1300 files changed, 60329 insertions, 93462 deletions

diff --git a/lib/.gitignore b/lib/.gitignore
index 56b1ed2b84..4125111ebd 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -7,6 +7,7 @@
 /common_test/doc/src/ct_rpc.xml
 /common_test/doc/src/ct_snmp.xml
 /common_test/doc/src/ct_ssh.xml
+/common_test/doc/src/ct_netconfc.xml
 /common_test/doc/src/ct_telnet.xml
 /common_test/doc/src/unix_telnet.xml
 
diff --git a/lib/Makefile b/lib/Makefile
index 3753bd165b..64b17a3cca 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -30,7 +30,7 @@ ifdef BUILD_ALL
           diameter \
           cosTransactions cosEvent cosTime cosNotification \
           cosProperty cosFileTransfer cosEventDomain et megaco webtool \
-	  xmerl edoc eunit ssh inviso typer erl_docgen \
+	  xmerl edoc eunit ssh typer erl_docgen \
 	  percept eldap dialyzer hipe
   EXTRA_FILE := $(wildcard EXTRA-APPLICATIONS)
   EXTRA_APPLICATIONS := $(if $(EXTRA_FILE),$(shell cat $(EXTRA_FILE)))
diff --git a/lib/appmon/doc/src/Makefile b/lib/appmon/doc/src/Makefile
index 743f123c06..7c93abe6d8 100644
--- a/lib/appmon/doc/src/Makefile
+++ b/lib/appmon/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2010. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -107,14 +107,14 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/appmon/priv/Makefile b/lib/appmon/priv/Makefile
index 9af4fbd228..356fe9b842 100644
--- a/lib/appmon/priv/Makefile
+++ b/lib/appmon/priv/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -57,8 +57,8 @@ clean:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(HELP_FILES) $(TOOLBAR_FILES) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(HELP_FILES) $(TOOLBAR_FILES) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/appmon/src/Makefile b/lib/appmon/src/Makefile
index 43f4f085b8..06e61b7cc8 100644
--- a/lib/appmon/src/Makefile
+++ b/lib/appmon/src/Makefile
@@ -1,7 +1,7 @@
 #
 #  %CopyrightBegin%
 #  
-#  Copyright Ericsson AB 1996-2009. All Rights Reserved.
+#  Copyright Ericsson AB 1996-2012. All Rights Reserved.
 #  
 #  The contents of this file are subject to the Erlang Public License,
 #  Version 1.1, (the "License"); you may not use this file except in
@@ -92,10 +92,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
index 8c06be56f8..dc926947af 100644
--- a/lib/asn1/c_src/Makefile
+++ b/lib/asn1/c_src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2002-2011. All Rights Reserved.
+# Copyright Ericsson AB 2002-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -66,13 +66,8 @@ NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.dll
 CLIB_FLAGS =
 LN=cp
 else
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.eld
-CLIB_FLAGS =
-else
 NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.so
 CLIB_FLAGS = -lc
-endif
 LN= ln -s
 endif
 
@@ -110,10 +105,10 @@ $(NIF_SHARED_OBJ_FILE): $(NIF_OBJ_FILES)
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
-	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) $(RELSYSDIR)/priv/lib
-	$(INSTALL_DIR) $(RELSYSDIR)/c_src
-	$(INSTALL_DATA) *.c $(RELSYSDIR)/c_src
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
+	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+	$(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src"
 
 release_docs_spec:
 
diff --git a/lib/asn1/doc/src/Makefile b/lib/asn1/doc/src/Makefile
index 20bd00a3b8..3b3e1bd8f9 100644
--- a/lib/asn1/doc/src/Makefile
+++ b/lib/asn1/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -119,13 +119,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html	
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/asn1/doc/src/asn1_ug.xml b/lib/asn1/doc/src/asn1_ug.xml
index 1b399fb641..6cb251c3e2 100644
--- a/lib/asn1/doc/src/asn1_ug.xml
+++ b/lib/asn1/doc/src/asn1_ug.xml
@@ -186,13 +186,21 @@ END      </pre>
         The following shows how the compiler
         can be called from the  Erlang shell:</p>
       <pre>
-1><input>asn1ct:compile("People",[ber_bin]).</input>
+1><input>asn1ct:compile("People", [ber]).</input>
+ok
+2>      </pre>
+
+      <p>The <c>verbose</c> option can be given to have information
+      about the generated files printed:</p>
+      <pre>
+2><input>asn1ct:compile("People", [ber,verbose]).</input>
 Erlang ASN.1 compiling "People.asn" 
 --{generated,"People.asn1db"}--
 --{generated,"People.hrl"}--
 --{generated,"People.erl"}--
 ok
-2>      </pre>
+3>      </pre>
+
       <p>The ASN.1 module People is now accepted and the abstract syntax tree
         is saved in the <c>People.asn1db</c> file, the
         generated Erlang code is compiled using the Erlang compiler and
@@ -229,7 +237,7 @@ receive
         constructed  and encoded using
         <c>'People':encode('Person',Answer)</c> which takes an
         instance of a defined ASN.1 type and transforms it to a
-        (possibly) nested list of bytes  according to the BER or PER
+        binary according to the BER or PER
         encoding-rules. 
                 <br></br>
 The encoder and the decoder can also be run from
@@ -239,24 +247,12 @@ The encoder and the decoder can also be run from
       <pre>
 2> <input>Rockstar = {'Person',"Some Name",roving,50}.</input>
 {'Person',"Some Name",roving,50}
-3> <input>{ok,Bytes} = asn1rt:encode('People','Person',Rockstar).</input>
-{ok,[&lt;&lt;243&gt;&gt;,
-     [17],
-     [19,9,"Some Name"],
-     [2,1,[2]],
-     [2,1,"2"]]}
-4> <input>Bin = list_to_binary(Bytes).</input>
-&lt;&lt;243,17,19,9,83,111,109,101,32,78,97,109,101,2,1,2,2,1,50&gt;&gt;
-5> <input>{ok,Person} = asn1rt:decode('People','Person',Bin).</input>
+3> <input>{ok,Bin} = asn1rt:encode('People','Person',Rockstar).</input>
+{ok,&lt;&lt;243,17,19,9,83,111,109,101,32,78,97,109,101,2,1,2,
+      2,1,50&gt;&gt;}
+4> <input>{ok,Person} = asn1rt:decode('People','Person',Bin).</input>
 {ok,{'Person',"Some Name",roving,50}}
-6>      </pre>
-      <p>Notice that the result from <c>encode</c> is a nested list which
-        must be turned into a binary before the call to <c>decode</c>. A
-        binary is necessary as input to decode since the module was compiled
-        with the <c>ber_bin</c> option
-        The reason for returning a nested list is that it is faster to produce 
-        and  the <c>list_to_binary</c> operation is
-        performed automatically when the list is sent via the Erlang port mechanism.</p>
+5>      </pre>
     </section>
 
     <section>
@@ -305,17 +301,15 @@ The encoder and the decoder can also be run from
         ASN.1 compiler:</p>
       <pre>
 erlc Person.asn
-erlc -bper_bin Person.asn
-erlc -bber_bin +optimize ../Example.asn
+erlc -bper Person.asn
+erlc -bber ../Example.asn
 erlc -o ../asnfiles -I ../asnfiles -I /usr/local/standards/asn1 Person.asn      </pre>
       <p>The useful options for the ASN.1 compiler are:</p>
       <taglist>
-        <tag><c>-b[ber | per | ber_bin | per_bin | uper_bin]</c></tag>
+        <tag><c>-b[ber | per | uper]</c></tag>
         <item>
           <p>Choice of encoding rules, if omitted <c>ber</c> is the
-          default. The <c>ber_bin</c> and <c>per_bin</c> options
-          allows for optimizations and are therefore recommended
-          instead of the <c>ber</c> and <c>per</c> options.</p>
+          default.</p>
         </item>
         <tag><c>-o OutDirectory</c></tag>
         <item>
@@ -339,42 +333,12 @@ erlc -o ../asnfiles -I ../asnfiles -I /usr/local/standards/asn1 Person.asn
         </item>
         <tag><c>+der</c></tag>
         <item>
-          <p>DER encoding rule. Only when using <c>-ber</c> or 
-            <c>-ber_bin</c> option.</p>
-        </item>
-        <tag><c>+optimize</c></tag>
-        <item>
-          <p>This flag has effect only when used together with one of
-            <c>per_bin</c> or <c>ber_bin</c> flags. It gives time optimized
-            code in the generated modules and it uses another runtime module.
-            In the <c>per_bin</c> case a nif is used. The
-            result from an encode is a binary.</p>
-          <p><em>When this flag is used you cannot use the old format</em><c>{TypeName,Value}</c> when you encode values. Since it is
-            an unnecessary construct it has been removed in favor of
-            performance. It
-            is neither admitted to construct SEQUENCE or SET component values
-            with the format <c>{ComponentName,Value}</c> since it also is
-            unnecessary. The only case were it is necessary is in a CHOICE,
-            were you have to pass values to the right component by specifying
-            <c>{ComponentName,Value}</c>. See also about
-            <seealso marker="#TypeNameValue">{Typename,Value}</seealso> below 
-            and in the sections for each type.</p>
-        </item>
-        <tag><c>+driver</c></tag>
-        <item>
-           <p>As of R15B this means the same as the <c>nif</c> option. Kept for
-	    backwards compatability reasons.</p>
-        </item>
-	<tag><c>+nif</c></tag>
-        <item>
-          <p>Together with the flags <c>ber_bin</c>
-	  and <c>optimize</c> you choose to use a nif for considerable
-	  faster encode and decode. </p>
+          <p>DER encoding rule. Only when using <c>-ber</c> option.</p>
         </item>
         <tag><c>+asn1config</c></tag>
         <item>
           <p>This functionality works together with the flags
-            <c>ber_bin</c> and <c>optimize</c>. You enables the
+            <c>ber</c>. It enables the
             specialized decodes, see the <seealso marker="asn1_spec">Specialized Decode</seealso> chapter.
             </p>
         </item>
@@ -413,7 +377,6 @@ erlc -o ../asnfiles -I ../asnfiles -I /usr/local/standards/asn1 Person.asn
         </item>
       </taglist>
       <p>For a complete description of <c>erlc</c> see Erts Reference Manual.</p>
-      <p>For preferred option use see <seealso marker="#preferred option use">Preferred Option Use</seealso> section.</p>
       <p>The compiler and other compile-time functions can also be invoked from 
         the Erlang shell. Below follows a brief
         description of the primary functions, for a
@@ -429,9 +392,9 @@ asn1ct:compile("H323-MESSAGES.asn1").      </pre>
       <p>which equals:</p>
       <pre>
 asn1ct:compile("H323-MESSAGES.asn1",[ber]).      </pre>
-      <p>If one wants PER encoding with optimizations:</p>
+      <p>If one wants PER encoding:</p>
       <pre>
-asn1ct:compile("H323-MESSAGES.asn1",[per_bin,optimize]).      </pre>
+asn1ct:compile("H323-MESSAGES.asn1",[per]).      </pre>
       <p>The generic encode and decode functions can be invoked like this:</p>
       <pre>
 asn1ct:encode('H323-MESSAGES','SomeChoiceType',{call,"octetstring"}).
@@ -443,269 +406,6 @@ asn1ct:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
     </section>
 
     <section>
-      <marker id="preferred option use"></marker>
-      <title>Preferred Option Use</title>
-      <p>
-	It may not be obvious which compile options best fit a
-	situation. This section describes the format of the result of
-	encode and decode. It also gives some performance statistics
-	when using certain options. Finally there is a recommendation
-	which option combinations should be used.
-      </p>
-      <p>
-	The default option is <c>ber</c>. It is the same backend as
-	<c>ber_bin</c> except that the result of encode is transformed
-	to a flat list. Below is a table that gives the different
-	formats of input and output of encode and decode using the
-	<em>allowed combinations</em> of coding and optimization
-	options: (EAVF stands for how ASN1 values are represented in
-	Erlang which is described in the <seealso
-	marker="#ASN1Types">ASN1 Types chapter</seealso>)
-      </p>
-      <table>
-      <row>
-        <cell align="left" valign="middle"><em>Encoding Rule</em></cell>
-        <cell align="left" valign="middle"><em>Compile options, allowed combinations</em></cell>
-        <cell align="left" valign="middle"><em>encode input</em></cell>
-        <cell align="left" valign="middle"><em>encode output</em></cell>
-        <cell align="left" valign="middle"><em>decode input</em></cell>
-        <cell align="left" valign="middle"><em>decode output</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">BER</cell>
-        <cell align="left" valign="middle">[ber] (default)</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-        <cell align="left" valign="middle">flat list</cell>
-        <cell align="left" valign="middle">flat list / binary</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">BER</cell>
-        <cell align="left" valign="middle">[ber_bin]</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-        <cell align="left" valign="middle">iolist</cell>
-        <cell align="left" valign="middle">binary</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">BER</cell>
-        <cell align="left" valign="middle"><em>[ber_bin, optimize]</em></cell>
-        <cell align="left" valign="middle">EAVF</cell>
-        <cell align="left" valign="middle">iolist</cell>
-        <cell align="left" valign="middle">binary</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">BER</cell>
-        <cell align="left" valign="middle"><em>[ber_bin, optimize, nif]</em></cell>
-        <cell align="left" valign="middle">EAVF</cell>
-        <cell align="left" valign="middle">iolist</cell>
-        <cell align="left" valign="middle">iolist / binary</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">PER aligned variant</cell>
-        <cell align="left" valign="middle">[per]</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-        <cell align="left" valign="middle">flat list</cell>
-        <cell align="left" valign="middle">flat list</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">PER aligned variant</cell>
-        <cell align="left" valign="middle"><em>[per_bin]</em></cell>
-        <cell align="left" valign="middle">EAVF</cell>
-        <cell align="left" valign="middle">iolist / binary</cell>
-        <cell align="left" valign="middle">binary</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">PER aligned variant</cell>
-        <cell align="left" valign="middle"><em>[per_bin, optimize]</em></cell>
-        <cell align="left" valign="middle">EAVF</cell>
-        <cell align="left" valign="middle">binary</cell>
-        <cell align="left" valign="middle">binary</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">PER unaligned variant</cell>
-        <cell align="left" valign="middle"><em>[uper_bin]</em></cell>
-        <cell align="left" valign="middle">EAVF</cell>
-        <cell align="left" valign="middle">binary</cell>
-        <cell align="left" valign="middle">binary</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-      </row>
-
-      <row>
-        <cell align="left" valign="middle">DER</cell>
-        <cell align="left" valign="middle">[(ber), der]</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-        <cell align="left" valign="middle">flat list</cell>
-        <cell align="left" valign="middle">flat list / binary</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">DER</cell>
-        <cell align="left" valign="middle">[ber_bin, der]</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-        <cell align="left" valign="middle">iolist</cell>
-        <cell align="left" valign="middle">binary</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">DER</cell>
-        <cell align="left" valign="middle"><em>[ber_bin, optimize, der]</em></cell>
-        <cell align="left" valign="middle">EAVF</cell>
-        <cell align="left" valign="middle">iolist</cell>
-        <cell align="left" valign="middle">binary</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">DER</cell>
-        <cell align="left" valign="middle"><em>[ber_bin, optimize, nif, der]</em></cell>
-        <cell align="left" valign="middle">EAVF</cell>
-        <cell align="left" valign="middle">iolist</cell>
-        <cell align="left" valign="middle">binary</cell>
-        <cell align="left" valign="middle">EAVF</cell>
-      </row>
-
-
-      <tcaption>The output / input formats for different combinations of compile options.</tcaption>
-    </table>
-    <p>
-      Encode / decode speed comparison in one user case for the above
-      alternatives (except <c>DER</c>) is showed in the table below. The
-      <c>DER</c> alternatives are slower than their corresponding
-      <c>BER</c> alternative.
-    </p>
-
-    <table>
-      <row>
-	<cell align="left" valign="middle"><em>compile options</em></cell>
-	<cell align="left" valign="middle"><em>encode time</em></cell>
-	<cell align="left" valign="middle"><em>decode time</em></cell>
-      </row>
-      <row>
-	<cell align="left" valign="middle">[ber]</cell>
-	<cell align="left" valign="middle">120</cell>
-	<cell align="left" valign="middle">162</cell>
-      </row>
-      <row>
-	<cell align="left" valign="middle">[ber_bin]</cell>
-	<cell align="left" valign="middle">124</cell>
-	<cell align="left" valign="middle">154</cell>
-      </row>
-      <row>
-	<cell align="left" valign="middle"><em>[ber_bin, optimize]</em></cell>
-	<cell align="left" valign="middle">50</cell>
-	<cell align="left" valign="middle">78</cell>
-      </row>
-      <row>
-	<cell align="left" valign="middle"><em>[ber_bin, optimize, driver]</em></cell>
-	<cell align="left" valign="middle">50</cell>
-	<cell align="left" valign="middle">62</cell>
-      </row>
-      <row>
-	<cell align="left" valign="middle">[per]</cell>
-	<cell align="left" valign="middle">141</cell>
-	<cell align="left" valign="middle">133</cell>
-      </row>
-      <row>
-	<cell align="left" valign="middle"><em>[per_bin]</em></cell>
-	<cell align="left" valign="middle">125</cell>
-	<cell align="left" valign="middle">123</cell>
-      </row>
-      <row>
-	<cell align="left" valign="middle"><em>[per_bin, optimize]</em></cell>
-	<cell align="left" valign="middle">77</cell>
-	<cell align="left" valign="middle">72</cell>
-      </row>
-      <row>
-	<cell align="left" valign="middle"><em>[uper_bin]</em></cell>
-	<cell align="left" valign="middle">97</cell>
-	<cell align="left" valign="middle">104</cell>
-      </row>
-      <tcaption>
-	One example of difference in speed for the compile option alternatives.
-      </tcaption>
-    </table>
-
-    <p>
-      The compile options <c>ber</c>, <c>per</c> and
-      <c>driver</c> are kept for backwards compatibility and should not be 
-      used in new code. The nif implementation which replaces the linked-in
-      driver has been shown to be about 5-15% faster.
-    </p>
-    <p>
-      You are strongly recommended to use the appropriate alternative
-      of the bold typed options. The <c>optimize</c> and
-      <c>nif</c> options does not affect the encode or decode
-      result, just the time spent in run-time. When <c>ber_bin</c> and
-      <c>nif</c> or <c>per_bin</c> and <c>optimize</c> is
-      combined the C-code nif is used in chosen parts of encode /
-      decode procedure.
-    </p>
-    <table>
-      <row>
-        <cell align="left" valign="middle"><em>Compile options, allowed combinations</em></cell>
-        <cell align="left" valign="middle"><em>use of nif</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">[ber]</cell>
-        <cell align="left" valign="middle">no</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">[ber_bin]</cell>
-        <cell align="left" valign="middle">no</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>[ber_bin, optimize]</em></cell>
-        <cell align="left" valign="middle">no</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>[ber_bin, optimize, nif]</em></cell>
-        <cell align="left" valign="middle">yes</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">[per]</cell>
-        <cell align="left" valign="middle">no</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>[per_bin]</em></cell>
-        <cell align="left" valign="middle">no</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>[per_bin, optimize]</em></cell>
-        <cell align="left" valign="middle">yes</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>[uper_bin]</em></cell>
-        <cell align="left" valign="middle">no</cell>
-      </row>
-
-      <row>
-        <cell align="left" valign="middle">[(ber), der]</cell>
-        <cell align="left" valign="middle">no</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">[ber_bin, der]</cell>
-        <cell align="left" valign="middle">no</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>[ber_bin, optimize, der]</em></cell>
-        <cell align="left" valign="middle">no</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>[ber_bin, optimize, nif, der]</em></cell>
-        <cell align="left" valign="middle">yes</cell>
-      </row>
-
-
-      <tcaption>When the ASN1 nif is used.</tcaption>
-    </table>
-
-    </section>
-    <section>
       <title>Run-time Functions</title>
       <p>A brief description of the major functions is given here. For a
         complete description of each function see
@@ -719,9 +419,9 @@ asn1rt:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
 'H323-MESSAGES':encode('SomeChoiceType',{call,"octetstring"}).
 'H323-MESSAGES':decode('SomeChoiceType',Bytes).      </pre>
       <p>The asn1 nif is enabled in two occasions: encoding of
-        asn1 values when the asn1 spec is compiled with <c>per_bin</c> and
-        <c>optimize</c> or decode of encoded asn1 values when the asn1 spec is
-        compiled with <c>ber_bin</c>, <c>optimize</c> and <c>nif</c>. In
+        asn1 values when the asn1 spec is compiled with <c>per</c> and
+        or decode of encoded asn1 values when the asn1 spec is
+        compiled with <c>ber</c>. In
         those cases the nif will be loaded automatically at the first call
         to <c>encode</c>/<c>decode</c>. If one doesn't want the performance
         overhead of the nif being loaded at the first call it is possible
@@ -868,26 +568,6 @@ Operational ::= BOOLEAN --ASN.1 definition    </pre>
     <pre>
 Val = true,
 {ok,Bytes}=asn1rt:encode(MyModule,'Operational',Val),    </pre>
-    <p>For historical reasons it is also possible to assign ASN.1 values 
-      in Erlang using a tuple notation
-      with type and value as this</p>
-    <pre>
-Val = {'Operational',true}    </pre>
-    <warning>
-      <marker id="warning"></marker>
-      <p>The tuple notation, <c>{Typename, Value}</c> is only kept
-        because of backward compatibility and may be withdrawn in a
-        future release. If the notation is used the <c>Typename</c>
-        element must be spelled correctly, otherwise a run-time error
-        will occur. 
-        </p>
-      <p>If the ASN.1 module is compiled with the flags
-        <c>per_bin</c> or <c>ber_bin</c> and <c>optimize</c> it is not
-        allowed to use the tuple notation. That possibility has been
-        removed due to performance reasons. Neither is it allowed to
-        use the <c>{ComponentName,Value}</c> notation in case of a
-        SEQUENCE or SET type.</p>
-    </warning>
     <p>Below follows a description of how
       values of each type can be represented in Erlang. 
       </p>
@@ -1149,7 +829,7 @@ TextFileVal2 = [88,76,55,44,99,121 .......... a lot of characters here ....]
         The following example shows how it works:</p>
       <p>In a file <c>PrimStrings.asn1</c> the type <c>BMP</c> is defined as
                 <br></br>
-<c>BMP ::= BMPString</c> then using BER encoding (<c>ber_bin</c> 
+<c>BMP ::= BMPString</c> then using BER encoding (<c>ber</c>
         option)the input/output format will be:</p>
       <pre>
 1> <input>{ok,Bytes1} = asn1rt:encode('PrimStrings','BMP',[{0,0,53,53},{0,0,45,56}]).</input>
@@ -1174,9 +854,9 @@ TextFileVal2 = [88,76,55,44,99,121 .......... a lot of characters here ....]
         <c>utf8_list_to_binary</c>, are in the <c>asn1rt</c> module. In
         the example below we assume an asn1 definition <c>UTF ::= UTF8String</c> in a module <c>UTF.asn</c>:</p>
       <pre>
-1> <input>asn1ct:compile('UTF',[ber_bin]).</input>
+1> <input>asn1ct:compile('UTF',[ber]).</input>
 Erlang ASN.1 version "1.4.3.3" compiling "UTF.asn" 
-Compiler Options: [ber_bin]
+Compiler Options: [ber]
 --{generated,"UTF.asn1db"}--
 --{generated,"UTF.erl"}--
 ok
@@ -1287,14 +967,6 @@ Pdu ::= SEQUENCE {
       <p>Values can be assigned in Erlang as shown below:</p>
       <pre>
 MyPdu = #'Pdu'{a=22,b=77.99,c={0,1,2,3,4},d='NULL'}.      </pre>
-<note>
-  <p>
-    In very early versions of the asn1 compiler it was also possible to 
-    specify the values of the components in 
-    a SEQUENCE or a SET as a list of tuples <c>{ComponentName,Value}</c>. 
-    This is no longer supported.
-  </p>
-</note>
       <p>The decode functions will return a record as result when decoding 
         a <c>SEQUENCE</c> or a <c>SET</c>.
                 <marker id="DEFAULT"></marker>
@@ -1739,12 +1411,9 @@ SS ::= SET {
 1> <input>Val = 'Values':tt().</input>
 {'TT',77,["kalle","kula"]}
 2> <input>{ok,Bytes} = 'Values':encode('TT',Val).</input>
-{ok,["0",
-     [18],
-     [[[128],[1],"M"],["\\241","\\r",[[[4],[5],"kalle"],[[4],[4],"kula"]]]]]}
-3> <input>FlatBytes = lists:flatten(Bytes).</input>
-[48,18,128,1,77,161,13,4,5,107,97,108,108,101,4,4,107,117,108,97]
-4> <input>'Values':decode('TT',FlatBytes).</input>
+{ok,&lt;&lt;48,18,128,1,77,161,13,4,5,107,97,108,108,101,4,4,
+      107,117,108,97&gt;&gt;}
+4> <input>'Values':decode('TT',Bytes).</input>
 {ok,{'TT',77,["kalle","kula"]}}
 5>
     </pre>
diff --git a/lib/asn1/doc/src/asn1ct.xml b/lib/asn1/doc/src/asn1ct.xml
index 3be58cbc8e..9a9bb7ec1b 100644
--- a/lib/asn1/doc/src/asn1ct.xml
+++ b/lib/asn1/doc/src/asn1ct.xml
@@ -41,6 +41,19 @@
       encode/decode functions. There are also some generic functions which
       can be used in during development of applications which handles ASN.1
       data (encoded as BER or PER).</p>
+      <note>
+	<p>In R16, the options have been simplified. The back-end is chosen
+	using one of the options <c>ber</c>, <c>per</c>, or <c>uper</c>.
+	The options <c>optimize</c>, <c>nif</c>, and <c>driver</c> options
+	are no longer necessary (and the ASN.1 compiler will print a
+	warning if they are used). The options <c>ber_bin</c>, <c>per_bin</c>,
+	and <c>uper_bin</c> options will still work, but will print a warning.
+	</p>
+	<p>Another change in R16 is that the generated <c>encode/2</c>
+	function (and <c>asn1rt:encode/3</c>) always returns a binary.
+	The <c>encode/2</c> function for the BER back-end used to return
+	an iolist.</p>
+      </note>
   </description>
   <funcs>
     <func>
@@ -50,9 +63,9 @@
       <type>
         <v>Asn1module = atom() | string()</v>
         <v>Options = [Option| OldOption]</v>
-        <v>Option = ber_bin | per_bin | uper_bin | der | compact_bit_string |
-	noobj | {n2n, EnumTypeName} |{outdir, Dir} | {i, IncludeDir} | optimize |
-	nif | asn1config | undec_rest | {inline, OutputName} | inline |
+        <v>Option = ber | per | uper | der | compact_bit_string |
+	noobj | {n2n, EnumTypeName} |{outdir, Dir} | {i, IncludeDir} |
+	asn1config | undec_rest | {inline, OutputName} | inline |
 	{macro_name_prefix, Prefix} | {record_name_prefix, Prefix} | verbose | warnings_as_errors</v>
         <v>OldOption = ber | per</v> 
         <v>Reason = term()</v>
@@ -112,7 +125,7 @@ File3.asn        </pre>
 	  section in users guide</seealso>. Available options are:
 	</p>
 	<taglist>
-          <tag><c>ber | ber_bin | per | per_bin | uper_bin</c></tag>
+          <tag><c>ber | per | uper</c></tag>
           <item>
             <p>
 	      The encoding rule to be used. The supported encoding rules
@@ -120,23 +133,12 @@ File3.asn        </pre>
 	      PER aligned (Packed Encoding Rules) and PER unaligned. 
 	      If the encoding rule option is omitted <c>ber</c> 
 	      is the default.
-	      The <c>per_bin</c> option means the aligned
-	      variant. To use the unaligned variant the <c>uper_bin</c>
-	      option has to be used.
 	    </p>
 	    <p>
 	      The generated Erlang module always gets the same name
 	      as the ASN.1 module and as a consequence of this only one
 	    encoding rule per ASN.1 module can be used at runtime.
 	    </p>
-	    <p>
-	      The <c>ber_bin</c> and <c>per_bin</c> options are
-	      equivalent with the <c>OldOptions</c> <c>ber</c> and <c>per</c>
-	      with the difference that the generated encoding/decoding
-	      functions take advantage of the bit syntax, which in most
-	      cases increases the performance considerably. The result
-	      from encoding is a binary or an iolist.
-	    </p>
           </item>
           <tag><c>der</c></tag>
           <item>
@@ -144,7 +146,7 @@ File3.asn        </pre>
 	      By this option the Distinguished Encoding Rules (DER) is chosen.
 	      DER is regarded as a specialized variant of the BER encoding 
               rule, therefore the <c>der</c> option only makes sense together
-	      with the <c>ber</c> or <c>ber_bin</c> option. 
+	      with the <c>ber</c> option.
 	      This option
               sometimes adds sorting and value checks when encoding, which
               implies a slower encoding. The decoding routines are the same
@@ -206,28 +208,6 @@ Binary = binary()
               shall be placed. If omitted the files are placed in the 
               current directory.</p>
           </item>
-          <tag><c>optimize</c></tag>
-          <item>
-            <p>This option is only valid together with one of the
-              <c>per_bin</c> 
-              or <c>ber_bin</c> option. It gives time optimized code 
-              generated and it uses another runtime module and 
-              in the <c>per_bin</c> case a nif. The result 
-              in the <c>per_bin</c> case from an encode when compiled
-              with this option will be a binary.</p>
-          </item>
-          <tag><c>driver</c></tag>
-          <item>
-            <p>As of R15B this means the same as the <c>nif</c> option. Kept for
-	    backwards compatability reasons.</p>
-          </item>
-	  <tag><c>nif</c></tag>
-          <item>
-            <p>Option valid together with <c>ber_bin</c> and <c>optimize</c>
-	      options. It enables the use of several nifs that gives faster 
-	      encode and decode. Nifs are only enabled by the explicit use of 
-	      the option <c>nif</c></p>
-          </item>
           <tag><c>asn1config</c></tag>
           <item>
             <p>When one of the specialized decodes, exclusive or
@@ -270,10 +250,6 @@ Binary = binary()
               <c>{export, [atom()]}</c> or <c>{export_all, true}</c> option
               are provided. The list of atoms are names of chosen asn1
               specs from the <c>.set.asn</c> file. </p>
-	      <p>When used together with <c>nif</c> for <c>ber_bin</c>, the
-	      asn1 nifs will be used if the <c>asn1rt_nif</c> module is 
-	      available. If it is not available, a slower erlang fallback
-	      will be used.</p>
           </item>
           <tag><c>inline</c></tag>
           <item>
@@ -327,13 +303,12 @@ Binary = binary()
       <type>
         <v>Module = Type = atom()</v>
         <v>Value = term()</v>
-        <v>Bytes = [Int] when integer(Int), Int >= 0, Int =&lt; 255</v>
+        <v>Bytes = binary()</v>
         <v>Reason = term()</v>
       </type>
       <desc>
         <p>Encodes <c>Value</c> of <c>Type</c> defined in the ASN.1 module 
-          <c>Module</c>. Returns a list of bytes if successful. To get as fast execution as 
-          possible the 
+          <c>Module</c>. To get as fast execution as possible the
           encode function only performs rudimentary tests that the input 
           <c>Value</c>
           is a correct instance of <c>Type</c>. The length of strings is for example
@@ -348,10 +323,10 @@ Binary = binary()
       <type>
         <v>Module = Type = atom()</v>
         <v>Value = Reason = term()</v>
-        <v>Bytes = [Int] when integer(Int), Int >= 0, Int =&lt; 255</v>
+        <v>Bytes = binary()</v>
       </type>
       <desc>
-        <p>Decodes <c>Type</c> from <c>Module</c> from the list of bytes 
+        <p>Decodes <c>Type</c> from <c>Module</c> from the binary
           <c>Bytes</c>. Returns <c>{ok, Value}</c> if successful.</p>
       </desc>
     </func>
diff --git a/lib/asn1/doc/src/asn1rt.xml b/lib/asn1/doc/src/asn1rt.xml
index 0c3c257189..f2cac0c9e7 100644
--- a/lib/asn1/doc/src/asn1rt.xml
+++ b/lib/asn1/doc/src/asn1rt.xml
@@ -47,35 +47,34 @@
       <type>
         <v>Module = Type = atom()</v>
         <v>Value = Reason = term()</v>
-        <v>Bytes = binary | [Int] when integer(Int), Int >= 0, Int =&lt; 255 | binary</v>
+        <v>Bytes = binary</v>
       </type>
       <desc>
-        <p>Decodes <c>Type</c> from <c>Module</c> from the list of bytes or
-          binary <c>Bytes</c>. If the module is compiled with <c>ber_bin</c>
-          or <c>per_bin</c> option <c>Bytes</c> must be a binary. 
+        <p>Decodes <c>Type</c> from <c>Module</c> from the binary <c>Bytes</c>.
           Returns <c>{ok,Value}</c> if successful.</p>
       </desc>
     </func>
 
     <func>
-      <name>encode(Module,Type,Value)-> {ok,BinOrList} | {error,Reason}</name>
+      <name>encode(Module,Type,Value)-> {ok,Bytes} | {error,Reason}</name>
       <fsummary>Encode an ASN.1 value.</fsummary>
       <type>
         <v>Module = Type = atom()</v>
         <v>Value = term()</v>
-        <v>BinOrList = Bytes | binary()</v>
-        <v>Bytes = [Int|binary|Bytes] when integer(Int), Int >= 0, Int =&lt; 255</v>
+        <v>Bytes = binary</v>
         <v>Reason = term()</v>
       </type>
       <desc>
         <p>Encodes <c>Value</c> of <c>Type</c> defined in the ASN.1 module 
           <c>Module</c>. Returns a possibly nested list of bytes and or binaries 
-          if successful. If <c>Module</c> was compiled with the options <c>per_bin</c> and <c>optimize</c> the result is a binary. To get as 
-          fast execution as possible the 
+          if successful. To get as fast execution as possible the
           encode function only performs rudimentary tests that the input 
           <c>Value</c>
           is a correct instance of <c>Type</c>. The length of strings is for example
           not always checked. </p>
+	  <note>
+	  <p>Starting in R16, <c>Bytes</c> is always a binary.</p>
+	  </note>
       </desc>
     </func>
 
@@ -95,28 +94,6 @@
     </func>
 
     <func>
-      <name>load_driver() ->  ok | {error,Reason}</name>
-      <fsummary>Loads the linked-in driver. (deprecated)</fsummary>
-      <type>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-	<p>This function is obsolete and will be removed in R16A</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>unload_driver() ->  ok | {error,Reason}</name>
-      <fsummary>Unloads the linked-in driver. (deprecated)</fsummary>
-      <type>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-	<p>This function is obsolete and will be removed in R16A</p>
-      </desc>
-    </func>
-
-    <func>
       <name>utf8_binary_to_list(UTF8Binary) ->  {ok,UnicodeList} | {error,Reason}</name>
       <fsummary>Transforms an utf8 encoded binary to a unicode list.</fsummary>
       <type>
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index b5422c9083..72b496caf7 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,75 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 1.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Encoding and decoding of integer ranges can now be done
+	    with an upper bound larger than the previous limit of
+	    16^10. The new upper bound in per encoding and decodings
+	    for constrained whole numbers is 2^2040 (close to 16^508)</p>
+          <p>
+	    Own Id: OTP-10128</p>
+        </item>
+        <item>
+          <p>
+	    Per encoding/decoding now works correctly for single
+	    value subtyping of an integer type where a subtype is a
+	    predefined value. Previously a predefined value could
+	    cause a non-valid range-check in the generated Erlang
+	    code for per encoding/decoding due to a bug in the
+	    constraint checking.</p>
+          <p>
+	    Own Id: OTP-10139</p>
+        </item>
+        <item>
+          <p>
+	    Fix typo error in selected decode function (Thanks to
+	    Artem Teslenko)</p>
+          <p>
+	    Own Id: OTP-10152</p>
+        </item>
+        <item>
+          <p>
+	    Better error indication when detecting unexpected tags
+	    during decoding of BER encoded data.</p>
+          <p>
+	    Own Id: OTP-10186</p>
+        </item>
+        <item>
+          <p>
+	    asn1rt_check: Fix transform_to_EXTERNAL1990 for binary
+	    input (Thanks to Harald Welte)</p>
+          <p>
+	    Own Id: OTP-10233</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add support for multiple ExtensionAdditionGroups</p>
+          <p>
+	    Own Id: OTP-10058</p>
+        </item>
+        <item>
+          <p>
+	    Add support for extensible enumeration types in n2n
+	    generated functions.</p>
+          <p>
+	    Own Id: OTP-10144</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 1.7</title>
 
     <section><title>Improvements and New Features</title>
@@ -414,7 +483,7 @@
 	    ENUMERATION type, the compilation will be terminated with an 
 	    error code.<br/>
 	    Below follows an example on how to use the option from the command line with <c>erlc</c>:<br/>
-	    <c>erlc -bper_bin +optimize +driver +"{n2n,'CauseMisc'}" +"{n2n,'CausePcl'}" MyModyle.asn</c>
+	    <c>erlc -bper+"{n2n,'CauseMisc'}" +"{n2n,'CausePcl'}" MyModyle.asn</c>
 	  </p>
           <p>
             Own Id: OTP-8136 Aux Id: seq11347 </p>
diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
index 5614cbea91..3d66583745 100644
--- a/lib/asn1/src/Makefile
+++ b/lib/asn1/src/Makefile
@@ -52,8 +52,6 @@ CT_MODULES= \
 	asn1ct_gen_per_rt2ct \
 	asn1ct_name \
 	asn1ct_constructed_per \
-	asn1ct_constructed_ber \
-	asn1ct_gen_ber \
 	asn1ct_constructed_ber_bin_v2 \
 	asn1ct_gen_ber_bin_v2 \
 	asn1ct_value \
@@ -63,7 +61,6 @@ CT_MODULES= \
 
 RT_MODULES= \
 	asn1rt \
-	asn1rt_per_bin \
 	asn1rt_ber_bin \
 	asn1rt_ber_bin_v2 \
 	asn1rt_per_bin_rt2ct \
@@ -153,16 +150,16 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(EXAMPLES) $(RELSYSDIR)/examples
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples"
 
 # there are no include files to be used by the user
-#$(INSTALL_DIR) $(RELSYSDIR)/include
-#$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+#$(INSTALL_DIR) "$(RELSYSDIR)/include"
+#$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
 
diff --git a/lib/asn1/src/asn1.app.src b/lib/asn1/src/asn1.app.src
index 09144ba2f7..64b33a8a30 100644
--- a/lib/asn1/src/asn1.app.src
+++ b/lib/asn1/src/asn1.app.src
@@ -3,7 +3,6 @@
   {vsn, "%VSN%"},
   {modules, [
 	asn1rt,
-	asn1rt_per_bin,
 	asn1rt_per_bin_rt2ct,
 	asn1rt_uper_bin,
 	asn1rt_ber_bin,
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index 99755a95a6..90882462ac 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -85,14 +85,8 @@
 compile(File) ->
     compile(File,[]).
 
-compile(File,Options) when is_list(Options) ->
-    case lists:member(driver, Options) of %% remove me in R16A!
-	true ->
-	    io:format("Warning: driver option is obsolete and will be removed in R16A, use nif instead!");
-	false ->
-	    ok
-    end,
-    Options1 = optimize_ber_bin(Options),
+compile(File, Options0) when is_list(Options0) ->
+    Options1 = translate_options(Options0),
     Options2 = includes(File,Options1),
     Includes = strip_includes(Options2),
     in_process(fun() -> compile_proc(File, Includes, Options2) end).
@@ -833,7 +827,7 @@ generate({true,{M,_Module,GenTOrV}},OutFile,EncodingRule,Options) ->
     asn1ct_table:new(check_functions),
 
     %% create decoding function names and taglists for partial decode
-    case specialized_decode_prepare(EncodingRule,M,GenTOrV,Options) of
+    case (catch specialized_decode_prepare(EncodingRule,M,GenTOrV,Options)) of
         {error, Reason}  -> warning("Error in configuration file: ~n~p~n",
                                     [Reason], Options,
                                     "Error in configuration file");
@@ -852,8 +846,8 @@ generate({true,{M,_Module,GenTOrV}},OutFile,EncodingRule,Options) ->
     debug_off(Options),
     put(compact_bit_string,false),
     erase(encoding_options),
-    erase(tlv_format), % used in ber_bin, optimize
-    erase(class_default_type),% used in ber_bin, optimize
+    erase(tlv_format), % used in ber
+    erase(class_default_type),% used in ber
     asn1ct_table:delete(check_functions),
     case Result of 
 	{error,_} ->
@@ -876,14 +870,13 @@ parse_and_save(Module,S) ->
     Options = S#state.options,
     SourceDir = S#state.sourcedir,
     Includes = [I || {i,I} <-Options],
-    Options1 = optimize_ber_bin(Options),
-    
+
     case get_input_file(Module,[SourceDir|Includes]) of 
 	%% search for asn1 source
 	{file,SuffixedASN1source} ->
-	    case dbfile_uptodate(SuffixedASN1source,Options1) of
+	    case dbfile_uptodate(SuffixedASN1source,Options) of
 		false ->
-		    parse_and_save1(S,SuffixedASN1source,Options1,Includes);
+		    parse_and_save1(S,SuffixedASN1source,Options,Includes);
 		_ -> ok
 	    end;
 	Err ->
@@ -1065,9 +1058,9 @@ get_file_list1(Stream,Dir,Includes,Acc) ->
     end.
 
 get_rule(Options) ->
-    case [Rule ||Rule <-[per,ber,ber_bin,ber_bin_v2,per_bin,uper_bin],
-		 Opt <- Options,
-		 Rule==Opt] of
+    case [Rule || Rule <- [ber,per,uper],
+		  Opt <- Options,
+		  Rule =:= Opt] of
 	[Rule] ->
 	    Rule;
 	[Rule|_] ->
@@ -1079,19 +1072,34 @@ get_rule(Options) ->
 get_runtime_mod(Options) ->
     RtMod1=
 	case get_rule(Options) of
-	    per -> ["asn1rt_per_bin.erl"];
-	    ber -> ["asn1rt_ber_bin.erl"];
-	    per_bin ->
-		case lists:member(optimize,Options) of
-		    true -> ["asn1rt_per_bin_rt2ct.erl"];
-		    _ -> ["asn1rt_per_bin.erl"]
-		end;
-	    ber_bin -> ["asn1rt_ber_bin.erl"];
-	    ber_bin_v2 -> ["asn1rt_ber_bin_v2.erl"];
-	    uper_bin -> ["asn1rt_uper_bin.erl"]
+	    per -> "asn1rt_per_bin_rt2ct.erl";
+	    ber -> ["asn1rt_ber_bin_v2.erl"];
+	    uper -> ["asn1rt_uper_bin.erl"]
 	end,
     RtMod1++["asn1rt_check.erl","asn1rt.erl"].
-    
+
+%% translate_options(NewOptions) -> OldOptions
+%%  Translate the new option names to the old option name.
+%%  FIXME. We should rewrite all code to handle the new option names.
+
+translate_options([ber_bin|T]) ->
+    io:format("Warning: The option 'ber_bin' is now called 'ber'.\n"),
+    [ber|translate_options(T)];
+translate_options([per_bin|T]) ->
+    io:format("Warning: The option 'per_bin' is now called 'per'.\n"),
+    [per|translate_options(T)];
+translate_options([uper_bin|T]) ->
+    io:format("Warning: The option 'uper_bin' is now called 'uper'.\n"),
+    translate_options([uper|T]);
+translate_options([nif|T]) ->
+    io:format("Warning: The option 'nif' is no longer needed.\n"),
+    translate_options(T);
+translate_options([optimize|T]) ->
+    io:format("Warning: The option 'optimize' is no longer needed.\n"),
+    translate_options(T);
+translate_options([H|T]) ->
+    [H|translate_options(T)];
+translate_options([]) -> [].
 
 erl_compile(OutFile,Options) ->
 %    io:format("Options:~n~p~n",[Options]),
@@ -1115,7 +1123,6 @@ remove_asn_flags(Options) ->
 	  X /= optimize,
 	  X /= compact_bit_string,
 	  X /= debug,
-	  X /= keyed_list,
 	  X /= asn1config,
 	  X /= record_name_prefix].
 	  
@@ -1125,12 +1132,6 @@ debug_on(Options) ->
 	    put(asndebug,true);
 	_ ->
 	    true
-    end,
-    case lists:member(keyed_list,Options) of
-	true ->
-	    put(asn_keyed_list,true);
-	_ ->
-	    true
     end.
 
 igorify_options(Options) ->
@@ -1151,8 +1152,7 @@ generated_file(Name,Options) ->
     end.
 
 debug_off(_Options) ->
-    erase(asndebug),
-    erase(asn_keyed_list).
+    erase(asndebug).
 
 
 outfile(Base, Ext, Opts) ->
@@ -1168,13 +1168,6 @@ outfile(Base, Ext, Opts) ->
 	    lists:concat([Obase,".",Ext])
     end.
 
-optimize_ber_bin(Options) ->
-    case {lists:member(optimize,Options),lists:member(ber_bin,Options)} of
-	{true,true} -> 
-	    [ber_bin_v2|Options--[ber_bin]];
-	_ -> Options
-    end.
-
 includes(File,Options) -> 
     Options2 = include_append(".", Options),
     Options3 = include_append(filename:dirname(File), Options2),
@@ -1284,12 +1277,7 @@ make_erl_options(Opts) ->
 	  Defines) ++
 	case OutputType of
 	    undefined -> [ber]; % temporary default (ber when it's ready)
-	    ber -> [ber];
-	    ber_bin -> [ber_bin];
-	    ber_bin_v2 -> [ber_bin_v2];
-	    per -> [per];
-	    per_bin -> [per_bin];
-	    uper_bin -> [uper_bin]
+	    _ -> [OutputType]	% pass through
 	end,
 
     Options++[errors, {cwd, Cwd}, {outdir, Outdir}|
@@ -1400,8 +1388,7 @@ test_value(Module, Type, Value) ->
     in_process(fun() ->
                    case catch encode(Module, Type, Value) of
                        {ok, Bytes} ->
-                           M = to_atom(Module),
-                           NewBytes = prepare_bytes(M:encoding_rule(), Bytes),
+                           NewBytes = prepare_bytes(Bytes),
                            case decode(Module, Type, NewBytes) of
                                {ok, Value} ->
                                    {ok, {Module, Type, Value}};
@@ -1452,18 +1439,8 @@ check(Module, Includes) ->
             end
     end.
 
-to_atom(Term) when is_list(Term) -> list_to_atom(Term);
-to_atom(Term) when is_atom(Term) -> Term.
-
-prepare_bytes(ber,          Bytes) -> lists:flatten(Bytes);
-prepare_bytes(ber_bin,      Bytes) when is_binary(Bytes) -> Bytes;
-prepare_bytes(ber_bin,      Bytes) -> list_to_binary(Bytes);
-prepare_bytes(ber_bin_v2,   Bytes) when is_binary(Bytes) -> Bytes;
-prepare_bytes(ber_bin_v2,   Bytes) -> list_to_binary(Bytes);
-prepare_bytes(per,          Bytes) -> lists:flatten(Bytes);
-prepare_bytes(per_bin,      Bytes) when is_binary(Bytes) -> Bytes;
-prepare_bytes(per_bin,      Bytes) -> list_to_binary(Bytes);
-prepare_bytes(uper_bin,     Bytes) -> Bytes.
+prepare_bytes(Bytes) when is_binary(Bytes) -> Bytes;
+prepare_bytes(Bytes) -> list_to_binary(Bytes).
 
 vsn() ->
     ?vsn.
@@ -1504,7 +1481,7 @@ specialized_decode_prepare(Erule,M,TsAndVs,Options) ->
     end.
 %% Reads the configuration file if it exists and stores information
 %% about partial decode and incomplete decode
-partial_decode_prepare(ber_bin_v2,M,TsAndVs,Options) when is_tuple(TsAndVs) ->
+partial_decode_prepare(ber,M,TsAndVs,Options) when is_tuple(TsAndVs) ->
     %% read configure file
 
     ModName =
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 187339fb53..fe1b2e14a8 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -61,13 +61,13 @@
 
 -define(TAG_PRIMITIVE(Num),
 	case S#state.erule of
-	    ber_bin_v2 ->
+	    ber ->
 		#tag{class='UNIVERSAL',number=Num,type='IMPLICIT',form=0};
 	    _ -> []
 	end).
 -define(TAG_CONSTRUCTED(Num),
 	case S#state.erule of
-	    ber_bin_v2 ->
+	    ber ->
 		#tag{class='UNIVERSAL',number=Num,type='IMPLICIT',form=32};
 	    _ -> []
 	end).
@@ -3262,7 +3262,7 @@ check_type(S=#state{recordtopname=TopName},Type,Ts) when is_record(Ts,type) ->
 		       inlined=IsInlined},
     TestFun = 
 	fun(Tref) ->
-		{_,MaybeChoice} = get_referenced_type(S,Tref),
+		MaybeChoice = get_non_typedef(S, Tref),
 		case catch((MaybeChoice#typedef.typespec)#type.def) of
 		    {'CHOICE',_} ->
 			maybe_illicit_implicit_tag(choice,Tag);
@@ -3347,7 +3347,7 @@ check_type(S=#state{recordtopname=TopName},Type,Ts) when is_record(Ts,type) ->
 			TempNewDef#newt{
 			  type = check_externaltypereference(S,NewExt),
 			  tag = case S#state.erule of
-				    ber_bin_v2 ->
+				    ber ->
 					merge_tags(Ct,RefType#type.tag);
 				    _ ->
 					Ct
@@ -3617,6 +3617,14 @@ check_type(S=#state{recordtopname=TopName},Type,Ts) when is_record(Ts,type) ->
 check_type(_S,Type,Ts) ->
     exit({error,{asn1,internal_error,Type,Ts}}).
 
+get_non_typedef(S, Tref0) ->
+    case get_referenced_type(S, Tref0) of
+	{_,#typedef{typespec=#type{def=#'Externaltypereference'{}=Tref}}} ->
+	    get_non_typedef(S, Tref);
+	{_,Type} ->
+	    Type
+    end.
+
 %% tablecinf_choose. A SEQUENCE or SET may be inserted in another
 %% SEQUENCE or SET by the COMPONENTS OF directive. If this inserted
 %% type is a referenced type that already has been checked it already
@@ -4177,7 +4185,7 @@ check_constraint(S,{'SizeConstraint',Lb}) ->
 
 check_constraint(S,{'SingleValue', L}) when is_list(L) ->
     F = fun(A) -> resolv_value(S,A) end,
-    {'SingleValue',lists:map(F,L)};
+    {'SingleValue',lists:sort(lists:map(F,L))};
     
 check_constraint(S,{'SingleValue', V}) when is_integer(V) ->
     Val = resolv_value(S,V),
@@ -5289,7 +5297,7 @@ iof_associated_type(S,[]) ->
 	    AssociateSeq = iof_associated_type1(S,[]),
 	    Tag =
 		case S#state.erule of
-		    ber_bin_v2 ->
+		    ber ->
 			[?TAG_CONSTRUCTED(?N_INSTANCE_OF)];
 		    _ -> []
 		end,
@@ -5320,7 +5328,7 @@ iof_associated_type1(S,C) ->
 	end,
     {ObjIdTag,C1TypeTag}=
 	case S#state.erule of
-	    ber_bin_v2 -> 
+	    ber ->
 		{[{'UNIVERSAL',8}],
 		 [#tag{class='UNIVERSAL',
 		       number=6,
@@ -5551,8 +5559,9 @@ complist_as_tuple(_Per,[],Acc,Ext,_Acc2,ext) ->
 complist_as_tuple(_Per,[],Acc,Ext,Acc2,root2) ->
     {lists:reverse(Acc),lists:reverse(Ext),lists:reverse(Acc2)}.
 
-is_erule_per(Erule) ->
-    lists:member(Erule,[per,per_bin,uper_bin]).
+is_erule_per(per) -> true;
+is_erule_per(uper) -> true;
+is_erule_per(ber) -> false.
 
 expand_components(S, [{'COMPONENTS OF',Type}|T]) ->
     CompList = expand_components2(S,get_referenced_type(S,Type#type.def)),
@@ -5641,7 +5650,7 @@ check_set(S,Type,Components) ->
 	{true,_} ->
 	    {Sorted,SortedComponents} = sort_components(der,S,NewComponents),
 	    {Sorted,TableCInf,SortedComponents};
-	{_,PER} when PER =:= per; PER =:= per_bin; PER =:= uper_bin ->
+	{_,PER} when PER =:= per; PER =:= uper ->
 	    {Sorted,SortedComponents} = sort_components(per,S,NewComponents),
 	    {Sorted,TableCInf,SortedComponents};
 	_ ->
@@ -5765,7 +5774,7 @@ sort_universal_type(Components) ->
 decode_type(I) when is_integer(I) ->
     I;
 decode_type(T) ->
-    asn1ct_gen_ber:decode_type(T).
+    asn1ct_gen_ber_bin_v2:decode_type(T).
 
 untagged_choice(_S,[#'ComponentType'{typespec=#type{tag=[],def={'CHOICE',_}}}|_Rest]) ->
     true;
@@ -5991,17 +6000,25 @@ generate_automatic_tags1([H|T],[TagNo|TagNos]) when is_record(H,'ComponentType')
 			     type={default,'IMPLICIT'},
 			     form= 0 }]}, % PRIMITIVE
     [H#'ComponentType'{typespec=NewTs}|generate_automatic_tags1(T,[TagNo+1|TagNos])];
-generate_automatic_tags1([ExtMark|T],[_TagNo|TagNos]) -> % EXTENSIONMARK
+generate_automatic_tags1([ExtMark = #'EXTENSIONMARK'{}|T],[_TagNo|TagNos]) -> 
     [ExtMark | generate_automatic_tags1(T,TagNos)];
+generate_automatic_tags1([H|T],TagList) -> % ExtensionAdditionGroup etc are just ignored
+    [H | generate_automatic_tags1(T,TagList)];
 generate_automatic_tags1([],_) ->
     [].
 
-any_manual_tag([#'ComponentType'{typespec=#type{tag=[]}}|Rest]) ->
-    any_manual_tag(Rest);
-any_manual_tag([#'EXTENSIONMARK'{}|Rest]) ->
-    any_manual_tag(Rest);
-any_manual_tag([_|_Rest]) ->
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Returns true if there is at least one ComponentType with a manually 
+%% specified tag. No manual tag is indicated by typespec=#type{tag=[]}
+%% so we check if we find a tag =/= [] and return true in that case
+%% all other things in the componentlist like (EXTENSIONMARK, 
+%% ExtensionAdditionGroup,...) except ComponentType is simply
+%% ignored/skipped
+any_manual_tag([#'ComponentType'{typespec=#type{tag=Tag}}|_Rest]) 
+  when Tag =/= []->
     true;
+any_manual_tag([_|Rest]) ->
+    any_manual_tag(Rest);
 any_manual_tag([]) ->
     false.
 
@@ -6876,16 +6893,16 @@ get_taglist(S,{ObjCl,FieldNameList}) when is_record(ObjCl,objectclass),
 	{TypeFieldName,_} when is_atom(TypeFieldName) -> []%should check if allowed
     end;
 get_taglist(S,Def) ->
-    case lists:member(S#state.erule,[ber_bin_v2]) of
-	false ->
+    case S#state.erule of
+	ber ->
+	    [];
+	_ ->
 	    case Def of
 		'ASN1_OPEN_TYPE' -> % open_type has no UNIVERSAL tag as such
 		    [];
 		_ ->
 		    [asn1ct_gen:def_to_tag(Def)]
-	    end;
-	_ -> 
-	    []
+	    end
     end.
 
 get_taglist1(S,[#'ComponentType'{name=_Cname,tags=TagL}|Rest]) when is_list(TagL) -> 
diff --git a/lib/asn1/src/asn1ct_constructed_ber.erl b/lib/asn1/src/asn1ct_constructed_ber.erl
deleted file mode 100644
index 360de77663..0000000000
--- a/lib/asn1/src/asn1ct_constructed_ber.erl
+++ /dev/null
@@ -1,1596 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
--module(asn1ct_constructed_ber).
-
--export([gen_encode_sequence/3]).
--export([gen_decode_sequence/3]).
--export([gen_encode_set/3]).
--export([gen_decode_set/3]).
--export([gen_encode_sof/4]).
--export([gen_decode_sof/4]).
--export([gen_encode_choice/3]).
--export([gen_decode_choice/3]).
-
-%%%% Application internal exports 
--export([match_tag/2]).
-
--include("asn1_records.hrl").
-
--import(asn1ct_gen, [emit/1,demit/1,get_record_name_prefix/0]).
-
-% the encoding of class of tag bits 8 and 7
--define(UNIVERSAL,   0).
--define(APPLICATION, 16#40).
--define(CONTEXT,     16#80).
--define(PRIVATE,     16#C0).
-
-% primitive or constructed encoding % bit 6
--define(PRIMITIVE,   0).
--define(CONSTRUCTED, 2#00100000).
-
-
-
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%%  Encode/decode SEQUENCE
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-gen_encode_sequence(Erules,Typename,D) when is_record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:new(term),
-    asn1ct_name:new(bytes),
-    
-    %% if EXTERNAL type the input value must be transformed to 
-    %% ASN1 1990 format
-    case Typename of
-	['EXTERNAL'] ->
-	    emit(["   NewVal = asn1rt_check:transform_to_EXTERNAL1990(Val),",
-		  nl]);
-	_ ->
-	    ok
-    end,
-
-    {SeqOrSet,TableConsInfo,CompList0} =
-	case D#type.def of
-	    #'SEQUENCE'{tablecinf=TCI,components=CL} -> 
-		{'SEQUENCE',TCI,CL};
-	    #'SET'{tablecinf=TCI,components=CL} -> 
-		{'SET',TCI,CL}
-	end,
-    %% filter away extensionAdditiongroup markers
-    CompList = filter_complist(CompList0),
-    Ext = extensible(CompList),
-    CompList1 = case CompList of
-		    {Rl1,El,Rl2} -> Rl1 ++ El ++ Rl2;
-		    {Rl,El} -> Rl ++ El;
-		    _ -> CompList
-		end,
-    EncObj =
-	case TableConsInfo of
-	    #simpletableattributes{usedclassfield=Used,
-				   uniqueclassfield=Unique} when Used /= Unique ->
-		false;
-	    %% ObjectSetRef, name of the object set in constraints
-	    %% 
-	    %%{ObjectSetRef,AttrN,N,UniqueFieldName}
-	    #simpletableattributes{objectsetname=ObjectSetRef,
-				   c_name=AttrN,
-				   c_index=N,
-				   usedclassfield=UniqueFieldName,
-				   uniqueclassfield=UniqueFieldName,
-				   valueindex=ValueIndex
-				  } ->
-		OSDef =
-		    case ObjectSetRef of
-			{Module,OSName} ->
-			    asn1_db:dbget(Module,OSName);
-			OSName ->
-			    asn1_db:dbget(get(currmod),OSName)
-		    end,
-%		io:format("currmod: ~p~nOSName: ~p~nAttrN: ~p~nN: ~p~nUniqueFieldName: ~p~n",
-%			  [get(currmod),OSName,AttrN,N,UniqueFieldName]),
-		case (OSDef#typedef.typespec)#'ObjectSet'.gen of
-		    true ->
-% 			Val = lists:concat(["?RT_BER:cindex(",
-% 					    N+1,",Val,"]),
-			ObjectEncode = 
-			    asn1ct_gen:un_hyphen_var(lists:concat(['Obj',
-								   AttrN])),
-			emit({ObjectEncode," = ",nl}),
-			{ObjSetMod,ObjSetName} = 
-			    case ObjectSetRef of
-				{M,O} ->
-				    {{asis,M},O};
-				O ->
-				    {"?MODULE",O}
-			    end,
-			emit({"  ",ObjSetMod,":'getenc_",ObjSetName,"'(",{asis,UniqueFieldName},
-			      ", ",nl}),
-%			emit({indent(35),"?RT_BER:cindex(",N+1,", Val,",
-%			      {asis,AttrN},")),",nl}),
-			Length = fun(X,_LFun) when is_atom(X) -> 
-					 length(atom_to_list(X));
-				    (X,_LFun) when is_list(X) ->
-					 length(X);
-				    ({X1,X2},LFun) ->
-					 LFun(X1,LFun) + LFun(X2,LFun)
-				 end,
-			emit([indent(10+Length(ObjectSetRef,Length)),
-			      "value_match(",{asis,ValueIndex},",",
-			      "?RT_BER:cindex(",N+1,",Val,",
-			      {asis,AttrN},"))),",nl]),
-			notice_value_match(),
-			{AttrN,ObjectEncode};
-		    _ ->
-			false
-		end;
-	    _ ->
-		case D#type.tablecinf of
-		    [{objfun,_}|_] ->
-			%% when the simpletableattributes was at an
-			%% outer level and the objfun has been passed
-			%% through the function call
-			{"got objfun through args","ObjFun"};
-		    _ ->
-			false
-		end
-	end,
-
-    gen_enc_sequence_call(Erules,Typename,CompList1,1,Ext,EncObj),
-
-    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
-	++ 
-	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
-	      number = asn1ct_gen_ber:decode_type(SeqOrSet),
-	      form = ?CONSTRUCTED,
-	      type = 'IMPLICIT'}],
-    emit([nl,"   BytesSoFar = "]),
-    case SeqOrSet of
-	'SET' when (D#type.def)#'SET'.sorted == dynamic ->
-	    emit("asn1rt_check:dynamicsort_SET_components(["),
-	    mkvlist(asn1ct_name:all(encBytes)),
-	    emit(["]),",nl]);
-	_ ->
-	    emit("["),
-	    mkvlist(asn1ct_name:all(encBytes)),
-	    emit(["],",nl])
-    end,
-    emit("  LenSoFar = "),
-    case asn1ct_name:all(encLen) of
-	[] -> emit("0");
-	AllLengths -> 
-	    mkvplus(AllLengths)
-    end,
-    emit([",",nl]),
-% emit(["{TagBytes,Len} = ?RT_BER:encode_tags(TagIn ++ ",
- emit(["  ?RT_BER:encode_tags(TagIn ++ ",
- 		  {asis,MyTag},", BytesSoFar, LenSoFar).",nl]).
-
-
-gen_decode_sequence(Erules,Typename,D) when is_record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:new(tag),
-    #'SEQUENCE'{tablecinf=TableConsInfo,components=CList0} = D#type.def,
-
-    %% filter away extensionAdditiongroup markers
-    CList = filter_complist(CList0),
-
-    Ext = extensible(CList),
-    {CompList,CompList2} = case CList of
-		   {Rl1,El,Rl2} -> {Rl1 ++ El ++ Rl2,CList};
-		   {Rl,El}  -> {Rl ++ El, Rl ++ El};
-		   _ -> {CList,CList}
-	       end,
-
-    emit(["   %%-------------------------------------------------",nl]),
-    emit(["   %% decode tag and length ",nl]),
-    emit(["   %%-------------------------------------------------",nl]),
-
-    asn1ct_name:new(rb),
-    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
-	++ 
-	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
-	      number = asn1ct_gen_ber:decode_type('SEQUENCE'),
-	      form = ?CONSTRUCTED,
-	      type = 'IMPLICIT'}],
-    emit(["   {{_,",asn1ct_gen_ber:unused_var("Len",D#type.def),"},",{next,bytes},",",{curr,rb},
-	  "} = ?RT_BER:check_tags(TagIn ++ ",{asis,MyTag},", ",
-	  {curr,bytes},", OptOrMand), ",nl]),
-    asn1ct_name:new(bytes),
-    asn1ct_name:new(len),
-
-    case CompList of
-	[] -> true;
-	_ ->
-	    emit({"{",{next,bytes},
-		  ",RemBytes} = ?RT_BER:split_list(",
-		  {curr,bytes},
-		  ",", {prev,len},"),",nl}),
-	    asn1ct_name:new(bytes)
-    end,
-    
-    {DecObjInf,UniqueFName,ValueIndex} =
-	case TableConsInfo of
-	    #simpletableattributes{objectsetname=ObjectSet,
-				   c_name=AttrN,
-				   usedclassfield=UniqueFieldName,
-				   uniqueclassfield=UniqueFieldName,
-				   valueindex=ValIndex
-				  } ->
-		F = fun(#'ComponentType'{typespec=CT})->
-			    case {asn1ct_gen:get_constraint(CT#type.constraint,componentrelation),CT#type.tablecinf} of
-%			    case {CT#type.constraint,CT#type.tablecinf} of
-				{no,[{objfun,_}|_R]} -> true;
-				_ -> false
-			    end
-		    end,
-		case lists:any(F,CompList) of
-		    %%AttributeName = asn1ct_gen:un_hyphen_var(AttrN),
-		    true -> % when component relation constraint establish
-			%% relation from a component to another components
-			%% subtype component
-			{{AttrN,{deep,ObjectSet,UniqueFieldName,
-					 ValIndex}},
-			 UniqueFieldName,ValIndex};
-		    false ->
-			{{AttrN,ObjectSet},UniqueFieldName,ValIndex}
-		end;
-	    _ ->
-		{false,false,false}
-	end,
-    RecordName = lists:concat([get_record_name_prefix(),asn1ct_gen:list2rname(Typename)]),
-    case gen_dec_sequence_call(Erules,Typename,CompList2,Ext,DecObjInf) of
-	no_terms -> % an empty sequence	    
-	    emit([nl,nl]),
-	    demit({"Result = "}), %dbg
-	    %% return value as record
-	    asn1ct_name:new(rb),
-	    emit(["   {{'",RecordName,"'}, ",{curr,bytes},",",nl,"    "]),
-	    asn1ct_gen_ber:add_removed_bytes(),
-	    emit(["}.",nl]);
-	{LeadingAttrTerm,PostponedDecArgs} ->
-	    emit([com,nl,nl]),
-	    case {LeadingAttrTerm,PostponedDecArgs} of
-		{[],[]} ->
-		    ok;
-		{_,[]} ->
-		    ok;
-		{[{ObjSet,LeadingAttr,Term}],PostponedDecArgs} ->
-		    DecObj = asn1ct_gen:un_hyphen_var(lists:concat(['DecObj',LeadingAttr,Term])),
-		    ValueMatch = value_match(ValueIndex,Term),
-		    {ObjSetMod,ObjSetName} =
-			case ObjSet of
-			    {M,O} ->
-				{{asis,M},O};
-			    _ ->
-				{"?MODULE",ObjSet}
-			end,
-		    emit([DecObj," =",nl,"   ",ObjSetMod,":'getdec_",ObjSetName,"'(",
-%			  {asis,UniqueFName},", ",Term,"),",nl}),
-			  {asis,UniqueFName},", ",ValueMatch,"),",nl]),
-		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
-	    end,
-	    demit({"Result = "}), %dbg
-	    %% return value as record
-	    asn1ct_name:new(rb),
-	    asn1ct_name:new(bytes),
-	    ExtStatus = case Ext of
-			    {ext,_,_} -> ext;
-			    _ -> noext % noext | extensible
-			end,
-	    emit(["   {",{next,bytes},",",{curr,rb},"} = ?RT_BER:restbytes2(RemBytes, ",
-		  {curr,bytes},",",ExtStatus,"),",nl]),
-	    asn1ct_name:new(rb),
-	    case Typename of
-		['EXTERNAL'] ->
-		    emit(["   OldFormat={'",RecordName,
-			  "', "]),
-		    mkvlist(asn1ct_name:all(term)),
-		    emit(["},",nl]),
-		    emit(["   ASN11994Format =",nl,
-			  "      asn1rt_check:transform_to_EXTERNAL1994",
-			  "(OldFormat),",nl]),
-		    emit(["   {ASN11994Format,",{next,bytes},", "]);
-		_ ->
-		    emit(["   {{'",RecordName,"', "]),
-		    mkvlist(asn1ct_name:all(term)),
-		    emit(["}, ",{next,bytes},", "])
-	    end,
-	    asn1ct_gen_ber:add_removed_bytes(),
-	    emit(["}.",nl])
-    end.
-
-gen_dec_postponed_decs(_,[]) ->
-    emit(nl);
-gen_dec_postponed_decs(DecObj,[{_Cname,{FirstPFN,PFNList},Term,TmpTerm,_Tag,OptOrMand}|Rest]) ->
-%    asn1ct_name:new(term),
-    asn1ct_name:new(tmpterm),
-    asn1ct_name:new(reason),
-
-    emit({"{",Term,", _, _} = ",nl}),
-    N = case OptOrMand of
-	    mandatory -> 0;
-	    'OPTIONAL' -> 
-		emit_opt_or_mand_check(asn1_NOVALUE,TmpTerm),
-		6;
-	    {'DEFAULT',Val} ->
-		emit_opt_or_mand_check(Val,TmpTerm),
-		6
-	end,
-    emit({indent(N+3),"case (catch ",DecObj,"(",{asis,FirstPFN},
-%	  ", ",TmpTerm,", ", {asis,Tag},", ",{asis,PFNList},")) of",nl}),
-	  ", ",TmpTerm,", [], ",{asis,PFNList},")) of",nl}),
-    emit({indent(N+6),"{'EXIT', ",{curr,reason},"} ->",nl}),
-    emit({indent(N+9),"exit({'Type not compatible with table constraint',",
-	  {curr,reason},"});",nl}),
-    emit({indent(N+6),{curr,tmpterm}," ->",nl}),
-    emit({indent(N+9),{curr,tmpterm},nl}),
-
-    case OptOrMand of 
-	mandatory -> emit([indent(N+3),"end,",nl]);
-	_ ->
-	    emit([indent(N+3),"end",nl,
-		  indent(3),"end,",nl])
-    end,
-%    emit({indent(3),"end,",nl}),
-    gen_dec_postponed_decs(DecObj,Rest).
-
-
-emit_opt_or_mand_check(Value,TmpTerm) ->
-    emit([indent(3),"case ",TmpTerm," of",nl,
-	  indent(6),{asis,Value}," -> {",{asis,Value},",[],[]};",nl,
-	  indent(6),"_ ->",nl]).
-
-%%============================================================================
-%%  Encode/decode SET
-%%
-%%============================================================================
-
-gen_encode_set(Erules,Typename,D) when is_record(D,type) ->
-    gen_encode_sequence(Erules,Typename,D).
-
-gen_decode_set(Erules,Typename,D) when is_record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:clear(),
-    asn1ct_name:new(term),
-    asn1ct_name:new(tag),
-    #'SET'{components=TCompList0} = D#type.def,
-
-    %% filter away extensionAdditiongroup markers
-    TCompList = filter_complist(TCompList0),
-    Ext = extensible(TCompList),
-    ToOptional = fun(mandatory) ->
-			 'OPTIONAL';
-		    (X) -> X
-		 end,
-    CompList = case TCompList of
-		   {Rl1,El,Rl2} -> 
-		       Rl1 ++ [X#'ComponentType'{prop=ToOptional(Y)}||X = #'ComponentType'{prop=Y}<-El] ++ Rl2;
-		   {Rl,El} -> Rl ++ El;
-		   _ -> TCompList
-	       end,
-
-    emit(["   %%-------------------------------------------------",nl]),
-    emit(["   %% decode tag and length ",nl]),
-    emit(["   %%-------------------------------------------------",nl]),
-
-    asn1ct_name:new(rb),
-    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
-	++ 
-	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
-	      number = asn1ct_gen_ber:decode_type('SET'),
-	      form = ?CONSTRUCTED,
-	      type = 'IMPLICIT'}],
-    emit(["   {{_,Len},",{next,bytes},",",{curr,rb},
-	  "} = ?RT_BER:check_tags(TagIn ++ ",{asis,MyTag},", ",
-	  {curr,bytes},", OptOrMand), ",nl]),
-    asn1ct_name:new(bytes),
-    asn1ct_name:new(len),
-    asn1ct_name:new(rb),
-
-    emit(["   {SetTerm, SetBytes, ",{curr,rb},"} = ?RT_BER:decode_set(0, Len, ",
-	  {curr,bytes},", OptOrMand, ",
-	  "fun 'dec_",asn1ct_gen:list2name(Typename),"_fun'/2, []),",nl]),
-    
-    asn1ct_name:new(rb),
-    {ExtFlatten1,ExtFlatten2} =
-	case Ext of
-	    noext -> {"",""};
-	    _ -> {"lists:flatten(",")"}
-	end,
-    emit(["   'dec_",asn1ct_gen:list2name(Typename),
-	  "__result__'(lists:sort(",ExtFlatten1,"SetTerm",ExtFlatten2,"), SetBytes, "]),
-    asn1ct_gen_ber:add_removed_bytes(),
-    emit([").",nl,nl,nl]),
-
-    emit({"%%-------------------------------------------------",nl}),
-    emit({"%% Set loop fun for ",asn1ct_gen:list2name(Typename),nl}),
-    emit({"%%-------------------------------------------------",nl}),
-
-    asn1ct_name:clear(),
-    asn1ct_name:new(term),
-    emit(["'dec_",asn1ct_gen:list2name(Typename),"_fun'(",{curr,bytes},
-	  ", OptOrMand) ->",nl]),
-    
-    asn1ct_name:new(bytes),
-    gen_dec_set(Erules,Typename,CompList,1,Ext),
-
-    emit(["      %% tag not found, if extensionmark we should skip bytes here",nl]),
-    emit([indent(6),"_ -> ",nl]),
-    case Ext of
-	noext ->
-	    emit([indent(9),"{[], Bytes,0}",nl]);
-	_ ->
-	    asn1ct_name:new(rbCho),
-	    emit([indent(9),"{RestBytes, ",{curr,rbCho},
-		  "} = ?RT_BER:skipvalue(Bytes),",nl,
-		  indent(9),"{[], RestBytes, ",{curr,rbCho},"}",nl])
-    end,
-    emit([indent(3),"end.",nl,nl,nl]),
-
-
-    emit({"%%-------------------------------------------------",nl}),
-    emit({"%% Result ",asn1ct_gen:list2name(Typename),nl}),
-    emit({"%%-------------------------------------------------",nl}),
-
-    asn1ct_name:clear(),
-    emit({"'dec_",asn1ct_gen:list2name(Typename),"__result__'(",
-	  asn1ct_gen_ber:unused_var("TermList",D#type.def),", Bytes, Rb) ->",nl}),
-    RecordName = lists:concat([get_record_name_prefix(),
-			       asn1ct_gen:list2rname(Typename)]),
-    case gen_dec_set_result(Erules,Typename,CompList) of
-	no_terms -> 	    
-	    %% return value as record
-	    asn1ct_name:new(rb),
-	    emit({"   {{'",RecordName,"'}, Bytes, Rb}.",nl});
-	_ ->
-	    emit({nl,"   case ",{curr,termList}," of",nl}),
-	    emit({"      [] -> {{'",RecordName,"', "}),
-	    mkvlist(asn1ct_name:all(term)),
-	    emit({"}, Bytes, Rb};",nl}),    
-	    emit({"      ExtraAtt -> exit({error,{asn1,{too_many_attributes, ExtraAtt}}})",nl}),
-	    emit({"   end.",nl}),
-	    emit({nl,nl,nl})
-    end.
-
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%%  Encode/decode SEQUENCE OF and SET OF
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-gen_encode_sof(Erules,Typename,_InnerTypename,D) when is_record(D,type) ->
-    asn1ct_name:start(),
-    {SeqOrSetOf, Cont} = D#type.def,
-
-    Objfun = case D#type.tablecinf of
-		 [{objfun,_}|_R] ->
-		     ", ObjFun";
-		 _ ->
-		     ""
-	     end,
-
-    emit({"   {EncBytes,EncLen} = 'enc_",asn1ct_gen:list2name(Typename),
-	  "_components'(Val",Objfun,",[],0),",nl}),
-
-    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
-	++ 
-	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
-	      number = asn1ct_gen_ber:decode_type(SeqOrSetOf),
-	      form = ?CONSTRUCTED,
-	      type = 'IMPLICIT'}],
-%    gen_encode_tags(Erules,MyTag,"EncLen","EncBytes"),
- 	    emit(["   ?RT_BER:encode_tags(TagIn ++ ",
- 		  {asis,MyTag},", EncBytes, EncLen).",nl,nl]),
-
-    gen_encode_sof_components(Erules,Typename,SeqOrSetOf,Cont).
-%     gen_enc_line(Erules,Typename,TypeNameSuffix,Cont,"H",0,
-% 		 mandatory,"{EncBytes,EncLen} = "),
-    
-
-gen_decode_sof(Erules,Typename,_InnerTypename,D) when is_record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:clear(),
-    {SeqOrSetOf, TypeTag, Cont} = 
-	case D#type.def of
-	    {'SET OF',_Cont} -> {'SET OF','SET',_Cont};
-	    {'SEQUENCE OF',_Cont} -> {'SEQUENCE OF','SEQUENCE',_Cont}
-	end,
-    TypeNameSuffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,Cont#type.def),
-    
-    emit({"   %%-------------------------------------------------",nl}),
-    emit({"   %% decode tag and length ",nl}),
-    emit({"   %%-------------------------------------------------",nl}),
-    
-    asn1ct_name:new(rb),
-    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
-	++ 
-	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
-	      number = asn1ct_gen_ber:decode_type(TypeTag),
-	      form = ?CONSTRUCTED,
-	      type = 'IMPLICIT'}],
-    emit(["   {{_,Len},",{next,bytes},",",{curr,rb},
-	  "} = ?RT_BER:check_tags(TagIn ++ ",{asis,MyTag},", ",
-	  {curr,bytes},", OptOrMand), ",nl]),
-
-    emit(["   ?RT_BER:decode_components(",{curr,rb}]),
-    InnerType = asn1ct_gen:get_inner(Cont#type.def),
-    ContName = case asn1ct_gen:type(InnerType) of
-		   Atom when is_atom(Atom) -> Atom;
-		   _ -> TypeNameSuffix
-	       end,
-    emit([", Len, ",{next,bytes},", "]),
-%    NewCont = 
-%	case Cont#type.def of
-%	    {'ENUMERATED',_,Components}-> 
-%		Cont#type{def={'ENUMERATED',Components}};
-%	    _ -> Cont
-%	end,
-     ObjFun =
-	case D#type.tablecinf of
-	    [{objfun,_}|_R] ->
-		", ObjFun";
-	    _ ->
-		[]
-	end,
-    gen_dec_line_sof(Erules,Typename,ContName,Cont,ObjFun),
-    emit([", []).",nl,nl,nl]).
-    
-
-gen_encode_sof_components(Erules,Typename,SeqOrSetOf,Cont) 
-  when is_record(Cont,type)->
-
-    {Objfun,ObjFun_novar,EncObj} = 
-	case Cont#type.tablecinf of
-	    [{objfun,_}|_R] ->
-		{", ObjFun",", _",{no_attr,"ObjFun"}};
-	    _ ->
-		{"","",false}
-	end,
-    emit(["'enc_",asn1ct_gen:list2name(Typename),
-	  "_components'([]",ObjFun_novar,", AccBytes, AccLen) -> ",nl]),
-
-    case catch lists:member(der,get(encoding_options)) of
-	true when SeqOrSetOf=='SET OF' ->
-	    emit([indent(3),
-		  "{asn1rt_check:dynamicsort_SETOF(AccBytes),AccLen};",nl,nl]);
-	_ ->
-	    emit([indent(3),"{lists:reverse(AccBytes),AccLen};",nl,nl])
-    end,
-    emit(["'enc_",asn1ct_gen:list2name(Typename),
-	  "_components'([H|T]",Objfun,",AccBytes, AccLen) ->",nl]),
-    TypeNameSuffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,Cont#type.def),
-    gen_enc_line(Erules,Typename,TypeNameSuffix,Cont,"H",3,
-%		 mandatory,"{EncBytes,EncLen} = ",EncObj),
-		 mandatory,EncObj),
-    emit([",",nl]),
-    emit([indent(3),"'enc_",asn1ct_gen:list2name(Typename),
-	  "_components'(T",Objfun,","]), 
-    emit(["[EncBytes|AccBytes], AccLen + EncLen).",nl,nl]).
-
-%%============================================================================
-%%  Encode/decode CHOICE
-%%
-%%============================================================================
-
-gen_encode_choice(Erules,Typename,D) when is_record(D,type) ->
-    ChoiceTag = D#type.tag,
-    {'CHOICE',CompList} = D#type.def,
-    Ext = extensible(CompList),
-    CompList1 = case CompList of
-		    {Rl1,El,Rl2} -> Rl1 ++ El ++ Rl2;
-		    {Rl,El} -> Rl ++ El;
-		    _ -> CompList
-		end,
-    gen_enc_choice(Erules,Typename,ChoiceTag,CompList1,Ext),
-    emit({nl,nl}).
-
-gen_decode_choice(Erules,Typename,D) when is_record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:new(bytes),
-    ChoiceTag = D#type.tag,
-    {'CHOICE',CompList} = D#type.def,
-    Ext = extensible(CompList),
-    CompList1 = case CompList of
-		    {Rl1,El,Rl2} -> Rl1 ++ El ++Rl2;
-		    {Rl,El} -> Rl ++ El;
-		    _ -> CompList
-		end,
-    gen_dec_choice(Erules,Typename,ChoiceTag,CompList1,Ext),
-    emit({".",nl}).
-
-
-%%============================================================================
-%%  Encode SEQUENCE
-%%
-%%============================================================================
-
-gen_enc_sequence_call(Erules,TopType,[#'ComponentType'{name=Cname,typespec=Type,prop=Prop,textual_order=Order}|Rest],Pos,Ext,EncObj) ->
-    asn1ct_name:new(encBytes),
-    asn1ct_name:new(encLen),
-    CindexPos =
-	case Order of
-	    undefined ->
-		Pos;
-	    _ -> Order % der
-	end,
-    Element = 
-	case TopType of
-	    ['EXTERNAL'] ->
-		io_lib:format("?RT_BER:cindex(~w,NewVal,~w)",[CindexPos+1,Cname]);
-	    _ ->
-		io_lib:format("?RT_BER:cindex(~w,Val,~w)",[CindexPos+1,Cname])
-	end,
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    print_attribute_comment(InnerType,Pos,Prop),
-    gen_enc_line(Erules,TopType,Cname,Type,Element,3,Prop,EncObj),
-    case Rest of
-	[] ->
-	    emit({com,nl});
-	_ ->
-	    emit({com,nl}),
-	    gen_enc_sequence_call(Erules,TopType,Rest,Pos+1,Ext,EncObj)
-    end;
-
-gen_enc_sequence_call(_Erules,_TopType,[],_Num,_,_) ->
-	true.
-
-%%============================================================================
-%%  Decode SEQUENCE
-%%
-%%============================================================================
-
-gen_dec_sequence_call(Erules,TopType,CompList,Ext,DecObjInf) 
-  when is_list(CompList) ->
-    gen_dec_sequence_call1(Erules,TopType, CompList, 1, Ext,DecObjInf,[],[]);
-gen_dec_sequence_call(Erules,TopType,CList,Ext,DecObjInf) ->
-    gen_dec_sequence_call2(Erules,TopType,CList,Ext,DecObjInf).
-
-gen_dec_sequence_call1(Erules,TopType,[#'ComponentType'{name=Cname,typespec=Type,prop=Prop,tags=Tags}|Rest],Num,Ext,DecObjInf,LeadingAttrAcc,ArgsAcc) ->
-    {LA,PostponedDec} = 
-	gen_dec_component(Erules,TopType,Cname,Tags,Type,Num,Prop,
-			  Ext,DecObjInf),
-    case Rest of
-	[] ->
-	    {LA ++ LeadingAttrAcc,PostponedDec ++ ArgsAcc};
-	_ ->
-	    emit({com,nl}),
-%	    asn1ct_name:new(term),
-	    asn1ct_name:new(bytes),
-	    gen_dec_sequence_call1(Erules,TopType,Rest,Num+1,Ext,DecObjInf,
-				   LA++LeadingAttrAcc,PostponedDec++ArgsAcc)
-    end;
-
-gen_dec_sequence_call1(_Erules,_TopType,[],1,_,_,_,_) ->
-    no_terms.
-
-gen_dec_sequence_call2(_Erules,_TopType,{[],[],[]},_Ext,_DecObjInf) ->
-    no_terms;
-gen_dec_sequence_call2(Erules,TopType,{Root1,EList,Root2},_Ext,DecObjInf) ->
-    {LA,ArgsAcc} =
-	case gen_dec_sequence_call1(Erules,TopType,Root1++EList,1,
-				    extensible({Root1,EList}),DecObjInf,[],[]) of
-	    no_terms ->
-		{[],[]};
-	    Res -> Res
-	end,
-    %% TagList is the tags of Root2 elements from the first up to and
-    %% including the first mandatory element.
-    TagList = get_root2_taglist(Root2,[]),
-    emit({com,nl}),
-    asn1ct_name:new(bytes),
-    emit(["  {",{next,bytes},", ",{next,rb},
-	  "} = ?RT_BER:skip_ExtensionAdditions(",
-	  {curr,bytes},", ",{asis,TagList},"),",nl]),
-    asn1ct_name:new(rb),
-    asn1ct_name:new(bytes),
-    gen_dec_sequence_call1(Erules,TopType,Root2,
-			   length(Root1)+length(EList),noext,
-			   DecObjInf,LA,ArgsAcc).
-	
-%% returns a list of tags of the elements in the component (second
-%% root) list up to and including the first mandatory tag. See 24.6 in
-%% X.680 (7/2002)
-get_root2_taglist([],Acc) ->
-    lists:reverse(Acc);
-get_root2_taglist([#'ComponentType'{prop=Prop,typespec=Type}|Rest],Acc) ->
-    FirstTag = fun([])->[];
-		  ([H|_T])->H#tag{class=asn1ct_gen_ber:decode_class(H#tag.class)}
-	       end(Type#type.tag),
-    case Prop of
-	mandatory ->
-	    %% match_tags/ may be used
-	    %% this is the last tag of interest -> return
-	    lists:reverse([FirstTag|Acc]);
-	_ ->
-	    get_root2_taglist(Rest,[FirstTag|Acc])
-    end.
-
-
-%%----------------------------
-%%SEQUENCE mandatory
-%%----------------------------
-
-gen_dec_component(Erules,TopType,Cname,CTags,Type,Pos,Prop,Ext,DecObjInf) ->
-    InnerType = 
-	case Type#type.def of
-	    #'ObjectClassFieldType'{type=OCFTType} -> OCFTType;
-	    _ -> asn1ct_gen:get_inner(Type#type.def)
-	end,
-
-    Prop1 = case {Prop,Ext} of
-		{_,{ext,Epos,_Root2pos}} when Pos < Epos ->
-		    Prop;
-		{mandatory,{ext,Epos,_}} when Pos >= Epos ->
-		    'OPTIONAL';
-		_ ->
-		    Prop
-	    end,
-    print_attribute_comment(InnerType,Pos,Prop1),
-    emit("   "),
-    
-    case {InnerType,DecObjInf} of
-	{{typefield,_},NotFalse} when NotFalse /= false ->
-	    asn1ct_name:new(term),
-	    asn1ct_name:new(tmpterm),
-	    emit({"{",{curr,tmpterm},", ",{next,bytes},",",{next,rb},"} = "});
-	{{objectfield,_,_},_} ->
-	    asn1ct_name:new(term),
-	    asn1ct_name:new(tmpterm),
-	    emit({"{",{curr,tmpterm},", ",{next,bytes},",",{next,rb},"} = "});
-	_ ->
-	    asn1ct_name:new(term),
-	    emit({"{",{curr,term},",",{next,bytes},",",{next,rb},"} = "})
-    end,
-    asn1ct_name:new(rb),
-    PostponedDec = 
-	gen_dec_line(Erules,TopType,Cname,CTags,Type,Prop1,DecObjInf),
-    asn1ct_name:new(form),
-    PostponedDec.
-
-
-%%-------------------------------------
-%%  Decode SET
-%%-------------------------------------
-
-gen_dec_set(Erules,TopType,CompList,Pos,Ext) ->
-    ExtCatch = case Ext of
-		   noext ->"";
-		   _ -> " catch"
-	       end,
-    TagList = get_all_choice_tags(CompList),
-    emit({indent(3),
-	  {curr,tagList}," = ",{asis,TagList},",",nl}),
-    emit({indent(3),
-	  "case",ExtCatch," ?RT_BER:check_if_valid_tag(Bytes, ",
-	  {curr,tagList},", OptOrMand) of",nl}),
-    asn1ct_name:new(tagList),
-    asn1ct_name:new(rbCho),
-    asn1ct_name:new(choTags),
-    gen_dec_set_cases(Erules,TopType,CompList,TagList,Pos),
-    asn1ct_name:new(tag),
-    asn1ct_name:new(bytes).
-
-
-
-gen_dec_set_cases(_,_,[],_,_) ->
-    ok;
-gen_dec_set_cases(Erules,TopType,[H|T],List,Pos) ->
-    Name = H#'ComponentType'.name,
-    Type = H#'ComponentType'.typespec,
-    
-    emit({indent(6),"'",Name,"' ->",nl}),
-    case Type#type.def of
-	{'CHOICE',_NewCompList} -> 
-	    gen_dec_set_cases_choice(Erules,TopType,H,Pos);
-	_ ->
-	    gen_dec_set_cases_type(Erules,TopType,H,Pos)
-    end,
-    gen_dec_set_cases(Erules,TopType,T,List,Pos+1).
-
-
-
-gen_dec_set_cases_choice(_Erules,TopType,H,Pos) ->
-    Cname = H#'ComponentType'.name,
-    Tag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}
-	   || X <- (H#'ComponentType'.typespec)#type.tag],
-    asn1ct_name:new(rbCho),
-    emit({indent(9),"{Dec, Rest, ",{curr,rbCho},"} = "}),
-    emit({"'dec_",asn1ct_gen:list2name([Cname|TopType]),
-	  "'(Bytes,OptOrMand,",{asis,Tag},"),",nl}),
-    emit(["      {{",Pos,",Dec}, Rest, ",{curr,rbCho},"}"]),
-    emit([";",nl,nl]).
-
-
-gen_dec_set_cases_type(Erules,TopType,H,Pos) ->
-    Cname = H#'ComponentType'.name,
-    Type = H#'ComponentType'.typespec,
-    %% always use Prop = mandatory here    Prop = H#'ComponentType'.prop,
-
-    asn1ct_name:new(rbCho),
-    emit({indent(9),"{Dec, Rest, ",{curr,rbCho},"} = "}),
-    asn1ct_name:delete(bytes),
-    %% we have already seen the tag so now we must find the value 
-    %% that why we always use 'mandatory' here
-    gen_dec_line(Erules,TopType,Cname,[],Type,mandatory,decObjInf), 
-    asn1ct_name:new(bytes),
-    
-    emit([",",nl]),
-    emit(["{{",Pos,",Dec}, Rest, ",{curr,rbCho},"}"]),
-    emit([";",nl,nl]).
-
-
-%%---------------------------------
-%%  Decode SET result
-%%---------------------------------
-
-gen_dec_set_result(Erules,TopType,CompList) ->
-    gen_dec_set_result1(Erules,TopType, CompList, 1).
-
-gen_dec_set_result1(Erules,TopType,
-		   [#'ComponentType'{name=Cname,
-				     typespec=Type,
-				     prop=Prop}|Rest],Num) ->
-    gen_dec_set_component(Erules,TopType,Cname,Type,Num,Prop),
-    case Rest of
-	[] ->
-	    true;
-	_ ->
-	    gen_dec_set_result1(Erules,TopType,Rest,Num+1)
-    end;
-
-gen_dec_set_result1(_Erules,_TopType,[],1) ->
-    no_terms;
-gen_dec_set_result1(_Erules,_TopType,[],_Num) ->
-    true.
-
-
-gen_dec_set_component(_Erules,_TopType,_Cname,Type,Pos,Prop) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    print_attribute_comment(InnerType,Pos,Prop),
-    emit({"   {",{next,term},com,{next,termList},"} =",nl}),
-    emit({"      case ",{curr,termList}," of",nl}),
-    emit({"          [{",Pos,com,{curr,termTmp},"}|",
-	  {curr,rest},"] -> "}),
-    emit({"{",{curr,termTmp},com,
-	  {curr,rest},"};",nl}),
-    case Prop of
-	'OPTIONAL' ->
-	    emit([indent(10),"_ -> {asn1_NOVALUE, ",{curr,termList},"}",nl]);
-	{'DEFAULT', DefVal} ->
-	    emit([indent(10),
-		  "_ -> {",{asis,DefVal},", ",{curr,termList},"}",nl]);
-	mandatory ->
-	    emit([indent(10),
-		  "_ -> exit({error,{asn1,{mandatory_attribute_no, ",
-		  Pos,", missing}}})",nl])
-    end,
-    emit([indent(6),"end,",nl]),
-    asn1ct_name:new(rest),
-    asn1ct_name:new(term),
-    asn1ct_name:new(termList),    
-    asn1ct_name:new(termTmp).    
-    
-
-%%---------------------------------------------
-%%  Encode CHOICE
-%%---------------------------------------------
-%% for BER we currently do care (a little) if the choice has an EXTENSIONMARKER
-
-
-gen_enc_choice(Erules,TopType,Tag,CompList,_Ext) ->
-    gen_enc_choice1(Erules,TopType,Tag,CompList,_Ext).
-
-gen_enc_choice1(Erules,TopType,Tag,CompList,_Ext) ->
-    asn1ct_name:clear(),
-    emit({"   {EncBytes,EncLen} = case element(1,Val) of",nl}),
-    gen_enc_choice2(Erules,TopType,CompList),
-    emit([nl,"   end,",nl,nl]),
-    NewTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- Tag],
-%    gen_encode_tags(Erules,NewTag,"EncLen","EncBytes").
-   emit(["?RT_BER:encode_tags(TagIn ++",{asis,NewTag},", EncBytes, EncLen).",nl]).
-
-
-
-gen_enc_choice2(Erules,TopType,[H1|T]) when is_record(H1,'ComponentType') ->
-    Cname = H1#'ComponentType'.name,
-    Type = H1#'ComponentType'.typespec,
-    emit({"      ",{asis,Cname}," ->",nl}),
-    {Encobj,Assign} =
-% 	case asn1ct_gen:get_constraint(Type#type.constraint,
-% 				       tableconstraint_info) of
-	case {Type#type.def,asn1ct_gen:get_constraint(Type#type.constraint,
-						      componentrelation)} of
-	    {#'ObjectClassFieldType'{},{componentrelation,_,_}} ->
-		asn1ct_name:new(tmpBytes),
-		asn1ct_name:new(encBytes),
-		asn1ct_name:new(encLen),
-		Emit = ["{",{curr,tmpBytes},", _} = "],
-		{{no_attr,"ObjFun"},Emit};
-	    _ ->
-		case Type#type.tablecinf of
-		    [{objfun,_}] -> {{no_attr,"ObjFun"},[]};
-		    _->	{false,[]}
-		end
-	end,
-    gen_enc_line(Erules,TopType,Cname,Type,"element(2,Val)",9,
-		 mandatory,Assign,Encobj),
-    case {Type#type.def,Encobj} of
-	{#'ObjectClassFieldType'{},{no_attr,"ObjFun"}} ->
-	    emit({",",nl,indent(9),"{",{curr,encBytes},", ",
-		  {curr,encLen},"}"});
-	_ -> ok
-    end,
-    emit({";",nl}),
-    case T of 
-	[] ->
-	    emit([indent(6), "Else -> ",nl,
-		  indent(9),"exit({error,{asn1,{invalid_choice_type,Else}}})"]);
-	_ ->
-	    true
-    end,
-    gen_enc_choice2(Erules,TopType,T);
-
-gen_enc_choice2(_,_,[])  ->
-    true.
-
-
-
-
-%%--------------------------------------------
-%%  Decode CHOICE
-%%--------------------------------------------
-
-gen_dec_choice(Erules,TopType, ChTag, CompList, Ext) ->
-    asn1ct_name:delete(bytes),
-    Tags = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- ChTag],
-    
-    emit(["   {{_,Len},",{next,bytes},
-	  ", RbExp} = ?RT_BER:check_tags(TagIn++",
-	  {asis,Tags},", ",
-	  {curr,bytes},", OptOrMand),",nl]),
-    asn1ct_name:new(bytes),
-    asn1ct_name:new(len),
-    gen_dec_choice_indef_funs(Erules),
-    case Erules of
-	ber_bin ->
-	    emit([indent(3),"case ",{curr,bytes}," of",nl]);
-	ber ->
-	    emit([indent(3),
-		  "case (catch ?RT_BER:peek_tag(",{curr,bytes},")) of",nl])
-    end,
-    asn1ct_name:new(tagList),
-    asn1ct_name:new(choTags),
-    gen_dec_choice_cases(Erules,TopType,CompList),
-    case Ext of
-	noext ->
-	    emit([indent(6), {curr,else}," -> ",nl]),
-	    emit([indent(9),"case OptOrMand of",nl,
-		  indent(12),"mandatory ->","exit({error,{asn1,",
-		  "{invalid_choice_tag,",{curr,else},"}}});",nl,
-		  indent(12),"_ ->","exit({error,{asn1,{no_optional_tag,",
-		  {curr,else},"}}})",nl,
-		  indent(9),"end",nl]);
-	_ ->
-	    emit([indent(6),"_ -> ",nl]),
-	    emit([indent(9),"{{asn1_ExtAlt,",{curr,bytes},"},",
-		  empty_lb(Erules),", RbExp}",nl])
-    end,
-    emit([indent(3),"end"]),
-    asn1ct_name:new(tag),
-    asn1ct_name:new(else).
-
-gen_dec_choice_indef_funs(Erules) ->
-    emit({indent(3),"IndefEndBytes = fun(indefinite,",indefend_match(Erules,used_var),
-	  ")-> R; (_,B)-> B end,",nl}),
-    emit({indent(3),"IndefEndRb = fun(indefinite,",indefend_match(Erules,unused_var),
-	  ")-> 2; (_,_)-> 0 end,",nl}).
-
-
-gen_dec_choice_cases(_,_, []) ->
-    ok;
-gen_dec_choice_cases(Erules,TopType, [H|T]) ->
-    asn1ct_name:push(rbCho),
-    Name = H#'ComponentType'.name,
-    emit([nl,"%% '",Name,"'",nl]),
-    Fcases  = fun([T1,T2|Tail],Fun) ->		      
-		      emit([indent(6),match_tag(Erules,T1)," ->",nl]),
-		      gen_dec_choice_cases_type(Erules,TopType, H),
-		      Fun([T2|Tail],Fun);
-		 ([T1],_) ->
-		      emit([indent(6),match_tag(Erules,T1)," ->",nl]),
-		      gen_dec_choice_cases_type(Erules,TopType, H)
-	      end,
-    Fcases(H#'ComponentType'.tags,Fcases),
-    asn1ct_name:pop(rbCho),
-    gen_dec_choice_cases(Erules,TopType, T).
-
-
-
-gen_dec_choice_cases_type(Erules,TopType,H) ->
-    Cname = H#'ComponentType'.name,
-    Type = H#'ComponentType'.typespec,
-    Prop = H#'ComponentType'.prop,
-    emit({indent(9),"{Dec, Rest, ",{curr,rbCho},"} = "}),
-    gen_dec_line(Erules,TopType,Cname,[],Type,Prop,false),
-    emit([",",nl,indent(9),"{{",{asis,Cname},
-	  ", Dec}, IndefEndBytes(Len,Rest), RbExp + ",
-	  {curr,rbCho}," + IndefEndRb(Len,Rest)};",nl,nl]).
-
-encode_tag_val(Erules,{Class,TagNo}) when is_integer(TagNo) ->
-    Rtmod = rtmod(Erules),
-    Rtmod:encode_tag_val({asn1ct_gen_ber:decode_class(Class),
-				  0,TagNo});
-encode_tag_val(Erules,{Class,TypeName}) ->
-    Rtmod = rtmod(Erules),
-    Rtmod:encode_tag_val({asn1ct_gen_ber:decode_class(Class),
-				  0,asn1ct_gen_ber:decode_type(TypeName)}).
-
-
-match_tag(ber_bin,Arg) ->
-    match_tag_with_bitsyntax(Arg);
-match_tag(Erules,Arg) ->
-    io_lib:format("~p",[encode_tag_val(Erules,Arg)]).
-
-match_tag_with_bitsyntax({Class,TagNo}) when is_integer(TagNo) ->
-    match_tag_with_bitsyntax1({asn1ct_gen_ber:decode_class(Class),
-				  0,TagNo});
-match_tag_with_bitsyntax({Class,TypeName}) ->
-    match_tag_with_bitsyntax1({asn1ct_gen_ber:decode_class(Class),
-				  0,asn1ct_gen_ber:decode_type(TypeName)}).
-
-match_tag_with_bitsyntax1({Class, _Form, TagNo}) when (TagNo =< 30) -> 
-    io_lib:format("<<~p:2,_:1,~p:5,_/binary>>",[Class bsr 6,TagNo]);
-
-match_tag_with_bitsyntax1({Class, _Form, TagNo}) -> 
-    {Octets,Len} = mk_object_val(TagNo),
-    OctForm = case Len of
-		 1 -> "~p";
-		 2 -> "~p,~p";
-		 3 -> "~p,~p,~p";
-		 4 -> "~p,~p,~p,~p"
-	     end,
-    io_lib:format("<<~p:2,_:1,31:5," ++ OctForm ++ ",_/binary>>",
-		  [Class bsr 6] ++ Octets). 
-
-%%%%%%%%%%% 
-%% mk_object_val(Value) -> {OctetList, Len} 
-%% returns a Val as a list of octets, the 8 bit is allways set to one except 
-%% for the last octet, where its 0 
-%% 
-
- 
-mk_object_val(Val) when Val =< 127 -> 
-    {[255 band Val], 1}; 
-mk_object_val(Val) -> 
-    mk_object_val(Val bsr 7, [Val band 127], 1).  
-mk_object_val(0, Ack, Len) -> 
-    {Ack, Len}; 
-mk_object_val(Val, Ack, Len) -> 
-    mk_object_val(Val bsr 7, [((Val band 127) bor 128) | Ack], Len + 1). 
- 
- 
-get_all_choice_tags(ComponentTypeList) ->
-    get_all_choice_tags(ComponentTypeList,[]).
-
-get_all_choice_tags([],TagList) ->
-    TagList;
-get_all_choice_tags([H|T],TagList)  ->
-    Tags = H#'ComponentType'.tags,
-    get_all_choice_tags(T, TagList ++ [{H#'ComponentType'.name, Tags}]).
-
-
-
-%%---------------------------------------
-%% Generate the encode/decode code 
-%%---------------------------------------
-
-gen_enc_line(Erules,TopType,Cname,
-	     Type=#type{constraint=C,
-			def=#'ObjectClassFieldType'{type={typefield,_}}},
-	     Element,Indent,OptOrMand=mandatory,EncObj)
-  when is_list(Element) ->
-    case asn1ct_gen:get_constraint(C,componentrelation) of
-	{componentrelation,_,_} ->
-	    asn1ct_name:new(tmpBytes),
-	    gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,
-			 ["{",{curr,tmpBytes},",_} = "],EncObj);
-	_ ->
-	    gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,
-			 ["{",{curr,encBytes},",",{curr,encLen},"} = "],
-			 EncObj)
-    end;
- gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,EncObj) 
-   when is_list(Element) ->
-     gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,
- 		 ["{",{curr,encBytes},",",{curr,encLen},"} = "],EncObj).
-
-gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,Assign,EncObj)
-  when is_list(Element) ->
-    IndDeep = indent(Indent),
-
-    Tag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}
-	   || X <- Type#type.tag],
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    WhatKind = asn1ct_gen:type(InnerType),
-    emit(IndDeep),
-    emit(Assign),
-    gen_optormand_case(OptOrMand,Erules,TopType,Cname,Type,InnerType,WhatKind,
-		       Element),
-    case {Type,asn1ct_gen:get_constraint(Type#type.constraint,
-					 componentrelation)} of
-	{#type{def=#'ObjectClassFieldType'{type={typefield,_},
-					   fieldname=RefedFieldName}},
-	 {componentrelation,_,_}} ->
-	    {_LeadingAttrName,Fun} = EncObj,
-	    case RefedFieldName of
-		{Name,RestFieldNames} when is_atom(Name),Name =/= notype ->
-		    case OptOrMand of
-			mandatory -> ok;
-			_ ->
-			    emit(["{",{curr,tmpBytes},", _} = "])
-		    end,
-		    emit({Fun,"(",{asis,Name},", ",Element,", [], ",
-			  {asis,RestFieldNames},"),",nl}),
-		    emit(IndDeep),
-		    case OptOrMand of
-			mandatory ->
-			    emit({"{",{curr,encBytes},", ",{curr,encLen},"} = "}),
-			    emit({"?RT_BER:encode_open_type(",{curr,tmpBytes},
-				  ",",{asis,Tag},")"});
-			_ ->
-			    emit({"{",{next,tmpBytes},", ",{curr,tmpLen},
-				  "} = "}),
-			    emit({"?RT_BER:encode_open_type(",{curr,tmpBytes},
-				  ",",{asis,Tag},"),",nl}),
-			    emit(IndDeep),
-			    emit({"{",{next,tmpBytes},", ",{curr,tmpLen},"}"})
-		    end;
-		Err ->
-		    throw({asn1,{'internal error',Err}})
-	    end;
-	_ ->
-	    case WhatKind of
-		{primitive,bif} ->
-		    EncType =
-			case Type#type.def of
-			    #'ObjectClassFieldType'{
-					     type={fixedtypevaluefield,
-						   _,Btype}} ->
-				Btype;
-			    _ ->
-				Type
-			end,
-		    asn1ct_gen_ber:gen_encode_prim(ber,EncType,{asis,Tag},
-						   Element);
-		'ASN1_OPEN_TYPE' ->
-		    asn1ct_gen_ber:gen_encode_prim(ber,Type#type{def='ASN1_OPEN_TYPE'},{asis,Tag},Element);
-		_ ->
-		    {EncFunName, _, _} = 
-			mkfuncname(TopType,Cname,WhatKind,enc),
-		    case {WhatKind,Type#type.tablecinf,EncObj} of
-			{{constructed,bif},[{objfun,_}|_R],{_,Fun}} ->
-			    emit([EncFunName,"(",Element,", ",{asis,Tag},
-				  ", ",Fun,")"]);
-			_ ->
-			    emit([EncFunName,"(",Element,", ",{asis,Tag},")"])
-		    end
-	    end
-    end,
-    case OptOrMand of
-	mandatory -> true;
-	_ ->
-	    emit({nl,indent(7),"end"})
-    end.
-
-
-
-gen_optormand_case(mandatory,_,_,_,_,_,_, _) ->
-    ok;
-gen_optormand_case('OPTIONAL',Erules,_,_,_,_,_,Element) ->
-    emit({" case ",Element," of",nl}),
-    emit({indent(9),"asn1_NOVALUE -> {",
-	  empty_lb(Erules),",0};",nl}),
-    emit({indent(9),"_ ->",nl,indent(12)});
-gen_optormand_case({'DEFAULT',DefaultValue},Erules,TopType,Cname,Type,
-		   InnerType,WhatKind,Element) ->
-    CurrMod = get(currmod),
-    case catch lists:member(der,get(encoding_options)) of
-	true ->
-	    emit(" case catch "),
-	    asn1ct_gen:gen_check_call(TopType,Cname,Type,InnerType,
-				      WhatKind,{asis,DefaultValue},
-				      Element),
-	    emit({" of",nl}),
-	    emit({indent(12),"true -> {[],0};",nl});
-	_ ->
-	    emit({" case ",Element," of",nl}),
-	    emit({indent(9),"asn1_DEFAULT -> {",
-		  empty_lb(Erules),
-		  ",0};",nl}),
-	    case DefaultValue of 
-		#'Externalvaluereference'{module=CurrMod,
-					  value=V} ->
-		    emit({indent(9),"?",{asis,V}," -> {",
-			  empty_lb(Erules),",0};",nl});
-		_ ->
-		    emit({indent(9),{asis,
-				     DefaultValue}," -> {",
-			  empty_lb(Erules),",0};",nl})
-	    end
-    end,
-    emit({indent(9),"_ ->",nl,indent(12)}).
-
-    
-
-
-gen_dec_line_sof(Erules,TopType,Cname,Type,ObjFun) ->
-
-    Tag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}
-	   || X <- Type#type.tag],    
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    WhatKind = asn1ct_gen:type(InnerType),
-    case WhatKind of
-	{primitive,bif} ->
-	    asn1ct_name:delete(len),
-
-	    asn1ct_name:new(len),
-	    emit(["fun(FBytes,_,_)->",nl]),
-	    EncType = case Type#type.def of
-			    #'ObjectClassFieldType'{
-					     type={fixedtypevaluefield,
-						   _,Btype}} ->
-				Btype;
-			    _ ->
-				Type
-		      end,
-	    asn1ct_gen_ber:gen_dec_prim(ber,EncType,"FBytes",Tag,
-					[],no_length,?PRIMITIVE,
-					mandatory),
-	    emit([nl,"end, []"]);
-	_ ->
-	    case ObjFun of
-		[] ->
-		    {DecFunName, _, _} = 
-			mkfunname(Erules,TopType,Cname,WhatKind,dec,3),
-		    emit([DecFunName,", ",{asis,Tag}]);
-		_ ->
-		    {DecFunName, _, _} = 
-			mkfunname(Erules,TopType,Cname,WhatKind,dec,4),
-		    emit([DecFunName,", ",{asis,Tag},", ObjFun"])
-	    end
-    end.
-    
-
-gen_dec_line(Erules,TopType,Cname,CTags,Type,OptOrMand,DecObjInf)  ->
-    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
-    Tag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}
-	   || X <- Type#type.tag],
-    InnerType = 
-	case Type#type.def of
-	    #'ObjectClassFieldType'{type=OCFTType} ->
-		OCFTType;
-	    _ ->
-		asn1ct_gen:get_inner(Type#type.def)
-	end,
-    PostpDec = 
-	case OptOrMand of
-	    mandatory ->
-		gen_dec_call(InnerType,Erules,TopType,Cname,Type,
-			     BytesVar,Tag,mandatory,", mandatory, ",
-			     DecObjInf,OptOrMand);
-	    _ -> %optional or default
-		case {CTags,Erules} of
-		    {[CTag],ber_bin} when CTag =/= [] -> % R9C-0.patch-34
-			emit(["case ",{curr,bytes}," of",nl]),
-			emit([match_tag(Erules,CTag)," ->",nl]),
-			PostponedDec = 
-			    gen_dec_call(InnerType,Erules,TopType,Cname,Type,
-					 BytesVar,Tag,mandatory,
-					 ", opt_or_default, ",DecObjInf,
-					 OptOrMand),
-			emit([";",nl]),
-			emit(["_ ->",nl]),
-			case OptOrMand of
-			    {'DEFAULT', Def} ->
-				emit(["{",{asis,Def},",",
-				      BytesVar,", 0 }",nl]);
-			    'OPTIONAL' ->
-				emit(["{ asn1_NOVALUE, ",
-				      BytesVar,", 0 }",nl])
-			end,
-			emit("end"),
-			PostponedDec;
-		    _ ->
-			emit("case (catch "),
-			PostponedDec = 
-			    gen_dec_call(InnerType,Erules,TopType,Cname,Type,
-					 BytesVar,Tag,OptOrMand,
-					 ", opt_or_default, ",DecObjInf,
-					 OptOrMand),
-			emit([") of",nl]),
-			case OptOrMand of
-			    {'DEFAULT', Def} ->
-				emit(["{'EXIT',{error,{asn1,{no_optional_tag,_}}}}",
-				      " -> {",{asis,Def},",",
-				      BytesVar,", 0 };",nl]);
-			    'OPTIONAL' ->
-				emit(["{'EXIT',{error,{asn1,{no_optional_tag,_}}}}",
-				      " -> { asn1_NOVALUE, ",
-				      BytesVar,", 0 };",nl])
-			end,
-			asn1ct_name:new(casetmp),
-			emit([{curr,casetmp},"-> ",{curr,casetmp},nl,"end"]),
-			PostponedDec
-		end
-	end,
-    case DecObjInf of
-	{Cname,ObjSet} -> % this must be the component were an object is 
-	    %% choosen from the object set according to the table 
-	    %% constraint.
-	    ObjSetName = case ObjSet of
-			     {deep,OSName,_,_} ->
-				 OSName;
-			     _ -> ObjSet
-			 end,
-	    {[{ObjSetName,Cname,asn1ct_gen:mk_var(asn1ct_name:curr(term))}],
-	     PostpDec};
-	_  -> {[],PostpDec}
-    end.
-
-
-gen_dec_call({typefield,_},Erules,_,_,Type,_,Tag,_,_,false,_) ->
-    %%  this in case of a choice with typefield components
-    asn1ct_name:new(reason),
-    {FirstPFName,RestPFName} = 
-% 	asn1ct_gen:get_constraint(Type#type.constraint,
-% 				  tableconstraint_info),
-	(Type#type.def)#'ObjectClassFieldType'.fieldname,
-    emit([nl,indent(6),"begin",nl]),
-    emit([indent(9),"{OpenDec,TmpRest,TmpRbCho} =",nl,indent(12),
-	  "?RT_BER:decode_open_type(",Erules,",",{curr,bytes},",",
-	  {asis,Tag},"),",nl]),
-    emit([indent(9),"case (catch ObjFun(",{asis,FirstPFName},
-	  ", OpenDec, [], ",{asis,RestPFName},
-	  ")) of", nl]),%% ??? What about Tag 
-    emit([indent(12),"{'EXIT',",{curr,reason},"} ->",nl]),
-%%    emit({indent(15),"throw({runtime_error,{'Type not ",
-%%	  "compatible with tableconstraint', OpenDec}});",nl}),
-    emit([indent(15),"exit({'Type not ",
-	  "compatible with table constraint', ",{curr,reason},"});",nl]),
-    emit([indent(12),"{TmpDec,_ ,_} ->",nl]),
-    emit([indent(15),"{TmpDec, TmpRest, TmpRbCho}",nl]),
-    emit([indent(9),"end",nl,indent(6),"end",nl]),
-    [];
-gen_dec_call({typefield,_},_Erules,_,Cname,Type,_BytesVar,Tag,_,_,
-	     _DecObjInf,OptOrMandComp) ->
-    emit(["?RT_BER:decode_open_type(",{curr,bytes},",",{asis,Tag},")"]),
-    RefedFieldName = 
-	(Type#type.def)#'ObjectClassFieldType'.fieldname,
-% 	asn1ct_gen:get_constraint(Type#type.constraint,
-% 				  tableconstraint_info),
-    [{Cname,RefedFieldName,
-      asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-%      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),[],OptOrMandComp}];
-      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
-gen_dec_call({objectfield,PrimFieldName,PFNList},_Erules,_,Cname,_,_,Tag,_,_,_,
-	     OptOrMandComp) ->
-    emit(["?RT_BER:decode_open_type(",{curr,bytes},",",{asis,Tag},")"]),
-    [{Cname,{PrimFieldName,PFNList},
-      asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-%      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),[],OptOrMandComp}];
-      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
-gen_dec_call(InnerType,Erules,TopType,Cname,Type,BytesVar,Tag,PrimOptOrMand,
-	     OptOrMand,DecObjInf,_) ->
-    WhatKind = asn1ct_gen:type(InnerType),
-    gen_dec_call1(WhatKind,InnerType,Erules,TopType,Cname,Type,BytesVar,Tag,
-		  PrimOptOrMand,OptOrMand),
-    case DecObjInf of
-	{Cname,{_,OSet,UniqueFName,ValIndex}} ->
-	    Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-	    ValueMatch = value_match(ValIndex,Term),
-	    {ObjSetMod,ObjSetName} =
-		case OSet of
-		    {M,O} ->
-			{{asis,M},O};
-		    _ ->
-			{"?MODULE",OSet}
-		end,
-	    emit({",",nl,"ObjFun = ",ObjSetMod,":'getdec_",ObjSetName,"'(",
-		  {asis,UniqueFName},", ",ValueMatch,")"});
-	_ ->
-	    ok
-    end,
-    [].
-gen_dec_call1({primitive,bif},InnerType,Erules,_,_,Type,BytesVar,
-	      Tag,OptOrMand,_) ->
-    case InnerType of
-	{fixedtypevaluefield,_,Btype} ->
-	    asn1ct_gen_ber:gen_dec_prim(Erules,Btype,BytesVar,Tag,[],no_length,
-					?PRIMITIVE,OptOrMand);
-	_ ->
-	    asn1ct_gen_ber:gen_dec_prim(Erules,Type,BytesVar,Tag,[],no_length,
-					?PRIMITIVE,OptOrMand)
-    end;
-gen_dec_call1('ASN1_OPEN_TYPE',_InnerType,Erules,_,_,Type,BytesVar,
-	      Tag,OptOrMand,_) ->
-    asn1ct_gen_ber:gen_dec_prim(Erules,Type#type{def='ASN1_OPEN_TYPE'},
-				BytesVar,Tag,[],no_length,
-				?PRIMITIVE,OptOrMand);
-gen_dec_call1(WhatKind,_,_Erules,TopType,Cname,Type,_,Tag,_,OptOrMand) ->
-    {DecFunName,_,_} = 
-	mkfuncname(TopType,Cname,WhatKind,dec),
-    case {WhatKind,Type#type.tablecinf} of
-	{{constructed,bif},[{objfun,_}|_R]} ->
-	    emit({DecFunName,"(",{curr,bytes},OptOrMand,{asis,Tag},", ObjFun)"});
-	_ ->
-	    emit({DecFunName,"(",{curr,bytes},OptOrMand,{asis,Tag},")"})
-    end.
-
-
-%%------------------------------------------------------
-%% General and special help functions (not exported)
-%%------------------------------------------------------
-
-
-indent(N) ->
-    lists:duplicate(N,32). % 32 = space
-
-
-mkvlist([H,T1|T], Sep) -> % Sep is a string e.g ", " or "+ "
-    emit([{var,H},Sep]),
-    mkvlist([T1|T], Sep);
-mkvlist([H|T], Sep) ->
-    emit([{var,H}]),
-    mkvlist(T, Sep);
-mkvlist([], _) ->
-    true.
-
-mkvlist(L) ->
-    mkvlist(L,", ").
-
-mkvplus(L) ->
-    mkvlist(L," + ").
-
-extensible(CompList) when is_list(CompList) ->
-    noext;
-extensible({RootList,ExtList}) ->
-    {ext,length(RootList)+1,length(ExtList)};
-extensible({_Rl1,_ExtL,_Rl2}) ->
-    extensible.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% filter away ExtensionAdditionGroup start and end marks since these
-%% have no significance for the BER encoding
-%%
-filter_complist(CompList) when is_list(CompList) ->
-    lists:filter(fun(#'ExtensionAdditionGroup'{}) ->
-			 false;
-		    ('ExtensionAdditionGroupEnd') ->
-			 false;
-		    (_) ->
-			 true
-		 end, CompList);
-filter_complist({Root,Ext}) ->
-    {Root,filter_complist(Ext)};
-filter_complist({Root1,Ext,Root2}) ->
-    {Root1,filter_complist(Ext),Root2}.
-
-print_attribute_comment(InnerType,Pos,Prop) ->
-    CommentLine = "%%-------------------------------------------------",
-    emit([nl,CommentLine]),
-    case InnerType of
-	{typereference,_,Name} -> 
-	    emit([nl,"%% attribute number ",Pos," with type ",Name]);
-	{'Externaltypereference',_,XModule,Name} -> 
-	    emit([nl,"%% attribute number ",Pos,"   External ",XModule,":",Name]);
-	_ ->
-	    emit([nl,"%% attribute number ",Pos," with type ",InnerType])
-    end,
-    case Prop of
-	mandatory ->
-	    continue;
-	{'DEFAULT', Def} ->
-	    emit([" DEFAULT = ",{asis,Def}]);
-	'OPTIONAL' ->
-	    emit([" OPTIONAL"])
-    end,
-    emit([nl,CommentLine,nl]).
-
-
-mkfuncname(TopType,Cname,WhatKind,DecOrEnc) ->
-    CurrMod = get(currmod),
-    case WhatKind of
-	#'Externaltypereference'{module=CurrMod,type=EType} ->
-	    F = lists:concat(["'",DecOrEnc,"_",EType,"'"]),
-	    {F, "?MODULE", F};
-	#'Externaltypereference'{module=Mod,type=EType} ->
-	    {lists:concat(["'",Mod,"':'",DecOrEnc,"_",EType,"'"]),Mod,
-	     lists:concat(["'",DecOrEnc,"_",EType,"'"])};
-	{constructed,bif} ->
-	    F = lists:concat(["'",DecOrEnc,"_",asn1ct_gen:list2name([Cname|TopType]),"'"]),
-	    {F, "?MODULE", F}
-    end.
-
-mkfunname(Erule,TopType,Cname,WhatKind,DecOrEnc,Arity) ->
-    CurrMod = get(currmod),
-    case WhatKind of
-	#'Externaltypereference'{module=CurrMod,type=EType} ->
-	    F = lists:concat(["fun '",DecOrEnc,"_",EType,"'/",Arity]),
-	    {F, "?MODULE", F};
-	#'Externaltypereference'{module=Mod,type=EType} ->
-	    {lists:concat(["fun '",Mod,"':'",DecOrEnc,"_",EType,"'/",Arity]),Mod,
-	     lists:concat(["'",DecOrEnc,"_",EType,"'"])};
-	{constructed,bif} ->
-	    F =
-		lists:concat(["fun '",DecOrEnc,"_",
-			      asn1ct_gen:list2name([Cname|TopType]),"'/",
-			      Arity]),
-	    {F, "?MODULE", F};
-	'ASN1_OPEN_TYPE' ->
-	    case Arity of
-		3 ->
-		    F = lists:concat(["fun(A,_,C) -> ?RT_BER:decode_open_type(",Erule,",A,C) end"]),
-		    {F, "?MODULE", F};
-		4 ->
-		    F = lists:concat(["fun(A,_,C,_) -> ?RT_BER:decode_open_type(",Erule,",A,C) end"]),
-		    {F, "?MODULE", F}
-	    end
-    end.
-
-empty_lb(ber) ->
-    "[]";
-empty_lb(ber_bin) ->
-    "<<>>".
-
-rtmod(ber) ->
-    list_to_atom(?RT_BER_BIN);
-rtmod(ber_bin) ->
-    list_to_atom(?RT_BER_BIN).
-
-indefend_match(ber,used_var) ->
-    "[0,0|R]";
-indefend_match(ber,unused_var) ->
-    "[0,0|_R]";
-indefend_match(ber_bin,used_var) ->
-    "<<0,0,R/binary>>";
-indefend_match(ber_bin,unused_var) ->
-    "<<0,0,_R/binary>>".
-
-notice_value_match() ->
-    Module = get(currmod),
-    put(value_match,{true,Module}).
-    
-value_match(Index,Value) when is_atom(Value) ->
-    value_match(Index,atom_to_list(Value));
-value_match([],Value) ->
-    Value;
-value_match([{VI,_Cname}|VIs],Value) ->
-    value_match1(Value,VIs,lists:concat(["element(",VI,","]),1).
-value_match1(Value,[],Acc,Depth) ->
-    Acc ++ Value ++ lists:concat(lists:duplicate(Depth,")"));
-value_match1(Value,[{VI,_Cname}|VIs],Acc,Depth) ->
-    value_match1(Value,VIs,Acc++lists:concat(["element(",VI,","]),Depth+1).
diff --git a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
index 2c4b44996d..78cb9297d8 100644
--- a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
@@ -32,7 +32,6 @@
 -include("asn1_records.hrl").
 
 -import(asn1ct_gen, [emit/1,demit/1,get_record_name_prefix/0]).
--import(asn1ct_constructed_ber,[match_tag/2]).
 
 -define(ASN1CT_GEN_BER,asn1ct_gen_ber_bin_v2).
 
@@ -913,7 +912,7 @@ gen_dec_choice_cases(Erules,TopType, [H|T]) ->
 					     [DecTag],Type}),
 	    asn1ct:update_gen_state(namelist,Names),
 	    emit([indent(4),{curr,res}," = ",
-		  match_tag(ber_bin,{FirstT#tag.class,FirstT#tag.number}),
+		  match_tag(FirstT#tag.class, FirstT#tag.number),
 		  " -> ",nl]),
 	    emit([indent(8),"{",{asis,Cname},", {'",
 		  asn1ct_gen:list2name([Cname|TopType]),"',",
@@ -928,7 +927,25 @@ gen_dec_choice_cases(Erules,TopType, [H|T]) ->
     end,
     gen_dec_choice_cases(Erules,TopType, T).
 
+match_tag(Class, TagNo) when is_integer(TagNo) ->
+    match_tag1(asn1ct_gen_ber_bin_v2:decode_class(Class), TagNo).
 
+match_tag1(Class, TagNo) when TagNo =< 30 ->
+    io_lib:format("<<~p:2,_:1,~p:5,_/binary>>", [Class bsr 6,TagNo]);
+match_tag1(Class, TagNo) ->
+    Octets = mk_object_val(TagNo),
+    io_lib:format("<<~p:2,_:1,31:5,~s,_/binary>>", [Class bsr 6,Octets]).
+
+mk_object_val(Val) when Val < 16#80 ->
+    integer_to_list(Val);
+mk_object_val(Val) ->
+    mk_object_val(Val bsr 7, [integer_to_list(Val band 16#7F)]).
+
+mk_object_val(0, Acc) ->
+    Acc;
+mk_object_val(Val, Acc) ->
+    I = integer_to_list((Val band 16#7F) bor 16#80),
+    mk_object_val(Val bsr 7, [I,","|Acc]).
 
 %%---------------------------------------
 %% Generate the encode/decode code 
@@ -1493,10 +1510,6 @@ mkfuncname(TopType,Cname,WhatKind,Prefix,Suffix) ->
     end.
 
 empty_lb(ber) ->
-    "[]";
-empty_lb(ber_bin) ->
-    "<<>>";
-empty_lb(ber_bin_v2) ->
     "<<>>".
 
 value_match(Index,Value) when is_atom(Value) ->
diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl
index e07680f10b..e4e0e064e8 100644
--- a/lib/asn1/src/asn1ct_constructed_per.erl
+++ b/lib/asn1/src/asn1ct_constructed_per.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -80,9 +80,7 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
 		  "compiler warning for unused vars!",nl,
 		  "_Val = ",{curr,val},",",nl]);
 	{[],_,_} ->
-	    emit([{next,val}," = ?RT_PER:list_to_record("]),
-	    emit(["'",asn1ct_gen:list2rname(Typename),"'"]),
-	    emit([", ",{curr,val},"),",nl]);
+	    emit([{next,val}," = ",{curr,val},",",nl]);
 	{_,_,true} ->
 	    gen_fixoptionals(Optionals),
 	    FixOpts = param_map(fun(Var) ->
@@ -100,20 +98,26 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
     case Ext of
 	{ext,_,NumExt} when NumExt > 0 ->
 	    case extgroup_pos_and_length(CompList) of
-		{extgrouppos,ExtGroupPos,ExtGroupLen} ->
-		    Elements = make_elements(ExtGroupPos+1,
-					     "Val1",lists:seq(1,ExtGroupLen)),
-		    emit([
-			  {next,val}," = case [X || X <- [",Elements,
-			  "],X =/= asn1_NOVALUE] of",nl,
-			  "[] -> ",{curr,val},";",nl,
-			  "_ -> setelement(",{asis,ExtGroupPos+1},",",
-			  {curr,val},",",
-			  "{extaddgroup,", Elements,"})",nl,
-			  "end,",nl]),
-		    asn1ct_name:new(val);
-		_ -> % no extensionAdditionGroup
-		    ok
+		{extgrouppos,[]} -> % no extenstionAdditionGroup
+		    ok;
+		{extgrouppos,ExtGroupPosLenList} ->
+		    ExtGroupFun = 
+			fun({ExtActualGroupPos,ExtGroupVirtualPos,ExtGroupLen}) ->
+				Elements = 
+				    make_elements(ExtGroupVirtualPos+1,
+						  "Val1",
+						  lists:seq(1,ExtGroupLen)),
+				emit([
+				      {next,val}," = case [X || X <- [",Elements,
+				      "],X =/= asn1_NOVALUE] of",nl,
+				      "[] -> ",{curr,val},";",nl,
+				      "_ -> setelement(",{asis,ExtActualGroupPos+1},",",
+				      {curr,val},",",
+				      "{extaddgroup,", Elements,"})",nl,
+				      "end,",nl]),
+				asn1ct_name:new(val)
+			end,
+		    lists:foreach(ExtGroupFun,ExtGroupPosLenList)
 	    end,
 	    asn1ct_name:new(tmpval),
 	    emit(["Extensions = ?RT_PER:fixextensions(",{asis,Ext},",",
@@ -149,7 +153,7 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
 			emit([ObjectEncode," = ",nl]),
 			emit(["  ",ObjSetMod,":'getenc_",ObjSetName,"'(",
 			      {asis,UniqueFieldName},", ",nl]),
-			El = make_element(N+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),AttrN),
+			El = make_element(N+1,asn1ct_gen:mk_var(asn1ct_name:curr(val))),
 
 			Length = fun(X,_LFun) when is_atom(X) -> 
 					 length(atom_to_list(X));
@@ -279,9 +283,9 @@ gen_decode_constructed(Erules,Typename,D) when is_record(D,type) ->
 			{false,false,false}
 		end
 	end,
-    NewCompList = wrap_compList(CompList),
+%%    NewCompList = wrap_compList(CompList),
     {AccTerm,AccBytes} =
-	gen_dec_components_call(Erules,Typename,NewCompList,MaybeComma2,DecObjInf,Ext,length(Optionals)),
+	gen_dec_components_call(Erules,Typename,CompList,MaybeComma2,DecObjInf,Ext,length(Optionals)),
     case asn1ct_name:all(term) of
 	[] -> emit(MaybeComma2); % no components at all
 	_ -> emit({com,nl})
@@ -577,8 +581,7 @@ gen_encode_sof_components(Erule,Typename,SeqOrSetOf,Cont) ->
     
     Conttype = asn1ct_gen:get_inner(Cont#type.def),
     Currmod = get(currmod),
-    Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per,
-					  asn1ct_gen:rt2ct_suffix()])),
+    Ctgenmod = asn1ct_gen:ct_gen_module(Erule),
     case asn1ct_gen:type(Conttype) of
 	{primitive,bif} ->
 	    gen_encode_prim_wrapper(Ctgenmod,Erule,Cont,false,"H");
@@ -616,8 +619,7 @@ gen_decode_sof_components(Erule,Typename,SeqOrSetOf,Cont) ->
     Constructed_Suffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,
 						       Cont#type.def),
     Conttype = asn1ct_gen:get_inner(Cont#type.def),
-    Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per,
-					  asn1ct_gen:rt2ct_suffix()])),
+    Ctgenmod = asn1ct_gen:ct_gen_module(Erule),
     CurrMod = get(currmod),
     case asn1ct_gen:type(Conttype) of
 	{primitive,bif} ->
@@ -689,24 +691,28 @@ ext_length([],_,Acc) ->
     Acc.
 
 extgroup_pos_and_length(CompList) when is_list(CompList) ->
-    noextgroup;
+    {extgrouppos,[]};
 extgroup_pos_and_length({RootList,ExtList}) ->
-    extgrouppos(ExtList,length(RootList)+1);
-extgroup_pos_and_length({Rl1,Ext,_Rl2}) ->
-    extgrouppos(Ext,length(Rl1)+1).
-
-extgrouppos([{'ExtensionAdditionGroup',_Num}|T],Pos) ->
-    extgrouppos(T,Pos,0);
-extgrouppos([_|T],Pos) ->
-    extgrouppos(T,Pos+1);
-extgrouppos([],_) ->
-    noextgroup.
-
-extgrouppos(['ExtensionAdditionGroupEnd'|_T],Pos,Len) ->
-    {extgrouppos,Pos,Len};
-extgrouppos([_|T],Pos,Len) ->
-    extgrouppos(T,Pos,Len+1).
-    
+    ActualPos = length(RootList) +1,
+    %% position to get and deliver data in the record to the user
+    VirtualPos = ActualPos,
+    %% position to encode/decode the extaddgroup as an opentype sequence
+    extgrouppos(ExtList,ActualPos,VirtualPos,[]);
+extgroup_pos_and_length({RootList,ExtList,_Rl2}) ->
+    extgroup_pos_and_length({RootList,ExtList}).
+
+extgrouppos([{'ExtensionAdditionGroup',_Num}|T],ActualPos,VirtualPos,Acc) ->
+    extgrouppos(T,ActualPos,VirtualPos,0,Acc);
+extgrouppos([_|T],ActualPos,VirtualPos,Acc) ->
+    extgrouppos(T,ActualPos+1,VirtualPos+1,Acc);
+extgrouppos([],_,_,Acc) ->
+    {extgrouppos,lists:reverse(Acc)}.
+
+extgrouppos(['ExtensionAdditionGroupEnd'|T],ActualPos,VirtualPos,Len,Acc) ->
+    extgrouppos(T,ActualPos+1,VirtualPos+Len,[{ActualPos,VirtualPos,Len}|Acc]);
+extgrouppos([_|T],ActualPos,VirtualPos,Len,Acc) ->
+    extgrouppos(T,ActualPos,VirtualPos,Len+1,Acc).
+
 
 
 gen_dec_extension_value(_) ->
@@ -817,19 +823,21 @@ add_textual_order1(Cs,NumIn) ->
 		   end,
 		   NumIn,Cs).
 
-gen_enc_components_call(Erule,TopType,{Root1,ExtList,Root2},MaybeComma,DynamicEnc,Ext) ->
-    gen_enc_components_call(Erule,TopType,{Root1++Root2,ExtList},MaybeComma,DynamicEnc,Ext);
-gen_enc_components_call(Erule,TopType,{CompList,ExtList},MaybeComma,DynamicEnc,Ext) ->
+gen_enc_components_call(Erule,TopType,{Root,ExtList},MaybeComma,DynamicEnc,Ext) ->
+    gen_enc_components_call(Erule,TopType,{Root,ExtList,[]},MaybeComma,DynamicEnc,Ext);
+gen_enc_components_call(Erule,TopType,CL={Root,ExtList,Root2},MaybeComma,DynamicEnc,Ext) ->
     %% The type has extensionmarker
-    Rpos = gen_enc_components_call1(Erule,TopType,CompList,1,MaybeComma,DynamicEnc,noext),
+    Rpos = gen_enc_components_call1(Erule,TopType,Root++Root2,1,MaybeComma,DynamicEnc,noext),
     case Ext of
 	{ext,_,ExtNum} when ExtNum > 0 ->
 	    emit([nl,
 		  ",Extensions",nl]);
+
 	_ -> true
     end,
     %handle extensions
-    NewExtList = wrap_extensionAdditionGroups(ExtList),
+    {extgrouppos,ExtGroupPosLen}  = extgroup_pos_and_length(CL),
+    NewExtList = wrap_extensionAdditionGroups(ExtList,ExtGroupPosLen),
     gen_enc_components_call1(Erule,TopType,NewExtList,Rpos,MaybeComma,DynamicEnc,Ext);
 gen_enc_components_call(Erule,TopType, CompList, MaybeComma, DynamicEnc, Ext) ->
     %% The type has no extensionmarker
@@ -877,7 +885,7 @@ gen_enc_components_call1(_Erule,_TopType,[],Pos,_,_,_) ->
 	Pos.
 
 gen_enc_component_default(Erule,TopType,Cname,Type,Pos,DynamicEnc,Ext,DefaultVal) ->
-    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),Cname),
+    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val))),
     emit({"case ",Element," of",nl}),
 %    emit({"asn1_DEFAULT -> [];",nl}),
     emit({"DFLT when DFLT == asn1_DEFAULT; DFLT == ",{asis,DefaultVal}," -> [];",nl}),
@@ -897,7 +905,7 @@ gen_enc_component_optional(Erule,TopType,Cname,
 					components=_ExtGroupCompList}},
 			   Pos,DynamicEnc,Ext) when is_integer(Number) ->
 
-    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),Cname),
+    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val))),
     emit({"case ",Element," of",nl}),
 
     emit({"asn1_NOVALUE -> [];",nl}),
@@ -910,7 +918,7 @@ gen_enc_component_optional(Erule,TopType,Cname,
     gen_enc_line(Erule,TopType,Cname,Type,NextElement, Pos,DynamicEnc,Ext),
     emit({nl,"end"});
 gen_enc_component_optional(Erule,TopType,Cname,Type,Pos,DynamicEnc,Ext) ->
-    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),Cname),
+    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val))),
     emit({"case ",Element," of",nl}),
 
     emit({"asn1_NOVALUE -> [];",nl}),
@@ -930,15 +938,14 @@ gen_enc_component_mandatory(Erule,TopType,Cname,Type,Pos,DynamicEnc,Ext) ->
     gen_enc_line(Erule,TopType,Cname,Type,[],Pos,DynamicEnc,Ext).
 
 gen_enc_line(Erule,TopType, Cname, Type, [], Pos,DynamicEnc,Ext) ->
-    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),Cname),
+    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val))),
     gen_enc_line(Erule,TopType,Cname,Type,Element, Pos,DynamicEnc,Ext);
 gen_enc_line(Erule,TopType,Cname,Type,Element, _Pos,DynamicEnc,Ext) ->
-    Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per,
-					  asn1ct_gen:rt2ct_suffix()])),
+    Ctgenmod = asn1ct_gen:ct_gen_module(Erule),
     Atype = 
 	case Type of
 	    #type{def=#'ObjectClassFieldType'{type=InnerType}} ->
-		InnerType;
+		InnerType;  
 	    _  ->
 		asn1ct_gen:get_inner(Type#type.def)
 	end,
@@ -948,6 +955,7 @@ gen_enc_line(Erule,TopType,Cname,Type,Element, _Pos,DynamicEnc,Ext) ->
 	    emit(["?RT_PER:encode_open_type(dummy,?RT_PER:complete("]);
 	_ -> true
     end,
+
     case Atype of
 	{typefield,_} ->
 	    case DynamicEnc of
@@ -1023,20 +1031,22 @@ gen_enc_line(Erule,TopType,Cname,Type,Element, _Pos,DynamicEnc,Ext) ->
 	    emit("))");
 	_ -> true
     end.
-gen_dec_components_call(Erule,TopType,{Root1,ExtList,Root2},MaybeComma,DecInfObj,Ext,NumberOfOptionals) ->
-    gen_dec_components_call(Erule,TopType,{Root1++Root2,ExtList},MaybeComma,DecInfObj,Ext,NumberOfOptionals);
-gen_dec_components_call(Erule,TopType,{CompList,ExtList},MaybeComma,
+gen_dec_components_call(Erule,TopType,{Root,ExtList},MaybeComma,
 			DecInfObj,Ext,NumberOfOptionals) ->
+    gen_dec_components_call(Erule,TopType,{Root,ExtList,[]},MaybeComma,DecInfObj,Ext,NumberOfOptionals);
+gen_dec_components_call(Erule,TopType,CL={Root1,ExtList,Root2},MaybeComma,DecInfObj,Ext,NumberOfOptionals) ->
     %% The type has extensionmarker
-    OptTable = create_optionality_table(CompList),
+
+    OptTable = create_optionality_table(Root1++Root2),
     {Rpos,AccTerm,AccBytes} = 
-	gen_dec_components_call1(Erule,TopType, CompList, 1, OptTable, 
+	gen_dec_components_call1(Erule,TopType, Root1++Root2, 1, OptTable, 
 				 MaybeComma,DecInfObj,noext,[],[],
 				 NumberOfOptionals),
     emit([",",nl,"{Extensions,",{next,bytes},"} = "]),
     emit(["?RT_PER:getextension(Ext,",{curr,bytes},"),",nl]),
     asn1ct_name:new(bytes),
-    NewExtList = wrap_extensionAdditionGroups(ExtList),
+    {extgrouppos,ExtGroupPosLen}  = extgroup_pos_and_length(CL),
+    NewExtList = wrap_extensionAdditionGroups(ExtList,ExtGroupPosLen),
     {_Epos,AccTermE,AccBytesE} = 
 	gen_dec_components_call1(Erule,TopType,NewExtList,Rpos, OptTable,
 				 "",DecInfObj,Ext,[],[],NumberOfOptionals),
@@ -1199,8 +1209,7 @@ gen_dec_component_no_val({ext,_,_},mandatory) ->
     
 
 gen_dec_line(Erule,TopType,Cname,Type,Pos,DecInfObj,Ext,Prop)  ->
-    Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per,
-					  asn1ct_gen:rt2ct_suffix()])),
+    Ctgenmod = asn1ct_gen:ct_gen_module(Erule),
     Atype = 
 	case Type of
 	    #type{def=#'ObjectClassFieldType'{type=InnerType}} ->
@@ -1233,8 +1242,7 @@ gen_dec_line(Erule,TopType,Cname,Type,Pos,DecInfObj,Ext,Prop)  ->
 			      "} = ?RT_PER:decode_open_type(",{curr,bytes},
 			      ", []),",nl]),
 			emit([indent(2),"case (catch ObjFun(",
-			      {asis,Name},
-			      ",",{curr,tmpterm},",telltype,",
+			      {asis,Name},",",{curr,tmpterm},",telltype,",
 			      {asis,RestFieldNames},")) of", nl]),
 			emit([indent(4),"{'EXIT',",{curr,reason},"} ->",nl]),
 			emit([indent(6),"exit({'Type not ",
@@ -1564,22 +1572,17 @@ gen_encode_prim_wrapper(CtgenMod,Erule,Cont,DoTag,Value) ->
 make_elements(I,Val,ExtCnames) ->
     make_elements(I,Val,ExtCnames,[]).
 
-make_elements(I,Val,[ExtCname],Acc)-> % the last one, no comma needed
-    Element = make_element(I,Val,ExtCname),
+make_elements(I,Val,[_ExtCname],Acc)-> % the last one, no comma needed
+    Element = make_element(I, Val),
     make_elements(I+1,Val,[],[Element|Acc]);
-make_elements(I,Val,[ExtCname|Rest],Acc)->
-    Element = make_element(I,Val,ExtCname),
+make_elements(I,Val,[_ExtCname|Rest],Acc)->
+    Element = make_element(I, Val),
     make_elements(I+1,Val,Rest,[", ",Element|Acc]);
 make_elements(_I,_,[],Acc) ->
     lists:reverse(Acc).
 
-make_element(I,Val,Cname) ->
-    case tuple_notation_allowed() of
-	true ->
-	    io_lib:format("?RT_PER:cindex(~w,~s,~w)",[I,Val,Cname]);
-	_ ->
-	    io_lib:format("element(~w,~s)",[I,Val])
-    end.
+make_element(I, Val) ->
+    io_lib:format("element(~w,~s)", [I,Val]).
 
 emit_extaddgroupTerms(VarSeries,[_]) ->
     asn1ct_name:new(VarSeries),
@@ -1596,49 +1599,47 @@ flat_complist({Rl1,El,Rl2}) -> Rl1 ++ El ++ Rl2;
 flat_complist({Rl,El}) -> Rl ++ El;
 flat_complist(CompList) -> CompList.
 
-wrap_compList({Root1,Ext,Root2}) ->
-    {Root1,wrap_extensionAdditionGroups(Ext),Root2};
-wrap_compList({Root1,Ext}) ->
-    {Root1,wrap_extensionAdditionGroups(Ext)};
-wrap_compList(CompList) ->
-    CompList.
+%%wrap_compList({Root1,Ext,Root2}) ->
+%%    {Root1,wrap_extensionAdditionGroups(Ext),Root2};
+%%wrap_compList({Root1,Ext}) ->
+%%    {Root1,wrap_extensionAdditionGroups(Ext)};
+%%wrap_compList(CompList) ->
+%%    CompList.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Will convert all componentTypes following 'ExtensionAdditionGroup'
 %%  up to the matching 'ExtensionAdditionGroupEnd' into one componentType
 %% of type SEQUENCE with the componentTypes as components
 %%
-wrap_extensionAdditionGroups(ExtCompList) ->
-    wrap_extensionAdditionGroups(ExtCompList,[],0).
+wrap_extensionAdditionGroups(ExtCompList,ExtGroupPosLen) ->
+    wrap_extensionAdditionGroups(ExtCompList,ExtGroupPosLen,[],0,0).
 
-wrap_extensionAdditionGroups([{'ExtensionAdditionGroup',_Number}|Rest],Acc,0) ->
-    {ExtGroupCompList=
-     [#'ComponentType'{textual_order=TextPos}|_],
-     ['ExtensionAdditionGroupEnd'|Rest2]} =
+wrap_extensionAdditionGroups([{'ExtensionAdditionGroup',_Number}|Rest],
+			     [{ActualPos,_,_}|ExtGroupPosLenRest],Acc,_ExtAddGroupDiff,ExtGroupNum) ->
+    {ExtGroupCompList,['ExtensionAdditionGroupEnd'|Rest2]} =
 	lists:splitwith(fun(#'ComponentType'{}) -> true;
 			   (_) -> false
 			end,
 			Rest),
-    wrap_extensionAdditionGroups(Rest2,
+    wrap_extensionAdditionGroups(Rest2,ExtGroupPosLenRest,
 				 [#'ComponentType'{
-                                  name='ExtAddGroup', % FIXME: handles ony one ExtAddGroup
-                                  typespec=#type{def=#'SEQUENCE'{
-						   extaddgroup=1,% FIXME: handles only one
+				     name=list_to_atom("ExtAddGroup"++
+							integer_to_list(ExtGroupNum+1)), 
+				     typespec=#type{def=#'SEQUENCE'{
+						   extaddgroup=ExtGroupNum+1,
 						   components=ExtGroupCompList}},
-                                  textual_order = TextPos,
-				  prop='OPTIONAL'}|Acc],length(ExtGroupCompList)-1);
-wrap_extensionAdditionGroups([H=#'ComponentType'{textual_order=Tord}|T],Acc,ExtAddGroupDiff) when is_integer(Tord) ->
-    wrap_extensionAdditionGroups(T,[H#'ComponentType'{
-				      textual_order=Tord - ExtAddGroupDiff}|Acc],ExtAddGroupDiff);
-wrap_extensionAdditionGroups([H|T],Acc,ExtAddGroupDiff) ->
-    wrap_extensionAdditionGroups(T,[H|Acc],ExtAddGroupDiff);
-wrap_extensionAdditionGroups([],Acc,_) ->
+				     textual_order = ActualPos,
+				     prop='OPTIONAL'}|Acc],length(ExtGroupCompList)-1,
+				 ExtGroupNum+1);
+wrap_extensionAdditionGroups([H=#'ComponentType'{textual_order=Tord}|T],
+			     ExtAddGrpLenPos,Acc,ExtAddGroupDiff,ExtGroupNum) when is_integer(Tord) ->
+    wrap_extensionAdditionGroups(T,ExtAddGrpLenPos,[H#'ComponentType'{
+				      textual_order=Tord - ExtAddGroupDiff}|Acc],ExtAddGroupDiff,ExtGroupNum);
+wrap_extensionAdditionGroups([H|T],ExtAddGrpLenPos,Acc,ExtAddGroupDiff,ExtGroupNum) ->
+    wrap_extensionAdditionGroups(T,ExtAddGrpLenPos,[H|Acc],ExtAddGroupDiff,ExtGroupNum);
+wrap_extensionAdditionGroups([],_,Acc,_,_) ->
     lists:reverse(Acc).
 
 
-tuple_notation_allowed() ->
-    Options = get(encoding_options),
-    not (lists:member(optimize,Options) orelse lists:member(uper_bin,Options)).
-
 wrap_gen_dec_line(Erule,C,TopType,Cname,Type,Pos,DIO,Ext) ->
     put(component_type,{true,C}),
     gen_dec_line(Erule,TopType,Cname,Type,Pos,DIO,Ext,mandatory),
@@ -1667,7 +1668,5 @@ notice_value_match() ->
     Module = get(currmod),
     put(value_match,{true,Module}).
     
-is_optimized(per_bin) ->
-    lists:member(optimize,get(encoding_options));
-is_optimized(_Erule) ->
-    false.
+is_optimized(per) -> true;
+is_optimized(uper) -> false.
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index fda4e1c6d9..b0990e92cf 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -37,8 +37,7 @@
 	 gen_check_call/7,
 	 get_constraint/2,
 	 insert_once/2,
-	 rt2ct_suffix/1,
-	 rt2ct_suffix/0,
+	 ct_gen_module/1,
 	 index2suffix/1,
 	 get_record_name_prefix/0]).
 -export([pgen/5,
@@ -52,7 +51,7 @@
 %% pgen(Outfile, Erules, Module, TypeOrVal, Options)
 %% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
 %% .hrl file is only generated if necessary
-%% Erules = per | ber | ber_bin | per_bin
+%% Erules = per | ber
 %% Module = atom()
 %% TypeOrVal = {TypeList,ValueList}
 %% TypeList = ValueList = [atom()]
@@ -83,7 +82,7 @@ pgen_module(OutFile,Erules,Module,
     pgen_exports(Erules,Module,TypeOrVal),
     pgen_dispatcher(Erules,Module,TypeOrVal),
     pgen_info(),
-    pgen_typeorval(wrap_ber(Erules),Module,N2nConvEnums,TypeOrVal),
+    pgen_typeorval(Erules,Module,N2nConvEnums,TypeOrVal),
     pgen_partial_incomplete_decode(Erules),
 % gen_vars(asn1_db:mod_to_vars(Module)),
 % gen_tag_table(AllTypes),
@@ -92,8 +91,7 @@ pgen_module(OutFile,Erules,Module,
 
 
 pgen_typeorval(Erules,Module,N2nConvEnums,{Types,Values,_Ptypes,_Classes,Objects,ObjectSets}) ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-				       rt2ct_suffix(Erules)])),
+    Rtmod = ct_gen_module(Erules),
     pgen_types(Rtmod,Erules,N2nConvEnums,Module,Types),
     pgen_values(Erules,Module,Values),
     pgen_objects(Rtmod,Erules,Module,Objects),
@@ -129,28 +127,39 @@ pgen_types(Rtmod,Erules,N2nConvEnums,Module,[H|T]) ->
     end,
     pgen_types(Rtmod,Erules,N2nConvEnums,Module,T).
 
+%% Enumerated type with extension marker
 pgen_n2nconversion(_Erules,#typedef{name=TypeName,typespec=#type{def={'ENUMERATED',{NN1,NN2}}}}) ->
     NN = NN1 ++ NN2,
-    pgen_name2numfunc(TypeName,NN),
-    pgen_num2namefunc(TypeName,NN);
+    pgen_name2numfunc(TypeName,NN, extension_marker),
+    pgen_num2namefunc(TypeName,NN, extension_marker);
+%% Without extension marker
+pgen_n2nconversion(_Erules,#typedef{name=TypeName,typespec=#type{def={'ENUMERATED',NN}}}) ->
+    pgen_name2numfunc(TypeName,NN, no_extension_marker),
+    pgen_num2namefunc(TypeName,NN, no_extension_marker);
 pgen_n2nconversion(_Erules,_) ->
     true.
 
-pgen_name2numfunc(_TypeName,[]) ->
+pgen_name2numfunc(_TypeName,[], _) ->
     true;
-pgen_name2numfunc(TypeName,[{Atom,Number}]) ->
+pgen_name2numfunc(TypeName,[{Atom,Number}], extension_marker) ->
+    emit(["name2num_",TypeName,"(",{asis,Atom},") ->",Number,";",nl]),
+    emit(["name2num_",TypeName,"({asn1_enum, Num}) -> Num.",nl,nl]);
+pgen_name2numfunc(TypeName,[{Atom,Number}], _) ->
     emit(["name2num_",TypeName,"(",{asis,Atom},") ->",Number,".",nl,nl]);
-pgen_name2numfunc(TypeName,[{Atom,Number}|NNRest]) ->
+pgen_name2numfunc(TypeName,[{Atom,Number}|NNRest], EM) ->
     emit(["name2num_",TypeName,"(",{asis,Atom},") ->",Number,";",nl]),
-    pgen_name2numfunc(TypeName,NNRest).
+    pgen_name2numfunc(TypeName,NNRest, EM).
 
-pgen_num2namefunc(_TypeName,[]) ->
+pgen_num2namefunc(_TypeName,[], _) ->
     true;
-pgen_num2namefunc(TypeName,[{Atom,Number}]) ->
+pgen_num2namefunc(TypeName,[{Atom,Number}], extension_marker) ->
+    emit(["num2name_",TypeName,"(",Number,") ->",{asis,Atom},";",nl]),
+    emit(["num2name_",TypeName,"(ExtensionNum) -> {asn1_enum, ExtensionNum}.",nl,nl]);
+pgen_num2namefunc(TypeName,[{Atom,Number}], _) ->
     emit(["num2name_",TypeName,"(",Number,") ->",{asis,Atom},".",nl,nl]);
-pgen_num2namefunc(TypeName,[{Atom,Number}|NNRest]) ->
+pgen_num2namefunc(TypeName,[{Atom,Number}|NNRest], EM) ->
     emit(["num2name_",TypeName,"(",Number,") ->",{asis,Atom},";",nl]),
-    pgen_num2namefunc(TypeName,NNRest).
+    pgen_num2namefunc(TypeName,NNRest, EM).
 
 pgen_objects(_,_,_,[]) ->
     true;
@@ -185,7 +194,7 @@ pgen_check_defaultval(Erules,Module) ->
     end,
     gen_check_defaultval(Erules,Module,CheckObjects).
 
-pgen_partial_decode(Rtmod,Erule,Module) when Erule == ber_bin_v2 ->
+pgen_partial_decode(Rtmod,Erule,Module) when Erule == ber ->
     pgen_partial_inc_dec(Rtmod,Erule,Module),
     pgen_partial_dec(Rtmod,Erule,Module);
 pgen_partial_decode(_,_,_) ->
@@ -229,7 +238,7 @@ pgen_partial_inc_dec1(Rtmod,Erules,Module,[P|Ps]) ->
 pgen_partial_inc_dec1(_,_,_,[]) ->
     ok.
 
-gen_partial_inc_dec_refed_funcs(Rtmod,Erule) when Erule == ber_bin_v2 ->
+gen_partial_inc_dec_refed_funcs(Rtmod,Erule) when Erule == ber ->
     case asn1ct:next_refed_func() of
 	[] ->
 	    ok;
@@ -285,8 +294,7 @@ pgen_partial_types1(_,undefined) ->
 %% TypeList a decode function will be generated.
 traverse_type_structure(Erules,Type,[],FuncName,TopTypeName) ->
     %% this is the selected type
-    Ctmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-					       rt2ct_suffix(Erules)])),
+    Ctmod = ct_gen_module(Erules),
     TypeDef =
 	case Type of
 	    #type{} ->
@@ -446,7 +454,7 @@ pgen_partial_incomplete_decode(Erule) ->
 	_ ->
 	    ok
     end.
-pgen_partial_incomplete_decode1(ber_bin_v2) ->
+pgen_partial_incomplete_decode1(ber) ->
     case asn1ct:read_config_data(partial_incomplete_decode) of
 	undefined ->
 	    ok;
@@ -541,20 +549,17 @@ gen_part_decode_funcs(WhatKind,_TypeName,{_,Directive,_,_}) ->
 gen_types(Erules,Tname,{RootL1,ExtList,RootL2}) 
   when is_list(RootL1), is_list(RootL2) ->
     gen_types(Erules,Tname,RootL1),
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-				       rt2ct_suffix(Erules)])),
+    Rtmod = ct_gen_module(Erules),
     gen_types(Erules,Tname,Rtmod:extaddgroup2sequence(ExtList)),
     gen_types(Erules,Tname,RootL2);
 gen_types(Erules,Tname,{RootList,ExtList}) when is_list(RootList) ->
     gen_types(Erules,Tname,RootList),
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-				       rt2ct_suffix(Erules)])),
+    Rtmod = ct_gen_module(Erules),
     gen_types(Erules,Tname,Rtmod:extaddgroup2sequence(ExtList));
 gen_types(Erules,Tname,[{'EXTENSIONMARK',_,_}|Rest]) ->
     gen_types(Erules,Tname,Rest);
 gen_types(Erules,Tname,[ComponentType|Rest]) ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-				       rt2ct_suffix(Erules)])),
+    Rtmod = ct_gen_module(Erules),
     asn1ct_name:clear(),
     Rtmod:gen_encode(Erules,Tname,ComponentType),
     asn1ct_name:clear(),
@@ -563,8 +568,7 @@ gen_types(Erules,Tname,[ComponentType|Rest]) ->
 gen_types(_,_,[]) ->
     true;
 gen_types(Erules,Tname,Type) when is_record(Type,type) ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-				       rt2ct_suffix(Erules)])),
+    Rtmod = ct_gen_module(Erules),
     asn1ct_name:clear(),
     Rtmod:gen_encode(Erules,Tname,Type),
     asn1ct_name:clear(),
@@ -743,8 +747,7 @@ gen_value(Value) when is_record(Value,valuedef) ->
     emit([{asis,V},".",nl,nl]).
 
 gen_encode_constructed(Erules,Typename,InnerType,D) when is_record(D,type) ->
-
-    Rtmod = list_to_atom(lists:concat(["asn1ct_constructed_",erule(Erules)])),
+    Rtmod = ct_constructed_module(Erules),
     case InnerType of
 	'SET' ->
 	    Rtmod:gen_encode_set(Erules,Typename,D),
@@ -776,7 +779,7 @@ gen_encode_constructed(Erules,Typename,InnerType,D)
     gen_encode_constructed(Erules,Typename,InnerType,D#typedef.typespec).
 
 gen_decode_constructed(Erules,Typename,InnerType,D) when is_record(D,type) ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_constructed_",erule(Erules)])),
+    Rtmod = ct_constructed_module(Erules),
     asn1ct:step_in_constructed(), %% updates namelist for exclusive decode
     case InnerType of
 	'SET' ->
@@ -807,27 +810,11 @@ pgen_exports(Erules,_Module,{Types,Values,_,_,Objects,ObjectSets}) ->
 	    case Erules of
 		ber ->
 		    gen_exports1(Types,"enc_",2);
-		ber_bin ->
-		    gen_exports1(Types,"enc_",2);
-		ber_bin_v2 ->
-		    gen_exports1(Types,"enc_",2);
 		_ ->
 		    gen_exports1(Types,"enc_",1)
 	    end,
 	    emit({"-export([",nl}),
-	    gen_exports1(Types,"dec_",2),
-	    case Erules of
-		ber ->
-		    emit({"-export([",nl}),
-		    gen_exports1(Types,"dec_",3);
-		ber_bin ->
-		    emit({"-export([",nl}),
-		    gen_exports1(Types,"dec_",3);
-% 		ber_bin_v2 ->
-% 		    emit({"-export([",nl}),
-% 		    gen_exports1(Types,"dec_",2);
-		_ -> ok
-	    end
+	    gen_exports1(Types,"dec_",2)
     end,
     case [X || {n2n,X} <- get(encoding_options)] of
 	[] -> ok;
@@ -852,16 +839,11 @@ pgen_exports(Erules,_Module,{Types,Values,_,_,Objects,ObjectSets}) ->
 		    gen_exports1(Objects,"enc_",3),
 		    emit({"-export([",nl}),
 		    gen_exports1(Objects,"dec_",4);
-		ber_bin_v2 ->
+		ber ->
 		    emit({"-export([",nl}),
 		    gen_exports1(Objects,"enc_",3),
 		    emit({"-export([",nl}),
-		    gen_exports1(Objects,"dec_",3);
-		_ -> 
-		    emit({"-export([",nl}),
-		    gen_exports1(Objects,"enc_",4),
-		    emit({"-export([",nl}),
-		    gen_exports1(Objects,"dec_",4)
+		    gen_exports1(Objects,"dec_",3)
 	    end
     end,
     case ObjectSets of
@@ -937,20 +919,17 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
     emit(["encoding_rule() ->",nl]),
     emit(["   ",{asis,Erules},".",nl,nl]),
     NoFinalPadding = lists:member(no_final_padding,get(encoding_options)),
-    Call = case Erules of
-	       per -> "?RT_PER:complete(encode_disp(Type,Data))";
-	       per_bin -> ["?RT_PER:complete(encode_disp(Type,Data))"];
-	       ber -> "encode_disp(Type,Data)";
-	       ber_bin -> "encode_disp(Type,Data)";
-	       ber_bin_v2 -> "encode_disp(Type,Data)";
-	       uper_bin when NoFinalPadding == true -> 
-		   "?RT_PER:complete_NFP(encode_disp(Type,Data))";
-	       uper_bin -> ["?RT_PER:complete(encode_disp(Type,Data))"]
-	   end,
-    EncWrap = case Erules of
-	       ber -> "wrap_encode(Bytes)";
-	       _ -> "Bytes"
-	   end,
+    {Call,BytesAsBinary} =
+	case Erules of
+	    per ->
+		{["?RT_PER:complete(encode_disp(Type,Data))"],"Bytes"};
+	    ber ->
+		{"encode_disp(Type,Data)","iolist_to_binary(Bytes)"};
+	    uper when NoFinalPadding == true ->
+		{"?RT_PER:complete_NFP(encode_disp(Type,Data))","Bytes"};
+	    uper ->
+		{["?RT_PER:complete(encode_disp(Type,Data))"],"Bytes"}
+	end,
     emit(["encode(Type,Data) ->",nl,
 	  "case catch ",Call," of",nl,
 	  "  {'EXIT',{error,Reason}} ->",nl,
@@ -958,42 +937,25 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
 	  "  {'EXIT',Reason} ->",nl,
 	  "    {error,{asn1,Reason}};",nl,
 	  "  {Bytes,_Len} ->",nl,
-	  "    {ok,",EncWrap,"};",nl]),
-    case Erules of
-	per ->
-	    emit(["  Bytes when is_binary(Bytes) ->",nl,
-		  "    {ok,binary_to_list(Bytes)};",nl,
-		  "  Bytes ->",nl,
-		  "    {ok,binary_to_list(list_to_binary(Bytes))}",nl,
-		  "  end.",nl,nl]);
-	_ ->
-	    emit(["  Bytes ->",nl,
-		  "    {ok,",EncWrap,"}",nl,
-		  "end.",nl,nl])
-    end,
-
-%     case Erules of
-% 	ber_bin_v2 ->
-% 	    emit(["decode(Type,Data0) ->",nl]),
-% 	    emit(["{Data,_RestBin} = ?RT_BER:decode(Data0",nif_parameter(),"),",nl]);
-% 	_ ->
-% 	    emit(["decode(Type,Data) ->",nl])
-%     end,
+	  "    {ok,",BytesAsBinary,"};",nl,
+	  "  Bytes ->",nl,
+	  "    {ok,",BytesAsBinary,"}",nl,
+	  "end.",nl,nl]),
 
     Return_rest = lists:member(undec_rest,get(encoding_options)),
     Data = case {Erules,Return_rest} of
-	       {ber_bin_v2,true} -> "Data0";
+	       {ber,true} -> "Data0";
 	       _ -> "Data"
 	   end,
 
     emit(["decode(Type,",Data,") ->",nl]),
     DecAnonymous =
 	case {Erules,Return_rest} of
-	    {ber_bin_v2,false} ->
+	    {ber,false} ->
 		io_lib:format("~s~s~s~n",
 			      ["element(1,?RT_BER:decode(Data",
 			       nif_parameter(),"))"]);
-	    {ber_bin_v2,true} ->
+	    {ber,true} ->
 		emit(["{Data,Rest} = ?RT_BER:decode(Data0",
 		      nif_parameter(),"),",nl]),
 		"Data";
@@ -1001,10 +963,8 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
 		"Data"
 	end,
     DecWrap = case Erules of
-		  ber -> "wrap_decode(Data)";
-		  ber_bin_v2 ->
+		  ber ->
 		      DecAnonymous;
-		  per -> "list_to_binary(Data)";
 		  _ -> "Data"
 	      end,
 	    
@@ -1014,32 +974,18 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
 	  "  {'EXIT',Reason} ->",nl,
 	  "    {error,{asn1,Reason}};",nl]),
     case {Erules,Return_rest} of 
-	{ber_bin_v2,false} ->
+	{ber,false} ->
 	    emit(["  Result ->",nl,
 		  "    {ok,Result}",nl]);
-	{ber_bin_v2,true} ->
+	{ber,true} ->
 	    emit(["  Result ->",nl,
 		  "    {ok,Result,Rest}",nl]);
-	{per,false} ->
-	    emit(["  {X,_Rest} ->",nl,
-		  "    {ok,if_binary2list(X)};",nl,
-		  "  {X,_Rest,_Len} ->",nl,
-		  "    {ok,if_binary2list(X)}",nl]);
 	{_,false} ->
 	    emit(["  {X,_Rest} ->",nl,
 		  "    {ok,X};",nl,
 		  "  {X,_Rest,_Len} ->",nl,
 		  "    {ok,X}",nl]);
-	{per,true}  ->
-	    emit(["  {X,{_,Rest}} ->",nl,
-		  "    {ok,if_binary2list(X),Rest};",nl,
-		  "  {X,{_,Rest},_Len} ->",nl,
-		  "    {ok,if_binary2list(X),Rest};",nl,
-		  "  {X,Rest} ->",nl,
-		  "    {ok,if_binary2list(X),Rest};",nl,
-		  "  {X,Rest,_Len} ->",nl,
-		  "    {ok,if_binary2list(X),Rest}",nl]);
-	{per_bin,true} ->
+	{per,true} ->
 	    emit(["  {X,{_,Rest}} ->",nl,
 		  "    {ok,X,Rest};",nl,
 		  "  {X,{_,Rest},_Len} ->",nl,
@@ -1048,7 +994,7 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
 		  "    {ok,X,Rest};",nl,
 		  "  {X,Rest,_Len} ->",nl,
 		  "    {ok,X,Rest}",nl]);
-	{uper_bin,true} ->
+	{uper,true} ->
 	    emit(["  {X,{_,Rest}} ->",nl,
 		  "    {ok,X,Rest};",nl,
 		  "  {X,{_,Rest},_Len} ->",nl,
@@ -1056,34 +1002,14 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
 		  "  {X,Rest} ->",nl,
 		  "    {ok,X,Rest};",nl,
 		  "  {X,Rest,_Len} ->",nl,
-		  "    {ok,X,Rest}",nl]);
-	_ ->
-	    emit(["  {X,Rest} ->",nl,
-		  "    {ok,X,Rest};",nl,
-		  "  {X,Rest,_Len} ->",nl,
 		  "    {ok,X,Rest}",nl])
     end,
     emit(["end.",nl,nl]),
 
-    case Erules of
-	per ->
-	    emit(["if_binary2list(B) when is_binary(B) ->",nl,
-		  "  binary_to_list(B);",nl,
-		  "if_binary2list(L) -> L.",nl,nl]);
-	_ ->
-	    ok
-    end,
-
     gen_decode_partial_incomplete(Erules),
 
     case Erules of
 	ber ->
-	    gen_dispatcher(Types,"encode_disp","enc_",",[]"),
-	    gen_dispatcher(Types,"decode_disp","dec_",",mandatory");
-	ber_bin ->
-	    gen_dispatcher(Types,"encode_disp","enc_",",[]"),
-	    gen_dispatcher(Types,"decode_disp","dec_",",mandatory");
-	ber_bin_v2 ->
 	    gen_dispatcher(Types,"encode_disp","enc_",""),
 	    gen_dispatcher(Types,"decode_disp","dec_",""),
 	    gen_partial_inc_dispatcher();
@@ -1092,17 +1018,10 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
 	    gen_dispatcher(Types,"decode_disp","dec_",",mandatory")
     end,
     emit([nl]),
-
-    case Erules of
-	ber ->
-	    gen_wrapper();
-	_ -> ok
-    end,
     emit({nl,nl}).
 
 
-gen_decode_partial_incomplete(Erule) when Erule == ber;Erule==ber_bin;
-					   Erule==ber_bin_v2 ->
+gen_decode_partial_incomplete(ber) ->
     case {asn1ct:read_config_data(partial_incomplete_decode),
 	  asn1ct:get_gen_state_field(inc_type_pattern)} of
 	{undefined,_} ->
@@ -1110,34 +1029,35 @@ gen_decode_partial_incomplete(Erule) when Erule == ber;Erule==ber_bin;
 	{_,undefined} ->
 	    ok;
 	_ ->
-	    case Erule of
-		ber_bin_v2 ->
-		    EmitCaseClauses =
-			fun() ->
-				emit(["   {'EXIT',{error,Reason}} ->",nl,
-				      "      {error,Reason};",nl,
-				      "    {'EXIT',Reason} ->",nl,
-				      "      {error,{asn1,Reason}};",nl,
-				      "    Result ->",nl,
-				      "      {ok,Result}",nl,
-				      "  end.",nl,nl])
-			end,
-		    emit(["decode_partial_incomplete(Type,Data0,",
-			  "Pattern) ->",nl]),
-		    emit(["  {Data,_RestBin} =",nl,
-			  "    ?RT_BER:decode_primitive_",
-			  "incomplete(Pattern,Data0),",nl,
-			  "  case catch decode_partial_inc_disp(Type,",
-			  "Data) of",nl]),
-		    EmitCaseClauses(),
-		    emit(["decode_part(Type,Data0) ->",nl]),
-		    emit(["  case catch decode_inc_disp(Type,element(1,"
-			  "?RT_BER:decode(Data0",nif_parameter(),"))) of",nl]),
-% 			  "  {Data,_RestBin} = ?RT_BER:decode(Data0),",nl,
-% 			  "  case catch decode_inc_disp(Type,Data) of",nl]),
-		    EmitCaseClauses();
-		_ -> ok % add later
-	    end
+	    EmitCaseClauses =
+		fun() ->
+			emit(["   {'EXIT',{error,Reason}} ->",nl,
+			      "      {error,Reason};",nl,
+			      "    {'EXIT',Reason} ->",nl,
+			      "      {error,{asn1,Reason}};",nl,
+			      "    Result ->",nl,
+			      "      {ok,Result}",nl,
+			      "  end"])
+		end,
+	    emit(["decode_partial_incomplete(Type,Data0,",
+		  "Pattern) ->",nl]),
+	    emit(["  {Data,_RestBin} =",nl,
+		  "    ?RT_BER:decode_primitive_",
+		  "incomplete(Pattern,Data0),",nl,
+		  "  case catch decode_partial_inc_disp(Type,",
+		  "Data) of",nl]),
+	    EmitCaseClauses(),
+	    emit([".",nl,nl]),
+	    emit(["decode_part(Type, Data0) "
+		  "when is_binary(Data0) ->",nl]),
+	    emit(["  case catch decode_inc_disp(Type,element(1,"
+		  "?RT_BER:decode(Data0",nif_parameter(),"))) of",nl]),
+	    EmitCaseClauses(),
+	    emit([";",nl]),
+	    emit(["decode_part(Type, Data0) ->",nl]),
+	    emit(["  case catch decode_inc_disp(Type, Data0) of",nl]),
+	    EmitCaseClauses(),
+	    emit([".",nl,nl])
     end;
 gen_decode_partial_incomplete(_Erule) ->
     ok.
@@ -1176,23 +1096,8 @@ gen_partial_inc_dispatcher([],_) ->
 	  "  exit({error,{asn1,{undefined_type,Type}}}).",nl]).
 
 nif_parameter() ->
-    Options = get(encoding_options),
-    case {lists:member(driver,Options),lists:member(nif,Options)} of
-	{true,_} -> ",nif";
-	{_,true} -> ",nif";
-	_ ->  ""
-    end.
+    ",nif".
 
-gen_wrapper() ->
-    emit(["wrap_encode(Bytes) when is_list(Bytes) ->",nl,
-	  "   binary_to_list(list_to_binary(Bytes));",nl,
-	  "wrap_encode(Bytes) when is_binary(Bytes) ->",nl,
-	  "   binary_to_list(Bytes);",nl,
-	  "wrap_encode(Bytes) -> Bytes.",nl,nl]),
-    emit(["wrap_decode(Bytes) when is_list(Bytes) ->",nl,
-	  "   list_to_binary(Bytes);",nl,
-	  "wrap_decode(Bytes) -> Bytes.",nl]).
-    
 gen_dispatcher([F1,F2|T],FuncName,Prefix,ExtraArg) ->
 	emit([FuncName,"('",F1,"',Data) -> '",Prefix,F1,"'(Data",ExtraArg,")",";",nl]),
 	gen_dispatcher([F2|T],FuncName,Prefix,ExtraArg);
@@ -1202,19 +1107,16 @@ gen_dispatcher([Flast|_T],FuncName,Prefix,ExtraArg) ->
 
 pgen_info() ->
     emit(["info() ->",nl,
-	  "   case ?MODULE:module_info() of",nl,
-	  "      MI when is_list(MI) ->",nl,
-	  "         case lists:keysearch(attributes,1,MI) of",nl,
-	  "            {value,{_,Attributes}} when is_list(Attributes) ->",nl,
-	  "               case lists:keysearch(asn1_info,1,Attributes) of",nl,
-	  "                  {value,{_,Info}} when is_list(Info) ->",nl,
-	  "                     Info;",nl,
-	  "                  _ ->",nl,
-	  "                     []",nl,
-	  "               end;",nl,
-	  "            _ ->",nl,
-	  "               []",nl,
-	  "         end",nl,
+	  "   case ?MODULE:module_info(attributes) of",nl,
+	  "     Attributes when is_list(Attributes) ->",nl,
+	  "       case lists:keyfind(asn1_info, 1, Attributes) of",nl,
+	  "         {_,Info} when is_list(Info) ->",nl,
+	  "           Info;",nl,
+	  "         _ ->",nl,
+	  "           []",nl,
+	  "       end;",nl,
+	  "     _ ->",nl,
+	  "       []",nl,
 	  "   end.",nl]).
 
 open_hrl(OutFile,Module) ->
@@ -1485,32 +1387,15 @@ gen_head(Erules,Mod,Hrl) ->
     {Rtmac,Rtmod} = case Erules of
 			per ->
 			    emit({"%% Generated by the Erlang ASN.1 PER-"
-				  "compiler version:",asn1ct:vsn(),nl}),
-			    {"RT_PER",?RT_PER_BIN};
-			ber ->
-			    emit({"%% Generated by the Erlang ASN.1 BER-"
-				  "compiler version:",asn1ct:vsn(),nl}),
-			    {"RT_BER",?RT_BER_BIN};
-			per_bin ->
-			    emit({"%% Generated by the Erlang ASN.1 BER-"
-				  "compiler version, utilizing bit-syntax:",
-				  asn1ct:vsn(),nl}),
-			    %% temporary code to enable rt2ct optimization
-			    case lists:member(optimize,Options) of
-				true -> {"RT_PER","asn1rt_per_bin_rt2ct"};
-				_ ->    {"RT_PER",?RT_PER_BIN}
-			    end;
-			ber_bin ->
-			    emit({"%% Generated by the Erlang ASN.1 BER-"
 				  "compiler version, utilizing bit-syntax:",
 				  asn1ct:vsn(),nl}),
-			    {"RT_BER",?RT_BER_BIN};
-			ber_bin_v2 ->
+			    {"RT_PER","asn1rt_per_bin_rt2ct"};
+			ber ->
 			    emit({"%% Generated by the Erlang ASN.1 BER_V2-"
 				  "compiler version, utilizing bit-syntax:",
 				  asn1ct:vsn(),nl}),
 			    {"RT_BER","asn1rt_ber_bin_v2"};
-			uper_bin ->
+			uper ->
 			    emit(["%% Generated by the Erlang ASN.1 UNALIGNED"
 				  " PER-compiler version, utilizing"
 				  " bit-syntax:",
@@ -1530,7 +1415,7 @@ gen_head(Erules,Mod,Hrl) ->
     emit(["-define('",Rtmac,"',",Rtmod,").",nl]),
     emit(["-asn1_info([{vsn,'",asn1ct:vsn(),"'},",nl,
 	  "            {module,'",Mod,"'},",nl,
-	  "            {options,",io_lib:format("~w",[Options]),"}]).",nl,nl]).
+	  "            {options,",io_lib:format("~p",[Options]),"}]).",nl,nl]).
 			
 
 gen_hrlhead(Mod) ->
@@ -2008,43 +1893,29 @@ constructed_suffix('SEQUENCE OF',_) ->
 constructed_suffix('SET OF',_) -> 
     'SETOF'.
 
-erule(ber) ->
-    ber;
-erule(ber_bin) ->
-    ber;
-erule(ber_bin_v2) ->
-    ber_bin_v2;
-erule(per) ->
-    per;
-erule(per_bin) ->
-    per;
-erule(uper_bin) ->
-    per.
-
-wrap_ber(ber) ->
-    ber_bin;
-wrap_ber(Erule) ->
-    Erule.
-
-rt2ct_suffix() ->
-    Options = get(encoding_options),
-    case {lists:member(optimize,Options),lists:member(per_bin,Options)} of
-	{true,true} -> "_rt2ct";
-	_ -> ""
-    end.
-rt2ct_suffix(per_bin) ->
-    Options = get(encoding_options),
-    case lists:member(optimize,Options) of
-	true -> "_rt2ct";
-	_ -> ""
-    end;
-rt2ct_suffix(_) -> "".
+erule(ber) -> ber;
+erule(per) -> per;
+erule(uper) -> per.
 
 index2suffix(0) ->
     "";
 index2suffix(N) ->
     lists:concat(["_",N]).
 
+ct_gen_module(ber) ->
+    asn1ct_gen_ber_bin_v2;
+ct_gen_module(per) ->
+    asn1ct_gen_per_rt2ct;
+ct_gen_module(uper) ->
+    asn1ct_gen_per.
+
+ct_constructed_module(ber) ->
+    asn1ct_constructed_ber_bin_v2;
+ct_constructed_module(per) ->
+    asn1ct_constructed_per;
+ct_constructed_module(uper) ->
+    asn1ct_constructed_per.
+
 get_constraint(C,Key) ->
     case lists:keysearch(Key,1,C) of
 	false ->
diff --git a/lib/asn1/src/asn1ct_gen_ber.erl b/lib/asn1/src/asn1ct_gen_ber.erl
deleted file mode 100644
index 491ebcb8fd..0000000000
--- a/lib/asn1/src/asn1ct_gen_ber.erl
+++ /dev/null
@@ -1,1749 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
--module(asn1ct_gen_ber).
-
-%% Generate erlang module which handles (PER) encode and decode for
-%% all types in an ASN.1 module
-
--include("asn1_records.hrl").
-
--export([pgen/4]).
--export([decode_class/1, decode_type/1]).
--export([add_removed_bytes/0]).
--export([gen_encode/2,gen_encode/3,gen_decode/2,gen_decode/3]).
--export([gen_encode_prim/4]).
--export([gen_dec_prim/8]).
--export([gen_objectset_code/2, gen_obj_code/3]).
--export([re_wrap_erule/1]).
--export([unused_var/2]).
--export([extaddgroup2sequence/1]).
-
--import(asn1ct_gen, [emit/1,demit/1]).
-
-						% the encoding of class of tag bits 8 and 7
--define(UNIVERSAL,   0).
--define(APPLICATION, 16#40).
--define(CONTEXT,     16#80).
--define(PRIVATE,     16#C0).
-
-						% primitive or constructed encoding % bit 6
--define(PRIMITIVE,   0).
--define(CONSTRUCTED, 2#00100000).
-
-
--define(T_ObjectDescriptor, ?UNIVERSAL bor ?PRIMITIVE bor 7).
-						% restricted character string types
--define(T_NumericString,    ?UNIVERSAL bor ?PRIMITIVE bor 18). %can be constructed
--define(T_PrintableString,  ?UNIVERSAL bor ?PRIMITIVE bor 19). %can be constructed
--define(T_TeletexString,    ?UNIVERSAL bor ?PRIMITIVE bor 20). %can be constructed
--define(T_VideotexString,   ?UNIVERSAL bor ?PRIMITIVE bor 21). %can be constructed
--define(T_IA5String,        ?UNIVERSAL bor ?PRIMITIVE bor 22). %can be constructed
--define(T_GraphicString,    ?UNIVERSAL bor ?PRIMITIVE bor 25). %can be constructed
--define(T_VisibleString,    ?UNIVERSAL bor ?PRIMITIVE bor 26). %can be constructed
--define(T_GeneralString,    ?UNIVERSAL bor ?PRIMITIVE bor 27). %can be constructed
-
-%% pgen(Erules, Module, TypeOrVal)
-%% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
-%% .hrl file is only generated if necessary
-%% Erules = per | ber
-%% Module = atom()
-%% TypeOrVal = {TypeList,ValueList,PTypeList}
-%% TypeList = ValueList = [atom()]
-
-pgen(OutFile,Erules,Module,TypeOrVal) ->
-    asn1ct_gen:pgen_module(OutFile,Erules,Module,TypeOrVal,[],true).
-
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Generate ENCODING
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-%%===============================================================================
-%% encode #{typedef, {pos, name, typespec}}
-%%===============================================================================
-
-gen_encode(Erules,Type) when is_record(Type,typedef) ->
-    gen_encode_user(Erules,Type).
-
-%%===============================================================================
-%% encode #{type, {tag, def, constraint}}
-%%===============================================================================
-
-gen_encode(Erules,Typename,Type) when is_record(Type,type) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    ObjFun =
-	case lists:keysearch(objfun,1,Type#type.tablecinf) of
-	    {value,{_,_Name}} ->
-		", ObjFun";
-	    false ->
-		""
-	end,
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    emit([nl,nl,nl,"%%================================"]),
-	    emit([nl,"%%  ",asn1ct_gen:list2name(Typename)]),
-	    emit([nl,"%%================================",nl]),
-	    case lists:member(InnerType,['SET','SEQUENCE']) of
-		true -> 
-		    case get(asn_keyed_list) of
-			true ->
-			    CompList = 
-				case Type#type.def of
-				    #'SEQUENCE'{components=Cl} -> Cl;
-				    #'SET'{components=Cl} -> Cl
-				end,
-			    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-				  "'(Val, TagIn",ObjFun,
-				  ") when is_list(Val) ->",nl]),
-			    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-				  "'(?RT_BER:fixoptionals(",
-				  {asis,optionals(CompList)},
-				  ",Val), TagIn",ObjFun,");",nl,nl]);
-			_ -> true
-		    end;
-		_ ->
-		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'({'",asn1ct_gen:list2name(Typename),
-			  "',Val}, TagIn",ObjFun,") ->",nl]),
-		    emit(["   'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val, TagIn",ObjFun,");",nl,nl])
-	    end,
-	    emit(["'enc_",asn1ct_gen:list2name(Typename),
-		  "'(Val, TagIn",ObjFun,") ->",nl,"   "]),
-	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
-	_ ->
-	    true
-    end;
-
-%%===============================================================================
-%% encode ComponentType
-%%===============================================================================
-
-gen_encode(Erules,Tname,#'ComponentType'{name=Cname,typespec=Type}) ->
-    NewTname = [Cname|Tname],
-    %% The tag is set to [] to avoid that it is
-    %% taken into account twice, both as a component/alternative (passed as
-    %% argument to the encode decode function and within the encode decode
-    %% function it self.
-    NewType = Type#type{tag=[]},
-    gen_encode(Erules,NewTname,NewType).
-
-gen_encode_user(Erules,D) when is_record(D,typedef) ->
-    Typename = [D#typedef.name],
-    Type = D#typedef.typespec,
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    emit([nl,nl,"%%================================"]),
-    emit([nl,"%%  ",Typename]),
-    emit([nl,"%%================================",nl]),
-    case lists:member(InnerType,['SET','SEQUENCE']) of
-	true -> 
-	    case get(asn_keyed_list) of
-		true ->
-		    CompList = 
-			case Type#type.def of
-			    #'SEQUENCE'{components=Cl} -> Cl;
-			    #'SET'{components=Cl} -> Cl
-			end,
-
-		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val, TagIn) when is_list(Val) ->",nl]),
-		    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-			  "'(?RT_BER:fixoptionals(",
-			  {asis,optionals(CompList)},
-			  ",Val), TagIn);",nl,nl]);
-		_ -> true
-	    end;
-	_ ->
-	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
-		  "'({'",asn1ct_gen:list2name(Typename),"',Val}, TagIn) ->",nl}),
-	    emit({"   'enc_",asn1ct_gen:list2name(Typename),"'(Val, TagIn);",nl,nl})
-    end,
-    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(",
-	  unused_var("Val",Type#type.def),", TagIn) ->",nl}),
-    CurrentMod = get(currmod),
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,D);
-	{primitive,bif} ->
-	    asn1ct_gen_ber:gen_encode_prim(ber,Type,["TagIn ++ ",
-						     {asis,Tag}],"Val"),
-	    emit([".",nl]);
-	#typereference{val=Ename} ->
-	    emit(["   'enc_",Ename,"'(Val, TagIn ++ ",{asis,Tag},").",nl]);
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'enc_",Etype,"'(Val, TagIn ++ ",
-		  {asis,Tag},").",nl]);
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'enc_",Etype,"'(Val, TagIn ++ ",
-		  {asis,Tag},").",nl]);
-	'ASN1_OPEN_TYPE' ->
-	    emit(["%% OPEN TYPE",nl]),
-	    asn1ct_gen_ber:gen_encode_prim(ber,
-					   Type#type{def='ASN1_OPEN_TYPE'},
-					   ["TagIn ++ ",
-					    {asis,Tag}],"Val"),
-	    emit([".",nl])
-    end.
-
-unused_var(Var,#'SEQUENCE'{components=Cl}) ->
-    unused_var1(Var,Cl);
-unused_var(Var,#'SET'{components=Cl}) ->
-    unused_var1(Var,Cl);
-unused_var(Var,_) ->
-    Var.
-unused_var1(Var,Cs) when Cs == []; Cs == {[],[]} ->
-    lists:concat(["_",Var]);
-unused_var1(Var,_) ->
-    Var.
-
-unused_optormand_var(Var,Def) ->
-    case asn1ct_gen:type(asn1ct_gen:get_inner(Def)) of
-	'ASN1_OPEN_TYPE' ->
-	    lists:concat(["_",Var]);
-	_ ->
-	    Var
-    end.
-    
-
-gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) ->
-    
-%%% Currently not used for BER (except for BitString) and therefore replaced
-%%% with [] as a placeholder
-    BitStringConstraint = D#type.constraint,
-    Constraint = [],
-    asn1ct_name:new(enumval),
-    case D#type.def of
-	'BOOLEAN' ->
-	    emit_encode_func('boolean',Value,DoTag);
-	'INTEGER' ->
-	    emit_encode_func('integer',Constraint,Value,DoTag);
-	{'INTEGER',NamedNumberList} ->
-	    emit_encode_func('integer',Constraint,Value,
-			     NamedNumberList,DoTag);
-	{'ENUMERATED',NamedNumberList={_,_}} ->
-	    
-	    emit(["case (case ",Value," of {_,",{curr,enumval},"}->",
-		  {curr,enumval},";_->", Value," end) of",nl]),
-	    asn1ct_name:new(enumval),
-	    emit_enc_enumerated_cases(NamedNumberList,DoTag);
-	{'ENUMERATED',NamedNumberList} ->
-	    
-	    emit(["case (case ",Value," of {_,",{curr,enumval},"}->",
-		  {curr,enumval},";_->", Value," end) of",nl]),
-	    asn1ct_name:new(enumval),
-	    emit_enc_enumerated_cases(NamedNumberList,DoTag);
-	
-	'REAL' ->
-	    emit_encode_func('real',Constraint,Value,DoTag);
-
-	{'BIT STRING',NamedNumberList} ->
-	    emit_encode_func('bit_string',BitStringConstraint,Value,
-			     NamedNumberList,DoTag);
-	'ANY' ->
-	    emit_encode_func('open_type', Value,DoTag);
-	'NULL' ->
-	    emit_encode_func('null',Value,DoTag);
-	'OBJECT IDENTIFIER' ->
-	    emit_encode_func("object_identifier",Value,DoTag);
-	'RELATIVE-OID' ->
-	    emit_encode_func("relative_oid",Value,DoTag);
-	'ObjectDescriptor' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_ObjectDescriptor,DoTag);
-	'OCTET STRING' ->
-	    emit_encode_func('octet_string',Constraint,Value,DoTag);
-	'NumericString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_NumericString,DoTag);
-	TString when TString == 'TeletexString';
-		     TString == 'T61String' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_TeletexString,DoTag);
-	'VideotexString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_VideotexString,DoTag);
-	'GraphicString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_GraphicString,DoTag);
-	'VisibleString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_VisibleString,DoTag);
-	'GeneralString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_GeneralString,DoTag);
-	'PrintableString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_PrintableString,DoTag);
-	'IA5String' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_IA5String,DoTag);
-	'UniversalString' ->
-	    emit_encode_func('universal_string',Constraint,Value,DoTag);
-	'UTF8String' ->
-	    emit_encode_func('UTF8_string',Constraint,Value,DoTag);
-	'BMPString' ->
-	    emit_encode_func('BMP_string',Constraint,Value,DoTag);
-	'UTCTime' ->
-	    emit_encode_func('utc_time',Constraint,Value,DoTag);
-	'GeneralizedTime' ->
-	    emit_encode_func('generalized_time',Constraint,Value,DoTag);
-	'ASN1_OPEN_TYPE' ->
-	    emit_encode_func('open_type', Value,DoTag);
-	#'ObjectClassFieldType'{} ->
-	    case asn1ct_gen:get_inner(D#type.def) of
-		{fixedtypevaluefield,_,InnerType} -> 
-		    gen_encode_prim(Erules,InnerType,DoTag,Value);
-		'ASN1_OPEN_TYPE' ->
-		    emit_encode_func('open_type', Value,DoTag);
-		XX ->
-		    exit({'can not encode' ,XX})
-	    end;
-	XX ->
-	    exit({'can not encode' ,XX})
-    end.
-
-
-emit_encode_func(Name,Value,Tags) when is_atom(Name) ->
-    emit_encode_func(atom_to_list(Name),Value,Tags);
-emit_encode_func(Name,Value,Tags) ->
-    Fname = "?RT_BER:encode_" ++ Name,
-    emit([Fname,"(",Value,", ",Tags,")"]).
-
-emit_encode_func(Name,Constraint,Value,Tags) when is_atom(Name) ->
-    emit_encode_func(atom_to_list(Name),Constraint,Value,Tags);
-emit_encode_func(Name,Constraint,Value,Tags) ->
-    Fname = "?RT_BER:encode_" ++ Name,
-    emit([Fname,"(",{asis,Constraint},", ",Value,", ",Tags,")"]).
-
-emit_encode_func(Name,Constraint,Value,Asis,Tags) when is_atom(Name) ->
-    emit_encode_func(atom_to_list(Name),Constraint,Value,Asis,Tags);
-emit_encode_func(Name,Constraint,Value,Asis,Tags) ->
-    Fname = "?RT_BER:encode_" ++ Name,
-    emit([Fname,"(",{asis,Constraint},", ",Value,
-	  ", ",{asis,Asis},
-	  ", ",Tags,")"]).
-    
-emit_enc_enumerated_cases({L1,L2}, Tags) ->
-    emit_enc_enumerated_cases(L1++L2, Tags, ext);
-emit_enc_enumerated_cases(L, Tags) ->
-    emit_enc_enumerated_cases(L, Tags, noext).
-
-emit_enc_enumerated_cases([{EnumName,EnumVal},H2|T], Tags, Ext) ->
-    emit([{asis,EnumName}," -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,");",nl]),
-%%    emit(["'",{asis,EnumName},"' -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,");",nl]),
-    emit_enc_enumerated_cases([H2|T], Tags, Ext);
-emit_enc_enumerated_cases([{EnumName,EnumVal}], Tags, Ext) ->
-    emit([{asis,EnumName}," -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,")"]),
-%%    emit(["'",{asis,EnumName},"' -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,")"]),
-    case Ext of
-	noext -> emit([";",nl]);
-	ext -> 
-%% 	    emit([";",nl,"{asn1_enum,",{curr,enumval},"} -> ",
-%% 		     "?RT_BER:encode_enumerated(",{curr,enumval},",",Tags,");",nl]),
-%% 	    asn1ct_name:new(enumval)
-	    emit([";",nl])
-    end,
-    emit([{curr,enumval}," -> exit({error,{asn1, {enumerated_not_in_range,",{curr, enumval},"}}})"]),
-    emit([nl,"end"]).
-
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Generate DECODING
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-%%===============================================================================
-%% decode #{typedef, {pos, name, typespec}}
-%%===============================================================================
-
-gen_decode(Erules,Type) when is_record(Type,typedef) ->
-    D = Type,
-    emit({nl,nl}),
-    emit({"'dec_",Type#typedef.name,"'(Bytes, OptOrMand) ->",nl}),
-    emit({"   'dec_",Type#typedef.name,"'(Bytes, OptOrMand, []).",nl,nl}),
-    emit({"'dec_",Type#typedef.name,"'(Bytes, ",
-	  unused_optormand_var("OptOrMand",(Type#typedef.typespec)#type.def),", TagIn) ->",nl}),
-    dbdec(Type#typedef.name),
-    gen_decode_user(Erules,D).
-
-
-%%===============================================================================
-%% decode #{type, {tag, def, constraint}}
-%%===============================================================================
-
-gen_decode(Erules,Tname,Type) when is_record(Type,type) ->
-    Typename = Tname,
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    ObjFun =
-		case Type#type.tablecinf of
-		    [{objfun,_}|_R] ->
-			", ObjFun";
-		    _ ->
-			""
-		end,
-	    emit({"'dec_",asn1ct_gen:list2name(Typename),"'(Bytes, OptOrMand, TagIn",ObjFun,") ->",nl}),
-	    dbdec(Typename),
-	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,Type);
-	_ ->
-	    true
-    end;
-
-
-%%===============================================================================
-%% decode ComponentType
-%%===============================================================================
-
-gen_decode(Erules,Tname,#'ComponentType'{name=Cname,typespec=Type}) ->
-    NewTname = [Cname|Tname],
-    %% The tag is set to [] to avoid that it is
-    %% taken into account twice, both as a component/alternative (passed as
-    %% argument to the encode decode function and within the encode decode
-    %% function it self.
-    NewType = Type#type{tag=[]},
-    gen_decode(Erules,NewTname,NewType).
-
-
-gen_decode_user(Erules,D) when is_record(D,typedef) ->
-    Typename = [D#typedef.name],
-    Def = D#typedef.typespec,
-    InnerType = asn1ct_gen:get_inner(Def#type.def),
-    InnerTag = Def#type.tag ,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- InnerTag],
-    case asn1ct_gen:type(InnerType) of
-	'ASN1_OPEN_TYPE' ->
-	    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
-	    asn1ct_name:new(len),
-	    gen_dec_prim(Erules, Def#type{def='ASN1_OPEN_TYPE'}, 
-			 BytesVar, Tag, "TagIn",no_length, 
-			 ?PRIMITIVE,"OptOrMand"),
-	    emit({".",nl,nl});
-	{primitive,bif} ->
-	    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
-	    asn1ct_name:new(len),
-	    gen_dec_prim(Erules, Def, BytesVar, Tag, "TagIn",no_length, 
-			 ?PRIMITIVE,"OptOrMand"),
-	    emit({".",nl,nl});
-	{constructed,bif} ->
-	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,D);
-	TheType ->
-	    DecFunName = mkfuncname(TheType,dec),
-	    emit({DecFunName,"(",{curr,bytes},
-		  ", OptOrMand, TagIn++",{asis,Tag},")"}),
-	    emit({".",nl,nl})
-    end.
-
-
-gen_dec_prim(Erules,Att,BytesVar,DoTag,TagIn,Length,Form,OptOrMand) ->
-    Typename = Att#type.def,
-%% Currently not used for BER replaced with [] as place holder
-%%    Constraint = Att#type.constraint,
-%% Constraint = [],
-    Constraint = 
-	case get_constraint(Att#type.constraint,'SizeConstraint') of
-	    no -> [];
-	    Tc -> Tc
-	end,
-    ValueRange = 
-	case get_constraint(Att#type.constraint,'ValueRange') of
-	    no -> [];
-	    Tv -> Tv
-	end,
-    SingleValue = 
-	case get_constraint(Att#type.constraint,'SingleValue') of
-	    no -> [];
-	    Sv -> Sv
-	end,
-    AsBin = case get(binary_strings) of
-		true -> "_as_bin";
-		_ -> ""
-	    end,
-    NewTypeName = case Typename of
-		      'ANY' -> 'ASN1_OPEN_TYPE';
-		      _ -> Typename
-		  end,
-    DoLength = 
-	case NewTypeName of
-	    'BOOLEAN'->
-		emit({"?RT_BER:decode_boolean(",BytesVar,","}),
-		false;
-	    'INTEGER' ->
-		emit({"?RT_BER:decode_integer(",BytesVar,",",
-		      {asis,int_constr(SingleValue,ValueRange)},","}),
-		false;
-	    {'INTEGER',NamedNumberList} ->
-		emit({"?RT_BER:decode_integer(",BytesVar,",",
-		      {asis,int_constr(SingleValue,ValueRange)},",",
-		      {asis,NamedNumberList},","}),
-		false;
-	    {'ENUMERATED',NamedNumberList} ->
-		emit({"?RT_BER:decode_enumerated(",BytesVar,",",
-		      {asis,Constraint},",",
-		      {asis,NamedNumberList},","}),
-		false;
-	    'REAL' ->
-		emit({"?RT_BER:decode_real(",BytesVar,",",
-		      {asis,Constraint},","}),
-		false;
-	    {'BIT STRING',NamedNumberList} ->
-		case get(compact_bit_string) of
-		    true ->
-			emit({"?RT_BER:decode_compact_bit_string(",
-			      BytesVar,",",{asis,Constraint},",",
-			      {asis,NamedNumberList},","});
-		    _ ->
-			emit({"?RT_BER:decode_bit_string(",BytesVar,",",
-			      {asis,Constraint},",",
-			      {asis,NamedNumberList},","})
-		end,
-		true;
-	    'NULL' ->
-		emit({"?RT_BER:decode_null(",BytesVar,","}),
-		false;
-	    'OBJECT IDENTIFIER' ->
-		emit({"?RT_BER:decode_object_identifier(",BytesVar,","}),
-		false;
-	    'RELATIVE-OID' ->
-		emit({"?RT_BER:decode_relative_oid(",BytesVar,","}),
-		false;
-	    'ObjectDescriptor' ->
-		emit({"?RT_BER:decode_restricted_string(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_ObjectDescriptor},","}),
-		true;
-	    'OCTET STRING' ->
-		emit({"?RT_BER:decode_octet_string",AsBin,"(",BytesVar,",",{asis,Constraint},","}),
-		true;
-	    'NumericString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_NumericString},","}),true;
-	    TString when TString == 'TeletexString';
-			 TString == 'T61String' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_TeletexString},","}),
-		true;
-	    'VideotexString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_VideotexString},","}),
-		true;
-	    'GraphicString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_GraphicString},","})
-		    ,true;
-	    'VisibleString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_VisibleString},","}),
-		true;
-	    'GeneralString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_GeneralString},","}),
-		true;
-	    'PrintableString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_PrintableString},","}),
-		true;
-	    'IA5String' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_IA5String},","}),
-		true;
-	    'UniversalString' ->
-		emit({"?RT_BER:decode_universal_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},","}),
-		true;
-	    'UTF8String' ->
-		emit({"?RT_BER:decode_UTF8_string",AsBin,"(",
-		      BytesVar,","}),
-		false;
-	    'BMPString' ->
-		emit({"?RT_BER:decode_BMP_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},","}),
-		true;
-	    'UTCTime' ->
-		emit({"?RT_BER:decode_utc_time",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},","}),
-		true;
-	    'GeneralizedTime' ->
-		emit({"?RT_BER:decode_generalized_time",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},","}),
-		true;
-	    'ASN1_OPEN_TYPE' ->
-		emit(["?RT_BER:decode_open_type(",re_wrap_erule(Erules),",",
-		      BytesVar,","]),
-		false;
-	    #'ObjectClassFieldType'{} ->
-		case asn1ct_gen:get_inner(Att#type.def) of
-		    {fixedtypevaluefield,_,InnerType} -> 
-			gen_dec_prim(Erules,InnerType,BytesVar,DoTag,TagIn,Length,Form,OptOrMand),
-			false;
-		    'ASN1_OPEN_TYPE' ->
-			emit(["?RT_BER:decode_open_type(",
-			      re_wrap_erule(Erules),",",
-			      BytesVar,","]),
-			false;
-		    XX ->
-			exit({'can not decode' ,XX})
-		end;
-	    Other ->
-		exit({'can not decode' ,Other})
-	end,
-    
-    NewLength = case DoLength of
-		    true -> [", ", Length];
-		    false -> ""
-		end,
-    NewOptOrMand = case OptOrMand of
-		       _ when is_list(OptOrMand) -> OptOrMand;
-		       mandatory -> {asis,mandatory};
-		       _ -> {asis,opt_or_default}
-		   end,
-    case {TagIn,NewTypeName} of
-	{_,#'ObjectClassFieldType'{}} ->
-	    case asn1ct_gen:get_inner(Att#type.def) of
-		'ASN1_OPEN_TYPE' ->
-		    emit([{asis,DoTag},")"]);
-		_ -> ok
-	    end;
-	{[],'ASN1_OPEN_TYPE'} ->
-	    emit([{asis,DoTag},")"]);
-	{_,'ASN1_OPEN_TYPE'} ->
-	    emit([TagIn,"++",{asis,DoTag},")"]);
-	{[],_} ->
-	    emit([{asis,DoTag},NewLength,", ",NewOptOrMand,")"]);
-	_ when is_list(TagIn) ->
-	    emit([TagIn,"++",{asis,DoTag},NewLength,", ",NewOptOrMand,")"])
-    end.
-
-
-int_constr([],[]) ->
-    [];
-int_constr([],ValueRange) ->
-    ValueRange;
-int_constr(SingleValue,[]) ->
-    SingleValue;
-int_constr(SV,VR) ->
-    [SV,VR].
-    
-%% Object code generating for encoding and decoding
-%% ------------------------------------------------
-
-gen_obj_code(Erules,_Module,Obj) when is_record(Obj,typedef) ->
-    ObjName = Obj#typedef.name,
-    Def = Obj#typedef.typespec,
-    #'Externaltypereference'{module=M,type=ClName} = Def#'Object'.classname,
-    Class = asn1_db:dbget(M,ClName),
-
-    {object,_,Fields} = Def#'Object'.def,
-    emit({nl,nl,nl,"%%================================"}),
-    emit({nl,"%%  ",ObjName}),
-    emit({nl,"%%================================",nl}),
-    EncConstructed =
-	gen_encode_objectfields(ClName,get_class_fields(Class),
-				ObjName,Fields,[]),
-    emit(nl),
-    gen_encode_constr_type(Erules,EncConstructed),
-    emit(nl),
-    DecConstructed =
-	gen_decode_objectfields(ClName,get_class_fields(Class),
-				ObjName,Fields,[]),
-    emit(nl),
-    gen_decode_constr_type(Erules,DecConstructed);
-gen_obj_code(_Erules,_Module,Obj) when is_record(Obj,pobjectdef) ->
-    ok.
-
-
-gen_encode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Args) ->
-		emit(["'enc_",ObjName,"'(",{asis,Name},
-		      ", ",Args,", _RestPrimFieldName) ->",nl])
-	end,
-%     emit(["'enc_",ObjName,"'(",{asis,Name},
-% 	  ", Val, TagIn, _RestPrimFieldName) ->",nl]),
-    MaybeConstr=
-	case {get_object_field(Name,ObjectFields),OptOrMand} of
-	    {false,'MANDATORY'} -> %% this case is illegal
-		exit({error,{asn1,{"missing mandatory field in object",
-				   ObjName}}});
-	    {false,'OPTIONAL'} -> %% OPTIONAL field in class
-		EmitFuncClause("Val, _"), %% Value must be anything
-                                          %% already encoded
-		emit(["   {Val,0}"]),
-		[];
-	    {false,{'DEFAULT',DefaultType}} ->
-		EmitFuncClause("Val, TagIn"),
-		gen_encode_default_call(ClassName,Name,DefaultType);
-	    {{Name,TypeSpec},_} ->
-		%% A specified field owerwrites any 'DEFAULT' or
-		%% 'OPTIONAL' field in the class
-		EmitFuncClause("Val, TagIn"),
-		gen_encode_field_call(ObjName,Name,TypeSpec)
-	end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,
-			    MaybeConstr++ConstrAcc);
-gen_encode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    CurrentMod = get(currmod),
-    EmitFuncClause =
-	fun(Args) ->
-		emit(["'enc_",ObjName,"'(",{asis,Name},
-		      ", ",Args,") ->",nl])
-	end,
-%     emit(["'enc_",ObjName,"'(",{asis,Name},
-% 	  ", Val, TagIn, [H|T]) ->",nl]),
-    case {get_object_field(Name,ObjectFields),OptOrMand} of
-	{false,'MANDATORY'} ->
-	    exit({error,{asn1,{"missing mandatory field in object",
-			       ObjName}}});
-	{false,'OPTIONAL'} ->
-	    EmitFuncClause("_,_,_"),
-	    emit(["  exit({error,{'use of missing field in object', ",{asis,Name},
-		  "}})"]);
-	{false,{'DEFAULT',_DefaultObject}} ->
-	    exit({error,{asn1,{"not implemented yet",Name}}});
-	{{Name,#'Externalvaluereference'{module=CurrentMod,
-					 value=TypeName}},_} ->
-	    EmitFuncClause(" Val, TagIn, [H|T]"),
-	    emit({indent(3),"'enc_",TypeName,"'(H, Val, TagIn, T)"});
-	{{Name,#'Externalvaluereference'{module=M,value=TypeName}},_} ->
-	    EmitFuncClause(" Val, TagIn, [H|T]"),
-	    emit({indent(3),"'",M,"':'enc_",TypeName,"'(H, Val, TagIn, T)"});
-	{{Name,TypeSpec},_} ->
-	    EmitFuncClause(" Val, TagIn, [H|T]"),
-	    case TypeSpec#typedef.name of
-		{ExtMod,TypeName} ->
-		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
-			  "'(H, Val, TagIn, T)"});
-		TypeName ->
-		    emit({indent(3),"'enc_",TypeName,"'(H, Val, TagIn, T)"})
-	    end
-    end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
-gen_encode_objectfields(ClassName,[_|Cs],O,OF,Acc) ->
-    gen_encode_objectfields(ClassName,Cs,O,OF,Acc);
-gen_encode_objectfields(_,[],_,_,Acc) ->
-    Acc.
-
-
-% gen_encode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
-%     Fields = Class#objectclass.fields,
-%     MaybeConstr=
-% 	case is_typefield(Fields,FieldName) of
-% 	    true ->
-% 		Def = Type#typedef.typespec,
-% 		OTag = Def#type.tag,
-% 		Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-% 		emit({"'enc_",ObjName,"'(",{asis,FieldName},
-% 		      ", Val, TagIn, RestPrimFieldName) ->",nl}),
-% 		CAcc=
-% 		case Type#typedef.name of
-% 		    {primitive,bif} ->
-% 			gen_encode_prim(ber,Def,["TagIn ++ ",{asis,Tag}],
-% 					"Val"),
-% 			[];
-% 		    {constructed,bif} ->
-% 			%%InnerType = asn1ct_gen:get_inner(Def#type.def),
-% 			%%asn1ct_gen:gen_encode_constructed(ber,[ObjName],
-% 			%%                            InnerType,Def);
-% 			emit({"   'enc_",ObjName,'_',FieldName,
-% 			      "'(Val, TagIn ++ ",{asis,Tag},")"}),
-% 			[{['enc_',ObjName,'_',FieldName],Def}];
-% 		    {ExtMod,TypeName} ->
-% 			emit({"   '",ExtMod,"':'enc_",TypeName,
-% 			      "'(Val, TagIn ++ ",{asis,Tag},")"}),
-% 			[];
-% 		    TypeName ->
-% 			emit({"   'enc_",TypeName,"'(Val, TagIn ++ ",
-% 			      {asis,Tag},")"}),
-% 			[]
-% 		end,
-% 		case more_genfields(Fields,Rest) of
-% 		    true ->
-% 			emit({";",nl});
-% 		    false ->
-% 			emit({".",nl})
-% 		end,
-% 		CAcc;
-% 	{false,objectfield} ->
-% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
-% 		  ", Val, TagIn, [H|T]) ->",nl}),
-% 	    case Type#typedef.name of
-% 		{ExtMod,TypeName} ->
-% 		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
-% 			  "'(H, Val, TagIn, T)"});
-% 		TypeName ->
-% 		    emit({indent(3),"'enc_",TypeName,"'(H, Val, TagIn, T)"})
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    [];
-% 	{false,_} -> []
-%     end,
-%     gen_encode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
-% gen_encode_objectfields(C,O,[H|T],Acc) ->
-%     gen_encode_objectfields(C,O,T,Acc);
-% gen_encode_objectfields(_,_,[],Acc) ->
-%     Acc.
-
-% gen_encode_constr_type([{Name,Def}|Rest]) ->
-%     emit({Name,"(Val,TagIn) ->",nl}),
-%     InnerType = asn1ct_gen:get_inner(Def#type.def),
-%     asn1ct_gen:gen_encode_constructed(ber,Name,InnerType,Def),
-%     gen_encode_constr_type(Rest);
-gen_encode_constr_type(Erules,[TypeDef|Rest]) when is_record(TypeDef,typedef) ->
-    case is_already_generated(enc,TypeDef#typedef.name) of
-	true -> ok;
-	_ -> gen_encode_user(Erules,TypeDef)
-    end,
-    gen_encode_constr_type(Erules,Rest);
-gen_encode_constr_type(_,[]) ->
-    ok.
-
-gen_encode_field_call(_ObjName,_FieldName,
-		      #'Externaltypereference'{module=M,type=T}) ->
-    CurrentMod = get(currmod),
-    TDef = asn1_db:dbget(M,T),
-    Def = TDef#typedef.typespec,
-    OTag = Def#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    if
-	M == CurrentMod ->
-	    emit({"   'enc_",T,"'(Val, TagIn ++ ",{asis,Tag},")"}),
-	    [];
-	true ->
-	    emit({"   '",M,"':'enc_",T,"'(Val, TagIn ++ ",{asis,Tag},")"}),
-	    []
-    end;
-gen_encode_field_call(ObjName,FieldName,Type) ->
-    Def = Type#typedef.typespec,
-    OTag = Def#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case Type#typedef.name of
-	{primitive,bif} -> %%tag should be the primitive tag
-	    gen_encode_prim(ber,Def,["TagIn ++ ",{asis,Tag}],
-			    "Val"),
-	    [];
-	{constructed,bif} ->
-	    emit({"   'enc_",ObjName,'_',FieldName,
-		  "'(Val, TagIn ++",{asis,Tag},")"}),
-	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-	{ExtMod,TypeName} ->
-	    emit({"   '",ExtMod,"':'enc_",TypeName,
-		  "'(Val, TagIn ++ ",{asis,Tag},")"}),
-	    [];
-	TypeName ->
-	    emit({"   'enc_",TypeName,"'(Val, TagIn ++ ",{asis,Tag},")"}),
-	    []
-    end.
-
-gen_encode_default_call(ClassName,FieldName,Type) ->
-    CurrentMod = get(currmod),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case asn1ct_gen:type(InnerType) of
-    	{constructed,bif} ->
-%%	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
-	    emit(["   'enc_",ClassName,'_',FieldName,"'(Bytes, TagIn ++ ",
-		  {asis,Tag},")"]),
-	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
-		      typespec=Type}];
-	{primitive,bif} ->
-	    gen_encode_prim(ber,Type,["TagIn ++ ",{asis,Tag}],"Val"),
-	    [];
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'enc_",Etype,"'(Val, TagIn ++ ",{asis,Tag},")",nl]),
-	    [];
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'enc_",Etype,"'(Val, TagIn ++ ",{asis,Tag},")",nl]),
-	    []
-    end.
-    
-
-
-gen_decode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Args) ->
-		emit(["'dec_",ObjName,"'(",{asis,Name},
-		      ", ",Args,"_) ->",nl])
-	end,
-%     emit(["'dec_",ObjName,"'(",{asis,Name},
-% 	  ", Bytes, TagIn, RestPrimFieldName) ->",nl]),
-    MaybeConstr=
-	case {get_object_field(Name,ObjectFields),OptOrMand} of
-	    {false,'MANDATORY'} -> %% this case is illegal
-		exit({error,{asn1,{"missing mandatory field in object",
-				   ObjName}}});
-	    {false,'OPTIONAL'} ->
-		EmitFuncClause("Bytes, _,"),
-%		emit(["   asn1_NOVALUE"]),
-		emit(["   {Bytes,[],0}"]),
-		[];
-	    {false,{'DEFAULT',DefaultType}} ->
-		EmitFuncClause("Bytes, TagIn,"),
-		gen_decode_default_call(ClassName,Name,"Bytes",DefaultType);
-	    {{Name,TypeSpec},_} ->
-		%% A specified field owerwrites any 'DEFAULT' or
-		%% 'OPTIONAL' field in the class
-		EmitFuncClause("Bytes, TagIn,"),
-		gen_decode_field_call(ObjName,Name,"Bytes",TypeSpec)
-	end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,MaybeConstr++ConstrAcc);
-gen_decode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    CurrentMod = get(currmod),
-    EmitFuncClause =
-	fun(Args) ->
-		emit(["'dec_",ObjName,"'(",{asis,Name},
-		      ", ",Args,") ->",nl])
-	end,
-%     emit(["'dec_",ObjName,"'(",{asis,Name},
-% 	  ", Bytes,TagIn,[H|T]) ->",nl]),
-    case {get_object_field(Name,ObjectFields),OptOrMand} of
-	{false,'MANDATORY'} ->
-	    exit({error,{asn1,{"missing mandatory field in object",
-			       ObjName}}});
-	{false,'OPTIONAL'} ->
-	    EmitFuncClause("_,_,_"),
-	    emit(["  exit({error,{'illegal use of missing field in object', ",{asis,Name},
-		  "}})"]);
-	{false,{'DEFAULT',_DefaultObject}} ->
-	    exit({error,{asn1,{"not implemented yet",Name}}});
-	{{Name,#'Externalvaluereference'{module=CurrentMod,
-					 value=TypeName}},_} ->
-	    EmitFuncClause("Bytes,TagIn,[H|T]"),
-	    emit({indent(3),"'dec_",TypeName,"'(H, Bytes, TagIn, T)"});
-	{{Name,#'Externalvaluereference'{module=M,value=TypeName}},_} ->
-	    EmitFuncClause("Bytes,TagIn,[H|T]"),
-	    emit({indent(3),"'",M,"':'dec_",TypeName,
-		  "'(H, Bytes, TagIn, T)"});
-	{{Name,TypeSpec},_} ->
-	    EmitFuncClause("Bytes,TagIn,[H|T]"),
-	    case TypeSpec#typedef.name of
-		{ExtMod,TypeName} ->
-		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
-			  "'(H, Bytes, TagIn, T)"});
-		TypeName ->
-		    emit({indent(3),"'dec_",TypeName,"'(H, Bytes, TagIn, T)"})
-	    end
-    end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
-gen_decode_objectfields(CN,[_|Cs],O,OF,CAcc) ->
-    gen_decode_objectfields(CN,Cs,O,OF,CAcc);
-gen_decode_objectfields(_,[],_,_,CAcc) ->
-    CAcc.
-
-
-gen_decode_constr_type(Erules,[TypeDef|Rest]) when is_record(TypeDef,typedef) ->
-    case is_already_generated(dec,TypeDef#typedef.name) of
-	true -> ok;
-	_ ->
-	    gen_decode(Erules,TypeDef)
-    end,
-    gen_decode_constr_type(Erules,Rest);
-gen_decode_constr_type(_,[]) ->
-    ok.
-
-gen_decode_field_call(_ObjName,_FieldName,Bytes,
-		      #'Externaltypereference'{module=M,type=T}) ->
-    CurrentMod = get(currmod),
-    TDef = asn1_db:dbget(M,T),
-    Def = TDef#typedef.typespec,
-    OTag = Def#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    if
-	M == CurrentMod ->
-	    emit({"   'dec_",T,"'(",Bytes,
-		  ", opt_or_default,TagIn ++ ",{asis,Tag},")"}),
-	    [];
-	true ->
-	    emit({"   '",M,"':'dec_",T,
-		  "'(",Bytes,", opt_or_default,TagIn ++ ",{asis,Tag},")"}),
-	    []
-    end;
-gen_decode_field_call(ObjName,FieldName,Bytes,Type) ->
-    Def = Type#typedef.typespec,
-    OTag = Def#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case Type#typedef.name of
-	{primitive,bif} -> %%tag should be the primitive tag
-	    gen_dec_prim(ber,Def,Bytes,Tag,"TagIn",no_length,
-			 ?PRIMITIVE,opt_or_default),
-	    [];
-	{constructed,bif} ->
-	    emit({"   'dec_",ObjName,'_',FieldName,
-		  "'(",Bytes,",opt_or_default, TagIn ++ ",{asis,Tag},")"}),
-	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-	{ExtMod,TypeName} ->
-	    emit({"   '",ExtMod,"':'dec_",TypeName,
-		  "'(",Bytes,", opt_or_default,TagIn ++ ",{asis,Tag},")"}),
-	    [];
-	TypeName ->
-	    emit({"   'dec_",TypeName,"'(",Bytes,
-		  ", opt_or_default,TagIn ++ ",{asis,Tag},")"}),
-	    []
-    end.
-
-gen_decode_default_call(ClassName,FieldName,Bytes,Type) ->
-    CurrentMod = get(currmod),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case asn1ct_gen:type(InnerType) of
-    	{constructed,bif} ->
-	    emit(["   'dec_",ClassName,'_',FieldName,"'(",Bytes,
-		  ",opt_or_default, TagIn ++ ",{asis,Tag},")"]),
-	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
-		      typespec=Type}];
-	{primitive,bif} ->
-	    gen_dec_prim(ber,Type,Bytes,Tag,"TagIn",no_length,
-			 ?PRIMITIVE,opt_or_default),
-	    [];
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'dec_",Etype,"'(",Bytes,
-		  " ,opt_or_default, TagIn ++ ",{asis,Tag},")",nl]),
-	    [];
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'dec_",Etype,"'(",Bytes,
-		  ", opt_or_defualt, TagIn ++ ",{asis,Tag},")",nl]),
-	    []
-    end.
-
-    
-more_genfields([]) ->
-    false;
-more_genfields([Field|Fields]) ->
-    case element(1,Field) of
-	typefield ->
-	    true;
-	objectfield ->
-	    true;
-	_ ->
-	    more_genfields(Fields)
-    end.
-
-
-
-%% Object Set code generating for encoding and decoding
-%% ----------------------------------------------------
-gen_objectset_code(Erules,ObjSet) ->
-    ObjSetName = ObjSet#typedef.name,
-    Def = ObjSet#typedef.typespec,
-%    {ClassName,ClassDef} = Def#'ObjectSet'.class,
-    #'Externaltypereference'{module=ClassModule,
-			     type=ClassName} = Def#'ObjectSet'.class,
-    ClassDef = asn1_db:dbget(ClassModule,ClassName),
-    UniqueFName = Def#'ObjectSet'.uniquefname,
-    Set = Def#'ObjectSet'.set,
-    emit({nl,nl,nl,"%%================================"}),
-    emit({nl,"%%  ",ObjSetName}),
-    emit({nl,"%%================================",nl}),
-    case ClassName of
-	{_Module,ExtClassName} ->
-	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
-			    ExtClassName,ClassDef);
-	_ ->
-	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
-			    ClassName,ClassDef)
-    end,
-    emit(nl).
-
-gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassDef)->
-    ClassFields = (ClassDef#classdef.typespec)#objectclass.fields,
-    InternalFuncs=gen_objset_enc(ObjSetName,UniqueFName,Set,ClassName,ClassFields,1,[]),
-    gen_objset_dec(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassFields,1),
-    gen_internal_funcs(Erules,InternalFuncs).
-
-    
-%% gen_objset_enc iterates over the objects of the object set
-gen_objset_enc(_,{unique,undefined},_,_,_,_,_) ->
-    %% There is no unique field in the class of this object set
-    %% don't bother about the constraint
-    [];
-gen_objset_enc(ObjSName,UniqueName,[{_,no_unique_value,_},T|Rest],
-	       ClName,ClFields,NthObj,Acc) ->
-    %% No need to check that this class has property OPTIONAL for the
-    %% unique field, it was detected in the previous phase
-    gen_objset_enc(ObjSName,UniqueName,[T|Rest],ClName,ClFields,NthObj,Acc);
-gen_objset_enc(ObjSetName,UniqueName,[{_,no_unique_value,_}],
-	       _ClName,_ClFields,_NthObj,Acc) ->
-    %% No need to check that this class has property OPTIONAL for the
-    %% unique field, it was detected in the previous phase
-    emit_default_getenc(ObjSetName,UniqueName),
-    emit({".",nl,nl}),
-    Acc;
-gen_objset_enc(ObjSName,UniqueName,
-	       [{ObjName,Val,Fields},T|Rest],ClName,ClFields,NthObj,Acc)->
-    emit({"'getenc_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},") ->",nl}),
-    CurrMod = get(currmod),
-    {InternalFunc,NewNthObj}=
-	case ObjName of
-	    {no_mod,no_name} ->
-		gen_inlined_enc_funs(Fields,ClFields,ObjSName,NthObj);
-	    {CurrMod,Name} ->
-		emit({"    fun 'enc_",Name,"'/4"}),
-		{[],NthObj};
-	    {ModuleName,Name} ->
-		emit_ext_fun(enc,ModuleName,Name),
-%		emit(["    {'",ModuleName,"', 'enc_",Name,"'}"]),
-		{[],NthObj};
-	    _Other ->
-		emit({"    fun 'enc_",ObjName,"'/4"}),
-		{[],NthObj}
-	end,
-    emit({";",nl}),
-    gen_objset_enc(ObjSName,UniqueName,[T|Rest],ClName,ClFields,
-		   NewNthObj,InternalFunc ++ Acc);
-gen_objset_enc(ObjSetName,UniqueName,
-	       [{ObjName,Val,Fields}],_ClName,ClFields,NthObj,Acc) ->
-    emit({"'getenc_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},") ->",nl}),
-    CurrMod = get(currmod),
-    {InternalFunc,_}=
-	case ObjName of
-	    {no_mod,no_name} ->
-		gen_inlined_enc_funs(Fields,ClFields,ObjSetName,NthObj);
-	    {CurrMod,Name} ->
-		emit({"    fun 'enc_",Name,"'/4"}),
-		{[],NthObj};
-	    {ModuleName,Name} ->
-		emit_ext_fun(enc,ModuleName,Name),
-%		emit(["    {'",ModuleName,"', 'enc_",Name,"'}"]),
-		{[],NthObj};
-	    _Other ->
-		emit({"    fun 'enc_",ObjName,"'/4"}),
-		{[],NthObj}
-	end,
-    emit([";",nl]),
-    emit_default_getenc(ObjSetName,UniqueName),
-    emit({".",nl,nl}),
-    InternalFunc ++ Acc;
-%% See X.681 Annex E for the following case
-gen_objset_enc(ObjSetName,_UniqueName,['EXTENSIONMARK'],
-	       _ClName,_ClFields,_NthObj,Acc) ->
-    emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
-    emit({indent(3),"fun(_Attr, Val, _TagIn, _RestPrimFieldName) ->",nl}),
-    emit({indent(6),"Len = case Val of",nl,indent(9),
- 	  "Bin when is_binary(Bin) -> size(Bin);",nl,indent(9),
- 	  "_ -> length(Val)",nl,indent(6),"end,"}),
-    emit({indent(6),"{Val,Len}",nl}),
-    emit({indent(3),"end.",nl,nl}),
-    Acc;
-gen_objset_enc(ObjSetName,UniqueName,['EXTENSIONMARK','EXTENSIONMARK'|Rest],
-	       ClName,ClFields,NthObj,Acc) ->
-    gen_objset_enc(ObjSetName,UniqueName,['EXTENSIONMARK'|Rest],
-		   ClName,ClFields,NthObj,Acc);
-gen_objset_enc(ObjSetName,UniqueName,['EXTENSIONMARK'|Rest],
-	       ClName,ClFields,NthObj,Acc) ->
-    gen_objset_enc(ObjSetName,UniqueName,Rest++['EXTENSIONMARK'],
-		   ClName,ClFields,NthObj,Acc);
-gen_objset_enc(_,_,[],_,_,_,Acc) ->
-    Acc.
-
-emit_ext_fun(EncDec,ModuleName,Name) ->
-    emit([indent(3),"fun(T,V,_O1,_O2) -> '",ModuleName,"':'",EncDec,"_",
-	  Name,"'(T,V,_O1,_O2) end"]).
-
-emit_default_getenc(ObjSetName,UniqueName) ->
-    emit(["'getenc_",ObjSetName,"'(",{asis,UniqueName},", ErrV) ->",nl]),
-    emit([indent(3),"fun(C,V,_,_) -> exit({'Type not compatible with table constraint',{component,C},{value,V}, {unique_name_and_value,",{asis,UniqueName},", ErrV}}) end"]).
-
-%% gen_inlined_enc_funs for each object iterates over all fields of a
-%% class, and for each typefield it checks if the object has that
-%% field and emits the proper code.
-gen_inlined_enc_funs(Fields,[{typefield,Name,_}|Rest],ObjSetName,
-		     NthObj) ->
-    CurrMod = get(currmod),
-    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when is_record(Type,type) ->
-	    emit({indent(3),"fun(Type, Val, TagIn, _RestPrimFieldName) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    {Ret,N} = emit_inner_of_fun(Type,InternalDefFunName),
-	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
-	{value,{_,Type}} when is_record(Type,typedef) ->
-	    emit({indent(3),"fun(Type, Val, TagIn, _RestPrimFieldName) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    {Ret,N} = emit_inner_of_fun(Type,InternalDefFunName),
-	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
-	{value,{_,#'Externaltypereference'{module=M,type=T}}} ->
-	    #typedef{typespec=Type} = asn1_db:dbget(M,T),
-	    OTag = Type#type.tag,
-	    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-	    emit([indent(3),"fun(Type, Val, TagIn, _RestPrimFieldName) ->",nl,
-		  indent(6),"case Type of",nl]),
-	    emit([indent(9),{asis,Name}," ->",nl]),
-	    if
-		M == CurrMod ->
-		    emit([indent(12),"'enc_",T,"'(Val, TagIn ++ ",
-			  {asis,Tag},")"]);
-		true ->
-		    emit([indent(12),"'",M,"':'enc_",T,"'(Val,TagIn ++",
-			  {asis,Tag},")"])
-	    end,
-	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj,[]);
-	false ->
-	    %% This field was not present in the object thus there were no
-	    %% type in the table and we therefore generate code that returns
-	    %% the input for application treatment.
-	    emit([indent(3),"fun(Type, Val, TagIn, _RestPrimFieldName) ->",nl,
-		  indent(6),"case Type of",nl]),
-	    emit([indent(9),{asis,Name}," ->",nl]),
-	    emit([indent(12),"Len = case Val of",nl,
-		  indent(15),"Bin when is_binary(Bin) -> size(Bin);",nl,
-		  indent(15),"_ -> length(Val)",nl,indent(12),"end,",nl,
-		  indent(12),"{Val,Len}"]),
-	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj,[])
-    end;
-gen_inlined_enc_funs(Fields,[_H|Rest],ObjSetName,NthObj) ->
-    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_enc_funs(_,[],_,NthObj) ->
-    {[],NthObj}.
-
-gen_inlined_enc_funs1(Fields,[{typefield,Name,_}|Rest],ObjSetName,
-		      NthObj,Acc) ->
-    CurrMod = get(currmod),
-    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
-    {Acc2,NAdd}=
-	case lists:keysearch(Name,1,Fields) of
-	    {value,{_,Type}} when is_record(Type,type) ->
-		emit({";",nl}),
-		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-		{Ret++Acc,N};
-	    {value,{_,Type}} when is_record(Type,typedef) ->
-		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-		{Ret++Acc,N};
-	    {value,{_,#'Externaltypereference'{module=M,type=T}}} ->
-		#typedef{typespec=Type} = asn1_db:dbget(M,T),
-		OTag = Type#type.tag,
-		Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-		if
-		    M == CurrMod ->
-			emit([indent(12),"'enc_",T,"'(Val, TagIn ++ ",
-			      {asis,Tag},")"]);
-		    true ->
-			emit([indent(12),"'",M,"':'enc_",T,"'(Val,TagIn ++",
-			      {asis,Tag},")"])
-		end,
-		{Acc,0};
-	    false ->
-		%% This field was not present in the object thus there were no
-		%% type in the table and we therefore generate code that returns
-		%% the input for application treatment.
-		emit([";",nl,indent(9),{asis,Name}," ->",nl]),
-		emit([indent(12),"Len = case Val of",nl,
-		      indent(15),"Bin when is_binary(Bin) -> size(Bin);",nl,
-		      indent(15),"_ -> length(Val)",nl,indent(12),"end,",nl,
-		      indent(12),"{Val,Len}"]),
-		{Acc,0}
-	end,
-    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+NAdd,Acc2);
-gen_inlined_enc_funs1(Fields,[_H|Rest],ObjSetName,NthObj,Acc)->
-    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj,Acc);
-gen_inlined_enc_funs1(_,[],_,NthObj,Acc) ->
-    emit({nl,indent(6),"end",nl}),
-    emit({indent(3),"end"}),
-    {Acc,NthObj}.
-
-
-emit_inner_of_fun(TDef = #typedef{name={ExtMod,Name},typespec=Type},
-		  InternalDefFunName) ->
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case {ExtMod,Name} of
-	{primitive,bif} ->
-	    emit(indent(12)),
-	    gen_encode_prim(ber,Type,["TagIn ++ ",{asis,Tag}],"Val"),
-	    {[],0};
-	{constructed,bif} ->
-	    emit([indent(12),"'enc_",
-		  InternalDefFunName,"'(Val,TagIn ++ ",
-		  {asis,Tag},")"]),
-	    {[TDef#typedef{name=InternalDefFunName}],1};
-	_ ->
-	    emit({indent(12),"'",ExtMod,"':'enc_",Name,"'(Val, TagIn ++ ",
-		  {asis,Tag},")"}),
-	    {[],0}
-    end;
-emit_inner_of_fun(#typedef{name=Name,typespec=Type},_) ->
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    emit({indent(12),"'enc_",Name,"'(Val, TagIn ++ ",{asis,Tag},")"}),
-    {[],0};
-emit_inner_of_fun(Type,_) when is_record(Type,type) ->
-    CurrMod = get(currmod),
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case Type#type.def of
-	Def when is_atom(Def) ->
-	    emit({indent(9),Def," ->",nl,indent(12)}),
-	    gen_encode_prim(ber,Type,["TagIn ++ ",{asis,Tag}],"Val");
-	TRef when is_record(TRef,typereference) ->
-	    T = TRef#typereference.val,
-	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,
-		  "'(Val, TagIn ++ ",{asis,Tag},")"});
-	#'Externaltypereference'{module=CurrMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,
-		  "'(Val, TagIn ++ ",{asis,Tag},")"});
-	#'Externaltypereference'{module=ExtMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'enc_",
-		  T,"'(Val, TagIn ++ ",{asis,Tag},")"})
-    end,
-    {[],0}.
-
-indent(N) ->
-    lists:duplicate(N,32). % 32 = space
-
-
-gen_objset_dec(_,_,{unique,undefined},_,_,_,_) ->
-    %% There is no unique field in the class of this object set
-    %% don't bother about the constraint
-    ok;
-gen_objset_dec(Erules,ObjSName,UniqueName,[{_,no_unique_value,_},T|Rest],
-	       ClName,ClFields,NthObj)->
-    gen_objset_dec(Erules,ObjSName,UniqueName,[T|Rest],ClName,ClFields,
-		   NthObj);
-gen_objset_dec(_Erules,ObjSetName,UniqueName,[{_,no_unique_value,_}],
-	       _ClName,_ClFields,_NthObj)->
-    emit_default_getdec(ObjSetName,UniqueName),
-    emit({".",nl,nl});
-gen_objset_dec(Erules,ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
-	       ClName,ClFields,NthObj)->
-    emit({"'getdec_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},
-	  ") ->",nl}),
-    CurrMod = get(currmod),
-    NewNthObj=
-	case ObjName of
-	    {no_mod,no_name} ->
-		gen_inlined_dec_funs(Erules,Fields,ClFields,ObjSName,
-				     NthObj);
-	    {CurrMod,Name} ->
-		emit({"    fun 'dec_",Name,"'/4"}),
-		NthObj;
-	    {ModName,Name} ->
-		emit_ext_fun(dec,ModName,Name),
-%		emit(["    {'",ModName,"', 'dec_",Name,"'}"]),
-		NthObj;
-	    _Other ->
-		emit({"    fun 'dec_",ObjName,"'/4"}),
-		NthObj
-	end,
-    emit({";",nl}),
-    gen_objset_dec(Erules,ObjSName,UniqueName,[T|Rest],ClName,ClFields,
-		   NewNthObj);
-gen_objset_dec(Erules,ObjSetName,UniqueName,[{ObjName,Val,Fields}],_ClName,
-	       ClFields,NthObj) ->
-    emit({"'getdec_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},") ->",nl}),
-    CurrMod = get(currmod),
-    case ObjName of
-	{no_mod,no_name} ->
-	    gen_inlined_dec_funs(Erules,Fields,ClFields,ObjSetName,
-				 NthObj);
-	{CurrMod,Name} ->
-	    emit({"    fun 'dec_",Name,"'/4"});
-	{ModName,Name} ->
-	    emit_ext_fun(dec,ModName,Name);
-%	    emit(["    {'",ModName,"', 'dec_",Name,"'}"]);
-	_Other ->
-	    emit({"    fun 'dec_",ObjName,"'/4"})
-    end,
-    emit({";",nl}),
-    emit_default_getdec(ObjSetName,UniqueName),
-    emit({".",nl,nl});
-gen_objset_dec(_,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,_ClFields,
-	      _NthObj) ->
-    emit({"'getdec_",ObjSetName,"'(_, _) ->",nl}),
-    emit({indent(3),"fun(_, Bytes, _, _) ->",nl}),
-    emit({indent(6),"Len = case Bytes of",nl,indent(9),
- 	  "Bin when is_binary(Bin) -> size(Bin);",nl,indent(9),
- 	  "_ -> length(Bytes)",nl,indent(6),"end,"}),
-    emit({indent(6),"{Bytes,[],Len}",nl}),
-    emit({indent(3),"end.",nl,nl}),
-    ok;
-gen_objset_dec(Erule,ObjSetName,UniqueName,
-	       ['EXTENSIONMARK','EXTENSIONMARK'|Rest],
-	       ClName,ClFields,NthObj) ->
-    gen_objset_dec(Erule,ObjSetName,UniqueName,['EXTENSIONMARK'|Rest],
-		   ClName,ClFields,NthObj);
-gen_objset_dec(Erule,ObjSetName,UniqueName,['EXTENSIONMARK'|Rest],
-	       ClName,ClFields,NthObj) ->
-    gen_objset_dec(Erule,ObjSetName,UniqueName,Rest++['EXTENSIONMARK'],
-		   ClName,ClFields,NthObj);
-gen_objset_dec(_,_,_,[],_,_,_) ->
-    ok.
-
-emit_default_getdec(ObjSetName,UniqueName) ->
-    emit(["'getdec_",ObjSetName,"'(",{asis,UniqueName},", ErrV) ->",nl]),
-    emit([indent(3),"fun(C,V,_,_) -> exit({{component,C},{value,V}, {unique_name_and_value,",{asis,UniqueName},", ErrV}}) end"]).
-
-gen_inlined_dec_funs(Erules,Fields,[{typefield,Name,Prop}|Rest],
-		     ObjSetName,NthObj) ->
-    DecProp = case Prop of
-		  'OPTIONAL' -> opt_or_default;
-		  {'DEFAULT',_} -> opt_or_default;
-		  _ -> mandatory
-	      end,
-    CurrMod = get(currmod),
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when is_record(Type,type) ->
-	    emit({indent(3),"fun(Type, Bytes, TagIn, _RestPrimFieldName) ->",
-		  nl,indent(6),"case Type of",nl}),
-	    N=emit_inner_of_decfun(Erules,Type,DecProp,InternalDefFunName),
-	    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj+N);
-	{value,{_,Type}} when is_record(Type,typedef) ->
-	    emit({indent(3),"fun(Type, Bytes, TagIn, _RestPrimFieldName) ->",
-		  nl,indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    N=emit_inner_of_decfun(Erules,Type,DecProp,InternalDefFunName),
-	    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj+N);
-	{value,{_,#'Externaltypereference'{module=M,type=T}}} ->
-	    #typedef{typespec=Type} = asn1_db:dbget(M,T),
-	    OTag = Type#type.tag,
-	    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-	    emit({indent(3),"fun(Type, Bytes, TagIn, _RestPrimFieldName) ->",
-		  nl,indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    if
-		M == CurrMod ->
-		    emit([indent(12),"'dec_",T,"'(Bytes, ",DecProp,
-			  ", TagIn ++ ",{asis,Tag},")"]);
-		true ->
-		    emit([indent(12),"'",M,"':'dec_",T,"'(Bytes, ",
-			  DecProp,", TagIn ++ ",{asis,Tag},")"])
-	    end,
-	    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj);
-	false ->
-	    emit([indent(3),"fun(Type, Bytes, TagIn, _RestPrimFieldName) ->",
-		  nl,indent(6),"case Type of",nl,
-		  indent(9),{asis,Name}," ->",nl,
-		  indent(12),"Len = case Bytes of",nl,
-		  indent(15),"B when is_binary(B) -> size(B);",nl,
-		  indent(15),"_ -> length(Bytes)",nl,
-		  indent(12),"end,",nl,
-		  indent(12),"{Bytes,[],Len}"]),
-	    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj)
-    end;
-gen_inlined_dec_funs(Erules,Fields,[_H|Rest],ObjSetName,NthObj) ->
-    gen_inlined_dec_funs(Erules,Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs(_,_,[],_,NthObj) ->
-    NthObj.
-
-gen_inlined_dec_funs1(Erules,Fields,[{typefield,Name,Prop}|Rest],
-		      ObjSetName,NthObj) ->
-    DecProp = case Prop of
-		  'OPTIONAL' -> opt_or_default;
-		  {'DEFAULT',_} -> opt_or_default;
-		  _ -> mandatory
-	      end,
-    CurrMod = get(currmod),
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    N=
-	case lists:keysearch(Name,1,Fields) of
-	    {value,{_,Type}} when is_record(Type,type) ->
-		emit({";",nl}),
-		emit_inner_of_decfun(Erules,Type,DecProp,InternalDefFunName);
-	    {value,{_,Type}} when is_record(Type,typedef) ->
-		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-		emit_inner_of_decfun(Erules,Type,DecProp,InternalDefFunName);
-	    {value,{_,#'Externaltypereference'{module=M,type=T}}} ->
-		#typedef{typespec=Type} = asn1_db:dbget(M,T),
-		OTag = Type#type.tag,
-		Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-		if
-		    M == CurrMod ->
-			emit([indent(12),"'dec_",T,"'(Bytes, ",DecProp,
-			      ", TagIn ++ ",{asis,Tag},")"]);
-		    true ->
-			emit([indent(12),"'",M,"':'dec_",T,"'(Bytes, ",
-			      DecProp,", TagIn ++ ",{asis,Tag},")"])
-		end,
-		0;
-	    false ->
-		emit([";",nl,
-		      indent(9),{asis,Name}," ->",nl,
-		      indent(12),"Len = case Bytes of",nl,
-		      indent(15),"B when is_binary(B) -> size(B);",nl,
-		      indent(15),"_ -> length(Bytes)",nl,
-		      indent(12),"end,",nl,
-		      indent(12),"{Bytes,[],Len}"]),
-		0
-	end,
-    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj+N);
-gen_inlined_dec_funs1(Erules,Fields,[_H|Rest],ObjSetName,NthObj)->
-    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs1(_,_,[],_,NthObj) ->
-    emit({nl,indent(6),"end",nl}),
-    emit({indent(3),"end"}),
-    NthObj.
-
-emit_inner_of_decfun(Erules,#typedef{name={ExtName,Name},typespec=Type},
-		     Prop,InternalDefFunName) ->
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case {ExtName,Name} of
-	{primitive,bif} ->
-	    emit(indent(12)),
-	    gen_dec_prim(Erules,Type,"Bytes",Tag,"TagIn",no_length,
-			 ?PRIMITIVE,Prop),
-	    0;
-	{constructed,bif} ->
-	    emit({indent(12),"'dec_",
-		  asn1ct_gen:list2name(InternalDefFunName),"'(Bytes, ",Prop,
-		  ", TagIn ++ ",{asis,Tag},")"}),
-	    1;
-	_ ->
-	    emit({indent(12),"'",ExtName,"':'dec_",Name,"'(Bytes, ",Prop,
-		  ", TagIn ++ ",{asis,Tag},")"}),
-	    0
-    end;
-emit_inner_of_decfun(_,#typedef{name=Name,typespec=Type},Prop,_) ->
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    emit({indent(12),"'dec_",Name,"'(Bytes, ",Prop,", TagIn ++ ",
-	  {asis,Tag},")"}),
-    0;
-emit_inner_of_decfun(Erules,Type,Prop,_) when is_record(Type,type) ->
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    CurrMod = get(currmod),
-    Def = Type#type.def,
-    InnerType = asn1ct_gen:get_inner(Def),
-    WhatKind = asn1ct_gen:type(InnerType),
-    case WhatKind of
-	{primitive,bif} -> 
-	    emit({indent(9),Def," ->",nl,indent(12)}),
-	    gen_dec_prim(Erules,Type,"Bytes",Tag,"TagIn",no_length,
-			 ?PRIMITIVE,Prop);
-%	TRef when is_record(TRef,typereference) ->
-%	    T = TRef#typereference.val,
-%	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,"'(Val)"});
-	#'Externaltypereference'{module=CurrMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,
-		  "'(Bytes, ",Prop,", TagIn ++ ",{asis,Tag},")"});
-	#'Externaltypereference'{module=ExtMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'dec_",
-		  T,"'(Bytes, ",Prop,", TagIn ++ ",{asis,Tag},")"})
-    end,
-    0.
-
-
-gen_internal_funcs(_,[]) ->
-    ok;
-gen_internal_funcs(Erules,[TypeDef|Rest]) ->
-    gen_encode_user(Erules,TypeDef),
-    emit({"'dec_",TypeDef#typedef.name,"'(Bytes, ",
-	  unused_optormand_var("OptOrMand",(TypeDef#typedef.typespec)#type.def),", TagIn) ->",nl}),
-    gen_decode_user(Erules,TypeDef),
-    gen_internal_funcs(Erules,Rest).
-
-
-dbdec(Type) ->
-    demit({"io:format(\"decoding: ",{asis,Type},"~w~n\",[Bytes]),",nl}).
-
-
-decode_class('UNIVERSAL') ->
-    ?UNIVERSAL;
-decode_class('APPLICATION') ->
-    ?APPLICATION;
-decode_class('CONTEXT') ->
-    ?CONTEXT;
-decode_class('PRIVATE') ->
-    ?PRIVATE.
-
-decode_type('BOOLEAN') -> 1;
-decode_type('INTEGER') -> 2;
-decode_type('BIT STRING') -> 3; 
-decode_type('OCTET STRING') -> 4; 
-decode_type('NULL') -> 5;
-decode_type('OBJECT IDENTIFIER') -> 6;
-decode_type('ObjectDescriptor') -> 7;
-decode_type('EXTERNAL') -> 8;
-decode_type('REAL') -> 9;
-decode_type('ENUMERATED') -> 10;
-decode_type('EMBEDDED_PDV') -> 11;
-decode_type('UTF8String') -> 12;
-decode_type('RELATIVE-OID') -> 13;
-decode_type('SEQUENCE') -> 16;
-decode_type('SEQUENCE OF') -> 16;
-decode_type('SET') -> 17;
-decode_type('SET OF') -> 17;
-decode_type('NumericString') -> 18;  
-decode_type('PrintableString') -> 19;  
-decode_type('TeletexString') -> 20;  
-decode_type('T61String') -> 20;  
-decode_type('VideotexString') -> 21;  
-decode_type('IA5String') -> 22;  
-decode_type('UTCTime') -> 23;  
-decode_type('GeneralizedTime') -> 24;  
-decode_type('GraphicString') -> 25;  
-decode_type('VisibleString') -> 26;  
-decode_type('GeneralString') -> 27;  
-decode_type('UniversalString') -> 28;  
-decode_type('BMPString') -> 30;
-decode_type('CHOICE') -> 'CHOICE'; % choice gets the tag from the actual alternative  
-decode_type(Else) -> exit({error,{asn1,{unrecognized_type,Else}}}).
-
-add_removed_bytes() ->
-    asn1ct_name:delete(rb),
-    add_removed_bytes(asn1ct_name:all(rb)).
-
-add_removed_bytes([H,T1|T]) ->
-    emit({{var,H},"+"}),
-    add_removed_bytes([T1|T]);
-add_removed_bytes([H|T]) ->
-    emit({{var,H}}),
-    add_removed_bytes(T);
-add_removed_bytes([]) ->
-    true.
-
-mkfuncname(WhatKind,DecOrEnc) ->
-    case WhatKind of
-	#'Externaltypereference'{module=Mod,type=EType} ->
-	    CurrMod = get(currmod),
-	    case CurrMod of
-		Mod ->
-		    lists:concat(["'",DecOrEnc,"_",EType,"'"]);
-		_ ->
-% 		    io:format("CurrMod: ~p, Mod: ~p~n",[CurrMod,Mod]),
-		    lists:concat(["'",Mod,"':'",DecOrEnc,"_",EType,"'"])
-	    end;
-	#'typereference'{val=EType} ->
-	    lists:concat(["'",DecOrEnc,"_",EType,"'"]);
-	'ASN1_OPEN_TYPE' ->
-	    lists:concat(["'",DecOrEnc,"_",WhatKind,"'"])
-	    
-    end.
-
-optionals(L) -> optionals(L,[],1).
-
-optionals([{'EXTENSIONMARK',_,_}|Rest],Acc,Pos) ->
-    optionals(Rest,Acc,Pos); % optionals in extension are currently not handled
-optionals([#'ComponentType'{name=Name,prop='OPTIONAL'}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
-optionals([#'ComponentType'{name=Name,prop={'DEFAULT',_}}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
-optionals([#'ComponentType'{}|Rest],Acc,Pos) ->
-		 optionals(Rest,Acc,Pos+1);
-optionals([],Acc,_) ->
-    lists:reverse(Acc).
-
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	     no;
-	{value,{_,V}} -> 
-	    V
-    end.
-
-%% if the original option was ber and it has been wrapped to ber_bin
-%% turn it back to ber
-re_wrap_erule(ber_bin) ->
-    case get(encoding_options) of
-	Options when is_list(Options) ->
-	    case lists:member(ber,Options) of
-		true -> ber;
-		_ -> ber_bin
-	    end;
-	_ -> ber_bin
-    end;
-re_wrap_erule(Erule) ->
-    Erule.
-
-is_already_generated(Operation,Name) ->
-    case get(class_default_type) of
-	undefined ->
-	    put(class_default_type,[{Operation,Name}]),
-	    false;
-	GeneratedList ->
-	    case lists:member({Operation,Name},GeneratedList) of
-		true ->
-		    true;
-		false ->
-		    put(class_default_type,[{Operation,Name}|GeneratedList]),
-		    false
-	    end
-    end.
-
-get_class_fields(#classdef{typespec=ObjClass}) ->
-    ObjClass#objectclass.fields;
-get_class_fields(#objectclass{fields=Fields}) ->
-    Fields;
-get_class_fields(_) ->
-    [].
-
-get_object_field(Name,ObjectFields) ->
-    case lists:keysearch(Name,1,ObjectFields) of
-	{value,Field} -> Field;
-	false -> false
-    end.
-
-%% For BER the ExtensionAdditionGroup notation has no impact on the encoding/decoding
-%% and therefore we only filter away the ExtensionAdditionGroup start and end markers
-%%
-extaddgroup2sequence(ExtList) when is_list(ExtList) ->
-    lists:filter(fun(#'ExtensionAdditionGroup'{}) ->
-			 false;
-		    ('ExtensionAdditionGroupEnd') ->
-			 false;
-		    (_) ->
-			 true
-		 end, ExtList).
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
index 597fb0030b..00c3dd98b2 100644
--- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
@@ -116,22 +116,7 @@ gen_encode(Erules,Typename,Type) when is_record(Type,type) ->
 	    end,
 	    case lists:member(InnerType,['SET','SEQUENCE']) of
 		true -> 
-		    case get(asn_keyed_list) of
-			true ->
-			    CompList = 
-				case Type#type.def of
-				    #'SEQUENCE'{components=Cl} -> Cl;
-				    #'SET'{components=Cl} -> Cl
-				end,
-			    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-				  "'(Val, TagIn",ObjFun,
-				  ") when is_list(Val) ->",nl]),
-			    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-				  "'(?RT_BER:fixoptionals(",
-				  {asis,optionals(CompList)},
-				  ",Val), TagIn",ObjFun,");",nl,nl]);
-			_ -> true
-		    end;
+		    true;
 		_ ->
 		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
 			  "'({'",asn1ct_gen:list2name(Typename),
@@ -175,22 +160,7 @@ gen_encode_user(Erules,D) when is_record(D,typedef) ->
 
     case lists:member(InnerType,['SET','SEQUENCE']) of
 	true -> 
-	    case get(asn_keyed_list) of
-		true ->
-		    CompList = 
-			case Type#type.def of
-			    #'SEQUENCE'{components=Cl} -> Cl;
-			    #'SET'{components=Cl} -> Cl
-			end,
-
-		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val, TagIn) when is_list(Val) ->",nl]),
-		    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-			  "'(?RT_BER:fixoptionals(",
-			  {asis,optionals(CompList)},
-			  ",Val), TagIn);",nl,nl]);
-		_ -> true
-	    end;
+	    true;
 	_ ->
 	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
 		  "'({'",asn1ct_gen:list2name(Typename),"',Val}, TagIn) ->",nl}),
@@ -419,7 +389,7 @@ gen_decode_selected(Erules,Type,FuncName) ->
 	  "      {Tlv,_} = ?RT_BER:decode(Bin2",asn1ct_gen:nif_parameter(),"),",nl]),
     emit("{ok,"),
     gen_decode_selected_type(Erules,Type),
-    emit(["};",nl,"    Err -> exit({error,{selctive_decode,Err}})",nl,
+    emit(["};",nl,"    Err -> exit({error,{selective_decode,Err}})",nl,
 	  "  end.",nl]).
 
 gen_decode_selected_type(_Erules,TypeDef) ->
@@ -1504,7 +1474,7 @@ gen_objset_dec(Erules,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
     emit([indent(2),"fun(_,Bytes, _RestPrimFieldName) ->",nl]),
     
     case Erules of
-	ber_bin_v2 ->
+	ber ->
 	    emit([indent(4),"case Bytes of",nl,
 		  indent(6),"Bin when is_binary(Bin) -> ",nl,
 		  indent(8),"Bin;",nl,
@@ -1772,19 +1742,6 @@ mkfuncname(WhatKind,DecOrEnc) ->
 	    
     end.
 
-optionals(L) -> optionals(L,[],1).
-
-optionals([{'EXTENSIONMARK',_,_}|Rest],Acc,Pos) ->
-    optionals(Rest,Acc,Pos); % optionals in extension are currently not handled
-optionals([#'ComponentType'{name=Name,prop='OPTIONAL'}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
-optionals([#'ComponentType'{name=Name,prop={'DEFAULT',_}}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
-optionals([#'ComponentType'{}|Rest],Acc,Pos) ->
-		 optionals(Rest,Acc,Pos+1);
-optionals([],Acc,_) ->
-    lists:reverse(Acc).
-
 get_constraint(C,Key) ->
     case lists:keysearch(Key,1,C) of
 	false ->
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 59b4b3d261..3e100fc833 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -155,7 +155,7 @@ gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) ->
 	    NewList = lists:concat([[{0,X}||{X,_} <- Nlist1],['EXT_MARK'],[{1,X}||{X,_} <- Nlist2]]),
 	    NewC = [{'ValueRange',{0,length(Nlist1)-1}}],
 	    case Erules of
-		uper_bin ->
+		uper ->
 		    emit(["case ",Value," of",nl]);
 		_ ->
 		    emit(["case (case ",Value," of {_,",{curr,enumval},"}-> ",
@@ -168,7 +168,7 @@ gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) ->
 	    NewList = [X||{X,_} <- NamedNumberList],
 	    NewC = [{'ValueRange',{0,length(NewList)-1}}],
 	    case Erules of
-		uper_bin ->
+		uper ->
 		    emit(["case ",Value," of",nl]);
 		_ ->
 		    emit(["case (case ",Value," of {_,",{curr,enumval},
@@ -274,7 +274,7 @@ emit_enc_enumerated_cases(Erule, C, [H1,H2|T], Count) ->
     
 
 
-emit_enc_enumerated_case(uper_bin,_C, {asn1_enum,High}, _) ->
+emit_enc_enumerated_case(uper,_C, {asn1_enum,High}, _) ->
     emit([
 	  "{asn1_enum,EnumV} when is_integer(EnumV), EnumV > ",High," -> ",
 	  "[<<1:1>>,?RT_PER:encode_small_number(EnumV)]"]);
@@ -284,11 +284,11 @@ emit_enc_enumerated_case(_Per,_C, {asn1_enum,High}, _) ->
 	  "[{bit,1},?RT_PER:encode_small_number(EnumV)]"]);
 emit_enc_enumerated_case(_Erule, _C, 'EXT_MARK', _Count) ->
     true;
-emit_enc_enumerated_case(uper_bin,_C, {1,EnumName}, Count) ->
+emit_enc_enumerated_case(uper,_C, {1,EnumName}, Count) ->
     emit(["'",EnumName,"' -> [<<1:1>>,?RT_PER:encode_small_number(",Count,")]"]);
 emit_enc_enumerated_case(_Per,_C, {1,EnumName}, Count) ->
     emit(["'",EnumName,"' -> [{bit,1},?RT_PER:encode_small_number(",Count,")]"]);
-emit_enc_enumerated_case(uper_bin,C, {0,EnumName}, Count) ->
+emit_enc_enumerated_case(uper,C, {0,EnumName}, Count) ->
     emit(["'",EnumName,"' -> [<<0:1>>,?RT_PER:encode_integer(",{asis,C},", ",Count,")]"]);
 emit_enc_enumerated_case(_Per,C, {0,EnumName}, Count) ->
     emit(["'",EnumName,"' -> [{bit,0},?RT_PER:encode_integer(",{asis,C},", ",Count,")]"]);
@@ -321,19 +321,13 @@ effective_constr(_,[]) ->
     [];
 effective_constr('SingleValue',List) ->
     SVList = lists:flatten(lists:map(fun(X)->element(2,X)end,List)),
-    % sort and remove duplicates
-    SortedSVList = lists:sort(SVList),
-    RemoveDup = fun([],_) ->[];
-		   ([H],_) -> [H];
-		   ([H,H|T],F) -> F([H|T],F);
-		   ([H|T],F) -> [H|F(T,F)]
-		end,
-    
-    case RemoveDup(SortedSVList,RemoveDup) of
+    %% Sort and remove duplicates before generating SingleValue or ValueRange
+    %% In case of ValueRange, also check for 'MIN and 'MAX'
+    case lists:usort(SVList) of
 	[N] ->
 	    [{'SingleValue',N}];
-	L when is_list(L) -> 
-	    [{'ValueRange',{hd(L),lists:last(L)}}]
+	L when is_list(L) ->
+	    [{'ValueRange',{least_Lb(L),greatest_Ub(L)}}]
     end;
 effective_constr('ValueRange',List) ->
     LBs = lists:map(fun({_,{Lb,_}})-> Lb end,List),
@@ -448,7 +442,7 @@ gen_encode_objectfields(Erule,ClassName,[{typefield,Name,OptOrMand}|Rest],
 	    {false,'OPTIONAL'} ->
 		EmitFuncClause("Val"),
 		case Erule of
-		    uper_bin ->
+		    uper ->
 			emit("   Val");
 		    _ ->
 			emit("   [{octets,Val}]")
@@ -839,7 +833,7 @@ gen_objset_enc(Erule,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
     emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
     emit({indent(3),"fun(_, Val, _) ->",nl}),
     case Erule of
-	uper_bin ->
+	uper ->
 	    emit([indent(6),"Val",nl]);
 	_ ->
 	    emit([indent(6),"[{octets,Val}]",nl])
@@ -889,7 +883,7 @@ gen_inlined_enc_funs(Erule,Fields,[{typefield,Name,_}|Rest],ObjSetName,NthObj) -
 	    emit({indent(9),{asis,Name}," ->",nl}),
 	    emit([indent(12),"'",M,"'",":'enc_",T,"'(Val)"]),
 	    gen_inlined_enc_funs1(Erule,Fields,Rest,ObjSetName,NthObj,[]);
-	false when Erule == uper_bin ->
+	false when Erule =:= uper ->
 	    emit([indent(3),"fun(Type,Val,_) ->",nl,
 		  indent(6),"case Type of",nl,
 		  indent(9),{asis,Name}," -> Val",nl]),
@@ -927,7 +921,7 @@ gen_inlined_enc_funs1(Erule,Fields,[{typefield,Name,_}|Rest],ObjSetName,
 		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
 		emit([indent(12),"'",M,"'",":'enc_",T,"'(Val)"]),
 		{Acc,0};
-	    false when Erule == uper_bin ->
+	    false when Erule =:= uper ->
 		emit([";",nl,
 		      indent(9),{asis,Name}," -> ",nl,
 		      "Val",nl]),
@@ -1405,19 +1399,21 @@ get_object_field(Name,ObjectFields) ->
 %% have been specified within a SEQUENCE, therefore we construct a fake sequence type here
 %% so that we can generate code for it
 extaddgroup2sequence(ExtList) ->
-    extaddgroup2sequence(ExtList,[]).
+    extaddgroup2sequence(ExtList,0,[]).
 
-extaddgroup2sequence([{'ExtensionAdditionGroup',Number0}|T],Acc) ->
+extaddgroup2sequence([{'ExtensionAdditionGroup',Number0}|T],ExtNum,Acc) ->
     Number = case Number0 of undefined -> 1; _ -> Number0 end,
     {ExtGroupComps,['ExtensionAdditionGroupEnd'|T2]} =
      lists:splitwith(fun(Elem) -> is_record(Elem,'ComponentType') end,T),
-    extaddgroup2sequence(T2,[#'ComponentType'{
-                                  name='ExtAddGroup',
-                                  typespec=#type{def=#'SEQUENCE'{
-						   extaddgroup=Number,
-						   components=ExtGroupComps}},
-				  prop='OPTIONAL'}|Acc]);
-extaddgroup2sequence([C|T],Acc) ->
-    extaddgroup2sequence(T,[C|Acc]);
-extaddgroup2sequence([],Acc) ->
+    extaddgroup2sequence(T2,ExtNum+1,
+			 [#'ComponentType'{
+			     name=list_to_atom("ExtAddGroup"++
+						   integer_to_list(ExtNum+1)),
+			     typespec=#type{def=#'SEQUENCE'{
+					      extaddgroup=Number,
+					      components=ExtGroupComps}},
+			     prop='OPTIONAL'}|Acc]);
+extaddgroup2sequence([C|T],ExtNum,Acc) ->
+    extaddgroup2sequence(T,ExtNum,[C|Acc]);
+extaddgroup2sequence([],_,Acc) ->
     lists:reverse(Acc).
diff --git a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
index 4add659d79..16eec92847 100644
--- a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
+++ b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
@@ -670,18 +670,13 @@ effective_constr(_,[]) ->
     [];
 effective_constr('SingleValue',List) ->
     SVList = lists:flatten(lists:map(fun(X)->element(2,X)end,List)),
-    % sort and remove duplicates
-    RemoveDup = fun([],_) ->[];
-		   ([H],_) -> [H];
-		   ([H,H|T],F) -> F([H|T],F);
-		   ([H|T],F) -> [H|F(T,F)]
-		end,
-    
-    case RemoveDup(SVList,RemoveDup) of
+    %% Sort and remove duplicates before generating SingleValue or ValueRange
+    %% In case of ValueRange, also check for 'MIN and 'MAX'
+    case lists:usort(SVList) of
 	[N] ->
 	    [{'SingleValue',N}];
-	L when is_list(L) -> 
-	    [{'ValueRange',{hd(L),lists:last(L)}}]
+	L when is_list(L) ->
+	    [{'ValueRange',{least_Lb(L),greatest_Ub(L)}}]
     end;
 effective_constr('ValueRange',List) ->
     LBs = lists:map(fun({_,{Lb,_}})-> Lb end,List),
@@ -1808,19 +1803,21 @@ dec_enumerated_cases([],_,_) ->
 %% have been specified within a SEQUENCE, therefore we construct a fake sequence type here
 %% so that we can generate code for it
 extaddgroup2sequence(ExtList) ->
-    extaddgroup2sequence(ExtList,[]).
+    extaddgroup2sequence(ExtList,0,[]).
 
-extaddgroup2sequence([{'ExtensionAdditionGroup',Number0}|T],Acc) ->
+extaddgroup2sequence([{'ExtensionAdditionGroup',Number0}|T],ExtNum,Acc) ->
     Number = case Number0 of undefined -> 1; _ -> Number0 end,
     {ExtGroupComps,['ExtensionAdditionGroupEnd'|T2]} =
      lists:splitwith(fun(Elem) -> is_record(Elem,'ComponentType') end,T),
-    extaddgroup2sequence(T2,[#'ComponentType'{
-                                  name='ExtAddGroup',
-                                  typespec=#type{def=#'SEQUENCE'{
-						   extaddgroup=Number,
-						   components=ExtGroupComps}},
-				  prop='OPTIONAL'}|Acc]);
-extaddgroup2sequence([C|T],Acc) ->
-    extaddgroup2sequence(T,[C|Acc]);
-extaddgroup2sequence([],Acc) ->
+    extaddgroup2sequence(T2,ExtNum+1,
+			 [#'ComponentType'{
+			     name=list_to_atom("ExtAddGroup"++ 
+						   integer_to_list(ExtNum+1)),
+			     typespec=#type{def=#'SEQUENCE'{
+					      extaddgroup=Number,
+					      components=ExtGroupComps}},
+			     prop='OPTIONAL'}|Acc]);
+extaddgroup2sequence([C|T],ExtNum,Acc) ->
+    extaddgroup2sequence(T,ExtNum,[C|Acc]);
+extaddgroup2sequence([],_,Acc) ->
     lists:reverse(Acc).
diff --git a/lib/asn1/src/asn1ct_parser2.erl b/lib/asn1/src/asn1ct_parser2.erl
index 007d390a1b..7301f49085 100644
--- a/lib/asn1/src/asn1ct_parser2.erl
+++ b/lib/asn1/src/asn1ct_parser2.erl
@@ -769,9 +769,11 @@ resolve_module(_Type, Current, undefined) ->
     Current;
 resolve_module(Type, Current, Imports) ->
     case [Mod || #'SymbolsFromModule'{symbols = S, module = Mod} <- Imports,
-                 #'Externaltypereference'{type = T} <- S,
+                 #'Externaltypereference'{type = T} <- S, 
                  Type == T] of
-        [#'Externaltypereference'{type = Mod}] -> Mod;
+        [#'Externaltypereference'{type = Mod}|_] -> Mod; 
+	%% This allows the same symbol to be imported several times
+	%% which ought to be checked elsewhere and flagged as an error
         []  -> Current
     end.
 
diff --git a/lib/asn1/src/asn1ct_value.erl b/lib/asn1/src/asn1ct_value.erl
index 9013baef92..6057e27b63 100644
--- a/lib/asn1/src/asn1ct_value.erl
+++ b/lib/asn1/src/asn1ct_value.erl
@@ -54,7 +54,7 @@ from_type(M,Typename,Type) when is_record(Type,type) ->
 	{notype,_} ->
 	    true;
 	{primitive,bif} ->
-	    from_type_prim(Type,get_encoding_rule(M));
+	    from_type_prim(Type);
 	'ASN1_OPEN_TYPE' ->
 	    case  Type#type.constraint of
 		[#'Externaltypereference'{type=TrefConstraint}] ->
@@ -164,7 +164,7 @@ gen_list(_,_,_,0) ->
 gen_list(M,Typename,Oftype,N) ->
     [from_type(M,Typename,Oftype)|gen_list(M,Typename,Oftype,N-1)].
     
-from_type_prim(D,Erule) ->
+from_type_prim(D) ->
     C = D#type.constraint,
     case D#type.def of
 	'INTEGER' ->
@@ -303,12 +303,7 @@ from_type_prim(D,Erule) ->
 	    adjust_list(size_random(C),c_string(C,"BMPString"));
 	'UTF8String' ->
 	    {ok,Res}=asn1rt:utf8_list_to_binary(adjust_list(random(50),[$U,$T,$F,$8,$S,$t,$r,$i,$n,$g,16#ffff,16#fffffff,16#ffffff,16#fffff,16#fff])),
-	    case Erule of
-		per ->
-		    binary_to_list(Res);
-		_ ->
-		    Res
-	    end;
+	    Res;
 	'UniversalString' ->
 	    adjust_list(size_random(C),c_string(C,"UniversalString"));
 	XX ->
@@ -440,17 +435,9 @@ get_encoding_rule(M) ->
     end.
 
 open_type_value(ber) ->
-    [4,9,111,112,101,110,95,116,121,112,101];
-open_type_value(ber_bin) ->
-%    [4,9,111,112,101,110,95,116,121,112,101];
-    <<4,9,111,112,101,110,95,116,121,112,101>>;
-open_type_value(ber_bin_v2) ->
-%    [4,9,111,112,101,110,95,116,121,112,101];
     <<4,9,111,112,101,110,95,116,121,112,101>>;
 open_type_value(per) ->
-    "\n\topen_type"; %octet string value "open_type"
-open_type_value(per_bin) ->
-    <<"\n\topen_type">>;
+    <<"\n\topen_type">>;	       %octet string value "open_type"
 %    <<10,9,111,112,101,110,95,116,121,112,101>>;
 open_type_value(_) ->
     [4,9,111,112,101,110,95,116,121,112,101].
diff --git a/lib/asn1/src/asn1rt_ber_bin.erl b/lib/asn1/src/asn1rt_ber_bin.erl
index 22f9f2ecfd..ec1549804b 100644
--- a/lib/asn1/src/asn1rt_ber_bin.erl
+++ b/lib/asn1/src/asn1rt_ber_bin.erl
@@ -19,337 +19,30 @@
 %%
 -module(asn1rt_ber_bin).
 
-%% encoding / decoding of BER
-
--export([decode/1]).
--export([fixoptionals/2,split_list/2,cindex/3,restbytes2/3,
-	 list_to_record/2,
-	 encode_tag_val/1,decode_tag/1,peek_tag/1,
-	 check_tags/3, encode_tags/3]).
--export([encode_boolean/2,decode_boolean/3,
-	 encode_integer/3,encode_integer/4,
-	 decode_integer/4,decode_integer/5,encode_enumerated/2,
-	 encode_enumerated/4,decode_enumerated/5,
+-export([decode_length/1,
 	 encode_real/2, encode_real/3,
 	 decode_real/2, decode_real/4,
-	 encode_bit_string/4,decode_bit_string/6,
-	 decode_compact_bit_string/6,
-	 encode_octet_string/3,decode_octet_string/5,
-	 encode_null/2,decode_null/3,
-	 encode_object_identifier/2,decode_object_identifier/3,
-	 encode_relative_oid/2,decode_relative_oid/3,
-	 encode_restricted_string/4,decode_restricted_string/6,
-	 encode_universal_string/3,decode_universal_string/5,
-	 encode_UTF8_string/3, decode_UTF8_string/3,
-	 encode_BMP_string/3,decode_BMP_string/5,
-	 encode_generalized_time/3,decode_generalized_time/5,
-	 encode_utc_time/3,decode_utc_time/5,
-	 encode_length/1,decode_length/1,
-	 check_if_valid_tag/3,
-	 decode_tag_and_length/1, decode_components/6,
-	 decode_components/7, decode_set/6]).
-
--export([encode_open_type/1,encode_open_type/2,decode_open_type/1,decode_open_type/2,decode_open_type/3]).
--export([skipvalue/1, skipvalue/2,skip_ExtensionAdditions/2]).
+	 decode_tag/1]).
 
 -include("asn1_records.hrl").
 
-% the encoding of class of tag bits 8 and 7
+%% the encoding of class of tag bits 8 and 7
 -define(UNIVERSAL,   0).
--define(APPLICATION, 16#40).
--define(CONTEXT,     16#80).
--define(PRIVATE,     16#C0).
 
 %%% primitive or constructed encoding % bit 6
 -define(PRIMITIVE,   0).
 -define(CONSTRUCTED, 2#00100000).
 
 %%% The tag-number for universal types
--define(N_BOOLEAN, 1).
--define(N_INTEGER, 2).
--define(N_BIT_STRING, 3).
--define(N_OCTET_STRING, 4).
--define(N_NULL, 5).
--define(N_OBJECT_IDENTIFIER, 6).
--define(N_OBJECT_DESCRIPTOR, 7).
--define(N_EXTERNAL, 8).
 -define(N_REAL, 9).
--define(N_ENUMERATED, 10).
--define(N_EMBEDDED_PDV, 11).
--define(N_UTF8String, 12).
--define('N_RELATIVE-OID',13).
--define(N_SEQUENCE, 16).
--define(N_SET, 17).
--define(N_NumericString, 18).
--define(N_PrintableString, 19).
--define(N_TeletexString, 20).
--define(N_VideotexString, 21).
--define(N_IA5String, 22).
--define(N_UTCTime, 23).
--define(N_GeneralizedTime, 24).
--define(N_GraphicString, 25).
--define(N_VisibleString, 26).
--define(N_GeneralString, 27).
--define(N_UniversalString, 28).
--define(N_BMPString, 30).
-
-
-% the complete tag-word of built-in types
--define(T_BOOLEAN,          ?UNIVERSAL bor ?PRIMITIVE bor 1).
--define(T_INTEGER,          ?UNIVERSAL bor ?PRIMITIVE bor 2).
--define(T_BIT_STRING,       ?UNIVERSAL bor ?PRIMITIVE bor 3). % can be CONSTRUCTED
--define(T_OCTET_STRING,     ?UNIVERSAL bor ?PRIMITIVE bor 4). % can be CONSTRUCTED
--define(T_NULL,             ?UNIVERSAL bor ?PRIMITIVE bor 5).
--define(T_OBJECT_IDENTIFIER,?UNIVERSAL bor ?PRIMITIVE bor 6).
--define(T_OBJECT_DESCRIPTOR,?UNIVERSAL bor ?PRIMITIVE bor 7).
--define(T_EXTERNAL,         ?UNIVERSAL bor ?PRIMITIVE bor 8).
--define(T_REAL,             ?UNIVERSAL bor ?PRIMITIVE bor 9).
--define(T_ENUMERATED,       ?UNIVERSAL bor ?PRIMITIVE bor 10).
--define(T_EMBEDDED_PDV,     ?UNIVERSAL bor ?PRIMITIVE bor 11).
--define(T_SEQUENCE,         ?UNIVERSAL bor ?CONSTRUCTED bor 16).
--define(T_SET,              ?UNIVERSAL bor ?CONSTRUCTED bor 17).
--define(T_NumericString,    ?UNIVERSAL bor ?PRIMITIVE bor 18). %can be constructed
--define(T_PrintableString,  ?UNIVERSAL bor ?PRIMITIVE bor 19). %can be constructed
--define(T_TeletexString,    ?UNIVERSAL bor ?PRIMITIVE bor 20). %can be constructed
--define(T_VideotexString,   ?UNIVERSAL bor ?PRIMITIVE bor 21). %can be constructed
--define(T_IA5String,        ?UNIVERSAL bor ?PRIMITIVE bor 22). %can be constructed
--define(T_UTCTime,          ?UNIVERSAL bor ?PRIMITIVE bor 23).
--define(T_GeneralizedTime,  ?UNIVERSAL bor ?PRIMITIVE bor 24).
--define(T_GraphicString,    ?UNIVERSAL bor ?PRIMITIVE bor 25). %can be constructed
--define(T_VisibleString,    ?UNIVERSAL bor ?PRIMITIVE bor 26). %can be constructed
--define(T_GeneralString,    ?UNIVERSAL bor ?PRIMITIVE bor 27). %can be constructed
--define(T_UniversalString,  ?UNIVERSAL bor ?PRIMITIVE bor 28). %can be constructed
--define(T_BMPString,        ?UNIVERSAL bor ?PRIMITIVE bor 30). %can be constructed
-
-
-decode(Bin) ->
-    decode_primitive(Bin).
-
-decode_primitive(Bin) ->
-    {Tlv = {Tag,Len,V},<<>>} = decode_tlv(Bin),
-    case element(2,Tag) of
-	?CONSTRUCTED ->
-	    {Tag,Len,decode_constructed(V)};
-	_ ->
-	    Tlv
-    end.
-
-decode_constructed(<<>>) ->
-    [];
-decode_constructed(Bin) ->
-    {Tlv = {Tag,Len,V},Rest} = decode_tlv(Bin),
-    NewTlv =
-	case element(2,Tag) of
-	    ?CONSTRUCTED ->
-		{Tag,Len,decode_constructed(V)};
-	    _ ->
-		Tlv
-	end,
-    [NewTlv|decode_constructed(Rest)].
-
-decode_tlv(Bin) ->
-    {Tag,Bin1,_Rb1} = decode_tag(Bin),
-    {{Len,Bin2},_Rb2} = decode_length(Bin1),
-    <<V:Len/binary,Bin3/binary>> = Bin2,
-    {{Tag,Len,V},Bin3}.
-
-
-
-%%%%%%%%%%%%%
-% split_list(List,HeadLen) -> {HeadList,TailList}
-%
-% splits List into HeadList (Length=HeadLen) and TailList
-% if HeadLen == indefinite -> return {List,indefinite}
-split_list(List,indefinite) ->
-    {List, indefinite};
-split_list(Bin, Len) when is_binary(Bin) ->
-    split_binary(Bin,Len);
-split_list(List,Len) ->
-    {lists:sublist(List,Len),lists:nthtail(Len,List)}.
 
-
-%%% new function which fixes a bug regarding indefinite length decoding
-restbytes2(indefinite,<<0,0,RemBytes/binary>>,_) ->
-    {RemBytes,2};
-restbytes2(indefinite,RemBytes,ext) ->
-    skipvalue(indefinite,RemBytes);
-restbytes2(RemBytes,<<>>,_) ->
-    {RemBytes,0};
-restbytes2(_RemBytes,Bytes,noext) ->
-    exit({error,{asn1, {unexpected,Bytes}}});
-restbytes2(RemBytes,Bytes,ext) ->
-%%    {RemBytes,0}.
-    {RemBytes,byte_size(Bytes)}.
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% skipvalue(Length, Bytes) -> {RemainingBytes, RemovedNumberOfBytes}
-%%
-%% skips the one complete (could be nested) TLV from Bytes
-%% handles both definite and indefinite length encodings
-%%
-
-skipvalue(L, Bytes) ->
-    skipvalue(L, Bytes, 0).
-
-skipvalue(L, Bytes, Rb) ->
-    skipvalue(L, Bytes, Rb, 0).
-
-skipvalue(indefinite, Bytes, Rb, IndefLevel) ->
-    {T,Bytes2,R2} = decode_tag(Bytes),
-    {{L,Bytes3},R3} = decode_length(Bytes2),
-    case {T,L} of
-	{_,indefinite} ->
-	    skipvalue(indefinite,Bytes3,Rb+R2+R3,IndefLevel+1);
-	{{0,0,0},0} when IndefLevel =:= 0 ->
-	    %% See X690 8.1.5 NOTE, end of indefinite content
-	    {Bytes3,Rb+2};
-	{{0,0,0},0} ->
-	    skipvalue(indefinite,Bytes3,Rb+2,IndefLevel - 1);
-	_ ->
-	    <<_:L/binary, RestBytes/binary>> = Bytes3,
-	    skipvalue(indefinite,RestBytes,Rb+R2+R3+L, IndefLevel)
-	    %%{RestBytes, R2+R3+L}
-    end;
-%%     case Bytes4 of
-%% 	<<0,0,Bytes5/binary>> ->
-%% 	    {Bytes5,Rb+Rb4+2};
-%% 	_  -> skipvalue(indefinite,Bytes4,Rb+Rb4)
-%%     end;
-skipvalue(L, Bytes, Rb, _) ->
-%    <<Skip:L/binary, RestBytes/binary>> = Bytes,
-    <<_:L/binary, RestBytes/binary>> = Bytes,
-    {RestBytes,Rb+L}.
-
-
-skipvalue(Bytes) ->
-    {_T,Bytes2,R2} = decode_tag(Bytes),
-    {{L,Bytes3},R3} = decode_length(Bytes2),
-    skipvalue(L,Bytes3,R2+R3).
-
-
-cindex(Ix,Val,Cname) ->
-    case element(Ix,Val) of
-	{Cname,Val2} -> Val2;
-	X -> X
-    end.
-
-%%%
-%% skips byte sequence of Bytes that do not match a tag in Tags
-skip_ExtensionAdditions(Bytes,Tags) ->
-    skip_ExtensionAdditions(Bytes,Tags,0).
-skip_ExtensionAdditions(<<>>,_Tags,RmB) ->
-    {<<>>,RmB};
-skip_ExtensionAdditions(Bytes,Tags,RmB) ->
-    case catch decode_tag(Bytes) of
-	{'EXIT',_Reason} ->
-	    tag_error(no_data,Tags,Bytes,'OPTIONAL');
-	{_T={Class,_Form,TagNo},_Bytes2,_R2} ->
-	    case [X||X=#tag{class=Cl,number=TN} <- Tags,Cl==Class,TN==TagNo] of
-		[] ->
-		    %% skip this TLV and continue with next
-		    {Bytes3,R3} = skipvalue(Bytes),
-		    skip_ExtensionAdditions(Bytes3,Tags,RmB+R3);
-		_ ->
-		    {Bytes,RmB}
-	    end
-    end.
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Optionals, preset not filled optionals with asn1_NOVALUE
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-% converts a list to a record if necessary
-list_to_record(Name,List) when is_list(List) ->
-    list_to_tuple([Name|List]);
-list_to_record(_Name,Tuple) when is_tuple(Tuple) ->
-    Tuple.
-
-
-fixoptionals(OptList,Val) when is_list(Val) ->
-    fixoptionals(OptList,Val,1,[],[]).
-
-fixoptionals([{Name,Pos}|Ot],[{Name,Val}|Vt],_Opt,Acc1,Acc2) ->
-    fixoptionals(Ot,Vt,Pos+1,[1|Acc1],[{Name,Val}|Acc2]);
-fixoptionals([{_Name,Pos}|Ot],V,Pos,Acc1,Acc2) ->
-    fixoptionals(Ot,V,Pos+1,[0|Acc1],[asn1_NOVALUE|Acc2]);
-fixoptionals(O,[Vh|Vt],Pos,Acc1,Acc2) ->
-    fixoptionals(O,Vt,Pos+1,Acc1,[Vh|Acc2]);
-fixoptionals([],[Vh|Vt],Pos,Acc1,Acc2) ->
-    fixoptionals([],Vt,Pos+1,Acc1,[Vh|Acc2]);
-fixoptionals([],[],_,_Acc1,Acc2) ->
-    % return Val as a record
-    list_to_tuple([asn1_RECORDNAME|lists:reverse(Acc2)]).
-
-
-%%encode_tag(TagClass(?UNI, APP etc), Form (?PRIM etx), TagInteger) ->
-%%     8bit Int | binary
 encode_tag_val({Class, Form, TagNo}) when (TagNo =< 30) ->
     <<(Class bsr 6):2,(Form bsr 5):1,TagNo:5>>;
 
 encode_tag_val({Class, Form, TagNo}) ->
     {Octets,_Len} = mk_object_val(TagNo),
     BinOct = list_to_binary(Octets),
-    <<(Class bsr 6):2, (Form bsr 5):1, 31:5,BinOct/binary>>;
-
-%% asumes whole correct tag bitpattern, multiple of 8
-encode_tag_val(Tag) when (Tag =< 255) -> Tag;  %% anv�nds denna funktion??!!
-%% asumes correct bitpattern of 0-5
-encode_tag_val(Tag) -> encode_tag_val2(Tag,[]).
-
-encode_tag_val2(Tag, OctAck) when (Tag =< 255) ->
-    [Tag | OctAck];
-encode_tag_val2(Tag, OctAck) ->
-    encode_tag_val2(Tag bsr 8, [255 band Tag | OctAck]).
-
-
-%%%encode_tag(TagClass(?UNI, APP etc), Form (?PRIM etx), TagInteger) ->
-%%%     8bit Int | [list of octets]
-%encode_tag_val({Class, Form, TagNo}) when (TagNo =< 30) ->
-%%%    <<Class:2,Form:1,TagNo:5>>;
-%    [Class bor Form bor TagNo];
-%encode_tag_val({Class, Form, TagNo}) ->
-%    {Octets,L} = mk_object_val(TagNo),
-%    [Class bor Form bor 31 | Octets];
-
-
-%%============================================================================\%% Peek on the initial tag
-%% peek_tag(Bytes) -> TagBytes
-%% interprets the first byte and possible  second, third and fourth byte as
-%% a tag and returns all the bytes comprising the tag, the constructed/primitive bit (6:th bit of first byte) is normalised to 0
-%%
-
-peek_tag(<<B7_6:2,_:1,31:5,Buffer/binary>>) ->
-    Bin = peek_tag(Buffer, <<>>),
-    <<B7_6:2,31:6,Bin/binary>>;
-%% single tag (tagno < 31)
-peek_tag(<<B7_6:2,_:1,B4_0:5,_Buffer/binary>>) ->
-    <<B7_6:2,B4_0:6>>.
-
-peek_tag(<<0:1,PartialTag:7,_Buffer/binary>>, TagAck) ->
-    <<TagAck/binary,PartialTag>>;
-peek_tag(<<PartialTag,Buffer/binary>>, TagAck) ->
-    peek_tag(Buffer,<<TagAck/binary,PartialTag>>);
-peek_tag(_,TagAck) ->
-    exit({error,{asn1, {invalid_tag,TagAck}}}).
-%%peek_tag([Tag|Buffer]) when (Tag band 31) =:= 31 ->
-%%    [Tag band 2#11011111 | peek_tag(Buffer,[])];
-%%%% single tag (tagno < 31)
-%%peek_tag([Tag|Buffer]) ->
-%%    [Tag band 2#11011111].
-
-%%peek_tag([PartialTag|Buffer], TagAck) when (PartialTag < 128 ) ->
-%%    lists:reverse([PartialTag|TagAck]);
-%%peek_tag([PartialTag|Buffer], TagAck) ->
-%%    peek_tag(Buffer,[PartialTag|TagAck]);
-%%peek_tag(Buffer,TagAck) ->
-%%    exit({error,{asn1, {invalid_tag,lists:reverse(TagAck)}}}).
-
+    <<(Class bsr 6):2, (Form bsr 5):1, 31:5,BinOct/binary>>.
 
 %%===============================================================================
 %% Decode a tag
@@ -403,33 +96,11 @@ check_tags_i([Tag1|TagRest], Buffer, Rb, OptOrMand) ->
 		_ ->
 		    check_tags_i(TagRest, Buffer2, Rb + Rb1, mandatory)
 	    end
-    end;
-
-check_tags_i([], Buffer, Rb, _) ->
-    {[],{{0,0},Buffer,Rb}}.
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% This function is called from generated code
 
-check_tags([Tag], Buffer, OptOrMand) -> % optimized very usual case
-    check_one_tag(Tag, Buffer, OptOrMand);
-check_tags(Tags, Buffer, OptOrMand) ->
-    check_tags(Tags, Buffer, 0, OptOrMand).
-
-check_tags([Tag1,Tag2|TagRest], Buffer, Rb, OptOrMand)
-  when Tag1#tag.type == 'IMPLICIT' ->
-    check_tags([Tag1#tag{type=Tag2#tag.type}|TagRest], Buffer, Rb, OptOrMand);
-
-check_tags([Tag1|TagRest], Buffer, Rb, OptOrMand) ->
-    {Form_Length,Buffer2,Rb1} = check_one_tag(Tag1, Buffer, OptOrMand),
-    case TagRest of
-	[] -> {Form_Length, Buffer2, Rb + Rb1};
-	_ -> check_tags(TagRest, Buffer2, Rb + Rb1, mandatory)
-    end;
-
-check_tags([], Buffer, Rb, _) ->
-    {{0,0},Buffer,Rb}.
-
 check_one_tag(Tag=#tag{class=ExpectedClass,number=ExpectedNumber}, Buffer, OptOrMand) ->
     case catch decode_tag(Buffer) of
 	{'EXIT',_Reason} ->
@@ -491,382 +162,6 @@ encode_one_tag(#tag{class=Class,number=No,type=Type, form = Form}) ->
     Bytes = encode_tag_val({Class,NewForm,No}),
     {Bytes,size(Bytes)}.
 
-%%===============================================================================
-%% Change the tag (used when an implicit tagged type has a reference to something else)
-%% The constructed bit in the tag is taken from the tag to be replaced.
-%%
-%% change_tag(NewTag,[Tag,Buffer]) -> [NewTag,Buffer]
-%%===============================================================================
-
-%change_tag({NewClass,NewTagNr}, Buffer) ->
-%    {{OldClass, OldForm, OldTagNo}, Buffer1, RemovedBytes} = decode_tag(lists:flatten(Buffer)),
-%    [encode_tag_val({NewClass, OldForm, NewTagNr}) | Buffer1].
-
-
-%%===============================================================================
-%%
-%% This comment is valid for all the encode/decode functions
-%%
-%% C = Constraint -> typically {'ValueRange',LowerBound,UpperBound}
-%%     used for PER-coding but not for BER-coding.
-%%
-%% Val = Value.  If Val is an atom then it is a symbolic integer value
-%%       (i.e the atom must be one of the names in the NamedNumberList).
-%%       The NamedNumberList is used to translate the atom to an integer value
-%%       before encoding.
-%%
-%%===============================================================================
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_open_type(Value) -> CompleteList
-%% Value = list of bytes of an already encoded value (the list must be flat)
-%%         | binary
-
-%% This version does not consider Explicit tagging of the open type. It
-%% is only left because of backward compatibility.
-encode_open_type(Val) when is_list(Val) ->
-    {Val, byte_size(list_to_binary(Val))};
-encode_open_type(Val) ->
-    {Val, byte_size(Val)}.
-
-%%
-encode_open_type(Val, []) when is_list(Val) ->
-    {Val, byte_size(list_to_binary(Val))};
-encode_open_type(Val, []) ->
-    {Val, byte_size(Val)};
-encode_open_type(Val, Tag) when is_list(Val) ->
-    encode_tags(Tag, Val, byte_size(list_to_binary(Val)));
-encode_open_type(Val, Tag) ->
-    encode_tags(Tag, Val, byte_size(Val)).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_open_type(Buffer) -> Value
-%% Bytes = [byte] with BER encoded data
-%% Value = [byte] with decoded data (which must be decoded again as some type)
-%%
-decode_open_type(Bytes) ->
-%    {_Tag, Len, _RemainingBuffer, RemovedBytes} = decode_tag_and_length(Bytes),
-%    N = Len + RemovedBytes,
-    {_Tag, Len, RemainingBuffer, RemovedBytes} = decode_tag_and_length(Bytes),
-    {_RemainingBuffer2, RemovedBytes2} = skipvalue(Len, RemainingBuffer, RemovedBytes),
-    N = RemovedBytes2,
-    <<Val:N/binary, RemainingBytes/binary>> = Bytes,
-%    {Val, RemainingBytes, Len + RemovedBytes}.
-    {Val,RemainingBytes,N}.
-
-decode_open_type(<<>>,[]=ExplTag) -> % R9C-0.patch-40
-    exit({error, {asn1,{no_optional_tag, ExplTag}}});
-decode_open_type(Bytes,ExplTag) ->
-    {Tag, Len, RemainingBuffer, RemovedBytes} = decode_tag_and_length(Bytes),
-    case {Tag,ExplTag} of
-% 	{{Class,Form,32},[#tag{class=Class,number=No,form=32}]} ->
-% 	    {_Tag2, Len2, RemainingBuffer2, RemovedBytes2} = decode_tag_and_length(RemainingBuffer),
-% 	    {_RemainingBuffer3, RemovedBytes3} = skipvalue(Len2, RemainingBuffer2, RemovedBytes2),
-% 	    N = RemovedBytes3,
-% 	    <<_:RemovedBytes/unit:8,Val:N/binary,RemainingBytes/binary>> = Bytes,
-% 	    {Val, RemainingBytes, N + RemovedBytes};
-	{{Class,Form,No},[#tag{class=Class,number=No,form=Form}]} ->
-	    {_RemainingBuffer2, RemovedBytes2} =
-		skipvalue(Len, RemainingBuffer),
-	    N = RemovedBytes2,
-	    <<_:RemovedBytes/unit:8,Val:N/binary,RemainingBytes/binary>> = Bytes,
-	    {Val, RemainingBytes, N + RemovedBytes};
-	_ ->
-	    {_RemainingBuffer2, RemovedBytes2} =
-		skipvalue(Len, RemainingBuffer, RemovedBytes),
-	    N = RemovedBytes2,
-	    <<Val:N/binary, RemainingBytes/binary>> = Bytes,
-	    {Val, RemainingBytes, N}
-    end.
-
-decode_open_type(ber_bin,Bytes,ExplTag) ->
-    decode_open_type(Bytes,ExplTag);
-decode_open_type(ber,Bytes,ExplTag) ->
-    {Val,RemBytes,Len}=decode_open_type(Bytes,ExplTag),
-    {binary_to_list(Val),RemBytes,Len}.
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Boolean, ITU_T X.690 Chapter 8.2
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-%%===============================================================================
-%% encode_boolean(Integer, tag | notag) -> [octet list]
-%%===============================================================================
-
-encode_boolean({Name, Val}, DoTag) when is_atom(Name) ->
-    dotag(DoTag, ?N_BOOLEAN, encode_boolean(Val));
-encode_boolean(true,[]) ->
-    {[1,1,16#FF],3};
-encode_boolean(false,[]) ->
-    {[1,1,0],3};
-encode_boolean(Val, DoTag) ->
-    dotag(DoTag, ?N_BOOLEAN, encode_boolean(Val)).
-
-%% encode_boolean(Boolean) -> [Len, Boolean] = [1, $FF | 0]
-encode_boolean(true)   ->    {[16#FF],1};
-encode_boolean(false)  ->    {[0],1};
-encode_boolean(X) -> exit({error,{asn1, {encode_boolean, X}}}).
-
-
-%%===============================================================================
-%% decode_boolean(BuffList, HasTag, TotalLen) -> {true, Remain, RemovedBytes} |
-%%                                               {false, Remain, RemovedBytes}
-%%===============================================================================
-
-decode_boolean(Buffer, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_BOOLEAN}),
-    decode_boolean_notag(Buffer, NewTags, OptOrMand).
-
-decode_boolean_notag(Buffer, Tags, OptOrMand) ->
-    {RestTags, {FormLen,Buffer0,Rb0}} =
-	check_tags_i(Tags, Buffer, OptOrMand),
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val,Buffer1,Rb1} = decode_boolean_notag(Buffer00, RestTags, OptOrMand),
-	    {Buffer2, Rb2} = restbytes2(RestBytes,Buffer1,noext),
-	    {Val, Buffer2, Rb0+Rb1+Rb2};
-	{_,_} ->
-	    decode_boolean2(Buffer0, Rb0)
-    end.
-
-decode_boolean2(<<0:8, Buffer/binary>>, RemovedBytes) ->
-    {false, Buffer, RemovedBytes + 1};
-decode_boolean2(<<_:8, Buffer/binary>>, RemovedBytes) ->
-    {true, Buffer, RemovedBytes + 1};
-decode_boolean2(Buffer, _) ->
-    exit({error,{asn1, {decode_boolean, Buffer}}}).
-
-
-%%===========================================================================
-%% Integer, ITU_T X.690 Chapter 8.3
-
-%% encode_integer(Constraint, Value, Tag) -> [octet list]
-%% encode_integer(Constraint, Name, NamedNumberList, Tag) -> [octet list]
-%%    Value = INTEGER | {Name,INTEGER}
-%%    Tag = tag | notag
-%%===========================================================================
-
-encode_integer(C, Val, []) when is_integer(Val) ->
-    {EncVal,Len} = encode_integer(C, Val),
-    dotag_universal(?N_INTEGER,EncVal,Len);
-encode_integer(C, Val, Tag) when is_integer(Val) ->
-    dotag(Tag, ?N_INTEGER, encode_integer(C, Val));
-encode_integer(C,{Name,Val},Tag) when is_atom(Name) ->
-    encode_integer(C,Val,Tag);
-encode_integer(_, Val, _) ->
-    exit({error,{asn1, {encode_integer, Val}}}).
-
-
-encode_integer(C, Val, NamedNumberList, Tag) when is_atom(Val) ->
-    case lists:keyfind(Val, 1, NamedNumberList) of
-	{_, NewVal} ->
-	    dotag(Tag, ?N_INTEGER, encode_integer(C, NewVal));
-	_ ->
-	    exit({error,{asn1, {encode_integer_namednumber, Val}}})
-    end;
-encode_integer(C,{_,Val},NamedNumberList,Tag) ->
-    encode_integer(C,Val,NamedNumberList,Tag);
-encode_integer(C, Val, _NamedNumberList, Tag) ->
-    dotag(Tag, ?N_INTEGER, encode_integer(C, Val)).
-
-
-encode_integer(_C, Val) ->
-    Bytes =
-	if
-	    Val >= 0 ->
-		encode_integer_pos(Val, []);
-	    true ->
-		encode_integer_neg(Val, [])
-	end,
-    {Bytes,length(Bytes)}.
-
-encode_integer_pos(0, L=[B|_Acc]) when B < 128 ->
-    L;
-encode_integer_pos(N, Acc) ->
-    encode_integer_pos((N bsr 8), [N band 16#ff| Acc]).
-
-encode_integer_neg(-1, L=[B1|_T]) when B1 > 127 ->
-    L;
-encode_integer_neg(N, Acc) ->
-    encode_integer_neg(N bsr 8, [N band 16#ff|Acc]).
-
-%%===============================================================================
-%% decode integer
-%%    (Buffer, Range, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}
-%%    (Buffer, Range, NamedNumberList, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}
-%%===============================================================================
-
-decode_integer(Buffer, Range, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_INTEGER}),
-    decode_integer_notag(Buffer, Range, [], NewTags, OptOrMand).
-
-decode_integer(Buffer, Range, NamedNumberList, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_INTEGER}),
-    decode_integer_notag(Buffer, Range, NamedNumberList, NewTags, OptOrMand).
-
-decode_integer_notag(Buffer, Range, NamedNumberList, NewTags, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} =
-	check_tags_i(NewTags, Buffer, OptOrMand),
-%    Result = {Val, Buffer2, RemovedBytes} =
-	case FormLen of
-	    {?CONSTRUCTED,Len} ->
-		{Buffer00, RestBytes} = split_list(Buffer0,Len),
-		{Val01, Buffer01, Rb01} =
-		    decode_integer_notag(Buffer00, Range, NamedNumberList,
-					 RestTags, OptOrMand),
-		{Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-		{Val01, Buffer02, Rb0+Rb01+Rb02};
-	    {_, Len} ->
-		Result =
-		    decode_integer2(Len,Buffer0,Rb0+Len),
-		Result2 = check_integer_constraint(Result,Range),
-		resolve_named_value(Result2,NamedNumberList)
-	end.
-
-resolve_named_value(Result={Val,Buffer,RemBytes},NamedNumberList) ->
-    case NamedNumberList of
-	[] -> Result;
-	_ ->
-	    NewVal = case lists:keyfind(Val, 2, NamedNumberList) of
-			 {NamedVal, _} ->
-			     NamedVal;
-			 _ ->
-			     Val
-		     end,
-	    {NewVal, Buffer, RemBytes}
-    end.
-
-check_integer_constraint(Result={Val, _Buffer,_},Range) ->
-    case Range of
-	[] -> % No length constraint
-	    Result;
-	{Lb,Ub} when Val >= Lb, Ub >= Val -> % variable length constraint
-	    Result;
-	Val -> % fixed value constraint
-	    Result;
-	{_,_} ->
-	    exit({error,{asn1,{integer_range,Range,Val}}});
-	SingleValue when is_integer(SingleValue) ->
-	    exit({error,{asn1,{integer_range,Range,Val}}});
-	_ -> % some strange constraint that we don't support yet
-	    Result
-    end.
-
-%%============================================================================
-%% Enumerated value, ITU_T X.690 Chapter 8.4
-
-%% encode enumerated value
-%%============================================================================
-encode_enumerated(Val, []) when is_integer(Val) ->
-    {EncVal,Len} = encode_integer(false,Val),
-    dotag_universal(?N_ENUMERATED,EncVal,Len);
-encode_enumerated(Val, DoTag) when is_integer(Val) ->
-    dotag(DoTag, ?N_ENUMERATED, encode_integer(false,Val));
-encode_enumerated({Name,Val}, DoTag) when is_atom(Name) ->
-    encode_enumerated(Val, DoTag).
-
-%% The encode_enumerated functions below this line can be removed when the
-%% new code generation is stable. (the functions might have to be kept here
-%% a while longer for compatibility reasons)
-
-encode_enumerated(C, Val, {NamedNumberList,ExtList}, DoTag) when is_atom(Val) ->
-    case catch encode_enumerated(C, Val, NamedNumberList, DoTag) of
-	{'EXIT',_} -> encode_enumerated(C, Val, ExtList, DoTag);
-	Result -> Result
-    end;
-
-encode_enumerated(C, Val, NamedNumberList, DoTag) when is_atom(Val) ->
-    case lists:keyfind(Val, 1, NamedNumberList) of
-	{_, NewVal} when DoTag =:= [] ->
-	    {EncVal,Len} = encode_integer(C,NewVal),
-	    dotag_universal(?N_ENUMERATED,EncVal,Len);
-	{_, NewVal} ->
-	    dotag(DoTag, ?N_ENUMERATED, encode_integer(C, NewVal));
-	_ ->
-	    exit({error,{asn1, {enumerated_not_in_range, Val}}})
-    end;
-
-encode_enumerated(C, {asn1_enum, Val}, {_,_}, DoTag) when is_integer(Val) ->
-    dotag(DoTag, ?N_ENUMERATED, encode_integer(C,Val));
-
-encode_enumerated(C, {Name,Val}, NamedNumberList, DoTag) when is_atom(Name) ->
-    encode_enumerated(C, Val, NamedNumberList, DoTag);
-
-encode_enumerated(_, Val, _, _) ->
-    exit({error,{asn1, {enumerated_not_namednumber, Val}}}).
-
-
-
-%%============================================================================
-%% decode enumerated value
-%%   (Buffer, Range, NamedNumberList, HasTag, TotalLen) ->
-%%                                    {Value, RemainingBuffer, RemovedBytes}
-%%===========================================================================
-decode_enumerated(Buffer, Range, NamedNumberList, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_ENUMERATED}),
-    decode_enumerated_notag(Buffer, Range, NamedNumberList,
-			    NewTags, OptOrMand).
-
-decode_enumerated_notag(Buffer, Range, NNList = {NamedNumberList,ExtList}, Tags, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} =
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} =
-		decode_enumerated_notag(Buffer00, Range, NNList, RestTags, OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,Len} ->
-	    {Val01, Buffer01, Rb01} =
-		decode_integer2(Len, Buffer0, Rb0+Len),
-	    case decode_enumerated1(Val01, NamedNumberList) of
-		{asn1_enum,Val01} ->
-		    {decode_enumerated1(Val01,ExtList), Buffer01, Rb01};
-		Result01 ->
-		    {Result01, Buffer01, Rb01}
-	    end
-    end;
-
-decode_enumerated_notag(Buffer, Range, NNList, Tags, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} =
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} =
-		decode_enumerated_notag(Buffer00, Range, NNList, RestTags, OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,Len} ->
-	    {Val01, Buffer02, Rb02} =
-		decode_integer2(Len, Buffer0, Rb0+Len),
-	    case decode_enumerated1(Val01, NNList) of
-		{asn1_enum,_} ->
-		    exit({error,{asn1, {illegal_enumerated, Val01}}});
-		Result01 ->
-		    {Result01, Buffer02, Rb02}
-	    end
-    end.
-
-decode_enumerated1(Val, NamedNumberList) ->
-    %% it must be a named integer
-    case lists:keyfind(Val, 2, NamedNumberList) of
-	{NamedVal, _} ->
-	    NamedVal;
-	_ ->
-	    {asn1_enum,Val}
-    end.
-
-
 %%============================================================================
 %%
 %% Real value, ITU_T X.690 Chapter 8.5
@@ -1117,513 +412,15 @@ decode_real2(Buffer0, _C, Len, RemBytes1) ->
 	    {{Mantissa, Base, Exp}, Buffer4, RemBytes2+RemBytes3}
     end.
 
+encode_integer_pos(0, L=[B|_Acc]) when B < 128 ->
+    L;
+encode_integer_pos(N, Acc) ->
+    encode_integer_pos((N bsr 8), [N band 16#ff| Acc]).
 
-%%============================================================================
-%% Bitstring value, ITU_T X.690 Chapter 8.6
-%%
-%% encode bitstring value
-%%
-%% bitstring NamedBitList
-%% Val can be  of:
-%% - [identifiers] where only named identifers are set to one,
-%%   the Constraint must then have some information of the
-%%   bitlength.
-%% - [list of ones and zeroes] all bits
-%% - integer value representing the bitlist
-%% C is constrint Len, only valid when identifiers
-%%============================================================================
-
-encode_bit_string(C,Bin={Unused,BinBits},NamedBitList,DoTag) when is_integer(Unused), is_binary(BinBits) ->
-    encode_bin_bit_string(C,Bin,NamedBitList,DoTag);
-encode_bit_string(C, [FirstVal | RestVal], NamedBitList, DoTag) when is_atom(FirstVal) ->
-    encode_bit_string_named(C, [FirstVal | RestVal], NamedBitList, DoTag);
-
-encode_bit_string(C, [{bit,X} | RestVal], NamedBitList, DoTag) ->
-    encode_bit_string_named(C, [{bit,X} | RestVal], NamedBitList, DoTag);
-
-encode_bit_string(C, [FirstVal| RestVal], NamedBitList, DoTag) when is_integer(FirstVal) ->
-    encode_bit_string_bits(C, [FirstVal | RestVal], NamedBitList, DoTag);
-
-encode_bit_string(_, 0, _, []) ->
-    {[?N_BIT_STRING,1,0],3};
-
-encode_bit_string(_, 0, _, DoTag) ->
-    dotag(DoTag, ?N_BIT_STRING, {<<0>>,1});
-
-encode_bit_string(_, [], _, []) ->
-    {[?N_BIT_STRING,1,0],3};
-
-encode_bit_string(_, [], _, DoTag) ->
-    dotag(DoTag, ?N_BIT_STRING, {<<0>>,1});
-
-encode_bit_string(C, IntegerVal, NamedBitList, DoTag) when is_integer(IntegerVal) ->
-    BitListVal = int_to_bitlist(IntegerVal),
-    encode_bit_string_bits(C, BitListVal, NamedBitList, DoTag);
-
-encode_bit_string(C, {Name,BitList}, NamedBitList, DoTag) when is_atom(Name) ->
-    encode_bit_string(C, BitList, NamedBitList, DoTag).
-
-
-
-int_to_bitlist(0) ->
-    [];
-int_to_bitlist(Int) when is_integer(Int), Int >= 0 ->
-    [Int band 1 | int_to_bitlist(Int bsr 1)].
-
-
-%%=================================================================
-%% Encode BIT STRING of the form {Unused,BinBits}.
-%% Unused is the number of unused bits in the last byte in BinBits
-%% and BinBits is a binary representing the BIT STRING.
-%%=================================================================
-encode_bin_bit_string(C,{Unused,BinBits},_NamedBitList,DoTag)->
-    case get_constraint(C,'SizeConstraint') of
-	no ->
-	    remove_unused_then_dotag(DoTag,?N_BIT_STRING,Unused,BinBits);
-	{_Min,Max} ->
-	    BBLen = (size(BinBits)*8)-Unused,
-	    if
-		BBLen > Max ->
-		    exit({error,{asn1,
-				 {bitstring_length,
-				  {{was,BBLen},{maximum,Max}}}}});
-		true ->
-		    remove_unused_then_dotag(DoTag,?N_BIT_STRING,
-					     Unused,BinBits)
-	    end;
-	Size ->
-	    case ((size(BinBits)*8)-Unused) of
-		BBSize when BBSize =< Size ->
-		    remove_unused_then_dotag(DoTag,?N_BIT_STRING,
-					     Unused,BinBits);
-		BBSize  ->
-		    exit({error,{asn1,
-				 {bitstring_length,
-				  {{was,BBSize},{should_be,Size}}}}})
-	    end
-    end.
-
-remove_unused_then_dotag(DoTag,StringType,Unused,BinBits) ->
-    case Unused of
-	0 when (byte_size(BinBits) =:= 0), DoTag =:= [] ->
-	    %% time optimization of next case
-	   {[StringType,1,0],3};
-	0 when (byte_size(BinBits) =:= 0) ->
-	    dotag(DoTag,StringType,{<<0>>,1});
-	0 when DoTag =:= [] -> % time optimization of next case
-	    dotag_universal(StringType,[Unused|[BinBits]],size(BinBits)+1);
-% 	    {LenEnc,Len} = encode_legth(size(BinBits)+1),
-% 	    {[StringType,LenEnc,[Unused|BinBits]],size(BinBits)+1+Len+1};
-	0 ->
-	    dotag(DoTag,StringType,<<Unused,BinBits/binary>>);
-	Num when DoTag =:= [] -> % time optimization of next case
-	    N = byte_size(BinBits) - 1,
-	    <<BBits:N/binary,LastByte>> = BinBits,
-	    dotag_universal(StringType,
-			    [Unused,BBits,(LastByte bsr Num) bsl Num],
-			    byte_size(BinBits) + 1);
-% 	    {LenEnc,Len} = encode_legth(size(BinBits)+1),
-% 	    {[StringType,LenEnc,[Unused,BBits,(LastByte bsr Num) bsl Num],
-% 	      1+Len+size(BinBits)+1};
-	Num ->
-	    N = byte_size(BinBits) - 1,
-	    <<BBits:N/binary,LastByte>> = BinBits,
-	    dotag(DoTag,StringType,{[Unused,binary_to_list(BBits) ++
-				     [(LastByte bsr Num) bsl Num]],
-				    byte_size(BinBits) + 1})
-    end.
-
-
-%%=================================================================
-%% Encode named bits
-%%=================================================================
-
-encode_bit_string_named(C, [FirstVal | RestVal], NamedBitList, DoTag) ->
-    {Len,Unused,OctetList} =
-	case get_constraint(C,'SizeConstraint') of
-	    no ->
-		ToSetPos = get_all_bitposes([FirstVal | RestVal],
-					    NamedBitList, []),
-		BitList = make_and_set_list(lists:max(ToSetPos)+1,
-					    ToSetPos, 0),
-		encode_bitstring(BitList);
-	    {_Min,Max} ->
-		ToSetPos = get_all_bitposes([FirstVal | RestVal],
-					    NamedBitList, []),
-		BitList = make_and_set_list(Max, ToSetPos, 0),
-		encode_bitstring(BitList);
-	    Size ->
-		ToSetPos = get_all_bitposes([FirstVal | RestVal],
-					    NamedBitList, []),
-		BitList = make_and_set_list(Size, ToSetPos, 0),
-		encode_bitstring(BitList)
-	end,
-    case DoTag of
-	[] ->
-	    dotag_universal(?N_BIT_STRING,[Unused|OctetList],Len+1);
-% 	    {EncLen,LenLen} = encode_length(Len+1),
-% 	    {[?N_BIT_STRING,EncLen,Unused,OctetList],1+LenLen+Len+1};
-	_ ->
-	    dotag(DoTag, ?N_BIT_STRING, {[Unused|OctetList],Len+1})
-    end.
-
-
-%%----------------------------------------
-%% get_all_bitposes([list of named bits to set], named_bit_db, []) ->
-%%   [sorted_list_of_bitpositions_to_set]
-%%----------------------------------------
-
-get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
-    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
-get_all_bitposes([Val | Rest], NamedBitList, Ack) when is_atom(Val) ->
-    case lists:keyfind(Val, 1, NamedBitList) of
-	{_ValName, ValPos} ->
-	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
-	_ ->
-	    exit({error,{asn1, {bitstring_namedbit, Val}}})
-    end;
-get_all_bitposes([], _NamedBitList, Ack) ->
-    lists:sort(Ack).
-
-
-%%----------------------------------------
-%% make_and_set_list(Len of list to return, [list of positions to set to 1])->
-%% returns list of Len length, with all in SetPos set.
-%% in positioning in list the first element is 0, the second 1 etc.., but
-%% Len will make a list of length Len, not Len + 1.
-%%    BitList = make_and_set_list(C, ToSetPos, 0),
-%%----------------------------------------
-
-make_and_set_list(0, [], _) -> [];
-make_and_set_list(0, _, _) ->
-    exit({error,{asn1,bitstring_sizeconstraint}});
-make_and_set_list(Len, [XPos|SetPos], XPos) ->
-    [1 | make_and_set_list(Len - 1, SetPos, XPos + 1)];
-make_and_set_list(Len, [Pos|SetPos], XPos) ->
-    [0 | make_and_set_list(Len - 1, [Pos | SetPos], XPos + 1)];
-make_and_set_list(Len, [], XPos) ->
-    [0 | make_and_set_list(Len - 1, [], XPos + 1)].
-
-
-%%=================================================================
-%% Encode bit string for lists of ones and zeroes
-%%=================================================================
-encode_bit_string_bits(C, BitListVal, _NamedBitList, DoTag) when is_list(BitListVal) ->
-    {Len,Unused,OctetList} =
-	case get_constraint(C,'SizeConstraint') of
-	    no ->
-		encode_bitstring(BitListVal);
-	    Constr={Min,_Max} when is_integer(Min) ->
-		encode_constr_bit_str_bits(Constr,BitListVal,DoTag);
-	    {Constr={_,_},[]} ->
-		%% constraint with extension mark
-		encode_constr_bit_str_bits(Constr,BitListVal,DoTag);
-	    Constr={{_,_},{_,_}} ->%{{Min1,Max1},{Min2,Max2}}
-		%% constraint with extension mark
-		encode_constr_bit_str_bits(Constr,BitListVal,DoTag);
-	    Size ->
-		case length(BitListVal) of
-		    BitSize when BitSize =:= Size ->
-			encode_bitstring(BitListVal);
-		    BitSize when BitSize < Size ->
-			PaddedList =
-			    pad_bit_list(Size-BitSize,BitListVal),
-			encode_bitstring(PaddedList);
-		    BitSize ->
-			exit({error,
-			      {asn1,
-			       {bitstring_length,
-				{{was,BitSize},
-				 {should_be,Size}}}}})
-		end
-	end,
-    %%add unused byte to the Len
-    case DoTag of
-	[] ->
-	    dotag_universal(?N_BIT_STRING,[Unused|OctetList],Len+1);
-% 	    {EncLen,LenLen}=encode_length(Len+1),
-% 	    {[?N_BIT_STRING,EncLen,Unused|OctetList],1+LenLen+Len+1};
-	_ ->
-	    dotag(DoTag, ?N_BIT_STRING,
-		  {[Unused | OctetList],Len+1})
-    end.
-
-
-encode_constr_bit_str_bits({{_Min1,Max1},{Min2,Max2}},BitListVal,_DoTag) ->
-    BitLen = length(BitListVal),
-    case BitLen of
-	Len when Len > Max2 ->
-	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
-						 {maximum,Max2}}}}});
-	Len when Len > Max1, Len < Min2  ->
-	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
-						 {not_allowed_interval,
-						  Max1,Min2}}}}});
-	_ ->
-	    encode_bitstring(BitListVal)
-    end;
-encode_constr_bit_str_bits({Min,Max},BitListVal,_DoTag) ->
-    BitLen = length(BitListVal),
-    if
-	BitLen > Max ->
-	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
-						 {maximum,Max}}}}});
-	BitLen < Min ->
-	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
-						 {minimum,Min}}}}});
-	true ->
-	    encode_bitstring(BitListVal)
-    end.
-
-
-%% returns a list of length Size + length(BitListVal), with BitListVal
-%% as the most significant elements followed by padded zero elements
-pad_bit_list(Size,BitListVal) ->
-    Tail = lists:duplicate(Size,0),
-    BitListVal ++ Tail.
-
-%%=================================================================
-%% Do the actual encoding
-%%     ([bitlist]) -> {ListLen, UnusedBits, OctetList}
-%%=================================================================
-
-encode_bitstring([B8, B7, B6, B5, B4, B3, B2, B1 | Rest]) ->
-    Val = (B8 bsl 7) bor (B7 bsl 6) bor (B6 bsl 5) bor (B5 bsl 4) bor
-	(B4 bsl 3) bor (B3 bsl 2) bor (B2 bsl 1) bor B1,
-    encode_bitstring(Rest, [Val], 1);
-encode_bitstring(Val) ->
-    {Unused, Octet} = unused_bitlist(Val, 7, 0),
-    {1, Unused, [Octet]}.
-
-encode_bitstring([B8, B7, B6, B5, B4, B3, B2, B1 | Rest], Ack, Len) ->
-    Val = (B8 bsl 7) bor (B7 bsl 6) bor (B6 bsl 5) bor (B5 bsl 4) bor
-	(B4 bsl 3) bor (B3 bsl 2) bor (B2 bsl 1) bor B1,
-    encode_bitstring(Rest, [Ack | [Val]], Len + 1);
-%%even multiple of 8 bits..
-encode_bitstring([], Ack, Len) ->
-    {Len, 0, Ack};
-%% unused bits in last octet
-encode_bitstring(Rest, Ack, Len) ->
-%    io:format("uneven ~w ~w ~w~n",[Rest, Ack, Len]),
-    {Unused, Val} = unused_bitlist(Rest, 7, 0),
-    {Len + 1, Unused, [Ack | [Val]]}.
-
-%%%%%%%%%%%%%%%%%%
-%% unused_bitlist([list of ones and zeros <= 7], 7, []) ->
-%%  {Unused bits, Last octet with bits moved to right}
-unused_bitlist([], Trail, Ack) ->
-    {Trail + 1, Ack};
-unused_bitlist([Bit | Rest], Trail, Ack) ->
-%%    io:format("trail Bit: ~w Rest: ~w Trail: ~w Ack:~w~n",[Bit, Rest, Trail, Ack]),
-    unused_bitlist(Rest, Trail - 1, (Bit bsl Trail) bor Ack).
-
-
-%%============================================================================
-%% decode bitstring value
-%%    (Buffer, Range, NamedNumberList, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}
-%%============================================================================
-
-decode_compact_bit_string(Buffer, Range, NamedNumberList, Tags, LenIn, OptOrMand) ->
-%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_BIT_STRING}),
-     decode_restricted_string(Buffer, Range, ?N_BIT_STRING, Tags, LenIn,
-			     NamedNumberList, OptOrMand,bin).
-
-decode_bit_string(Buffer, Range, NamedNumberList, Tags, LenIn, OptOrMand) ->
-%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_BIT_STRING}),
-    decode_restricted_string(Buffer, Range, ?N_BIT_STRING, Tags, LenIn,
-			     NamedNumberList, OptOrMand,old).
-
-
-decode_bit_string2(1,<<0 ,Buffer/binary>>,_NamedNumberList,RemovedBytes,BinOrOld) ->
-    case BinOrOld of
-	bin ->
-	    {{0,<<>>},Buffer,RemovedBytes};
-	_ ->
-	    {[], Buffer, RemovedBytes}
-    end;
-decode_bit_string2(Len,<<Unused,Buffer/binary>>,NamedNumberList,
-		   RemovedBytes,BinOrOld) ->
-    L = Len - 1,
-    <<Bits:L/binary,BufferTail/binary>> = Buffer,
-    case NamedNumberList of
-	[] ->
-	    case BinOrOld of
-		bin ->
-		    {{Unused,Bits},BufferTail,RemovedBytes};
-		_ ->
-		    BitString = decode_bitstring2(L, Unused, Buffer),
-		    {BitString,BufferTail, RemovedBytes}
-	    end;
-	_ ->
-	    BitString = decode_bitstring2(L, Unused, Buffer),
-	    {decode_bitstring_NNL(BitString,NamedNumberList),
-	     BufferTail,
-	     RemovedBytes}
-    end.
-
-%%----------------------------------------
-%% Decode the in buffer to bits
-%%----------------------------------------
-decode_bitstring2(1,Unused,<<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,_/binary>>) ->
-    lists:sublist([B7,B6,B5,B4,B3,B2,B1,B0],8-Unused);
-decode_bitstring2(Len, Unused,
-		  <<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,Buffer/binary>>) ->
-    [B7, B6, B5, B4, B3, B2, B1, B0 |
-     decode_bitstring2(Len - 1, Unused, Buffer)].
-
-%%decode_bitstring2(1, Unused, Buffer) ->
-%%    make_bits_of_int(hd(Buffer), 128, 8-Unused);
-%%decode_bitstring2(Len, Unused, [BitVal | Buffer]) ->
-%%    [B7, B6, B5, B4, B3, B2, B1, B0] = make_bits_of_int(BitVal, 128, 8),
-%%    [B7, B6, B5, B4, B3, B2, B1, B0 |
-%%     decode_bitstring2(Len - 1, Unused, Buffer)].
-
-
-%%make_bits_of_int(_, _, 0) ->
-%%    [];
-%%make_bits_of_int(BitVal, MaskVal, Unused) when Unused > 0 ->
-%%    X = case MaskVal band BitVal of
-%%	    0 -> 0 ;
-%%	    _ -> 1
-%%	end,
-%%    [X | make_bits_of_int(BitVal, MaskVal bsr 1, Unused - 1)].
-
-
-
-%%----------------------------------------
-%% Decode the bitlist to names
-%%----------------------------------------
-
-decode_bitstring_NNL(BitList,NamedNumberList) ->
-    decode_bitstring_NNL(BitList,NamedNumberList,0,[]).
-
-
-decode_bitstring_NNL([],_,_No,Result) ->
-    lists:reverse(Result);
-
-decode_bitstring_NNL([B|BitList],[{Name,No}|NamedNumberList],No,Result) ->
-    if
-	B =:= 0 ->
-	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,Result);
-	true ->
-	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,[Name|Result])
-    end;
-decode_bitstring_NNL([1|BitList],NamedNumberList,No,Result) ->
-    decode_bitstring_NNL(BitList,NamedNumberList,No+1,[{bit,No}|Result]);
-decode_bitstring_NNL([0|BitList],NamedNumberList,No,Result) ->
-    decode_bitstring_NNL(BitList,NamedNumberList,No+1,Result).
-
-
-%%============================================================================
-%% Octet string, ITU_T X.690 Chapter 8.7
-%%
-%% encode octet string
-%% The OctetList must be a flat list of integers in the range 0..255
-%% the function does not check this because it takes to much time
-%%============================================================================
-encode_octet_string(_C, OctetList, []) when is_binary(OctetList) ->
-    dotag_universal(?N_OCTET_STRING,OctetList,byte_size(OctetList));
-encode_octet_string(_C, OctetList, DoTag) when is_binary(OctetList) ->
-    dotag(DoTag, ?N_OCTET_STRING, {OctetList,byte_size(OctetList)});
-encode_octet_string(_C, OctetList, DoTag) when is_list(OctetList) ->
-    case length(OctetList) of
-	Len when DoTag =:= [] ->
-	    dotag_universal(?N_OCTET_STRING,OctetList,Len);
-	Len ->
-	    dotag(DoTag, ?N_OCTET_STRING, {OctetList,Len})
-    end;
-%% encode_octet_string(C, OctetList, DoTag) when is_list(OctetList) ->
-%%     dotag(DoTag, ?N_OCTET_STRING, {OctetList,length(OctetList)});
-encode_octet_string(C, {Name,OctetList}, DoTag) when is_atom(Name) ->
-    encode_octet_string(C, OctetList, DoTag).
-
-
-%%============================================================================
-%% decode octet string
-%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}
-%%
-%% Octet string is decoded as a restricted string
-%%============================================================================
-decode_octet_string(Buffer, Range, Tags, TotalLen, OptOrMand) ->
-%%  NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_OCTET_STRING}),
-    decode_restricted_string(Buffer, Range, ?N_OCTET_STRING,
-			     Tags, TotalLen, [], OptOrMand,old).
-
-%%============================================================================
-%% Null value, ITU_T X.690 Chapter 8.8
-%%
-%% encode NULL value
-%%============================================================================
-
-encode_null(_, []) ->
-    {[?N_NULL,0],2};
-encode_null(_, DoTag) ->
-    dotag(DoTag, ?N_NULL, {[],0}).
-
-%%============================================================================
-%% decode NULL value
-%%    (Buffer, HasTag, TotalLen) -> {NULL, Remain, RemovedBytes}
-%%============================================================================
-decode_null(Buffer, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_NULL}),
-    decode_null_notag(Buffer, NewTags, OptOrMand).
-
-decode_null_notag(Buffer, Tags, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} =
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {_Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} = decode_null_notag(Buffer0, RestTags,
-							OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,0} ->
-	    {'NULL', Buffer0, Rb0};
-	{_,Len} ->
-	    exit({error,{asn1,{invalid_length,'NULL',Len}}})
-    end.
-
-
-%%============================================================================
-%% Object identifier, ITU_T X.690 Chapter 8.19
-%%
-%% encode Object Identifier value
-%%============================================================================
-
-encode_object_identifier({Name,Val}, DoTag) when is_atom(Name) ->
-    encode_object_identifier(Val, DoTag);
-encode_object_identifier(Val, []) ->
-    {EncVal,Len} = e_object_identifier(Val),
-    dotag_universal(?N_OBJECT_IDENTIFIER,EncVal,Len);
-encode_object_identifier(Val, DoTag) ->
-    dotag(DoTag, ?N_OBJECT_IDENTIFIER, e_object_identifier(Val)).
-
-e_object_identifier({'OBJECT IDENTIFIER', V}) ->
-    e_object_identifier(V);
-e_object_identifier({Cname, V}) when is_atom(Cname), is_tuple(V) ->
-    e_object_identifier(tuple_to_list(V));
-e_object_identifier({Cname, V}) when is_atom(Cname), is_list(V) ->
-    e_object_identifier(V);
-e_object_identifier(V) when is_tuple(V) ->
-    e_object_identifier(tuple_to_list(V));
-
-%%%%%%%%%%%%%%%
-%% e_object_identifier([List of Obect Identifiers]) ->
-%% {[Encoded Octetlist of ObjIds], IntLength}
-%%
-e_object_identifier([E1, E2 | Tail]) ->
-    Head = 40*E1 + E2,  % wow!
-    {H,Lh} = mk_object_val(Head),
-    {R,Lr} = enc_obj_id_tail(Tail, [], 0),
-    {[H|R], Lh+Lr}.
-
-enc_obj_id_tail([], Ack, Len) ->
-    {lists:reverse(Ack), Len};
-enc_obj_id_tail([H|T], Ack, Len) ->
-    {B, L} = mk_object_val(H),
-    enc_obj_id_tail(T, [B|Ack], Len+L).
+encode_integer_neg(-1, L=[B1|_T]) when B1 > 127 ->
+    L;
+encode_integer_neg(N, Acc) ->
+    encode_integer_neg(N bsr 8, [N band 16#ff|Acc]).
 
 
 %%%%%%%%%%%
@@ -1643,476 +440,6 @@ mk_object_val(Val, Ack, Len) ->
     mk_object_val(Val bsr 7, [((Val band 127) bor 128) | Ack], Len + 1).
 
 
-
-%%============================================================================
-%% decode Object Identifier value
-%%    (Buffer, HasTag, TotalLen) -> {{ObjId}, Remain, RemovedBytes}
-%%============================================================================
-
-decode_object_identifier(Buffer, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,
-				 number=?N_OBJECT_IDENTIFIER}),
-    decode_object_identifier_notag(Buffer, NewTags, OptOrMand).
-
-decode_object_identifier_notag(Buffer, Tags, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} =
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} =
-		decode_object_identifier_notag(Buffer00,
-					       RestTags, OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,Len} ->
-	    {[AddedObjVal|ObjVals],Buffer01} =
-		dec_subidentifiers(Buffer0,0,[],Len),
-	    {Val1, Val2} = if
-			       AddedObjVal < 40 ->
-				   {0, AddedObjVal};
-			       AddedObjVal < 80 ->
-				   {1, AddedObjVal - 40};
-			       true ->
-				   {2, AddedObjVal - 80}
-			   end,
-	    {list_to_tuple([Val1, Val2 | ObjVals]), Buffer01,
-	     Rb0+Len}
-    end.
-
-dec_subidentifiers(Buffer,_Av,Al,0) ->
-    {lists:reverse(Al),Buffer};
-dec_subidentifiers(<<1:1,H:7,T/binary>>,Av,Al,Len) ->
-    dec_subidentifiers(T,(Av bsl 7) + H,Al,Len-1);
-dec_subidentifiers(<<H,T/binary>>,Av,Al,Len) ->
-    dec_subidentifiers(T,0,[((Av bsl 7) + H)|Al],Len-1).
-
-%%============================================================================
-%% RELATIVE-OID, ITU_T X.690 Chapter 8.20
-%%
-%% encode Relative Object Identifier
-%%============================================================================
-encode_relative_oid({Name,Val},TagIn) when is_atom(Name) ->
-    encode_relative_oid(Val,TagIn);
-encode_relative_oid(Val,TagIn) when is_tuple(Val) ->
-    encode_relative_oid(tuple_to_list(Val),TagIn);
-encode_relative_oid(Val,[]) ->
-    {EncVal,Len} = enc_relative_oid(Val),
-    dotag_universal(?'N_RELATIVE-OID',EncVal,Len);
-encode_relative_oid(Val, DoTag) ->
-    dotag(DoTag, ?'N_RELATIVE-OID', enc_relative_oid(Val)).
-
-enc_relative_oid(Val) ->
-    lists:mapfoldl(fun(X,AccIn) ->
-			   {SO,L}=mk_object_val(X),
-			   {SO,L+AccIn}
-		   end
-		   ,0,Val).
-
-%%============================================================================
-%% decode Relative Object Identifier value
-%%    (Buffer, HasTag, TotalLen) -> {{ObjId}, Remain, RemovedBytes}
-%%============================================================================
-decode_relative_oid(Buffer, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,
-				 number=?'N_RELATIVE-OID'}),
-    decode_relative_oid_notag(Buffer, NewTags, OptOrMand).
-
-decode_relative_oid_notag(Buffer, Tags, OptOrMand) ->
-    {_RestTags, {_FormLen={_,Len}, Buffer0, Rb0}} =
-	check_tags_i(Tags, Buffer, OptOrMand),
-    {ObjVals,Buffer01} =
-	dec_subidentifiers(Buffer0,0,[],Len),
-    {list_to_tuple(ObjVals), Buffer01, Rb0+Len}.
-
-%%============================================================================
-%% Restricted character string types, ITU_T X.690 Chapter 8.21
-%%
-%% encode Numeric Printable Teletex Videotex Visible IA5 Graphic General strings
-%%============================================================================
-encode_restricted_string(_C, OctetList, StringType, [])
-  when is_binary(OctetList) ->
-    dotag_universal(StringType, OctetList, byte_size(OctetList));
-encode_restricted_string(_C, OctetList, StringType, DoTag)
-  when is_binary(OctetList) ->
-    dotag(DoTag, StringType, {OctetList, byte_size(OctetList)});
-encode_restricted_string(_C, OctetList, StringType, [])
-  when is_list(OctetList) ->
-    dotag_universal(StringType, OctetList, length(OctetList));
-encode_restricted_string(_C, OctetList, StringType, DoTag)
-  when is_list(OctetList) ->
-    dotag(DoTag, StringType, {OctetList, length(OctetList)});
-encode_restricted_string(C,{Name,OctetL},StringType,DoTag) when is_atom(Name) ->
-    encode_restricted_string(C, OctetL, StringType, DoTag).
-
-%%============================================================================
-%% decode Numeric Printable Teletex Videotex Visible IA5 Graphic General strings
-%%    (Buffer, Range, StringType, HasTag, TotalLen) ->
-%%                                  {String, Remain, RemovedBytes}
-%%============================================================================
-
-decode_restricted_string(Buffer, Range, StringType, Tags, LenIn, OptOrMand) ->
-    {Val,Buffer2,Rb} =
-	decode_restricted_string_tag(Buffer, Range, StringType, Tags,
-				  LenIn, [], OptOrMand,old),
-    {check_and_convert_restricted_string(Val,StringType,Range,[],old),
-     Buffer2,Rb}.
-
-
-decode_restricted_string(Buffer, Range, StringType, Tags, LenIn, NNList, OptOrMand, BinOrOld ) ->
-    {Val,Buffer2,Rb} =
-	decode_restricted_string_tag(Buffer, Range, StringType, Tags,
-			     LenIn, NNList, OptOrMand, BinOrOld),
-    {check_and_convert_restricted_string(Val,StringType,Range,NNList,BinOrOld),
-     Buffer2,Rb}.
-
-decode_restricted_string_tag(Buffer, Range, StringType, TagsIn, LenIn, NNList, OptOrMand, BinOrOld ) ->
-    NewTags = new_tags(TagsIn, #tag{class=?UNIVERSAL,number=StringType}),
-    decode_restricted_string_notag(Buffer, Range, StringType, NewTags,
-				   LenIn, NNList, OptOrMand, BinOrOld).
-
-
-check_and_convert_restricted_string(Val,StringType,Range,NamedNumberList,_BinOrOld) ->
-    {StrLen,NewVal} = case StringType of
-			  ?N_BIT_STRING when NamedNumberList =/= [] ->
-			      {no_check,Val};
-			  ?N_BIT_STRING when is_list(Val) ->
-			      {length(Val),Val};
-			  ?N_BIT_STRING when is_tuple(Val) ->
-			      {(size(element(2,Val))*8) - element(1,Val),Val};
-			  _ when is_binary(Val) ->
-			      {byte_size(Val),binary_to_list(Val)};
-			  _ when is_list(Val) ->
-			      {length(Val), Val}
-		      end,
-    case Range of
-	_ when StrLen =:= no_check ->
-	    NewVal;
-	[] -> % No length constraint
-	    NewVal;
-	{Lb,Ub} when StrLen >= Lb, Ub >= StrLen -> % variable length constraint
-	    NewVal;
-	{{Lb,_Ub},[]} when StrLen >= Lb ->
-	    NewVal;
-	{{Lb,_Ub},_Ext=[MinExt|_]} when StrLen >= Lb; StrLen >= MinExt ->
-	    NewVal;
-	{{Lb1,Ub1},{Lb2,Ub2}} when StrLen >= Lb1, StrLen =< Ub1;
-				   StrLen =< Ub2, StrLen >= Lb2 ->
-	    NewVal;
-	StrLen -> % fixed length constraint
-	    NewVal;
-	{_,_} ->
-	    exit({error,{asn1,{length,Range,Val}}});
-	_Len when is_integer(_Len) ->
-	    exit({error,{asn1,{length,Range,Val}}});
-	_ -> % some strange constraint that we don't support yet
-	    NewVal
-    end.
-
-%%=============================================================================
-%% Common routines for several string types including bit string
-%% handles indefinite length
-%%=============================================================================
-
-
-decode_restricted_string_notag(Buffer, _Range, StringType, TagsIn,
-			       _, NamedNumberList, OptOrMand, BinOrOld) ->
-    %%-----------------------------------------------------------
-    %% Get inner (the implicit tag or no tag) and
-    %%     outer (the explicit tag) lengths.
-    %%-----------------------------------------------------------
-    {RestTags, {FormLength={_,_Len01}, Buffer0, Rb0}} =
-	check_tags_i(TagsIn, Buffer, OptOrMand),
-
-    case FormLength of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00, RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} =
-		decode_restricted_parts(Buffer00, RestBytes, [], StringType,
-					RestTags,
-					Len, NamedNumberList,
-					OptOrMand,
-					BinOrOld, 0, []),
-	    {Val01, Buffer01, Rb0+Rb01};
-	{_, Len} ->
-	    {Val01, Buffer01, Rb01} =
-		decode_restricted(Buffer0, Len, StringType,
-				  NamedNumberList, BinOrOld),
-	    {Val01, Buffer01, Rb0+Rb01}
-    end.
-
-
-decode_restricted_parts(Buffer, RestBytes, [], StringType, RestTags, Len, NNList,
-			OptOrMand, BinOrOld, AccRb, AccVal) ->
-    DecodeFun = case RestTags of
-		    [] -> fun decode_restricted_string_tag/8;
-		    _ -> fun decode_restricted_string_notag/8
-		end,
-    {Val, Buffer1, Rb} =
-	DecodeFun(Buffer, [], StringType, RestTags,
-		  no_length, NNList,
-		  OptOrMand, BinOrOld),
-    {Buffer2,More} =
-	case Buffer1 of
-	    <<0,0,Buffer10/binary>> when Len == indefinite ->
-		{Buffer10,false};
-	    <<>> ->
-		{RestBytes,false};
-	    _ ->
-		{Buffer1,true}
-	end,
-    {NewVal, NewRb} =
-	case StringType of
-	    ?N_BIT_STRING when BinOrOld == bin ->
-		{concat_bit_binaries(AccVal, Val), AccRb+Rb};
-	    _ when is_binary(Val),is_binary(AccVal) ->
-		{<<AccVal/binary,Val/binary>>,AccRb+Rb};
-	    _ when is_binary(Val), AccVal =:= [] ->
-		{Val,AccRb+Rb};
-	    _ ->
-		{AccVal++Val, AccRb+Rb}
-	end,
-    case More of
-	false ->
-	    {NewVal, Buffer2, NewRb};
-	true ->
-	    decode_restricted_parts(Buffer2, RestBytes, [], StringType, RestTags, Len, NNList,
-				    OptOrMand, BinOrOld, NewRb, NewVal)
-    end.
-
-
-
-decode_restricted(Buffer, InnerLen, StringType, NamedNumberList,BinOrOld) ->
-
-    case StringType of
-	?N_BIT_STRING ->
-	    decode_bit_string2(InnerLen,Buffer,NamedNumberList,InnerLen,BinOrOld);
-
-	?N_UniversalString ->
-	    <<PreBuff:InnerLen/binary,RestBuff/binary>> = Buffer,%%added for binary
-	    UniString = mk_universal_string(binary_to_list(PreBuff)),
-	    {UniString,RestBuff,InnerLen};
-	?N_BMPString ->
-	    <<PreBuff:InnerLen/binary,RestBuff/binary>> = Buffer,%%added for binary
-	    BMP = mk_BMP_string(binary_to_list(PreBuff)),
-	    {BMP,RestBuff,InnerLen};
-	_ ->
-	    <<PreBuff:InnerLen/binary,RestBuff/binary>> = Buffer,%%added for binary
-	    {PreBuff, RestBuff, InnerLen}
-    end.
-
-
-
-%%============================================================================
-%% encode Universal string
-%%============================================================================
-
-encode_universal_string(C, {Name, Universal}, DoTag) when is_atom(Name) ->
-    encode_universal_string(C, Universal, DoTag);
-encode_universal_string(_C, Universal, []) ->
-    OctetList = mk_uni_list(Universal),
-    dotag_universal(?N_UniversalString,OctetList,length(OctetList));
-encode_universal_string(_C, Universal, DoTag) ->
-    OctetList = mk_uni_list(Universal),
-    dotag(DoTag, ?N_UniversalString, {OctetList,length(OctetList)}).
-
-mk_uni_list(In) ->
-    mk_uni_list(In,[]).
-
-mk_uni_list([],List) ->
-    lists:reverse(List);
-mk_uni_list([{A,B,C,D}|T],List) ->
-    mk_uni_list(T,[D,C,B,A|List]);
-mk_uni_list([H|T],List) ->
-    mk_uni_list(T,[H,0,0,0|List]).
-
-%%===========================================================================
-%% decode Universal strings
-%%    (Buffer, Range, StringType, HasTag, LenIn) ->
-%%                           {String, Remain, RemovedBytes}
-%%===========================================================================
-
-decode_universal_string(Buffer, Range, Tags, LenIn, OptOrMand) ->
-%    NewTags = new_tags(HasTag, #tag{class=?UNIVERSAL,number=?N_UniversalString}),
-    decode_restricted_string(Buffer, Range, ?N_UniversalString,
-			     Tags, LenIn, [], OptOrMand,old).
-
-
-mk_universal_string(In) ->
-    mk_universal_string(In,[]).
-
-mk_universal_string([],Acc) ->
-    lists:reverse(Acc);
-mk_universal_string([0,0,0,D|T],Acc) ->
-    mk_universal_string(T,[D|Acc]);
-mk_universal_string([A,B,C,D|T],Acc) ->
-    mk_universal_string(T,[{A,B,C,D}|Acc]).
-
-
-%%============================================================================
-%% encode UTF8 string
-%%============================================================================
-encode_UTF8_string(_,UTF8String,[]) when is_binary(UTF8String) ->
-    dotag_universal(?N_UTF8String,UTF8String,byte_size(UTF8String));
-encode_UTF8_string(_,UTF8String,DoTag) when is_binary(UTF8String) ->
-    dotag(DoTag,?N_UTF8String,{UTF8String,byte_size(UTF8String)});
-encode_UTF8_string(_,UTF8String,[]) ->
-    dotag_universal(?N_UTF8String,UTF8String,length(UTF8String));
-encode_UTF8_string(_,UTF8String,DoTag) ->
-    dotag(DoTag,?N_UTF8String,{UTF8String,length(UTF8String)}).
-
-%%============================================================================
-%% decode UTF8 string
-%%============================================================================
-
-decode_UTF8_string(Buffer, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags, #tag{class=?UNIVERSAL,number=?N_UTF8String}),
-    decode_UTF8_string_notag(Buffer, NewTags, OptOrMand).
-
-decode_UTF8_string_notag(Buffer, Tags, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} =
-	check_tags_i(Tags, Buffer, OptOrMand),
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    %% an UTF8String may be encoded as a constructed type
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} =
-		decode_UTF8_string_notag(Buffer00,RestTags,OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,Len} ->
-	    <<Result:Len/binary,RestBuff/binary>> = Buffer0,
-	    {Result,RestBuff,Rb0 + Len}
-    end.
-
-
-%%============================================================================
-%% encode BMP string
-%%============================================================================
-
-encode_BMP_string(C, {Name,BMPString}, DoTag) when is_atom(Name) ->
-    encode_BMP_string(C, BMPString, DoTag);
-encode_BMP_string(_C, BMPString, []) ->
-    OctetList = mk_BMP_list(BMPString),
-    dotag_universal(?N_BMPString,OctetList,length(OctetList));
-encode_BMP_string(_C, BMPString, DoTag) ->
-    OctetList = mk_BMP_list(BMPString),
-    dotag(DoTag, ?N_BMPString, {OctetList,length(OctetList)}).
-
-mk_BMP_list(In) ->
-    mk_BMP_list(In,[]).
-
-mk_BMP_list([],List) ->
-    lists:reverse(List);
-mk_BMP_list([{0,0,C,D}|T],List) ->
-    mk_BMP_list(T,[D,C|List]);
-mk_BMP_list([H|T],List) ->
-    mk_BMP_list(T,[H,0|List]).
-
-%%============================================================================
-%% decode (OctetList, Range(ignored), tag|notag) -> {ValList, RestList}
-%%    (Buffer, Range, StringType, HasTag, TotalLen) ->
-%%                               {String, Remain, RemovedBytes}
-%%============================================================================
-decode_BMP_string(Buffer, Range, Tags, LenIn, OptOrMand) ->
-%    NewTags = new_tags(HasTag, #tag{class=?UNIVERSAL,number=?N_BMPString}),
-    decode_restricted_string(Buffer, Range, ?N_BMPString,
-			     Tags, LenIn, [], OptOrMand,old).
-
-mk_BMP_string(In) ->
-    mk_BMP_string(In,[]).
-
-mk_BMP_string([],US) ->
-    lists:reverse(US);
-mk_BMP_string([0,B|T],US) ->
-    mk_BMP_string(T,[B|US]);
-mk_BMP_string([C,D|T],US) ->
-    mk_BMP_string(T,[{0,0,C,D}|US]).
-
-
-%%============================================================================
-%% Generalized time, ITU_T X.680 Chapter 39
-%%
-%% encode Generalized time
-%%============================================================================
-
-encode_generalized_time(C, {Name,OctetList}, DoTag) when is_atom(Name) ->
-    encode_generalized_time(C, OctetList, DoTag);
-encode_generalized_time(_C, OctetList, []) ->
-    dotag_universal(?N_GeneralizedTime,OctetList,length(OctetList));
-encode_generalized_time(_C, OctetList, DoTag) ->
-    dotag(DoTag, ?N_GeneralizedTime, {OctetList,length(OctetList)}).
-
-%%============================================================================
-%% decode Generalized time
-%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}
-%%============================================================================
-
-decode_generalized_time(Buffer, Range, Tags, TotalLen, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,
-			 number=?N_GeneralizedTime}),
-    decode_generalized_time_notag(Buffer, Range, NewTags, TotalLen, OptOrMand).
-
-decode_generalized_time_notag(Buffer, Range, Tags, TotalLen, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} =
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} =
-		decode_generalized_time_notag(Buffer00, Range,
-					      RestTags, TotalLen,
-					      OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,Len} ->
-	    <<PreBuff:Len/binary,RestBuff/binary>> = Buffer0,
-	    {binary_to_list(PreBuff), RestBuff, Rb0+Len}
-    end.
-
-%%============================================================================
-%% Universal time, ITU_T X.680 Chapter 40
-%%
-%% encode UTC time
-%%============================================================================
-
-encode_utc_time(C, {Name,OctetList}, DoTag) when is_atom(Name) ->
-    encode_utc_time(C, OctetList, DoTag);
-encode_utc_time(_C, OctetList, []) ->
-    dotag_universal(?N_UTCTime, OctetList,length(OctetList));
-encode_utc_time(_C, OctetList, DoTag) ->
-    dotag(DoTag, ?N_UTCTime, {OctetList,length(OctetList)}).
-
-%%============================================================================
-%% decode UTC time
-%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}
-%%============================================================================
-
-decode_utc_time(Buffer, Range, Tags, TotalLen, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_UTCTime}),
-    decode_utc_time_notag(Buffer, Range, NewTags, TotalLen, OptOrMand).
-
-decode_utc_time_notag(Buffer, Range, Tags, TotalLen, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} =
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} =
-		decode_utc_time_notag(Buffer00, Range,
-				      RestTags, TotalLen,
-				      OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,Len} ->
-	    <<PreBuff:Len/binary,RestBuff/binary>> = Buffer0,
-	    {binary_to_list(PreBuff), RestBuff, Rb0+Len}
-    end.
-
-
 %%============================================================================
 %% Length handling
 %%
@@ -2122,8 +449,6 @@ decode_utc_time_notag(Buffer, Range, Tags, TotalLen, OptOrMand) ->
 %%          [<127]| [128 + Int (<127),OctetList] | [16#80]
 %%============================================================================
 
-encode_length(indefinite) ->
-    {[16#80],1}; % 128
 encode_length(L) when L =< 16#7F ->
     {[L],1};
 encode_length(L) ->
@@ -2162,242 +487,12 @@ decode_length(<<1:1,LL:7,T/binary>>) ->
     <<Length:LL/unit:8,Rest/binary>> = T,
     {{Length,Rest}, LL+1}.
 
-%decode_length([128 | T]) ->
-%    {{indefinite, T},1};
-%decode_length([H | T]) when H =< 127 ->
-%    {{H, T},1};
-%decode_length([H | T]) ->
-%    dec_long_length(H band 16#7F, T, 0, 1).
-
-
-%%dec_long_length(0, Buffer, Acc, Len) ->
-%%    {{Acc, Buffer},Len};
-%%dec_long_length(Bytes, [H | T], Acc, Len) ->
-%%    dec_long_length(Bytes - 1, T, (Acc bsl 8) + H, Len+1).
-
-%%===========================================================================
-%% Decode tag and length
-%%
-%% decode_tag_and_length(Buffer) -> {Tag, Len, RemainingBuffer, RemovedBytes}
-%%
-%%===========================================================================
-
-decode_tag_and_length(Buffer) ->
-    {Tag, Buffer2, RemBytesTag} = decode_tag(Buffer),
-    {{Len, Buffer3}, RemBytesLen} = decode_length(Buffer2),
-    {Tag, Len, Buffer3, RemBytesTag+RemBytesLen}.
-
-
-%%============================================================================
-%% Check if valid tag
-%%
-%% check_if_valid_tag(Tag, List_of_valid_tags, OptOrMand) -> name of the tag
-%%============================================================================
-
-check_if_valid_tag(<<0,0,_/binary>>,_,_) ->
-    asn1_EOC;
-check_if_valid_tag(<<>>, _, OptOrMand) ->
-    check_if_valid_tag2_error([], OptOrMand);
-check_if_valid_tag(Bytes, ListOfTags, OptOrMand) when is_binary(Bytes) ->
-    {Tag, _, _} = decode_tag(Bytes),
-    check_if_valid_tag(Tag, ListOfTags, OptOrMand);
-
-%% This alternative should be removed in the near future
-%% Bytes as input should be the only necessary call
-check_if_valid_tag(Tag, ListOfTags, OptOrMand) ->
-    {Class, _Form, TagNo} = Tag,
-    C = code_class(Class),
-    T = case C of
-	    'UNIVERSAL' ->
-		code_type(TagNo);
-	    _ ->
-		TagNo
-	end,
-    check_if_valid_tag2({C,T}, ListOfTags, Tag, OptOrMand).
-
-check_if_valid_tag2(_Class_TagNo, [], Tag, MandOrOpt) ->
-    check_if_valid_tag2_error(Tag,MandOrOpt);
-check_if_valid_tag2(Class_TagNo, [{TagName,TagList}|T], Tag, OptOrMand) ->
-    case check_if_valid_tag_loop(Class_TagNo, TagList) of
-	true ->
-	    TagName;
-	false ->
-	    check_if_valid_tag2(Class_TagNo, T, Tag, OptOrMand)
-    end.
-
--spec check_if_valid_tag2_error(term(), atom()) -> no_return().
-
-check_if_valid_tag2_error(Tag,mandatory) ->
-    exit({error,{asn1,{invalid_tag,Tag}}});
-check_if_valid_tag2_error(Tag,_) ->
-    exit({error,{asn1,{no_optional_tag,Tag}}}).
-
-check_if_valid_tag_loop(_Class_TagNo,[]) ->
-    false;
-check_if_valid_tag_loop(Class_TagNo,[H|T]) ->
-    %% It is not possible to distinguish between SEQUENCE OF and SEQUENCE, and
-    %% between SET OF and SET because both are coded as 16 and 17, respectively.
-    H_without_OF = case H of
-		       {C, 'SEQUENCE OF'} ->
-			   {C, 'SEQUENCE'};
-		       {C, 'SET OF'} ->
-			   {C, 'SET'};
-		       Else ->
-			   Else
-		   end,
-
-    case H_without_OF of
-	Class_TagNo ->
-	    true;
-	{_,_} ->
-	    check_if_valid_tag_loop(Class_TagNo,T);
-	_ ->
-	    check_if_valid_tag_loop(Class_TagNo,H),
-	    check_if_valid_tag_loop(Class_TagNo,T)
-    end.
-
-
-
-code_class(0) -> 'UNIVERSAL';
-code_class(16#40) -> 'APPLICATION';
-code_class(16#80) -> 'CONTEXT';
-code_class(16#C0) -> 'PRIVATE'.
-
-
-code_type(1) -> 'BOOLEAN';
-code_type(2) -> 'INTEGER';
-code_type(3) -> 'BIT STRING';
-code_type(4) -> 'OCTET STRING';
-code_type(5) -> 'NULL';
-code_type(6) -> 'OBJECT IDENTIFIER';
-code_type(7) -> 'ObjectDescriptor';
-code_type(8) -> 'EXTERNAL';
-code_type(9) -> 'REAL';
-code_type(10) -> 'ENUMERATED';
-code_type(11) -> 'EMBEDDED_PDV';
-code_type(16) -> 'SEQUENCE';
-% code_type(16) -> 'SEQUENCE OF';
-code_type(17) -> 'SET';
-% code_type(17) -> 'SET OF';
-code_type(18) -> 'NumericString';
-code_type(19) -> 'PrintableString';
-code_type(20) -> 'TeletexString';
-code_type(21) -> 'VideotexString';
-code_type(22) -> 'IA5String';
-code_type(23) -> 'UTCTime';
-code_type(24) -> 'GeneralizedTime';
-code_type(25) -> 'GraphicString';
-code_type(26) -> 'VisibleString';
-code_type(27) -> 'GeneralString';
-code_type(28) -> 'UniversalString';
-code_type(30) -> 'BMPString';
-code_type(Else) -> exit({error,{asn1,{unrecognized_type,Else}}}).
-
-%%-------------------------------------------------------------------------
-%% decoding of the components of a SET
-%%-------------------------------------------------------------------------
-
-decode_set(Rb, indefinite, <<0,0,Bytes/binary>>, _OptOrMand, _Fun3, Acc) ->
-   {lists:reverse(Acc),Bytes,Rb+2};
-
-decode_set(Rb, indefinite, Bytes, OptOrMand, Fun3, Acc) ->
-    case Fun3(Bytes, OptOrMand) of
-	{_Term, _Remain, 0} ->
-	    {lists:reverse(Acc),Bytes,Rb};
-	{Term, Remain, Rb1} ->
-	    Fun3(Bytes, OptOrMand),
-	    decode_set(Rb+Rb1, indefinite, Remain, OptOrMand, Fun3, [Term|Acc])
-    end;
-%%   {Term, Remain, Rb1} = Fun3(Bytes, OptOrMand),
-%%   decode_set(Rb+Rb1, indefinite, Remain, OptOrMand, Fun3, [Term|Acc]);
-
-decode_set(Rb, Num, Bytes, _OptOrMand, _Fun3, Acc) when Num == 0 ->
-   {lists:reverse(Acc), Bytes, Rb};
-
-decode_set(_, Num, _, _, _, _) when Num < 0 ->
-   exit({error,{asn1,{length_error,'SET'}}});
-
-decode_set(Rb, Num, Bytes, OptOrMand, Fun3, Acc) ->
-    case Fun3(Bytes, OptOrMand) of
-	{_Term, _Remain, 0} ->
-	    {lists:reverse(Acc),Bytes,Rb};
-	{Term, Remain, Rb1} ->
-	    Fun3(Bytes, OptOrMand),
-	    decode_set(Rb+Rb1, Num-Rb1, Remain, OptOrMand, Fun3, [Term|Acc])
-    end.
-%%    {Term, Remain, Rb1} = Fun3(Bytes, OptOrMand),
-%%    decode_set(Rb+Rb1, Num-Rb1, Remain, OptOrMand, Fun3, [Term|Acc]).
-
-
-%%-------------------------------------------------------------------------
-%% decoding of SEQUENCE OF and SET OF
-%%-------------------------------------------------------------------------
-
-decode_components(Rb, indefinite, <<0,0,Bytes/binary>>, _Fun3, _TagIn, Acc) ->
-   {lists:reverse(Acc),Bytes,Rb+2};
-
-decode_components(Rb, indefinite, Bytes, Fun3, TagIn, Acc) ->
-   {Term, Remain, Rb1} = Fun3(Bytes, mandatory, TagIn),
-   decode_components(Rb+Rb1, indefinite, Remain, Fun3, TagIn, [Term|Acc]);
-
-decode_components(Rb, Num, Bytes, _Fun3, _TagIn, Acc) when Num == 0 ->
-   {lists:reverse(Acc), Bytes, Rb};
-
-decode_components(_, Num, _, _, _, _) when Num < 0 ->
-   exit({error,{asn1,{length_error,'SET/SEQUENCE OF'}}});
-
-decode_components(Rb, Num, Bytes, Fun3, TagIn, Acc) ->
-   {Term, Remain, Rb1} = Fun3(Bytes, mandatory, TagIn),
-   decode_components(Rb+Rb1, Num-Rb1, Remain, Fun3, TagIn, [Term|Acc]).
-
-%%decode_components(Rb, indefinite, [0,0|Bytes], _Fun3, _TagIn, Acc) ->
-%%   {lists:reverse(Acc),Bytes,Rb+2};
-
-decode_components(Rb, indefinite, <<0,0,Bytes/binary>>, _Fun4, _TagIn, _Fun, Acc) ->
-   {lists:reverse(Acc),Bytes,Rb+2};
-
-decode_components(Rb, indefinite, Bytes, _Fun4, TagIn, _Fun, Acc) ->
-   {Term, Remain, Rb1} = _Fun4(Bytes, mandatory, TagIn, _Fun),
-   decode_components(Rb+Rb1, indefinite, Remain, _Fun4, TagIn, _Fun, [Term|Acc]);
-
-decode_components(Rb, Num, Bytes, _Fun4, _TagIn, _Fun, Acc) when Num == 0 ->
-   {lists:reverse(Acc), Bytes, Rb};
-
-decode_components(_, Num, _, _, _, _, _) when Num < 0 ->
-   exit({error,{asn1,{length_error,'SET/SEQUENCE OF'}}});
-
-decode_components(Rb, Num, Bytes, _Fun4, TagIn, _Fun, Acc) ->
-   {Term, Remain, Rb1} = _Fun4(Bytes, mandatory, TagIn, _Fun),
-   decode_components(Rb+Rb1, Num-Rb1, Remain, _Fun4, TagIn, _Fun, [Term|Acc]).
-
-
-
-%%-------------------------------------------------------------------------
-%% INTERNAL HELPER FUNCTIONS (not exported)
-%%-------------------------------------------------------------------------
-
-
-%%==========================================================================
-%% Encode tag
-%%
-%% dotag(tag | notag, TagValpattern | TagValTuple, [Length, Value]) -> [Tag]
-%% TagValPattern is a correct bitpattern for a tag
-%% TagValTuple is a tuple of three bitpatterns, Class, Form and TagNo where
-%%     Class = UNIVERSAL | APPLICATION | CONTEXT | PRIVATE
-%%     Form  = Primitive | Constructed
-%%     TagNo = Number of tag
-%%==========================================================================
-
 
 dotag([], Tag, {Bytes,Len}) ->
     dotag_universal(Tag,Bytes,Len);
 dotag(Tags, Tag, {Bytes,Len}) ->
     encode_tags(Tags ++ [#tag{class=?UNIVERSAL,number=Tag,form=?PRIMITIVE}],
-		Bytes, Len);
-
-dotag(Tags, Tag, Bytes) ->
-    encode_tags(Tags ++ [#tag{class=?UNIVERSAL,number=Tag,form=?PRIMITIVE}],
-		Bytes, size(Bytes)).
+		Bytes, Len).
 
 dotag_universal(UniversalTag,Bytes,Len) when Len =< 16#7F->
     {[UniversalTag,Len,Bytes],2+Len};
@@ -2415,47 +510,6 @@ decode_integer2(Len,<<1:1,B2:7,Bs/binary>>,RemovedBytes)  ->
     Int = N - (1 bsl (8 * Len - 1)),
     {Int,Buffer2,RemovedBytes}.
 
-%%decode_integer2(Len,Buffer,Acc,RemovedBytes) when (hd(Buffer) band 16#FF) =< 16#7F ->
-%%    {decode_integer_pos(Buffer, 8 * (Len - 1)),skip(Buffer,Len),RemovedBytes};
-%%decode_integer2(Len,Buffer,Acc,RemovedBytes)  ->
-%%    {decode_integer_neg(Buffer, 8 * (Len - 1)),skip(Buffer,Len),RemovedBytes}.
-
-%%decode_integer_pos([Byte|Tail], Shift) ->
-%%    (Byte bsl Shift) bor decode_integer_pos(Tail, Shift-8);
-%%decode_integer_pos([], _) -> 0.
-
-
-%%decode_integer_neg([Byte|Tail], Shift) ->
-%%    (-128 + (Byte band 127) bsl Shift) bor decode_integer_pos(Tail, Shift-8).
-
-
-concat_bit_binaries([],Bin={_,_}) ->
-    Bin;
-concat_bit_binaries({0,B1},{U2,B2}) ->
-    {U2,<<B1/binary,B2/binary>>};
-concat_bit_binaries({U1,B1},{U2,B2}) ->
-    S1 = (size(B1) * 8) - U1,
-    S2 = (size(B2) * 8) - U2,
-    PadBits = 8 - ((S1+S2) rem 8),
-    {PadBits, <<B1:S1/binary-unit:1,B2:S2/binary-unit:1,0:PadBits>>};
-concat_bit_binaries(L1,L2) when is_list(L1), is_list(L2) ->
-    %% this case occur when decoding with NNL
-    L1 ++ L2.
-
-
-get_constraint(C,Key) ->
-    case lists:keyfind(Key,1,C) of
-	false ->
-	     no;
-	{_, V} ->
-	    V
-    end.
-
-%%skip(Buffer, 0) ->
-%%    Buffer;
-%%skip([H | T], Len) ->
-%%    skip(T, Len-1).
-
 new_tags([],LastTag) ->
     [LastTag];
 new_tags(Tags = [#tag{type='IMPLICIT'}],_LastTag) ->
diff --git a/lib/asn1/src/asn1rt_ber_bin_v2.erl b/lib/asn1/src/asn1rt_ber_bin_v2.erl
index 17e66f77c9..92ca11cf89 100644
--- a/lib/asn1/src/asn1rt_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1rt_ber_bin_v2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -22,8 +22,7 @@
 %% encoding / decoding of BER  
 
 -export([decode/1, decode/2, match_tags/2, encode/1, encode/2]). 
--export([fixoptionals/2, cindex/3,
-	 list_to_record/2,
+-export([fixoptionals/2,
 	 encode_tag_val/1,
 	 encode_tags/3,
 	 skip_ExtensionAdditions/2]).
@@ -54,8 +53,6 @@
 	 decode_open_type_as_binary/3]).
 
 -export([decode_primitive_incomplete/2,decode_selective/2]).
-
--export([is_nif_loadable/0]).
  
 % the encoding of class of tag bits 8 and 7 
 -define(UNIVERSAL,   0). 
@@ -135,12 +132,7 @@ encode(Tlv,_) when is_binary(Tlv) ->
 encode([Tlv],Method) ->
     encode(Tlv,Method);
 encode(Tlv, nif) ->
-    case is_nif_loadable() of
-	true ->
-	    asn1rt_nif:encode_ber_tlv(Tlv);
-	false ->
-	    encode_erl(Tlv)
-    end;
+    asn1rt_nif:encode_ber_tlv(Tlv);
 encode(Tlv, _) ->
     encode_erl(Tlv).
 
@@ -178,36 +170,15 @@ decode(B) ->
 
 %% asn1-1.7
 decode(B, nif) ->
-    case is_nif_loadable() of
-	true ->
-	    case asn1rt_nif:decode_ber_tlv(B) of
-		{error, Reason} -> handle_error(Reason, B);
-		Else -> Else
-	    end;
-	false ->
-	    decode(B)
+    case asn1rt_nif:decode_ber_tlv(B) of
+	{error, Reason} -> handle_error(Reason, B);
+	Else -> Else
     end;
 decode(B,erlang) when is_binary(B) ->
     decode_primitive(B);
 decode(Tlv,erlang) ->
     {Tlv,<<>>}.
 
-%% Have to check this since asn1 is not guaranteed to be available
-is_nif_loadable() ->
-    case application:get_env(asn1, nif_loadable) of
-	{ok,R} ->
-	    R;
-	undefined ->
-	    case catch code:load_file(asn1rt_nif) of
-		{module, asn1rt_nif} ->
-		    application:set_env(asn1, nif_loadable, true),
-		    true;
-		_Else ->
-		    application:set_env(asn1, nif_loadable, false),
-		    false
-	    end
-    end.
-
 handle_error([],_)->
     exit({error,{asn1,{"memory allocation problem"}}});
 handle_error({$1,_},L) -> % error in nif
@@ -610,15 +581,8 @@ match_tags(Vlist = [{T,_V}|_], [T]) ->
     Vlist;
 match_tags(Tlv, []) ->
     Tlv;
-match_tags({Tag,_V},[T|_Tt]) ->
-    {error,{asn1,{wrong_tag,{Tag,T}}}}.
-
- 
-cindex(Ix,Val,Cname) -> 
-    case element(Ix,Val) of 
-	{Cname,Val2} -> Val2; 
-	X -> X 
-    end. 
+match_tags(Tlv = {Tag,_V},[T|_Tt]) ->
+    exit({error,{asn1,{wrong_tag,{{expected,T},{got,Tag,Tlv}}}}}).
  
 %%%
 %% skips components that do not match a tag in Tags
@@ -642,13 +606,6 @@ skip_ExtensionAdditions(TLV=[{Tag,_}|Rest],Tags) ->
 %%=============================================================================== 
 %%=============================================================================== 
  
-% converts a list to a record if necessary 
-list_to_record(Name,List) when is_list(List) -> 
-    list_to_tuple([Name|List]); 
-list_to_record(_Name,Tuple) when is_tuple(Tuple) -> 
-    Tuple. 
- 
- 
 fixoptionals(OptList,Val) when is_list(Val) -> 
     fixoptionals(OptList,Val,1,[],[]). 
  
diff --git a/lib/asn1/src/asn1rt_check.erl b/lib/asn1/src/asn1rt_check.erl
index d9856901b8..35b993fc71 100644
--- a/lib/asn1/src/asn1rt_check.erl
+++ b/lib/asn1/src/asn1rt_check.erl
@@ -311,7 +311,8 @@ transform_to_EXTERNAL1990([Data_val_desc,Data_value],Acc)
   when is_binary(Data_value)->
     list_to_tuple(lists:reverse([{'single-ASN1-type',Data_value},
 				 Data_val_desc|Acc]));
-transform_to_EXTERNAL1990([Data_value],Acc) when is_list(Data_value)->
+transform_to_EXTERNAL1990([Data_value],Acc)
+  when is_list(Data_value); is_binary(Data_value) ->
     list_to_tuple(lists:reverse([{'octet-aligned',Data_value}|Acc])).
 
 
diff --git a/lib/asn1/src/asn1rt_per_bin.erl b/lib/asn1/src/asn1rt_per_bin.erl
deleted file mode 100644
index a124c7553d..0000000000
--- a/lib/asn1/src/asn1rt_per_bin.erl
+++ /dev/null
@@ -1,2287 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(asn1rt_per_bin).
-
-%% encoding / decoding of PER aligned
-
--include("asn1_records.hrl").
-
--export([dec_fixup/3, cindex/3, list_to_record/2]).
--export([setchoiceext/1, setext/1, fixoptionals/2, fixoptionals/3, 
-	 fixextensions/2, 
-	 getext/1, getextension/2, skipextensions/3, getbit/1, getchoice/3 ]).
--export([getoptionals/2, getoptionals2/2, set_choice/3, encode_integer/2, encode_integer/3  ]).
--export([decode_integer/2, decode_integer/3, encode_small_number/1, encode_boolean/1, 
-	 decode_boolean/1, encode_length/2, decode_length/1, decode_length/2,
-	 encode_small_length/1, decode_small_length/1,
-	 decode_compact_bit_string/3]).
--export([decode_enumerated/3, 
-	 encode_bit_string/3, decode_bit_string/3  ]).
--export([encode_octet_string/2, decode_octet_string/2,
-	 encode_null/1, decode_null/1,
-	 encode_object_identifier/1, decode_object_identifier/1,
-	 encode_real/1, decode_real/1,
-	 encode_relative_oid/1, decode_relative_oid/1,
-	 complete/1]).
-
-
--export([encode_open_type/2, decode_open_type/2]).
-
--export([encode_UniversalString/2, decode_UniversalString/2,
-	 encode_PrintableString/2, decode_PrintableString/2,
-	 encode_GeneralString/2, decode_GeneralString/2,
-	 encode_GraphicString/2, decode_GraphicString/2,
-	 encode_TeletexString/2, decode_TeletexString/2,
-	 encode_VideotexString/2, decode_VideotexString/2,
-	 encode_VisibleString/2, decode_VisibleString/2,
-	 encode_UTF8String/1, decode_UTF8String/1,
-	 encode_BMPString/2, decode_BMPString/2,
-	 encode_IA5String/2, decode_IA5String/2,
-	 encode_NumericString/2, decode_NumericString/2,
-	 encode_ObjectDescriptor/2, decode_ObjectDescriptor/1
-	]).
--export([complete_bytes/1, getbits/2, getoctets/2]).
-
--define('16K',16384).
--define('32K',32768).
--define('64K',65536).
-
-dec_fixup(Terms,Cnames,RemBytes) ->
-    dec_fixup(Terms,Cnames,RemBytes,[]).
-
-dec_fixup([novalue|T],[_Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,Acc);
-dec_fixup([{_Name,novalue}|T],[_Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,Acc);
-dec_fixup([H|T],[Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,[{Hc,H}|Acc]);
-dec_fixup([],_Cnames,RemBytes,Acc) ->
-    {lists:reverse(Acc),RemBytes}.
-
-cindex(Ix,Val,Cname) ->
-    case element(Ix,Val) of
-	{Cname,Val2} -> Val2;
-	X -> X
-    end.
-
-%% converts a list to a record if necessary
-list_to_record(_Name,Tuple) when is_tuple(Tuple) ->
-    Tuple;
-list_to_record(Name,List) when is_list(List) ->
-    list_to_tuple([Name|List]).
-
-%%--------------------------------------------------------
-%% setchoiceext(InRootSet) -> [{bit,X}]
-%% X  is set to  1 when InRootSet==false
-%% X  is set to  0 when InRootSet==true
-%%
-setchoiceext(true) ->
-    [{debug,choiceext},{bits,1,0}];
-setchoiceext(false) ->
-    [{debug,choiceext},{bits,1,1}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% setext(true|false) ->  CompleteList
-%%
-
-setext(false) ->
-    [{debug,ext},{bits,1,0}];
-setext(true) ->
-    [{debug,ext},{bits,1,1}].
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% This version of fixoptionals/2 are left only because of 
-%% backward compatibility with older generates
-
-fixoptionals(OptList,Val) when is_tuple(Val) ->
-    fixoptionals1(OptList,Val,[]);
-
-fixoptionals(OptList,Val) when is_list(Val) ->
-    fixoptionals1(OptList,Val,1,[],[]).
-
-fixoptionals1([],Val,Acc) ->
-    %% return {Val,Opt}
-    {Val,lists:reverse(Acc)};
-fixoptionals1([{_,Pos}|Ot],Val,Acc) ->
-    case element(Pos+1,Val) of
-	asn1_NOVALUE -> fixoptionals1(Ot,Val,[0|Acc]);
-	asn1_DEFAULT -> fixoptionals1(Ot,Val,[0|Acc]);
-	_ -> fixoptionals1(Ot,Val,[1|Acc])
-    end.
-
-
-fixoptionals1([{Name,Pos}|Ot],[{Name,Val}|Vt],_Opt,Acc1,Acc2) ->
-    fixoptionals1(Ot,Vt,Pos+1,[1|Acc1],[{Name,Val}|Acc2]);
-fixoptionals1([{_Name,Pos}|Ot],V,Pos,Acc1,Acc2) ->
-    fixoptionals1(Ot,V,Pos+1,[0|Acc1],[asn1_NOVALUE|Acc2]);
-fixoptionals1(O,[Vh|Vt],Pos,Acc1,Acc2) ->
-    fixoptionals1(O,Vt,Pos+1,Acc1,[Vh|Acc2]);
-fixoptionals1([],[Vh|Vt],Pos,Acc1,Acc2) ->
-    fixoptionals1([],Vt,Pos+1,Acc1,[Vh|Acc2]);
-fixoptionals1([],[],_,Acc1,Acc2) ->
-						% return {Val,Opt}
-    {list_to_tuple([asn1_RECORDNAME|lists:reverse(Acc2)]),lists:reverse(Acc1)}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% This is the new fixoptionals/3 which is used by the new generates
-%%
-fixoptionals(OptList,OptLength,Val) when is_tuple(Val) ->
-    Bits = fixoptionals(OptList,Val,0),
-    {Val,{bits,OptLength,Bits}};
-
-fixoptionals([],_Val,Acc) ->
-    %% Optbits
-    Acc;
-fixoptionals([{Pos,DefVal}|Ot],Val,Acc) ->
-    case element(Pos,Val) of
-	asn1_DEFAULT -> fixoptionals(Ot,Val,Acc bsl 1);
-	DefVal -> fixoptionals(Ot,Val,Acc bsl 1);
-	_ -> fixoptionals(Ot,Val,(Acc bsl 1) + 1)
-    end;
-fixoptionals([Pos|Ot],Val,Acc) ->
-    case element(Pos,Val) of
-	asn1_NOVALUE -> fixoptionals(Ot,Val,Acc bsl 1);
-	asn1_DEFAULT -> fixoptionals(Ot,Val,Acc bsl 1);
-	_ -> fixoptionals(Ot,Val,(Acc bsl 1) + 1)
-    end.
-
-
-getext(Bytes) when is_tuple(Bytes) ->
-    getbit(Bytes);
-getext(Bytes) when is_binary(Bytes) ->
-    getbit({0,Bytes}).
-
-getextension(0, Bytes) ->
-    {{},Bytes};
-getextension(1, Bytes) ->
-    {Len,Bytes2} = decode_small_length(Bytes),
-    {Blist, Bytes3} = getbits_as_list(Len,Bytes2),
-    {list_to_tuple(Blist),Bytes3}.
-
-fixextensions({ext,ExtPos,ExtNum},Val) ->
-    case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
-	0 -> [];
-	ExtBits ->
-	    [encode_small_length(ExtNum),{bits,ExtNum,ExtBits}]
-    end.
-
-fixextensions(Pos,MaxPos,_,Acc) when Pos >= MaxPos ->
-    Acc;
-fixextensions(Pos,ExtPos,Val,Acc) ->
-    Bit = case catch(element(Pos+1,Val)) of
-	      asn1_NOVALUE ->
-		  0;
-	      asn1_NOEXTVALUE ->
-		  0;
-	      {'EXIT',_} ->
-		  0;
-	      _ ->
-		  1
-	  end,
-    fixextensions(Pos+1,ExtPos,Val,(Acc bsl 1)+Bit).
-
-skipextensions(Bytes,Nr,ExtensionBitPattern) -> 
-    case (catch element(Nr,ExtensionBitPattern)) of
-	1 ->
-	    {_,Bytes2} = decode_open_type(Bytes,[]),
-	    skipextensions(Bytes2, Nr+1, ExtensionBitPattern);
-	0 ->
-	    skipextensions(Bytes, Nr+1, ExtensionBitPattern);
-	{'EXIT',_} -> % badarg, no more extensions
-	    Bytes
-    end.
-
-
-getchoice(Bytes,1,0) -> % only 1 alternative is not encoded
-    {0,Bytes};
-getchoice(Bytes,_,1) ->
-    decode_small_number(Bytes);
-getchoice(Bytes,NumChoices,0) ->
-    decode_constrained_number(Bytes,{0,NumChoices-1}).
-
-%% old version kept for backward compatibility with generates from R7B
-getoptionals(Bytes,NumOpt) ->
-    {Blist,Bytes1} = getbits_as_list(NumOpt,Bytes),
-    {list_to_tuple(Blist),Bytes1}.
-
-%% new version used in generates from r8b_patch/3 and later
-getoptionals2(Bytes,NumOpt) ->
-    getbits(Bytes,NumOpt).
-
-
-%% getbits_as_binary(Num,Bytes) -> {{Unused,BinBits},RestBytes},
-%% Num = integer(),
-%% Bytes = list() | tuple(),
-%% Unused = integer(),
-%% BinBits = binary(),
-%% RestBytes = tuple()
-getbits_as_binary(Num,Bytes) when is_binary(Bytes) ->
-    getbits_as_binary(Num,{0,Bytes});
-getbits_as_binary(0,Buffer) ->
-    {{0,<<>>},Buffer};
-getbits_as_binary(Num,{0,Bin}) when Num > 16 ->
-    Used = Num rem 8,
-    Pad = (8 - Used) rem 8,
-%    Nbytes = Num div 8,
-    <<Bits:Num,_:Pad,RestBin/binary>> = Bin,
-    {{Pad,<<Bits:Num,0:Pad>>},RestBin};
-getbits_as_binary(Num,Buffer={_Used,_Bin}) -> % Unaligned buffer
-    %% Num =< 16,
-    {Bits2,Buffer2} = getbits(Buffer,Num),
-    Pad = (8 - (Num rem 8)) rem 8,
-    {{Pad,<<Bits2:Num,0:Pad>>},Buffer2}.
-
-
-% integer_from_list(Int,[],BigInt) ->
-%     BigInt;
-% integer_from_list(Int,[H|T],BigInt) when Int < 8 ->
-%     (BigInt bsl Int) bor (H bsr (8-Int));
-% integer_from_list(Int,[H|T],BigInt) ->
-%     integer_from_list(Int-8,T,(BigInt bsl 8) bor H).
-
-getbits_as_list(Num,Bytes) when is_binary(Bytes) ->
-    getbits_as_list(Num,{0,Bytes},[]);
-getbits_as_list(Num,Bytes) ->
-    getbits_as_list(Num,Bytes,[]).
-
-%% If buffer is empty and nothing more will be picked.
-getbits_as_list(0, B, Acc) ->
-    {lists:reverse(Acc),B};
-%% If first byte in buffer is full and at least one byte will be picked,
-%% then pick one byte.
-getbits_as_list(N,{0,Bin},Acc) when N >= 8 ->
-    <<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,Rest/binary>> = Bin,
-    getbits_as_list(N-8,{0,Rest},[B0,B1,B2,B3,B4,B5,B6,B7|Acc]);
-getbits_as_list(N,{Used,Bin},Acc) when N >= 4, Used =< 4 ->
-    NewUsed = Used + 4,
-    Rem = 8 - NewUsed,
-    <<_:Used,B3:1,B2:1,B1:1,B0:1,_:Rem, Rest/binary>> = Bin,
-    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
-    getbits_as_list(N-4,{NewUsed rem 8,NewRest},[B0,B1,B2,B3|Acc]);
-getbits_as_list(N,{Used,Bin},Acc) when N >= 2, Used =< 6  ->
-    NewUsed = Used + 2,
-    Rem = 8 - NewUsed,
-    <<_:Used,B1:1,B0:1,_:Rem, Rest/binary>> = Bin,
-    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
-    getbits_as_list(N-2,{NewUsed rem 8,NewRest},[B0,B1|Acc]);
-getbits_as_list(N,{Used,Bin},Acc) when Used =< 7 ->
-    NewUsed = Used + 1,
-    Rem = 8 - NewUsed,
-    <<_:Used,B0:1,_:Rem, Rest/binary>> = Bin,
-    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
-    getbits_as_list(N-1,{NewUsed rem 8,NewRest},[B0|Acc]).
-
-
-getbit({7,<<_:7,B:1,Rest/binary>>}) ->
-    {B,{0,Rest}};
-getbit({0,Buffer = <<B:1,_:7,_/binary>>}) ->
-    {B,{1,Buffer}};
-getbit({Used,Buffer}) ->
-    Unused = (8 - Used) - 1,
-    <<_:Used,B:1,_:Unused,_/binary>> = Buffer,
-    {B,{Used+1,Buffer}};
-getbit(Buffer) when is_binary(Buffer) ->
-    getbit({0,Buffer}).
-
-
-getbits({0,Buffer},Num) when (Num rem 8) == 0 ->
-    <<Bits:Num,Rest/binary>> = Buffer,
-    {Bits,{0,Rest}};
-getbits({Used,Bin},Num) ->
-    NumPlusUsed = Num + Used,
-    NewUsed = NumPlusUsed rem 8,
-    Unused = (8-NewUsed) rem 8,
-    case Unused of
-	0 ->
-	    <<_:Used,Bits:Num,Rest/binary>> = Bin,
-	    {Bits,{0,Rest}};
-	_ ->
-	    Bytes = NumPlusUsed div 8,
-	    <<_:Used,Bits:Num,_UBits:Unused,_/binary>> = Bin,
-	    <<_:Bytes/binary,Rest/binary>> = Bin,
-	    {Bits,{NewUsed,Rest}}
-    end;
-getbits(Bin,Num) when is_binary(Bin) ->
-    getbits({0,Bin},Num).
-
-
-
-% getoctet(Bytes) when is_list(Bytes) ->
-%     getoctet({0,Bytes});
-% getoctet(Bytes) ->
-%     %%    io:format("getoctet:Buffer = ~p~n",[Bytes]),
-%     getoctet1(Bytes).
-
-% getoctet1({0,[H|T]}) ->
-%     {H,{0,T}};
-% getoctet1({Pos,[_,H|T]}) ->
-%     {H,{0,T}}.
-
-align({0,L}) ->
-    {0,L};
-align({_Pos,<<_H,T/binary>>}) ->
-    {0,T};
-align(Bytes) ->
-    {0,Bytes}.
-
-%% First align buffer, then pick the first Num octets.
-%% Returns octets as an integer with bit significance as in buffer.
-getoctets({0,Buffer},Num) ->
-    <<Val:Num/integer-unit:8,RestBin/binary>> = Buffer,
-    {Val,{0,RestBin}};
-getoctets({U,<<_Padding,Rest/binary>>},Num) when U /= 0 ->
-    getoctets({0,Rest},Num);
-getoctets(Buffer,Num) when is_binary(Buffer) ->
-    getoctets({0,Buffer},Num).
-% getoctets(Buffer,Num) ->
-%     %%    io:format("getoctets:Buffer = ~p~nNum = ~p~n",[Buffer,Num]),
-%     getoctets(Buffer,Num,0).
-
-% getoctets(Buffer,0,Acc) ->
-%     {Acc,Buffer};
-% getoctets(Buffer,Num,Acc) ->
-%     {Oct,NewBuffer} = getoctet(Buffer),
-%     getoctets(NewBuffer,Num-1,(Acc bsl 8)+Oct). 
-
-% getoctets_as_list(Buffer,Num) ->
-%     getoctets_as_list(Buffer,Num,[]).
-
-% getoctets_as_list(Buffer,0,Acc) ->
-%     {lists:reverse(Acc),Buffer};
-% getoctets_as_list(Buffer,Num,Acc) ->
-%     {Oct,NewBuffer} = getoctet(Buffer),
-%     getoctets_as_list(NewBuffer,Num-1,[Oct|Acc]).
-
-%% First align buffer, then pick the first Num octets.
-%% Returns octets as a binary
-getoctets_as_bin({0,Bin},Num)->
-    <<Octets:Num/binary,RestBin/binary>> = Bin,
-    {Octets,{0,RestBin}};
-getoctets_as_bin({_U,Bin},Num) ->
-    <<_Padding,Octets:Num/binary,RestBin/binary>> = Bin,
-    {Octets,{0,RestBin}};
-getoctets_as_bin(Bin,Num) when is_binary(Bin) ->
-    getoctets_as_bin({0,Bin},Num).
-
-%% same as above but returns octets as a List
-getoctets_as_list(Buffer,Num) ->
-    {Bin,Buffer2} = getoctets_as_bin(Buffer,Num),
-    {binary_to_list(Bin),Buffer2}.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% set_choice(Alt,Choices,Altnum) -> ListofBitSettings
-%% Alt = atom()
-%% Altnum = integer() | {integer(),integer()}% number of alternatives
-%% Choices = [atom()] | {[atom()],[atom()]}
-%% When Choices is a tuple the first list is the Rootset and the
-%% second is the Extensions and then Altnum must also be a tuple with the
-%% lengths of the 2 lists 
-%%
-set_choice(Alt,{L1,L2},{Len1,_Len2}) ->
-    case set_choice_tag(Alt,L1) of
-	N when is_integer(N), Len1 > 1 ->
-	    [{bits,1,0}, % the value is in the root set
-	     encode_integer([{'ValueRange',{0,Len1-1}}],N)];
-	N when is_integer(N) ->
-	    [{bits,1,0}]; % no encoding if only 0 or 1 alternative
-	false ->
-	    [{bits,1,1}, % extension value
-	     case set_choice_tag(Alt,L2) of
-		 N2 when is_integer(N2) ->
-		     encode_small_number(N2);
-		 false ->
-		     unknown_choice_alt
-	     end]
-    end;
-set_choice(Alt,L,Len) ->
-    case set_choice_tag(Alt,L) of
-	N when is_integer(N), Len > 1 ->
-	    encode_integer([{'ValueRange',{0,Len-1}}],N);
-	N when is_integer(N) ->
-	    []; % no encoding if only 0 or 1 alternative
-	false ->
-	    [unknown_choice_alt]
-    end.
-
-set_choice_tag(Alt,Choices) ->
-    set_choice_tag(Alt,Choices,0).
-
-set_choice_tag(Alt,[Alt|_Rest],Tag) ->
-    Tag;
-set_choice_tag(Alt,[_H|Rest],Tag) ->
-    set_choice_tag(Alt,Rest,Tag+1);
-set_choice_tag(_Alt,[],_Tag) ->
-    false.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_fragmented_XXX; decode of values encoded fragmented according
-%% to ITU-T X.691 clause 10.9.3.8. The unit (XXX) is either bits, octets,
-%% characters or number of components (in a choice,sequence or similar).
-%% Buffer is a buffer {Used, Bin}.
-%% C is the constrained length.
-%% If the buffer is not aligned, this function does that.
-decode_fragmented_bits({0,Buffer},C) ->
-    decode_fragmented_bits(Buffer,C,[]);
-decode_fragmented_bits({_N,<<_,Bs/binary>>},C) ->
-    decode_fragmented_bits(Bs,C,[]).
-
-decode_fragmented_bits(<<3:2,Len:6,Bin/binary>>,C,Acc) ->
-    {Value,Bin2} = split_binary(Bin, Len * ?'16K'),
-    decode_fragmented_bits(Bin2,C,[Value,Acc]);
-decode_fragmented_bits(<<0:1,0:7,Bin/binary>>,C,Acc) ->
-    BinBits = list_to_binary(lists:reverse(Acc)),
-    case C of
-	Int when is_integer(Int),C == size(BinBits) ->
-	    {BinBits,{0,Bin}};
-	Int when is_integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,BinBits}}})
-    end;
-decode_fragmented_bits(<<0:1,Len:7,Bin/binary>>,C,Acc) ->
-    Result = {BinBits,{Used,_Rest}} =
-	case (Len rem 8) of
-	    0 -> 
-		<<Value:Len/binary-unit:1,Bin2/binary>> = Bin,
-		{list_to_binary(lists:reverse([Value|Acc])),{0,Bin2}};
-	    Rem ->
-		Bytes = Len div 8,
-		U = 8 - Rem,
-		<<Value:Bytes/binary-unit:8,Bits1:Rem,Bits2:U,Bin2/binary>> = Bin,
-		{list_to_binary(lists:reverse([Bits1 bsl U,Value|Acc])),
-		 {Rem,<<Bits2,Bin2/binary>>}}
-	end,
-    case C of
-	 Int when is_integer(Int),C == (size(BinBits) - ((8 - Used) rem 8)) ->
-	    Result;
-	Int when is_integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,BinBits}}})
-    end.
-
-
-decode_fragmented_octets({0,Bin},C) ->
-    decode_fragmented_octets(Bin,C,[]).
-
-decode_fragmented_octets(<<3:2,Len:6,Bin/binary>>,C,Acc) ->
-    {Value,Bin2} = split_binary(Bin,Len * ?'16K'),
-    decode_fragmented_octets(Bin2,C,[Value,Acc]);
-decode_fragmented_octets(<<0:1,0:7,Bin/binary>>,C,Acc) ->
-    Octets = list_to_binary(lists:reverse(Acc)),
-    case C of
-	Int when is_integer(Int), C == size(Octets) ->
-	    {Octets,{0,Bin}};
-	Int when is_integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,Octets}}})
-    end;
-decode_fragmented_octets(<<0:1,Len:7,Bin/binary>>,C,Acc) ->
-    <<Value:Len/binary-unit:8,Bin2/binary>> = Bin,
-    BinOctets = list_to_binary(lists:reverse([Value|Acc])),
-    case C of
-	Int when is_integer(Int),size(BinOctets) == Int ->
-	    {BinOctets,Bin2};
-	Int when is_integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,BinOctets}}})
-    end.
-
-
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_open_type(Constraint, Value) -> CompleteList
-%% Value = list of bytes of an already encoded value (the list must be flat)
-%%         | binary
-%% Contraint = not used in this version
-%%
-encode_open_type(_C, Val) when is_list(Val) ->
-    Bin = list_to_binary(Val),
-    [encode_length(undefined,size(Bin)),{octets,Bin}]; % octets implies align
-encode_open_type(_C, Val) when is_binary(Val) ->
-    [encode_length(undefined,size(Val)),{octets,Val}]. % octets implies align
-%% the binary_to_list is not optimal but compatible with the current solution
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_open_type(Buffer,Constraint) -> Value
-%% Constraint is not used in this version
-%% Buffer = [byte] with PER encoded data 
-%% Value = [byte] with decoded data (which must be decoded again as some type)
-%%
-decode_open_type(Bytes, _C) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    getoctets_as_bin(Bytes2,Len).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_integer(Constraint,Value,NamedNumberList) -> CompleteList
-%% encode_integer(Constraint,Value) -> CompleteList
-%% encode_integer(Constraint,{Name,Value}) -> CompleteList
-%% 
-%%
-encode_integer(C,V,NamedNumberList) when is_atom(V) ->
-    case lists:keysearch(V,1,NamedNumberList) of
-	{value,{_,NewV}} -> 
-	    encode_integer(C,NewV);
-	_ -> 
-	    exit({error,{asn1,{namednumber,V}}})
-    end;
-encode_integer(C,V,_NamedNumberList) when is_integer(V) ->
-    encode_integer(C,V);
-encode_integer(C,{Name,V},NamedNumberList) when is_atom(Name) ->
-    encode_integer(C,V,NamedNumberList).
-
-encode_integer(C,{Name,Val}) when is_atom(Name) ->
-    encode_integer(C,Val);
-
-encode_integer([{Rc,_Ec}],Val) when is_tuple(Rc) -> % XXX when is this invoked? First argument most often a list,...Ok this is the extension case...but it doesn't work.
-    case (catch encode_integer([Rc],Val)) of
-	{'EXIT',{error,{asn1,_}}} ->
-	    [{bits,1,1},encode_unconstrained_number(Val)];
-	Encoded ->
-	    [{bits,1,0},Encoded]
-    end;
-encode_integer(C,Val ) when is_list(C) ->
-    case get_constraint(C,'SingleValue') of
-	no ->
-	    encode_integer1(C,Val);
-	V when is_integer(V),V == Val ->
-	    []; % a type restricted to a single value encodes to nothing
-	V when is_list(V) ->
-	    case lists:member(Val,V) of
-		true ->
-		    encode_integer1(C,Val);
-		_ ->
-		    exit({error,{asn1,{illegal_value,Val}}})
-	    end;
-	_ ->
-	    exit({error,{asn1,{illegal_value,Val}}})
-    end.
-
-encode_integer1(C, Val) ->		    
-    case VR = get_constraint(C,'ValueRange') of
-	no ->
-	    encode_unconstrained_number(Val);
-	{Lb,'MAX'} ->
-	    encode_semi_constrained_number(Lb,Val);
-	%% positive with range
-	{Lb,Ub} when Val >= Lb,
-		     Ub >= Val ->
-	    encode_constrained_number(VR,Val);
-	_ ->
-	    exit({error,{asn1,{illegal_value,VR,Val}}})
-    end.
-
-decode_integer(Buffer,Range,NamedNumberList) ->
-    {Val,Buffer2} = decode_integer(Buffer,Range),
-    case lists:keysearch(Val,2,NamedNumberList) of
-	{value,{NewVal,_}} -> {NewVal,Buffer2};
-	_ -> {Val,Buffer2}
-    end.
-
-decode_integer(Buffer,[{Rc,_Ec}]) when is_tuple(Rc) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> decode_integer(Buffer2,[Rc]);
-	1 -> decode_unconstrained_number(Buffer2)
-    end;
-decode_integer(Buffer,undefined) ->
-    decode_unconstrained_number(Buffer);
-decode_integer(Buffer,C) ->
-    case get_constraint(C,'SingleValue') of
-	V when is_integer(V) ->
-	    {V,Buffer};
-	V when is_list(V) ->
-	    {Val,Buffer2} = decode_integer1(Buffer,C),
-	    case lists:member(Val,V) of
-		true ->
-		    {Val,Buffer2};
-		_ -> 
-		    exit({error,{asn1,{illegal_value,Val}}})
-	    end;
-	_ ->
-	    decode_integer1(Buffer,C)
-    end.
-
-decode_integer1(Buffer,C) ->
-    case VR = get_constraint(C,'ValueRange') of
-	no ->
-	    decode_unconstrained_number(Buffer);
-	{Lb, 'MAX'} ->
-	    decode_semi_constrained_number(Buffer,Lb);
-	{_,_} ->
-	    decode_constrained_number(Buffer,VR)
-    end.
-
-						% X.691:10.6 Encoding of a normally small non-negative whole number
-						% Use this for encoding of CHOICE index if there is an extension marker in 
-						% the CHOICE
-encode_small_number({Name,Val}) when is_atom(Name) ->
-    encode_small_number(Val);
-encode_small_number(Val) when Val =< 63 ->
-%    [{bits,1,0},{bits,6,Val}];
-    [{bits,7,Val}]; % same as above but more efficient
-encode_small_number(Val) ->
-    [{bits,1,1},encode_semi_constrained_number(0,Val)].
-
-decode_small_number(Bytes) ->
-    {Bit,Bytes2} = getbit(Bytes),
-    case Bit of
-	0 -> 
-	    getbits(Bytes2,6);
-	1 ->
-	    decode_semi_constrained_number(Bytes2,0)
-    end.
-
-%% X.691:10.7 Encoding of a semi-constrained whole number
-%% might be an optimization encode_semi_constrained_number(0,Val) ->
-encode_semi_constrained_number(C,{Name,Val}) when is_atom(Name) ->
-    encode_semi_constrained_number(C,Val);
-encode_semi_constrained_number({Lb,'MAX'},Val) ->
-    encode_semi_constrained_number(Lb,Val);
-encode_semi_constrained_number(Lb,Val) ->
-    Val2 = Val - Lb,
-    Oct = eint_positive(Val2),
-    Len = length(Oct),
-    if 
-	Len < 128 ->
-	    {octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
-	true ->
-	    [encode_length(undefined,Len),{octets,Oct}]
-    end.
-
-decode_semi_constrained_number(Bytes,{Lb,_}) ->
-    decode_semi_constrained_number(Bytes,Lb);
-decode_semi_constrained_number(Bytes,Lb) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {V,Bytes3} = getoctets(Bytes2,Len),
-    {V+Lb,Bytes3}.
-
-encode_constrained_number(Range,{Name,Val}) when is_atom(Name) ->
-    encode_constrained_number(Range,Val);
-encode_constrained_number({Lb,Ub},Val) when Val >= Lb, Ub >= Val -> 
-    Range = Ub - Lb + 1,
-    Val2 = Val - Lb,
-    if 
-	Range  == 1 ->
-	    [];
-	Range  == 2 ->
-	    {bits,1,Val2};
-	Range  =< 4 -> 
-	    {bits,2,Val2};
-	Range  =< 8 ->
-	    {bits,3,Val2};
-	Range  =< 16 ->
-	    {bits,4,Val2};
-	Range  =< 32 ->
-	    {bits,5,Val2};
-	Range  =< 64 ->
-	    {bits,6,Val2};
-	Range  =< 128 ->
-	    {bits,7,Val2};
-	Range  =< 255 ->
-	    {bits,8,Val2};
-	Range  =< 256 ->
-	    {octets,[Val2]};
-	Range  =< 65536 ->
-	    {octets,<<Val2:16>>};
-	Range =< 16#1000000  ->
-	    Octs = eint_positive(Val2),
-	    [{bits,2,length(Octs)-1},{octets,Octs}];
-	Range =< 16#100000000  ->
-	    Octs = eint_positive(Val2),
-	    [{bits,2,length(Octs)-1},{octets,Octs}];
-	Range =< 16#10000000000  ->
-	    Octs = eint_positive(Val2),
-	    [{bits,3,length(Octs)-1},{octets,Octs}];
-	true  ->
-	    exit({not_supported,{integer_range,Range}})
-    end;
-encode_constrained_number(Range,Val) -> 
-    exit({error,{asn1,{integer_range,Range,value,Val}}}).
-
-
-decode_constrained_number(Buffer,{Lb,Ub}) ->
-    Range = Ub - Lb + 1,
-						%    Val2 = Val - Lb,
-    {Val,Remain} = 
-	if 
-	    Range  == 1 ->
-		{0,Buffer};
-	    Range  == 2 ->
-		getbits(Buffer,1);
-	    Range  =< 4 -> 
-		getbits(Buffer,2);
-	    Range  =< 8 ->
-		getbits(Buffer,3);
-	    Range  =< 16 ->
-		getbits(Buffer,4);
-	    Range  =< 32 ->
-		getbits(Buffer,5);
-	    Range  =< 64 ->
-		getbits(Buffer,6);
-	    Range  =< 128 ->
-		getbits(Buffer,7);
-	    Range  =< 255 ->
-		getbits(Buffer,8);
-	    Range  =< 256 ->
-		getoctets(Buffer,1);
-	    Range  =< 65536 ->
-		getoctets(Buffer,2);
-	    Range =< 16#1000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,3}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	    Range =< 16#100000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,4}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	    Range =< 16#10000000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,5}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	    true  ->
-		exit({not_supported,{integer_range,Range}})
-	end,
-    {Val+Lb,Remain}.
-
-%% X.691:10.8 Encoding of an unconstrained whole number
-
-encode_unconstrained_number(Val) when Val >= 0 ->
-    Oct = eint(Val,[]),
-    Len = length(Oct),
-    if 
-	Len < 128 ->
-	    {octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
-	true ->
-	    [encode_length(undefined,Len),{octets,Oct}]
-    end;
-encode_unconstrained_number(Val) -> % negative
-    Oct = enint(Val,[]),
-    Len = length(Oct),
-    if 
-	Len < 128 ->
-	    {octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
-	true ->
-	    [encode_length(undefined,Len),{octets,Oct}]
-    end.
-
-
-%% used for positive Values which don't need a sign bit
-%% returns a binary
-eint_positive(Val) ->
-    case eint(Val,[]) of
-	[0,B1|T] ->
-	    [B1|T];
-	T -> 
-	    T
-    end.
-
-
-eint(0, [B|Acc]) when B < 128 ->
-    [B|Acc];
-eint(N, Acc) ->
-    eint(N bsr 8, [N band 16#ff| Acc]).
-
-enint(-1, [B1|T]) when B1 > 127 ->
-    [B1|T];
-enint(N, Acc) ->
-    enint(N bsr 8, [N band 16#ff|Acc]).
-
-decode_unconstrained_number(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Ints,Bytes3} = getoctets_as_list(Bytes2,Len),
-    {dec_integer(Ints),Bytes3}.
-
-dec_pos_integer(Ints) ->
-    decpint(Ints, 8 * (length(Ints) - 1)).
-dec_integer(Ints) when hd(Ints) band 255 =< 127 -> %% Positive number
-    decpint(Ints, 8 * (length(Ints) - 1));
-dec_integer(Ints) ->                        %% Negative
-    decnint(Ints,  8 * (length(Ints) - 1)).
-
-decpint([Byte|Tail], Shift) ->
-    (Byte bsl Shift) bor decpint(Tail, Shift-8);
-decpint([], _) -> 0.
-
-decnint([Byte|Tail], Shift) ->
-    (-128 + (Byte band 127) bsl Shift) bor decpint(Tail, Shift-8).
-
-% minimum_octets(Val) ->
-%     minimum_octets(Val,[]).
-
-% minimum_octets(Val,Acc) when Val > 0 -> 
-%     minimum_octets((Val bsr 8),[Val band 16#FF|Acc]);
-% minimum_octets(0,Acc) ->
-%     Acc.
-
-
-%% X.691:10.9 Encoding of a length determinant
-%%encode_small_length(undefined,Len) -> % null means no UpperBound
-%%    encode_small_number(Len).
-
-%% X.691:10.9.3.5 
-%% X.691:10.9.3.7
-encode_length(undefined,Len) -> % un-constrained
-    if 
-	Len < 128 ->
-	    {octets,[Len]};
-	Len < 16384 ->
-	    {octets,<<2:2,Len:14>>};
-	true  -> % should be able to endode length >= 16384
-	    exit({error,{asn1,{encode_length,{nyi,above_16k}}}})
-    end;
-
-encode_length({0,'MAX'},Len) ->
-    encode_length(undefined,Len);
-encode_length(Vr={Lb,Ub},Len) when Ub =< 65535 ,Lb >= 0 -> % constrained
-    encode_constrained_number(Vr,Len);
-encode_length({Lb,_Ub},Len) when is_integer(Lb), Lb >= 0 -> % Ub > 65535
-    encode_length(undefined,Len);
-encode_length({Vr={Lb,Ub},Ext},Len) 
-  when Ub =< 65535 ,Lb >= 0, Len=<Ub, is_list(Ext) -> 
-    %% constrained extensible
-    [{bits,1,0},encode_constrained_number(Vr,Len)];
-encode_length({{Lb,_Ub},Ext},Len) when is_list(Ext) ->
-    [{bits,1,1},encode_semi_constrained_number(Lb,Len)];
-encode_length(SingleValue,_Len) when is_integer(SingleValue) ->
-    [].
-
-%% X.691 10.9.3.4 (only used for length of bitmap that prefixes extension 
-%% additions in a sequence or set
-encode_small_length(Len) when Len =< 64 ->
-%%    [{bits,1,0},{bits,6,Len-1}];
-    {bits,7,Len-1}; % the same as above but more efficient
-encode_small_length(Len) ->
-    [{bits,1,1},encode_length(undefined,Len)].
-
-% decode_small_length({Used,<<_:Used,0:1,Num:6,_:((8-Used+1) rem 8),Rest/binary>>}) ->
-%     case Buffer of
-% 	<<_:Used,0:1,Num:6,_:((8-Used+1) rem 8),Rest/binary>> ->
-% 	    {Num,
-%     case getbit(Buffer) of
-% 	{0,Remain} -> 
-% 	    {Bits,Remain2} = getbits(Remain,6),
-% 	    {Bits+1,Remain2};
-% 	{1,Remain} -> 
-% 	    decode_length(Remain,undefined)
-%     end.
-
-decode_small_length(Buffer) ->
-    case getbit(Buffer) of
-	{0,Remain} -> 
-	    {Bits,Remain2} = getbits(Remain,6),
-	    {Bits+1,Remain2};
-	{1,Remain} -> 
-	    decode_length(Remain,undefined)
-    end.
-
-decode_length(Buffer) ->
-    decode_length(Buffer,undefined).
-
-decode_length(Buffer,undefined)  -> % un-constrained
-    {0,Buffer2} = align(Buffer),
-    case Buffer2 of
-	<<0:1,Oct:7,Rest/binary>> ->
-	    {Oct,{0,Rest}};
-	<<2:2,Val:14,Rest/binary>> ->
-	    {Val,{0,Rest}};
-	<<3:2,_:14,_Rest/binary>> ->
-	    %% this case should be fixed
-	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}})
-    end;
-%%    {Bits,_} = getbits(Buffer2,2),
-%     case Bits of
-% 	2 -> 
-% 	    {Val,Bytes3} = getoctets(Buffer2,2),
-% 	    {(Val band 16#3FFF),Bytes3};
-% 	3 -> 
-% 	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}});
-% 	_ ->
-% 	    {Val,Bytes3} = getoctet(Buffer2),
-% 	    {Val band 16#7F,Bytes3}
-%     end;
-
-decode_length(Buffer,{Lb,Ub}) when Ub =< 65535 ,Lb >= 0 -> % constrained
-    decode_constrained_number(Buffer,{Lb,Ub});
-decode_length(Buffer,{Lb,_}) when is_integer(Lb), Lb >= 0 -> % Ub > 65535
-    decode_length(Buffer,undefined);
-decode_length(Buffer,{VR={_Lb,_Ub},Ext}) when is_list(Ext) ->
-    case getbit(Buffer) of
-	{0,Buffer2} ->
-	    decode_length(Buffer2, VR);
-	{1,Buffer2} ->
-	    decode_length(Buffer2, undefined)
-    end;
-%%     {0,Buffer2} = getbit(Buffer),
-%%     decode_length(Buffer2, VR);
-	
-
-%When does this case occur with {_,_Lb,Ub} ??
-% X.691:10.9.3.5 
-decode_length({Used,Bin},{_,_Lb,_Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub NOTE! this case does not cover case when Ub > 65535
-    Unused = (8-Used) rem 8,
-    case Bin of
-	<<_:Used,0:1,Val:7,R:Unused,Rest/binary>> -> 
-	    {Val,{Used,<<R,Rest/binary>>}};
-	<<_:Used,_:Unused,2:2,Val:14,Rest/binary>> -> 
-	    {Val, {0,Rest}};
-	<<_:Used,_:Unused,3:2,_:14,_Rest/binary>> -> 
-	    exit({error,{asn1,{decode_length,{nyi,length_above_64K}}}})
-    end;
-% decode_length(Buffer,{_,_Lb,Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub
-%     case getbit(Buffer) of
-% 	{0,Remain} -> 
-% 	    getbits(Remain,7);
-% 	{1,Remain} -> 
-% 	    {Val,Remain2} = getoctets(Buffer,2),
-% 	    {Val band 2#0111111111111111, Remain2}
-%     end;
-decode_length(Buffer,SingleValue) when is_integer(SingleValue) ->
-    {SingleValue,Buffer}.
-
-
-						% X.691:11
-encode_boolean(true) ->
-    {bits,1,1};
-encode_boolean(false) ->
-    {bits,1,0};
-encode_boolean({Name,Val}) when is_atom(Name) ->
-    encode_boolean(Val);
-encode_boolean(Val) ->
-    exit({error,{asn1,{encode_boolean,Val}}}).
-
-decode_boolean(Buffer) -> %when record(Buffer,buffer)
-    case getbit(Buffer) of
-	{1,Remain} -> {true,Remain};
-	{0,Remain} -> {false,Remain}
-    end.
-
-
-%% ENUMERATED with extension marker
-decode_enumerated(Buffer,C,{Ntup1,Ntup2}) when is_tuple(Ntup1), is_tuple(Ntup2) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> % not an extension value
-	    {Val,Buffer3} = decode_integer(Buffer2,C),
-	    case catch (element(Val+1,Ntup1)) of
-		NewVal when is_atom(NewVal) -> {NewVal,Buffer3};
-		_Error -> exit({error,{asn1,{decode_enumerated,{Val,[Ntup1,Ntup2]}}}})
-	    end;
-	1 -> % this an extension value
-	    {Val,Buffer3} = decode_small_number(Buffer2),
-	    case catch (element(Val+1,Ntup2)) of
-		NewVal when is_atom(NewVal) -> {NewVal,Buffer3};
-		_ -> {{asn1_enum,Val},Buffer3}
-	    end
-    end;
-
-decode_enumerated(Buffer,C,NamedNumberTup) when is_tuple(NamedNumberTup) ->
-    {Val,Buffer2} = decode_integer(Buffer,C),
-    case catch (element(Val+1,NamedNumberTup)) of
-	NewVal when is_atom(NewVal) -> {NewVal,Buffer2};
-	_Error -> exit({error,{asn1,{decode_enumerated,{Val,NamedNumberTup}}}})
-    end.
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Bitstring value, ITU_T X.690 Chapter 8.5
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-%%===============================================================================
-%% encode bitstring value
-%%===============================================================================
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% bitstring NamedBitList
-%% Val can be  of:
-%% - [identifiers] where only named identifers are set to one, 
-%%   the Constraint must then have some information of the 
-%%   bitlength.
-%% - [list of ones and zeroes] all bits 
-%% - integer value representing the bitlist
-%% C is constraint Len, only valid when identifiers
-
-
-%% when the value is a list of {Unused,BinBits}, where 
-%% Unused = integer(),
-%% BinBits = binary().
-
-encode_bit_string(C,Bin={Unused,BinBits},NamedBitList) when is_integer(Unused),
-							    is_binary(BinBits) ->
-    encode_bin_bit_string(C,Bin,NamedBitList);
-
-%% when the value is a list of named bits
-encode_bit_string(C, LoNB=[FirstVal | _RestVal], NamedBitList) when is_atom(FirstVal) ->
-    ToSetPos = get_all_bitposes(LoNB, NamedBitList, []),
-    BitList = make_and_set_list(ToSetPos,0),
-    encode_bit_string(C,BitList,NamedBitList);
-
-encode_bit_string(C, BL=[{bit,_No} | _RestVal], NamedBitList) ->
-    ToSetPos = get_all_bitposes(BL, NamedBitList, []),
-    BitList = make_and_set_list(ToSetPos,0),
-    encode_bit_string(C,BitList,NamedBitList);
-
-%% when the value is a list of ones and zeroes
-
-% encode_bit_string(C, BitListValue, NamedBitList) when is_list(BitListValue) ->
-%     Bl1 = 
-% 	case NamedBitList of
-% 	    [] ->  % dont remove trailing zeroes
-% 		BitListValue;
-% 	    _ -> % first remove any trailing zeroes
-% 		lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,
-% 					      lists:reverse(BitListValue)))
-% 	end,
-%     BitList = [{bit,X} || X <- Bl1],
-% %%    BListLen = length(BitList),
-%     case get_constraint(C,'SizeConstraint') of
-% 	0 -> % fixed length
-% 	    []; % nothing to encode
-% 	V when is_integer(V),V=<16 -> % fixed length 16 bits or less
-% 	    pad_list(V,BitList);
-% 	V when is_integer(V) -> % fixed length 16 bits or more
-% 	    [align,pad_list(V,BitList)]; % should be another case for V >= 65537
-% 	{Lb,Ub} when is_integer(Lb),is_integer(Ub) ->	    
-% 	    [encode_length({Lb,Ub},length(BitList)),align,BitList];
-% 	no ->
-% 	    [encode_length(undefined,length(BitList)),align,BitList];
-% 	Sc -> % extension marker
-% 	    [encode_length(Sc,length(BitList)),align,BitList]
-%     end;
-encode_bit_string(C, BitListValue, NamedBitList) when is_list(BitListValue) ->
-    BitListToBinary = 
-	%% fun that transforms a list of 1 and 0 to a tuple:
-	%% {UnusedBitsInLastByte, Binary}
-	fun([1|T],Acc,N,Fun) ->
-		Fun(T,(Acc bsl 1)+1,N+1,Fun);
-	   ([0|T],Acc,N,Fun) ->
-		Fun(T,(Acc bsl 1),N+1,Fun);
-	   ([_H|_T],_,_,_) ->
-		exit({error,{asn1,{bitstring_bitlist,BitListValue}}});
-	   ([],Acc,N,_) -> 
-		Unused = (8 - (N rem 8)) rem 8,
-		{Unused,<<Acc:N,0:Unused>>}
-	end,
-    UnusedAndBin =
-	case NamedBitList of
-	    [] ->  % dont remove trailing zeroes
-		BitListToBinary(BitListValue,0,0,BitListToBinary);
-	    _ ->
-		BitListToBinary(lists:reverse(
-			       lists:dropwhile(fun(0)->true;(_)->false end,
-					       lists:reverse(BitListValue))),
-			     0,0,BitListToBinary)
-	end,
-    encode_bin_bit_string(C,UnusedAndBin,NamedBitList);
-
-%% when the value is an integer
-encode_bit_string(C, IntegerVal, NamedBitList) when is_integer(IntegerVal)->
-    BitList = int_to_bitlist(IntegerVal),
-    encode_bit_string(C,BitList,NamedBitList);
-
-%% when the value is a tuple
-encode_bit_string(C,{Name,Val}, NamedBitList) when is_atom(Name) ->
-    encode_bit_string(C,Val,NamedBitList).
-
-
-%% encode_bin_bit_string/3, when value is a tuple of Unused and BinBits.
-%% Unused = integer(),i.e. number unused bits in least sign. byte of
-%% BinBits = binary().
-
-
-encode_bin_bit_string(C,UnusedAndBin={_Unused,_BinBits},NamedBitList) ->
-    Constr = get_constraint(C,'SizeConstraint'),
-    UnusedAndBin1 = {Unused1,Bin1} = 
-	remove_trailing_bin(NamedBitList,UnusedAndBin,lower_bound(Constr)),
-    case Constr of
-	0 ->
-	    [];
-	V when is_integer(V),V=<16 ->
-	    {Unused2,Bin2} = pad_list(V,UnusedAndBin1),
-	    <<BitVal:V,_:Unused2>> = Bin2,
-	    {bits,V,BitVal};
-	V when is_integer(V) ->
-	    [align, pad_list(V, UnusedAndBin1)];
-	{Lb,Ub} when is_integer(Lb),is_integer(Ub) ->
-	    [encode_length({Lb,Ub},size(Bin1)*8 - Unused1),
-	     align,UnusedAndBin1];
-	{{Fix,Fix},L} when is_integer(Fix),is_list(L) ->
-	    %% X.691 � 15.6, the rest of this paragraph is covered by
-	    %% the last, ie. Sc, clause in this case
-	    case (size(Bin1)*8)-Unused1 of
-		Size when Size =< Fix, Fix =< 16 ->
-		    {Unused2,Bin2} = pad_list(Fix,UnusedAndBin),
-		    <<BitVal:Fix,_:Unused2>> = Bin2,
-		    [{bits,1,0},{bits,Fix,BitVal}];
-		Size when Size =< Fix ->
-		    [{bits,1,0},align, pad_list(Fix, UnusedAndBin1)];
-		Size ->
-		    [{bits,1,1},encode_length(undefined,Size),
-		     align,UnusedAndBin1]
-	    end;
-	no ->
-	    [encode_length(undefined,size(Bin1)*8 - Unused1),
-	     align,UnusedAndBin1];
-	Sc ->
-	    [encode_length(Sc,size(Bin1)*8 - Unused1),
-	     align,UnusedAndBin1]
-    end.
-
-
-remove_trailing_bin([], {Unused,Bin},_) ->
-    {Unused,Bin};
-remove_trailing_bin(_NamedNumberList,{_Unused,<<>>},C) ->
-    case C of
-	Int when is_integer(Int),Int > 0 ->
-	    %% this padding see OTP-4353
-	    pad_list(Int,{0,<<>>});
-	_ -> {0,<<>>}
-    end;
-remove_trailing_bin(NamedNumberList, {_Unused,Bin},C) ->
-    Size = size(Bin)-1,
-    <<Bfront:Size/binary, LastByte:8>> = Bin,
-    %% clear the Unused bits to be sure
-    Unused1 = trailingZeroesInNibble(LastByte band 15),
-    Unused2 = 
-	case Unused1 of 
-	    4 ->
-		4 + trailingZeroesInNibble(LastByte bsr 4);
-	    _ -> Unused1
-	end,
-    case Unused2 of
-	8 ->
-	    remove_trailing_bin(NamedNumberList,{0,Bfront},C);
-	_ ->
-	    case C of
-		Int when is_integer(Int),Int > ((size(Bin)*8)-Unused2) ->
-		    %% this padding see OTP-4353
-		    pad_list(Int,{Unused2,Bin});
-		_ -> {Unused2,Bin}
-	    end
-    end.
-
-
-trailingZeroesInNibble(0) ->
-    4;
-trailingZeroesInNibble(1) ->
-    0;
-trailingZeroesInNibble(2) ->
-    1;
-trailingZeroesInNibble(3) ->
-    0;
-trailingZeroesInNibble(4) ->
-    2;
-trailingZeroesInNibble(5) ->
-    0;
-trailingZeroesInNibble(6) ->
-    1;
-trailingZeroesInNibble(7) ->
-    0;
-trailingZeroesInNibble(8) ->
-    3;
-trailingZeroesInNibble(9) ->
-    0;
-trailingZeroesInNibble(10) ->
-    1;
-trailingZeroesInNibble(11) ->
-    0;
-trailingZeroesInNibble(12) -> %#1100
-    2;
-trailingZeroesInNibble(13) ->
-    0;
-trailingZeroesInNibble(14) ->
-    1;
-trailingZeroesInNibble(15) ->
-    0.
-
-lower_bound({{Lb,_},_}) when is_integer(Lb) ->
-    Lb;
-lower_bound({Lb,_}) when is_integer(Lb) ->
-    Lb;
-lower_bound(C) ->
-    C.
-
-%%%%%%%%%%%%%%%
-%% The result is presented as a list of named bits (if possible)
-%% else as a tuple {Unused,Bits}. Unused is the number of unused
-%% bits, least significant bits in the last byte of Bits. Bits is
-%% the BIT STRING represented as a binary.
-%% 
-decode_compact_bit_string(Buffer, C, NamedNumberList) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 -> % fixed length
-	    {{8,0},Buffer};
-	V when is_integer(V),V=<16 -> %fixed length 16 bits or less
-	    compact_bit_string(Buffer,V,NamedNumberList);
-	V when is_integer(V),V=<65536 -> %fixed length > 16 bits
-	    Bytes2 = align(Buffer),
-	    compact_bit_string(Bytes2,V,NamedNumberList);
-	V when is_integer(V) -> % V > 65536 => fragmented value
-	    {Bin,Buffer2} = decode_fragmented_bits(Buffer,V),
-	    case Buffer2 of
-		{0,_} -> {{0,Bin},Buffer2};
-		{U,_} -> {{8-U,Bin},Buffer2}
-	    end;
-	{Lb,Ub} when is_integer(Lb),is_integer(Ub) ->
-	    %% This case may demand decoding of fragmented length/value
-	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
-	    Bytes3 = align(Bytes2),
-	    compact_bit_string(Bytes3,Len,NamedNumberList);
-	no ->
-	    %% This case may demand decoding of fragmented length/value
-	    {Len,Bytes2} = decode_length(Buffer,undefined),
-	    Bytes3 = align(Bytes2),
-	    compact_bit_string(Bytes3,Len,NamedNumberList);
-	{{Fix,Fix},L} = Sc when is_list(L), is_integer(Fix), Fix =< 16 ->
-	    %% X.691 �15.6, special case of extension marker
-	    case decode_length(Buffer,Sc) of
-		{Len,Bytes2} when Len > Fix ->
-		    Bytes3 = align(Bytes2),
-		    compact_bit_string(Bytes3,Len,NamedNumberList);
-		{Len,Bytes2} ->
-		    compact_bit_string(Bytes2,Len,NamedNumberList)
-	    end;
-	Sc ->
-	    {Len,Bytes2} = decode_length(Buffer,Sc),
-	    Bytes3 = align(Bytes2),
-	    compact_bit_string(Bytes3,Len,NamedNumberList)
-    end.
-
-
-%%%%%%%%%%%%%%%
-%% The result is presented as a list of named bits (if possible)
-%% else as a list of 0 and 1.
-%% 
-decode_bit_string(Buffer, C, NamedNumberList) ->
-    case get_constraint(C,'SizeConstraint') of
-	{Lb,Ub} when is_integer(Lb),is_integer(Ub) ->
-	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
-	    Bytes3 = align(Bytes2),
-	    bit_list_or_named(Bytes3,Len,NamedNumberList);
-	no ->
-	    {Len,Bytes2} = decode_length(Buffer,undefined),
-	    Bytes3 = align(Bytes2),
-	    bit_list_or_named(Bytes3,Len,NamedNumberList);
-	0 -> % fixed length
-	    {[],Buffer}; % nothing to encode
-	V when is_integer(V),V=<16 -> % fixed length 16 bits or less
-	    bit_list_or_named(Buffer,V,NamedNumberList);
-	V when is_integer(V),V=<65536 ->
-	    Bytes2 = align(Buffer),
-	    bit_list_or_named(Bytes2,V,NamedNumberList);
-	V when is_integer(V) ->
-	    Bytes2 = align(Buffer),
-	    {BinBits,_} = decode_fragmented_bits(Bytes2,V),
-	    bit_list_or_named(BinBits,V,NamedNumberList);
-	{{Fix,Fix},L} = Sc when is_list(L), is_integer(Fix), Fix =< 16 ->
-	    %% X.691 �15.6, special case of extension marker
-	    case decode_length(Buffer,Sc) of
-		{Len,Bytes2} when Len > Fix ->
-		     Bytes3 = align(Bytes2),
-		    bit_list_or_named(Bytes3,Len,NamedNumberList);
-		{Len,Bytes2} when Len > 16 ->
-		     Bytes3 = align(Bytes2),
-		    bit_list_or_named(Bytes3,Len,NamedNumberList);
-		{Len,Bytes2} ->
-		    bit_list_or_named(Bytes2,Len,NamedNumberList)
-	    end;
-	Sc -> %% X.691 �15.6, extension marker
-	    {Len,Bytes2} = decode_length(Buffer,Sc),
-	    Bytes3 = align(Bytes2),
-	    bit_list_or_named(Bytes3,Len,NamedNumberList)
-    end.
-
-
-%% if no named bits are declared we will return a
-%% {Unused,Bits}. Unused = integer(),
-%% Bits = binary().
-compact_bit_string(Buffer,Len,[]) ->
-    getbits_as_binary(Len,Buffer); % {{Unused,BinBits},NewBuffer}
-compact_bit_string(Buffer,Len,NamedNumberList) ->
-    bit_list_or_named(Buffer,Len,NamedNumberList).
-
-
-%% if no named bits are declared we will return a
-%% BitList = [0 | 1]
-
-bit_list_or_named(Buffer,Len,[]) ->
-    getbits_as_list(Len,Buffer);
-
-%% if there are named bits declared we will return a named
-%% BitList where the names are atoms and unnamed bits represented
-%% as {bit,Pos}
-%% BitList = [atom() | {bit,Pos}]
-%% Pos = integer()
-
-bit_list_or_named(Buffer,Len,NamedNumberList) ->
-    {BitList,Rest} = getbits_as_list(Len,Buffer),
-    {bit_list_or_named1(0,BitList,NamedNumberList,[]), Rest}.
-
-bit_list_or_named1(Pos,[0|Bt],Names,Acc) ->
-    bit_list_or_named1(Pos+1,Bt,Names,Acc);
-bit_list_or_named1(Pos,[1|Bt],Names,Acc) ->
-    case lists:keysearch(Pos,2,Names) of
-	{value,{Name,_}} ->
-	    bit_list_or_named1(Pos+1,Bt,Names,[Name|Acc]);
-	_  -> 
-	    bit_list_or_named1(Pos+1,Bt,Names,[{bit,Pos}|Acc])
-    end;
-bit_list_or_named1(_,[],_,Acc) ->
-    lists:reverse(Acc).
-
-
-
-%%%%%%%%%%%%%%%
-%% 
-
-int_to_bitlist(Int) when is_integer(Int), Int > 0 ->
-    [Int band 1 | int_to_bitlist(Int bsr 1)];
-int_to_bitlist(0) ->
-    [].
-
-
-%%%%%%%%%%%%%%%%%%
-%% get_all_bitposes([list of named bits to set], named_bit_db, []) ->
-%%   [sorted_list_of_bitpositions_to_set]
-
-get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
-    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
-
-get_all_bitposes([Val | Rest], NamedBitList, Ack) ->
-    case lists:keysearch(Val, 1, NamedBitList) of
-	{value, {_ValName, ValPos}} ->
-	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
-	_ ->
-	    exit({error,{asn1, {bitstring_namedbit, Val}}})
-    end;
-get_all_bitposes([], _NamedBitList, Ack) ->
-    lists:sort(Ack).
-
-%%%%%%%%%%%%%%%%%%
-%% make_and_set_list([list of positions to set to 1])->
-%% returns list with all in SetPos set.
-%% in positioning in list the first element is 0, the second 1 etc.., but
-%% 
-
-make_and_set_list([XPos|SetPos], XPos) ->
-    [1 | make_and_set_list(SetPos, XPos + 1)];
-make_and_set_list([Pos|SetPos], XPos) ->
-    [0 | make_and_set_list([Pos | SetPos], XPos + 1)];
-make_and_set_list([], _) ->
-    [].
-
-%%%%%%%%%%%%%%%%%
-%% pad_list(N,BitList) -> PaddedList
-%% returns a padded (with trailing {bit,0} elements) list of length N
-%% if Bitlist contains more than N significant bits set an exit asn1_error 
-%% is generated
-
-pad_list(N,In={Unused,Bin}) ->
-    pad_list(N, size(Bin)*8 - Unused, In).
-    
-pad_list(N,Size,In={_,_}) when N < Size ->
-    exit({error,{asn1,{range_error,{bit_string,In}}}});
-pad_list(N,Size,{Unused,Bin}) when N > Size, Unused > 0 ->
-    pad_list(N,Size+1,{Unused-1,Bin});
-pad_list(N,Size,{_Unused,Bin}) when N > Size ->
-    pad_list(N,Size+1,{7,<<Bin/binary,0>>});
-pad_list(N,N,In={_,_}) ->
-    In.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% X.691:16
-%% encode_octet_string(Constraint,ExtensionMarker,Val)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-encode_octet_string(C,Val) ->
-    encode_octet_string2(C,Val).
-
-encode_octet_string2(C,{_Name,Val}) ->
-    encode_octet_string2(C,Val);
-encode_octet_string2(C,Val) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 ->
-	    [];
-	1 ->
-	    [V] = Val,
-	    {bits,8,V};
-	2 ->
-	    [V1,V2] = Val,
-	    [{bits,8,V1},{bits,8,V2}];
-	Sv when Sv =<65535, Sv == length(Val) -> % fixed length
-	    {octets,Val};
-	{Lb,Ub}  ->
-	    [encode_length({Lb,Ub},length(Val)),{octets,Val}];
-	Sv when is_list(Sv) ->
-	    [encode_length({hd(Sv),lists:max(Sv)},length(Val)),{octets,Val}];
-	no  ->
-	    [encode_length(undefined,length(Val)),{octets,Val}]
-    end.
-
-decode_octet_string(Bytes,Range) ->
-    decode_octet_string(Bytes,Range,false).
-
-decode_octet_string(Bytes,C,false) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 ->
-	    {[],Bytes};
-	1 ->
-	    {B1,Bytes2} = getbits(Bytes,8),
-	    {[B1],Bytes2};
-	2 ->
-	    {Bs,Bytes2}= getbits(Bytes,16),
-	    {binary_to_list(<<Bs:16>>),Bytes2};
-	{_,0} ->
-	    {[],Bytes};
-	Sv when is_integer(Sv), Sv =<65535 -> % fixed length
-	    getoctets_as_list(Bytes,Sv);
-	Sv when is_integer(Sv) -> % fragmented encoding
-	    Bytes2 = align(Bytes),
-	    decode_fragmented_octets(Bytes2,Sv);
-	{Lb,Ub}  ->
-	    {Len,Bytes2} = decode_length(Bytes,{Lb,Ub}),
-	    getoctets_as_list(Bytes2,Len);
-	Sv when is_list(Sv) ->
-	    {Len,Bytes2} = decode_length(Bytes,{hd(Sv),lists:max(Sv)}),
-	    getoctets_as_list(Bytes2,Len);
-	no  ->
-	    {Len,Bytes2} = decode_length(Bytes,undefined),
-	    getoctets_as_list(Bytes2,Len)
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Restricted char string types 
-%% (NumericString, PrintableString,VisibleString,IA5String,BMPString,UniversalString)
-%% X.691:26 and X.680:34-36
-%%encode_restricted_string(aligned,'BMPString',Constraints,Extension,Val)
-
-
-encode_restricted_string(aligned,{Name,Val}) when is_atom(Name) ->
-    encode_restricted_string(aligned,Val);
-
-encode_restricted_string(aligned,Val) when is_list(Val)->
-    [encode_length(undefined,length(Val)),{octets,Val}].
-
-encode_known_multiplier_string(aligned,StringType,C,_Ext,{Name,Val}) when is_atom(Name) ->
-    encode_known_multiplier_string(aligned,StringType,C,false,Val);
-
-encode_known_multiplier_string(aligned,StringType,C,_Ext,Val) ->
-    Result = chars_encode(C,StringType,Val),
-    NumBits = get_NumBits(C,StringType),
-    case get_constraint(C,'SizeConstraint') of
-	Ub when is_integer(Ub), Ub*NumBits =< 16  ->
-	    Result;
-	0 ->
-	    [];
-	Ub when is_integer(Ub),Ub =<65535 -> % fixed length
-	    [align,Result];
-	{Ub,Lb} ->
-	    [encode_length({Ub,Lb},length(Val)),align,Result];
-	Vl when is_list(Vl) ->
-	    [encode_length({lists:min(Vl),lists:max(Vl)},length(Val)),align,Result];
-	no  ->
-	    [encode_length(undefined,length(Val)),align,Result]
-    end.
-
-decode_restricted_string(Bytes,aligned) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    getoctets_as_list(Bytes2,Len).
-
-decode_known_multiplier_string(Bytes,aligned,StringType,C,_Ext) ->
-    NumBits = get_NumBits(C,StringType),
-    case get_constraint(C,'SizeConstraint') of
-	Ub when is_integer(Ub), Ub*NumBits =< 16  ->
-	    chars_decode(Bytes,NumBits,StringType,C,Ub);
-	Ub when is_integer(Ub),Ub =<65535 -> % fixed length
-	    Bytes1 = align(Bytes),
-	    chars_decode(Bytes1,NumBits,StringType,C,Ub);
-	0 ->
-	    {[],Bytes};
-	Vl when is_list(Vl) ->
-	    {Len,Bytes1} = decode_length(Bytes,{hd(Vl),lists:max(Vl)}),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,C,Len);
-	no  ->
-	    {Len,Bytes1} = decode_length(Bytes,undefined),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,C,Len);
-	{Lb,Ub}->
-	    {Len,Bytes1} = decode_length(Bytes,{Lb,Ub}),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,C,Len)
-    end.
-
-
-encode_NumericString(C,Val) ->
-    encode_known_multiplier_string(aligned,'NumericString',C,false,Val).
-decode_NumericString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'NumericString',C,false).
-
-encode_PrintableString(C,Val) ->
-    encode_known_multiplier_string(aligned,'PrintableString',C,false,Val).
-decode_PrintableString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'PrintableString',C,false).
-
-encode_VisibleString(C,Val) -> % equivalent with ISO646String
-    encode_known_multiplier_string(aligned,'VisibleString',C,false,Val).
-decode_VisibleString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'VisibleString',C,false).
-
-encode_IA5String(C,Val) ->
-    encode_known_multiplier_string(aligned,'IA5String',C,false,Val).
-decode_IA5String(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'IA5String',C,false).
-
-encode_BMPString(C,Val) ->
-    encode_known_multiplier_string(aligned,'BMPString',C,false,Val).
-decode_BMPString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'BMPString',C,false).
-
-encode_UniversalString(C,Val) ->
-    encode_known_multiplier_string(aligned,'UniversalString',C,false,Val).
-decode_UniversalString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'UniversalString',C,false).
-
-    
-%% end of known-multiplier strings for which PER visible constraints are
-%% applied
-
-encode_GeneralString(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_GeneralString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_GraphicString(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_GraphicString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_ObjectDescriptor(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_ObjectDescriptor(Bytes) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_TeletexString(_C,Val) -> % equivalent with T61String
-    encode_restricted_string(aligned,Val).
-decode_TeletexString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_VideotexString(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_VideotexString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% getBMPChars(Bytes,Len) ->{BMPcharList,RemainingBytes}
-%%
-getBMPChars(Bytes,1) ->
-    {O1,Bytes2} = getbits(Bytes,8),
-    {O2,Bytes3} = getbits(Bytes2,8),
-    if 
-	O1 == 0 ->
-	    {[O2],Bytes3};
-	true ->
-	    {[{0,0,O1,O2}],Bytes3}
-    end;
-getBMPChars(Bytes,Len) ->
-    getBMPChars(Bytes,Len,[]).
-
-getBMPChars(Bytes,0,Acc) ->
-    {lists:reverse(Acc),Bytes};
-getBMPChars(Bytes,Len,Acc) ->
-    {Octs,Bytes1} = getoctets_as_list(Bytes,2),
-    case Octs of
-	[0,O2] ->
-	    getBMPChars(Bytes1,Len-1,[O2|Acc]);
-	[O1,O2]->
-	    getBMPChars(Bytes1,Len-1,[{0,0,O1,O2}|Acc])
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% chars_encode(C,StringType,Value) -> ValueList
-%%
-%% encodes chars according to the per rules taking the constraint PermittedAlphabet 
-%% into account.
-%% This function does only encode the value part and NOT the length
-
-chars_encode(C,StringType,Value) ->
-    case {StringType,get_constraint(C,'PermittedAlphabet')} of
-	{'UniversalString',{_,_Sv}} ->
-	    exit({error,{asn1,{'not implemented',"UniversalString with PermittedAlphabet constraint"}}});
-	{'BMPString',{_,_Sv}} ->
-	    exit({error,{asn1,{'not implemented',"BMPString with PermittedAlphabet constraint"}}});
-	_ ->
-	    {NumBits,CharOutTab} = {get_NumBits(C,StringType),get_CharOutTab(C,StringType)}, 
-	    chars_encode2(Value,NumBits,CharOutTab)
-    end.
-
-chars_encode2([H|T],NumBits,{Min,Max,notab}) when  H =< Max, H >= Min ->
-    [{bits,NumBits,H-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([H|T],NumBits,{Min,Max,Tab}) when H =< Max, H >= Min ->
-    [{bits,NumBits,exit_if_false(H,element(H-Min+1,Tab))}|chars_encode2(T,NumBits,{Min,Max,Tab})];
-chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,notab}) -> 
-    %% no value range check here (ought to be, but very expensive)
-%    [{bits,NumBits,(A*B*C*D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
-    [{bits,NumBits,((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,Tab}) -> 
-    %% no value range check here (ought to be, but very expensive)
-%    [{bits,NumBits,element((A*B*C*D)-Min,Tab)}|chars_encode2(T,NumBits,{Min,Max,notab})];
-    [{bits,NumBits,exit_if_false({A,B,C,D},element(((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min,Tab))}|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([H|_T],_,{_,_,_}) ->
-    exit({error,{asn1,{illegal_char_value,H}}});
-chars_encode2([],_,_) ->
-    [].
-
-exit_if_false(V,false)->
-    exit({error,{asn1,{"illegal value according to Permitted alphabet constraint",V}}});
-exit_if_false(_,V) ->V.
-
-
-get_NumBits(C,StringType) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	{'SingleValue',Sv} ->
-	    charbits(length(Sv),aligned);
-	no ->
-	    case StringType of
-		'IA5String' ->
-		    charbits(128,aligned); % 16#00..16#7F
-		'VisibleString' ->
-		    charbits(95,aligned); % 16#20..16#7E
-		'PrintableString' ->
-		    charbits(74,aligned); % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-		'NumericString' ->
-		    charbits(11,aligned); % $ ,"0123456789"
-		'UniversalString' ->
-		    32;
-		'BMPString' ->
-		    16
-	    end
-    end.
-
-%%Maybe used later
-%%get_MaxChar(C,StringType) ->
-%%    case get_constraint(C,'PermittedAlphabet') of
-%%	{'SingleValue',Sv} ->
-%%	    lists:nth(length(Sv),Sv);
-%%	no ->
-%%	    case StringType of
-%%		'IA5String' ->
-%%		    16#7F; % 16#00..16#7F
-%%		'VisibleString' ->
-%%		    16#7E; % 16#20..16#7E
-%%		'PrintableString' ->
-%%		    $z; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-%%		'NumericString' ->
-%%		    $9; % $ ,"0123456789"
-%%		'UniversalString' ->
-%%		    16#ffffffff;
-%%		'BMPString' ->
-%%		    16#ffff
-%%	    end
-%%    end.
-
-%%Maybe used later
-%%get_MinChar(C,StringType) ->
-%%    case get_constraint(C,'PermittedAlphabet') of
-%%	{'SingleValue',Sv} ->
-%%	    hd(Sv);
-%%	no ->
-%%	    case StringType of
-%%		'IA5String' ->
-%%		    16#00; % 16#00..16#7F
-%%		'VisibleString' ->
-%%		    16#20; % 16#20..16#7E
-%%		'PrintableString' ->
-%%		    $\s; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-%%		'NumericString' ->
-%%		    $\s; % $ ,"0123456789"
-%%		'UniversalString' ->
-%%		    16#00;
-%%		'BMPString' ->
-%%		    16#00
-%%	    end
-%%    end.
-
-get_CharOutTab(C,StringType) ->
-    get_CharTab(C,StringType,out).
-
-get_CharInTab(C,StringType) ->
-    get_CharTab(C,StringType,in).
-
-get_CharTab(C,StringType,InOut) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	{'SingleValue',Sv} ->
-	    get_CharTab2(C,StringType,hd(Sv),lists:max(Sv),Sv,InOut);
-	no ->
-	    case StringType of
-		'IA5String' ->
-		    {0,16#7F,notab};
-		'VisibleString' ->
-		    get_CharTab2(C,StringType,16#20,16#7F,notab,InOut);
-		'PrintableString' ->
-		    Chars = lists:sort(
-			      " '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
-		    get_CharTab2(C,StringType,hd(Chars),lists:max(Chars),Chars,InOut);
-		'NumericString' ->
-		    get_CharTab2(C,StringType,16#20,$9," 0123456789",InOut);
-		'UniversalString' ->
-		    {0,16#FFFFFFFF,notab};
-		'BMPString' ->
-		    {0,16#FFFF,notab}
-	    end
-    end.
-
-get_CharTab2(C,StringType,Min,Max,Chars,InOut) ->
-    BitValMax = (1 bsl get_NumBits(C,StringType))-1,
-    if
-	Max =< BitValMax ->
-	    {0,Max,notab};
-	true ->
-	    case InOut of
-		out ->
-		    {Min,Max,create_char_tab(Min,Chars)};
-		in  ->
-		    {Min,Max,list_to_tuple(Chars)}
-	    end
-    end.
-
-create_char_tab(Min,L) ->
-    list_to_tuple(create_char_tab(Min,L,0)).
-create_char_tab(Min,[Min|T],V) ->
-    [V|create_char_tab(Min+1,T,V+1)];
-create_char_tab(_Min,[],_V) ->
-    [];
-create_char_tab(Min,L,V) ->
-    [false|create_char_tab(Min+1,L,V)].
-
-%% This very inefficient and should be moved to compiletime
-charbits(NumOfChars,aligned) ->
-    case charbits(NumOfChars) of
-	1 -> 1;
-	2 -> 2;
-	B when B =< 4 -> 4;
-	B when B =< 8 -> 8;
-	B when B =< 16 -> 16; 
-	B when B =< 32 -> 32
-    end.
-
-charbits(NumOfChars) when NumOfChars =< 2 -> 1;
-charbits(NumOfChars) when NumOfChars =< 4 -> 2;
-charbits(NumOfChars) when NumOfChars =< 8 -> 3;
-charbits(NumOfChars) when NumOfChars =< 16 -> 4;
-charbits(NumOfChars) when NumOfChars =< 32 -> 5;
-charbits(NumOfChars) when NumOfChars =< 64 -> 6;
-charbits(NumOfChars) when NumOfChars =< 128 -> 7;
-charbits(NumOfChars) when NumOfChars =< 256 -> 8;
-charbits(NumOfChars) when NumOfChars =< 512 -> 9;
-charbits(NumOfChars) when NumOfChars =< 1024 -> 10;
-charbits(NumOfChars) when NumOfChars =< 2048 -> 11;
-charbits(NumOfChars) when NumOfChars =< 4096 -> 12;
-charbits(NumOfChars) when NumOfChars =< 8192 -> 13;
-charbits(NumOfChars) when NumOfChars =< 16384 -> 14;
-charbits(NumOfChars) when NumOfChars =< 32768 -> 15;
-charbits(NumOfChars) when NumOfChars =< 65536 -> 16;
-charbits(NumOfChars) when is_integer(NumOfChars) ->
-    16 + charbits1(NumOfChars bsr 16).
-
-charbits1(0) ->
-    0;
-charbits1(NumOfChars) ->
-    1 + charbits1(NumOfChars bsr 1).
-
-
-chars_decode(Bytes,_,'BMPString',C,Len) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	no ->
-	    getBMPChars(Bytes,Len);
-	_ ->
-	    exit({error,{asn1,
-			 {'not implemented',
-			  "BMPString with PermittedAlphabet constraint"}}})
-    end;
-chars_decode(Bytes,NumBits,StringType,C,Len) ->	
-    CharInTab = get_CharInTab(C,StringType),
-    chars_decode2(Bytes,CharInTab,NumBits,Len).
-
-
-chars_decode2(Bytes,CharInTab,NumBits,Len) ->
-    chars_decode2(Bytes,CharInTab,NumBits,Len,[]).
-
-chars_decode2(Bytes,_CharInTab,_NumBits,0,Acc) ->
-    {lists:reverse(Acc),Bytes};
-chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) when NumBits > 8 ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    Result = 
-	if
-	    Char < 256 -> Char;
-	    true ->
-		list_to_tuple(binary_to_list(<<Char:32>>))
-	end,
-    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Result|Acc]);
-% chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) when NumBits > 8 ->
-%     {Char,Bytes2} = getbits(Bytes,NumBits),
-%     Result = case minimum_octets(Char+Min) of
-% 		 [NewChar] -> NewChar;
-% 		 [C1,C2] -> {0,0,C1,C2};
-% 		 [C1,C2,C3] -> {0,C1,C2,C3};
-% 		 [C1,C2,C3,C4] -> {C1,C2,C3,C4}
-% 	     end,
-%     chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Result|Acc]);
-chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Char+Min|Acc]);
-
-%% BMPString and UniversalString with PermittedAlphabet is currently not supported
-chars_decode2(Bytes,{Min,Max,CharInTab},NumBits,Len,Acc) ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    chars_decode2(Bytes2,{Min,Max,CharInTab},NumBits,Len -1,[element(Char+1,CharInTab)|Acc]).
-
-
-%% UTF8String
-encode_UTF8String(Val) when is_binary(Val) ->
-    [encode_length(undefined,size(Val)),{octets,Val}];
-encode_UTF8String(Val) ->
-    Bin = list_to_binary(Val),
-    encode_UTF8String(Bin).
-
-decode_UTF8String(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-    {list_to_binary(Octs),Bytes3}.
-    
-
-						% X.691:17 
-encode_null(_) -> []. % encodes to nothing
-%encode_null({Name,Val}) when is_atom(Name) ->
-%    encode_null(Val).
-
-decode_null(Bytes) ->
-    {'NULL',Bytes}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_object_identifier(Val) -> CompleteList
-%% encode_object_identifier({Name,Val}) -> CompleteList
-%% Val -> {Int1,Int2,...,IntN} % N >= 2
-%% Name -> atom()
-%% Int1 -> integer(0..2)
-%% Int2 -> integer(0..39) when Int1 (0..1) else integer()
-%% Int3-N -> integer()
-%% CompleteList -> [{bits,8,Val}|{octets,Ol}|align|...]
-%%
-encode_object_identifier({Name,Val}) when is_atom(Name) ->
-    encode_object_identifier(Val);
-encode_object_identifier(Val) ->
-    OctetList = e_object_identifier(Val),
-    Octets = list_to_binary(OctetList), % performs a flatten at the same time
-    [{debug,object_identifier},encode_length(undefined,size(Octets)),{octets,Octets}].
-
-%% This code is copied from asn1_encode.erl (BER) and corrected and modified 
-
-e_object_identifier({'OBJECT IDENTIFIER',V}) ->
-    e_object_identifier(V);
-e_object_identifier({Cname,V}) when is_atom(Cname),is_tuple(V) ->
-    e_object_identifier(tuple_to_list(V));
-e_object_identifier({Cname,V}) when is_atom(Cname),is_list(V) ->
-    e_object_identifier(V);
-e_object_identifier(V) when is_tuple(V) ->
-    e_object_identifier(tuple_to_list(V));
-
-%% E1 = 0|1|2 and (E2 < 40 when E1 = 0|1) 
-e_object_identifier([E1,E2|Tail]) when E1 >= 0, E1 < 2, E2 < 40 ; E1==2 ->
-    Head = 40*E1 + E2,  % weird
-    e_object_elements([Head|Tail],[]);
-e_object_identifier(Oid=[_,_|_Tail]) ->
-    exit({error,{asn1,{'illegal_value',Oid}}}).
-
-e_object_elements([],Acc) ->
-    lists:reverse(Acc);
-e_object_elements([H|T],Acc) ->
-    e_object_elements(T,[e_object_element(H)|Acc]).
-
-e_object_element(Num) when Num < 128 ->
-    [Num];
-e_object_element(Num) ->
-    [e_o_e(Num bsr 7)|[Num band 2#1111111]].
-e_o_e(Num) when Num < 128 ->
-    Num bor 2#10000000;
-e_o_e(Num) ->
-    [e_o_e(Num bsr 7)|[(Num band 2#1111111) bor 2#10000000]].
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_object_identifier(Bytes) -> {ObjId,RemainingBytes}
-%% ObjId -> {integer(),integer(),...} % at least 2 integers
-%% RemainingBytes -> [integer()] when integer() (0..255)
-decode_object_identifier(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-    [First|Rest] = dec_subidentifiers(Octs,0,[]),
-    Idlist = if
-		 First < 40 ->
-		     [0,First|Rest];
-		 First < 80 ->
-		     [1,First - 40|Rest];
-		 true ->
-		     [2,First - 80|Rest]
-	     end,
-    {list_to_tuple(Idlist),Bytes3}.
-
-dec_subidentifiers([H|T],Av,Al) when H >=16#80 ->
-    dec_subidentifiers(T,(Av bsl 7) + (H band 16#7F),Al);
-dec_subidentifiers([H|T],Av,Al) ->
-    dec_subidentifiers(T,0,[(Av bsl 7) + H |Al]);
-dec_subidentifiers([],_Av,Al) ->
-    lists:reverse(Al).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_relative_oid(Val) -> CompleteList
-%% encode_relative_oid({Name,Val}) -> CompleteList
-encode_relative_oid({Name,Val}) when is_atom(Name) ->
-    encode_relative_oid(Val);
-encode_relative_oid(Val) when is_tuple(Val) ->
-    encode_relative_oid(tuple_to_list(Val));
-encode_relative_oid(Val) when is_list(Val) ->
-    Octets = list_to_binary([e_object_element(X)||X <- Val]),
-    [encode_length(undefined,size(Octets)),{octets,Octets}].
-    
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_relative_oid(Val) -> {ROID,Rest}
-%% decode_relative_oid({Name,Val}) -> {ROID,Rest}
-decode_relative_oid(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-    ObjVals = dec_subidentifiers(Octs,0,[]),
-    {list_to_tuple(ObjVals),Bytes3}.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_real(Val) -> CompleteList
-%% encode_real({Name,Val}) -> CompleteList
-encode_real({Name,Val}) when is_atom(Name) ->
-    encode_real(Val);
-encode_real(Real) ->
-    {EncVal,Len} = ?RT_COMMON:encode_real([],Real),
-    [encode_length(undefined,Len),{octets,EncVal}].
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_real(Val) -> {REALvalue,Rest}
-%% decode_real({Name,Val}) -> {REALvalue,Rest}
-decode_real(Bytes) ->
-    {Len,{0,Bytes2}} = decode_length(Bytes,undefined),
-    {RealVal,Rest,Len} = ?RT_COMMON:decode_real(Bytes2,Len),
-    {RealVal,{0,Rest}}.
-    
-
-get_constraint([{Key,V}],Key) ->
-    V;
-get_constraint([],_Key) ->
-    no;
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	    no;
-	{value,{_,V}} -> 
-	    V
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% complete(InList) -> ByteList
-%% Takes a coded list with bits and bytes and converts it to a list of bytes
-%% Should be applied as the last step at encode of a complete ASN.1 type
-%%
-
-% complete(L) ->
-%     case complete1(L) of
-% 	{[],0} ->
-% 	    <<0>>;
-% 	{Acc,0} ->
-% 	    lists:reverse(Acc);
-% 	{[Hacc|Tacc],Acclen}  -> % Acclen >0
-% 	    Rest = 8 - Acclen,
-% 	    NewHacc = Hacc bsl Rest,	       
-% 	    lists:reverse([NewHacc|Tacc])
-%     end.
-
-
-% complete1(InList) when is_list(InList) ->
-%     complete1(InList,[]);
-% complete1(InList) ->
-%     complete1([InList],[]).
-
-% complete1([{debug,_}|T], Acc) ->
-%     complete1(T,Acc);
-% complete1([H|T],Acc) when is_list(H) ->
-%     {NewH,NewAcclen} = complete1(H,Acc),
-%     complete1(T,NewH,NewAcclen);
-
-% complete1([{0,Bin}|T],Acc,0) when is_binary(Bin) ->
-%     complete1(T,[Bin|Acc],0);
-% complete1([{Unused,Bin}|T],Acc,0) when is_integer(Unused),is_binary(Bin) ->
-%     Size = size(Bin)-1,
-%     <<Bs:Size/binary,B>> = Bin,
-%     complete1(T,[(B bsr Unused),Bs|Acc],8-Unused);
-% complete1([{Unused,Bin}|T],[Hacc|Tacc],Acclen) when is_integer(Unused),is_binary(Bin) ->
-%     Rest = 8 - Acclen,
-%     Used = 8 - Unused,
-%     case size(Bin) of
-% 	1 ->
-% 	    if
-% 		Rest >= Used ->
-% 		    <<B:Used,_:Unused>> = Bin,
-% 		    complete1(T,[(Hacc bsl Used) + B|Tacc],
-% 			     (Acclen+Used) rem 8);
-% 		true ->
-% 		    LeftOver = 8 - Rest - Unused,
-% 		    <<Val2:Rest,Val1:LeftOver,_:Unused>> = Bin,
-% 		    complete1(T,[Val1,(Hacc bsl Rest) + Val2|Tacc],
-% 			     (Acclen+Used) rem 8)
-% 	    end;
-% 	N ->
-% 	    if 
-% 		Rest == Used ->
-% 		    N1 = N - 1,
-% 		    <<B:Rest,Bs:N1/binary,_:Unused>> = Bin,
-% 		    complete1(T,[Bs,(Hacc bsl Rest) + B|Tacc],0);
-% 		Rest > Used ->
-% 		    N1 = N - 2,
-% 		    N2 = (8 - Rest) + Used,
-% 		    <<B1:Rest,Bytes:N1/binary,B2:N2,_:Unused>> = Bin,
-% 		    complete1(T,[B2,Bytes,(Hacc bsl Rest) + B1|Tacc],
-% 			     (Acclen + Used) rem 8);
-% 		true -> % Rest < Used
-% 		    N1 = N - 1,
-% 		    N2 = Used - Rest,
-% 		    <<B1:Rest,Bytes:N1/binary,B2:N2,_:Unused>> = Bin,
-% 		    complete1(T,[B2,Bytes,(Hacc bsl Rest) + B1|Tacc],
-% 			     (Acclen + Used) rem 8)
-% 	    end
-%     end;
-	    
-% %complete1([{octets,N,Val}|T],Acc,Acclen) when N =< 4 ,is_integer(Val) ->
-% %    complete1([{octets,<<Val:N/unit:8>>}|T],Acc,Acclen);
-% complete1([{octets,N,Val}|T],Acc,Acclen) when N =< 4 ,is_integer(Val) ->
-%    Newval = case N of
-% 		 1 -> 
-% 		     Val4 = Val band 16#FF,
-% 		     [Val4];
-% 		 2 -> 
-% 		     Val3 = (Val bsr 8) band 16#FF,
-% 		     Val4 = Val band 16#FF,
-% 		     [Val3,Val4];
-% 		 3 ->
-% 		     Val2 = (Val bsr 16) band 16#FF,
-% 		     Val3 = (Val bsr 8) band 16#FF,
-% 		     Val4 = Val band 16#FF,
-% 		     [Val2,Val3,Val4];
-% 		 4 ->
-% 		     Val1 = (Val bsr 24) band 16#FF,
-% 		     Val2 = (Val bsr 16) band 16#FF,
-% 		     Val3 = (Val bsr 8) band 16#FF,
-% 		     Val4 = Val band 16#FF,
-% 		     [Val1,Val2,Val3,Val4]
-% 	     end,
-%    complete1([{octets,Newval}|T],Acc,Acclen);
-
-% complete1([{octets,Bin}|T],Acc,Acclen) when is_binary(Bin) ->
-%     Rest = 8 - Acclen,
-%     if 
-% 	Rest == 8 ->
-% 	    complete1(T,[Bin|Acc],0);
-% 	true ->
-% 	    [Hacc|Tacc]=Acc,
-% 	    complete1(T,[Bin, Hacc bsl Rest|Tacc],0)
-%     end;
-
-% complete1([{octets,Oct}|T],Acc,Acclen) when is_list(Oct) ->
-%     Rest = 8 - Acclen,
-%     if 
-% 	Rest == 8 ->
-% 	    complete1(T,[list_to_binary(Oct)|Acc],0);
-% 	true ->
-% 	    [Hacc|Tacc]=Acc,
-% 	    complete1(T,[list_to_binary(Oct), Hacc bsl Rest|Tacc],0)
-%     end;
-
-% complete1([{bit,Val}|T], Acc, Acclen) ->
-%     complete1([{bits,1,Val}|T],Acc,Acclen);
-% complete1([{octet,Val}|T], Acc, Acclen) ->
-%     complete1([{octets,1,Val}|T],Acc,Acclen);
-
-% complete1([{bits,N,Val}|T], Acc, 0) when N =< 8 ->
-%     complete1(T,[Val|Acc],N);
-% complete1([{bits,N,Val}|T], [Hacc|Tacc], Acclen) when N =< 8 ->
-%     Rest = 8 - Acclen,
-%     if 
-% 	Rest >= N ->
-% 	    complete1(T,[(Hacc bsl N) + Val|Tacc],(Acclen+N) rem 8);
-% 	true -> 
-% 	    Diff = N - Rest, 
-% 	    NewHacc = (Hacc bsl Rest) + (Val bsr Diff),
-% 	    Mask = element(Diff,{1,3,7,15,31,63,127,255}),
-% 	    complete1(T,[(Val band Mask),NewHacc|Tacc],(Acclen+N) rem 8)
-%     end;
-% complete1([{bits,N,Val}|T], Acc, Acclen) -> % N > 8
-%     complete1([{bits,N-8,Val bsr 8},{bits,8,Val band 255}|T],Acc,Acclen);
-
-% complete1([align|T],Acc,0) ->
-%     complete1(T,Acc,0);
-% complete1([align|T],[Hacc|Tacc],Acclen) ->
-%     Rest = 8 - Acclen,
-%     complete1(T,[Hacc bsl Rest|Tacc],0);
-% complete1([{octets,N,Val}|T],Acc,Acclen) when is_list(Val) -> % no security check here 
-%     complete1([{octets,Val}|T],Acc,Acclen);
-
-% complete1([],Acc,Acclen) ->
-%     {Acc,Acclen}.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% complete(InList) -> ByteList
-%% Takes a coded list with bits and bytes and converts it to a list of bytes
-%% Should be applied as the last step at encode of a complete ASN.1 type
-%%
-
-complete(L) ->
-    case complete1(L) of
-	{[],[]} ->
-	    <<0>>;
-	{Acc,[]} ->
-	    Acc;
-	{Acc,Bacc}  ->
-	    [Acc|complete_bytes(Bacc)]
-    end.
-
-%% this function builds the ugly form of lists [E1|E2] to avoid having to reverse it at the end.
-%% this is done because it is efficient and that the result always will be sent on a port or
-%% converted by means of list_to_binary/1
-complete1(InList) when is_list(InList) ->
-    complete1(InList,[],[]);
-complete1(InList) ->
-    complete1([InList],[],[]).
-
-complete1([],Acc,Bacc) ->
-    {Acc,Bacc};
-complete1([H|T],Acc,Bacc) when is_list(H) ->
-    {NewH,NewBacc} = complete1(H,Acc,Bacc),
-    complete1(T,NewH,NewBacc);
-
-complete1([{octets,Bin}|T],Acc,[]) ->
-    complete1(T,[Acc|Bin],[]);
-
-complete1([{octets,Bin}|T],Acc,Bacc) ->
-    complete1(T,[Acc|[complete_bytes(Bacc),Bin]],[]);
-
-complete1([{debug,_}|T], Acc,Bacc) ->
-    complete1(T,Acc,Bacc);
-
-complete1([{bits,N,Val}|T],Acc,Bacc) ->
-    complete1(T,Acc,complete_update_byte(Bacc,Val,N));
-
-complete1([{bit,Val}|T],Acc,Bacc) ->
-    complete1(T,Acc,complete_update_byte(Bacc,Val,1));
-
-complete1([align|T],Acc,[]) ->
-    complete1(T,Acc,[]);
-complete1([align|T],Acc,Bacc) ->
-    complete1(T,[Acc|complete_bytes(Bacc)],[]);
-complete1([{0,Bin}|T],Acc,[]) when is_binary(Bin) ->
-    complete1(T,[Acc|Bin],[]);
-complete1([{Unused,Bin}|T],Acc,[]) when is_integer(Unused),is_binary(Bin) ->
-    Size = size(Bin)-1,
-    <<Bs:Size/binary,B>> = Bin,
-    NumBits = 8-Unused,
-    complete1(T,[Acc|Bs],[[B bsr Unused]|NumBits]);
-complete1([{Unused,Bin}|T],Acc,Bacc) when is_integer(Unused),is_binary(Bin) ->
-    Size = size(Bin)-1,
-    <<Bs:Size/binary,B>> = Bin,
-    NumBits = 8 - Unused,
-    Bf = complete_bytes(Bacc),
-    complete1(T,[Acc|[Bf,Bs]],[[B bsr Unused]|NumBits]).
-
-
-complete_update_byte([],Val,Len) ->
-    complete_update_byte([[0]|0],Val,Len);
-complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) when NumBits + Len == 8 ->
-    [[0,((Byte bsl Len) + Val) band 255|Bacc]|0];
-complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) when NumBits + Len > 8  ->
-    Rem = 8 - NumBits,
-    Rest = Len - Rem,
-    complete_update_byte([[0,((Byte bsl Rem) + (Val bsr Rest)) band 255 |Bacc]|0],Val,Rest);
-complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) ->
-    [[((Byte bsl Len) + Val) band 255|Bacc]|NumBits+Len].
-
- 
-complete_bytes([[_Byte|Bacc]|0]) ->
-    lists:reverse(Bacc);
-complete_bytes([[Byte|Bacc]|NumBytes]) ->
-    lists:reverse([(Byte bsl (8-NumBytes)) band 255|Bacc]);
-complete_bytes([]) ->
-    [].
-
-% complete_bytes(L) ->
-%     complete_bytes1(lists:reverse(L),[],[],0,0).
-
-% complete_bytes1([H={V,B}|T],Acc,ReplyAcc,NumBits,NumFields) when ((NumBits+B) rem 8) == 0 ->
-% 	    NewReplyAcc = [complete_bytes2([H|Acc],0)|ReplyAcc],
-% 	    complete_bytes1(T,[],NewReplyAcc,0,0);
-% complete_bytes1([H={V,B}|T],Acc,ReplyAcc,NumBits,NumFields)  when NumFields == 7; (NumBits+B) div 8 > 0 ->
-%     Rem = (NumBits+B) rem 8,
-%     NewReplyAcc = [complete_bytes2([{V bsr Rem,B - Rem}|Acc],0)|ReplyAcc],
-%     complete_bytes1([{V,Rem}|T],[],NewReplyAcc,0,0);
-% complete_bytes1([H={V,B}|T],Acc,ReplyAcc,NumBits,NumFields)  ->
-%     complete_bytes1(T,[H|Acc],ReplyAcc,NumBits+B,NumFields+1);
-% complete_bytes1([],[],ReplyAcc,_,_) ->
-%     lists:reverse(ReplyAcc);
-% complete_bytes1([],Acc,ReplyAcc,NumBits,_) ->
-%     PadBits = case NumBits rem 8 of
-% 		  0 -> 0;
-% 		  Rem -> 8 - Rem
-% 	      end,
-%     lists:reverse([complete_bytes2(Acc,PadBits)|ReplyAcc]).
-
-
-% complete_bytes2([{V1,B1}],PadBits) ->
-%     <<V1:B1,0:PadBits>>;
-% complete_bytes2([{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,0:PadBits>>;
-% complete_bytes2([{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,V3:B3,0:PadBits>>;
-% complete_bytes2([{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,V3:B3,V4:B4,0:PadBits>>;
-% complete_bytes2([{V5,B5},{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,V3:B3,V4:B4,V5:B5,0:PadBits>>;
-% complete_bytes2([{V6,B6},{V5,B5},{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,V3:B3,V4:B4,V5:B5,V6:B6,0:PadBits>>;
-% complete_bytes2([{V7,B7},{V6,B6},{V5,B5},{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,V3:B3,V4:B4,V5:B5,V6:B6,V7:B7,0:PadBits>>;
-% complete_bytes2([{V8,B8},{V7,B7},{V6,B6},{V5,B5},{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,V3:B3,V4:B4,V5:B5,V6:B6,V7:B7,V8:B8,0:PadBits>>.
-
-    
-    
-    
-
-
diff --git a/lib/asn1/src/asn1rt_per_bin_rt2ct.erl b/lib/asn1/src/asn1rt_per_bin_rt2ct.erl
index 750b59aba6..01e1cb23d7 100644
--- a/lib/asn1/src/asn1rt_per_bin_rt2ct.erl
+++ b/lib/asn1/src/asn1rt_per_bin_rt2ct.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -18,12 +18,11 @@
 %%
 %%
 -module(asn1rt_per_bin_rt2ct).
-
 %% encoding / decoding of PER aligned
 
 -include("asn1_records.hrl").
 
--export([dec_fixup/3, cindex/3, list_to_record/2]).
+-export([dec_fixup/3]).
 -export([setchoiceext/1, setext/1, fixoptionals/3, fixextensions/2, 
 	 getext/1, getextension/2, skipextensions/3, getbit/1, getchoice/3 ]).
 -export([getoptionals/2, getoptionals2/2, 
@@ -88,18 +87,6 @@ dec_fixup([H|T],[Hc|Tc],RemBytes,Acc) ->
 dec_fixup([],_Cnames,RemBytes,Acc) ->
     {lists:reverse(Acc),RemBytes}.
 
-cindex(Ix,Val,Cname) ->
-    case element(Ix,Val) of
-	{Cname,Val2} -> Val2;
-	X -> X
-    end.
-
-%% converts a list to a record if necessary
-list_to_record(_,Tuple) when is_tuple(Tuple) ->
-    Tuple;
-list_to_record(Name,List) when is_list(List) ->
-    list_to_tuple([Name|List]).
-
 %%--------------------------------------------------------
 %% setchoiceext(InRootSet) -> [{bit,X}]
 %% X  is set to  1 when InRootSet==false
@@ -605,19 +592,13 @@ encode_constrained_number({Lb,Ub},Val) when Val >= Lb, Ub >= Val ->
 	Range  =< 65536 ->
 %	    Size = {octets,<<Val2:16>>};
 	    [20,2,<<Val2:16>>];
-	Range =< 16#1000000  ->
-	    Octs = eint_positive(Val2),
-%	    [{bits,2,length(Octs)-1},{octets,Octs}];
-	    Len = length(Octs),
-	    [10,2,Len-1,20,Len,Octs];
-	Range =< 16#100000000  ->
-	    Octs = eint_positive(Val2),
-	    Len = length(Octs),
-	    [10,2,Len-1,20,Len,Octs];
-	Range =< 16#10000000000  ->
-	    Octs = eint_positive(Val2),
-	    Len = length(Octs),
-	    [10,3,Len-1,20,Len,Octs];
+	Range =< (1 bsl (255*8))  ->
+            Octs = binary:encode_unsigned(Val2),
+            RangeOcts = binary:encode_unsigned(Range - 1),
+            OctsLen = erlang:byte_size(Octs),
+            RangeOctsLen = erlang:byte_size(RangeOcts),
+            LengthBitsNeeded = minimum_bits(RangeOctsLen - 1),
+            [10,LengthBitsNeeded,OctsLen-1,20,OctsLen,Octs];
 	true  ->
 	    exit({not_supported,{integer_range,Range}})
     end;
@@ -661,23 +642,27 @@ decode_constrained_number(Buffer,{Lb,_Ub},Range) ->
 		getoctets(Buffer,1);
 	    Range  =< 65536 ->
 		getoctets(Buffer,2);
-	    Range =< 16#1000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,3}),
-		{Octs,Bytes3} = getoctets_as_bin(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	    Range =< 16#100000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,4}),
-		{Octs,Bytes3} = getoctets_as_bin(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	    Range =< 16#10000000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,5}),
-		{Octs,Bytes3} = getoctets_as_bin(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
+            Range =< (1 bsl (255*8))  ->
+                OList = binary:bin_to_list(binary:encode_unsigned(Range - 1)),
+                RangeOctLen = length(OList),
+                {Len, Bytes} = decode_length(Buffer, {1, RangeOctLen}),
+                {Octs, RestBytes} = getoctets_as_bin(Bytes, Len),
+                {binary:decode_unsigned(Octs), RestBytes};
 	    true  ->
 		exit({not_supported,{integer_range,Range}})
 	end,
     {Val+Lb,Remain}.
 
+%% For some reason the minimum bits needed in the length field in
+%% the encoding of constrained whole numbers must always be at least 2?
+minimum_bits(N) when N < 4 -> 2;
+minimum_bits(N) when N < 8 -> 3;
+minimum_bits(N) when N < 16 -> 4;
+minimum_bits(N) when N < 32 -> 5;
+minimum_bits(N) when N < 64 -> 6;
+minimum_bits(N) when N < 128 -> 7;
+minimum_bits(_N) -> 8.
+
 %% X.691:10.8 Encoding of an unconstrained whole number
 
 encode_unconstrained_number(Val) when Val >= 0 ->
@@ -736,17 +721,12 @@ decode_unconstrained_number(Bytes) ->
     {Ints,Bytes3} = getoctets_as_bin(Bytes2,Len),
     {dec_integer(Ints),Bytes3}.
 
-
-dec_pos_integer(Ints) ->
-    decpint(Ints).
 dec_integer(Bin = <<0:1,_:7,_/binary>>) ->  
     decpint(Bin);
 dec_integer(<<_:1,B:7,BitStr/bitstring>>) ->
     Size = bit_size(BitStr),
     <<I:Size>> = BitStr,
     (-128 + B) bsl bit_size(BitStr) bor I.
-
-    
     
 decpint(Bin) ->
     Size = bit_size(Bin),
diff --git a/lib/asn1/src/asn1rt_uper_bin.erl b/lib/asn1/src/asn1rt_uper_bin.erl
index abe178a69e..e1f96416a9 100644
--- a/lib/asn1/src/asn1rt_uper_bin.erl
+++ b/lib/asn1/src/asn1rt_uper_bin.erl
@@ -25,7 +25,6 @@
 
 %%-compile(export_all).
 
- -export([cindex/3, list_to_record/2]).
  -export([setext/1, fixoptionals/3, 
  	 fixextensions/2, 
  	 getext/1, getextension/2, skipextensions/3, getbit/1, getchoice/3 ]).
@@ -65,19 +64,6 @@
 -define('64K',65536).
 
 
-cindex(Ix,Val,Cname) ->
-    case element(Ix,Val) of
-	{Cname,Val2} -> Val2;
-	X -> X
-    end.
-
-%% converts a list to a record if necessary
-list_to_record(_Name,Tuple) when is_tuple(Tuple) ->
-    Tuple;
-list_to_record(Name,List) when is_list(List) ->
-    list_to_tuple([Name|List]).
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% setext(true|false) ->  CompleteList
 %%
diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index 1621abbec9..1794d6bb71 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -83,6 +83,7 @@ MODULES= \
 	testInfObj \
 	testParameterizedInfObj \
 	testMergeCompile \
+	testMultipleLevels \
 	testDeepTConstr \
 	testTimer \
 	testMegaco \
@@ -156,13 +157,13 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/asn1_SUITE_data
-	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) asn1.spec asn1.cover $(INSTALL_PROGS) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	cd asn1_SUITE_data; tar cfh $(RELSYSDIR)/asn1_SUITE_data.tar *
-	cd $(RELSYSDIR)/asn1_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar
-	rm $(RELSYSDIR)/asn1_SUITE_data.tar
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/asn1_SUITE_data"
+	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) asn1.spec asn1.cover $(INSTALL_PROGS) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	cd asn1_SUITE_data; tar cfh "$(RELSYSDIR)/asn1_SUITE_data.tar" *
+	cd "$(RELSYSDIR)/asn1_SUITE_data"; tar xf "$(RELSYSDIR)/asn1_SUITE_data.tar"
+	rm "$(RELSYSDIR)/asn1_SUITE_data.tar"
 
 release_docs_spec:
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 3b9a7532c0..fd5ea15323 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -1,3 +1,4 @@
+%%
 %% %CopyrightBegin%
 %%
 %% Copyright Ericsson AB 2001-2012. All Rights Reserved.
@@ -20,27 +21,17 @@
 -module(asn1_SUITE).
 
 -define(only_per(Func),
-    if  Rule == per orelse Rule == per_bin -> Func;
-        true                               -> ok
+    if Rule =:= per -> Func;
+       true -> ok
     end).
 -define(only_ber(Func),
-    if  Rule == ber orelse Rule == ber_bin orelse Rule == ber_bin_v2 -> Func;
-        true                                                         -> ok
+    if Rule =:= ber -> Func;
+       true -> ok
     end).
 -define(only_uper(Func),
     case Rule of
-        uper_bin -> Func;
-        _        -> ok
-    end).
--define(only_per_nif(Func),
-    case {Rule, lists:member(optimize, Opts)} of
-        {per_bin, true} -> Func;
-        _               -> ok
-    end).
--define(only_ber_nif(Func),
-    case {Rule, lists:member(nif, Opts)} of
-        {ber_bin_v2, true} -> Func;
-        _               -> ok
+        uper -> Func;
+        _ -> ok
     end).
 
 -compile(export_all).
@@ -54,7 +45,8 @@
 suite() -> [{ct_hooks, [ts_install_cth]}].
 
 all() ->
-    [{group, parallel},
+    [{group, compile},
+     {group, parallel},
      {group, app_test},
      {group, appup_test},
 
@@ -75,16 +67,14 @@ groups() ->
      {ber, parallel([]),
       [ber_choiceinseq,
        % Uses 'SOpttest'
-       {group, [], [ber_optional,
-                    ber_optional_keyed_list]}]},
+       ber_optional]},
 
      {app_test, [], [{asn1_app_test, all}]},
 
      {appup_test, [], [{asn1_appup_test, all}]},
 
      {parallel, parallel([]),
-      [{group, compile},
-       {group, ber},
+      [{group, ber},
        % Uses 'P-Record', 'Constraints', 'MEDIA-GATEWAY-CONTROL'...
        {group, [], [parse,
                     test_driver_load,
@@ -115,6 +105,7 @@ groups() ->
        testChoTypeRefPrim,
        testChoTypeRefSeq,
        testChoTypeRefSet,
+       testMultipleLevels,
        testDef,
        testOpt,
        testSeqDefault,
@@ -202,13 +193,8 @@ groups() ->
 
      {performance, [],
       [testTimer_ber,
-       testTimer_ber_bin,
-       testTimer_ber_bin_opt,
-       testTimer_ber_bin_opt_driver,
        testTimer_per,
-       testTimer_per_bin,
-       testTimer_per_bin_opt,
-       testTimer_uper_bin,
+       testTimer_uper,
        smp]}].
 
 parallel(Options) ->
@@ -242,14 +228,13 @@ init_per_testcase(Func, Config) ->
     true = code:add_patha(CaseDir),
 
     Dog = case Func of
-              testX420 -> test_server:timetrap({minutes, 90});
-              _        -> test_server:timetrap({minutes, 60})
+              testX420 -> ct:timetrap({minutes, 90});
+              _        -> ct:timetrap({minutes, 60})
           end,
     [{case_dir, CaseDir}, {watchdog, Dog}|Config].
 
 end_per_testcase(_Func, Config) ->
-    true = code:del_path(?config(case_dir, Config)),
-    test_server:timetrap_cancel(?config(watchdog, Config)).
+    code:del_path(?config(case_dir, Config)).
 
 %%------------------------------------------------------------------------------
 %% Test runners
@@ -257,14 +242,8 @@ end_per_testcase(_Func, Config) ->
 
 test(Config, TestF) ->
     test(Config, TestF, [per,
-                         per_bin,
-                         {per_bin, [optimize]},
-                         uper_bin,
-                         ber,
-                         ber_bin,
-                         ber_bin_v2,
-                         % TODO: {ber_bin_v2, [optimize, nif]} ?
-                         {ber_bin_v2, [nif]}]).
+                         uper,
+                         ber]).
 
 test(Config, TestF, Rules) ->
     Fun = fun(C, R, O) ->
@@ -344,10 +323,10 @@ testCompactBitString(Config, Rule, Opts) ->
     testCompactBitString:compact_bit_string(Rule),
     ?only_uper(testCompactBitString:bit_string_unnamed(Rule)),
     ?only_per(testCompactBitString:bit_string_unnamed(Rule)),
-    ?only_per_nif(testCompactBitString:ticket_7734(Rule)),
-    ?only_per_nif(asn1_test_lib:compile("Constraints", Config,
+    ?only_per(testCompactBitString:ticket_7734(Rule)),
+    ?only_per(asn1_test_lib:compile("Constraints", Config,
                                         [Rule, compact_bit_string|Opts])),
-    ?only_per_nif(testCompactBitString:otp_4869(Rule)).
+    ?only_per(testCompactBitString:otp_4869(Rule)).
 
 testPrimStrings(Config) -> test(Config, fun testPrimStrings/3).
 testPrimStrings(Config, Rule, Opts) ->
@@ -371,10 +350,10 @@ testPrimExternal(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(["External", "PrimExternal"], Config,
                               [Rule|Opts]),
     testPrimExternal:external(Rule),
-    ?only_ber_nif(asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config,
+    ?only_ber(asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config,
                                             [Rule|Opts])),
-    ?only_ber_nif(testPrimStrings_cases(Rule)),
-    ?only_ber_nif(testPrimStrings:more_strings(Rule)).
+    ?only_ber(testPrimStrings_cases(Rule)),
+    ?only_ber(testPrimStrings:more_strings(Rule)).
 
 testChoPrim(Config) -> test(Config, fun testChoPrim/3).
 testChoPrim(Config, Rule, Opts) ->
@@ -399,7 +378,7 @@ testChoOptional(Config, Rule, Opts) ->
 
 testChoOptionalImplicitTag(Config) ->
     test(Config, fun testChoOptionalImplicitTag/3,
-             [ber, ber_bin, ber_bin_v2]).
+	 [ber]).
 testChoOptionalImplicitTag(Config, Rule, Opts) ->
     %% Only meaningful for ber & co
     asn1_test_lib:compile("ChoOptionalImplicitTag", Config, [Rule|Opts]),
@@ -430,6 +409,11 @@ testChoTypeRefSet(Config, Rule, Opts) ->
     asn1_test_lib:compile("ChoTypeRefSet", Config, [Rule|Opts]),
     testChoTypeRefSet:set(Rule).
 
+testMultipleLevels(Config) -> test(Config, fun testMultipleLevels/3).
+testMultipleLevels(Config, Rule, Opts) ->
+    asn1_test_lib:compile("MultipleLevels", Config, [Rule|Opts]),
+    testMultipleLevels:main(Rule).
+
 testDef(Config) -> test(Config, fun testDef/3).
 testDef(Config, Rule, Opts) ->
     asn1_test_lib:compile("Def", Config, [Rule|Opts]),
@@ -515,8 +499,7 @@ testSeqOfCho(Config, Rule, Opts) ->
     testSeqOfCho:main(Rule).
 
 testSeqOfIndefinite(Config) ->
-    test(Config, fun testSeqOfIndefinite/3,
-             [ber, ber_bin, ber_bin_v2, {ber_bin_v2, [nif]}]).
+    test(Config, fun testSeqOfIndefinite/3, [ber]).
 testSeqOfIndefinite(Config, Rule, Opts) ->
     Files = ["Mvrasn-Constants-1", "Mvrasn-DataTypes-1", "Mvrasn-21-4",
              "Mvrasn-20-4", "Mvrasn-19-4", "Mvrasn-18-4", "Mvrasn-17-4",
@@ -632,13 +615,12 @@ c_syntax(Config) ->
              "SeqBadComma"]].
 
 c_string(Config) ->
-    test(Config, fun c_string/3, [per, per_bin, ber, ber_bin, ber_bin_v2]).
+    test(Config, fun c_string/3, [per, ber]).
 c_string(Config, Rule, Opts) ->
     asn1_test_lib:compile("String", Config, [Rule|Opts]).
 
 c_implicit_before_choice(Config) ->
-    test(Config, fun c_implicit_before_choice/3,
-             [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun c_implicit_before_choice/3, [ber]).
 c_implicit_before_choice(Config, Rule, Opts) ->
     DataDir = ?config(data_dir, Config),
     CaseDir = ?config(case_dir, Config),
@@ -649,12 +631,13 @@ parse(Config) ->
     [asn1_test_lib:compile(M, Config, [abs]) || M <- test_modules()].
 
 per(Config) ->
-    test(Config, fun per/3, [per, per_bin, {per_bin, [optimize]}]).
+    test(Config, fun per/3, [per]).
 per(Config, Rule, Opts) ->
     [module_test(M, Config, Rule, Opts) || M <- per_modules()].
 
 ber_other(Config) ->
-    test(Config, fun ber_other/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun ber_other/3, [ber]).
+
 ber_other(Config, Rule, Opts) ->
     [module_test(M, Config, Rule, Opts) || M <- ber_modules()].
 
@@ -669,12 +652,12 @@ module_test(M, Config, Rule, Opts) ->
 
 
 ber_choiceinseq(Config) ->
-    test(Config, fun ber_choiceinseq/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun ber_choiceinseq/3, [ber]).
 ber_choiceinseq(Config, Rule, Opts) ->
     asn1_test_lib:compile("ChoiceInSeq", Config, [Rule|Opts]).
 
 ber_optional(Config) ->
-    test(Config, fun ber_optional/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun ber_optional/3, [ber]).
 ber_optional(Config, Rule, Opts) ->
     asn1_test_lib:compile("SOpttest", Config, [Rule|Opts]),
     V = {'S', {'A', 10, asn1_NOVALUE, asn1_NOVALUE},
@@ -685,21 +668,6 @@ ber_optional(Config, Rule, Opts) ->
     V2 = asn1_wrapper:decode('SOpttest', 'S', Bytes),
     V = element(2, V2).
 
-ber_optional_keyed_list(Config) ->
-    test(Config, fun ber_optional_keyed_list/3, [ber, ber_bin]).
-ber_optional_keyed_list(Config, Rule, Opts) ->
-    asn1_test_lib:compile("SOpttest", Config, [Rule, keyed_list|Opts]),
-    Vrecord = {'S', {'A', 10,           asn1_NOVALUE, asn1_NOVALUE},
-        {'B', asn1_NOVALUE, asn1_NOVALUE, asn1_NOVALUE},
-        {'C', asn1_NOVALUE, 111,          asn1_NOVALUE}},
-    V = [{a, [{scriptKey, 10}]},
-        {b, []},
-        {c, [{callingPartysCategory, 111}]}],
-    {ok, B} = asn1_wrapper:encode('SOpttest', 'S', V),
-    Bytes = lists:flatten(B),
-    V2 = asn1_wrapper:decode('SOpttest', 'S', Bytes),
-    Vrecord = element(2, V2).
-
 %% records used by test-case default
 -record('Def1', {bool0,
                  bool1 = asn1_DEFAULT,
@@ -734,7 +702,7 @@ value_bad_enum_test(Config) ->
     end.
 
 constructed(Config) ->
-    test(Config, fun constructed/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun constructed/3, [ber]).
 constructed(Config, Rule, Opts) ->
     asn1_test_lib:compile("Constructed", Config, [Rule|Opts]),
     {ok, B} = asn1_wrapper:encode('Constructed', 'S', {'S', false}),
@@ -745,7 +713,7 @@ constructed(Config, Rule, Opts) ->
     [136, 1, 10] = lists:flatten(B2).
 
 ber_decode_error(Config) ->
-    test(Config, fun ber_decode_error/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun ber_decode_error/3, [ber]).
 ber_decode_error(Config, Rule, Opts) ->
     asn1_test_lib:compile("Constructed", Config, [Rule|Opts]),
     ber_decode_error:run(Opts).
@@ -758,14 +726,14 @@ h323test(Config, Rule, Opts) ->
     h323test:run(Rule).
 
 per_GeneralString(Config) ->
-    test(Config, fun per_GeneralString/3, [per, per_bin]).
+    test(Config, fun per_GeneralString/3, [per]).
 per_GeneralString(Config, Rule, Opts) ->
     asn1_test_lib:compile("MULTIMEDIA-SYSTEM-CONTROL", Config, [Rule|Opts]),
     UI = [109, 64, 1, 57],
     {ok, _V} = asn1_wrapper:decode('MULTIMEDIA-SYSTEM-CONTROL',
                                    'MultimediaSystemControlMessage', UI).
 
-per_open_type(Config) -> test(Config, fun per_open_type/3, [per, per_bin]).
+per_open_type(Config) -> test(Config, fun per_open_type/3, [per]).
 per_open_type(Config, Rule, Opts) ->
     asn1_test_lib:compile("OpenType", Config, [Rule|Opts]),
     {ok, _} = asn1ct:test('OpenType', 'Ot', {'Stype', 10, true}).
@@ -773,28 +741,29 @@ per_open_type(Config, Rule, Opts) ->
 testConstraints(Config) -> test(Config, fun testConstraints/3).
 testConstraints(Config, Rule, Opts) ->
     asn1_test_lib:compile("Constraints", Config, [Rule|Opts]),
+    asn1_test_lib:compile("LargeConstraints", Config, [Rule|Opts]),
     testConstraints:int_constraints(Rule).
 
 
 testSeqIndefinite(Config) ->
-    test(Config, fun testSeqIndefinite/3, [ber, ber_bin, ber_bin_v2,
-                                               {ber_bin_v2, [nif]}]).
+    test(Config, fun testSeqIndefinite/3, [ber]).
+
 testSeqIndefinite(Config, Rule, Opts) ->
     asn1_test_lib:compile("SeqSetIndefinite", Config, [Rule|Opts]),
     testSeqIndefinite:main(Rule).
 
 
 testSetIndefinite(Config) ->
-    test(Config, fun testSetIndefinite/3, [ber, ber_bin, ber_bin_v2,
-                                               {ber_bin_v2, [nif]}]).
+    test(Config, fun testSetIndefinite/3, [ber]).
+
 testSetIndefinite(Config, Rule, Opts) ->
     asn1_test_lib:compile("SeqSetIndefinite", Config, [Rule|Opts]),
     testSetIndefinite:main(Rule).
 
 
 testChoiceIndefinite(Config) ->
-    test(Config, fun testChoiceIndefinite/3, [ber, ber_bin, ber_bin_v2,
-                                                  {ber_bin_v2, [nif]}]).
+    test(Config, fun testChoiceIndefinite/3, [ber]).
+
 testChoiceIndefinite(Config, Rule, Opts) ->
     asn1_test_lib:compile("ChoiceIndef", Config, [Rule|Opts]),
     testChoiceIndefinite:main(Rule).
@@ -856,7 +825,7 @@ testExport(Config) ->
     end.
 
 testImport(Config) ->
-    test(Config, fun testImport/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun testImport/3, [ber]).
 testImport(Config, Rule, Opts) ->
     {error, _} = asn1ct:compile(filename:join(?config(data_dir, Config),
                                               "ImportsFrom"),
@@ -905,8 +874,7 @@ duplicate_tags(Config) ->
             {skip, "Runs in asn1_SUITE only"}
     end.
 
-rtUI(Config) -> test(Config, fun rtUI/3, [per, per_bin, ber,
-            ber_bin, ber_bin_v2]).
+rtUI(Config) -> test(Config, fun rtUI/3, [per,ber]).
 rtUI(Config, Rule, Opts) ->
     asn1_test_lib:compile("Prim", Config, [Rule|Opts]),
     {ok, _} = asn1rt:info('Prim').
@@ -922,19 +890,19 @@ testINSTANCE_OF(Config, Rule, Opts) ->
     testINSTANCE_OF:main(Rule).
 
 testTCAP(Config) ->
-    test(Config, fun testTCAP/3,
-             [ber, ber_bin, ber_bin_v2, {ber_bin_v2, [nif]}]).
+    test(Config, fun testTCAP/3, [ber]).
 testTCAP(Config, Rule, Opts) ->
     testTCAP:compile(Config, [Rule|Opts]),
     testTCAP:test(Rule, Config),
     case Rule of
-        ber_bin_v2 -> testTCAP:compile_asn1config(Config, [Rule, asn1config]),
-                      testTCAP:test_asn1config();
-        _          -> ok
+        ber ->
+	    testTCAP:compile_asn1config(Config, [Rule, asn1config]),
+	    testTCAP:test_asn1config();
+        _ -> ok
     end.
 
 testDER(Config) ->
-    test(Config, fun testDER/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun testDER/3, [ber]).
 testDER(Config, Rule, Opts) ->
     asn1_test_lib:compile("DERSpec", Config, [Rule, der|Opts]),
     testDER:test(),
@@ -944,7 +912,7 @@ testDER(Config, Rule, Opts) ->
     testSeqSetDefaultVal:main(Rule).
 
 specialized_decodes(Config) ->
-    test(Config, fun specialized_decodes/3, [ber_bin_v2]).
+    test(Config, fun specialized_decodes/3, [ber]).
 specialized_decodes(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(["PartialDecSeq.asn",
                                "PartialDecSeq2.asn",
@@ -952,13 +920,12 @@ specialized_decodes(Config, Rule, Opts) ->
                                "PartialDecMyHTTP.asn",
                                "MEDIA-GATEWAY-CONTROL.asn",
                                "P-Record"],
-                              Config, [Rule, optimize, asn1config|Opts]),
+                              Config, [Rule, asn1config|Opts]),
     test_partial_incomplete_decode:test(Config),
     test_selective_decode:test().
 
 special_decode_performance(Config) ->
-    test(Config, fun special_decode_performance/3,
-             [{ber_bin, [optimize]}, {ber_bin_v2, [optimize, nif]}]).
+    test(Config, fun special_decode_performance/3, [ber]).
 special_decode_performance(Config, Rule, Opts) ->
     Files = ["MEDIA-GATEWAY-CONTROL", "PartialDecSeq"],
     asn1_test_lib:compile_all(Files, Config, [Rule, asn1config|Opts]),
@@ -966,19 +933,19 @@ special_decode_performance(Config, Rule, Opts) ->
 
 
 test_driver_load(Config) ->
-    test(Config, fun test_driver_load/3, [{per_bin, [optimize]}]).
+    test(Config, fun test_driver_load/3, [per]).
 test_driver_load(Config, Rule, Opts) ->
     asn1_test_lib:compile("P-Record", Config, [Rule|Opts]),
     test_driver_load:test(5).
 
 test_ParamTypeInfObj(Config) ->
-    asn1_test_lib:compile("IN-CS-1-Datatypes", Config, [ber_bin]).
+    asn1_test_lib:compile("IN-CS-1-Datatypes", Config, [ber]).
 
 test_WS_ParamClass(Config) ->
-    asn1_test_lib:compile("InformationFramework", Config, [ber_bin]).
+    asn1_test_lib:compile("InformationFramework", Config, [ber]).
 
 test_Defed_ObjectIdentifier(Config) ->
-    asn1_test_lib:compile("UsefulDefinitions", Config, [ber_bin]).
+    asn1_test_lib:compile("UsefulDefinitions", Config, [ber]).
 
 testSelectionType(Config) -> test(Config, fun testSelectionType/3).
 testSelectionType(Config, Rule, Opts) ->
@@ -986,7 +953,7 @@ testSelectionType(Config, Rule, Opts) ->
     {ok, _}  = testSelectionTypes:test().
 
 testSSLspecs(Config) ->
-    test(Config, fun testSSLspecs/3, [ber, ber_bin, ber_bin_v2, {ber_bin_v2, [optimize]}]).
+    test(Config, fun testSSLspecs/3, [ber]).
 testSSLspecs(Config, Rule, Opts) ->
     ok = testSSLspecs:compile(Config,
                               [Rule, compact_bit_string, der|Opts]),
@@ -1010,12 +977,12 @@ test_undecoded_rest(Config, Rule, Opts) ->
     ok = test_undecoded_rest:test([], Config),
     asn1_test_lib:compile("P-Record", Config, [Rule,undec_rest|Opts]),
     case Rule of
-        ber_bin_v2 -> ok;
+        ber -> ok;
         _ -> test_undecoded_rest:test(undec_rest, Config)
     end.
 
 test_inline(Config) ->
-    test(Config, fun test_inline/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun test_inline/3, [ber]).
 test_inline(Config, Rule, Opts) ->
     case code:which(asn1ct) of
         cover_compiled ->
@@ -1028,12 +995,11 @@ test_inline(Config, Rule, Opts) ->
     end.
 
 testTcapsystem(Config) ->
-    test(Config, fun testTcapsystem/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun testTcapsystem/3, [ber]).
 testTcapsystem(Config, Rule, Opts) ->
     testTcapsystem:compile(Config, [Rule|Opts]).
 
-testNBAPsystem(Config) -> test(Config, fun testNBAPsystem/3,
-        [per, per_bin, {per_bin, [optimize]}]).
+testNBAPsystem(Config) -> test(Config, fun testNBAPsystem/3, [per]).
 testNBAPsystem(Config, Rule, Opts) ->
     testNBAPsystem:compile(Config, [Rule|Opts]),
     testNBAPsystem:test(Rule, Config).
@@ -1063,21 +1029,23 @@ test_modified_x420(Config) ->
     asn1_test_lib:compile_all(Files, Config, [der]),
     test_modified_x420:test_io(Config).
 
+
+testX420() ->
+    [{timetrap,{minutes,90}}].
 testX420(Config) ->
-    test(Config, fun testX420/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun testX420/3, [ber]).
 testX420(Config, Rule, Opts) ->
     testX420:compile(Rule, [der|Opts], Config),
     ok = testX420:ticket7759(Rule, Config),
     testX420:compile(Rule, Opts, Config).
 
 test_x691(Config) ->
-    test(Config, fun test_x691/3,
-             [per, per_bin, uper_bin, {per_bin, [optimize]}]).
+    test(Config, fun test_x691/3, [per, uper]).
 test_x691(Config, Rule, Opts) ->
     Files = ["P-RecordA1", "P-RecordA2", "P-RecordA3"],
     asn1_test_lib:compile_all(Files, Config, [Rule|Opts]),
     test_x691:cases(Rule, case Rule of
-                              uper_bin -> unaligned;
+                              uper -> unaligned;
                               _ -> aligned
                           end),
     asn1_test_lib:ticket_7708(Config, []),
@@ -1088,8 +1056,7 @@ ticket_6143(Config) ->
 
 testExtensionAdditionGroup(Config) ->
     %% FIXME problems with automatic tags [ber_bin], [ber_bin, optimize]
-    test(Config, fun testExtensionAdditionGroup/3,
-             [per_bin, {per_bin, [optimize]}, uper_bin]).
+    test(Config, fun testExtensionAdditionGroup/3, [per, uper]).
 testExtensionAdditionGroup(Config, Rule, Opts) ->
     asn1_test_lib:compile("Extension-Addition-Group", Config, [Rule|Opts]),
     asn1_test_lib:compile_erlang("extensionAdditionGroup", Config,
@@ -1178,46 +1145,17 @@ timer_compile(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(["H235-SECURITY-MESSAGES", "H323-MESSAGES"],
                               Config, [Rule|Opts]).
 
-testTimer_ber(suite) -> [];
 testTimer_ber(Config) ->
     timer_compile(Config,ber,[]),
     testTimer:go(Config,ber).
 
-testTimer_ber_bin(suite) -> [];
-testTimer_ber_bin(Config) ->
-    timer_compile(Config,ber_bin,[]),
-    testTimer:go(Config,ber_bin).
-
-testTimer_ber_bin_opt(suite) -> [];
-testTimer_ber_bin_opt(Config) ->
-    timer_compile(Config,ber_bin,[optimize]),
-    testTimer:go(Config,ber_bin).
-
-testTimer_ber_bin_opt_driver(suite) -> [];
-testTimer_ber_bin_opt_driver(Config) ->
-    timer_compile(Config,ber_bin,[optimize,driver]),
-    testTimer:go(Config,ber_bin).
-
-testTimer_per(suite) -> [];
 testTimer_per(Config) ->
     timer_compile(Config,per,[]),
     testTimer:go(Config,per).
 
-testTimer_per_bin(suite) -> [];
-testTimer_per_bin(Config) ->
-    timer_compile(Config,per_bin,[]),
-    testTimer:go(Config,per_bin).
-
-testTimer_per_bin_opt(suite) -> [];
-testTimer_per_bin_opt(Config) ->
-    timer_compile(Config,per_bin,[optimize]),
-    testTimer:go(Config,per_bin).
-
-
-testTimer_uper_bin(suite) -> [];
-testTimer_uper_bin(Config) ->
-    timer_compile(Config,uper_bin,[]),
-    {comment,_} = testTimer:go(Config,uper_bin).
+testTimer_uper(Config) ->
+    timer_compile(Config,uper,[]),
+    {comment,_} = testTimer:go(Config,uper).
 
 %% Test of multiple-line comment, OTP-8043
 testComment(suite) -> [];
@@ -1236,14 +1174,35 @@ testName2Number(Config) ->
 
     0 = 'S1AP-IEs':name2num_CauseMisc('control-processing-overload'),
     'unknown-PLMN' = 'S1AP-IEs':num2name_CauseMisc(5),
+
+    %% OTP-10144
+    %% Test that n2n option generates name2num and num2name functions supporting
+    %% values not within the extension root if the enumeration type has an
+    %% extension marker.
+    N2NOptionsExt = [{n2n, 'NoExt'}, {n2n, 'Ext'}, {n2n, 'Ext2'}],
+    asn1_test_lib:compile("EnumN2N", Config, N2NOptionsExt),
+    %% Previously, name2num and num2name was not generated if the type didn't
+    %% have an extension marker:
+    0 = 'EnumN2N':name2num_NoExt('blue'),
+    2 = 'EnumN2N':name2num_NoExt('green'),
+    blue = 'EnumN2N':num2name_NoExt(0),
+    green = 'EnumN2N':num2name_NoExt(2),
+
+    %% Test enumeration extension:
+    7 = 'EnumN2N':name2num_Ext2('orange'),
+    orange = 'EnumN2N':num2name_Ext2(7),
+    %% 7 is not defined in Ext, only in Ext2.
+    {asn1_enum, 7} = 'EnumN2N':num2name_Ext(7),
+    7 = 'EnumN2N':name2num_Ext({asn1_enum, 7}),
+    42 = 'EnumN2N':name2num_Ext2({asn1_enum, 42}),
     ok.
 
 ticket_7407(Config) ->
-    asn1_test_lib:compile("EUTRA-extract-7407", Config, [uper_bin]),
+    asn1_test_lib:compile("EUTRA-extract-7407", Config, [uper]),
     asn1_test_lib:ticket_7407_code(true),
 
     asn1_test_lib:compile("EUTRA-extract-7407", Config,
-                          [uper_bin, no_final_padding]),
+                          [uper, no_final_padding]),
     asn1_test_lib:ticket_7407_code(false).
 
 smp(suite) -> [];
@@ -1254,7 +1213,7 @@ smp(Config)  ->
             io:format("smp starting ~p workers\n",[NumOfProcs]),
 
             Msg = {initiatingMessage, testNBAPsystem:cell_setup_req_msg()},
-            ok = testNBAPsystem:compile(Config, [per_bin, optimize]),
+            ok = testNBAPsystem:compile(Config, [per]),
 
             enc_dec(NumOfProcs,Msg,2),
 
@@ -1263,7 +1222,7 @@ smp(Config)  ->
             {Time1,ok} = timer:tc(?MODULE,enc_dec,[NumOfProcs,Msg, N]),
             {Time1S,ok} = timer:tc(?MODULE,enc_dec,[1, Msg, NumOfProcs * N]),
 
-            ok = testNBAPsystem:compile(Config, [ber_bin, optimize, nif]),
+            ok = testNBAPsystem:compile(Config, [ber]),
             {Time3,ok} = timer:tc(?MODULE,enc_dec,[NumOfProcs,Msg, N]),
 
             {Time3S,ok} = timer:tc(?MODULE,enc_dec,[1, Msg, NumOfProcs * N]),
@@ -1284,10 +1243,8 @@ per_performance(Config) ->
     file:make_dir(NifDir),file:make_dir(ErlDir),
 
     Msg = {initiatingMessage, testNBAPsystem:cell_setup_req_msg()},
-    ok = testNBAPsystem:compile([{priv_dir,NifDir}|Config],
-                                      [per_bin, optimize]),
-    ok = testNBAPsystem:compile([{priv_dir,ErlDir}|Config],
-                                      [per_bin]),
+    ok = testNBAPsystem:compile([{priv_dir,NifDir}|Config], [per]),
+    ok = testNBAPsystem:compile([{priv_dir,ErlDir}|Config], [per]),
 
     Modules = ['NBAP-CommonDataTypes',
                'NBAP-Constants',
@@ -1325,7 +1282,7 @@ per_performance(Config) ->
 ber_performance(Config) ->
 
     Msg = {initiatingMessage, testNBAPsystem:cell_setup_req_msg()},
-    ok = testNBAPsystem:compile(Config, [ber_bin, optimize, nif]),
+    ok = testNBAPsystem:compile(Config, [ber]),
 
 
     BerFun = fun() ->
@@ -1499,7 +1456,7 @@ pforeach(_Fun,[],[]) ->
 -record('Iu-ReleaseCommand',{first,second}).
 
 ticket7904(Config) ->
-    asn1_test_lib:compile("RANAPextract1", Config, [per_bin, optimize]),
+    asn1_test_lib:compile("RANAPextract1", Config, [per]),
 
     Val1 = #'InitiatingMessage'{procedureCode=1,
                                 criticality=ignore,
diff --git a/lib/asn1/test/asn1_SUITE_data/Constraints.py b/lib/asn1/test/asn1_SUITE_data/Constraints.py
index de48c4c2ca..87243121f7 100644
--- a/lib/asn1/test/asn1_SUITE_data/Constraints.py
+++ b/lib/asn1/test/asn1_SUITE_data/Constraints.py
@@ -4,9 +4,14 @@ BEGIN
 -- Single Value
 SingleValue ::= INTEGER (1)
 SingleValue2 ::= INTEGER (1..20)
+predefined INTEGER ::= 1
+SingleValue3 ::= INTEGER (predefined | 5 | 10)
 Range2to19 ::= INTEGER (1<..<20)
 Range10to20 ::= INTEGER (10..20)
 ContainedSubtype ::= INTEGER (INCLUDES Range10to20)
+-- Some ranges for additional constrained number testing.
+LongLong ::= INTEGER (0..18446744073709551615)
+Range256to65536 ::= INTEGER (256..65536)
 FixedSize ::= OCTET STRING (SIZE(10)) 
 FixedSize2 ::= OCTET STRING (SIZE(10|20)) 
 VariableSize ::= OCTET STRING (SIZE(1..10)) 
diff --git a/lib/asn1/test/asn1_SUITE_data/EnumN2N.asn1 b/lib/asn1/test/asn1_SUITE_data/EnumN2N.asn1
new file mode 100644
index 0000000000..a724f2f3f5
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/EnumN2N.asn1
@@ -0,0 +1,25 @@
+EnumN2N DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+
+NoExt ::= ENUMERATED {
+	blue(0),
+	red(1),
+	green(2)
+}
+
+Ext ::= ENUMERATED {
+	blue(0),
+	red(1),
+	green(2),
+	...
+}
+
+Ext2 ::= ENUMERATED {
+	blue(0),
+	red(1),
+	green(2),
+	...,
+	orange(7)
+}
+
+END
diff --git a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
index fc244c30a2..55124f9449 100644
--- a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
+++ b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
@@ -1,7 +1,7 @@
 --
 -- %CopyrightBegin%
 --
--- Copyright Ericsson AB 2001-2010. All Rights Reserved.
+-- Copyright Ericsson AB 2001-2012. All Rights Reserved.
 --
 -- The contents of this file are subject to the Erlang Public License,
 -- Version 1.1, (the "License"); you may not use this file except in
@@ -79,4 +79,22 @@ Ax3 ::= SEQUENCE {
 }
 
 -- { a 253, b TRUE, s {sa 17, sb TRUE, sextaddgroup 11}}
+
+-- This is to test the case with more than one ExtensionAdditionGroup
+-- which did not work before
+
+AS-Config ::=				SEQUENCE {
+        a INTEGER,
+        b BOOLEAN,
+        c OCTET STRING,
+	...,
+	[[	sourceSystemInformationBlockType1Ext	OCTET STRING OPTIONAL,
+		sourceOtherConfig-r9			INTEGER
+	]],
+	[[	sourceSCellConfigList-r10	OCTET STRING OPTIONAL
+	]]
+}
+
+
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/LargeConstraints.py b/lib/asn1/test/asn1_SUITE_data/LargeConstraints.py
new file mode 100644
index 0000000000..68c7616b62
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/LargeConstraints.py
@@ -0,0 +1,9 @@
+LargeConstraints DEFINITIONS ::=
+BEGIN
+
+-- Maximum number that can be encoded as a constrained whole number: 1 bsl (255*8)
+-- The number of octets needed to represent a number cannot be more than 255
+-- As the length field is encoded as a 8-bit bitfield.
+RangeMax ::= INTEGER (1..126238304966058622268417487065116999845484776053576109500509161826268184136202698801551568013761380717534054534851164138648904527931605160527688095259563605939964364716019515983399209962459578542172100149937763938581219604072733422507180056009672540900709554109516816573779593326332288314873251559077853068444977864803391962580800682760017849589281937637993445539366428356761821065267423102149447628375691862210717202025241630303118559188678304314076943801692528246980959705901641444238894928620825482303431806955690226308773426829503900930529395181208739591967195841536053143145775307050594328881077553168201547776)
+
+END
diff --git a/lib/asn1/test/asn1_SUITE_data/MultipleLevels.asn b/lib/asn1/test/asn1_SUITE_data/MultipleLevels.asn
new file mode 100644
index 0000000000..1824e1fa5a
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/MultipleLevels.asn
@@ -0,0 +1,19 @@
+MultipleLevels DEFINITIONS AUTOMATIC TAGS ::=
+
+BEGIN
+
+Top ::= SEQUENCE {
+   country CountryName,
+   region Name
+}
+
+CountryName ::= CountryName0
+
+CountryName0 ::= Name
+
+Name ::= CHOICE {
+    short PrintableString (SIZE (0..10)),
+    long PrintableString
+}
+
+END
diff --git a/lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config b/lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config
index 19fa3c990e..d388f6cd02 100644
--- a/lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config
+++ b/lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config
@@ -17,6 +17,6 @@
 	 {decode_D_incomplete,['D',[{a,undecoded}]]},
 	 {decode_F_fb_exclusive2,['F',[{fb,[{b,parts},{d,[{da,parts}]}]}]]},	     {decode_F_fb_exclusive3,['F',[{fb,[{b,parts},{d,[{da,parts},{dc,[{dcc,undecoded}]}]}]}]]}]}}.
 {module_name,'Seq.asn1'}.
-{compile_options,[ber_bin,optimize,debug_info]}.
+{compile_options,[ber,debug_info]}.
 {multifile_compile,['M1.asn','M2.asn']}.
 
diff --git a/lib/asn1/test/asn1_SUITE_data/testobj.erl b/lib/asn1/test/asn1_SUITE_data/testobj.erl
index be7ceee7d1..80942f7e38 100644
--- a/lib/asn1/test/asn1_SUITE_data/testobj.erl
+++ b/lib/asn1/test/asn1_SUITE_data/testobj.erl
@@ -1420,24 +1420,7 @@ wrapper_encode(Module,Type,Value) ->
 	    Error
     end.
 
-wrapper_decode(Module,Type,Bytes) ->
-    case Module:encoding_rule() of
-	ber ->
-	    asn1rt:decode(Module,Type,Bytes);
-	ber_bin when binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	ber_bin ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes));
-	ber_bin_v2 when binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	ber_bin_v2 ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes));
-	per ->
-	    asn1rt:decode(Module,Type,Bytes);
-	per_bin when binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	per_bin ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes));
-	uper_bin ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes))
-    end.
+wrapper_decode(Module, Type, Bytes) when is_binary(Bytes) ->
+    asn1rt:decode(Module, Type, Bytes);
+wrapper_decode(Module, Type, Bytes) when is_list(Bytes) ->
+    asn1rt:decode(Module, Type, list_to_binary(Bytes)).
diff --git a/lib/asn1/test/asn1_test_lib.erl b/lib/asn1/test/asn1_test_lib.erl
index 96c04a9436..fda635d0eb 100644
--- a/lib/asn1/test/asn1_test_lib.erl
+++ b/lib/asn1/test/asn1_test_lib.erl
@@ -87,14 +87,14 @@ ticket_7407_compile(Config,Option) ->
     ?line OutDir = ?config(priv_dir,Config),
 
     ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-7407",
-			      [uper_bin, {outdir,OutDir}]++Option).
+			      [uper, {outdir,OutDir}]++Option).
 
 ticket_7708(Config,Option) ->
     ?line DataDir = ?config(data_dir,Config),
     ?line OutDir = ?config(priv_dir,Config),
     
     ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-55",
-			      [uper_bin, {outdir,OutDir}]++Option).
+			      [uper, {outdir,OutDir}]++Option).
     
 
 ticket_7407_code(FinalPadding) ->
@@ -154,7 +154,7 @@ ticket_7678(Config, Option) ->
     ?line OutDir = ?config(priv_dir,Config),
 
     ?line ok = asn1ct:compile(DataDir ++ "UPERDefault",
-			      [uper_bin, {outdir,OutDir}]++Option),
+			      [uper, {outdir,OutDir}]++Option),
     
     ?line Val = 'UPERDefault':seq(),
     ?line {ok,<<0,6,0>>} = 'UPERDefault':encode('Seq',Val),
@@ -167,12 +167,12 @@ ticket_7763(Config) ->
     ?line OutDir = ?config(priv_dir,Config),
 
     ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-55",
-			      [uper_bin, {outdir,OutDir}]),
+			      [uper, {outdir,OutDir}]),
     Val = {'Seq',15,lists:duplicate(8,0),[0],lists:duplicate(28,0),15,true},
     ?line {ok,Bin} = 'EUTRA-extract-55':encode('Seq',Val),
 
     ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-55",
-			      [uper_bin,compact_bit_string,{outdir,OutDir}]),
+			      [uper,compact_bit_string,{outdir,OutDir}]),
     CompactVal = {'Seq',15,{0,<<0>>},{7,<<0>>},{4,<<0,0,0,0>>},15,true},
     {ok,CompactBin} = 'EUTRA-extract-55':encode('Seq',CompactVal),
 
diff --git a/lib/asn1/test/asn1_wrapper.erl b/lib/asn1/test/asn1_wrapper.erl
index d515b99ac2..e764d8b4ca 100644
--- a/lib/asn1/test/asn1_wrapper.erl
+++ b/lib/asn1/test/asn1_wrapper.erl
@@ -34,41 +34,16 @@ encode(Module,Type,Value) ->
 	    Error
     end.
 
-decode(Module,Type,Bytes) ->
-    case Module:encoding_rule() of
-	ber ->
-	    asn1rt:decode(Module,Type,Bytes);
-	ber_bin when is_binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	ber_bin ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes));
-	ber_bin_v2 when is_binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	ber_bin_v2 ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes));
-	per ->
-	    asn1rt:decode(Module,Type,Bytes);
-	per_bin when is_binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	per_bin ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes));
-	uper_bin when is_binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	uper_bin ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes))
-    end.
+decode(Module, Type, Bytes) when is_binary(Bytes) ->
+    asn1rt:decode(Module, Type, Bytes);
+decode(Module, Type, Bytes) when is_list(Bytes) ->
+    asn1rt:decode(Module, Type, list_to_binary(Bytes)).
 
 erule(ber) ->
     ber;
-erule(ber_bin) ->
-    ber;
-erule(ber_bin_v2) ->
-    ber;
 erule(per) ->
     per;
-erule(per_bin) ->
-    per;
-erule(uper_bin) ->
+erule(uper) ->
     per.
 
 
diff --git a/lib/asn1/test/h323test.erl b/lib/asn1/test/h323test.erl
index b7a7d6e4df..426ae16994 100644
--- a/lib/asn1/test/h323test.erl
+++ b/lib/asn1/test/h323test.erl
@@ -22,7 +22,6 @@
 -export([run/1]).
 -include_lib("test_server/include/test_server.hrl").
 
-run(per_bin) -> run();
 run(per)     -> run();
 run(_Rules)  -> ok.
 
diff --git a/lib/asn1/test/testChoiceIndefinite.erl b/lib/asn1/test/testChoiceIndefinite.erl
index 630efcf27a..b5832c985a 100644
--- a/lib/asn1/test/testChoiceIndefinite.erl
+++ b/lib/asn1/test/testChoiceIndefinite.erl
@@ -23,12 +23,7 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
-main(per_bin) -> ok;
 main(per) -> ok;
-main(ber_bin_v2) ->
-    main(ber);
-main(ber_bin) ->
-    main(ber);
 main(ber) ->
     %% Test case related to OTP-4358
     %% normal encoding
diff --git a/lib/asn1/test/testCompactBitString.erl b/lib/asn1/test/testCompactBitString.erl
index 9563a31bf3..db102a3bda 100644
--- a/lib/asn1/test/testCompactBitString.erl
+++ b/lib/asn1/test/testCompactBitString.erl
@@ -233,7 +233,7 @@ compact_bit_string(Rules) ->
     
     ok.
 
-ticket_7734(per_bin) ->
+ticket_7734(per) ->
     ?line BS = {0,list_to_binary(lists:duplicate(128,0))},
     ?line {ok,BSEnc} = asn1_wrapper:encode('PrimStrings','BS1024',BS),
     ?line {ok,BS} = asn1_wrapper:decode('PrimStrings','BS1024',BSEnc).
@@ -251,7 +251,7 @@ bit_string_unnamed(Rules) ->
 				    lists:flatten(Bytes1))
     end.
 
-otp_4869(per_bin) ->
+otp_4869(per) ->
     ?line Val1={'IP',[0],{0,<<62,235,90,50,0,0,0,0,0,0,0,0,0,0,0,0>>},asn1_NOVALUE},
     ?line Val2 = {'IP',[0],[0,0,1,1,1,1,1,0,1,1,1,0,1,0,1,1,0,1,0,1,1,0,1,0,0,0,1,1,0,0,1,0] ++ lists:duplicate(128 - 32,0),asn1_NOVALUE},
 
diff --git a/lib/asn1/test/testConstraints.erl b/lib/asn1/test/testConstraints.erl
index 1ce68ec522..543c106e8a 100644
--- a/lib/asn1/test/testConstraints.erl
+++ b/lib/asn1/test/testConstraints.erl
@@ -52,8 +52,6 @@ int_constraints(Rules) ->
 		  ?line {error,_Reason2} =
 		      asn1_wrapper:encode('Constraints','SingleValue',1000)
 	  end,
-    
-
 
     %%==========================================================
     %% SingleValue2 ::=  INTEGER (1..20) 
@@ -86,7 +84,21 @@ int_constraints(Rules) ->
 		      asn1_wrapper:encode('Constraints','SingleValue',1000)
 	  end,
 
+    %%==========================================================
+    %% SingleValue3 ::=  INTEGER (Predefined | 5 | 10)
+    %% Testcase for OTP-10139. A single value subtyping of an integer type
+    %% where one value is predefined.
+    %%==========================================================
 
+    ?line {ok,BytesSV3} = asn1_wrapper:encode('Constraints','SingleValue3',1),
+    ?line {ok,1} = asn1_wrapper:decode('Constraints','SingleValue3',
+                                       lists:flatten(BytesSV3)),
+    ?line {ok,BytesSV3_2} = asn1_wrapper:encode('Constraints','SingleValue3',5),
+    ?line {ok,5} = asn1_wrapper:decode('Constraints','SingleValue3',
+                                       lists:flatten(BytesSV3_2)),
+    ?line {ok,BytesSV3_3} = asn1_wrapper:encode('Constraints','SingleValue3',10),
+    ?line {ok,10} = asn1_wrapper:decode('Constraints','SingleValue3',
+                                        lists:flatten(BytesSV3_3)),
 
     %%==========================================================
     %% Range2to19 ::=  INTEGER (1<..<20) 
@@ -116,7 +128,65 @@ int_constraints(Rules) ->
 		  ?line {error,_Reason6} =
 		      asn1_wrapper:encode('Constraints','Range2to19',20)
 	  end,
+
+    %%==========================================================
+    %% Tests for Range above 16^4 up to maximum supported by asn1 assuming the
+    %% octet length field is encoded on max 8 bits
+    %%==========================================================
+    LastNumWithoutLengthEncoding = 65536,
+    ?line {ok,BytesFoo} = asn1_wrapper:encode('Constraints','Range256to65536',
+                                              LastNumWithoutLengthEncoding),
+    ?line {ok,LastNumWithoutLengthEncoding} = 
+        asn1_wrapper:decode('Constraints','Range256to65536',lists:flatten(BytesFoo)),
+
+    FirstNumWithLengthEncoding = 65537,
+    ?line {ok,BytesBar} = asn1_wrapper:encode('LargeConstraints','RangeMax',
+                                              FirstNumWithLengthEncoding),
+    ?line {ok,FirstNumWithLengthEncoding} =
+        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesBar)),
+
+    FirstNumOver16_6 = 16777217,
+    ?line {ok, BytesBaz} =
+        asn1_wrapper:encode('LargeConstraints','RangeMax', FirstNumOver16_6),
+    ?line {ok, FirstNumOver16_6} = 
+        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesBaz)),
+    
+    FirstNumOver16_8 = 4294967297,
+    ?line {ok, BytesQux} =
+        asn1_wrapper:encode('LargeConstraints','RangeMax', FirstNumOver16_8),
+    ?line {ok, FirstNumOver16_8} = 
+        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesQux)),
+
+    FirstNumOver16_10 = 1099511627776,
+    ?line {ok, BytesBur} =
+        asn1_wrapper:encode('LargeConstraints','RangeMax', FirstNumOver16_10),
+    ?line {ok, FirstNumOver16_10} = 
+        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesBur)),
+
+    FirstNumOver16_10 = 1099511627776,
+    ?line {ok, BytesBur} =
+        asn1_wrapper:encode('LargeConstraints','RangeMax', FirstNumOver16_10),
+    ?line {ok, FirstNumOver16_10} =
+        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesBur)),
+
+    HalfMax = 1 bsl (128*8),
+    ?line {ok, BytesHalfMax} =
+        asn1_wrapper:encode('LargeConstraints','RangeMax', HalfMax),
+    ?line {ok, HalfMax} =
+        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesHalfMax)),
+
+    Max = 1 bsl (255*8),
+    ?line {ok, BytesMax} =
+        asn1_wrapper:encode('LargeConstraints','RangeMax', Max),
+    ?line {ok, Max} =
+        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesMax)),
     
+    %% Random number within longlong range
+    LongLong = 12672809400538808320,
+    ?line {ok, BytesLongLong} =
+        asn1_wrapper:encode('Constraints','LongLong', LongLong),
+    ?line {ok, LongLong} =
+        asn1_wrapper:decode('Constraints','LongLong',lists:flatten(BytesLongLong)),
 
     %%==========================================================
     %%  Constraint Combinations (Duboisson p. 285)
diff --git a/lib/asn1/test/testEnumExt.erl b/lib/asn1/test/testEnumExt.erl
index c97116413a..bb975a1d13 100644
--- a/lib/asn1/test/testEnumExt.erl
+++ b/lib/asn1/test/testEnumExt.erl
@@ -23,8 +23,8 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
-main(Rules) when Rules == per; Rules == per_bin; Rules == uper_bin ->
-    io:format("main(~p)~n",[Rules]),
+main(Rule) when Rule =:= per; Rule =:= uper ->
+    io:format("main(~p)~n",[Rule]),
     B32=[32],B64=[64],
     %% ENUMERATED with extensionmark (value is in root set)
     ?line {ok,B32} = asn1_wrapper:encode('EnumExt','Ext',red),
@@ -42,10 +42,6 @@ main(Rules) when Rules == per; Rules == per_bin; Rules == uper_bin ->
     ?line {ok,red} = asn1_wrapper:decode('EnumExt','Noext',B64),
     ok;
 
-main(ber_bin_v2) ->
-    main(ber);
-main(ber_bin) ->
-    main(ber);
 main(ber) ->
     io:format("main(ber)~n",[]),
     %% ENUMERATED with extensionmark (value is in root set)
diff --git a/lib/asn1/test/testINSTANCE_OF.erl b/lib/asn1/test/testINSTANCE_OF.erl
index 5986a00ec5..ce411beb92 100644
--- a/lib/asn1/test/testINSTANCE_OF.erl
+++ b/lib/asn1/test/testINSTANCE_OF.erl
@@ -26,7 +26,7 @@
 main(Erule) ->
 
     ?line {ok,Integer} = asn1_wrapper:encode('INSTANCEOF','Int',3),
-    Int = wrap(Erule,Integer),
+    Int = list_to_binary(Integer),
     ValotherName = {otherName,{'INSTANCE OF',{2,4},Int}},
     VallastName1 = {lastName,{'GeneralName_lastName',{2,4},12}},
     VallastName2 = {lastName,{'GeneralName_lastName',{2,3,4},
@@ -61,18 +61,3 @@ test_encdec(_Erule,{lastName,{'GeneralName_lastName',{2,3,4},
     ok;
 test_encdec(Erule,Res) ->
     {error,{Erule,Res}}.
-
-wrap(ber,Int) when is_list(Int) ->
-    binary_to_list(list_to_binary(Int));
-wrap(per,Int) when is_list(Int) ->
-    binary_to_list(list_to_binary(Int));
-wrap(ber_bin,Int) when is_list(Int) ->
-    list_to_binary(Int);
-wrap(ber_bin_v2,Int) when is_list(Int) ->
-    list_to_binary(Int);
-wrap(per_bin,Int) when is_list(Int) ->
-    list_to_binary(Int);
-wrap(uper_bin,Int) when is_list(Int) ->
-    list_to_binary(Int);
-wrap(_,Int) ->
-    Int.
diff --git a/lib/asn1/test/testInfObjectClass.erl b/lib/asn1/test/testInfObjectClass.erl
index e639066246..98408502c6 100644
--- a/lib/asn1/test/testInfObjectClass.erl
+++ b/lib/asn1/test/testInfObjectClass.erl
@@ -37,15 +37,12 @@ main(Rule) ->
 			{component,'ArgumentType'},
 			{value,_},_}}} = asn1_wrapper:encode('InfClass','Seq',
 						      {'Seq',12,13,1}),
-    Bytes2 =
-	if
-	    Rule==per;Rule==per_bin ->
-		[1,12,1,11,1,1];
-	    Rule == uper_bin ->
-		<<1,12,1,11,1,1>>;
-	    true ->
-		[48,9,2,1,12,2,1,11,2,1,1]
-	end,
+    Bytes2 = case Rule of
+		 ber ->
+		     <<48,9,2,1,12,2,1,11,2,1,1>>;
+		 _ ->
+		 <<1,12,1,11,1,1>>
+	     end,
     ?line {error,{asn1,{'Type not compatible with table constraint',
 			{{component,_},
 			 {value,_B},_}}}} = 
diff --git a/lib/asn1/test/testMergeCompile.erl b/lib/asn1/test/testMergeCompile.erl
index 31aa3518f6..d63df28c31 100644
--- a/lib/asn1/test/testMergeCompile.erl
+++ b/lib/asn1/test/testMergeCompile.erl
@@ -43,17 +43,11 @@ main(Erule) ->
     ?line EncVal = 
 	case Erule of
 	    per -> 
-		[1,100];
-	    per_bin -> 
 		<<1,100>>;
-	    uper_bin ->
+	    uper ->
 		<<1,100>>;
 	    ber ->
-		[2,1,1];
-	    ber_bin ->
-		<<2,1,1>>;
-	    ber_bin_v2 ->
-		<<2,1,1>>
+		[2,1,1]
 	end,
     ?line PEVal2 = [{dummy,1,ignore,EncVal},{dummy,2,reject,EncVal}],
     ?line Val2 = 
@@ -76,7 +70,7 @@ main(Erule) ->
 
 mvrasn(Erule) ->
     case Erule of
-	Ber when Ber == ber;Ber == ber_bin ->
+	ber ->
 	    ?line ok = test(isd),
 	    ?line ok = test(isd2),
 	    ?line ok = test(dsd),
diff --git a/lib/asn1/test/testMultipleLevels.erl b/lib/asn1/test/testMultipleLevels.erl
new file mode 100644
index 0000000000..ff6d023440
--- /dev/null
+++ b/lib/asn1/test/testMultipleLevels.erl
@@ -0,0 +1,27 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%
+
+-module(testMultipleLevels).
+-export([main/1]).
+
+main(_) ->
+    Data = {'Top',{short,"abc"},{long,"a long string follows here"}},
+    {ok,B} = 'MultipleLevels':encode('Top', Data),
+    {ok,Data} = 'MultipleLevels':decode('Top', iolist_to_binary(B)).
diff --git a/lib/asn1/test/testParameterizedInfObj.erl b/lib/asn1/test/testParameterizedInfObj.erl
index 68faf08a61..6f53595132 100644
--- a/lib/asn1/test/testParameterizedInfObj.erl
+++ b/lib/asn1/test/testParameterizedInfObj.erl
@@ -98,7 +98,7 @@ ranap(_Erule) ->
     
     ok.
 
-open_type(uper_bin,Val) when is_list(Val) ->
+open_type(uper,Val) when is_list(Val) ->
     list_to_binary(Val);
 open_type(_,Val) ->
     Val.
diff --git a/lib/asn1/test/testSSLspecs.erl b/lib/asn1/test/testSSLspecs.erl
index 51ef134e5f..45c5da50f0 100644
--- a/lib/asn1/test/testSSLspecs.erl
+++ b/lib/asn1/test/testSSLspecs.erl
@@ -42,11 +42,11 @@ compile(Config, Options) ->
     asn1_test_lib:compile_all(["PKIX1Explicit93", "PKIX1Implicit93"],
                               Config, NewOptions).
 
-compile_inline(Config, Rule) when Rule == ber_bin; Rule == ber_bin_v2 ->
+compile_inline(Config, ber=Rule) ->
     DataDir = ?config(data_dir, Config),
     CaseDir = ?config(case_dir, Config),
     Options = [{i, CaseDir}, {i, DataDir}, Rule,
-               der, compact_bit_string, optimize, asn1config, inline],
+               der, compact_bit_string, asn1config, inline],
     ok = remove_db_file_inline(CaseDir),
     asn1_test_lib:compile("OTP-PKIX.set.asn", Config, Options);
 compile_inline(_Config, _Rule) ->
@@ -73,7 +73,7 @@ remove_db_file_inline(Dir) ->
     ?line ok = remove_db_file(Dir ++ "PKIX1Explicit88.asn1db"),
     ?line ok = remove_db_file(Dir ++ "PKIX1Implicit88.asn1db").
 
-run(BER) when BER==ber_bin;BER==ber_bin_v2 ->
+run(ber) ->
     run1(1);
 run(_) ->
     ok.
@@ -100,20 +100,20 @@ transform1(ATAV) ->
     ?line {ok, ATAVEnc} = 'PKIX1Explicit88':encode('AttributeTypeAndValue',
 ATAV),
     ?line {ok, _ATAVDec} = 'SSL-PKIX':decode('AttributeTypeAndValue',
-                                      list_to_binary(ATAVEnc)).
+                                      ATAVEnc).
 
 transform2(ATAV) ->
     ?line {ok, ATAVEnc} = 'PKIX1Explicit88':encode('AttributeTypeAndValue',
 ATAV),
     ?line {ok, _ATAVDec} = 'PKIX1Explicit88':decode('AttributeTypeAndValue',
-                                             list_to_binary(ATAVEnc)).
+                                             ATAVEnc).
 
 
 transform4(ATAV) ->
     ?line {ok, ATAVEnc} = 'PKIX1Explicit88':encode('Attribute',
 ATAV),
     ?line {ok, _ATAVDec} = 'PKIX1Explicit88':decode('Attribute',
-                                             list_to_binary(ATAVEnc)).
+                                             ATAVEnc).
 
 
 ex(1) ->
@@ -146,7 +146,7 @@ ex(7) ->
      {1,2,840,113549,1,9,1},
      [[19,5,111,116,112,67,65]]}.
 
-run_inline(Rule) when Rule==ber_bin;Rule==ber_bin_v2 ->
+run_inline(ber) ->
     Cert = cert(),
     ?line {ok,{'CertificatePKIX1Explicit88',{Type,UnDec},_,_}} = 'OTP-PKIX':decode_TBSCert_exclusive(Cert),
     ?line {ok,_} = 'OTP-PKIX':decode_part(Type,UnDec),
diff --git a/lib/asn1/test/testSeqIndefinite.erl b/lib/asn1/test/testSeqIndefinite.erl
index 25742474bb..c7b8aba523 100644
--- a/lib/asn1/test/testSeqIndefinite.erl
+++ b/lib/asn1/test/testSeqIndefinite.erl
@@ -23,13 +23,7 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
-
-main(per_bin) -> ok;
 main(per) -> ok;
-main(ber_bin_v2) ->
-    main(ber);
-main(ber_bin) ->
-    main(ber);
 main(ber) ->
     
     %% normal encoding
diff --git a/lib/asn1/test/testSeqOf.erl b/lib/asn1/test/testSeqOf.erl
index 0c0bbc3e66..1aa1eab26d 100644
--- a/lib/asn1/test/testSeqOf.erl
+++ b/lib/asn1/test/testSeqOf.erl
@@ -198,19 +198,10 @@ main(Rules) ->
     
     ?line {ok,Bytes51} = asn1_wrapper:encode('SeqOf','SeqEmp',#'SeqEmp'{seq1 = [#'Empty'{}]}),
     ?line {ok,{'SeqEmp',[{'Empty'}]}} = asn1_wrapper:decode('SeqOf','SeqEmp',lists:flatten(Bytes51)),
-    
-    case Rules of
-	ber ->
-	    ?line {ok,Bytes52} = asn1_wrapper:encode('SeqOfEnum','SeqOfEnum',
-					     {'SeqOfEnum',[{'Enum',a},{'Enum',b}]}),
-	    ?line {ok,[a,b]} = asn1_wrapper:decode('SeqOfEnum','SeqOfEnum',
-					   lists:flatten(Bytes52));
-	_ -> ok
-    end,
 
     %% tests of OTP-4590
     case Rules of
-	PER when PER == per; PER == per_bin ->
+	per ->
 	    DayNames = ["Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
 	    ?line {ok,Bytes60} = asn1_wrapper:encode('XSeqOf','DayNames2',DayNames),
 	    ?line {ok,Bytes60} = asn1_wrapper:encode('XSeqOf','DayNames4',DayNames),
diff --git a/lib/asn1/test/testSetIndefinite.erl b/lib/asn1/test/testSetIndefinite.erl
index d8e2b6a9cf..73006da62b 100644
--- a/lib/asn1/test/testSetIndefinite.erl
+++ b/lib/asn1/test/testSetIndefinite.erl
@@ -24,12 +24,7 @@
 -include_lib("test_server/include/test_server.hrl").
 
 
-main(per_bin) -> ok;
 main(per) -> ok;
-main(ber_bin_v2) ->
-    main(ber);
-main(ber_bin) ->
-    main(ber);
 main(ber) ->
     
     %% normal encoding
diff --git a/lib/asn1/test/testSetOptional.erl b/lib/asn1/test/testSetOptional.erl
index 4692941524..cef90bc843 100644
--- a/lib/asn1/test/testSetOptional.erl
+++ b/lib/asn1/test/testSetOptional.erl
@@ -181,7 +181,7 @@ main(_Rules) ->
     ok.
 
 
-ticket_7533(Ber) when Ber == ber; Ber == ber_bin ->
+ticket_7533(Ber) when Ber == ber ->
     Val = #'SetOpt1'{bool1 = true,int1=12,set1=#'SetIn'{boolIn=false,intIn=13}},
     ?line {ok,B} = asn1_wrapper:encode('SetOptional','SetOpt1',Val),
     ?line {ok,Val} = asn1_wrapper:decode('SetOptional','SetOpt1',B),
diff --git a/lib/asn1/test/testTCAP.erl b/lib/asn1/test/testTCAP.erl
index 878ce7c070..b723995e40 100644
--- a/lib/asn1/test/testTCAP.erl
+++ b/lib/asn1/test/testTCAP.erl
@@ -37,7 +37,7 @@ compile_asn1config(Config, Options) ->
     asn1_test_lib:compile_all(Files, Config, Options),
     asn1_test_lib:compile_erlang("TCAPPackage_msg", Config, []).
 
-test(Erule,_Config) when Erule==ber;Erule==ber_bin;Erule==ber_bin_v2 ->
+test(ber=Erule,_Config) ->
 %    ?line OutDir = ?config(priv_dir,Config),
     %% testing OTP-4798, open type encoded with indefinite length
     ?line {ok,_Res} = asn1_wrapper:decode('TCAPMessages-simple','MessageType', val_OTP_4798(Erule)),
@@ -81,7 +81,7 @@ test_asn1config() ->
     
     ?line Val2 = 'TCAPPackage_msg':val('TransactionPDU'),
     ?line {ok,B2} = 'TCAPPackage':encode('TransactionPDU',Val2),
-    ?line {ok,ExMsg2}='TCAPPackage':decode_TransactionPDU(list_to_binary(B2)),
+    {ok,ExMsg2}='TCAPPackage':decode_TransactionPDU(B2),
     ?line {_,_,_,{Key2,ExVal2}}=ExMsg2,
     ?line {ok,_Parts2}='TCAPPackage':decode_part(Key2,ExVal2),
 
diff --git a/lib/asn1/test/testTimer.erl b/lib/asn1/test/testTimer.erl
index 2d3b777558..cd7ceb5630 100644
--- a/lib/asn1/test/testTimer.erl
+++ b/lib/asn1/test/testTimer.erl
@@ -133,23 +133,7 @@ go(Config,Enc) ->
     Module = 'H323-MESSAGES',
     Type = 'H323-UserInformation',
     Value = val(),
-%%    ok = asn1ct:compile(HelpModule,[Enc]),
-
-%%    ok = asn1ct:compile(Module,[Enc]),
-    ?line {ok,B} = asn1rt:encode(Module,Type,Value),
-    Bytes = case Enc of
-		ber_bin ->
-		    list_to_binary(B);
-		per_bin when is_list(B) ->
-		    list_to_binary(B);
-		per_bin ->
-		    B;
-		uper_bin ->
-		    B;
-		_ ->
-		    %%lists:flatten(B)
-		    list_to_binary(B)
-	    end,
+    {ok,Bytes} = asn1rt:encode(Module,Type,Value),
 
     CompileOptions = compile_options(),
     
@@ -181,35 +165,18 @@ encode(N, Module,Type,Value) ->
 decode(0, _Module,_Type,_Value,_Erule) ->
     done;
 decode(N, Module,Type,Value,Erule) ->
-    case Erule of
-	ber ->
-	    ?line {ok,_B} = asn1rt:decode(Module,Type,binary_to_list(Value));
-	per ->
-	    ?line {ok,_B} = asn1rt:decode(Module,Type,binary_to_list(Value));
-	_ ->
-	    ?line {ok,_B} = asn1rt:decode(Module,Type,Value)
-    end,
+    {ok,_B} = asn1rt:decode(Module,Type,Value),
     decode(N-1, Module,Type,Value,Erule).
 
 compile_options() ->
-    ?line {ok,Info} = asn1rt:info('H323-MESSAGES'),
-    case lists:keysearch(options,1,Info) of
-	{_,{_,Opts}} ->
-	    Opts2 = 
-		case lists:member(ber_bin_v2,Opts) of
-		    true ->
-			[ber_bin,optimize] ++ lists:delete(optimize,Opts);
-		    _ ->
-			Opts
-		end,
-	    Opts3 = [X||X <- Opts2,
-			(X == ber orelse
-			 X == ber_bin orelse
-			 X == per orelse
-			 X == per_bin orelse
-			 X == optimize orelse
-			 X == driver)],
-	    lists:flatten(io_lib:format("~p",[Opts3]));
+    {ok,Info} = asn1rt:info('H323-MESSAGES'),
+    case lists:keyfind(options, 1, Info) of
+	{_,Opts0} ->
+	    Opts1 = [X || X <- Opts0,
+			  (X =:= ber orelse
+			   X =:= per orelse
+			   X =:= uper)],
+	    lists:flatten(io_lib:format("~p", [Opts1]));
 	_ ->
 	    "[]"
     end.
diff --git a/lib/asn1/test/testTypeValueNotation.erl b/lib/asn1/test/testTypeValueNotation.erl
index cd5223ef23..59f7385f08 100644
--- a/lib/asn1/test/testTypeValueNotation.erl
+++ b/lib/asn1/test/testTypeValueNotation.erl
@@ -21,11 +21,9 @@
 
 -export([main/2]).
 
--include_lib("test_server/include/test_server.hrl").
-
 -record('Seq', {octstr, int, bool, enum, bitstr, null, oid, vstr}).
 
-main(Rule, Option) ->
+main(_Rule, _Option) ->
     Value1 = #'Seq'{octstr = [1, 2, 3, 4],
                     int = 12,
                     bool = true,
@@ -34,28 +32,5 @@ main(Rule, Option) ->
                     null = 'NULL',
                     oid = {1, 2, 55},
                     vstr = "Hello World"},
-    Value2 = #'Seq'{octstr = {'OctStr', [1, 2, 3, 4]},
-                    int = {'Int', 12},
-                    bool = {'Bool', true},
-                    enum = {'Enum', a},
-                    bitstr = {'BitStr', [1, 0, 1, 0]},
-                    null = {'Null', 'NULL'},
-                    oid = {'OId', {1, 2, 55}},
-                    vstr = {'VStr', "Hello World"}},
-    main(Rule, Option, Value1, Value2).
-
-%% Value2 will fail for ber_bin_v2, per_bin with nifs (optimize) and uper_bin
-main(ber_bin_v2, _,          Value1, Value2) -> encode_fail(Value1, Value2);
-main(per_bin,    [optimize], Value1, Value2) -> encode_fail(Value1, Value2);
-main(uper_bin,   [],         Value1, Value2) -> encode_fail(Value1, Value2);
-main(_,          _,          Value1, Value2) -> encode_normal(Value1, Value2).
-
-encode_normal(Value1, Value2) ->
-    {ok, Bytes}      = asn1_wrapper:encode('SeqTypeRefPrim', 'Seq', Value1),
-    {ok, Bytes}      = asn1_wrapper:encode('SeqTypeRefPrim', 'Seq', Value2),
-    {ok, Value1}     = asn1_wrapper:decode('SeqTypeRefPrim', 'Seq', Bytes).
-
-encode_fail(Value1, Value2) ->
-    {ok, Bytes}      = asn1_wrapper:encode('SeqTypeRefPrim', 'Seq', Value1),
-    {error, _Reason} = asn1_wrapper:encode('SeqTypeRefPrim', 'Seq', Value2),
-    {ok, Value1}     = asn1_wrapper:decode('SeqTypeRefPrim', 'Seq', Bytes).
+    {ok, Bytes} = asn1_wrapper:encode('SeqTypeRefPrim', 'Seq', Value1),
+    {ok, Value1} = asn1_wrapper:decode('SeqTypeRefPrim', 'Seq', Bytes).
diff --git a/lib/asn1/test/testX420.erl b/lib/asn1/test/testX420.erl
index abdbbfe536..52b20a2c70 100644
--- a/lib/asn1/test/testX420.erl
+++ b/lib/asn1/test/testX420.erl
@@ -34,7 +34,7 @@ compile(Erule, Options, Config) ->
 compile_loop(_Erule, [], _Options, _Config) ->
     ok;
 compile_loop(Erule, [Spec|Specs], Options, Config)
-  when Erule == ber; Erule == ber_bin; Erule == ber_bin_v2; Erule == per ->
+  when Erule =:= ber; Erule =:= per ->
     CaseDir = ?config(case_dir, Config),
     asn1_test_lib:compile(filename:join([x420, Spec]), Config,
                           [Erule, {i, CaseDir}]),
diff --git a/lib/asn1/test/test_compile_options.erl b/lib/asn1/test/test_compile_options.erl
index 4e732308d8..b973c5fbcc 100644
--- a/lib/asn1/test/test_compile_options.erl
+++ b/lib/asn1/test/test_compile_options.erl
@@ -92,7 +92,8 @@ noobj(Config) ->
     file:delete(filename:join([OutDir,'P-Record.beam'])),
     file:delete(filename:join([OutDir,'p_record.erl'])),
     file:delete(filename:join([OutDir,'p_record.beam'])),
-    ?line ok=asn1ct:compile(filename:join([DataDir,"p_record.set.asn"]),[asn1config,ber_bin,optimize,noobj,{outdir,OutDir}]),
+    ok = asn1ct:compile(filename:join([DataDir,"p_record.set.asn"]),
+			[asn1config,ber,noobj,{outdir,OutDir}]),
 %%     ?line false = code:is_loaded('P-Record'),
 %%     ?line false = code:is_loaded('p_record'),
     ?line {error,enoent} =
diff --git a/lib/asn1/test/test_inline.erl b/lib/asn1/test/test_inline.erl
index 62625572e3..e03ad739f9 100644
--- a/lib/asn1/test/test_inline.erl
+++ b/lib/asn1/test/test_inline.erl
@@ -41,16 +41,16 @@ inline1(Config, Rule, Opt) ->
     asn1_test_lib:compile("P-Record", Config, [{inline, 'inlined_P_Record'}|Opt]),
     test_inline1(),
 
-    ok=remove_inlined_files2(CaseDir, ber_bin_v2),
+    ok=remove_inlined_files2(CaseDir, ber),
 
     case Rule of
-        ber_bin_v2 ->
+        ber ->
             asn1_test_lib:compile("P-Record", Config,
-                                  [ber_bin, inline, asn1config, optimize|Opt]),
+                                  [ber, inline, asn1config|Opt]),
             test_inline2(Rule, 'P-Record'),
             remove_inlined_files3(CaseDir, Rule),
             asn1_test_lib:compile("p_record.set.asn", Config,
-                                  [ber_bin, inline, asn1config, optimize|Opt]),
+                                  [ber, inline, asn1config|Opt]),
             test_inline2(Rule, 'p_record'),
             remove_inlined_files4(CaseDir, Rule);
         _ ->
@@ -71,12 +71,12 @@ test_inline1() ->
     ?line {ok,_}=asn1_wrapper:decode('inlined_P_Record',
 				     'PersonnelRecord',Bytes).
 
-test_inline2(ber_bin_v2,Mod) ->
+test_inline2(ber,Mod) ->
     PRecMsg = {'PersonnelRecord',{'Name',"Sven","S","Svensson"},
 	       "manager",123,"20000202",{'Name',"Inga","K","Svensson"},
 	       asn1_DEFAULT},
     ?line {ok,Bytes} = Mod:encode('PersonnelRecord',PRecMsg),
-    ?line {ok,_} = Mod:sel_dec(list_to_binary(Bytes));
+    {ok,_} = Mod:sel_dec(Bytes);
 test_inline2(_,_) ->
     ok.
 
@@ -243,7 +243,7 @@ remove_inlined_files2(Dir,Rule) ->
 			  ?line ok=file:delete(X)
 		  end,[TargetErl,TargetBeam]),
     ok.
-remove_inlined_files3(Dir,ber_bin_v2) ->
+remove_inlined_files3(Dir,ber) ->
     Erl=filename:join([Dir,"P-Record.erl"]),
     Beam=filename:join([Dir,"P-Record.beam"]),
     Asn1DB=filename:join([Dir,"P-Record.asn1db"]),
@@ -255,7 +255,7 @@ remove_inlined_files3(Dir,ber_bin_v2) ->
 remove_inlined_files3(_,_) ->
     ok.
 
-remove_inlined_files4(Dir,ber_bin_v2) ->
+remove_inlined_files4(Dir,ber) ->
     Erl=filename:join([Dir,"p_record.erl"]),
     Beam=filename:join([Dir,"p_record.beam"]),
     Asn1DB=filename:join([Dir,"p_record.asn1db"]),
diff --git a/lib/asn1/test/test_special_decode_performance.erl b/lib/asn1/test/test_special_decode_performance.erl
index 4ac0ff2b27..dd56d29b28 100644
--- a/lib/asn1/test/test_special_decode_performance.erl
+++ b/lib/asn1/test/test_special_decode_performance.erl
@@ -33,7 +33,7 @@ go(all) ->
 go(N,Mod) ->
     ?line Val = val(Mod),
     ?line {ok,B} = Mod:encode(element(1,Val),Val),
-    ?line go(Mod,list_to_binary(B),N).
+    ?line go(Mod,B,N).
 
 go(Mod,Bin,N) ->
     ?line FsS = get_selective_funcs(Mod),
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 04f4b22421..81288496e9 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1,2 +1,2 @@
 #next version number to use is 2.0
-ASN1_VSN = 1.7
+ASN1_VSN = 1.8
diff --git a/lib/common_test/doc/src/Makefile b/lib/common_test/doc/src/Makefile
index d9651f13b0..99161ce68a 100644
--- a/lib/common_test/doc/src/Makefile
+++ b/lib/common_test/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2003-2011. All Rights Reserved.
+# Copyright Ericsson AB 2003-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -46,7 +46,8 @@ CT_MODULES = \
 	ct_rpc \
 	ct_snmp \
 	unix_telnet \
-	ct_slave
+	ct_slave \
+	ct_netconfc
 
 CT_XML_FILES = $(CT_MODULES:=.xml)
 
@@ -123,7 +124,7 @@ $(HTMLDIR)/%.gif: %.gif
 
 docs: pdf html man
 
-$(CT_XML_FILES): 
+$(CT_XML_FILES): %.xml: ../../src/%.erl
 	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -preprocess true -i $(XMERL_DIR)/include \
 		-i ../../../test_server/include -i  ../../include \
 		-i ../../../../erts/lib/kernel/include -i ../../../../lib/kernel/include \
@@ -158,18 +159,18 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DATA) $(MAN1DIR)/* $(RELEASE_PATH)/man/man1
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6DIR)/* $(RELEASE_PATH)/man/man6
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DATA) $(MAN1DIR)/* "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6DIR)/* "$(RELEASE_PATH)/man/man6"
 
 release_spec:
 
diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index 6babdb93af..b6d4a633cb 100644
--- a/lib/common_test/doc/src/common_test_app.xml
+++ b/lib/common_test/doc/src/common_test_app.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2011</year>
+      <year>2003</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -99,11 +99,11 @@
 	  be executed by Common Test. A test case is represented by an atom,
 	  the name of the test case function. A test case group is
 	  represented by a <c>group</c> tuple, where <c>GroupName</c>,
-	  an atom, is the name of the group (defined in <c>groups/0</c>).
+	  an atom, is the name of the group (defined in <c><seealso marker="#Module:groups-0">groups/0</seealso></c>).
 	  Execution properties for groups may also be specified, both
 	  for a top level group and for any of its sub-groups.
 	  Group execution properties specified here, will override
-	  properties in the group definition (see <c>groups/0</c>).
+	  properties in the group definition (see <c><seealso marker="#Module:groups-0">groups/0</seealso></c>).
 	  (With value <c>default</c>, the group definition properties
 	  will be used).</p>
 	
@@ -162,7 +162,7 @@
 	<v> Func = atom()</v>
 	<v> Args = list()</v>
 	<v> Fun = fun()</v>
-	<v> Required = Key | {Key,SubKeys}</v>
+	<v> Required = Key | {Key,SubKeys} | {Key,SubKey} | {Key,SubKey,SubKeys}</v>
 	<v> Key = atom()</v>
 	<v> SubKeys = SubKey | [SubKey]</v>
 	<v> SubKey = atom()</v>
@@ -184,8 +184,8 @@
 	  test cases in the suite).</p>
 	  
 	<p>The <c>timetrap</c> tag sets the maximum time each
-	  test case is allowed to execute (including <c>init_per_testcase/2</c>
-	  and <c>end_per_testcase/2</c>). If the timetrap time is
+	  test case is allowed to execute (including <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c>
+	  and <c><seealso marker="#Module:end_per_testcase-2">end_per_testcase/2</seealso></c>). If the timetrap time is
 	  exceeded, the test case fails with reason
 	  <c>timetrap_timeout</c>. A <c>TimeFunc</c> function can be used to
 	  set a new timetrap by returning a <c>TimeVal</c>. It may also be
@@ -201,11 +201,11 @@
 	  in any of the configuration files, all test cases are skipped. For more
 	  information about the 'require' functionality, see the
 	  reference manual for the function
-	  <c>ct:require/[1,2]</c>.</p>
+	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
 
 	<p>With <c>userdata</c>, it is possible for the user to
 	  specify arbitrary test suite related information which can be 
-	  read by calling <c>ct:userdata/2</c>.</p>
+	  read by calling <c><seealso marker="ct#userdata-2">ct:userdata/2</seealso></c>.</p>
 
 	  <p>The <c>ct_hooks</c> tag specifies which 
 	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
@@ -264,7 +264,7 @@
 	
 	<p>This function is called as the last test case in the
 	  suite. It is meant to be used for cleaning up after
-	  <c>init_per_suite/1</c>.
+	  <c><seealso marker="#Module:init_per_suite-1">init_per_suite/1</seealso></c>.
 	  For information on <c>save_config</c>, please see 
 	  <seealso marker="dependencies_chapter#save_config">Dependencies
 	    between Test Cases and Suites</seealso> in the User's Guide.</p>
@@ -289,7 +289,7 @@
 	<v> Func = atom()</v>
 	<v> Args = list()</v>
 	<v> Fun = fun()</v>
-	<v> Required = Key | {Key,SubKeys}</v>
+	<v> Required = Key | {Key,SubKeys} | {Key,Subkey} | {Key,Subkey,SubKeys}</v>
 	<v> Key = atom()</v>
 	<v> SubKeys = SubKey | [SubKey]</v>
 	<v> SubKey = atom()</v>
@@ -309,13 +309,14 @@
 	<p>This is the test case group info function. It is supposed to 
 	  return a list of tagged tuples that specify various properties
 	  related to the execution of a test case group (i.e. its test cases
-	  and sub-groups). Properties set by <c>groups/1</c> override
+	  and sub-groups). Properties set by
+	  <c><seealso marker="#Module:group-1">group/1</seealso></c> override
 	  properties with the same key that have been previously set by
-	  <c>suite/0</c>.</p>
+	  <c><seealso marker="#Module:suite-0">suite/0</seealso></c>.</p>
 	  
 	<p>The <c>timetrap</c> tag sets the maximum time each
-	  test case is allowed to execute (including <c>init_per_testcase/2</c>
-	  and <c>end_per_testcase/2</c>). If the timetrap time is
+	  test case is allowed to execute (including <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c>
+	  and <c><seealso marker="#Module:end_per_testcase-2">end_per_testcase/2</seealso></c>). If the timetrap time is
 	  exceeded, the test case fails with reason
 	  <c>timetrap_timeout</c>. A <c>TimeFunc</c> function can be used to
 	  set a new timetrap by returning a <c>TimeVal</c>. It may also be
@@ -330,11 +331,11 @@
 	  in any of the configuration files, all test cases in this group are skipped.
 	  For more information about the 'require' functionality, see the
 	  reference manual for the function
-	  <c>ct:require/[1,2]</c>.</p>
+	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
 
 	<p>With <c>userdata</c>, it is possible for the user to
 	  specify arbitrary test case group related information which can be 
-	  read by calling <c>ct:userdata/2</c>.</p>
+	  read by calling <c><seealso marker="ct#userdata-2">ct:userdata/2</seealso></c>.</p>
 
 	  <p>The <c>ct_hooks</c> tag specifies which 
 	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
@@ -367,7 +368,7 @@
 	    test case group. It typically contains initializations which are 
 	    common for all test cases and sub-groups in the group, and which
 	    shall only be performed once. <c>GroupName</c> is the name of the
-	    group, as specified in the group definition (see <c>groups/0</c>). The
+	    group, as specified in the group definition (see <c><seealso marker="#Module:groups-0">groups/0</seealso></c>). The
 	    <c>Config</c> parameter is the configuration data which can be modified
 	    here. The return value of this function is given as <c>Config</c> 
 	    to all test cases and sub-groups in the group. If <c>{skip,Reason}</c>
@@ -396,10 +397,10 @@
 	  <p> OPTIONAL </p>
 	  
 	  <p>This function is called after the execution of a test case group is finished.
-	    It is meant to be used for cleaning up after <c>init_per_group/2</c>.
+	    It is meant to be used for cleaning up after <c><seealso marker="#Module:init_per_group-2">init_per_group/2</seealso></c>.
 	    By means of <c>{return_group_result,Status}</c>, it is possible to return a 
 	    status value for a nested sub-group. The status can be retrieved in
-	    <c>end_per_group/2</c> for the group on the level above. The status will also
+	    <c><seealso marker="#Module:end_per_group-2">end_per_group/2</seealso></c> for the group on the level above. The status will also
 	    be used by Common Test for deciding if execution of a group should proceed in
 	    case the property <c>sequence</c> or <c>repeat_until_*</c> is set.</p>
 
@@ -450,7 +451,7 @@
 	  <p> OPTIONAL </p>
 	  
 	  <p> This function is called after each test case, and can be used
-	    to clean up after <c>init_per_testcase/2</c> and the test case. 
+	    to clean up after <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c> and the test case.
 	    Any return value (besides <c>{fail,Reason}</c> and <c>{save_config,SaveConfig}</c>) 
 	    is ignored. By returning <c>{fail,Reason}</c>, <c>TestCase</c> will be marked as
 	    failed (even though it was actually successful in the sense that it returned
@@ -476,7 +477,7 @@
 	<v> Func = atom()</v>
 	<v> Args = list()</v>
 	<v> Fun = fun()</v>
-	<v> Required = Key | {Key,SubKeys}</v>
+	<v> Required = Key | {Key,SubKeys} | {Key,Subkey} | {Key,Subkey,SubKeys}</v>
 	<v> Key = atom()</v>
 	<v> SubKeys = SubKey | [SubKey]</v>
 	<v> SubKey = atom()</v>
@@ -492,15 +493,15 @@
 	<p>This is the test case info function. It is supposed to 
 	  return a list of tagged tuples that specify various properties
 	  related to the execution of this particular test case.
-	  Properties set by <c>Testcase/0</c> override
+	  Properties set by <c><seealso marker="#Module:Testcase-0">Testcase/0</seealso></c> override
 	  properties that have been previously set for the test case
-	  by <c>group/1</c> or <c>suite/0</c>.</p>
+	  by <c><seealso marker="#Module:group-1">group/1</seealso></c> or <c><seealso marker="#Module:suite-0">suite/0</seealso></c>.</p>
 	  
 	<p>The <c>timetrap</c> tag sets the maximum time the
 	  test case is allowed to execute. If the timetrap time is
 	  exceeded, the test case fails with reason
-	  <c>timetrap_timeout</c>. <c>init_per_testcase/2</c>
-	  and <c>end_per_testcase/2</c> are included in the
+	  <c>timetrap_timeout</c>. <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c>
+	  and <c><seealso marker="#Module:end_per_testcase-2">end_per_testcase/2</seealso></c> are included in the
 	  timetrap time. A <c>TimeFunc</c> function can be used to
 	  set a new timetrap by returning a <c>TimeVal</c>. It may also be
 	  used to trigger a timetrap timeout by, at some point, returning a
@@ -514,15 +515,15 @@
 	  configuration files, the test case is skipped. For more
 	  information about the 'require' functionality, see the
 	  reference manual for the function
-	  <c>ct:require/[1,2]</c>.</p>
+	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
 
 	<p>If <c>timetrap</c> and/or <c>require</c> is not set, the
-	  default values specified by <c>suite/0</c> (or
-	  <c>group/1</c>) will be used.</p>
+	  default values specified by <c><seealso marker="#Module:suite-0">suite/0</seealso></c> (or
+	  <c><seealso marker="#Module:group-1">group/1</seealso></c>) will be used.</p>
 
 	<p>With <c>userdata</c>, it is possible for the user to
 	  specify arbitrary test case related information which can be 
-	  read by calling <c>ct:userdata/3</c>.</p>
+	  read by calling <c><seealso marker="ct#userdata-3">ct:userdata/3</seealso></c>.</p>
 	
 	<p>Other tuples than the ones defined will simply be ignored.</p>
 
@@ -550,7 +551,7 @@
 	<p>This is the implementation of a test case. Here you must
 	  call the functions you want to test, and do whatever you
 	  need to check the result. If something fails, make sure the
-	  function causes a runtime error, or call <c>ct:fail/1/2</c> 
+	  function causes a runtime error, or call <c><seealso marker="ct#fail-1">ct:fail/1/2</seealso></c>
 	  (which also causes the test case process to terminate).</p>
 	
 	<p>Elements from the <c>Config</c> list can e.g. be read
diff --git a/lib/common_test/doc/src/config_file_chapter.xml b/lib/common_test/doc/src/config_file_chapter.xml
index 6a860bb58b..d90adf8d7b 100644
--- a/lib/common_test/doc/src/config_file_chapter.xml
+++ b/lib/common_test/doc/src/config_file_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -29,6 +29,8 @@
     <file>config_file_chapter.xml</file>
   </header>
 
+    <marker id="top"></marker>
+
   <section>
     <title>General</title>
 
@@ -78,7 +80,7 @@
     test is skipped (unless a default value has been specified, see the
     <seealso marker="write_test_chapter#info_function">test case info
     function</seealso> chapter for details). There is also a function
-    <c>ct:require/[1,2]</c> which can be called from a test case
+    <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c> which can be called from a test case
     in order to check if a specific variable is available. The return 
     value from this function must be checked explicitly and appropriate 
     action be taken depending on the result (e.g. to skip the test case
@@ -88,7 +90,7 @@
     info-list should look like this:
     <c>{require,CfgVarName}</c> or <c>{require,AliasName,CfgVarName}</c>.
     The arguments <c>AliasName</c> and <c>CfgVarName</c> are the same as the
-    arguments to <c>ct:require/[1,2]</c> which are described in the
+    arguments to <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c> which are described in the
     reference manual for <seealso marker="ct">ct</seealso>.
     <c>AliasName</c> becomes an alias for the configuration variable,
     and can be used as reference to the configuration data value.
@@ -101,7 +103,8 @@
         (or test case) and improve readability.</item>
     </list>
     <p>To read the value of a config variable, use the function
-    <c>get_config/[1,2,3]</c> which is also described in the reference
+    <c><seealso marker="ct#get_config-1">get_config/1/2/3</seealso></c>
+    which is also described in the reference
     manual for <seealso marker="ct">ct</seealso>.</p>
     <p>Example:</p>
     <pre>
@@ -118,7 +121,7 @@
   <section>
   <title>Using configuration variables defined in multiple files</title>
     <p>If a configuration variable is defined in multiple files and you 
-      want to access all possible values, you may use the <c>ct:get_config/3</c>
+      want to access all possible values, you may use the <c><seealso marker="ct#get_config-3">ct:get_config/3</seealso></c>
       function and specify <c>all</c> in the options list. The values will then
       be returned in a list and the order of the elements corresponds to the order 
       that the config files were specified at startup. Please see 
@@ -130,7 +133,7 @@
     <marker id="encrypted_config_files"></marker>
     <p>It is possible to encrypt configuration files containing sensitive data
       if these files must be stored in open and shared directories.</p> 
-      <p>Call <c>ct:encrypt_config_file/[2,3]</c> to have Common Test encrypt a 
+      <p>Call <c><seealso marker="ct#encrypt_config_file-2">ct:encrypt_config_file/2/3</seealso></c> to have Common Test encrypt a
       specified file using the DES3 function in the OTP <c>crypto</c> application.
       The encrypted file can then be used as a regular configuration file,
       in combination with other encrypted files or normal text files. The key
@@ -139,7 +142,7 @@
       <c>decrypt_file</c> flag/option, or a key file in a predefined location.</p>
       
       <p>Common Test also provides decryption functions, 
-      <c>ct:decrypt_config_file/[2,3]</c>, for recreating the original text
+      <c><seealso marker="ct#decrypt_config_file-2">ct:decrypt_config_file/2/3</seealso></c>, for recreating the original text
       files.</p> 
 
       <p>Please see the <seealso marker="ct">ct</seealso> reference manual for
@@ -149,8 +152,8 @@
   <section>
     <title>Opening connections by using configuration data</title>
     <p>There are two different methods for opening a connection
-      by means of the support functions in e.g. <c>ct_ssh</c>, <c>ct_ftp</c>,
-      and <c>ct_telnet</c>:</p>
+      by means of the support functions in e.g. <c><seealso marker="ct_ssh">ct_ssh</seealso></c>, <c><seealso marker="ct_ftp">ct_ftp</seealso></c>,
+      and <c><seealso marker="ct_telnet">ct_telnet</seealso></c>:</p>
     <list>
       <item>Using a configuration target name (an alias) as reference.</item>
       <item>Using the configuration variable as reference.</item>
@@ -295,7 +298,7 @@
 
       <pre>
         [{ftp_host, [{ftp, "targethost"}, {username, "tester"}, {password, "letmein"}]},
-        {lm_directory, "/test/loadmodules"}]</pre>
+         {lm_directory, "/test/loadmodules"}]</pre>
 
     </section>
 
diff --git a/lib/common_test/doc/src/cover_chapter.xml b/lib/common_test/doc/src/cover_chapter.xml
index b7162cb542..b2e64bfff0 100644
--- a/lib/common_test/doc/src/cover_chapter.xml
+++ b/lib/common_test/doc/src/cover_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2011</year>
+      <year>2006</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -100,7 +100,7 @@
     <p><c>$ ct_run -dir $TESTOBJS/db -cover $TESTOBJS/db/config/db.coverspec</c></p>
     
     <p>You may also pass the cover specification file name in a
-      call to <c>ct:run_test/1</c>, by adding a <c>{cover,CoverSpec}</c>
+      call to <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>, by adding a <c>{cover,CoverSpec}</c>
       tuple to the <c>Opts</c> argument. Also, you can of course 
       enable code coverage in your test specifications (read
       more in the chapter about 
@@ -109,6 +109,33 @@
   </section>
 
   <section>
+    <marker id="cover_stop"></marker>
+    <title>Stopping the cover tool when tests are completed</title>
+    <p>By default the Cover tool is automatically stopped when the
+      tests are completed. This causes the original (non cover
+      compiled) modules to be loaded back in to the test node. If a
+      process at this point is still running old code of any of the
+      modules that are cover compiled, meaning that it has not done
+      any fully qualified function call after the cover compilation,
+      the process will now be killed. To avoid this it is possible to
+      set the value of the <c>cover_stop</c> option to
+      <c>false</c>. This means that the modules will stay cover
+      compiled, and it is therefore only recommended if the erlang
+      node(s) under test is terminated after the test is completed
+      or if cover can be manually stopped.</p>
+
+    <p>The option can be set by using the <c>-cover_stop</c> flag with
+      <c>ct_run</c>, by adding <c>{cover_stop,true|false}</c> to the
+      Opts argument to <c><seealso
+      marker="ct#run_test-1">ct:run_test/1</seealso></c>, or by adding
+      a <c>cover_stop</c> term in your test specification (see chapter
+      about <seealso
+      marker="run_test_chapter#test_specifications">test
+      specifications</seealso>).</p>
+
+  </section>
+
+  <section>
     <title>The cover specification file</title>
     <p>These are the terms allowed in a cover specification file:</p>
 
diff --git a/lib/common_test/doc/src/ct_hooks.xml b/lib/common_test/doc/src/ct_hooks.xml
index b98c04a850..b3e713c77f 100644
--- a/lib/common_test/doc/src/ct_hooks.xml
+++ b/lib/common_test/doc/src/ct_hooks.xml
@@ -5,7 +5,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2010</year><year>2011</year>
+      <year>2010</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -111,11 +111,12 @@
     </func>
 
     <func>
-      <name>Module:pre_init_per_suite(SuiteName, Config, CTHState) -&gt; 
+      <name>Module:pre_init_per_suite(SuiteName, InitData, CTHState) -&gt;
               Result</name>
       <fsummary>Called before init_per_suite</fsummary>
       <type>
 	<v>SuiteName = atom()</v>
+	<v>InitData = Config | SkipOrFail</v>
 	<v>Config = NewConfig = [{Key,Value}]</v>
 	<v>CTHState = NewCTHState = term()</v>
 	<v>Result = {Return, NewCTHState}</v>
@@ -140,7 +141,8 @@
 	
 	<p><c>SuiteName</c> is the name of the suite to be run.</p>
 
-	<p><c>Config</c> is the original config list of the test suite.</p>
+	<p><c>InitData</c> is the original config list of the test suite, or
+	a <c>SkipOrFail</c> tuple if a previous CTH has returned this.</p>
 
 	<p><c>CTHState</c> is the current internal state of the CTH.</p>
 
@@ -212,11 +214,12 @@
     </func>
     
     <func>
-      <name>Module:pre_init_per_group(GroupName, Config, CTHState) -&gt; 
+      <name>Module:pre_init_per_group(GroupName, InitData, CTHState) -&gt;
               Result</name>
       <fsummary>Called before init_per_group</fsummary>
       <type>
 	<v>GroupName = atom()</v>
+	<v>InitData = Config | SkipOrFail</v>
 	<v>Config = NewConfig = [{Key,Value}]</v>
 	<v>CTHState = NewCTHState = term()</v>
 	<v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
@@ -269,11 +272,12 @@
     </func>
 
     <func>
-      <name>Module:pre_init_per_testcase(TestcaseName, Config, CTHState) -&gt; 
+      <name>Module:pre_init_per_testcase(TestcaseName, InitData, CTHState) -&gt;
               Result</name>
       <fsummary>Called before init_per_testcase</fsummary>
       <type>
 	<v>TestcaseName = atom()</v>
+	<v>InitData = Config | SkipOrFail</v>
 	<v>Config = NewConfig = [{Key,Value}]</v>
 	<v>CTHState = NewCTHState = term()</v>
 	<v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
@@ -330,11 +334,12 @@
     </func>
 
     <func>
-      <name>Module:pre_end_per_group(GroupName, Config, CTHState) -&gt; 
+      <name>Module:pre_end_per_group(GroupName, EndData, CTHState) -&gt;
               Result</name>
       <fsummary>Called before end_per_group</fsummary>
       <type>
 	<v>GroupName = atom()</v>
+	<v>EndData = Config | SkipOrFail</v>
 	<v>Config = NewConfig = [{Key,Value}]</v>
 	<v>CTHState = NewCTHState = term()</v>
 	<v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
@@ -387,11 +392,12 @@
     </func>
 
     <func>
-      <name>Module:pre_end_per_suite(SuiteName, Config, CTHState) -&gt; 
+      <name>Module:pre_end_per_suite(SuiteName, EndData, CTHState) -&gt;
               Result</name>
       <fsummary>Called before end_per_suite</fsummary>
       <type>
 	<v>SuiteName = atom()</v>
+	<v>EndData = Config | SkipOrFail</v>
 	<v>Config = NewConfig = [{Key,Value}]</v>
 	<v>CTHState = NewCTHState = term()</v>
 	<v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
index 1dbb841fb0..86237f5fc1 100644
--- a/lib/common_test/doc/src/ct_hooks_chapter.xml
+++ b/lib/common_test/doc/src/ct_hooks_chapter.xml
@@ -192,12 +192,12 @@
     <section>
       <title>External configuration data and Logging</title>
       <p>It's possible in the CTH to read configuration data values
-	by calling <c>ct:get_config/1/2/3</c> (as explained in the
+	by calling <c><seealso marker="ct#get_config-1">ct:get_config/1/2/3</seealso></c> (as explained in the
 	<seealso marker="config_file_chapter#require_config_data">
 	  External configuration data</seealso>
 	chapter). The config variables in question must, as always, first have been
 	<c>required</c> by means of a suite-, group-, or test case info function,
-	or the <c>ct:require/1/2</c> function. Note that the latter can also be used
+	or the <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c> function. Note that the latter can also be used
 	in CT hook functions.</p>
       <p>The CT hook functions may call any of the logging functions available
 	in the <c>ct</c> interface to print information to the log files, or to
@@ -252,6 +252,13 @@
     {ok, Handle} -&gt;
       {[{db_handle, Handle} | Config], CTHState#state{ handle = Handle }}
   end.</code>
+  <note>If using multiple CTHs, the first part of the return tuple will be
+  used as input for the next CTH. So in the case above the next CTH might
+  get <c>{fail,Reason}</c> as the second parameter. If you have many CTHs
+  which interact, it might be a good idea to not let each CTH return
+  <c>fail</c> or <c>skip</c>. Instead return that an action should be taken
+  through the <c>Config</c> list and implement a CTH which at the end takes
+  the correct action. </note>
 	
     </section>
     
@@ -453,7 +460,7 @@ terminate(State) ->
 	<cell>Captures all test results and outputs them as surefire XML into
 	a file. The file which is created is by default called junit_report.xml.
 	The name can be by setting the path option for this hook. e.g.
-	<code>-ct_hooks cth_surefix [{path,"/tmp/report.xml"}]</code>
+	<code>-ct_hooks cth_surefire [{path,"/tmp/report.xml"}]</code>
 	Surefire XML can forinstance be used by Jenkins to display test
 	results.</cell>
       </row>
diff --git a/lib/common_test/doc/src/ct_master_chapter.xml b/lib/common_test/doc/src/ct_master_chapter.xml
index f4f0ecad62..9e848e99bb 100644
--- a/lib/common_test/doc/src/ct_master_chapter.xml
+++ b/lib/common_test/doc/src/ct_master_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2010</year>
+      <year>2006</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -124,7 +124,8 @@
     <p><c>NodeRef = NodeAlias | node() | master</c></p>
 
     <p>A <c>NodeAlias</c> (<c>atom()</c>) is used in a test specification as a 
-    reference to a node name (so the actual node name only needs to be declared once). 
+    reference to a node name (so the actual node name only needs to be declared once,
+      which can of course also be achieved using constants). 
     The alias is declared with a <c>node</c> term:</p>
 
     <p><c>{node, NodeAlias, NodeName}</c></p>
@@ -141,30 +142,32 @@
     CT Master:</p>
 
     <pre>
-      {node, node1, ct_node@host_x}.
-      {node, node2, ct_node@host_y}.
- 
-      {logdir, master, "/home/test/master_logs"}.
-      {logdir, "/home/test/logs"}.
+      {define, 'Top', "/home/test"}.
+      {define, 'T1', "'Top'/t1"}.
+      {define, 'T2', "'Top'/t2"}.
+      {define, 'T3', "'Top'/t3"}.
+      {define, 'CfgFile', "config.cfg"}.
+      {define, 'Node', ct_node}.
+
+      {node, node1, 'Node@host_x'}.
+      {node, node2, 'Node@host_y'}.
+
+      {logdir, master, "'Top'/master_logs"}.
+      {logdir, "'Top'/logs"}.
       
-      {config, node1, "/home/test/t1/cfg/config.cfg"}.
-      {config, node2, "/home/test/t2/cfg/config.cfg"}.
-      {config, "/home/test/t3/cfg/config.cfg"}.
+      {config, node1, "'T1'/'CfgFile'"}.
+      {config, node2, "'T2'/'CfgFile'"}.
+      {config, "'T3'/'CfgFile'"}.
       
-      {alias, t1, "/home/test/t1"}.
-      {alias, t2, "/home/test/t2"}.
-      {alias, t3, "/home/test/t3"}.
+      {suites, node1, 'T1', all}.
+      {skip_suites, node1, 'T1', [t1B_SUITE,t1D_SUITE], "Not implemented"}.
+      {skip_cases, node1, 'T1', t1A_SUITE, [test3,test4], "Irrelevant"}.
+      {skip_cases, node1, 'T1', t1C_SUITE, [test1], "Ignore"}.
       
-      {suites, node1, t1, all}.
-      {skip_suites, node1, t1, [t1B_SUITE,t1D_SUITE], "Not implemented"}.
-      {skip_cases, node1, t1, t1A_SUITE, [test3,test4], "Irrelevant"}.
-      {skip_cases, node1, t1, t1C_SUITE, [test1], "Ignore"}.
+      {suites, node2, 'T2', [t2B_SUITE,t2C_SUITE]}.
+      {cases, node2, 'T2', t2A_SUITE, [test4,test1,test7]}.
       
-      {suites, node2, t2, [t2B_SUITE,t2C_SUITE]}.
-      {cases, node2, t2, t2A_SUITE, [test4,test1,test7]}.
-      
-      {skip_suites, t3, all, "Not implemented"}.
-    </pre>
+      {skip_suites, 'T3', all, "Not implemented"}.</pre>
 
     <p>This example specifies the same tests as the original example. But 
     now if started with a call to <c>ct_master:run(TestSpecName)</c>, the 
@@ -190,10 +193,6 @@
     name as the Common Test node in question (typically <c>ct@somehost</c> if started
     with the <c>ct_run</c> program), will be performed. Tests without explicit
     node association will always be performed too of course!</p>
-
-    <note><p>It is recommended that absolute paths are used for log directories,
-    config files and test directory aliases in the test specifications so that
-    current working directory settings are not important.</p></note>
   </section>
 
   <section>
diff --git a/lib/common_test/doc/src/ct_run.xml b/lib/common_test/doc/src/ct_run.xml
index 078b9b958c..0750f560b3 100644
--- a/lib/common_test/doc/src/ct_run.xml
+++ b/lib/common_test/doc/src/ct_run.xml
@@ -36,6 +36,8 @@
     OS command line.
   </comsummary>
 
+  <marker id="top"></marker>
+
   <description>
   <p>The <c>ct_run</c> program is automatically installed with Erlang/OTP
     and Common Test (please see the Installation chapter in the Common
@@ -46,7 +48,7 @@
     particular mode.</p>
 
   <p>There is an interface function that corresponds to this program,
-    called <c>ct:run_test/1</c>, for starting Common Test from the Erlang
+    called <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>, for starting Common Test from the Erlang
     shell (or an Erlang program). Please see the <c>ct</c> man page for
     details.</p>
 
@@ -72,6 +74,10 @@
     following <c>-erl_args</c> on the command line. These directories are added
     to the code path normally (i.e. on specified form)</p>
 
+  <p>Exit status is set before the program ends. Value <c>0</c> indicates a successful
+    test result, <c>1</c> indicates one or more failed or auto-skipped test cases, and
+    <c>2</c> indicates test execution failure.</p>
+
   <p>If <c>ct_run</c> is called with option:</p>
     <pre>-help</pre>
     <p>it prints all valid start flags to stdout.</p>
@@ -84,18 +90,21 @@
     <pre>
 	ct_run [-dir TestDir1 TestDir2 .. TestDirN] |
 	[[-dir TestDir] -suite Suite1 Suite2 .. SuiteN
-	 [[-group Group1 Group2 .. GroupN] [-case Case1 Case2 .. CaseN]]]
+	 [[-group Groups1 Groups2 .. GroupsN] [-case Case1 Case2 .. CaseN]]]
 	[-step [config | keep_inactive]]
 	[-config ConfigFile1 ConfigFile2 .. ConfigFileN]
 	[-userconfig CallbackModule1 ConfigString1 and CallbackModule2
-	 ConfigString2 and .. and CallbackModuleN ConfigStringN]
+	 ConfigString2 and .. CallbackModuleN ConfigStringN]
 	[-decrypt_key Key] | [-decrypt_file KeyFile]
 	[-label Label]
 	[-logdir LogDir]
 	[-logopts LogOpts]
+	[-verbosity GenVLevel | [Category1 VLevel1 and
+	 Category2 VLevel2 and .. CategoryN VLevelN]]
 	[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
 	[-stylesheet CSSFile]
 	[-cover CoverCfgFile]
+	[-cover_stop Bool]
 	[-event_handler EvHandler1 EvHandler2 .. EvHandlerN] |
         [-event_handler_init EvHandler1 InitArg1 and
 	 EvHandler2 InitArg2 and .. EvHandlerN InitArgN]
@@ -107,7 +116,11 @@
         [-repeat N [-force_stop]] |
         [-duration HHMMSS [-force_stop]] |
         [-until [YYMoMoDD]HHMMSS [-force_stop]]
-	[-basic_html]</pre>
+	[-basic_html]
+    	[-ct_hooks CTHModule1 CTHOpts1 and CTHModule2 CTHOpts2 and ..
+	 CTHModuleN CTHOptsN]
+	[-exit_status ignore_config]
+    </pre>
   </section>
   <section>
     <title>Run tests using test specification</title>
@@ -120,10 +133,13 @@
 	[-label Label]
 	[-logdir LogDir]
 	[-logopts LogOpts]
+	[-verbosity GenVLevel | [Category1 VLevel1 and
+	 Category2 VLevel2 and .. CategoryN VLevelN]]
 	[-allow_user_terms]
 	[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
 	[-stylesheet CSSFile]
 	[-cover CoverCfgFile]
+	[-cover_stop Bool]
 	[-event_handler EvHandler1 EvHandler2 .. EvHandlerN] |
         [-event_handler_init EvHandler1 InitArg1 and
 	 EvHandler2 InitArg2 and .. EvHandlerN InitArgN]
@@ -135,7 +151,11 @@
         [-repeat N [-force_stop]] |
         [-duration HHMMSS [-force_stop]] |
         [-until [YYMoMoDD]HHMMSS [-force_stop]]
-	[-basic_html]</pre>
+	[-basic_html]
+    	[-ct_hooks CTHModule1 CTHOpts1 and CTHModule2 CTHOpts2 and ..
+	 CTHModuleN CTHOptsN]
+	[-exit_status ignore_config]
+    </pre>
   </section>
   <section>
     <title>Run tests in web based GUI</title>
@@ -147,6 +167,8 @@
 	[-userconfig CallbackModule1 ConfigString1 and CallbackModule2
          ConfigString2 and .. and CallbackModuleN ConfigStringN]
 	[-logopts LogOpts]
+	[-verbosity GenVLevel | [Category1 VLevel1 and
+	 Category2 VLevel2 and .. CategoryN VLevelN]]
 	[-decrypt_key Key] | [-decrypt_file KeyFile]
 	[-include InclDir1 InclDir2 .. InclDirN]
 	[-no_auto_compile]
diff --git a/lib/common_test/doc/src/event_handler_chapter.xml b/lib/common_test/doc/src/event_handler_chapter.xml
index a5886b9687..10a9b52d39 100644
--- a/lib/common_test/doc/src/event_handler_chapter.xml
+++ b/lib/common_test/doc/src/event_handler_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2011</year>
+      <year>2006</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -64,7 +64,7 @@
     <marker id="usage"></marker>
     <title>Usage</title>
     <p>Event handlers may be installed by means of an <c>event_handler</c>
-    start flag (<c>ct_run</c>) or option (<c>ct:run_test/1</c>), where the
+    start flag (<c>ct_run</c>) or option (<c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>), where the
     argument specifies the names of one or more event handler modules.
     Example:</p>
     <p><c>$ ct_run -suite test/my_SUITE -event_handler handlers/my_evh1 
@@ -78,7 +78,7 @@
     example).</p>
 
     <p>An event_handler tuple in the argument <c>Opts</c> has the following
-      definition (see also <c>ct:run_test/1</c> in the reference manual):</p>
+      definition (see also <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> in the reference manual):</p>
 
     <pre>
     {event_handler,EventHandlers}
@@ -205,7 +205,7 @@
 	                   {error,{RunTimeError,StackTrace}} | 
                            {timetrap_timeout,integer()} | 
 			   {failed,{Suite,end_per_testcase,FailInfo}}</c>, reason for failure.</p>	
-        <p><c>RequireInfo = {not_available,atom()}</c>, why require has failed.</p>
+        <p><c>RequireInfo = {not_available,atom() | tuple()}</c>, why require has failed.</p>
         <p><c>FailInfo = {timetrap_timeout,integer()} | 
 	                 {RunTimeError,StackTrace} | 
 			 UserTerm</c>, 
@@ -233,7 +233,7 @@
 	      reason for auto skipping <c>Func</c>.</p>
         <p><c>FailReason = {Suite,ConfigFunc,FailInfo}} | 
 	                   {Suite,FailedCaseInSequence}</c>, reason for failure.</p>	
-        <p><c>RequireInfo = {not_available,atom()}</c>, why require has failed.</p>
+        <p><c>RequireInfo = {not_available,atom() | tuple()}</c>, why require has failed.</p>
         <p><c>ConfigFunc = init_per_suite | init_per_group</c></p>
         <p><c>FailInfo = {timetrap_timeout,integer()} | 
 	                 {RunTimeError,StackTrace} |
@@ -308,7 +308,7 @@
     manager can look like.</p>
 
     <note><p>To ensure that printouts to standard out (or printouts made with
-    <c>ct:log/2/3</c> or <c>ct:pal/2/3</c>) get written to the test case log
+    <c><seealso marker="ct#log-2">ct:log/2/3</seealso></c> or <c><seealso marker="ct:pal-2">ct:pal/2/3</seealso></c>) get written to the test case log
     file, and not to the Common Test framework log, you can syncronize
     with the Common Test server by matching on the <c>tc_start</c> and <c>tc_done</c>
     events. In the period between these events, all IO gets directed to the
diff --git a/lib/common_test/doc/src/example_chapter.xml b/lib/common_test/doc/src/example_chapter.xml
index f269dba2cd..2333f92989 100644
--- a/lib/common_test/doc/src/example_chapter.xml
+++ b/lib/common_test/doc/src/example_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2010</year>
+      <year>2003</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -28,7 +28,8 @@
     <rev></rev>
     <file>example_chapter.xml</file>
   </header>
-         
+  
+  <marker id="top"></marker>
 
   <section>
     <title>Test suite example</title>
diff --git a/lib/common_test/doc/src/getting_started_chapter.xml b/lib/common_test/doc/src/getting_started_chapter.xml
index 039578dd2e..3cf04bb1a2 100644
--- a/lib/common_test/doc/src/getting_started_chapter.xml
+++ b/lib/common_test/doc/src/getting_started_chapter.xml
@@ -90,7 +90,7 @@
     <p>As you can understand from the illustration above, Common Test requires
       that a test case generates a runtime error to indicate failure (e.g.
       by causing a bad match error or by calling <c>exit/1</c>, preferrably
-      through the <c>ct:fail/1,2</c> help function). A succesful execution is
+      through the <c><seealso marker="ct#fail-1">ct:fail/1,2</seealso></c> help function). A succesful execution is
       indicated by means of a normal return from the test case function.
     </p>
     </section>
@@ -214,11 +214,56 @@
 
   <section>
     <title>What happens next?</title>
-    <p>
-      You will find detailed information about the basics introduced here in this
-      chapter in the following chapters in the User's Guide, as well as
-      presentations of many more useful features. Have fun!
-    </p>
+
+    <p>Well, you might already be asking yourself questions such as:</p>
+      
+      <list>
+	<item>"How and where can I specify variable data for my tests that mustn't
+	  be hard-coded in the test suites (such as host names, addresses,
+	  user login data, etc)?" The
+	  <seealso marker="config_file_chapter#top">External Configuration Data</seealso>
+	  chapter will give you that information.
+	</item>
+	<item>"Is there a way to declare a number of different tests and run them
+	  in one session without having to write my own scripts? And can such
+	  declarations be used for regression testing?" The 
+	  <seealso marker="run_test_chapter#test_specifications">Test Specifications</seealso>
+	  chapter answers these questions.
+	</item>
+	<item>"Can test cases and/or test runs be automatically repeated?" Learn more about
+	  <seealso marker="write_test_chapter#test_case_groups">Test Case Groups</seealso>
+	  and also read about start flags/options in the
+	  <seealso marker="run_test_chapter#ct_run">Running Tests</seealso> chapter and
+	  the Reference Manual.
+	</item>
+	<item>"Will Common Test execute my test cases in sequence or in parallel?" The
+	  <seealso marker="write_test_chapter#test_case_groups">Test Case Groups</seealso>
+	  section in the Running Tests chapter will give you the answer.
+	</item>
+	<item>"What's the syntax for timetraps (mentioned above), and how do I set them?"
+	  This is explained in the
+	  <seealso marker="write_test_chapter#timetraps">Timetrap Timeouts</seealso>
+	  part of the Writing Test Suites chapter.
+	</item>
+	<item>"What functions are available for logging and printing?" Check the
+	  <seealso marker="write_test_chapter#logging">Logging</seealso>
+	  section in the Writing Test Suites chapter.
+	</item>
+	<item>"I need data files for my tests. Where do I store them preferrably?"
+	  You should read about 
+	  <seealso marker="write_test_chapter#data_priv_dir">Data and Private
+	  Directories</seealso> for information about this.
+	</item>
+	<item>"May I start with a test suite example, please?"
+	  <seealso marker="example_chapter#top">Sure!</seealso>
+	</item>
+      </list>
+      <p>You will probably want to get started on your own first test suites now, while
+      at the same time digging deeper into the Common Test User's Guide and Reference Manual.
+      You will find that there's lots more to learn about the things that have been introduced
+      in this chapter. You will of course also be presented many more useful features, such as the
+      ones listed above. Have fun!
+      </p>
     </section>
 </chapter>
 
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 050b8774ca..7e33b71de1 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,330 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.6.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The ct:run_test/1 option 'config' only worked with a
+	    single config file, not a list of files. This has been
+	    fixed.</p>
+          <p>
+	    Own Id: OTP-10495</p>
+        </item>
+        <item>
+          <p>
+	    ct_netconfc:close_session sometimes returned
+	    {error,closed} because the ssh connection was closed
+	    (from the server side) before the rpc-reply was received
+	    by the client. This is normal and can not be helped. It
+	    has been corrected so the return will be 'ok' in this
+	    case. Other error situations will still give
+	    {error,Reason}.</p>
+          <p>
+	    Own Id: OTP-10510 Aux Id: kunagi-320 [231] </p>
+        </item>
+        <item>
+          <p>
+	    ct_netconfc:close_session sometimes returned
+	    {error,closed} or (if the connection was named)
+	    {error,{process_down,Pid,normal}} because the ssh
+	    connection was closed (from the server side) before the
+	    rpc-reply was received by the client. This is normal and
+	    can not be helped. It has been corrected so the return
+	    will be 'ok' in this situation.</p>
+          <p>
+	    Own Id: OTP-10570</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug where ct:require of same name with same config
+	    would return name_in_use.</p>
+          <p>
+	    Own Id: OTP-10572</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A new test case group search functionality has been
+	    implemented that makes Common Test search automatically
+	    through the group definitions tree (the return value of
+	    groups/0) and create tests for all paths of nested groups
+	    that match the specification. It also allows for
+	    specifying unique paths to sub groups in order to avoid
+	    execution of unwanted tests. This new feature can be used
+	    whenever starting a test run by means of the ct_run
+	    program, the ct:run_test/1 API function, or a Test
+	    Specification. Details can be found in the Test Case
+	    Group Execution section in the Running Tests chapter.</p>
+          <p>
+	    Own Id: OTP-10466 Aux Id: kunagi-276 [187] </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    Restore Config data if lost when test case fails.</p>
+          <p>
+	    Own Id: OTP-10070 Aux Id: kunagi-175 [86] </p>
+        </item>
+        <item>
+          <p>
+	    IO server error in test_server.</p>
+          <p>
+	    Own Id: OTP-10125 Aux Id: OTP-10101, kunagi-177 [88] </p>
+        </item>
+        <item>
+          <p>
+	    Faulty connection handling in common_test.</p>
+          <p>
+	    Own Id: OTP-10126 Aux Id: kunagi-178 [89] </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.6.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The interactive mode (ct_run -shell) would not start
+	    properly. This error has been fixed.</p>
+          <p>
+	    Own Id: OTP-10414</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.6.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    If a CT hook function caused a crash, this could in some
+	    situations cause Common Test to terminate due to an
+	    illegal IO operation. This error has been corrected.</p>
+          <p>
+	    Own Id: OTP-10050 Aux Id: seq12039 </p>
+        </item>
+        <item>
+          <p>
+	    The Common Test documentation states that timetraps are
+	    never active during execution of CT hook functions. This
+	    was only true for post hook functions, not for pre hook
+	    functions. The code for CT hooks has been modified to
+	    behave according to the documentation.</p>
+          <p>
+	    Own Id: OTP-10069</p>
+        </item>
+        <item>
+          <p>
+	    If a CT hook function would call the exit/1 or throw/1
+	    BIF (possibly indirectly, e.g. as a result of a timeout
+	    in gen_server:call/3), Common Test would hang. This
+	    problem has been fixed.</p>
+          <p>
+	    Own Id: OTP-10072 Aux Id: seq12053 </p>
+        </item>
+        <item>
+          <p>
+	    The documentation has been updated with information about
+	    how to deal with chaining of hooks which return
+	    fail/skip.</p>
+          <p>
+	    Own Id: OTP-10077 Aux Id: seq12048 </p>
+        </item>
+        <item>
+          <p>
+	    When ct_hooks called the id/1 functions of multiple
+	    hooks, it would reverse the order of the hooks and call
+	    the proceeding init/2 calls in the wrong order. This has
+	    been fixed.</p>
+          <p>
+	    Own Id: OTP-10135</p>
+        </item>
+        <item>
+          <p>
+	    The surefire hook now correctly handles autoskipped
+	    initialization and test functions.</p>
+          <p>
+	    Own Id: OTP-10158</p>
+        </item>
+        <item>
+          <p>
+	    The ct:get_status/0 function failed to report status if a
+	    parallel test case group was running at the time of the
+	    call. This has been fixed and the return value for the
+	    function has been updated. Please see the ct reference
+	    manual for details.</p>
+          <p>
+	    Own Id: OTP-10172</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The support for "silent connections" has been updated to
+	    include ssh. Also, a silent_connections term has been
+	    added to the set of test specification terms.</p>
+          <p>
+	    Own Id: OTP-9625 Aux Id: seq11918 </p>
+        </item>
+        <item>
+          <p>
+	    It is now possible to specify an arbitrarily large tuple
+	    as the requires config data when using require and
+	    ct:get_config. See the ct:get_config and ct:require
+	    reference manual pages for details about which keys are
+	    allowed.</p>
+          <p>
+	    This change introduces a backwards incompatability in the
+	    <c>ct:require/2</c> interface. Previously when doing
+	    <c>ct:require(a_name,{key,subkey})</c>, a_name would be
+	    associated with key. This has been changed to that
+	    <c>a_name</c> is associated with <c>subkey</c>. This
+	    change also effects using <c>require</c> in an
+	    suite/group/testcase info function.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-9626 Aux Id: seq11920 </p>
+        </item>
+        <item>
+          <p>
+	    The ct_run program now sets the OS process exit status
+	    before it ends. Value 0 indicates a successful test
+	    result, 1 indicates one or more failed or auto-skipped
+	    test cases, and 2 indicates test execution failure.</p>
+          <p>
+	    Own Id: OTP-9865 Aux Id: OTP-10087 </p>
+        </item>
+        <item>
+          <p>
+	    It is now possible to sort the HTML tables by clicking on
+	    the header elements. In order to reset a sorted table,
+	    the browser window should simply be refreshed. This
+	    feature requires that the browser supports javascript,
+	    and has javascript execution enabled. If the 'ct_run
+	    -basic_html' flag is used, no javascript code is included
+	    in the generated HTML code.</p>
+          <p>
+	    Own Id: OTP-9896 Aux Id: seq12034, OTP-9835 </p>
+        </item>
+        <item>
+          <p>
+	    A netconf client, ct_netconfc, is added to common_test.
+	    It supports basic netconf functionality over SSH. In
+	    order to allow testing of both success and failure cases,
+	    it is intentionally written to allow non-standard
+	    behavior.</p>
+          <p>
+	    Own Id: OTP-10025</p>
+        </item>
+        <item>
+          <p>
+	    The test specification term {define,Constant,Value} has
+	    been introduced, which makes it possible to replace
+	    constant names (atom()) with values (term()) in arbitrary
+	    test specification terms. The 'define' makes the (now
+	    deprecated) 'alias' term obsolete. More details,
+	    including examples, can be found in the Test
+	    Specifications chapter in the Common Test User's Guide.</p>
+          <p>
+	    Own Id: OTP-10049</p>
+        </item>
+        <item>
+          <p>
+	    Verbosity levels for log printouts has been added. This
+	    makes it possible to specify preferred verbosity for
+	    different categories of log printouts, as well as general
+	    printouts (such as standard IO), to allow control over
+	    which strings get printed and which get ignored. New
+	    versions of the Common Test logging functions, ct:log,
+	    ct:pal and ct:print, have been introduced, with a new
+	    Importance argument added. The Importance value is
+	    compared to the verbosity level at runtime. More
+	    information can be found in the chapter about Logging in
+	    the Common Test User's Guide.</p>
+          <p>
+	    Own Id: OTP-10067 Aux Id: seq12050 </p>
+        </item>
+        <item>
+          <p>
+	    The return values of ct:run_test/1 and ct:run_testspec/1
+	    have been changed from an uninformative 'ok' (independent
+	    of the test outcome) to a value,
+	    {Ok,Failed,{UserSkipped,AutoSkipped}} (all integers),
+	    that presents the final test case result, or a value,
+	    {error,Reason}, that informs about fatal test execution
+	    failure. See details in the reference manual for ct.</p>
+          <p>
+	    Own Id: OTP-10087 Aux Id: OTP-9865 </p>
+        </item>
+        <item>
+          <p>
+	    The test specification syntax has been updated with new
+	    and missing terms, such as 'define', 'verbosity',
+	    'auto_compile', 'stylesheet', 'silent_connections',
+	    'basic_html' and 'release_shell'. See the Test
+	    Specification chapter in the Common Test User's Guide for
+	    details.</p>
+          <p>
+	    Own Id: OTP-10089 Aux Id: OTP-10049 </p>
+        </item>
+        <item>
+          <p>
+	    It is now possible to pause execution of a test case, by
+	    calling the ct:break/1/2 function. Execution is resumed
+	    with a call to ct:continue/0/1. Break/continue also works
+	    for test cases executing in parallel. See the ct
+	    reference manual for details.</p>
+          <p>
+	    Own Id: OTP-10127</p>
+        </item>
+        <item>
+          <p>
+	    It is now possible to send user defined events from a
+	    testcase which will be picked up by the installed event
+	    handler.</p>
+          <p>
+	    Own Id: OTP-10157</p>
+        </item>
+        <item>
+          <p>
+	    A new start option, release_shell, for ct:run_test/1, has
+	    been added, which makes Common Test release the shell
+	    process after the test suite compilation phase is
+	    finished. For details, see the Running Tests chapter in
+	    the User's Guide.</p>
+          <p>
+	    Own Id: OTP-10248 Aux Id: OTP-10127 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.6.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/doc/src/ref_man.xml b/lib/common_test/doc/src/ref_man.xml
index a9fdef7359..6fede88434 100644
--- a/lib/common_test/doc/src/ref_man.xml
+++ b/lib/common_test/doc/src/ref_man.xml
@@ -4,7 +4,7 @@
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2003</year><year>2011</year>
+      <year>2003</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -71,6 +71,7 @@
   <xi:include href="ct_cover.xml"/>
   <xi:include href="ct_ftp.xml"/>
   <xi:include href="ct_ssh.xml"/>
+  <xi:include href="ct_netconfc.xml"/>
   <xi:include href="ct_rpc.xml"/>
   <xi:include href="ct_snmp.xml"/>
   <xi:include href="ct_telnet.xml"/>
diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml
index 30486d3eec..b804f134c6 100644
--- a/lib/common_test/doc/src/run_test_chapter.xml
+++ b/lib/common_test/doc/src/run_test_chapter.xml
@@ -119,7 +119,7 @@
       <item><c><![CDATA[ct_run -userconfig <callbackmodulename> <configfilenames> -suite <suiteswithfullpath>]]></c>
       </item>
       <item><c><![CDATA[ct_run -config <configfilenames> -suite <suitewithfullpath>
-	      -group <groupnames> -case <casenames>]]></c></item>
+	      -group <groups> -case <casenames>]]></c></item>
     </list>
     <p>Examples:</p>
     <p><c>$ ct_run -config $CFGS/sys1.cfg $CFGS/sys2.cfg -dir $SYS1_TEST $SYS2_TEST</c></p>
@@ -137,6 +137,8 @@
 
     <p><c>$ ct_run -suite ./testdir/x_SUITE ./testdir/y_SUITE</c></p>
 
+    <p>For more details on <seealso marker="run_test_chapter#group_execution">test case group execution</seealso>, please see below.</p>
+
     <p>Other flags that may be used with <c>ct_run</c>:</p>
     <list>
       <item><c><![CDATA[-logdir <dir>]]></c>, specifies where the HTML log files are to be written.</item>
@@ -153,6 +155,8 @@
       <item><c><![CDATA[-stylesheet <css_file>]]></c>, points out a user HTML style sheet (see below).</item>
       <item><c><![CDATA[-cover <cover_cfg_file>]]></c>, to perform code coverage test (see 
 	<seealso marker="cover_chapter#cover">Code Coverage Analysis</seealso>).</item>
+      <item><c><![CDATA[-cover_stop <bool>]]></c>, to specify if the cover tool shall be stopped after the test is completed (see
+	<seealso marker="cover_chapter#cover_stop">Code Coverage Analysis</seealso>).</item>
       <item><c><![CDATA[-event_handler <event_handlers>]]></c>, to install 
         <seealso marker="event_handler_chapter#event_handling">event handlers</seealso>.</item>
       <item><c><![CDATA[-event_handler_init <event_handlers>]]></c>, to install
@@ -178,6 +182,8 @@
       <item><c><![CDATA[-basic_html]]></c>, switches off html enhancements that might not be compatible with older browsers.</item>
       <item><c><![CDATA[-logopts <opts>]]></c>, makes it possible to modify aspects of the logging behaviour, see
         <seealso marker="run_test_chapter#logopts">Log options</seealso> below.</item>
+      <item><c><![CDATA[-verbosity <levels>]]></c>, sets <seealso marker="write_test_chapter#logging">verbosity levels
+      for printouts</seealso>.</item>
     </list>
 
     <note><p>Directories passed to Common Test may have either relative or absolute paths.</p></note>
@@ -196,62 +202,232 @@
 	     the current working directory of the Erlang Runtime System during the test run!</p>
     </note>
     
-    <p>For more information about the <c>ct_run</c> program, see the
-      <seealso marker="install_chapter#general">Installation</seealso> chapter.
-    </p>
-  </section>
-  
-  <section>
-    <title>Running tests from the Web based GUI</title>
-    
-    <p>The web based GUI, VTS, is started with the <c>ct_run</c>
-      program. From the GUI you can load config files, and select
-      directories, suites and cases to run. You can also state the
-      config files, directories, suites and cases on the command line
-      when starting the web based GUI.
-    </p>
-    
+    <p>The <c>ct_run</c> program sets the exit status before shutting down. The following values
+      are defined:</p>
     <list>
-      <item><c>ct_run -vts</c></item>
-      <item><c><![CDATA[ct_run -vts -config <configfilename>]]></c></item>
-      <item><c><![CDATA[ct_run -vts -config <configfilename> -suite <suitewithfullpath>
-	      -case <casename>]]></c></item>
+      <item><c>0</c> indicates a successful testrun, i.e. one without failed or auto-skipped test cases.</item>
+      <item><c>1</c> indicates that one or more test cases have failed, or have been auto-skipped.</item>
+      <item><c>2</c> indicates that the test execution has failed because of e.g. compilation errors, an
+	illegal return value from an info function, etc.</item>
     </list>
+    <p>If auto-skipped test cases should not affect the exit status, you may change the default
+      behaviour using start flag:</p>
+    <pre>-exit_status ignore_config</pre>
     
-    <p>From the GUI you can run tests and view the result and the logs.
+    <p>For more information about the <c>ct_run</c> program, see the
+      <seealso marker="ct_run#top">Reference Manual</seealso> and the
+      <seealso marker="install_chapter#general">Installation</seealso> chapter.
     </p>
-    
-    <p>Note that <c>ct_run -vts</c> will try to open the Common Test start
-      page in an existing web browser window or start the browser if it is
-      not running. Which browser should be started may be specified with
-      the browser start command option:</p>
-      <p><c><![CDATA[ct_run -vts -browser <browser_start_cmd>]]></c></p>
-      <p>Example:</p>
-      <p><c><![CDATA[$ ct_run -vts -browser 'firefox&']]></c></p>
-      <p>Note that the browser must run as a separate OS process or VTS will hang!</p>
-      <p>If no specific browser start command is specified, Firefox will
-        be the default browser on Unix platforms and Internet Explorer on Windows.
-	If Common Test fails to start a browser automatically, or <c>'none'</c> is
-	specified as the value for -browser (i.e. <c>-browser none</c>), start your
-	favourite browser manually and type in the URL that Common Test
-	displays in the shell.</p>    
   </section>
-  
+    
   <section>
     <title>Running tests from the Erlang shell or from an Erlang program</title>
     
     <p>Common Test provides an Erlang API for running tests. The main (and most
       flexible) function for specifying and executing tests is called
-      <c>ct:run_test/1</c>. This function takes the same start parameters as
-      the <c>ct_run</c> program described above, only the flags are instead
+      <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>.
+      This function takes the same start parameters as
+      the <c><seealso marker="run_test_chapter#ct_run">ct_run</seealso></c>
+      program described above, only the flags are instead
       given as options in a list of key-value tuples. E.g. a test specified 
       with <c>ct_run</c> like:</p>
+
       <p><c>$ ct_run -suite ./my_SUITE -logdir ./results</c></p> 
-      <p>is with <c>ct:run_test/1</c> specified as:</p> 
+      <p>is with <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> specified as:</p>
       <p><c>1> ct:run_test([{suite,"./my_SUITE"},{logdir,"./results"}]).</c></p>
-      <p>For detailed documentation, please see the <c>ct</c> manual page.</p>    
+
+      <p>The function returns the test result, represented by the tuple:
+	<c>{Ok,Failed,{UserSkipped,AutoSkipped}}</c>, where each element is an
+	integer. If test execution fails, the function returns the tuple:
+	<c>{error,Reason}</c>, where the term <c>Reason</c> explains the
+	failure.</p>
+
+	<section>
+	  <title>Releasing the Erlang shell</title>
+	  <p>During execution of tests, started with
+	  <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>,
+	  the Erlang shell process, controlling stdin, will remain the top
+	  level process of the Common Test system of processes. The result
+	  is that the Erlang shell is not available for interaction during
+	  the test run. If this is not desirable, maybe because the shell is needed
+	  for debugging purposes or for interaction with the SUT during test
+	  execution, you may set the <c>release_shell</c> start option to
+	  <c>true</c> (in the call to <c>ct:run_test/1</c> or by
+	  using the corresponding test specification term, see below). This will
+	  make Common Test release the shell immediately after the test suite
+	  compilation stage. To accomplish this, a test runner process
+	  is spawned to take control of the test execution, and the effect is that
+	  <c>ct:run_test/1</c> returns the pid of this process rather than the
+	  test result - which instead is printed to tty at the end of the test run.</p>
+	  <note><p>Note that in order to use the
+	  <c><seealso marker="ct#break-1">ct:break/1/2</seealso></c> and
+	  <c><seealso marker="ct#continue-0">ct:continue/0/1</seealso></c> functions,
+	  <c>release_shell</c> <em>must</em> be set to <c>true</c>.</p></note>
+	</section>
+        
+      <p>For detailed documentation about
+        <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>,
+        please see the
+        <c><seealso marker="ct#run_test-1">ct</seealso></c> manual page.</p>    
   </section>
   
+  <marker id="group_execution"></marker>
+   <section>
+    <title>Test case group execution</title>
+    
+    <p>With the <c>ct_run</c> flag, or <c>ct:run_test/1</c> option <c>group</c>,
+    one or more test case groups can be specified, optionally in combination
+    with specific test cases. The syntax for specifying groups is as follows
+    (on the command line):</p>
+
+    <pre>
+      <![CDATA[$ ct_run -group <group_names_or_paths> [-case <cases>]]]></pre>
+    <p>or (in the Erlang shell):</p>
+    <pre>
+      <![CDATA[1> ct:run_test([{group,GroupsNamesOrPaths}, {case,Cases}]).]]></pre>
+    
+    <p>The <c>group_names_or_paths</c> parameter specifies either one
+    or more group names and/or one or more group paths. At start up,
+    Common Test will search for matching groups in the group definitions
+    tree (i.e. the list returned from <c>Suite:groups/0</c>, please see the
+    <seealso marker="write_test_chapter#test_case_groups">Test case groups</seealso>
+    chapter for details).
+    Given a group name, say <c>g</c>, Common Test will search for all paths
+    that lead to <c>g</c>. By path here we mean a sequence of nested groups,
+    all of which have to be followed in order to get from the top level
+    group to <c>g</c>. Actually, what Common Test needs to do in order to
+    execute the test cases in group <c>g</c>, is to call the
+    <c>init_per_group/2</c> function for each group in the path to
+    <c>g</c>, as well as all corresponding <c>end_per_group/2</c>
+    functions afterwards. The obvious reason for this is that the configuration
+    of a test case in <c>g</c> (and its <c>Config</c> input data) depends on
+    <c>init_per_testcase(TestCase, Config)</c> and its return value, which
+    in turn depends on <c>init_per_group(g, Config)</c> and its return value,
+    which in turn depends on <c>init_per_group/2</c> of the group above
+    <c>g</c>, etc, all the way up to the top level group.</p>
+
+    <p>As you may have already realized, this means that if there is more than
+    one way to locate a group (and its test cases) in a path, the result of the
+    group search operation is a number of tests, all of which will be performed.
+    Common Test actually interprets a group specification that consists of a
+    single name this way:</p>
+
+    <p>"Search and find all paths in the group definitions tree that lead
+    to the specified group and, for each path, create a test which (1) executes
+    all configuration functions in the path to the specified group, then (2)
+    executes all - or all matching - test cases in this group, as well as (3)
+    all - or all matching - test cases in all sub groups of the group".
+    </p>
+    
+    <p>It is also possible for the user to specify a specific group path with
+    the <c>group_names_or_paths</c> parameter. With this type of specification it's
+    possible to avoid execution of unwanted groups (in otherwise matching paths),
+    and/or the execution of sub groups. The syntax of the group path is a list of
+    group names in the path, e.g. on the command line:
+    </p>
+    <p><c>$ ct_run -suite "./x_SUITE" -group [g1,g3,g4] -case tc1 tc5</c></p>
+    <p>or similarly in the Erlang shell (requires a list within the groups list):</p>
+    <p><c>1> ct:run_test([{suite,"./x_SUITE"}, {group,[[g1,g3,g4]]}, {testcase,[tc1,tc5]}]).</c></p>
+    
+    <p>The last group in the specified path will be the terminating group in
+    the test, i.e. no sub groups following this group will be executed. In the
+    example above, <c>g4</c> is the terminating group, hence Common Test will
+    execute a test that calls all init configuration functions in the path to
+    <c>g4</c>, i.e. <c>g1..g3..g4</c>. It will then call test cases <c>tc1</c>
+    and <c>tc5</c> in <c>g4</c> and finally all end configuration functions in order
+    <c>g4..g3..g1</c>.</p>
+    
+    <p>Note that the group path specification doesn't necessarily
+    have to include <em>all</em> groups in the path to the terminating group.
+    Common Test will search for all matching paths if given an incomplete group
+    path.</p>
+    
+    <p>Note also that it's possible to combine group names and group paths with the
+    <c>group_names_or_paths</c> parameter. Each element is treated as
+    an individual specification in combination with the <c>cases</c> parameter.
+    See examples below.</p>    
+
+    <p>Examples:</p>
+    <pre>
+      -module(x_SUITE).
+      ...
+      %% The group definitions:      
+      groups() ->
+        [{top1,[],[tc11,tc12,
+	           {sub11,[],[tc12,tc13]},
+	           {sub12,[],[tc14,tc15,
+			      {sub121,[],[tc12,tc16]}]}]},
+
+         {top2,[],[{group,sub21},{group,sub22}]},
+         {sub21,[],[tc21,{group,sub2X2}]},
+         {sub22,[],[{group,sub221},tc21,tc22,{group,sub2X2}]},
+         {sub221,[],[tc21,tc23]},
+         {sub2X2,[],[tc21,tc24]}].
+    </pre>
+    <br></br>
+    <p><c>$ ct_run -suite "x_SUITE" -group all</c></p>
+    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,all}]).</c></p>
+    <p>Two tests will be executed, one for all cases and all sub groups under <c>top1</c>,
+    and one for all under <c>top2</c>. (We would get the same result with
+    <c>-group top1 top2</c>, or <c>{group,[top1,top2]}</c>.</p>
+    <br></br>
+    <p><c>$ ct_run -suite "x_SUITE" -group top1</c></p>
+    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[top1]}]).</c></p>
+    <p>This will execute one test for all cases and sub groups under <c>top1</c>.</p>
+    <br></br>
+    <p><c>$ ct_run -suite "x_SUITE" -group top1 -case tc12</c></p>
+    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[top1]}, {testcase,[tc12]}]).</c></p>
+    <p>This will run a test that executes <c>tc12</c> in <c>top1</c> and any sub group
+    under <c>top1</c> where it can be found (<c>sub11</c> and <c>sub121</c>).</p>
+    <br></br>
+    <p><c>$ ct_run -suite "x_SUITE" -group [top1] -case tc12</c></p>
+    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[[top1]]}, {testcase,[tc12]}]).</c></p>
+    <p>This will execute <c>tc12</c> <em>only</em> in group <c>top1</c>.</p>
+    <br></br>
+    <p><c>$ ct_run -suite "x_SUITE" -group top1 -case tc16</c></p>
+    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[top1]}, {testcase,[tc16]}]).</c></p>
+    <p>This will search <c>top1</c> and all its sub groups for <c>tc16</c> and the result
+    will be that this test case executes in group <c>sub121</c>. (The specific path: 
+    <c>-group [sub121]</c> or <c>{group,[[sub121]]}</c>, would have given
+    us the same result in this example).</p>
+    <br></br>
+    <p><c>$ ct_run -suite "x_SUITE" -group sub12 [sub12]</c></p>
+    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[sub12,[sub12]]}]).</c></p>
+    <p>This will execute two tests, one that includes all cases and sub groups under
+    <c>sub12</c>, and one with <em>only</em> the test cases in <c>sub12</c>.</p>
+    <br></br>
+    <p><c>$ ct_run -suite "x_SUITE" -group sub2X2</c></p>
+    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[sub2X2]}]).</c></p>
+    <p>In this example, Common Test will find and execute two tests, one for the path from
+    <c>top2</c> to <c>sub2X2</c> via <c>sub21</c>, and one from <c>top2</c> to <c>sub2X2</c>
+    via <c>sub22</c>.</p>
+    <br></br>
+    <p><c>$ ct_run -suite "x_SUITE" -group [sub21,sub2X2]</c></p>
+    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[[sub21,sub2X2]]}]).</c></p>
+    <p>Here, by specifying the unique path: <c>top2 -> sub21 -> sub2X2</c>, only one test
+    is executed. The second possible path from <c>top2</c> to <c>sub2X2</c> (above)
+    will be discarded.</p>
+    <br></br>
+    <p><c>$ ct_run -suite "x_SUITE" -group [sub22] -case tc22 tc21</c></p>
+    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[[sub22]]}, {testcase,[tc22,tc21]}]).</c></p>
+    <p>In this example only the test cases for <c>sub22</c> will be executed, and in
+    reverse order compared to the group definition.</p>
+    <br></br>
+
+    <p>If a test case that belongs to a group (according to the group definition), is executed
+    without a group specification, i.e. simply by means of (command line):</p>
+    <p><c>$ ct_run -suite "my_SUITE" -case my_tc</c></p>
+    <p>or (Erlang shell):</p>
+    <p><c>1> ct:run_test([{suite,"my_SUITE"}, {testcase,my_tc}]).</c></p>
+    <p>then Common Test ignores the group definition and executes the test case in the scope of the
+    test suite only (no group configuration functions are called).</p>
+
+    <p>The group specification feature, exactly as it has been presented in this section, can also
+    be used in <seealso marker="run_test_chapter#test_specifications">Test
+    Specifications</seealso> (with some extra features added). Please see below.</p>
+   </section>
+      
+
   <section>
     <title>Running the interactive shell mode</title>
     
@@ -266,9 +442,9 @@
       for trying out various operations during test suite development.</p>
 
     <p>To invoke the interactive shell mode, you can start an Erlang shell 
-      manually and call <c>ct:install/1</c> to install any configuration
+      manually and call <c><seealso marker="ct#install-1">ct:install/1</seealso></c> to install any configuration
       data you might need (use <c>[]</c> as argument otherwise), then
-      call <c>ct:start_interactive/0</c> to start Common Test. If you use
+      call <c><seealso marker="ct#start_interactive-0">ct:start_interactive/0</seealso></c> to start Common Test. If you use
       the <c>ct_run</c> program, you may start the Erlang shell and Common Test
       in the same go by using the <c>-shell</c> and, optionally, the <c>-config</c>
       and/or <c>-userconfig</c> flag. Examples:
@@ -287,7 +463,8 @@
     
     <p>If any functions using "required config data" (e.g. ct_telnet or
       ct_ftp functions) are to be called from the erlang shell, config
-      data must first be required with <c>ct:require/[1,2]</c>. This is
+      data must first be required with <c><seealso marker="ct#require-1">
+      ct:require/1/2</seealso></c>. This is
       equivalent to a <c>require</c> statement in the <seealso
 	marker="write_test_chapter#suite">Test Suite Info 
 	Function</seealso> or in the <seealso
@@ -314,11 +491,11 @@
       is not supported.</p>
     
     <p>If you wish to exit the interactive mode (e.g. to start an
-      automated test run with <c>ct:run_test/1</c>), call the function 
-      <c>ct:stop_interactive/0</c>. This shuts down the
+      automated test run with <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>), call the function
+      <c><seealso marker="ct#stop_interactive-0">ct:stop_interactive/0</seealso></c>. This shuts down the
       running <c>ct</c> application. Associations between
       configuration names and data created with <c>require</c> are 
-      consequently deleted. <c>ct:start_interactive/0</c> will get you 
+      consequently deleted. <c><seealso marker="ct#start_interactive-0">ct:start_interactive/0</seealso></c> will get you
       back into interactive mode, but the previous state is not restored.</p>
   </section>
 
@@ -326,7 +503,7 @@
     <title>Step by step execution of test cases with the Erlang Debugger</title>
    
     <p>By means of <c>ct_run -step [opts]</c>, or by passing the 
-       <c>{step,Opts}</c> option to <c>ct:run_test/1</c>, it is possible
+       <c>{step,Opts}</c> option to <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>, it is possible
        to get the Erlang Debugger started automatically and use its
        graphical interface to investigate the state of the current test 
        case and to execute it step by step and/or set execution breakpoints.</p>
@@ -352,35 +529,38 @@
 
   <marker id="test_specifications"></marker>
   <section>
-    <title>Using test specifications</title>
+    <title>Test Specifications</title>
     
     <p>The most flexible way to specify what to test, is to use a so
       called test specification. A test specification is a sequence of
-      Erlang terms. The terms may be declared in a text file or passed
-      to the test server at runtime as a list
-      (see <c>run_testspec/1</c> in the manual page
-      for <c>ct</c>). There are two general types of terms:
-      configuration terms and test specification terms.</p>
+      Erlang terms. The terms are normally declared in a text file (see
+      <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>), but
+      may also be passed to Common Test on the form of a list (see
+      <c><seealso marker="ct#run_testspec-1">ct:run_testspec/1</seealso></c>).
+      There are two general types of terms: configuration terms and test
+      specification terms.</p>
     <p>With configuration terms it is possible to e.g. label the test
       run (similar to <c>ct_run -label</c>), evaluate arbitrary expressions
-      before starting a test, import configuration
-      data (similar to
-      <c>ct_run -config/-userconfig</c>), specify HTML log directories (similar
-      to
-      <c>ct_run -logdir</c>), give aliases to test nodes and test
-      directories (to make a specification easier to read and
-      maintain), enable code coverage analysis (see
-      the <seealso marker="cover_chapter#cover">Code Coverage
-      Analysis</seealso> chapter) and specify event_handler plugins
-      (see the <seealso marker="event_handler_chapter#event_handling">
-      Event Handling</seealso> chapter). There is also a term for
-      specifying include directories that should be passed on to the
-      compiler when automatic compilation is performed (similar
-      to <c>ct_run -include</c>, see above).</p>
+      before starting the test, import configuration data (similar to
+      <c>ct_run -config/-userconfig</c>), specify the top level HTML log
+      directory (similar to <c>ct_run -logdir</c>), enable code coverage
+      analysis (similar to <c>ct_run -cover</c>), install Common Test Hooks
+      (similar to <c>ct_run -ch_hooks</c>), install event_handler plugins
+      (similar to <c>ct_run -event_handler</c>), specify include directories
+      that should be passed to the compiler for automatic compilation
+      (similar to <c>ct_run -include</c>), disable the auto compilation
+      feature (similar to <c>ct_run -no_auto_compile</c>), set verbosity
+      levels (similar to <c>ct_run -verbosity</c>), and more.</p>
+    <p>Configuration terms can be combined with <c>ct_run</c> start flags,
+      or <c>ct:run_test/1</c> options. The result will for some flags/options
+      and terms be that the values are merged (e.g. configuration files,
+      include directories, verbosity levels, silent connections), and for
+      others that the start flags/options override the test specification
+      terms (e.g. log directory, label, style sheet, auto compilation).</p>
     <p>With test specification terms it is possible to state exactly
       which tests should run and in which order. A test term specifies
-      either one or more suites, one or more test case groups, or one
-      or more test cases in a group or suite.</p>
+      either one or more suites, one or more test case groups (possibly nested),
+      or one or more test cases in a group (or in multiple groups) or in a suite.</p>
     <p>An arbitrary number of test terms may be declared in sequence.
       Common Test will by default compile the terms into one or more tests 
       to be performed in one resulting test run. Note that a term that
@@ -391,49 +571,69 @@
       S, is a test of all cases in S. However, if a term specifying
       test case X and Y in S is merged with a term specifying case Z
       in S, the result is a test of X, Y and Z in S. To disable this
-      behaviour, it is possible in test specification to set the 
-      <c>merge_tests</c> term to <c>false</c>.</p>
+      behaviour, i.e. to instead perform each test sequentially in a "script-like"
+      manner, the term <c>merge_tests</c> can be set to <c>false</c> in
+      the test specification.</p>
     <p>A test term can also specify one or more test suites, groups,
       or test cases to be skipped. Skipped suites, groups and cases
-      are not executed and show up in the HTML test log files as
+      are not executed and show up in the HTML log files as
       SKIPPED.</p>
     <p>When a test case group is specified, the resulting test
-      executes the
-      <c>init_per_group</c> function, followed by all test cases and
-      sub groups (including their configuration functions), and
+      executes the <c>init_per_group</c> function, followed by all test
+      cases and sub groups (including their configuration functions), and
       finally the <c>end_per_group</c> function. Also if particular
       test cases in a group are specified, <c>init_per_group</c>
       and <c>end_per_group</c> for the group in question are
       called. If a group which is defined (in <c>Suite:group/0</c>) to
-      be a sub group of another group, is specified (or particular test
+      be a sub group of another group, is specified (or if particular test
       cases of a sub group are), Common Test will call the configuration
       functions for the top level groups as well as for the sub group
       in question (making it possible to pass configuration data all
       the way from <c>init_per_suite</c> down to the test cases in the
       sub group).</p>
-
-    <p>With the <c>GroupSpec</c> element (below) it's possible to specify
-      group execution properties that will override those specified in the
+    <p>The test specification utilizes the same mechanism for specifying
+      test case groups by means of names and paths, as explained in the
+      <seealso marker="run_test_chapter#group_execution">Group Execution</seealso>
+      section above, with the addition of the <c>GroupSpec</c> element
+      described next.</p>
+    <p>The <c>GroupSpec</c> element makes it possible to specify
+      group execution properties that will override those in the
       group definition (i.e. in <c>groups/0</c>). Execution properties for
       sub-groups may be overridden as well. This feature makes it possible to
       change properties of groups at the time of execution,
-      without even having to edit the test suite. More detailed documentation,
-      and examples, can be found in the
-      <seealso marker="write_test_chapter#test_case_groups">
+      without even having to edit the test suite. The very same
+      feature is available for <c>group</c> elements in the <c>Suite:all/0</c>
+      list. Therefore, more detailed documentation, and examples, can be
+      found in the <seealso marker="write_test_chapter#test_case_groups">
       Test case groups</seealso> chapter.</p>
 
     <p>Below is the test specification syntax. Test specifications can
       be used to run tests both in a single test host environment and
       in a distributed Common Test environment (Large Scale
-      Testing). The node parameters in the init term are only
+      Testing). The node parameters in the <c>init</c> term are only
       relevant in the latter (see the
       <seealso marker="ct_master_chapter#test_specifications">Large
-      Scale Testing</seealso> chapter for information). For details on
-      the event_handler term, see the
+      Scale Testing</seealso> chapter for information). For more information
+      about the various terms, please see the corresponding sections in the
+      User's Guide, such as e.g. the
+      <seealso marker="run_test_chapter#ct_run"><c>ct_run</c>
+      program</seealso> for an overview of available start flags
+      (since most flags have a corresponding configuration term), and
+      more detailed explanation of e.g.
+      <seealso marker="write_test_chapter#logging">Logging</seealso>
+      (for the <c>verbosity</c>, <c>stylesheet</c> and <c>basic_html</c> terms),
+      <seealso marker="config_file_chapter#top">External Configuration Data</seealso>
+      (for the <c>config</c> and <c>userconfig</c> terms),      
       <seealso marker="event_handler_chapter#event_handling">Event
-      Handling</seealso> chapter.</p>
+      Handling</seealso> (for the <c>event_handler</c> term),
+      <seealso marker="ct_hooks_chapter#installing">Common Test Hooks</seealso>
+      (for the <c>ct_hooks</c> term), etc.</p>
       <p>Config terms:</p>
     <pre>
+      {merge_tests, Bool}.
+
+      {define, Constant, Value}.
+
       {node, NodeAlias, Node}.
 
       {init, InitOptions}.
@@ -442,6 +642,15 @@
       {label, Label}.
       {label, NodeRefs, Label}.
 
+      {verbosity, VerbosityLevels}.
+      {verbosity, NodeRefs, VerbosityLevels}.
+
+      {stylesheet, CSSFile}.
+      {stylesheet, NodeRefs, CSSFile}.
+
+      {silent_connections, ConnTypes}.
+      {silent_connections, NodeRefs, ConnTypes}.
+
       {multiply_timetraps, N}.
       {multiply_timetraps, NodeRefs, N}.
 
@@ -451,22 +660,29 @@
       {cover, CoverSpecFile}.
       {cover, NodeRefs, CoverSpecFile}.
       
+      {cover_stop, Bool}.
+      {cover_stop, NodeRefs, Bool}.
+
       {include, IncludeDirs}.
       {include, NodeRefs, IncludeDirs}.
 
+      {auto_compile, Bool},
+      {auto_compile, NodeRefs, Bool},
+
       {config, ConfigFiles}.
+      {config, ConfigDir, ConfigBaseNames}.
       {config, NodeRefs, ConfigFiles}.
+      {config, NodeRefs, ConfigDir, ConfigBaseNames}.
 
       {userconfig, {CallbackModule, ConfigStrings}}.
       {userconfig, NodeRefs, {CallbackModule, ConfigStrings}}.
       
-      {alias, DirAlias, Dir}.
-
-      {merge_tests, Bool}.
-      
       {logdir, LogDir}.                                        
       {logdir, NodeRefs, LogDir}.
 
+      {logopts, LogOpts}.
+      {logopts, NodeRefs, LogOpts}.
+
       {create_priv_dir, PrivDirOption}.
       {create_priv_dir, NodeRefs, PrivDirOption}.
       
@@ -479,83 +695,177 @@
       {ct_hooks, NodeRefs, CTHModules}.
 
       {enable_builtin_hooks, Bool}.
-    </pre>
+      
+      {basic_html, Bool}.
+      {basic_html, NodeRefs, Bool}.
+
+      {release_shell, Bool}.</pre>
+
       <p>Test terms:</p>
     <pre>
-      {suites, DirRef, Suites}.                                
-      {suites, NodeRefs, DirRef, Suites}.
+      {suites, Dir, Suites}.                                
+      {suites, NodeRefs, Dir, Suites}.
       
-      {groups, DirRef, Suite, Groups}.
-      {groups, NodeRefsDirRef, Suite, Groups}.
+      {groups, Dir, Suite, Groups}.
+      {groups, NodeRefs, Dir, Suite, Groups}.
 
-      {groups, DirRef, Suite, GroupSpec, {cases,Cases}}.
-      {groups, NodeRefsDirRef, Suite, GroupSpec, {cases,Cases}}.
+      {groups, Dir, Suite, Groups, {cases,Cases}}.
+      {groups, NodeRefs, Dir, Suite, Groups, {cases,Cases}}.
 
-      {cases, DirRef, Suite, Cases}.                           
-      {cases, NodeRefs, DirRef, Suite, Cases}.
+      {cases, Dir, Suite, Cases}.                           
+      {cases, NodeRefs, Dir, Suite, Cases}.
 
-      {skip_suites, DirRef, Suites, Comment}.
-      {skip_suites, NodeRefs, DirRef, Suites, Comment}.
+      {skip_suites, Dir, Suites, Comment}.
+      {skip_suites, NodeRefs, Dir, Suites, Comment}.
 
-      {skip_groups, DirRef, Suite, GroupNames, Comment}.
-      {skip_groups, NodeRefs, DirRef, Suite, GroupNames, Comment}.
+      {skip_groups, Dir, Suite, GroupNames, Comment}.
+      {skip_groups, NodeRefs, Dir, Suite, GroupNames, Comment}.
       
-      {skip_cases, DirRef, Suite, Cases, Comment}.
-      {skip_cases, NodeRefs, DirRef, Suite, Cases, Comment}.
-    </pre>
+      {skip_cases, Dir, Suite, Cases, Comment}.
+      {skip_cases, NodeRefs, Dir, Suite, Cases, Comment}.</pre>
+
       <p>Types:</p>
     <pre>
-      NodeAlias     = atom()
-      InitOptions   = term()
-      Node          = node()
-      NodeRef       = NodeAlias | Node | master
-      NodeRefs      = all_nodes | [NodeRef] | NodeRef
-      N             = integer()
-      Bool          = true | false
-      CoverSpecFile = string()
-      IncludeDirs   = string() | [string()]
-      ConfigFiles   = string() | [string()]
-      DirAlias      = atom()
-      Dir           = string()
-      LogDir        = string()
-      PrivDirOption = auto_per_run | auto_per_tc | manual_per_tc
-      EventHandlers = atom() | [atom()]
-      InitArgs      = [term()]
-      CTHModules    = [CTHModule | {CTHModule, CTHInitArgs} | {CTHModule, CTHInitArgs, CTHPriority}]
-      CTHModule     = atom()
-      CTHInitArgs   = term()
-      DirRef        = DirAlias | Dir
-      Suites        = atom() | [atom()] | all
-      Suite         = atom()
-      Groups        = GroupSpec | [GroupSpec] | all
-      GroupSpec     = GroupName | {GroupName,Properties} | {GroupName,Properties,GroupSpec}
-      GroupName     = atom()
-      GroupNames    = GroupName | [GroupName]
-      Cases         = atom() | [atom()] | all
-      Comment       = string() | ""
-    </pre>
-    <p>Example:</p>
+      Bool            = true | false
+      Constant        = atom()
+      Value           = term()
+      NodeAlias       = atom()
+      Node            = node()
+      NodeRef         = NodeAlias | Node | master
+      NodeRefs        = all_nodes | [NodeRef] | NodeRef
+      InitOptions     = term()
+      Label           = atom() | string()
+      VerbosityLevels = integer() | [{Category,integer()}]
+      Category        = atom()
+      CSSFile         = string()
+      ConnTypes       = all | [atom()]
+      N               = integer()
+      CoverSpecFile   = string()
+      IncludeDirs     = string() | [string()]
+      ConfigFiles     = string() | [string()]
+      ConfigDir       = string()
+      ConfigBaseNames = string() | [string()]
+      CallbackModule  = atom()
+      ConfigStrings   = string() | [string()]
+      LogDir          = string()
+      LogOpts         = [term()]
+      PrivDirOption   = auto_per_run | auto_per_tc | manual_per_tc
+      EventHandlers   = atom() | [atom()]
+      InitArgs        = [term()]
+      CTHModules      = [CTHModule | {CTHModule, CTHInitArgs} | {CTHModule, CTHInitArgs, CTHPriority}]
+      CTHModule       = atom()
+      CTHInitArgs     = term()
+      Dir             = string()
+      Suites          = atom() | [atom()] | all
+      Suite           = atom()
+      Groups          = GroupPath | [GroupPath] | GroupSpec | [GroupSpec] | all
+      GroupPath       = [GroupName]
+      GroupSpec       = GroupName | {GroupName,Properties} | {GroupName,Properties,GroupSpec}
+      GroupName       = atom()
+      GroupNames      = GroupName | [GroupName]
+      Cases           = atom() | [atom()] | all
+      Comment         = string() | ""</pre>
+
+    <p>The difference between the <c>config</c> terms above, is that with
+      <c>ConfigDir</c>, <c>ConfigBaseNames</c> is a list of base names,
+      i.e. without directory paths. <c>ConfigFiles</c> must be full names,
+      including paths. E.g, these two terms have the same meaning:</p>
     <pre>
-      {logdir, "/home/test/logs"}.
+      {config, ["/home/testuser/tests/config/nodeA.cfg",
+                "/home/testuser/tests/config/nodeB.cfg"]}.
+
+      {config, "/home/testuser/tests/config", ["nodeA.cfg","nodeB.cfg"]}.</pre>
+
+    <note><p>Any relative paths specified in the test specification, will be
+	relative to the directory which contains the test specification file, if
+	<c>ct_run -spec TestSpecFile ...</c> or
+	<c>ct:run:test([{spec,TestSpecFile},...])</c>
+	executes the test. The path will be relative to the top level log directory, if
+	<c>ct:run:testspec(TestSpec)</c> executes the test.</p></note>
       
-      {config, "/home/test/t1/cfg/config.cfg"}.
-      {config, "/home/test/t2/cfg/config.cfg"}.
-      {config, "/home/test/t3/cfg/config.cfg"}.
+    <p>The <c>define</c> term introduces a constant, which is used to
+      replace the name <c>Constant</c> with <c>Value</c>, wherever it's found in
+      the test specification. This replacement happens during an initial iteration
+      through the test specification. Constants may be used anywhere in the test
+      specification, e.g. in arbitrary lists and tuples, and even in strings
+      and inside the value part of other constant definitions! A constant can
+      also be part of a node name, but that is the only place where a constant
+      can be part of an atom.</p>
+    
+    <note><p>For the sake of readability, the name of the constant must always
+	begin with an upper case letter, or a <c>$</c>, <c>?</c>, or <c>_</c>.
+	This also means that it must always be single quoted (obviously, since
+	the constant name is actually an atom, not text).</p></note>
+
+    <p>The main benefit of constants is that they can be used to reduce the size
+      (and avoid repetition) of long strings, such as file paths. Compare these
+      terms:</p>
+
+    <pre>
+      %% 1a. no constant
+      {config, "/home/testuser/tests/config", ["nodeA.cfg","nodeB.cfg"]}.
+      {suites, "/home/testuser/tests/suites", all}.
       
-      {alias, t1, "/home/test/t1"}.
-      {alias, t2, "/home/test/t2"}.
-      {alias, t3, "/home/test/t3"}.
+      %% 1b. with constant
+      {define, 'TESTDIR', "/home/testuser/tests"}.
+      {config, "'TESTDIR'/config", ["nodeA.cfg","nodeB.cfg"]}.
+      {suites, "'TESTDIR'/suites", all}.
+
+      %% 2a. no constants
+      {config, [testnode@host1, testnode@host2], "../config", ["nodeA.cfg","nodeB.cfg"]}.
+      {suites, [testnode@host1, testnode@host2], "../suites", [x_SUITE, y_SUITE]}.
+
+      %% 2b. with constants
+      {define, 'NODE', testnode}.
+      {define, 'NODES', ['NODE'@host1, 'NODE'@host2]}.
+      {config, 'NODES', "../config", ["nodeA.cfg","nodeB.cfg"]}.
+      {suites, 'NODES', "../suites", [x_SUITE, y_SUITE]}.</pre>
+
+    <p>Constants make the test specification term <c>alias</c>, in previous
+      versions of Common Test, redundant. This term has been deprecated but will
+      remain supported in upcoming Common Test releases. Replacing <c>alias</c>
+      terms with <c>define</c> is strongly recommended though! Here's an example
+      of such a replacement:</p>
+
+    <pre>
+      %% using the old alias term
+      {config, "/home/testuser/tests/config/nodeA.cfg"}.
+      {alias, suite_dir, "/home/testuser/tests/suites"}.
+      {groups, suite_dir, x_SUITE, group1}.
+
+      %% replacing with constants
+      {define, 'TestDir', "/home/testuser/tests"}.
+      {define, 'CfgDir', "'TestDir'/config"}.
+      {define, 'SuiteDir', "'TestDir'/suites"}.
+      {config, 'CfgDir', "nodeA.cfg"}.
+      {groups, 'SuiteDir', x_SUITE, group1}.</pre>
+
+    <p>Actually, constants could well replace the <c>node</c> term too, but
+      this still has declarative value, mainly when used in combination
+      with <c>NodeRefs == all_nodes</c> (see types above).</p>
+
+    <p>Here follows a simple test specification example:</p>
+    <pre>
+      {define, 'Top', "/home/test"}.
+      {define, 'T1', "'Top'/t1"}.
+      {define, 'T2', "'Top'/t2"}.
+      {define, 'T3', "'Top'/t3"}.
+      {define, 'CfgFile', "config.cfg"}.
+
+      {logdir, "'Top'/logs"}.
       
-      {suites, t1, all}.
-      {skip_suites, t1, [t1B_SUITE,t1D_SUITE], "Not implemented"}.
-      {skip_cases, t1, t1A_SUITE, [test3,test4], "Irrelevant"}.
-      {skip_cases, t1, t1C_SUITE, [test1], "Ignore"}.
+      {config, ["'T1'/'CfgFile'", "'T2'/'CfgFile'", "'T3'/'CfgFile'"]}.
       
-      {suites, t2, [t2B_SUITE,t2C_SUITE]}.
-      {cases, t2, t2A_SUITE, [test4,test1,test7]}.
+      {suites, 'T1', all}.
+      {skip_suites, 'T1', [t1B_SUITE,t1D_SUITE], "Not implemented"}.
+      {skip_cases, 'T1', t1A_SUITE, [test3,test4], "Irrelevant"}.
+      {skip_cases, 'T1', t1C_SUITE, [test1], "Ignore"}.
       
-      {skip_suites, t3, all, "Not implemented"}.
-    </pre>
+      {suites, 'T2', [t2B_SUITE,t2C_SUITE]}.
+      {cases, 'T2', t2A_SUITE, [test4,test1,test7]}.
+      
+      {skip_suites, 'T3', all, "Not implemented"}.</pre>
+
     <p>The example specifies the following:</p>
     <list>
       <item>The specified logdir directory will be used for storing 
@@ -563,8 +873,6 @@
 	date and time).</item>
       <item>The variables in the specified test system config files will be 
 	imported for the test.</item>
-      <item>Aliases are given for three test system directories. The suites in
-	this example are stored in "/home/test/tX/test".</item>
       <item>The first test to run includes all suites for system t1. Excluded from
 	the test are however the t1B and t1D suites. Also test cases test3 and
 	test4 in t1A as well as the test1 case in t1C are excluded from
@@ -575,9 +883,9 @@
       <item>Lastly, all suites for systems t3 are to be completely skipped and this
 	should be explicitly noted in the log files.</item>
     </list>
-    <p>It is possible to specify initialization options for nodes defined in the
-      test specification. Currently, there are options to start the node and/or to
-      evaluate any function on the node.
+    <p>With the <c>init</c> term it's possible to specify initialization options
+      for nodes defined in the test specification. Currently, there are options
+      to start the node and/or to evaluate any function on the node.
       See the <seealso marker="ct_master_chapter#ct_slave">Automatic startup of
       the test target nodes</seealso> chapter for details.</p>
     <p>It is possible for the user to provide a test specification that
@@ -586,11 +894,49 @@
       <c>ct_run</c>. This forces Common Test to ignore unrecognizable terms.
       Note that in this mode, Common Test is not able to check the specification 
       for errors as efficiently as if the scanner runs in default mode. 
-      If <c>ct:run_test/1</c> is used for starting the tests, the relaxed scanner 
+      If <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> is used for starting the tests, the relaxed scanner
       mode is enabled by means of the tuple: <c>{allow_user_terms,true}</c></p>
   </section>
+
+  <section>
+    <title>Running tests from the Web based GUI</title>
+    
+    <p>The web based GUI, VTS, is started with the
+      <c><seealso marker="run_test_chapter#ct_run">ct_run</seealso></c>
+      program. From the GUI you can load config files, and select
+      directories, suites and cases to run. You can also state the
+      config files, directories, suites and cases on the command line
+      when starting the web based GUI.
+    </p>
+    
+    <list>
+      <item><c>ct_run -vts</c></item>
+      <item><c><![CDATA[ct_run -vts -config <configfilename>]]></c></item>
+      <item><c><![CDATA[ct_run -vts -config <configfilename> -suite <suitewithfullpath>
+	      -case <casename>]]></c></item>
+    </list>
+    
+    <p>From the GUI you can run tests and view the result and the logs.
+    </p>
+    
+    <p>Note that <c>ct_run -vts</c> will try to open the Common Test start
+      page in an existing web browser window or start the browser if it is
+      not running. Which browser should be started may be specified with
+      the browser start command option:</p>
+      <p><c><![CDATA[ct_run -vts -browser <browser_start_cmd>]]></c></p>
+      <p>Example:</p>
+      <p><c><![CDATA[$ ct_run -vts -browser 'firefox&']]></c></p>
+      <p>Note that the browser must run as a separate OS process or VTS will hang!</p>
+      <p>If no specific browser start command is specified, Firefox will
+        be the default browser on Unix platforms and Internet Explorer on Windows.
+	If Common Test fails to start a browser automatically, or <c>'none'</c> is
+	specified as the value for -browser (i.e. <c>-browser none</c>), start your
+	favourite browser manually and type in the URL that Common Test
+	displays in the shell.</p>    
+  </section>
   
   <section>
+    <marker id="log_files"></marker>
     <title>Log files</title>
     
     <p>As the execution of the test suites proceed, events are logged in
@@ -718,17 +1064,30 @@
 	  <p>instead of each <c>x</c> printed on a new line, which is the default behaviour.</p>
 	</section>
 
+	<section>
+	  <marker id="table_sorting"></marker>
+	  <title>Sorting HTML table columns</title>
+	  <p>By clicking the name in the column header of any table (e.g. "Ok", "Case", "Time", etc),
+	    the table rows are sorted in whatever order makes sense for the type of value (e.g.
+	    numerical for "Ok" or "Time", and alphabetical for "Case"). The sorting is performed
+	    by means of JavaScript code, automatically inserted into the HTML log files. Common Test
+	    uses the <url href="http://jquery.com">jQuery</url> library and the
+	    <url href="http://tablesorter.com">tablesorter</url> plugin, with customized sorting
+	    functions, for this implementation.</p>
+	</section>
       </section>
   
       <section>
 	<marker id="html_stylesheet"></marker>
 	<title>HTML Style Sheets</title>
-	<p>Common Test uses a CSS file to control the look of the HTML
-	  files generated during test runs. If, for some reason, the
-	  log files are not displayed correctly in the HTML browser of your
-	  choice, or you prefer the "pre Common Test v1.6 look"
-	  of the log files (i.e. not using CSS), use the start flag/option
-	  <c>basic_html</c> to revert to the old style.</p>
+	<p>Common Test uses an HTML Style Sheet (CSS file) to control the look of
+	  the HTML log files generated during test runs. If, for some reason, the
+	  log files are not displayed correctly in the browser of your
+	  choice, or you prefer a more primitive ("pre Common Test v1.6") look
+	  of the logs, use the start flag/option:</p>
+	<pre>basic_html</pre>
+	<p>This disables the use of Style Sheets, as well as JavaScripts (see
+	  table sorting above).</p>
 	  
 	<p>Common Test includes an <em>optional</em> feature to allow
 	  user HTML style sheets for customizing printouts. The
@@ -881,75 +1240,82 @@
   <section>
     <marker id="silent_connections"></marker>
       <title>Silent Connections</title>
-      <p>The protocol handling processes in Common Test, implemented by ct_telnet, ct_ftp etc,
-	do verbose printing to the test case logs. This can be switched off by means
-	of the <c>-silent_connections</c> flag:</p>
+      <p>The protocol handling processes in Common Test, implemented by ct_telnet,
+      ct_ssh, ct_ftp etc, do verbose printing to the test case logs. This can be switched off
+      by means of the <c>-silent_connections</c> flag:</p>
       
       <pre>
 	ct_run -silent_connections [conn_types]
       </pre>
       
-      <p>where <c>conn_types</c> specifies <c>telnet, ftp, rpc</c> and/or <c>snmp</c>.</p>
+      <p>where <c>conn_types</c> specifies <c>ssh, telnet, ftp, rpc</c> and/or <c>snmp</c>.</p>
       
       <p>Example:</p>
       
       <pre>
-	ct_run ... -silent_connections telnet ftp</pre>
-      <p>switches off logging for telnet and ftp connections.</p>
+	ct_run ... -silent_connections ssh telnet</pre>
+      <p>switches off logging for ssh and telnet connections.</p>
       
       <pre>
 	ct_run ... -silent_connections</pre>
       <p>switches off logging for all connection types.</p>
       
       
-      <p>Basic and important information such as opening and closing a connection,
-	fatal communication error and reconnection attempts will always be printed even 
-	if logging has been suppressed for the connection type in question. However, operations
-	such as sending and receiving data may be performed silently.</p>
+      <p>Fatal communication error and reconnection attempts will always be printed even 
+      if logging has been suppressed for the connection type in question. However, operations
+      such as sending and receiving data will be performed silently.</p>
       
       <p>It is possible to also specify <c>silent_connections</c> in a test suite. This is
 	accomplished by returning a tuple, <c>{silent_connections,ConnTypes}</c>, in the
 	<c>suite/0</c> or test case info list. If <c>ConnTypes</c> is a list of atoms 
-	(<c>telnet, ftp, rpc</c> and/or <c>snmp</c>), output for any corresponding connections 
+	(<c>ssh, telnet, ftp, rpc</c> and/or <c>snmp</c>), output for any corresponding connections 
 	will be suppressed. Full logging is per default enabled for any connection of type not 
 	specified in <c>ConnTypes</c>. Hence, if <c>ConnTypes</c> is the empty list, logging 
 	is enabled for all connections.</p>
       
-      <p>The <c>silent_connections</c> setting returned from a test case info function overrides,
-	for the test case in question, any setting made with <c>suite/0</c> (which is the setting 
-	used for all cases in the suite). Example:</p>
+	<p>Example:</p>
       
       <pre>
 	
 	-module(my_SUITE).
+
+	suite() -> [..., {silent_connections,[telnet,ssh]}, ...].
+
 	...
-	suite() -> [..., {silent_connections,[telnet,ftp]}, ...].
-	...
+
 	my_testcase1() ->
-	[{silent_connections,[ftp]}].
+	    [{silent_connections,[ssh]}].
+
 	my_testcase1(_) ->
-	...
+	    ...
+
 	my_testcase2(_) ->
-	...
+	    ...
       </pre>
       
       <p>In this example, <c>suite/0</c> tells Common Test to suppress
-	printouts from telnet and ftp connections. This is valid for
+	printouts from telnet and ssh connections. This is valid for
 	all test cases. However, <c>my_testcase1/0</c> specifies that
-	for this test case, only ftp should be silent. The result is
+	for this test case, only ssh should be silent. The result is
 	that <c>my_testcase1</c> will get telnet info (if any) printed
-	in the log, but not ftp info. <c>my_testcase2</c> will get no
+	in the log, but not ssh info. <c>my_testcase2</c> will get no
 	info from either connection printed.</p>
       
-      <p>The <c>-silent_connections</c> tag (or
-	<c>silent_connections</c> tagged tuple in the call to
-	<c>ct:run_test/1</c>) overrides any settings in the test
-	suite.</p>
+	<p><c>silent_connections</c> may also be specified with a term
+	in a test specification
+	(see <seealso marker="run_test_chapter#test_specifications">Test
+	Specifications</seealso>). Connections provided with the
+	<c>silent_connections</c> start	flag/option, will be merged with
+	any connections listed in the test specification.</p>
+
+	<p>The <c>silent_connections</c> start flag/option and test
+	specification term, overrides any settings made by the info functions
+	inside the test suite.</p>
       
-      <p>Note that in the current Common Test version, the
+      <note><p>Note that in the current Common Test version, the
 	<c>silent_connections</c> feature only works for telnet
-	connections. Support for other connection types will be added
-	in future Common Test versions.</p>
+	and ssh connections! Support for other connection types will be added
+	in future Common Test versions.</p></note>
       
   </section>
 </chapter>
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 7b7e7af8ea..248d7de8b6 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -47,7 +47,7 @@
       module for details about these functions.</p>
     
     <p>The CT application also includes other modules named 
-      <c><![CDATA[ct_<something>]]></c> that
+      <c><![CDATA[ct_<component>]]></c> that
       provide various support, mainly simplified use of communication
       protocols such as rpc, snmp, ftp, telnet, etc.</p>
 
@@ -173,7 +173,7 @@
     </p>
 
     <p>The <c>end_per_testcase/2</c> function is called even after a
-      test case terminates due to a call to <c>ct:abort_current_testcase/1</c>,
+      test case terminates due to a call to <c><seealso marker="ct#abort_current_testcase-1">ct:abort_current_testcase/1</seealso></c>,
       or after a timetrap timeout. However, <c>end_per_testcase</c>
       will then execute on a different process than the test case
       function, and in this situation, <c>end_per_testcase</c> will
@@ -243,7 +243,8 @@
 
     <note><p>The test case function argument <c>Config</c> should not be 
 	confused with the information that can be retrieved from 
-	configuration files (using ct:get_config/[1,2]). The Config argument 
+	configuration files (using <c><seealso marker="ct#get_config-1">
+	ct:get_config/1/2</seealso></c>). The Config argument
 	should be used for runtime configuration of the test suite and the 
 	test cases, while configuration files should typically contain data 
 	related to the SUT. These two types of configuration data are handled 
@@ -302,7 +303,7 @@
 	<item>
 	  <p>
 	    Use this to specify arbitrary data related to the testcase. This
-	    data can be retrieved at any time using the <c>ct:userdata/3</c> 
+	    data can be retrieved at any time using the <c><seealso marker="ct#userdata-3">ct:userdata/3</seealso></c>
 	    utility function.
 	  </p>
 	</item>
@@ -338,7 +339,8 @@
 
 	  <pre>
 	    testcase2() -> 
-	        [{require, unix_telnet, {unix, [telnet, username, password]}},
+	        [{require, unix_telnet, unix},
+		 {require, {unix, [telnet, username, password]}},
 	         {default_config, unix, [{telnet, "my_telnet_host"},
 	                                 {username, "aladdin"},
 	                                 {password, "sesame"}]}}].</pre>
@@ -346,7 +348,8 @@
       </taglist>
 
 	<p>See the <seealso marker="config_file_chapter#require_config_data">Config files</seealso>
-	  chapter and the <c>ct:require/[1,2]</c> function in the
+	  chapter and the <c><seealso marker="ct#require-1">
+	  ct:require/1/2</seealso></c> function in the
 	   <seealso marker="ct">ct</seealso> reference manual for more information about
 	   <c>require</c>.</p>
 
@@ -823,7 +826,7 @@
       Common Test to create one dedicated private directory per
       test case and execution instead. This is accomplished by means of
       the flag/option: <c>create_priv_dir</c> (to be used with the
-      <c>ct_run</c> program, the <c>ct:run_test/1</c> function, or
+      <c>ct_run</c> program, the <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> function, or
       as test specification term). There are three possible values
       for this option:
       <list>
@@ -839,7 +842,7 @@
       become very inefficient for test runs with many test cases and/or
       repetitions. Therefore, in case the manual version is instead used, the
       test case must tell Common Test to create priv_dir when it needs it.
-      It does this by calling the function <c>ct:make_priv_dir/0</c>.
+      It does this by calling the function <c><seealso marker="ct#make_priv_dir-0">ct:make_priv_dir/0</seealso></c>.
       </p>
 
       <note><p>You should not depend on current working directory for
@@ -883,11 +886,11 @@
     of its sub-groups. If a timetrap value is defined by <c>group/1</c>
     for a sub-group, it overrides that of its higher level groups. Timetrap
     values set by individual test cases (by means of the test case info
-    function) overrides both group- and suite- level timetraps.</p>
+    function) override both group- and suite- level timetraps.</p>
     
     <p>It is also possible to dynamically set/reset a timetrap during the
     excution of a test case, or configuration function. This is done by calling
-    <c>ct:timetrap/1</c>. This function cancels the current timetrap
+    <c><seealso marker="ct#timetrap-1">ct:timetrap/1</seealso></c>. This function cancels the current timetrap
     and starts a new one (that stays active until timeout, or end of the
     current function).</p>
     
@@ -900,12 +903,12 @@
     
     <p>If a test case needs to suspend itself for a time that also gets
     multipled by <c>multiply_timetraps</c> (and possibly also scaled up if
-    <c>scale_timetraps</c> is enabled), the function <c>ct:sleep/1</c>
+    <c>scale_timetraps</c> is enabled), the function <c><seealso marker="ct#sleep-1">ct:sleep/1</seealso></c>
     may be used (instead of e.g. <c>timer:sleep/1</c>).</p>
     
     <p>A function (<c>fun/0</c> or <c>MFA</c>) may be specified as
     timetrap value in the suite-, group- and test case info function, as
-    well as argument to the <c>ct:timetrap/1</c> function. Examples:</p>
+    well as argument to the <c><seealso marker="ct#timetrap-1">ct:timetrap/1</seealso></c> function. Examples:</p>
 
     <p><c>{timetrap,{my_test_utils,timetrap,[?MODULE,system_start]}}</c></p>
     <p><c>ct:timetrap(fun() -> my_timetrap(TestCaseName, Config) end)</c></p>
@@ -932,6 +935,99 @@
   </section>
 
   <section>
+    <marker id="logging"></marker>
+    <title>Logging - categories and verbosity levels</title>
+    <p>Common Test provides three main functions for printing strings:</p>
+    <list>
+      <item><c>ct:log(Category, Importance, Format, Args)</c></item>
+      <item><c>ct:print(Category, Importance, Format, Args)</c></item>
+      <item><c>ct:pal(Category, Importance, Format, Args)</c></item>
+    </list>
+    <p>The <c>log/1/2/3/4</c> function will print a string to the test case
+    log file. The <c>print/1/2/3/4</c> function will print the string to screen,
+    and the <c>pal/1/2/3/4</c> function will print the same string both to file and
+    screen. (The functions are documented in the <c>ct</c> reference manual).</p>
+
+    <p>The optional <c>Category</c> argument may be used to categorize the
+    log printout, and categories can be used for two things:</p>
+    <list>
+      <item>To compare the importance of the printout to a specific
+      verbosity level, and</item>
+      <item>to format the printout according to a user specific HTML
+      Style Sheet (CSS).</item>
+    </list>
+
+    <p>The <c>Importance</c> argument specifies a level of importance
+    which, compared to a verbosity level (general and/or set per category),
+    determines if the printout should be visible or not. <c>Importance</c>
+    is an arbitrary integer in the range 0..99. Pre-defined constants
+    exist in the <c>ct.hrl</c> header file. The default importance level,
+    <c>?STD_IMPORTANCE</c> (used if the <c>Importance</c> argument is not
+    provided), is 50. This is also the importance used for standard IO, e.g.
+    from printouts made with <c>io:format/2</c>, <c>io:put_chars/1</c>, etc.</p>
+
+    <p><c>Importance</c> is compared to a verbosity level set by means of the
+    <c>verbosity</c> start flag/option. The verbosity level can be set per
+    category and/or generally. The default verbosity level, <c>?STD_VERBOSITY</c>,
+    is 50, i.e. all standard IO gets printed. If a lower verbosity level is set,
+    standard IO printouts will be ignored. Common Test performs the following test:</p>
+    <pre>Importance >= (100-VerbosityLevel)</pre>
+    <p>This also means that verbosity level 0 effectively turns all logging off
+    (with the exception of printouts made by Common Test itself).</p>
+
+    <p>The general verbosity level is not associated with any particular
+    category. This level sets the threshold for the standard IO printouts,
+    uncategorized <c>ct:log/print/pal</c> printouts, as well as
+    printouts for categories with undefined verbosity level.</p>
+
+    <p>Example:</p>
+    <pre>
+
+      Some printouts during test case execution:
+
+        io:format("1. Standard IO, importance = ~w~n", [?STD_IMPORTANCE]),
+        ct:log("2. Uncategorized, importance = ~w", [?STD_IMPORTANCE]),
+        ct:log(info, "3. Categorized info, importance = ~w", [?STD_IMPORTANCE]]),
+        ct:log(info, ?LOW_IMPORTANCE, "4. Categorized info, importance = ~w", [?LOW_IMPORTANCE]),
+        ct:log(error, "5. Categorized error, importance = ~w", [?HI_IMPORTANCE]),
+        ct:log(error, ?HI_IMPORTANCE, "6. Categorized error, importance = ~w", [?MAX_IMPORTANCE]),
+
+      If starting the test without specifying any verbosity levels:
+
+        $ ct_run ...
+
+      the following gets printed:
+      
+        1. Standard IO, importance = 50
+        2. Uncategorized, importance = 50
+        3. Categorized info, importance = 50
+        5. Categorized error, importance = 75
+        6. Categorized error, importance = 99
+
+      If starting the test with:
+        
+        $ ct_run -verbosity 1 and info 75
+      
+      the following gets printed:
+
+        3. Categorized info, importance = 50
+	4. Categorized info, importance = 25
+        6. Categorized error, importance = 99
+    </pre>
+
+    <p>How categories can be mapped to CSS tags is documented in the 
+    <seealso marker="run_test_chapter#html_stylesheet">Running Tests</seealso>
+    chapter.</p>
+
+    <p>The <c>Format</c> and <c>Args</c> arguments in <c>ct:log/print/pal</c> are
+    always passed on to the <c>io:format/3</c> function in <c>stdlib</c>
+    (please see the <c>io</c> manual page for details).</p>
+    
+    <p>For more information about log files, please see the
+    <seealso marker="run_test_chapter#log_files">Running Tests</seealso> chapter.</p>
+  </section>
+  
+  <section>
     <title>Illegal dependencies</title>
 
     <p>Even though it is highly efficient to write test suites with
@@ -941,7 +1037,6 @@
       Erlang/OTP test suites.</p>
 
     <list>
-
 	<item>Depending on current directory, and writing there:<br></br>
 	    
 	    <p>This is a common error in test suites. It is assumed that
@@ -953,19 +1048,10 @@
 	    </p>
 	</item>
 
-	<item>Depending on the Clearcase (file version control system) 
-	  paths and files:<br></br>
-	    
-	    <p>The test suites are stored in Clearcase but are not 
-	      (necessarily) run within this environment. The directory 
-	      structure may vary from test run to test run.
-	    </p>
-	</item>
-
 	<item>Depending on execution order:<br></br>
 	
-	    <p>During development of test suites, no assumption should be made
-	    (preferrably) about the execution order of the test cases or suites.
+	    <p>During development of test suites, no assumption should preferrably
+	    be made about the execution order of the test cases or suites.
 	    E.g. a test case should not assume that a server it depends on,
 	    has already been started by a previous test case. There are
 	    several reasons for this:
diff --git a/lib/common_test/include/ct.hrl b/lib/common_test/include/ct.hrl
index 5a77108e1a..bde2709ad1 100644
--- a/lib/common_test/include/ct.hrl
+++ b/lib/common_test/include/ct.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -19,3 +19,16 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
+%% the log level is used as argument to any CT logging function
+-define(MIN_IMPORTANCE, 0 ).
+-define(LOW_IMPORTANCE, 25).
+-define(STD_IMPORTANCE, 50).
+-define(HI_IMPORTANCE,  75).
+-define(MAX_IMPORTANCE, 99).
+
+%% verbosity thresholds to filter out logging printouts
+-define(MIN_VERBOSITY, 0  ).  %% turn logging off
+-define(LOW_VERBOSITY, 25 ).
+-define(STD_VERBOSITY, 50 ).
+-define(HI_VERBOSITY,  75 ).
+-define(MAX_VERBOSITY, 100).
diff --git a/lib/common_test/priv/Makefile.in b/lib/common_test/priv/Makefile.in
index d9033f6ef1..4372ab124e 100644
--- a/lib/common_test/priv/Makefile.in
+++ b/lib/common_test/priv/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2011. All Rights Reserved.
+# Copyright Ericsson AB 2003-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -60,6 +60,7 @@ FILES = vts.tool
 SCRIPTS = 
 IMAGES = tile1.jpg
 CSS = ct_default.css
+JS = jquery-latest.js jquery.tablesorter.min.js 
 
 #
 # Rules
@@ -85,12 +86,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 ifeq ($(XNIX),true)
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) $(JS) "$(RELSYSDIR)/priv"
 else
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) $(JS) "$(RELSYSDIR)/priv"
 endif
 
 release_docs_spec:
@@ -107,6 +108,7 @@ else
 FILES = vts.tool 
 IMAGES = tile1.jpg
 CSS = ct_default.css
+JS = jquery-latest.js jquery.tablesorter.min.js 
 
 #
 # Rules
@@ -125,8 +127,8 @@ clean:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) $(JS) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/common_test/priv/ct_default.css b/lib/common_test/priv/ct_default.css
index 8ae6990cd8..1188f8f676 100644
--- a/lib/common_test/priv/ct_default.css
+++ b/lib/common_test/priv/ct_default.css
@@ -136,7 +136,18 @@ th {
 }
 
 thead th {
-    background: #2C5755; text-align: center;
+    background: #3F3F3F; color: #fff; 
+    font-family: arial, sans-serif; font-size: 120%;
+    letter-spacing: -0.5px;
+    font-weight: bold; text-align: center; 
+    padding-right: .5em; vertical-align: top;
+    text-decoration: underline;
+}
+
+tfoot td {
+    font-family: arial, sans-serif; font-size: 110%;
+    letter-spacing: -0.5px;
+    font-weight: bold;
 }
 
 .odd td {
@@ -167,10 +178,6 @@ th a, td a:active {
     color: #85ABD5;
 }
 
-tfoot th, tfoot td {
-    background: #3F3F3F; color: #fff;
-}
-
 th + td {
     padding-left: .5em;
 }
diff --git a/lib/common_test/priv/jquery-latest.js b/lib/common_test/priv/jquery-latest.js
new file mode 100644
index 0000000000..ac7e7009dc
--- /dev/null
+++ b/lib/common_test/priv/jquery-latest.js
@@ -0,0 +1,154 @@
+/*!

+ * jQuery JavaScript Library v1.4.2

+ * http://jquery.com/

+ *

+ * Copyright 2010, John Resig

+ * Dual licensed under the MIT or GPL Version 2 licenses.

+ * http://jquery.org/license

+ *

+ * Includes Sizzle.js

+ * http://sizzlejs.com/

+ * Copyright 2010, The Dojo Foundation

+ * Released under the MIT, BSD, and GPL Licenses.

+ *

+ * Date: Sat Feb 13 22:33:48 2010 -0500

+ */

+(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?

+e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=

+j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,

+"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=

+true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,

+Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&

+(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,

+a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===

+"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,

+function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||

+c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",

+L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,

+"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+

+a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],

+d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===

+a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&

+!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=

+true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";

+var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,

+parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=

+false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=

+s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,

+applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];

+else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,

+a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===

+w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,

+cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",

+i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",

+" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=

+this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=

+e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=

+c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");

+a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,

+function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");

+k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),

+C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=

+null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=

+e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&

+f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;

+if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),

+fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||

+d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,

+"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=

+a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,

+isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=

+{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};

+if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",

+e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,

+"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,

+d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&

+!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},

+toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,

+u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),

+function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];

+if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,

+e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();

+t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||

+g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];

+for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-

+1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,

+CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},

+relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=

+l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];

+h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},

+CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,

+g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},

+text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},

+setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=

+h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=

+m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===

+"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,

+h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||

+!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=

+h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&

+q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";

+if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();

+(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:

+function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,

+gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;

+c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=

+{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===

+"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",

+d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?

+a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===

+1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?

+a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=

+c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},

+wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},

+prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,

+this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);

+return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,

+""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&

+this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||

+u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===

+1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);

+return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",

+""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=

+c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?

+c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=

+function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=

+Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,

+"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=

+a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=

+a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==

+"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},

+serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),

+function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,

+global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&

+e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?

+"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===

+false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=

+false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",

+c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||

+d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);

+g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===

+1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===

+"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;

+if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");

+this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],

+"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},

+animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=

+j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);

+this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===

+"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||

+c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;

+this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=

+this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,

+e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||

+c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?

+function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=

+this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;

+k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&

+f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";

+a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);

+c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,

+d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-

+f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":

+"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in

+e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);

diff --git a/lib/common_test/priv/jquery.tablesorter.min.js b/lib/common_test/priv/jquery.tablesorter.min.js
new file mode 100644
index 0000000000..b8605df1e7
--- /dev/null
+++ b/lib/common_test/priv/jquery.tablesorter.min.js
@@ -0,0 +1,4 @@
+
+(function($){$.extend({tablesorter:new
+function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i<l;i++){var p=false;if($.metadata&&($($headers[i]).metadata()&&$($headers[i]).metadata().sorter)){p=getParserById($($headers[i]).metadata().sorter);}else if((table.config.headers[i]&&table.config.headers[i].sorter)){p=getParserById(table.config.headers[i].sorter);}if(!p){p=detectParserForColumn(table,rows,-1,i);}if(table.config.debug){parsersDebug+="column:"+i+" parser:"+p.id+"\n";}list.push(p);}}if(table.config.debug){log(parsersDebug);}return list;};function detectParserForColumn(table,rows,rowIndex,cellIndex){var l=parsers.length,node=false,nodeValue=false,keepLooking=true;while(nodeValue==''&&keepLooking){rowIndex++;if(rows[rowIndex]){node=getNodeFromRowAndCellIndex(rows,rowIndex,cellIndex);nodeValue=trimAndGetNodeText(table.config,node);if(table.config.debug){log('Checking if value was empty on row:'+rowIndex);}}else{keepLooking=false;}}for(var i=1;i<l;i++){if(parsers[i].is(nodeValue,table,node)){return parsers[i];}}return parsers[0];}function getNodeFromRowAndCellIndex(rows,rowIndex,cellIndex){return rows[rowIndex].cells[cellIndex];}function trimAndGetNodeText(config,node){return $.trim(getElementText(config,node));}function getParserById(name){var l=parsers.length;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==name.toLowerCase()){return parsers[i];}}return false;}function buildCache(table){if(table.config.debug){var cacheTime=new Date();}var totalRows=(table.tBodies[0]&&table.tBodies[0].rows.length)||0,totalCells=(table.tBodies[0].rows[0]&&table.tBodies[0].rows[0].cells.length)||0,parsers=table.config.parsers,cache={row:[],normalized:[]};for(var i=0;i<totalRows;++i){var c=$(table.tBodies[0].rows[i]),cols=[];if(c.hasClass(table.config.cssChildRow)){cache.row[cache.row.length-1]=cache.row[cache.row.length-1].add(c);continue;}cache.row.push(c);for(var j=0;j<totalCells;++j){cols.push(parsers[j].format(getElementText(table.config,c[0].cells[j]),table,c[0].cells[j]));}cols.push(cache.normalized.length);cache.normalized.push(cols);cols=null;};if(table.config.debug){benchmark("Building cache for "+totalRows+" rows:",cacheTime);}return cache;};function getElementText(config,node){var text="";if(!node)return"";if(!config.supportsTextContent)config.supportsTextContent=node.textContent||false;if(config.textExtraction=="simple"){if(config.supportsTextContent){text=node.textContent;}else{if(node.childNodes[0]&&node.childNodes[0].hasChildNodes()){text=node.childNodes[0].innerHTML;}else{text=node.innerHTML;}}}else{if(typeof(config.textExtraction)=="function"){text=config.textExtraction(node);}else{text=$(node).text();}}return text;}function appendToTable(table,cache){if(table.config.debug){var appendTime=new Date()}var c=cache,r=c.row,n=c.normalized,totalRows=n.length,checkCell=(n[0].length-1),tableBody=$(table.tBodies[0]),rows=[];for(var i=0;i<totalRows;i++){var pos=n[i][checkCell];rows.push(r[pos]);if(!table.config.appender){var l=r[pos].length;for(var j=0;j<l;j++){tableBody[0].appendChild(r[pos][j]);}}}if(table.config.appender){table.config.appender(table,rows);}rows=null;if(table.config.debug){benchmark("Rebuilt table:",appendTime);}applyWidget(table);setTimeout(function(){$(table).trigger("sortEnd");},0);};function buildHeaders(table){if(table.config.debug){var time=new Date();}var meta=($.metadata)?true:false;var header_index=computeTableHeaderCellIndexes(table);$tableHeaders=$(table.config.selectorHeaders,table).each(function(index){this.column=header_index[this.parentNode.rowIndex+"-"+this.cellIndex];this.order=formatSortingOrder(table.config.sortInitialOrder);this.count=this.order;if(checkHeaderMetadata(this)||checkHeaderOptions(table,index))this.sortDisabled=true;if(checkHeaderOptionsSortingLocked(table,index))this.order=this.lockedOrder=checkHeaderOptionsSortingLocked(table,index);if(!this.sortDisabled){var $th=$(this).addClass(table.config.cssHeader);if(table.config.onRenderHeader)table.config.onRenderHeader.apply($th);}table.config.headerList[index]=this;});if(table.config.debug){benchmark("Built headers:",time);log($tableHeaders);}return $tableHeaders;};function computeTableHeaderCellIndexes(t){var matrix=[];var lookup={};var thead=t.getElementsByTagName('THEAD')[0];var trs=thead.getElementsByTagName('TR');for(var i=0;i<trs.length;i++){var cells=trs[i].cells;for(var j=0;j<cells.length;j++){var c=cells[j];var rowIndex=c.parentNode.rowIndex;var cellId=rowIndex+"-"+c.cellIndex;var rowSpan=c.rowSpan||1;var colSpan=c.colSpan||1
+var firstAvailCol;if(typeof(matrix[rowIndex])=="undefined"){matrix[rowIndex]=[];}for(var k=0;k<matrix[rowIndex].length+1;k++){if(typeof(matrix[rowIndex][k])=="undefined"){firstAvailCol=k;break;}}lookup[cellId]=firstAvailCol;for(var k=rowIndex;k<rowIndex+rowSpan;k++){if(typeof(matrix[k])=="undefined"){matrix[k]=[];}var matrixrow=matrix[k];for(var l=firstAvailCol;l<firstAvailCol+colSpan;l++){matrixrow[l]="x";}}}}return lookup;}function checkCellColSpan(table,rows,row){var arr=[],r=table.tHead.rows,c=r[row].cells;for(var i=0;i<c.length;i++){var cell=c[i];if(cell.colSpan>1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i<l;i++){getWidgetById(c[i]).format(table);}}function getWidgetById(name){var l=widgets.length;for(var i=0;i<l;i++){if(widgets[i].id.toLowerCase()==name.toLowerCase()){return widgets[i];}}};function formatSortingOrder(v){if(typeof(v)!="Number"){return(v.toLowerCase()=="desc")?1:0;}else{return(v==1)?1:0;}}function isValueInArray(v,a){var l=a.length;for(var i=0;i<l;i++){if(a[i][0]==v){return true;}}return false;}function setHeadersCss(table,$headers,list,css){$headers.removeClass(css[0]).removeClass(css[1]);var h=[];$headers.each(function(offset){if(!this.sortDisabled){h[this.column]=$(this);}});var l=list.length;for(var i=0;i<l;i++){h[list[i][0]].addClass(css[list[i][1]]);}}function fixColumnWidth(table,$headers){var c=table.config;if(c.widthFixed){var colgroup=$('<colgroup>');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('<col>').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i<l;i++){var s=sortList[i],o=c.headerList[s[0]];o.count=s[1];o.count++;}}function multisort(table,sortList,cache){if(table.config.debug){var sortTime=new Date();}var dynamicExp="var sortWrapper = function(a,b) {",l=sortList.length;for(var i=0;i<l;i++){var c=sortList[i][0];var order=sortList[i][1];var s=(table.config.parsers[c].type=="text")?((order==0)?makeSortFunction("text","asc",c):makeSortFunction("text","desc",c)):((order==0)?makeSortFunction("numeric","asc",c):makeSortFunction("numeric","desc",c));var e="e"+i;dynamicExp+="var "+e+" = "+s;dynamicExp+="if("+e+") { return "+e+"; } ";dynamicExp+="else { ";}var orgOrderCol=cache.normalized[0].length-1;dynamicExp+="return a["+orgOrderCol+"]-b["+orgOrderCol+"];";for(var i=0;i<l;i++){dynamicExp+="}; ";}dynamicExp+="return 0; ";dynamicExp+="}; ";if(table.config.debug){benchmark("Evaling expression:"+dynamicExp,new Date());}eval(dynamicExp);cache.normalized.sort(sortWrapper);if(table.config.debug){benchmark("Sorting on "+sortList.toString()+" and dir "+order+" time:",sortTime);}return cache;};function makeSortFunction(type,direction,index){var a="a["+index+"]",b="b["+index+"]";if(type=='text'&&direction=='asc'){return"("+a+" == "+b+" ? 0 : ("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : ("+a+" < "+b+") ? -1 : 1 )));";}else if(type=='text'&&direction=='desc'){return"("+a+" == "+b+" ? 0 : ("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : ("+b+" < "+a+") ? -1 : 1 )));";}else if(type=='numeric'&&direction=='asc'){return"("+a+" === null && "+b+" === null) ? 0 :("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : "+a+" - "+b+"));";}else if(type=='numeric'&&direction=='desc'){return"("+a+" === null && "+b+" === null) ? 0 :("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : "+b+" - "+a+"));";}};function makeSortText(i){return"((a["+i+"] < b["+i+"]) ? -1 : ((a["+i+"] > b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((a<b)?-1:((a>b)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((b<a)?-1:((b>a)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j<a.length;j++){if(a[j][0]!=i){config.sortList.push(a[j]);}}}config.sortList.push([i,this.order]);}else{if(isValueInArray(i,config.sortList)){for(var j=0;j<config.sortList.length;j++){var s=config.sortList[j],o=config.headerList[s[0]];if(s[0]==i){o.count=s[1];o.count++;s[1]=o.count%2;}}}else{config.sortList.push([i,this.order]);}};setTimeout(function(){setHeadersCss($this[0],$headers,config.sortList,sortCSS);appendToTable($this[0],multisort($this[0],config.sortList,cache));},1);return false;}}).mousedown(function(){if(config.cancelSelection){this.onselectstart=function(){return false};return false;}});$this.bind("update",function(){var me=this;setTimeout(function(){me.config.parsers=buildParserCache(me,$headers);cache=buildCache(me);},1);}).bind("updateCell",function(e,cell){var config=this.config;var pos=[(cell.parentNode.rowIndex-1),cell.cellIndex];cache.normalized[pos[0]][pos[1]]=config.parsers[pos[1]].format(getElementText(config,cell),cell);}).bind("sorton",function(e,list){$(this).trigger("sortStart");config.sortList=list;var sortList=config.sortList;updateHeaderSortCount(this,sortList);setHeadersCss(this,$headers,sortList,sortCSS);appendToTable(this,multisort(this,sortList,cache));}).bind("appendCache",function(){appendToTable(this,cache);}).bind("applyWidgetId",function(e,id){getWidgetById(id).format(this);}).bind("applyWidgets",function(){applyWidget(this);});if($.metadata&&($(this).metadata()&&$(this).metadata().sortlist)){config.sortList=$(this).metadata().sortlist;}if(config.sortList.length>0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==parser.id.toLowerCase()){a=false;}}if(a){parsers.push(parser);};};this.addWidget=function(widget){widgets.push(widget);};this.formatFloat=function(s){var i=parseFloat(s);return(isNaN(i))?0:i;};this.formatInt=function(s){var i=parseInt(s);return(isNaN(i))?0:i;};this.isDigit=function(s,config){return/^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g,'')));};this.clearTableBody=function(table){if($.browser.msie){function empty(){while(this.firstChild)this.removeChild(this.firstChild);}empty.apply(table.tBodies[0]);}else{table.tBodies[0].innerHTML="";}};}});$.fn.extend({tablesorter:$.tablesorter.construct});var ts=$.tablesorter;ts.addParser({id:"text",is:function(s){return true;},format:function(s){return $.trim(s.toLocaleLowerCase());},type:"text"});ts.addParser({id:"digit",is:function(s,table){var c=table.config;return $.tablesorter.isDigit(s,c);},format:function(s){return $.tablesorter.formatFloat(s);},type:"numeric"});ts.addParser({id:"currency",is:function(s){return/^[£$€?.]/.test(s);},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/[£$€]/g),""));},type:"numeric"});ts.addParser({id:"ipAddress",is:function(s){return/^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);},format:function(s){var a=s.split("."),r="",l=a.length;for(var i=0;i<l;i++){var item=a[i];if(item.length==2){r+="0"+item;}else{r+=item;}}return $.tablesorter.formatFloat(r);},type:"numeric"});ts.addParser({id:"url",is:function(s){return/^(https?|ftp|file):\/\/$/.test(s);},format:function(s){return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//),''));},type:"text"});ts.addParser({id:"isoDate",is:function(s){return/^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);},format:function(s){return $.tablesorter.formatFloat((s!="")?new Date(s.replace(new RegExp(/-/g),"/")).getTime():"0");},type:"numeric"});ts.addParser({id:"percent",is:function(s){return/\%$/.test($.trim(s));},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g),""));},type:"numeric"});ts.addParser({id:"usLongDate",is:function(s){return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/));},format:function(s){return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"shortDate",is:function(s){return/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);},format:function(s,table){var c=table.config;s=s.replace(/\-/g,"/");if(c.dateFormat=="us"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$1/$2");}else if(c.dateFormat=="uk"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$2/$1");}else if(c.dateFormat=="dd/mm/yy"||c.dateFormat=="dd-mm-yy"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/,"$1/$2/$3");}return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"time",is:function(s){return/^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);},format:function(s){return $.tablesorter.formatFloat(new Date("2000/01/01 "+s).getTime());},type:"numeric"});ts.addParser({id:"metadata",is:function(s){return false;},format:function(s,table,cell){var c=table.config,p=(!c.parserMetadataName)?'sortValue':c.parserMetadataName;return $(cell).metadata()[p];},type:"numeric"});ts.addWidget({id:"zebra",format:function(table){if(table.config.debug){var time=new Date();}var $tr,row=-1,odd;$("tr:visible",table.tBodies[0]).each(function(i){$tr=$(this);if(!$tr.hasClass(table.config.cssChildRow))row++;odd=(row%2==0);$tr.removeClass(table.config.widgetZebra.css[odd?0:1]).addClass(table.config.widgetZebra.css[odd?1:0])});if(table.config.debug){$.tablesorter.benchmark("Applying Zebra widget",time);}}});})(jQuery);
\ No newline at end of file
diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
index 6a16c6f3af..dd2923ece9 100644
--- a/lib/common_test/src/Makefile
+++ b/lib/common_test/src/Makefile
@@ -70,14 +70,19 @@ MODULES= \
         ct_hooks\
         ct_hooks_lock\
 	cth_log_redirect\
-	cth_surefire
+	cth_surefire \
+	ct_netconfc \
+	ct_conn_log_h \
+	cth_conn_log \
+	ct_groups
 
 TARGET_MODULES= $(MODULES:%=$(EBIN)/%)
 BEAM_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 ERL_FILES= $(MODULES:=.erl)
 HRL_FILES = \
-	ct_util.hrl
+	ct_util.hrl \
+	ct_netconfc.hrl
 EXTERNAL_HRL_FILES = \
 	../include/ct.hrl \
 	../include/ct_event.hrl
@@ -133,12 +138,12 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_tests_spec: opt
 	$(INSTALL_DIR) $(RELEASE_PATH)/common_test_test
diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src
index ae9a51faeb..18c1dec784 100644
--- a/lib/common_test/src/common_test.app.src
+++ b/lib/common_test/src/common_test.app.src
@@ -33,6 +33,8 @@
 	     ct_master_event,
 	     ct_master_logs,
 	     ct_master_status,
+	     ct_netconfc,
+	     ct_conn_log_h,
 	     ct_repeat,
 	     ct_rpc,
 	     ct_run,
@@ -49,6 +51,7 @@
 	     ct_config_xml,
 	     ct_slave,
              cth_log_redirect,
+	     cth_conn_log,
              cth_surefire
 	    ]},
   {registered, [ct_logs,
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 571d99029f..8eafdff29f 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -25,24 +25,24 @@
 %%%
 %%% <p><strong>Test Suite Support Macros</strong></p>
 %%%
-%%% <p>The <code>config</code> macro is defined in <code>ct.hrl</code>. This
+%%% <p>The <c>config</c> macro is defined in <c>ct.hrl</c>. This
 %%% macro should be used to retrieve information from the
-%%% <code>Config</code> variable sent to all test cases. It is used with two
+%%% <c>Config</c> variable sent to all test cases. It is used with two
 %%% arguments, where the first is the name of the configuration
-%%% variable you wish to retrieve, and the second is the <code>Config</code>
+%%% variable you wish to retrieve, and the second is the <c>Config</c>
 %%% variable supplied to the test case.</p>
 %%%
 %%% <p>Possible configuration variables include:</p>
 %%% <ul>
-%%%   <li><code>data_dir</code>  - Data file directory.</li>
-%%%   <li><code>priv_dir</code>  - Scratch file directory.</li>
-%%%   <li>Whatever added by <code>init_per_suite/1</code> or
-%%%   <code>init_per_testcase/2</code> in the test suite.</li>
+%%%   <li><c>data_dir</c>  - Data file directory.</li>
+%%%   <li><c>priv_dir</c>  - Scratch file directory.</li>
+%%%   <li>Whatever added by <c>init_per_suite/1</c> or
+%%%   <c>init_per_testcase/2</c> in the test suite.</li>
 %%% </ul>
 
 %%% @type var_name() = atom(). A variable name which is specified when
-%%% <code>ct:require/2</code> is called,
-%%% e.g. <code>ct:require(mynodename,{node,[telnet]})</code>
+%%% <c>ct:require/2</c> is called,
+%%% e.g. <c>ct:require(mynodename,{node,[telnet]})</c>
 %%%
 %%% @type target_name() = var_name(). The name of a target.
 %%%
@@ -51,6 +51,8 @@
 
 -module(ct).
 
+-include("ct.hrl").
+
 %% Command line user interface for running tests
 -export([install/1, run/1, run/2, run/3,
 	 run_test/1, run_testspec/1, step/3, step/4,
@@ -60,13 +62,15 @@
 -export([require/1, require/2,
 	 get_config/1, get_config/2, get_config/3,
 	 reload_config/1,
-	 log/1, log/2, log/3,
-	 print/1, print/2, print/3,
-	 pal/1, pal/2, pal/3,
+	 log/1, log/2, log/3, log/4,
+	 print/1, print/2, print/3, print/4,
+	 pal/1, pal/2, pal/3, pal/4,
 	 capture_start/0, capture_stop/0, capture_get/0, capture_get/1,
 	 fail/1, fail/2, comment/1, comment/2, make_priv_dir/0,
 	 testcases/2, userdata/2, userdata/3,
-	 timetrap/1, get_timetrap_info/0, sleep/1]).
+	 timetrap/1, get_timetrap_info/0, sleep/1,
+	 notify/2, sync_notify/2,
+	 break/1, break/2, continue/0, continue/1]).
 
 %% New API for manipulating with config handlers
 -export([add_config/2, remove_config/2]).
@@ -95,10 +99,10 @@
 %%% <p>Run this function once before first test.</p>
 %%%
 %%% <p>Example:<br/>
-%%% <code>install([{config,["config_node.ctc","config_user.ctc"]}])</code>.</p>
+%%% <c>install([{config,["config_node.ctc","config_user.ctc"]}])</c>.</p>
 %%%
 %%% <p>Note that this function is automatically run by the
-%%% <code>ct_run</code> program.</p>
+%%% <c>ct_run</c> program.</p>
 install(Opts) ->
     ct_run:install(Opts).
 
@@ -111,10 +115,10 @@ install(Opts) ->
 %%%
 %%% @doc Run the given test case(s).
 %%%
-%%% <p>Requires that <code>ct:install/1</code> has been run first.</p>
+%%% <p>Requires that <c>ct:install/1</c> has been run first.</p>
 %%%
 %%% <p>Suites (*_SUITE.erl) files must be stored in
-%%% <code>TestDir</code> or <code>TestDir/test</code>.  All suites
+%%% <c>TestDir</c> or <c>TestDir/test</c>.  All suites
 %%% will be compiled when test is run.</p>
 run(TestDir,Suite,Cases) ->
     ct_run:run(TestDir,Suite,Cases).
@@ -144,18 +148,21 @@ run(TestDirs) ->
 %%%               {config,CfgFiles} | {userconfig, UserConfig} |
 %%%               {allow_user_terms,Bool} | {logdir,LogDir} |
 %%%               {silent_connections,Conns} | {stylesheet,CSSFile} |
-%%%               {cover,CoverSpecFile} | {step,StepOpts} |
+%%%               {cover,CoverSpecFile} | {cover_stop,Bool} | {step,StepOpts} |
 %%%               {event_handler,EventHandlers} | {include,InclDirs} |
 %%%               {auto_compile,Bool} | {create_priv_dir,CreatePrivDir}  |
 %%%               {multiply_timetraps,M} | {scale_timetraps,Bool} |
 %%%               {repeat,N} | {duration,DurTime} | {until,StopTime} |
 %%%               {force_stop,Bool} | {decrypt,DecryptKeyOrFile} |
-%%%               {refresh_logs,LogDir} | {logopts,LogOpts} | {basic_html,Bool} | 
-%%%               {ct_hooks, CTHs} | {enable_builtin_hooks,Bool}
+%%%               {refresh_logs,LogDir} | {logopts,LogOpts} | 
+%%%               {verbosity,VLevels} | {basic_html,Bool} | 
+%%%               {ct_hooks, CTHs} | {enable_builtin_hooks,Bool} |
+%%%               {release_shell,Bool}
 %%%   TestDirs = [string()] | string()
 %%%   Suites = [string()] | [atom()] | string() | atom()
 %%%   Cases = [atom()] | atom()
-%%%   Groups = [atom()] | atom()
+%%%   Groups = GroupNameOrPath | [GroupNameOrPath]
+%%%   GroupNameOrPath = [atom()] | atom() | all
 %%%   TestSpecs = [string()] | string()
 %%%   Label = string() | atom()
 %%%   CfgFiles = [string()] | string()
@@ -182,26 +189,45 @@ run(TestDirs) ->
 %%%   DecryptFile = string()
 %%%   LogOpts = [LogOpt]
 %%%   LogOpt = no_nl | no_src
+%%%   VLevels = VLevel | [{Category,VLevel}]
+%%%   VLevel = integer()
+%%%   Category = atom()
 %%%   CTHs = [CTHModule | {CTHModule, CTHInitArgs}]
 %%%   CTHModule = atom()
 %%%   CTHInitArgs = term()
-%%%   Result = [TestResult] | {error,Reason}
-%%% @doc Run tests as specified by the combination of options in <code>Opts</code>.
+%%%   Result = {Ok,Failed,{UserSkipped,AutoSkipped}} | TestRunnerPid | {error,Reason}
+%%%   Ok = integer()
+%%%   Failed = integer()
+%%%   UserSkipped = integer()
+%%%   AutoSkipped = integer()
+%%%   TestRunnerPid = pid()
+%%%   Reason = term()
+%%% @doc <p>Run tests as specified by the combination of options in <c>Opts</c>.
 %%% The options are the same as those used with the
-%%% <seealso marker="ct_run#ct_run"><code>ct_run</code></seealso> program.
-%%% Note that here a <code>TestDir</code> can be used to point out the path to 
-%%% a <code>Suite</code>. Note also that the option <code>testcase</code>
-%%% corresponds to the <code>-case</code> option in the <code>ct_run</code> 
-%%% program. Configuration files specified in <code>Opts</code> will be
-%%% installed automatically at startup.
+%%% <seealso marker="ct_run#ct_run"><c>ct_run</c></seealso> program.
+%%% Note that here a <c>TestDir</c> can be used to point out the path to 
+%%% a <c>Suite</c>. Note also that the option <c>testcase</c>
+%%% corresponds to the <c>-case</c> option in the <c>ct_run</c> 
+%%% program. Configuration files specified in <c>Opts</c> will be
+%%% installed automatically at startup.</p>
+%%% <p><c>TestRunnerPid</c> is returned if <c>release_shell == true</c>
+%%% (see <c>break/1</c> for details).</p>
+%%% <p><c>Reason</c> indicates what type of error has been encountered.</p>
 run_test(Opts) ->
     ct_run:run_test(Opts).
 
 %%%-----------------------------------------------------------------
 %%% @spec run_testspec(TestSpec) -> Result
 %%%   TestSpec = [term()]
-%%% @doc Run test specified by <code>TestSpec</code>. The terms are
+%%%   Result = {Ok,Failed,{UserSkipped,AutoSkipped}} | {error,Reason}
+%%%   Ok = integer()
+%%%   Failed = integer()
+%%%   UserSkipped = integer()
+%%%   AutoSkipped = integer()
+%%%   Reason = term()
+%%% @doc Run test specified by <c>TestSpec</c>. The terms are
 %%% the same as those used in test specification files.
+%%% <p><c>Reason</c> indicates what type of error has been encountered.</p>
 run_testspec(TestSpec) ->
     ct_run:run_testspec(TestSpec).
     
@@ -221,8 +247,8 @@ step(TestDir,Suite,Case) ->
 %%%   Opt = config | keep_inactive
 %%%
 %%% @doc Step through a test case with the debugger. If the
-%%% <code>config</code> option has been given, breakpoints will
-%%% be set also on the configuration functions in <code>Suite</code>.
+%%% <c>config</c> option has been given, breakpoints will
+%%% be set also on the configuration functions in <c>Suite</c>.
 %%% @see run/3
 step(TestDir,Suite,Case,Opts) ->
     ct_run:step(TestDir,Suite,Case,Opts).
@@ -234,22 +260,23 @@ step(TestDir,Suite,Case,Opts) ->
 %%%
 %%% <p>From this mode all test case support functions can be executed
 %%% directly from the erlang shell. The interactive mode can also be
-%%% started from the OS command line with <code>ct_run -shell
-%%% [-config File...]</code>.</p>
+%%% started from the OS command line with <c>ct_run -shell
+%%% [-config File...]</c>.</p>
 %%%
 %%% <p>If any functions using "required config data" (e.g. telnet or
 %%% ftp functions) are to be called from the erlang shell, config data
-%%% must first be required with <code>ct:require/2</code>.</p>
+%%% must first be required with <c>ct:require/2</c>.</p>
 %%%
 %%% <p>Example:<br/>
-%%% <code>&gt; ct:require(unix_telnet, unix).</code><br/>
-%%% <code>ok</code><br/>
-%%% <code>&gt; ct_telnet:open(unix_telnet).</code><br/>
-%%% <code>{ok,&lt;0.105.0&gt;}</code><br/>
-%%% <code>&gt; ct_telnet:cmd(unix_telnet, "ls .").</code><br/>
-%%% <code>{ok,["ls","file1  ...",...]}</code></p>
+%%% <c>&gt; ct:require(unix_telnet, unix).</c><br/>
+%%% <c>ok</c><br/>
+%%% <c>&gt; ct_telnet:open(unix_telnet).</c><br/>
+%%% <c>{ok,&lt;0.105.0&gt;}</c><br/>
+%%% <c>&gt; ct_telnet:cmd(unix_telnet, "ls .").</c><br/>
+%%% <c>{ok,["ls","file1  ...",...]}</c></p>
 start_interactive() ->
-    ct_util:start(interactive).
+    ct_util:start(interactive),
+    ok.
 
 %%%-----------------------------------------------------------------
 %%% @spec stop_interactive() -> ok
@@ -257,7 +284,8 @@ start_interactive() ->
 %%% @doc Exit the interactive mode.
 %%% @see start_interactive/0
 stop_interactive() ->
-    ct_util:stop(normal).
+    ct_util:stop(normal),
+    ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% MISC INTERFACE
@@ -265,27 +293,34 @@ stop_interactive() ->
 
 %%%-----------------------------------------------------------------
 %%% @spec require(Required) -> ok | {error,Reason}
-%%%      Required = Key | {Key,SubKeys}
+%%%      Required = Key | {Key,SubKeys} | {Key,SubKey,SubKeys}
 %%%      Key = atom()
 %%%      SubKeys = SubKey | [SubKey]
 %%%      SubKey = atom()
 %%%
-%%% @doc Check if the required configuration is available.
+%%% @doc Check if the required configuration is available. It is possible
+%%% to specify arbitrarily deep tuples as <c>Required</c>. Note that it is
+%%% only the last element of the tuple which can be a list of <c>SubKey</c>s.
 %%%
-%%% <p>Example: require the variable <code>myvar</code>:<br/>
-%%% <code>ok = ct:require(myvar)</code></p>
+%%% <p>Example 1: require the variable <c>myvar</c>:</p>
+%%% <pre>ok = ct:require(myvar).</pre>
 %%%
 %%% <p>In this case the config file must at least contain:</p>
-%%% <pre>
-%%% {myvar,Value}.</pre>
+%%% <pre>{myvar,Value}.</pre>
 %%% 
-%%% <p>Example: require the variable <code>myvar</code> with
-%%% subvariable <code>sub1</code>:<br/>
-%%% <code>ok = ct:require({myvar,sub1})</code></p>
+%%% <p>Example 2: require the key <c>myvar</c> with
+%%% subkeys <c>sub1</c> and <c>sub2</c>:</p>
+%%% <pre>ok = ct:require({myvar,[sub1,sub2]}).</pre>
 %%%
 %%% <p>In this case the config file must at least contain:</p>
-%%% <pre>
-%%% {myvar,[{sub1,Value}]}.</pre>
+%%% <pre>{myvar,[{sub1,Value},{sub2,Value}]}.</pre>
+%%%
+%%% <p>Example 3: require the key <c>myvar</c> with
+%%% subkey <c>sub1</c> with <c>subsub1</c>:</p>
+%%% <pre>ok = ct:require({myvar,sub1,sub2}).</pre>
+%%%
+%%% <p>In this case the config file must at least contain:</p>
+%%% <pre>{myvar,[{sub1,[{sub2,Value}]}]}.</pre>
 %%%
 %%% @see require/2
 %%% @see get_config/1
@@ -297,30 +332,36 @@ require(Required) ->
 %%%-----------------------------------------------------------------
 %%% @spec require(Name,Required) -> ok | {error,Reason}
 %%%      Name = atom()
-%%%      Required = Key | {Key,SubKeys}
+%%%      Required = Key | {Key,SubKey} | {Key,SubKey,SubKey}
+%%%      SubKey = Key
 %%%      Key = atom()
-%%%      SubKeys = SubKey | [SubKey]
-%%%      SubKey = atom()
 %%%
 %%% @doc Check if the required configuration is available, and give it
-%%% a name.
+%%% a name. The semantics for <c>Required</c> is the same as in
+%%% <c>required/1</c> except that it is not possible to specify a list
+%%% of <c>SubKey</c>s.
 %%%
-%%% <p>If the requested data is available, the main entry will be
-%%% associated with <code>Name</code> so that the value of the element
-%%% can be read with <code>get_config/1,2</code> provided
-%%% <code>Name</code> instead of the <code>Key</code>.</p>
+%%% <p>If the requested data is available, the sub entry will be
+%%% associated with <c>Name</c> so that the value of the element
+%%% can be read with <c>get_config/1,2</c> provided
+%%% <c>Name</c> instead of the whole <c>Required</c> term.</p>
 %%%
 %%% <p>Example: Require one node with a telnet connection and an
-%%% ftp connection. Name the node <code>a</code>:<br/> <code>ok =
-%%% ct:require(a,{node,[telnet,ftp]}).</code><br/> All references
-%%% to this node may then use the node name. E.g. you can fetch a
-%%% file over ftp like this:<br/>
-%%% <code>ok = ct:ftp_get(a,RemoteFile,LocalFile).</code></p>
+%%% ftp connection. Name the node <c>a</c>:
+%%% <pre>ok = ct:require(a,{machine,node}).</pre>
+%%% All references to this node may then use the node name.
+%%% E.g. you can fetch a file over ftp like this:</p>
+%%% <pre>ok = ct:ftp_get(a,RemoteFile,LocalFile).</pre>
 %%%
 %%% <p>For this to work, the config file must at least contain:</p>
-%%% <pre>
-%%% {node,[{telnet,IpAddr},
-%%%        {ftp,IpAddr}]}.</pre>
+%%% <pre>{machine,[{node,[{telnet,IpAddr},{ftp,IpAddr}]}]}.</pre>
+%%%
+%%% <note><p>The behaviour of this function changed radically in common_test
+%%% 1.6.2. In order too keep some backwards compatability it is still possible
+%%% to do: <br/><c>ct:require(a,{node,[telnet,ftp]}).</c><br/>
+%%% This will associate the name <c>a</c> with the top level <c>node</c> entry.
+%%% For this to work, the config file must at least contain:<br/>
+%%% <c>{node,[{telnet,IpAddr},{ftp,IpAddr}]}.</c></p></note>
 %%%
 %%% @see require/1
 %%% @see get_config/1
@@ -343,7 +384,7 @@ get_config(Required,Default) ->
 
 %%%-----------------------------------------------------------------
 %%% @spec get_config(Required,Default,Opts) -> ValueOrElement
-%%%      Required = KeyOrName | {KeyOrName,SubKey}
+%%%      Required = KeyOrName | {KeyOrName,SubKey} | {KeyOrName,SubKey,SubKey}
 %%%      KeyOrName = atom()
 %%%      SubKey = atom()
 %%%      Default = term()
@@ -355,43 +396,41 @@ get_config(Required,Default) ->
 %%%
 %%% <p>This function returns the matching value(s) or config element(s),
 %%% given a config variable key or its associated name
-%%% (if one has been specified with <code>require/2</code> or a 
+%%% (if one has been specified with <c>require/2</c> or a 
 %%% require statement).</p>
 %%%
 %%% <p>Example, given the following config file:</p>
 %%% <pre>
 %%% {unix,[{telnet,IpAddr},
-%%%        {username,Username},
-%%%        {password,Password}]}.</pre>
-%%% <p><code>get_config(unix,Default) -> 
+%%%        {user,[{username,Username},
+%%%               {password,Password}]}]}.</pre>
+%%% <p><c>ct:get_config(unix,Default) ->
 %%%                          [{telnet,IpAddr},
-%%%                           {username,Username},
-%%%                           {password,Password}]</code><br/>
-%%% <code>get_config({unix,telnet},Default) -> IpAddr</code><br/>
-%%% <code>get_config({unix,ftp},Default) -> Default</code><br/>
-%%% <code>get_config(unknownkey,Default) -> Default</code></p>
+%%%                           {user, [{username,Username},
+%%%                                   {password,Password}]}]</c><br/>
+%%% <c>ct:get_config({unix,telnet},Default) -> IpAddr</c><br/>
+%%% <c>ct:get_config({unix,user,username},Default) -> Username</c><br/>
+%%% <c>ct:get_config({unix,ftp},Default) -> Default</c><br/>
+%%% <c>ct:get_config(unknownkey,Default) -> Default</c></p>
 %%%
 %%% <p>If a config variable key has been associated with a name (by
-%%% means of <code>require/2</code> or a require statement), the name 
+%%% means of <c>require/2</c> or a require statement), the name 
 %%% may be used instead of the key to read the value:</p>
 %%%
-%%% <p><code>require(myhost,unix) -> ok</code><br/>
-%%% <code>get_config(myhost,Default) -> 
-%%%                          [{telnet,IpAddr},
-%%%                           {username,Username},
-%%%                           {password,Password}]</code></p>
+%%% <p><c>ct:require(myuser,{unix,user}) -> ok.</c><br/>
+%%% <c>ct:get_config(myuser,Default) ->
+%%%          [{username,Username},
+%%%           {password,Password}]</c></p>
 %%%
 %%% <p>If a config variable is defined in multiple files and you want to
-%%% access all possible values, use the <code>all</code> option. The
+%%% access all possible values, use the <c>all</c> option. The
 %%% values will be returned in a list and the order of the elements
 %%% corresponds to the order that the config files were specified at 
 %%% startup.</p>
 %%%
 %%% <p>If you want config elements (key-value tuples) returned as result 
-%%% instead of values, use the <code>element</code> option. 
-%%% The returned elements will then be on the form <code>{KeyOrName,Value}</code>, 
-%%% or (in case a subkey has been specified)
-%%% <code>{{KeyOrName,SubKey},Value}</code></p>
+%%% instead of values, use the <c>element</c> option. 
+%%% The returned elements will then be on the form <c>{Required,Value}</c></p>
 %%%
 %%% @see get_config/1
 %%% @see get_config/2
@@ -402,7 +441,7 @@ get_config(Required,Default,Opts) ->
 
 %%%-----------------------------------------------------------------
 %%% @spec reload_config(Required) -> ValueOrElement
-%%%      Required = KeyOrName | {KeyOrName,SubKey}
+%%%      Required = KeyOrName | {KeyOrName,SubKey} | {KeyOrName,SubKey,SubKey}
 %%%      KeyOrName = atom()
 %%%      SubKey = atom()
 %%%      ValueOrElement = term()
@@ -421,25 +460,41 @@ reload_config(Required)->
 
 %%%-----------------------------------------------------------------
 %%% @spec log(Format) -> ok
-%%% @equiv log(default,Format,[])
+%%% @equiv log(default,50,Format,[])
 log(Format) ->
-    log(default,Format,[]).
+    log(default,?STD_IMPORTANCE,Format,[]).
 
 %%%-----------------------------------------------------------------
 %%% @spec log(X1,X2) -> ok
-%%%      X1 = Category | Format
+%%%      X1 = Category | Importance | Format
 %%%      X2 = Format | Args
-%%% @equiv log(Category,Format,Args)
+%%% @equiv log(Category,Importance,Format,Args)
 log(X1,X2) ->
-    {Category,Format,Args} = 
-	if is_atom(X1) -> {X1,X2,[]};
-	   is_list(X1) -> {default,X1,X2}
+    {Category,Importance,Format,Args} = 
+	if is_atom(X1)    -> {X1,?STD_IMPORTANCE,X2,[]};
+	   is_integer(X1) -> {default,X1,X2,[]};
+	   is_list(X1)    -> {default,?STD_IMPORTANCE,X1,X2}
 	end,
-    log(Category,Format,Args).
+    log(Category,Importance,Format,Args).
 
 %%%-----------------------------------------------------------------
-%%% @spec log(Category,Format,Args) -> ok
+%%% @spec log(X1,X2,X3) -> ok
+%%%      X1 = Category | Importance
+%%%      X2 = Importance | Format
+%%%      X3 = Format | Args
+%%% @equiv log(Category,Importance,Format,Args)
+log(X1,X2,X3) ->
+    {Category,Importance,Format,Args} = 
+	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,[]};
+	   is_atom(X1), is_list(X2)    -> {X1,?STD_IMPORTANCE,X2,X3};
+	   is_integer(X1)              -> {default,X1,X2,X3}
+	end,
+    log(Category,Importance,Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec log(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -448,30 +503,52 @@ log(X1,X2) ->
 %%% <p>This function is meant for printing a string directly from a
 %%% test case to the test case log file.</p>
 %%%
-%%% <p>Default <code>Category</code> is <code>default</code> and
-%%% default <code>Args</code> is <code>[]</code>.</p>
-log(Category,Format,Args) ->
-    ct_logs:tc_log(Category,Format,Args).
+%%% <p>Default <c>Category</c> is <c>default</c>,
+%%% default <c>Importance</c> is <c>?STD_IMPORTANCE</c>,
+%%% and default value for <c>Args</c> is <c>[]</c>.</p>
+%%% <p>Please see the User's Guide for details on <c>Category</c>
+%%% and <c>Importance</c>.</p>
+log(Category,Importance,Format,Args) ->
+    ct_logs:tc_log(Category,Importance,Format,Args).
 
 
 %%%-----------------------------------------------------------------
 %%% @spec print(Format) -> ok
-%%% @equiv print(default,Format,[])
+%%% @equiv print(default,50,Format,[])
 print(Format) ->
-    print(default,Format,[]).
+    print(default,?STD_IMPORTANCE,Format,[]).
 
 %%%-----------------------------------------------------------------
-%%% @equiv print(Category,Format,Args)
+%%% @spec print(X1,X2) -> ok
+%%%      X1 = Category | Importance | Format
+%%%      X2 = Format | Args
+%%% @equiv print(Category,Importance,Format,Args)
 print(X1,X2) ->
-    {Category,Format,Args} = 
-	if is_atom(X1) -> {X1,X2,[]};
-	   is_list(X1) -> {default,X1,X2}
+    {Category,Importance,Format,Args} = 
+	if is_atom(X1)    -> {X1,?STD_IMPORTANCE,X2,[]};
+	   is_integer(X1) -> {default,X1,X2,[]};
+	   is_list(X1)    -> {default,?STD_IMPORTANCE,X1,X2}
 	end,
-    print(Category,Format,Args).
+    print(Category,Importance,Format,Args).
 
 %%%-----------------------------------------------------------------
-%%% @spec print(Category,Format,Args) -> ok
+%%% @spec print(X1,X2,X3) -> ok
+%%%      X1 = Category | Importance
+%%%      X2 = Importance | Format
+%%%      X3 = Format | Args
+%%% @equiv print(Category,Importance,Format,Args)
+print(X1,X2,X3) ->
+    {Category,Importance,Format,Args} = 
+	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,[]};
+	   is_atom(X1), is_list(X2)    -> {X1,?STD_IMPORTANCE,X2,X3};
+	   is_integer(X1)              -> {default,X1,X2,X3}
+	end,
+    print(Category,Importance,Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec print(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -480,33 +557,52 @@ print(X1,X2) ->
 %%% <p>This function is meant for printing a string from a test case
 %%% to the console.</p>
 %%%
-%%% <p>Default <code>Category</code> is <code>default</code> and
-%%% default <code>Args</code> is <code>[]</code>.</p>
-print(Category,Format,Args) ->
-    ct_logs:tc_print(Category,Format,Args).
+%%% <p>Default <c>Category</c> is <c>default</c>,
+%%% default <c>Importance</c> is <c>?STD_IMPORTANCE</c>,
+%%% and default value for <c>Args</c> is <c>[]</c>.</p>
+%%% <p>Please see the User's Guide for details on <c>Category</c>
+%%% and <c>Importance</c>.</p>
+print(Category,Importance,Format,Args) ->
+    ct_logs:tc_print(Category,Importance,Format,Args).
 
 
 %%%-----------------------------------------------------------------
 %%% @spec pal(Format) -> ok
-%%% @equiv pal(default,Format,[])
+%%% @equiv pal(default,50,Format,[])
 pal(Format) ->
-    pal(default,Format,[]).
+    pal(default,?STD_IMPORTANCE,Format,[]).
 
 %%%-----------------------------------------------------------------
 %%% @spec pal(X1,X2) -> ok
-%%%      X1 = Category | Format
+%%%      X1 = Category | Importance | Format
 %%%      X2 = Format | Args
-%%% @equiv pal(Category,Format,Args)
+%%% @equiv pal(Category,Importance,Format,Args)
 pal(X1,X2) ->
-    {Category,Format,Args} = 
-	if is_atom(X1) -> {X1,X2,[]};
-	   is_list(X1) -> {default,X1,X2}
+    {Category,Importance,Format,Args} = 
+	if is_atom(X1)    -> {X1,?STD_IMPORTANCE,X2,[]};
+	   is_integer(X1) -> {default,X1,X2,[]};
+	   is_list(X1)    -> {default,?STD_IMPORTANCE,X1,X2}
 	end,
-    pal(Category,Format,Args).
+    pal(Category,Importance,Format,Args).
 
 %%%-----------------------------------------------------------------
-%%% @spec pal(Category,Format,Args) -> ok
+%%% @spec pal(X1,X2,X3) -> ok
+%%%      X1 = Category | Importance
+%%%      X2 = Importance | Format
+%%%      X3 = Format | Args
+%%% @equiv pal(Category,Importance,Format,Args)
+pal(X1,X2,X3) ->
+    {Category,Importance,Format,Args} = 
+	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,[]};
+	   is_atom(X1), is_list(X2)    -> {X1,?STD_IMPORTANCE,X2,X3};
+	   is_integer(X1)              -> {default,X1,X2,X3}
+	end,
+    pal(Category,Importance,Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec pal(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -515,10 +611,13 @@ pal(X1,X2) ->
 %%% <p>This function is meant for printing a string from a test case,
 %%% both to the test case log file and to the console.</p>
 %%%
-%%% <p>Default <code>Category</code> is <code>default</code> and
-%%% default <code>Args</code> is <code>[]</code>.</p>
-pal(Category,Format,Args) ->
-    ct_logs:tc_pal(Category,Format,Args).
+%%% <p>Default <c>Category</c> is <c>default</c>,
+%%% default <c>Importance</c> is <c>?STD_IMPORTANCE</c>,
+%%% and default value for <c>Args</c> is <c>[]</c>.</p>
+%%% <p>Please see the User's Guide for details on <c>Category</c>
+%%% and <c>Importance</c>.</p>
+pal(Category,Importance,Format,Args) ->
+    ct_logs:tc_pal(Category,Importance,Format,Args).
 
 %%%-----------------------------------------------------------------
 %%% @spec capture_start() -> ok
@@ -535,7 +634,7 @@ capture_start() ->
 %%% @spec capture_stop() -> ok
 %%%
 %%% @doc Stop capturing text strings (a session started with
-%%% <code>capture_start/0</code>).
+%%% <c>capture_start/0</c>).
 %%%
 %%% @see capture_start/0
 %%% @see capture_get/1
@@ -558,9 +657,9 @@ capture_get() ->
 %%%
 %%% @doc Return and purge the list of text strings buffered
 %%% during the latest session of capturing printouts to stdout.
-%%% With <code>ExclCategories</code> it's possible to specify
-%%% log categories that should be ignored in <code>ListOfStrings</code>.
-%%% If <code>ExclCategories = []</code>, no filtering takes place.
+%%% With <c>ExclCategories</c> it's possible to specify
+%%% log categories that should be ignored in <c>ListOfStrings</c>.
+%%% If <c>ExclCategories = []</c>, no filtering takes place.
 %%%
 %%% @see capture_start/0
 %%% @see capture_stop/0
@@ -585,7 +684,7 @@ capture_get([]) ->
 %%%      Reason = term()
 %%%
 %%% @doc Terminate a test case with the given error
-%%% <code>Reason</code>.
+%%% <c>Reason</c>.
 fail(Reason) ->
     try
 	exit({test_case_failed,Reason})
@@ -605,7 +704,7 @@ fail(Reason) ->
 %%%
 %%% @doc Terminate a test case with an error message specified
 %%% by a format string and a list of values (used as arguments to
-%%% <code>io_lib:format/2</code>).
+%%% <c>io_lib:format/2</c>).
 fail(Format, Args) ->
     try io_lib:format(Format, Args) of
 	Str ->
@@ -628,11 +727,11 @@ fail(Format, Args) ->
 %%% @spec comment(Comment) -> void()
 %%%      Comment = term()
 %%%
-%%% @doc Print the given <code>Comment</code> in the comment field in
+%%% @doc Print the given <c>Comment</c> in the comment field in
 %%% the table on the test suite result page.
 %%%
 %%% <p>If called several times, only the last comment is printed.
-%%% The test case return value <code>{comment,Comment}</code>
+%%% The test case return value <c>{comment,Comment}</c>
 %%% overwrites the string set by this function.</p>
 comment(Comment) when is_list(Comment) ->
     Formatted =
@@ -655,10 +754,10 @@ comment(Comment) ->
 %%% @doc Print the formatted string in the comment field in
 %%% the table on the test suite result page.
 %%% 
-%%% <p>The <code>Format</code> and <code>Args</code> arguments are
-%%% used in call to <code>io_lib:format/2</code> in order to create
-%%% the comment string. The behaviour of <code>comment/2</code> is
-%%% otherwise the same as the <code>comment/1</code> function (see
+%%% <p>The <c>Format</c> and <c>Args</c> arguments are
+%%% used in call to <c>io_lib:format/2</c> in order to create
+%%% the comment string. The behaviour of <c>comment/2</c> is
+%%% otherwise the same as the <c>comment/1</c> function (see
 %%% above for details).</p>
 comment(Format, Args) when is_list(Format), is_list(Args) ->
     Formatted =
@@ -703,11 +802,11 @@ get_target_name(Handle) ->
 %%% @doc Parse the printout from an SQL table and return a list of tuples.
 %%%
 %%% <p>The printout to parse would typically be the result of a
-%%% <code>select</code> command in SQL. The returned
-%%% <code>Table</code> is a list of tuples, where each tuple is a row
+%%% <c>select</c> command in SQL. The returned
+%%% <c>Table</c> is a list of tuples, where each tuple is a row
 %%% in the table.</p>
 %%% 
-%%% <p><code>Heading</code> is a tuple of strings representing the
+%%% <p><c>Heading</c> is a tuple of strings representing the
 %%% headings of each column in the table.</p>
 parse_table(Data) ->
     ct_util:parse_table(Data).
@@ -779,8 +878,8 @@ make_and_load(Dir, Suite) ->
 %%%       SuiteUserData = [term()]
 %%%       Reason = term()
 %%%
-%%% @doc Returns any data specified with the tag <code>userdata</code> 
-%%% in the list of tuples returned from <code>Suite:suite/0</code>.
+%%% @doc Returns any data specified with the tag <c>userdata</c> 
+%%% in the list of tuples returned from <c>Suite:suite/0</c>.
 userdata(TestDir, Suite) ->
     case make_and_load(TestDir, Suite) of
 	E = {error,_} ->
@@ -815,9 +914,9 @@ get_userdata(_BadTerm, Spec) ->
 %%%       TCUserData = [term()]
 %%%       Reason = term()
 %%%
-%%% @doc Returns any data specified with the tag <code>userdata</code>
-%%% in the list of tuples returned from <code>Suite:group(GroupName)</code>
-%%% or <code>Suite:Case()</code>.
+%%% @doc Returns any data specified with the tag <c>userdata</c>
+%%% in the list of tuples returned from <c>Suite:group(GroupName)</c>
+%%% or <c>Suite:Case()</c>.
 userdata(TestDir, Suite, {group,GroupName}) ->
     case make_and_load(TestDir, Suite) of
 	E = {error,_} ->
@@ -840,8 +939,9 @@ userdata(TestDir, Suite, Case) when is_atom(Case) ->
 %%%-----------------------------------------------------------------
 %%% @spec get_status() -> TestStatus | {error,Reason} | no_tests_running
 %%%       TestStatus = [StatusElem]
-%%%       StatusElem = {current,{Suite,TestCase}} | {successful,Successful} |
+%%%       StatusElem = {current,TestCaseInfo} | {successful,Successful} |
 %%%                    {failed,Failed} | {skipped,Skipped} | {total,Total}
+%%%       TestCaseInfo = {Suite,TestCase} | [{Suite,TestCase}]
 %%%       Suite = atom()
 %%%       TestCase = atom()
 %%%       Successful = integer()
@@ -853,7 +953,8 @@ userdata(TestDir, Suite, Case) when is_atom(Case) ->
 %%%       Reason = term()
 %%%
 %%% @doc Returns status of ongoing test. The returned list contains info about
-%%%      which test case is currently executing, as well as counters for 
+%%%      which test case is currently executing (a list of cases when a
+%%%      parallel test case group is executing), as well as counters for 
 %%%      successful, failed, skipped, and total test cases so far.
 get_status() ->
     case get_testdata(curr_tc) of
@@ -878,20 +979,25 @@ get_testdata(Key) ->
 	    Error;
 	{'EXIT',_Reason} ->
 	    no_tests_running;
+	undefined ->
+	    {error,no_testdata};
+	[CurrTC] when Key == curr_tc ->
+	    {ok,CurrTC};
 	Data ->
 	    {ok,Data}
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec abort_current_testcase(Reason) -> ok | {error,no_testcase_running}
+%%% @spec abort_current_testcase(Reason) -> ok | {error,ErrorReason}
 %%%       Reason = term()
+%%%       ErrorReason = no_testcase_running | parallel_group
 %%%
 %%% @doc <p>When calling this function, the currently executing test case will be aborted.
 %%%      It is the user's responsibility to know for sure which test case is currently
 %%%	 executing. The function is therefore only safe to call from a function which
 %%%	 has been called (or synchronously invoked) by the test case.</p>
 %%%
-%%%      <p><code>Reason</code>, the reason for aborting the test case, is printed
+%%%      <p><c>Reason</c>, the reason for aborting the test case, is printed
 %%%      in the test case log.</p>
 abort_current_testcase(Reason) ->
     test_server_ctrl:abort_current_testcase(Reason).
@@ -904,13 +1010,13 @@ abort_current_testcase(Reason) ->
 %%%       Reason = term()
 %%%
 %%% @doc <p>This function encrypts the source config file with DES3 and 
-%%%      saves the result in file <code>EncryptFileName</code>. The key,
+%%%      saves the result in file <c>EncryptFileName</c>. The key,
 %%%      a string, must be available in a text file named 
-%%%      <code>.ct_config.crypt</code> in the current directory, or the 
+%%%      <c>.ct_config.crypt</c> in the current directory, or the 
 %%%      home directory of the user (it is searched for in that order).</p>
 %%%      <p>See the Common Test User's Guide for information about using
 %%%      encrypted config files when running tests.</p>
-%%%      <p>See the <code>crypto</code> application for details on DES3
+%%%      <p>See the <c>crypto</c> application for details on DES3
 %%%      encryption/decryption.</p>
 encrypt_config_file(SrcFileName, EncryptFileName) ->
     ct_config:encrypt_config_file(SrcFileName, EncryptFileName).
@@ -924,13 +1030,13 @@ encrypt_config_file(SrcFileName, EncryptFileName) ->
 %%%       Reason = term()
 %%%
 %%% @doc <p>This function encrypts the source config file with DES3 and
-%%%      saves the result in the target file <code>EncryptFileName</code>. 
+%%%      saves the result in the target file <c>EncryptFileName</c>. 
 %%%      The encryption key to use is either the value in 
-%%%      <code>{key,Key}</code> or the value stored in the file specified 
-%%%      by <code>{file,File}</code>.</p>
+%%%      <c>{key,Key}</c> or the value stored in the file specified 
+%%%      by <c>{file,File}</c>.</p>
 %%%      <p>See the Common Test User's Guide for information about using
 %%%      encrypted config files when running tests.</p>
-%%%      <p>See the <code>crypto</code> application for details on DES3
+%%%      <p>See the <c>crypto</c> application for details on DES3
 %%%      encryption/decryption.</p>
 encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile) ->
     ct_config:encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile).
@@ -942,11 +1048,11 @@ encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile) ->
 %%%       TargetFileName = string()
 %%%       Reason = term()
 %%%
-%%% @doc <p>This function decrypts <code>EncryptFileName</code>, previously 
-%%%      generated with <code>encrypt_config_file/2/3</code>. The original
+%%% @doc <p>This function decrypts <c>EncryptFileName</c>, previously 
+%%%      generated with <c>encrypt_config_file/2/3</c>. The original
 %%%      file contents is saved in the target file. The encryption key, a
 %%%      string, must be available in a text file named
-%%%      <code>.ct_config.crypt</code> in the current directory, or the
+%%%      <c>.ct_config.crypt</c> in the current directory, or the
 %%%      home directory of the user (it is searched for in that order).</p>
 decrypt_config_file(EncryptFileName, TargetFileName) ->
     ct_config:decrypt_config_file(EncryptFileName, TargetFileName).
@@ -959,8 +1065,8 @@ decrypt_config_file(EncryptFileName, TargetFileName) ->
 %%%       KeyOrFile = {key,string()} | {file,string()}
 %%%       Reason = term()
 %%%
-%%% @doc <p>This function decrypts <code>EncryptFileName</code>, previously 
-%%%      generated with <code>encrypt_config_file/2/3</code>. The original
+%%% @doc <p>This function decrypts <c>EncryptFileName</c>, previously 
+%%%      generated with <c>encrypt_config_file/2/3</c>. The original
 %%%      file contents is saved in the target file. The key must have the
 %%%      the same value as that used for encryption.</p>
 decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile) ->
@@ -977,7 +1083,7 @@ decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile) ->
 %%% 	 given callback module and configuration string. Callback module
 %%%	 should be either loaded or present in the code part. Loaded
 %%%	 configuration variables can later be removed using
-%%%	 <code>remove_config/2</code> function.</p>
+%%%	 <c>remove_config/2</c> function.</p>
 add_config(Callback, Config)->
     ct_config:add_config(Callback, Config).
 
@@ -1006,9 +1112,9 @@ remove_config(Callback, Config) ->
 %%%       A = list()
 %%%
 %%% @doc <p>Use this function to set a new timetrap for the running test case.
-%%%      If the argument is <code>Func</code>, the timetrap will be triggered
-%%%      when this function returns. <code>Func</code> may also return a new
-%%%      <code>Time</code> value, which in that case will be the value for the
+%%%      If the argument is <c>Func</c>, the timetrap will be triggered
+%%%      when this function returns. <c>Func</c> may also return a new
+%%%      <c>Time</c> value, which in that case will be the value for the
 %%%      new timetrap.</p>
 timetrap(Time) ->
     test_server:timetrap_cancel(),
@@ -1047,3 +1153,131 @@ sleep({seconds,Ss}) ->
     sleep(trunc(Ss * 1000));
 sleep(Time) ->
     test_server:adjusted_sleep(Time).
+
+%%%-----------------------------------------------------------------
+%%% @spec notify(Name,Data) -> ok
+%%%       Name = atom()
+%%%       Data = term()
+%%%
+%%% @doc <p>Sends a asynchronous notification of type <c>Name</c> with
+%%%      <c>Data</c>to the common_test event manager. This can later be
+%%%      caught by any installed event manager. </p>
+%%% @see //stdlib/gen_event
+notify(Name,Data) ->
+    ct_event:notify(Name, Data).
+
+%%%-----------------------------------------------------------------
+%%% @spec sync_notify(Name,Data) -> ok
+%%%       Name = atom()
+%%%       Data = term()
+%%%
+%%% @doc <p>Sends a synchronous notification of type <c>Name</c> with
+%%%      <c>Data</c>to the common_test event manager. This can later be
+%%%      caught by any installed event manager. </p>
+%%% @see //stdlib/gen_event
+sync_notify(Name,Data) ->
+    ct_event:sync_notify(Name, Data).
+
+%%%-----------------------------------------------------------------
+%%% @spec break(Comment) -> ok | {error,Reason}
+%%%       Comment = string()
+%%%       Reason = {multiple_cases_running,TestCases} |
+%%%                'enable break with release_shell option'
+%%%       TestCases = [atom()]
+%%%
+%%% @doc <p>This function will cancel any active timetrap and pause the
+%%%       execution of the current test case until the user calls the
+%%%       <c>continue/0</c> function. It gives the user the opportunity
+%%%       to interact with the erlang node running the tests, e.g. for
+%%%       debugging purposes or for manually executing a part of the
+%%%       test case. If a parallel group is executing, <c>break/2</c>
+%%%       should be called instead.</p>
+%%%      <p>A cancelled timetrap will not be automatically
+%%%       reactivated after the break, but must be started exlicitly with
+%%%       <c>ct:timetrap/1</c></p>
+%%%      <p>In order for the break/continue functionality to work,
+%%%       Common Test must release the shell process controlling stdin.
+%%%       This is done by setting the <c>release_shell</c> start option
+%%%       to <c>true</c>. See the User's Guide for more information.</p>
+
+break(Comment) ->
+    case {ct_util:get_testdata(starter),
+	  ct_util:get_testdata(release_shell)} of
+	{ct,ReleaseSh} when ReleaseSh /= true ->
+	    Warning = "ct:break/1 can only be used if release_shell == true.\n",
+	    ct_logs:log("Warning!", Warning, []),
+	    io:format(user, "Warning! " ++ Warning, []),
+	    {error,'enable break with release_shell option'};
+	_ ->
+	    case get_testdata(curr_tc) of
+		{ok,{_,_TestCase}} ->
+		    test_server:break(?MODULE, Comment);
+		{ok,Cases} when is_list(Cases) ->
+		    {error,{'multiple cases running',
+			    [TC || {_,TC} <- Cases]}};
+		Error = {error,_} -> 
+		    Error;
+		Error ->
+		    {error,Error}
+	    end
+    end.
+
+%%%-----------------------------------------------------------------
+%%% @spec break(TestCase, Comment) -> ok | {error,Reason}
+%%%       TestCase = atom()
+%%%       Comment = string()
+%%%       Reason = 'test case not running' |
+%%%                'enable break with release_shell option'
+%%%
+%%% @doc <p>This function works the same way as <c>break/1</c>,
+%%%       only the <c>TestCase</c> argument makes it possible to
+%%%       pause a test case executing in a parallel group. The
+%%%       <c>continue/1</c> function should be used to resume
+%%%       execution of <c>TestCase</c>.</p>
+%%%      <p>See <c>break/1</c> for more details.</p>
+break(TestCase, Comment) ->
+    case {ct_util:get_testdata(starter),
+	  ct_util:get_testdata(release_shell)} of
+	{ct,ReleaseSh} when ReleaseSh /= true ->
+	    Warning = "ct:break/2 can only be used if release_shell == true.\n",
+	    ct_logs:log("Warning!", Warning, []),
+	    io:format(user, "Warning! " ++ Warning, []),
+	    {error,'enable break with release_shell option'};
+	_ ->
+	    case get_testdata(curr_tc) of
+		{ok,Cases} when is_list(Cases) ->
+		    case lists:keymember(TestCase, 2, Cases) of
+			true ->
+			    test_server:break(?MODULE, TestCase, Comment);
+			false ->
+			    {error,'test case not running'}
+		    end;
+		{ok,{_,TestCase}} ->
+		    test_server:break(?MODULE, TestCase, Comment);
+		Error = {error,_} -> 
+		    Error;
+		Error ->
+		    {error,Error}
+	    end
+    end.
+
+%%%-----------------------------------------------------------------
+%%% @spec continue() -> ok
+%%%
+%%% @doc <p>This function must be called in order to continue after a
+%%%      test case (not executing in a parallel group) has called
+%%%      <c>break/1</c>.</p>
+continue() -> 
+    test_server:continue().
+
+%%%-----------------------------------------------------------------
+%%% @spec continue(TestCase) -> ok
+%%%       TestCase = atom()
+%%%
+%%% @doc <p>This function must be called in order to continue after a
+%%%      test case has called <c>break/2</c>. If the paused test case,
+%%%      <c>TestCase</c>, executes in a parallel group, this
+%%%      function - rather than <c>continue/0</c> - must be used
+%%%      in order to let the test case proceed.</p>
+continue(TestCase) -> 
+    test_server:continue(TestCase).
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index 9277af5bc1..b1d709bc75 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -122,8 +122,8 @@ return({To,Ref},Result) ->
 
 loop(StartDir) ->
     receive
-	{{require,Name,Tag,SubTags},From} ->
-	    Result = do_require(Name,Tag,SubTags),
+	{{require,Name,Key},From} ->
+	    Result = do_require(Name,Key),
 	    return(From,Result),
 	    loop(StartDir);
 	{{set_default_config,{Config,Scope}},From} ->
@@ -168,16 +168,19 @@ reload_config(KeyOrName) ->
     call({reload_config, KeyOrName}).
 
 process_default_configs(Opts) ->
-    case lists:keysearch(config, 1, Opts) of
-	{value,{_,Files=[File|_]}} when is_list(File) ->
-	    Files;
-	{value,{_,File=[C|_]}} when is_integer(C) ->
-	    [File];
-	{value,{_,[]}} ->
-	    [];
-	false ->
-	    []
-    end.
+    lists:flatmap(fun({config,[_|_] = FileOrFiles}) ->
+			  case {io_lib:printable_list(FileOrFiles),
+				io_lib:printable_list(hd(FileOrFiles))} of
+			      {false,true} ->
+				  FileOrFiles;
+			      {true,false} ->
+				  [FileOrFiles];
+			      _ ->
+				  []
+			  end;
+		     (_) ->
+			  []
+		  end,Opts).
 
 process_user_configs(Opts, Acc) ->
     case lists:keytake(userconfig, 1, Opts) of
@@ -319,75 +322,58 @@ get_config(KeyOrName,Default) ->
     get_config(KeyOrName,Default,[]).
 
 get_config(KeyOrName,Default,Opts) when is_atom(KeyOrName) ->
-    case lookup_config(KeyOrName) of
-	[] ->
-	    Default;
-	[{_Ref,Val}|_] = Vals ->
-	    case {lists:member(all,Opts),lists:member(element,Opts)} of
-		{true,true} ->
-		    [{KeyOrName,V} || {_R,V} <- lists:sort(Vals)];
-		{true,false} ->
-		    [V || {_R,V} <- lists:sort(Vals)];
-		{false,true} ->
-		    {KeyOrName,Val};
-		{false,false} ->
-		    Val
-	    end
+    case get_config({KeyOrName}, Default, Opts) of
+	%% If only an atom is given, then we need to unwrap the
+	%% key if it is returned
+	{{KeyOrName}, Val} ->
+	    {KeyOrName, Val};
+	[{{KeyOrName}, _Val}|_] = Res ->
+	    [{K, Val} || {{K},Val} <- Res, K == KeyOrName];
+	Else ->
+	    Else
     end;
 
-get_config({KeyOrName,SubKey},Default,Opts) ->
-    case lookup_config(KeyOrName) of
+%% This useage of get_config is only used by internal ct functions
+%% and may change at any time
+get_config({DeepKey,SubKey}, Default, Opts) when is_tuple(DeepKey) ->
+    get_config(erlang:append_element(DeepKey, SubKey), Default, Opts);
+get_config(KeyOrName,Default,Opts) when is_tuple(KeyOrName) ->
+    case lookup_config(element(1,KeyOrName)) of
 	[] ->
-	    Default;
+	    format_value([Default],KeyOrName,Opts);
 	Vals ->
-	    Vals1 = case [Val || {_Ref,Val} <- lists:sort(Vals)] of
-			Result=[L|_] when is_list(L) ->
-			    case L of
-				[{_,_}|_] ->
-				    Result;
-				_ ->
-				    []
-			    end;
-			_ ->
-			    []
-		    end,
-	    case get_subconfig([SubKey],Vals1,[],Opts) of
-		{ok,[{_,SubVal}|_]=SubVals} ->
-		    case {lists:member(all,Opts),lists:member(element,Opts)} of
-			{true,true} ->
-			    [{{KeyOrName,SubKey},Val} || {_,Val} <- SubVals];
-			{true,false} ->
-			    [Val || {_SubKey,Val} <- SubVals];
-			{false,true} ->
-			    {{KeyOrName,SubKey},SubVal};
-			{false,false} ->
-			    SubVal
-		    end;
-		_ ->
-		    Default
-	    end
+	    NewVals =
+		lists:map(
+		  fun({Val}) ->
+			  get_config(tl(tuple_to_list(KeyOrName)),
+				     Val,Default,Opts)
+		  end,Vals),
+	    format_value(NewVals,KeyOrName,Opts)
     end.
 
-get_subconfig(SubKeys,Values) ->
-    get_subconfig(SubKeys,Values,[],[]).
-
-get_subconfig(SubKeys,[Value|Rest],Mapped,Opts) ->
-    case do_get_config(SubKeys,Value,[]) of
-	{ok,SubMapped} ->
-	    case lists:member(all,Opts) of
-		true ->
-		    get_subconfig(SubKeys,Rest,Mapped++SubMapped,Opts);
-		false ->
-		    {ok,SubMapped}
-	    end;
-	_Error ->
-	    get_subconfig(SubKeys,Rest,Mapped,Opts)
+get_config([],Vals,_Default,_Opts) ->
+    Vals;
+get_config([[]],Vals,Default,Opts) ->
+    get_config([],Vals,Default,Opts);
+%% This case is used by {require,{unix,[port,host]}} functionality
+get_config([SubKeys], Vals, Default, _Opts) when is_list(SubKeys) ->
+    case do_get_config(SubKeys, Vals, []) of
+	{ok, SubVals} ->
+	    [SubVal || {_,SubVal} <- SubVals];
+
+	_ ->
+	    Default
     end;
-get_subconfig(SubKeys,[],[],_) ->
-    {error,{not_available,SubKeys}};
-get_subconfig(_SubKeys,[],Mapped,_) ->
-    {ok,Mapped}.
+get_config([Key|Rest], Vals, Default, Opts) ->
+    case do_get_config([Key], Vals, []) of
+	{ok, [{Key,NewVals}]} ->
+	    get_config(Rest, NewVals, Default, Opts);
+	_ ->
+	    Default
+    end.
 
+do_get_config([Key|_], Available, _Mapped) when not is_list(Available) ->
+    {error,{not_available,Key}};
 do_get_config([Key|Required],Available,Mapped) ->
     case lists:keysearch(Key,1,Available) of
 	{value,{Key,Value}} ->
@@ -403,8 +389,7 @@ do_get_config([],_Available,Mapped) ->
 get_all_config() ->
     ets:select(?attr_table,[{#ct_conf{name='$1',key='$2',value='$3',
 				      default='$4',_='_'},
-			     [],
-			     [{{'$1','$2','$3','$4'}}]}]).
+			     [],[{{'$1','$2','$3','$4'}}]}]).
 
 lookup_config(KeyOrName) ->
     case lookup_name(KeyOrName) of
@@ -415,13 +400,23 @@ lookup_config(KeyOrName) ->
     end.
 
 lookup_name(Name) ->
-    ets:select(?attr_table,[{#ct_conf{ref='$1',value='$2',name=Name,_='_'},
-			     [],
-			     [{{'$1','$2'}}]}]).
+    ets:select(?attr_table,[{#ct_conf{value='$1',name=Name,_='_'},
+			     [],[{{'$1'}}]}]).
 lookup_key(Key) ->
-    ets:select(?attr_table,[{#ct_conf{key=Key,ref='$1',value='$2',name='_UNDEF',_='_'},
-			     [],
-			     [{{'$1','$2'}}]}]).
+    ets:select(?attr_table,[{#ct_conf{key=Key,value='$1',name='_UNDEF',_='_'},
+			     [],[{{'$1'}}]}]).
+
+format_value([SubVal|_] = SubVals, KeyOrName, Opts) ->
+    case {lists:member(all,Opts),lists:member(element,Opts)} of
+	{true,true} ->
+	    [{KeyOrName,Val} || Val <- SubVals];
+	{true,false} ->
+	    [Val || Val <- SubVals];
+	{false,true} ->
+	    {KeyOrName,SubVal};
+	{false,false} ->
+	    SubVal
+    end.
 
 lookup_handler_for_config({Key, _Subkey}) ->
     lookup_handler_for_config(Key);
@@ -475,65 +470,79 @@ release_allocated([H|T]) ->
 release_allocated([]) ->
     ok.
 
-allocate(Name,Key,SubKeys) ->
-    case ets:match_object(?attr_table,#ct_conf{key=Key,name='_UNDEF',_='_'}) of
-	[] ->
+allocate(Name,Key) ->
+    Ref = make_ref(),
+    case get_config(Key,Ref,[all,element]) of
+	[{_,Ref}] ->
 	    {error,{not_available,Key}};
-	Available ->
-	    case allocate_subconfig(Name,SubKeys,Available,false) of
-		ok ->
-		    ok;
-		Error ->
-		    Error
-	    end
+	Configs ->
+	    associate(Name,Key,Configs),
+	    ok
     end.
 
-allocate_subconfig(Name,SubKeys,[C=#ct_conf{value=Value}|Rest],Found) ->
-    case do_get_config(SubKeys,Value,[]) of
-	{ok,_SubMapped} ->
-	    ets:insert(?attr_table,C#ct_conf{name=Name}),
-	    allocate_subconfig(Name,SubKeys,Rest,true);
-	_Error ->
-	    allocate_subconfig(Name,SubKeys,Rest,Found)
-    end;
-allocate_subconfig(_Name,_SubKeys,[],true) ->
+
+associate('_UNDEF',_Key,_Configs) ->
     ok;
-allocate_subconfig(_Name,SubKeys,[],false) ->
-    {error,{not_available,SubKeys}}.
+associate(Name,{Key,SubKeys},Configs) when is_atom(Key), is_list(SubKeys) ->
+    associate_int(Name,Configs,"true");
+associate(Name,_Key,Configs) ->
+    associate_int(Name,Configs,os:getenv("COMMON_TEST_ALIAS_TOP")).
+
+associate_int(Name,Configs,"true") ->
+    lists:map(fun({K,_Config}) ->
+		      Cs = ets:match_object(
+			     ?attr_table,
+			     #ct_conf{key=element(1,K),
+				      name='_UNDEF',_='_'}),
+		      [ets:insert(?attr_table,C#ct_conf{name=Name})
+		       || C <- Cs]
+	      end,Configs);
+associate_int(Name,Configs,_) ->
+    lists:map(fun({K,Config}) ->
+		      Key = if is_tuple(K) -> element(1,K);
+			       is_atom(K) -> K
+			    end,
+
+		      Cs = ets:match_object(
+			     ?attr_table,
+			     #ct_conf{key=Key,
+				      name='_UNDEF',_='_'}),
+		      [ets:insert(?attr_table,C#ct_conf{name=Name,
+							value=Config})
+		       || C <- Cs]
+	      end,Configs).
+
+
 
 delete_config(Default) ->
     ets:match_delete(?attr_table,#ct_conf{default=Default,_='_'}),
     ok.
 
-require(Key) when is_atom(Key) ->
-    require({Key,[]});
-require({Key,SubKeys}) when is_atom(Key) ->
-    allocate('_UNDEF',Key,to_list(SubKeys));
+require(Key) when is_atom(Key); is_tuple(Key) ->
+    allocate('_UNDEF',Key);
 require(Key) ->
     {error,{invalid,Key}}.
 
-require(Name,Key) when is_atom(Key) ->
-    require(Name,{Key,[]});
-require(Name,{Key,SubKeys}) when is_atom(Name), is_atom(Key) ->
-    call({require,Name,Key,to_list(SubKeys)});
+require(Name,Key) when is_atom(Name),is_atom(Key) orelse is_tuple(Key) ->
+    call({require,Name,Key});
 require(Name,Keys) ->
     {error,{invalid,{Name,Keys}}}.
 
-to_list(X) when is_list(X) -> X;
-to_list(X) -> [X].
-
-do_require(Name,Key,SubKeys) when is_list(SubKeys) ->
+do_require(Name,Key) ->
     case get_key_from_name(Name) of
 	{error,_} ->
-	    allocate(Name,Key,SubKeys);
-	{ok,Key} ->
+	    allocate(Name,Key);
+	{ok,NameKey} when NameKey == Key; 
+			  is_tuple(Key) andalso element(1,Key) == NameKey ->
 	    %% already allocated - check that it has all required subkeys
-	    Vals = [Val || {_Ref,Val} <- lookup_name(Name)],
-	    case get_subconfig(SubKeys,Vals) of
-		{ok,_SubMapped} ->
-		    ok;
-		Error ->
-		    Error
+	    R = make_ref(),
+	    case get_config(Key,R,[]) of
+		R ->
+		    {error,{not_available,Key}};
+		{error,_} = Error ->
+		    Error;
+		_Error ->
+		    ok
 	    end;
 	{ok,OtherKey} ->
 	    {error,{name_in_use,Name,OtherKey}}
@@ -760,13 +769,13 @@ check_config_files(Configs) ->
     end,
     lists:keysearch(error, 1, lists:flatten(lists:map(ConfigChecker, Configs))).
 
-prepare_user_configs([ConfigString|UserConfigs], Acc, new) ->
+prepare_user_configs([CallbackMod|UserConfigs], Acc, new) ->
     prepare_user_configs(UserConfigs,
-			 [{list_to_atom(ConfigString), []}|Acc],
+			 [{list_to_atom(CallbackMod),[]}|Acc],
 			 cur);
 prepare_user_configs(["and"|UserConfigs], Acc, _) ->
     prepare_user_configs(UserConfigs, Acc, new);
-prepare_user_configs([ConfigString|UserConfigs], [{LastMod, LastList}|Acc], cur) ->
+prepare_user_configs([ConfigString|UserConfigs], [{LastMod,LastList}|Acc], cur) ->
     prepare_user_configs(UserConfigs,
 			 [{LastMod, [ConfigString|LastList]}|Acc],
 			 cur);
diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl
new file mode 100644
index 0000000000..d7bd18606b
--- /dev/null
+++ b/lib/common_test/src/ct_conn_log_h.erl
@@ -0,0 +1,236 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(ct_conn_log_h).
+
+%%%
+%%% A handler that can be connected to the error_logger event
+%%% handler. Writes all ct connection events. See comments in
+%%% cth_conn_log for more information.
+%%%
+
+-include("ct_util.hrl").
+
+-export([init/1,
+	 handle_event/2, handle_call/2, handle_info/2,
+	 terminate/2]).
+
+-record(state, {group_leader,logs=[]}).
+
+-define(WIDTH,80).
+
+%%%-----------------------------------------------------------------
+%%% Callbacks
+init({GL,Logs}) ->
+    open_files(Logs,#state{group_leader=GL}).
+
+open_files([{ConnMod,{LogType,Logs}}|T],State) ->
+    case do_open_files(Logs,[]) of
+	{ok,Fds} ->
+	    open_files(T,State#state{logs=[{ConnMod,{LogType,Fds}} |
+					   State#state.logs]});
+	Error ->
+	    Error
+    end;
+open_files([],State) ->
+    {ok,State}.
+
+
+do_open_files([{Tag,File}|Logs],Acc) ->
+    case file:open(File, [write]) of
+	{ok,Fd} ->
+	    do_open_files(Logs,[{Tag,Fd}|Acc]);
+	{error,Reason} ->
+	    {error,{could_not_open_log,File,Reason}}
+    end;
+do_open_files([],Acc) ->
+    {ok,lists:reverse(Acc)}.
+
+handle_event({_Type, GL, _Msg}, State) when node(GL) /= node() ->
+    {ok, State};
+handle_event({_Type,_GL,{Pid,{ct_connection,Action,ConnName},Report}},State) ->
+    %% NOTE: if the format of this event is changed
+    %% ({ct_connection,Action,ConnName}) then remember to change
+    %% test_server_h:report_receiver as well!!!
+    Info = conn_info(Pid,#conn_log{name=ConnName,action=Action}),
+    write_report(now(),Info,Report,State),
+    {ok, State};
+handle_event({_Type,_GL,{Pid,Info=#conn_log{},Report}},State) ->
+    %% NOTE: if the format of this event is changed
+    %% (Info=#conn_log{}) then remember to change
+    %% test_server_h:report_receiver as well!!!
+    write_report(now(),conn_info(Pid,Info),Report,State),
+    {ok, State};
+handle_event({error_report,_,{Pid,_,[{ct_connection,ConnName}|R]}},State) ->
+    %% Error reports from connection
+    write_error(now(),conn_info(Pid,#conn_log{name=ConnName}),R,State),
+    {ok, State};
+handle_event(_, State) ->
+    {ok, State}.
+
+handle_info(_, State) ->
+    {ok, State}.
+
+handle_call(_Query, State) ->
+    {ok, {error, bad_query}, State}.
+
+terminate(_,#state{logs=Logs}) ->
+    [file:close(Fd) || {_,{_,Fds}} <- Logs, {_,Fd} <- Fds],
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% Writing reports
+write_report(Time,#conn_log{module=ConnMod}=Info,Data,State) ->
+    {LogType,Fd} = get_log(Info,State),
+    io:format(Fd,"~n~s~s~s",[format_head(ConnMod,LogType,Time),
+			     format_title(LogType,Info),
+			     format_data(ConnMod,LogType,Data)]).
+
+write_error(Time,#conn_log{module=ConnMod}=Info,Report,State) ->
+    case get_log(Info,State) of
+	{html,_} ->
+	    %% The error will anyway be written in the html log by the
+	    %% sasl error handler, so don't write it again.
+	    ok;
+	{LogType,Fd} ->
+	    io:format(Fd,"~n~s~s~s",[format_head(ConnMod,LogType,Time," ERROR"),
+				     format_title(LogType,Info),
+				     format_error(LogType,Report)])
+    end.
+
+get_log(Info,State) ->
+    case proplists:get_value(Info#conn_log.module,State#state.logs) of
+	{html,_} ->
+	    {html,State#state.group_leader};
+	{LogType,Fds} ->
+	    {LogType,get_fd(Info,Fds)};
+	undefined ->
+	    {html,State#state.group_leader}
+    end.
+
+get_fd(#conn_log{name=undefined},Fds) ->
+    proplists:get_value(default,Fds);
+get_fd(#conn_log{name=ConnName},Fds) ->
+    case proplists:get_value(ConnName,Fds) of
+	undefined ->
+	    proplists:get_value(default,Fds);
+	Fd ->
+	    Fd
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Formatting
+format_head(ConnMod,LogType,Time) ->
+    format_head(ConnMod,LogType,Time,"").
+
+format_head(ConnMod,raw,Time,Text) ->
+    io_lib:format("~n~p, ~p~s, ",[now_to_time(Time),ConnMod,Text]);
+format_head(ConnMod,_,Time,Text) ->
+    Head = pad_char_end(?WIDTH,pretty_head(now_to_time(Time),ConnMod,Text),$=),
+    io_lib:format("~n~s",[Head]).
+
+format_title(raw,#conn_log{client=Client}=Info) ->
+    io_lib:format("Client ~p ~s ~s",[Client,actionstr(Info),serverstr(Info)]);
+format_title(_,Info) ->
+    Title = pad_char_end(?WIDTH,pretty_title(Info),$=),
+    io_lib:format("~n~s", [Title]).
+
+format_data(_,_,NoData) when NoData == ""; NoData == <<>> ->
+    "";
+format_data(ConnMod,LogType,Data) ->
+    ConnMod:format_data(LogType,Data).
+
+format_error(raw,Report) ->
+    io_lib:format("~n~p~n",[Report]);
+format_error(pretty,Report) ->
+    [io_lib:format("~n    ~p: ~p",[K,V]) || {K,V} <- Report].
+
+
+
+
+%%%-----------------------------------------------------------------
+%%% Helpers
+conn_info(LoggingProc, #conn_log{client=undefined} = ConnInfo) ->
+    conn_info(ConnInfo#conn_log{client=LoggingProc});
+conn_info(_, ConnInfo) ->
+    conn_info(ConnInfo).
+
+conn_info(#conn_log{client=Client, module=undefined} = ConnInfo) ->
+    case ets:lookup(ct_connections,Client) of
+	[#conn{address=Address,callback=Callback}] ->
+	    ConnInfo#conn_log{address=Address,module=Callback};
+	[] ->
+	    ConnInfo
+    end;
+conn_info(ConnInfo) ->
+    ConnInfo.
+
+
+now_to_time({_,_,MicroS}=Now) ->
+    {calendar:now_to_local_time(Now),MicroS}.
+
+pretty_head({{{Y,Mo,D},{H,Mi,S}},MicroS},ConnMod,Text0) ->
+    Text = string:to_upper(atom_to_list(ConnMod) ++ Text0),
+    io_lib:format("= ~s ==== ~s-~s-~p::~s:~s:~s,~s ",
+		  [Text,t(D),month(Mo),Y,t(H),t(Mi),t(S),
+		   micro2milli(MicroS)]).
+
+pretty_title(#conn_log{client=Client}=Info) ->
+    io_lib:format("= Client ~p  ~s  Server ~s ",
+		  [Client,actionstr(Info),serverstr(Info)]).
+
+actionstr(#conn_log{action=send}) -> "----->";
+actionstr(#conn_log{action=recv}) -> "<-----";
+actionstr(#conn_log{action=open}) -> "opened session to";
+actionstr(#conn_log{action=close}) -> "closed session to";
+actionstr(_) -> "<---->".
+
+serverstr(#conn_log{name=undefined,address=Address}) ->
+    io_lib:format("~p",[Address]);
+serverstr(#conn_log{name=Alias,address=Address}) ->
+    io_lib:format("~p(~p)",[Alias,Address]).
+
+month(1) -> "Jan";
+month(2) -> "Feb";
+month(3) -> "Mar";
+month(4) -> "Apr";
+month(5) -> "May";
+month(6) -> "Jun";
+month(7) -> "Jul";
+month(8) -> "Aug";
+month(9) -> "Sep";
+month(10) -> "Oct";
+month(11) -> "Nov";
+month(12) -> "Dec".
+
+micro2milli(X) ->
+    pad0(3,integer_to_list(X div 1000)).
+
+t(X) ->
+    pad0(2,integer_to_list(X)).
+
+pad0(N,Str) ->
+    M = length(Str),
+    lists:duplicate(N-M,$0) ++ Str.
+
+pad_char_end(N,Str,Char) ->
+    case length(lists:flatten(Str)) of
+	M when M<N -> Str ++ lists:duplicate(N-M,Char);
+	_ -> Str
+    end.
diff --git a/lib/common_test/src/ct_event.erl b/lib/common_test/src/ct_event.erl
index 3e79898ad1..49e0635d79 100644
--- a/lib/common_test/src/ct_event.erl
+++ b/lib/common_test/src/ct_event.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -31,7 +31,7 @@
 
 %% API
 -export([start_link/0, add_handler/0, add_handler/1, stop/0]).
--export([notify/1, sync_notify/1]).
+-export([notify/1, notify/2, sync_notify/1,sync_notify/2]).
 -export([is_alive/0]).
 
 %% gen_event callbacks
@@ -90,6 +90,13 @@ notify(Event) ->
     end.
 
 %%--------------------------------------------------------------------
+%% Function: notify(Name,Data) -> ok
+%% Description: Asynchronous notification to event manager.
+%%--------------------------------------------------------------------
+notify(Name, Data) ->
+    notify(#event{ name = Name, data = Data}).
+
+%%--------------------------------------------------------------------
 %% Function: sync_notify(Event) -> ok
 %% Description: Synchronous notification to event manager.
 %%--------------------------------------------------------------------
@@ -102,6 +109,13 @@ sync_notify(Event) ->
     end.
 
 %%--------------------------------------------------------------------
+%% Function: sync_notify(Name,Data) -> ok
+%% Description: Synchronous notification to event manager.
+%%--------------------------------------------------------------------
+sync_notify(Name,Data) ->
+    sync_notify(#event{ name = Name, data = Data}).
+
+%%--------------------------------------------------------------------
 %% Function: is_alive() -> true | false
 %% Description: Check if Event Manager is alive.
 %%--------------------------------------------------------------------
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 11575cd0fb..c1abf27e9f 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -27,13 +27,11 @@
 -export([init_tc/3, end_tc/3, end_tc/4, get_suite/2, get_all_cases/1]).
 -export([report/2, warn/1, error_notification/4]).
 
--export([get_logopts/0, format_comment/1, get_html_wrapper/3]).
+-export([get_logopts/0, format_comment/1, get_html_wrapper/4]).
 
 -export([error_in_suite/1, init_per_suite/1, end_per_suite/1,
 	 init_per_group/2, end_per_group/2]).
 
--export([make_all_conf/3, make_conf/5]).
-
 -include("ct_event.hrl").
 -include("ct_util.hrl").
 
@@ -72,18 +70,25 @@ init_tc(Mod,Func,Config) ->
 	{Suite,{suite0_failed,_}=Failure} ->
 	    {skip,Failure};
 	_ ->
-	    ct_util:set_testdata({curr_tc,{Suite,Func}}),
+	    ct_util:update_testdata(curr_tc,
+				    fun(undefined) ->
+					    [{Suite,Func}];
+				       (Running) ->
+					    [{Suite,Func}|Running]
+				    end, [create]),
 	    case ct_util:read_suite_data({seq,Suite,Func}) of
 		undefined ->
 		    init_tc1(Mod,Suite,Func,Config);
 		Seq when is_atom(Seq) ->
 		    case ct_util:read_suite_data({seq,Suite,Seq}) of
 			[Func|TCs] ->		% this is the 1st case in Seq
-			    %% make sure no cases in this seq are marked as failed
-			    %% from an earlier execution in the same suite
+			    %% make sure no cases in this seq are
+			    %% marked as failed from an earlier execution 
+			    %% in the same suite
 			    lists:foreach(
 			      fun(TC) ->
-				      ct_util:save_suite_data({seq,Suite,TC},Seq)
+				      ct_util:save_suite_data({seq,Suite,TC},
+							      Seq)
 			      end, TCs);
 			_ ->
 			    ok
@@ -204,20 +209,23 @@ init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) ->
 			   data={Mod,FuncSpec}}),
 
     case catch configure(MergedInfo,MergedInfo,SuiteInfo,
-			 FuncSpec,Config) of
+			 FuncSpec,[],Config) of
 	{suite0_failed,Reason} ->
-	    ct_util:set_testdata({curr_tc,{Mod,{suite0_failed,{require,Reason}}}}),
+	    ct_util:set_testdata({curr_tc,{Mod,{suite0_failed,
+						{require,Reason}}}}),
 	    {skip,{require_failed_in_suite0,Reason}};
 	{error,Reason} ->
 	    {auto_skip,{require_failed,Reason}};
 	{'EXIT',Reason} ->
 	    {auto_skip,Reason};
-	{ok,Config1} ->
+	{ok,PostInitHook,Config1} ->
 	    case get('$test_server_framework_test') of
 		undefined ->
-		    ct_suite_init(Suite, FuncSpec, Config1);
+		    ct_suite_init(Suite, FuncSpec, PostInitHook, Config1);
 		Fun ->
-		    case Fun(init_tc, Config1) of
+		    PostInitHookResult = do_post_init_hook(PostInitHook,
+							   Config1),
+		    case Fun(init_tc, [PostInitHookResult ++ Config1]) of
 			NewConfig when is_list(NewConfig) ->
 			    {ok,NewConfig};
 			Else ->
@@ -226,14 +234,28 @@ init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) ->
 	    end
     end.
 
-ct_suite_init(Suite, Func, [Config]) when is_list(Config) ->
+ct_suite_init(Suite, Func, PostInitHook, Config) when is_list(Config) ->
     case ct_hooks:init_tc(Suite, Func, Config) of
 	NewConfig when is_list(NewConfig) ->
-	    {ok, [NewConfig]};
+	    PostInitHookResult = do_post_init_hook(PostInitHook, NewConfig),
+	    {ok, [PostInitHookResult ++ NewConfig]};
 	Else ->
 	    Else
     end.
 
+do_post_init_hook(PostInitHook, Config) ->
+    lists:flatmap(fun({Tag,Fun}) ->
+			  case lists:keysearch(Tag,1,Config) of
+			      {value,_} ->
+				  [];
+			      false -> 
+				  case Fun() of
+				      {error,_} -> [];
+				      Result    -> [{Tag,Result}]
+				  end
+			  end
+		  end, PostInitHook).
+
 add_defaults(Mod,Func, GroupPath) ->
     Suite = get_suite_name(Mod, GroupPath),
     case (catch Suite:suite()) of
@@ -453,15 +475,16 @@ timetrap_first([],Info,[]) ->
 timetrap_first([],Info,Found) ->
     ?rev(Found) ++ ?rev(Info).
 
-configure([{require,Required}|Rest],Info,SuiteInfo,Scope,Config) ->
+configure([{require,Required}|Rest],
+	  Info,SuiteInfo,Scope,PostInitHook,Config) ->
     case ct:require(Required) of
 	ok ->
-	    configure(Rest,Info,SuiteInfo,Scope,Config);
+	    configure(Rest,Info,SuiteInfo,Scope,PostInitHook,Config);
 	Error = {error,Reason} ->
 	    case required_default('_UNDEF',Required,Info,
 				  SuiteInfo,Scope) of
 		ok ->
-		    configure(Rest,Info,SuiteInfo,Scope,Config);
+		    configure(Rest,Info,SuiteInfo,Scope,PostInitHook,Config);
 		_ ->
 		    case lists:keymember(Required,2,SuiteInfo) of
 			true ->
@@ -471,14 +494,15 @@ configure([{require,Required}|Rest],Info,SuiteInfo,Scope,Config) ->
 		    end
 	    end
     end;
-configure([{require,Name,Required}|Rest],Info,SuiteInfo,Scope,Config) ->
+configure([{require,Name,Required}|Rest],
+	  Info,SuiteInfo,Scope,PostInitHook,Config) ->
     case ct:require(Name,Required) of
 	ok ->
-	    configure(Rest,Info,SuiteInfo,Scope,Config);
+	    configure(Rest,Info,SuiteInfo,Scope,PostInitHook,Config);
 	Error = {error,Reason} ->
 	    case required_default(Name,Required,Info,SuiteInfo,Scope) of
 		ok ->
-		    configure(Rest,Info,SuiteInfo,Scope,Config);
+		    configure(Rest,Info,SuiteInfo,Scope,PostInitHook,Config);
 		_ ->
 		    case lists:keymember(Name,2,SuiteInfo) of
 			true -> 
@@ -488,17 +512,24 @@ configure([{require,Name,Required}|Rest],Info,SuiteInfo,Scope,Config) ->
 		    end
 	    end
     end;
-configure([{timetrap,off}|Rest],Info,SuiteInfo,Scope,Config) ->
-    configure(Rest,Info,SuiteInfo,Scope,Config);
-configure([{timetrap,Time}|Rest],Info,SuiteInfo,Scope,Config) ->
-    Dog = test_server:timetrap(Time),
-    configure(Rest,Info,SuiteInfo,Scope,[{watchdog,Dog}|Config]);
-configure([{ct_hooks, Hook} | Rest], Info, SuiteInfo, Scope, Config) ->
-    configure(Rest, Info, SuiteInfo, Scope, [{ct_hooks, Hook} | Config]);
-configure([_|Rest],Info,SuiteInfo,Scope,Config) ->
-    configure(Rest,Info,SuiteInfo,Scope,Config);
-configure([],_,_,_,Config) ->
-    {ok,[Config]}.
+configure([{timetrap,off}|Rest],Info,SuiteInfo,Scope,PostInitHook,Config) ->
+    configure(Rest,Info,SuiteInfo,Scope,PostInitHook,Config);
+configure([{timetrap,Time}|Rest],Info,SuiteInfo,Scope,PostInitHook,Config) ->
+    PostInitHook1 = 
+	[{watchdog,fun() -> case test_server:get_timetrap_info() of
+				undefined ->
+				    test_server:timetrap(Time);
+				_ ->
+				    {error,already_set}
+			    end
+		   end} | PostInitHook],
+    configure(Rest,Info,SuiteInfo,Scope,PostInitHook1,Config);
+configure([{ct_hooks,Hook}|Rest],Info,SuiteInfo,Scope,PostInitHook,Config) ->
+    configure(Rest,Info,SuiteInfo,Scope,PostInitHook,[{ct_hooks,Hook}|Config]);
+configure([_|Rest],Info,SuiteInfo,Scope,PostInitHook,Config) ->
+    configure(Rest,Info,SuiteInfo,Scope,PostInitHook,Config);
+configure([],_,_,_,PostInitHook,Config) ->
+    {ok,PostInitHook,Config}.
 
 %% the require element in Info may come from suite/0 and
 %% should be scoped 'suite', or come from the group info
@@ -562,10 +593,8 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
     %% in case Mod == ct_framework, lookup the suite name
     Suite = get_suite_name(Mod, Args),
 
-    case lists:keysearch(watchdog,1,Args) of
-	{value,{watchdog,Dog}} -> test_server:timetrap_cancel(Dog);
-	false -> ok
-    end,
+    test_server:timetrap_cancel(),
+
     %% save the testcase process pid so that it can be used
     %% to look up the attached trace window later
     case ct_util:get_testdata(interpret) of
@@ -633,7 +662,22 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
     end,
 
     ct_util:reset_silent_connections(),
-    
+
+    %% reset the curr_tc state, or delete this TC from the list of
+    %% executing cases (if in a parallel group)
+    ClearCurrTC = fun(Running = [_,_|_]) ->
+			  lists:keydelete(Func,2,Running);
+		     ({_,{suite0_failed,_}}) ->
+			  undefined;
+		     ([{_,CurrTC}]) when CurrTC == Func ->
+			  undefined;
+		     (undefined) ->
+			  undefined;
+		     (Unexpected) ->
+			  exit({error,{reset_curr_tc,{Mod,Func},Unexpected}})
+		  end,
+    ct_util:update_testdata(curr_tc,ClearCurrTC),
+
     case FinalResult of
 	{skip,{sequence_failed,_,_}} ->
 	    %% ct_logs:init_tc is never called for a skipped test case
@@ -830,13 +874,13 @@ get_suite(Mod, all) ->
 	{'EXIT',_} ->
 	    get_all(Mod, []);
 	GroupDefs when is_list(GroupDefs) ->
-	    case catch find_groups(Mod, all, all, GroupDefs) of
+	    case catch ct_groups:find_groups(Mod, all, all, GroupDefs) of
 		{error,_} = Error ->
 		    %% this makes test_server call error_in_suite as first
 		    %% (and only) test case so we can report Error properly
 		    [{?MODULE,error_in_suite,[[Error]]}];
 		ConfTests ->
-		    get_all(Mod, ConfTests)		    
+		    get_all(Mod, ConfTests)
 	    end;
 	_ ->
 	    E = "Bad return value from "++atom_to_list(Mod)++":groups/0",
@@ -855,7 +899,7 @@ get_suite(Mod, Group={conf,Props,_Init,TCs,_End}) ->
 	{'EXIT',_} ->
 	    [Group];
 	GroupDefs when is_list(GroupDefs) ->
-	    case catch find_groups(Mod, Name, TCs, GroupDefs) of
+	    case catch ct_groups:find_groups(Mod, Name, TCs, GroupDefs) of
 		{error,_} = Error ->
 		    %% this makes test_server call error_in_suite as first
 		    %% (and only) test case so we can report Error properly
@@ -870,12 +914,13 @@ get_suite(Mod, Group={conf,Props,_Init,TCs,_End}) ->
 			    %% init/end functions for top groups will be executed
 			    case catch ?val(name, element(2, hd(ConfTests))) of
 				Name ->		% top group
-				    delete_subs(ConfTests, ConfTests);
+				    ct_groups:delete_subs(ConfTests, ConfTests);
 				_ ->
 				    []
 			    end;
 			false ->
-			    ConfTests1 = delete_subs(ConfTests, ConfTests),
+			    ConfTests1 = ct_groups:delete_subs(ConfTests,
+							       ConfTests),
 			    case ?val(override, Props) of
 				undefined ->
 				    ConfTests1;
@@ -884,9 +929,9 @@ get_suite(Mod, Group={conf,Props,_Init,TCs,_End}) ->
 				ORSpec ->
 				    ORSpec1 = if is_tuple(ORSpec) -> [ORSpec];
 						 true -> ORSpec end,
-				    search_and_override(ConfTests1,
-							ORSpec1, Mod)
-			    end							      
+				    ct_groups:search_and_override(ConfTests1,
+								  ORSpec1, Mod)
+			    end
 		    end
 	    end;
 	_ ->
@@ -930,234 +975,6 @@ get_all_cases1(_, []) ->
 
 %%%-----------------------------------------------------------------
 
-find_groups(Mod, Name, TCs, GroupDefs) ->
-    Found = find(Mod, Name, TCs, GroupDefs, [], GroupDefs, false),
-    trim(Found).
-
-find(Mod, all, _TCs, [{Name,Props,Tests} | Gs], Known, Defs, _) 
-  when is_atom(Name), is_list(Props), is_list(Tests) ->
-    cyclic_test(Mod, Name, Known),
-    [make_conf(Mod, Name, Props,
-	       find(Mod, all, all, Tests, [Name | Known], Defs, true)) |
-     find(Mod, all, all, Gs, [], Defs, true)];
-
-find(Mod, Name, TCs, [{Name,Props,Tests} | _Gs], Known, Defs, false)
-  when is_atom(Name), is_list(Props), is_list(Tests) ->
-    cyclic_test(Mod, Name, Known),
-    case TCs of
-	all ->
-	    [make_conf(Mod, Name, Props,
-		       find(Mod, Name, TCs, Tests, [Name | Known], Defs, true))];
-	_ ->
-	    Tests1 = [TC || TC <- TCs,
-			    lists:member(TC, Tests) == true],
-	    [make_conf(Mod, Name, Props, Tests1)]
-    end;
-
-find(Mod, Name, TCs, [{Name1,Props,Tests} | Gs], Known, Defs, false)
-  when is_atom(Name1), is_list(Props), is_list(Tests) ->
-    cyclic_test(Mod, Name1, Known),
-    [make_conf(Mod,Name1,Props,
-		   find(Mod, Name, TCs, Tests, [Name1 | Known], Defs, false)) |
-     find(Mod, Name, TCs, Gs, [], Defs, false)];
-
-find(Mod, Name, _TCs, [{Name,_Props,_Tests} | _Gs], _Known, _Defs, true)
-  when is_atom(Name) ->
-    E = "Duplicate groups named "++atom_to_list(Name)++" in "++
-	atom_to_list(Mod)++":groups/0",
-    throw({error,list_to_atom(E)});
-
-find(Mod, Name, all, [{Name1,Props,Tests} | Gs], Known, Defs, true)
-  when is_atom(Name1), is_list(Props), is_list(Tests) ->
-    cyclic_test(Mod, Name1, Known),
-    [make_conf(Mod, Name1, Props,
-	       find(Mod, Name, all, Tests, [Name1 | Known], Defs, true)) |
-     find(Mod, Name, all, Gs, [], Defs, true)];
-
-find(Mod, Name, TCs, [{group,Name1} | Gs], Known, Defs, Found) 
-  when is_atom(Name1) ->
-    find(Mod, Name, TCs, [expand(Mod, Name1, Defs) | Gs], Known, Defs, Found);
-
-%% Undocumented remote group feature, use with caution
-find(Mod, Name, TCs, [{group, ExtMod, ExtGrp} | Gs], Known, Defs, true)
-  when is_atom(ExtMod), is_atom(ExtGrp) ->
-    ExternalDefs = ExtMod:groups(),
-    ExternalTCs = find(ExtMod, ExtGrp, TCs, [{group, ExtGrp}],
-                       [], ExternalDefs, false),
-     ExternalTCs ++ find(Mod, Name, TCs, Gs, Known, Defs, true);
-
-find(Mod, Name, TCs, [{Name1,Tests} | Gs], Known, Defs, Found)
-  when is_atom(Name1), is_list(Tests) ->
-    find(Mod, Name, TCs, [{Name1,[],Tests} | Gs], Known, Defs, Found);
-
-find(Mod, Name, TCs, [_TC | Gs], Known, Defs, false) ->
-    find(Mod, Name, TCs, Gs, Known, Defs, false);
-
-find(Mod, Name, TCs, [TC | Gs], Known, Defs, true) when is_atom(TC) ->
-    [{Mod, TC} | find(Mod, Name, TCs, Gs, Known, Defs, true)];
-
-find(Mod, Name, TCs, [{ExternalTC, Case} = TC | Gs], Known, Defs, true)
-  when is_atom(ExternalTC),
-       is_atom(Case) ->
-    [TC | find(Mod, Name, TCs, Gs, Known, Defs, true)];
-
-find(Mod, _Name, _TCs, [BadTerm | _Gs], Known, _Defs, _Found) ->
-    Where = if length(Known) == 0 ->
-		    atom_to_list(Mod)++":groups/0";
-	       true ->
-		    "group "++atom_to_list(lists:last(Known))++
-			" in "++atom_to_list(Mod)++":groups/0"
-	    end,		 
-    Term = io_lib:format("~p", [BadTerm]),
-    E = "Bad term "++lists:flatten(Term)++" in "++Where,
-    throw({error,list_to_atom(E)});
-
-find(_Mod, _Name, _TCs,  [], _Known, _Defs, false) ->
-    ['$NOMATCH'];
-
-find(_Mod, _Name, _TCs,  [], _Known, _Defs, _Found) ->
-    [].
-
-delete_subs([{conf, _,_,_,_} = Conf | Confs], All) ->
-    All1 = delete_conf(Conf, All),
-    case is_sub(Conf, All1) of
-	true ->
-	    delete_subs(Confs, All1);
-	false ->
-	    delete_subs(Confs, All)
-    end;
-delete_subs([_Else | Confs], All) ->
-    delete_subs(Confs, All);
-delete_subs([], All) ->
-    All.
-
-delete_conf({conf,Props,_,_,_}, Confs) ->
-    Name = ?val(name, Props),
-    [Conf || Conf = {conf,Props0,_,_,_} <- Confs,
-	     Name =/= ?val(name, Props0)].
-
-is_sub({conf,Props,_,_,_}=Conf, [{conf,_,_,Tests,_} | Confs]) ->
-    Name = ?val(name, Props),
-    case lists:any(fun({conf,Props0,_,_,_}) ->
-			   case ?val(name, Props0) of
-			       N when N == Name ->
-				   true;
-			       _ ->
-				   false
-			   end;
-		      (_) ->
-			   false
-		   end, Tests) of
-	true ->
-	    true;
-	false ->
-	    is_sub(Conf, Tests) or is_sub(Conf, Confs)
-    end;
-
-is_sub(Conf, [_TC | Tests]) ->
-    is_sub(Conf, Tests);
-
-is_sub(_Conf, []) ->
-    false.
-
-trim(['$NOMATCH' | Tests]) ->
-    trim(Tests);
-
-trim([{conf,Props,Init,Tests,End} | Confs]) ->
-    case trim(Tests) of
-	[] ->
-	    trim(Confs);
-	Trimmed ->
-	    [{conf,Props,Init,Trimmed,End} | trim(Confs)]
-    end;
-
-trim([TC | Tests]) ->
-    [TC | trim(Tests)];
-
-trim([]) ->
-    [].
-
-cyclic_test(Mod, Name, Names) ->
-    case lists:member(Name, Names) of
-	true ->
-	    E = "Cyclic reference to group "++atom_to_list(Name)++
-		" in "++atom_to_list(Mod)++":groups/0",
-	    throw({error,list_to_atom(E)});
-	false ->
-	    ok
-    end.
-
-expand(Mod, Name, Defs) ->
-    case lists:keysearch(Name, 1, Defs) of
-	{value,Def} -> 
-	    Def;
-	false ->
-	    E = "Invalid group "++atom_to_list(Name)++
-		" in "++atom_to_list(Mod)++":groups/0",
-	    throw({error,list_to_atom(E)})
-    end.
-
-make_all_conf(Dir, Mod, _Props) ->
-    case code:is_loaded(Mod) of
-	false ->
-	    code:load_abs(filename:join(Dir,atom_to_list(Mod)));
-	_ ->
-	    ok
-    end,
-    make_all_conf(Mod).
-
-make_all_conf(Mod) ->
-    case catch apply(Mod, groups, []) of
-	{'EXIT',_} ->
-	    {error,{invalid_group_definition,Mod}};
-	GroupDefs when is_list(GroupDefs) ->
-	    case catch find_groups(Mod, all, all, GroupDefs) of
-		{error,_} = Error ->
-		    %% this makes test_server call error_in_suite as first
-		    %% (and only) test case so we can report Error properly
-		    [{?MODULE,error_in_suite,[[Error]]}];
-		[] ->
-		    {error,{invalid_group_spec,Mod}};
-		ConfTests ->
-		    [{conf,Props,Init,all,End} ||
-			{conf,Props,Init,_,End}
-			    <- delete_subs(ConfTests, ConfTests)]
-	    end
-    end.
-
-make_conf(Dir, Mod, Name, Props, TestSpec) ->
-    case code:is_loaded(Mod) of
-	false ->
-	    code:load_abs(filename:join(Dir,atom_to_list(Mod)));
-	_ ->
-	    ok
-    end,
-    make_conf(Mod, Name, Props, TestSpec).
-
-make_conf(Mod, Name, Props, TestSpec) ->
-    case code:is_loaded(Mod) of
-	false ->
-	    code:load_file(Mod);
-	_ ->
-	    ok
-    end,
-    {InitConf,EndConf,ExtraProps} =
-	case erlang:function_exported(Mod,init_per_group,2) of
-	    true ->
-		{{Mod,init_per_group},{Mod,end_per_group},[]};
-	    false ->
-		ct_logs:log("TEST INFO", "init_per_group/2 and "
-			    "end_per_group/2 missing for group "
-			    "~p in ~p, using default.",
-			    [Name,Mod]),
-		{{?MODULE,init_per_group},
-		 {?MODULE,end_per_group},
-		 [{suite,Mod}]}
-	end,
-    {conf,[{name,Name}|Props++ExtraProps],InitConf,TestSpec,EndConf}.
-
-%%%-----------------------------------------------------------------
-
 get_all(Mod, ConfTests) ->	
     case catch apply(Mod, all, []) of
 	{'EXIT',_} ->
@@ -1172,133 +989,24 @@ get_all(Mod, ConfTests) ->
 		    [{?MODULE,error_in_suite,[[{error,What}]]}];
 		SeqsAndTCs ->
 		    %% expand group references in all() using ConfTests
-		    case catch expand_groups(SeqsAndTCs, ConfTests, Mod) of
+		    case catch ct_groups:expand_groups(SeqsAndTCs,
+						       ConfTests,
+						       Mod) of
 			{error,_} = Error ->
 			    [{?MODULE,error_in_suite,[[Error]]}];
 			Tests ->
-			    delete_subs(Tests, Tests)
+			    ct_groups:delete_subs(Tests, Tests)
 		    end
 	    end;
 	Skip = {skip,_Reason} ->
 	    Skip;
 	_ ->
 	    Reason = 
-		list_to_atom("Bad return value from "++atom_to_list(Mod)++":all/0"),
+		list_to_atom("Bad return value from "++
+				 atom_to_list(Mod)++":all/0"),
 	    [{?MODULE,error_in_suite,[[{error,Reason}]]}]
     end.
 
-expand_groups([H | T], ConfTests, Mod) ->
-    [expand_groups(H, ConfTests, Mod) | expand_groups(T, ConfTests, Mod)];
-expand_groups([], _ConfTests, _Mod) ->
-    [];
-expand_groups({group,Name}, ConfTests, Mod) ->
-    expand_groups({group,Name,default,[]}, ConfTests, Mod);
-expand_groups({group,Name,default}, ConfTests, Mod) ->
-    expand_groups({group,Name,default,[]}, ConfTests, Mod);
-expand_groups({group,Name,ORProps}, ConfTests, Mod) when is_list(ORProps) ->
-    expand_groups({group,Name,ORProps,[]}, ConfTests, Mod);
-expand_groups({group,Name,ORProps,SubORSpec}, ConfTests, Mod) ->
-    FindConf =
-	fun(Conf = {conf,Props,Init,Ts,End}) ->
-		case ?val(name, Props) of
-		    Name when ORProps == default ->
-			[Conf];
-		    Name ->
-			[{conf,[{name,Name}|ORProps],Init,Ts,End}];
-		    _    -> 
-			[]
-		end
-	end,					 
-    case lists:flatmap(FindConf, ConfTests) of
-	[] ->
-	    throw({error,invalid_ref_msg(Name, Mod)});
-	Matching when SubORSpec == [] -> 
-	    Matching;
-	Matching -> 
-	    override_props(Matching, SubORSpec, Name,Mod)
-    end;
-expand_groups(SeqOrTC, _ConfTests, _Mod) ->
-    SeqOrTC.
-
-%% search deep for the matching conf test and modify it and any 
-%% sub tests according to the override specification
-search_and_override([Conf = {conf,Props,Init,Tests,End}], ORSpec, Mod) ->
-    Name = ?val(name, Props),
-    case lists:keysearch(Name, 1, ORSpec) of
-	{value,{Name,default}} ->
-	    [Conf];
-	{value,{Name,ORProps}} ->
-	    [{conf,[{name,Name}|ORProps],Init,Tests,End}];
-	{value,{Name,default,[]}} ->
-	    [Conf];
-	{value,{Name,default,SubORSpec}} ->
-	    override_props([Conf], SubORSpec, Name,Mod);
-	{value,{Name,ORProps,SubORSpec}} ->
-	    override_props([{conf,[{name,Name}|ORProps],
-			    Init,Tests,End}], SubORSpec, Name,Mod);
-	_ ->
-	    [{conf,Props,Init,search_and_override(Tests,ORSpec,Mod),End}]
-    end.
-
-%% Modify the Tests element according to the override specification
-override_props([{conf,Props,Init,Tests,End} | Confs], SubORSpec, Name,Mod) ->
-    {Subs,SubORSpec1} = override_sub_props(Tests, [], SubORSpec, Mod),
-    [{conf,Props,Init,Subs,End} | override_props(Confs, SubORSpec1, Name,Mod)];
-override_props([], [], _,_) ->
-    [];
-override_props([], SubORSpec, Name,Mod) ->
-    Es = [invalid_ref_msg(Name, element(1,Spec), Mod) || Spec <- SubORSpec],
-    throw({error,Es}).
-
-override_sub_props([], New, ORSpec, _) ->    
-    {?rev(New),ORSpec};
-override_sub_props([T = {conf,Props,Init,Tests,End} | Ts],
-		   New, ORSpec, Mod) ->
-    Name = ?val(name, Props),
-    case lists:keysearch(Name, 1, ORSpec) of
-	{value,Spec} ->				% group found in spec
-	    Props1 =
-		case element(2, Spec) of
-		    default -> Props;
-		    ORProps -> [{name,Name} | ORProps]
-		end,
-	    case catch element(3, Spec) of
-		Undef when Undef == [] ; 'EXIT' == element(1, Undef) ->
-		    override_sub_props(Ts, [{conf,Props1,Init,Tests,End} | New],
-				       lists:keydelete(Name, 1, ORSpec), Mod);
-		SubORSpec when is_list(SubORSpec) ->
-		    case override_sub_props(Tests, [], SubORSpec, Mod) of
-			{Subs,[]} ->
-			    override_sub_props(Ts, [{conf,Props1,Init,
-						     Subs,End} | New],
-					       lists:keydelete(Name, 1, ORSpec),
-					       Mod);
-			{_,NonEmptySpec} ->
-			    Es = [invalid_ref_msg(Name, element(1, GrRef),
-						  Mod) || GrRef <- NonEmptySpec],
-			    throw({error,Es})
-		    end;
-		BadGrSpec ->
-		    throw({error,{invalid_form,BadGrSpec}})
-	    end;
-	_ ->					% not a group in spec
-	    override_sub_props(Ts, [T | New], ORSpec, Mod)
-    end;
-override_sub_props([TC | Ts], New, ORSpec, Mod) ->
-    override_sub_props(Ts, [TC | New], ORSpec, Mod).
-
-invalid_ref_msg(Name, Mod) ->
-    E = "Invalid reference to group "++
-	atom_to_list(Name)++" in "++
-	atom_to_list(Mod)++":all/0",
-    list_to_atom(E).
-
-invalid_ref_msg(Name0, Name1, Mod) ->
-    E = "Invalid reference to group "++
-	atom_to_list(Name1)++" from "++atom_to_list(Name0)++
-	" in "++atom_to_list(Mod)++":all/0",
-    list_to_atom(E).
-
 %%!============================================================
 %%! The support for sequences by means of using sequences/0
 %%! will be removed in OTP R15. The code below is only kept 
@@ -1483,6 +1191,12 @@ report(What,Data) ->
 	    end;
 	tests_done ->
 	    ok;
+	severe_error ->
+	    ct_event:sync_notify(#event{name=What,
+					node=node(),
+					data=Data}),
+	    ct_util:set_testdata({What,Data}),
+	    ok;
 	tc_start ->
 	    %% Data = {{Suite,Func},LogFileName}
 	    ct_event:sync_notify(#event{name=tc_logfile,
@@ -1634,5 +1348,5 @@ format_comment(Comment) ->
 
 %%%-----------------------------------------------------------------
 %%% @spec get_html_wrapper(TestName, PrintLabel, Cwd) -> Header
-get_html_wrapper(TestName, PrintLabel, Cwd) ->
-    ct_logs:get_ts_html_wrapper(TestName, PrintLabel, Cwd).
+get_html_wrapper(TestName, PrintLabel, Cwd, TableCols) ->
+    ct_logs:get_ts_html_wrapper(TestName, PrintLabel, Cwd, TableCols).
diff --git a/lib/common_test/src/ct_ftp.erl b/lib/common_test/src/ct_ftp.erl
index 5db73066a3..8790393b36 100644
--- a/lib/common_test/src/ct_ftp.erl
+++ b/lib/common_test/src/ct_ftp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -66,6 +66,7 @@
 %%% {unix,[{ftp,IpAddr},
 %%%        {username,Username},
 %%%        {password,Password}]}.</pre>
+%%% @see ct:require/2
 put(KeyOrName,LocalFile,RemoteFile) ->
     Fun = fun(Ftp) -> send(Ftp,LocalFile,RemoteFile) end,
     open_and_do(KeyOrName,Fun).
@@ -85,6 +86,7 @@ put(KeyOrName,LocalFile,RemoteFile) ->
 %%%
 %%% <p>The config file must be as for put/3.</p>
 %%% @see put/3
+%%% @see ct:require/2
 get(KeyOrName,RemoteFile,LocalFile) ->
     Fun = fun(Ftp) -> recv(Ftp,RemoteFile,LocalFile) end,
     open_and_do(KeyOrName,Fun).
@@ -105,6 +107,10 @@ get(KeyOrName,RemoteFile,LocalFile) ->
 %%% simply use <code>Key</code>, the configuration variable name, to 
 %%% specify the target. Note that a connection that has no associated target 
 %%% name can only be closed with the handle value.</p>
+%%%
+%%% <p>See <c>ct:require/2</c> for how to create a new <c>Name</c></p>
+%%%
+%%% @see ct:require/2
 open(KeyOrName) ->
     case ct_util:get_key_from_name(KeyOrName) of
 	{ok,node} ->
diff --git a/lib/common_test/src/ct_gen_conn.erl b/lib/common_test/src/ct_gen_conn.erl
index 5aab4dd2dd..1f01d84601 100644
--- a/lib/common_test/src/ct_gen_conn.erl
+++ b/lib/common_test/src/ct_gen_conn.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -27,7 +27,7 @@
 -compile(export_all).
 
 -export([start/4, stop/1]).
--export([call/2, do_within_time/2]).
+-export([call/2, call/3, return/2, do_within_time/2]).
 
 -ifdef(debug).
 -define(dbg,true).
@@ -39,17 +39,24 @@
 		  name,
 		  address,
 		  init_data,
+		  reconnect    = true,
+		  forward      = false,
+		  use_existing = true,
+		  old          = false,
 		  conn_pid,
 		  cb_state,
 		  ct_util_server}).
 
 %%%-----------------------------------------------------------------
-%%% @spec start(Name,Address,InitData,CallbackMod) -> 
+%%% @spec start(Address,InitData,CallbackMod,Opts) ->
 %%%                                     {ok,Handle} | {error,Reason}
 %%%      Name = term()
 %%%      CallbackMod = atom()
 %%%      InitData = term()
 %%%      Address = term()
+%%%      Opts = [Opt]
+%%%      Opt = {name,Name} | {use_existing_connection,boolean()} |
+%%%            {reconnect,boolean()} | {forward_messages,boolean()}
 %%%
 %%% @doc Open a connection and start the generic connection owner process.
 %%%
@@ -60,50 +67,67 @@
 %%% <code>InitData</code> and returna
 %%% <code>{ok,ConnectionPid,State}</code> or
 %%% <code>{error,Reason}</code>.</p>
+%%%
+%%% If no name is given, the <code>Name</code> argument in init/3 will
+%%% have the value <code>undefined</code>.
+%%%
+%%% The callback modules must also export
+%%% ```
+%%% handle_msg(Msg,From,State) -> {reply,Reply,State} |
+%%%                               {noreply,State} |
+%%%                               {stop,Reply,State}
+%%% terminate(ConnectionPid,State) -> term()
+%%% close(Handle) -> term()
+%%% '''
+%%%
+%%% The <code>close/1</code> callback function is actually a callback
+%%% for ct_util, for closing registered connections when
+%%% ct_util_server is terminated. <code>Handle</code> is the Pid of
+%%% the ct_gen_conn process.
+%%%
+%%% If option <code>reconnect</code> is <code>true</code>, then the
+%%% callback must also export
+%%% ```
+%%% reconnect(Address,State) -> {ok,ConnectionPid,State}
+%%% '''
+%%%
+%%% If option <code>forward_messages</code> is <ocde>true</code>, then
+%%% the callback must also export
+%%% ```
+%%% handle_msg(Msg,State) -> {noreply,State} | {stop,State}
+%%% '''
+%%%
+%%% An old interface still exists. This is used by ct_telnet, ct_ftp
+%%% and ct_ssh. The start function then has an explicit
+%%% <code>Name</code> argument, and no <code>Opts</code> argument. The
+%%% callback must export:
+%%%
+%%% ```
+%%% init(Name,Address,InitData) -> {ok,ConnectionPid,State}
+%%% handle_msg(Msg,State) -> {Reply,State}
+%%% reconnect(Address,State) -> {ok,ConnectionPid,State}
+%%% terminate(ConnectionPid,State) -> term()
+%%% close(Handle) -> term()
+%%% '''
+%%%
+start(Address,InitData,CallbackMod,Opts) when is_list(Opts) ->
+    do_start(Address,InitData,CallbackMod,Opts);
 start(Name,Address,InitData,CallbackMod) ->
-    case ct_util:does_connection_exist(Name,Address,CallbackMod) of
-	{ok,Pid} ->
-	    log("ct_gen_conn:start","Using existing connection!\n",[]),
-	    {ok,Pid};
-	false ->
-	    Self = self(),
-	    Pid = spawn(fun() -> 
-				init_gen(Self, #gen_opts{callback=CallbackMod,
-							 name=Name,
-							 address=Address,
-							 init_data=InitData})
-			end),
-	    MRef = erlang:monitor(process,Pid),
-	    receive 
-		{connected,Pid} -> 
-		    erlang:demonitor(MRef, [flush]),
-		    ct_util:register_connection(Name,Address,CallbackMod,Pid),
-		    {ok,Pid};
-		{Error,Pid} ->
-		    receive {'DOWN',MRef,process,_,_} -> ok end,
-		    Error;
-		{'DOWN',MRef,process,_,Reason} ->
-		    log("ct_gen_conn:start",
-			"Connection process died: ~p\n",
-			[Reason]),
-		    {error,{connection_process_died,Reason}}
-	    end
-    end.
-
+    do_start(Address,InitData,CallbackMod,[{name,Name},{old,true}]).
 
 %%%-----------------------------------------------------------------
 %%% @spec stop(Handle) -> ok
 %%%      Handle = handle()
 %%%
-%%% @doc Close the telnet connection and stop the process managing it.
+%%% @doc Close the connection and stop the process managing it.
 stop(Pid) ->
-    call(Pid,stop).
+    call(Pid,stop,5000).
 
 %%%-----------------------------------------------------------------
 %%% @spec log(Heading,Format,Args) -> ok
 %%%
 %%% @doc Log activities on the current connection (tool-internal use only).
-%%% @see ct_logs:log/3 
+%%% @see ct_logs:log/3
 log(Heading,Format,Args) ->
     log(log,[Heading,Format,Args]).
 
@@ -111,7 +135,7 @@ log(Heading,Format,Args) ->
 %%% @spec start_log(Heading) -> ok
 %%%
 %%% @doc Log activities on the current connection (tool-internal use only).
-%%% @see ct_logs:start_log/1 
+%%% @see ct_logs:start_log/1
 start_log(Heading) ->
     log(start_log,[Heading]).
 
@@ -119,7 +143,7 @@ start_log(Heading) ->
 %%% @spec cont_log(Format,Args) -> ok
 %%%
 %%% @doc Log activities on the current connection (tool-internal use only).
-%%% @see ct_logs:cont_log/2 
+%%% @see ct_logs:cont_log/2
 cont_log(Format,Args) ->
     log(cont_log,[Format,Args]).
 
@@ -127,7 +151,7 @@ cont_log(Format,Args) ->
 %%% @spec end_log() -> ok
 %%%
 %%% @doc Log activities on the current connection (tool-internal use only).
-%%% @see ct_logs:end_log/0 
+%%% @see ct_logs:end_log/0
 end_log() ->
     log(end_log,[]).
 
@@ -148,10 +172,10 @@ do_within_time(Fun,Timeout) ->
     Silent = get(silent),
     TmpPid = spawn_link(fun() -> put(silent,Silent),
 				 R = Fun(),
-				 Self ! {self(),R} 
+				 Self ! {self(),R}
 			end),
     ConnPid = get(conn_pid),
-    receive 
+    receive
 	{TmpPid,Result} ->
 	    Result;
 	{'EXIT',ConnPid,_Reason}=M ->
@@ -159,7 +183,7 @@ do_within_time(Fun,Timeout) ->
 	    exit(TmpPid,kill),
 	    self() ! M,
 	    {error,connection_closed}
-    after 
+    after
 	Timeout ->
 	    exit(TmpPid,kill),
 	    receive
@@ -176,12 +200,66 @@ do_within_time(Fun,Timeout) ->
 
 %%%=================================================================
 %%% Internal functions
-call(Pid,Msg) ->
+do_start(Address,InitData,CallbackMod,Opts0) ->
+    Opts = check_opts(Opts0,#gen_opts{callback=CallbackMod,
+				      address=Address,
+				      init_data=InitData}),
+    case ct_util:does_connection_exist(Opts#gen_opts.name,
+				       Address,CallbackMod) of
+	{ok,Pid} when Opts#gen_opts.use_existing ->
+	    log("ct_gen_conn:start","Using existing connection!\n",[]),
+	    {ok,Pid};
+	{ok,Pid} when not Opts#gen_opts.use_existing ->
+	    {error,{connection_exists,Pid}};
+	false ->
+	    do_start(Opts)
+    end.
+
+do_start(Opts) ->
+    Self = self(),
+    Pid = spawn(fun() -> init_gen(Self, Opts) end),
+    MRef = erlang:monitor(process,Pid),
+    receive
+	{connected,Pid} ->
+	    erlang:demonitor(MRef, [flush]),
+	    ct_util:register_connection(Opts#gen_opts.name, Opts#gen_opts.address,
+					Opts#gen_opts.callback, Pid),
+	    {ok,Pid};
+	{Error,Pid} ->
+	    receive {'DOWN',MRef,process,_,_} -> ok end,
+	    Error;
+	{'DOWN',MRef,process,_,Reason} ->
+	    log("ct_gen_conn:start",
+		"Connection process died: ~p\n",
+		[Reason]),
+	    {error,{connection_process_died,Reason}}
+    end.
+
+check_opts(Opts0) ->
+    check_opts(Opts0,#gen_opts{}).
+
+check_opts([{name,Name}|T],Opts) ->
+    check_opts(T,Opts#gen_opts{name=Name});
+check_opts([{reconnect,Bool}|T],Opts) ->
+    check_opts(T,Opts#gen_opts{reconnect=Bool});
+check_opts([{forward_messages,Bool}|T],Opts) ->
+    check_opts(T,Opts#gen_opts{forward=Bool});
+check_opts([{use_existing_connection,Bool}|T],Opts) ->
+    check_opts(T,Opts#gen_opts{use_existing=Bool});
+check_opts([{old,Bool}|T],Opts) ->
+    check_opts(T,Opts#gen_opts{old=Bool});
+check_opts([],Opts) ->
+    Opts.
+
+call(Pid, Msg) ->
+    call(Pid, Msg, infinity).
+
+call(Pid, Msg, Timeout) ->
     MRef = erlang:monitor(process,Pid),
     Ref = make_ref(),
     Pid ! {Msg,{self(),Ref}},
     receive
-	{Ref, Result} -> 
+	{Ref, Result} ->
 	    erlang:demonitor(MRef, [flush]),
 	    case Result of
 		{retry,_Data} ->
@@ -189,8 +267,15 @@ call(Pid,Msg) ->
 		Other ->
 		    Other
 	    end;
-	{'DOWN',MRef,process,_,Reason}  -> 
+	{'DOWN',MRef,process,_,Reason}  ->
 	    {error,{process_down,Pid,Reason}}
+    after Timeout ->
+	    erlang:demonitor(MRef, [flush]),
+	    log("ct_gen_conn",
+		"Connection process ~p not responding. Killing now!",
+		[Pid]),
+	    exit(Pid, kill),
+	    {error,{process_down,Pid,forced_termination}}
     end.
 
 return({To,Ref},Result) ->
@@ -198,36 +283,47 @@ return({To,Ref},Result) ->
 
 init_gen(Parent,Opts) ->
     process_flag(trap_exit,true),
-    CtUtilServer = whereis(ct_util_server),
-    link(CtUtilServer),
     put(silent,false),
-    case catch (Opts#gen_opts.callback):init(Opts#gen_opts.name,
-					     Opts#gen_opts.address,
-					     Opts#gen_opts.init_data) of
+    try (Opts#gen_opts.callback):init(Opts#gen_opts.name,
+				      Opts#gen_opts.address,
+				      Opts#gen_opts.init_data) of
 	{ok,ConnPid,State} when is_pid(ConnPid) ->
 	    link(ConnPid),
 	    put(conn_pid,ConnPid),
+	    CtUtilServer = whereis(ct_util_server),
+	    link(CtUtilServer),
 	    Parent ! {connected,self()},
 	    loop(Opts#gen_opts{conn_pid=ConnPid,
 			       cb_state=State,
 			       ct_util_server=CtUtilServer});
 	{error,Reason} ->
 	    Parent ! {{error,Reason},self()}
+    catch
+	throw:{error,Reason} ->
+	    Parent ! {{error,Reason},self()}
     end.
 
 loop(Opts) ->
     receive
 	{'EXIT',Pid,Reason} when Pid==Opts#gen_opts.conn_pid ->
-	    log("Connection down!\nOpening new!","Reason: ~p\nAddress: ~p\n",
-		[Reason,Opts#gen_opts.address]),
-	    case reconnect(Opts) of
-		{ok, NewPid, NewState} ->
-		    link(NewPid),
-		    put(conn_pid,NewPid),
-		    loop(Opts#gen_opts{conn_pid=NewPid,cb_state=NewState});
-		Error ->
+	    case Opts#gen_opts.reconnect of
+		true ->
+		    log("Connection down!\nOpening new!",
+			"Reason: ~p\nAddress: ~p\n",
+			[Reason,Opts#gen_opts.address]),
+		    case reconnect(Opts) of
+			{ok, NewPid, NewState} ->
+			    link(NewPid),
+			    put(conn_pid,NewPid),
+			    loop(Opts#gen_opts{conn_pid=NewPid,cb_state=NewState});
+			Error ->
+			    ct_util:unregister_connection(self()),
+			    log("Reconnect failed. Giving up!","Reason: ~p\n",
+				[Error])
+		    end;
+		false ->
 		    ct_util:unregister_connection(self()),
-		    log("Reconnect failed. Giving up!","Reason: ~p\n",[Error])
+		    log("Connection closed!","Reason: ~p\n",[Reason])
 	    end;
 	{'EXIT',Pid,Reason} ->
 	    case Opts#gen_opts.ct_util_server of
@@ -252,24 +348,40 @@ loop(Opts) ->
 	    loop(Opts);
 	{{retry,{_Error,_Name,_CPid,Msg}}, From} ->
 	    log("Rerunning command","Connection reestablished. Rerunning command...",[]),
-	    {Return,NewState} = 
+	    {Return,NewState} =
 		(Opts#gen_opts.callback):handle_msg(Msg,Opts#gen_opts.cb_state),
 	    return(From, Return),
-	    loop(Opts#gen_opts{cb_state=NewState});	    
-	{Msg,From={Pid,_Ref}} when is_pid(Pid) ->
-	    {Return,NewState} = 
+	    loop(Opts#gen_opts{cb_state=NewState});
+	{Msg,From={Pid,_Ref}} when is_pid(Pid), Opts#gen_opts.old==true ->
+	    {Return,NewState} =
 		(Opts#gen_opts.callback):handle_msg(Msg,Opts#gen_opts.cb_state),
 	    return(From, Return),
-	    loop(Opts#gen_opts{cb_state=NewState})
+	    loop(Opts#gen_opts{cb_state=NewState});
+	{Msg,From={Pid,_Ref}} when is_pid(Pid) ->
+	    case (Opts#gen_opts.callback):handle_msg(Msg,From,
+						     Opts#gen_opts.cb_state) of
+		{reply,Reply,NewState} ->
+		    return(From,Reply),
+		    loop(Opts#gen_opts{cb_state=NewState});
+		{noreply,NewState} ->
+		    loop(Opts#gen_opts{cb_state=NewState});
+		{stop,Reply,NewState} ->
+		    ct_util:unregister_connection(self()),
+		    (Opts#gen_opts.callback):terminate(Opts#gen_opts.conn_pid,
+						       NewState),
+		    return(From,Reply)
+	    end;
+	Msg when Opts#gen_opts.forward==true ->
+	    case (Opts#gen_opts.callback):handle_msg(Msg,Opts#gen_opts.cb_state) of
+		{noreply,NewState} ->
+		    loop(Opts#gen_opts{cb_state=NewState});
+		{stop,NewState} ->
+		    ct_util:unregister_connection(self()),
+		    (Opts#gen_opts.callback):terminate(Opts#gen_opts.conn_pid,
+						       NewState)
+	    end
     end.
 
-nozero({ok,S}) when is_list(S) ->
-    {ok,[C || C <- S,
-	      C=/=0,
-	      C=/=13]};
-nozero(M) ->
-    M.
-
 reconnect(Opts) ->
     (Opts#gen_opts.callback):reconnect(Opts#gen_opts.address,
 				       Opts#gen_opts.cb_state).
@@ -277,10 +389,8 @@ reconnect(Opts) ->
 
 log(Func,Args) ->
     case get(silent) of
-	true when not ?dbg-> 
+	true when not ?dbg->
 	    ok;
 	_ ->
 	    apply(ct_logs,Func,Args)
     end.
-
-
diff --git a/lib/common_test/src/ct_groups.erl b/lib/common_test/src/ct_groups.erl
new file mode 100644
index 0000000000..74ab5e5439
--- /dev/null
+++ b/lib/common_test/src/ct_groups.erl
@@ -0,0 +1,599 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%% @doc Common Test Framework callback module.
+%%%
+%%% <p>This module contains CT internal help functions for searching
+%%%    through groups specification trees and producing resulting
+%%%    tests.</p>
+
+-module(ct_groups).
+
+-export([find_groups/4]).
+-export([make_all_conf/3, make_all_conf/4, make_conf/5]).
+-export([delete_subs/2]).
+-export([expand_groups/3, search_and_override/3]).
+
+-define(val(Key, List), proplists:get_value(Key, List)). 
+-define(val(Key, List, Def), proplists:get_value(Key, List, Def)).
+-define(rev(L), lists:reverse(L)).
+
+find_groups(Mod, GrNames, TCs, GroupDefs) when is_atom(GrNames) ; 
+					       (length(GrNames) == 1) ->
+    find_groups1(Mod, GrNames, TCs, GroupDefs);
+
+find_groups(Mod, Groups, TCs, GroupDefs) when Groups /= [] ->
+    lists:append([find_groups1(Mod, [GrNames], TCs, GroupDefs) || 
+		     GrNames <- Groups]);
+
+find_groups(_Mod, [], _TCs, _GroupDefs) ->
+    [].
+
+%% GrNames == atom(): Single group name, perform full search
+%% GrNames == list(): List of groups, find all matching paths
+%% GrNames == [list()]: Search path terminated by last group in GrNames
+find_groups1(Mod, GrNames, TCs, GroupDefs) ->
+    {GrNames1,FindAll} =
+	case GrNames of
+	    Name when is_atom(Name), Name /= all ->
+		{[Name],true};
+	    [Path] when is_list(Path) ->
+		{Path,false};
+	    Path ->
+		{Path,true}
+	end,
+    TCs1 = if (is_atom(TCs) and (TCs /= all)) or is_tuple(TCs) ->
+		   [TCs];
+	      true -> 
+		   TCs 
+	   end,
+    Found = find(Mod, GrNames1, TCs1, GroupDefs, [],
+		 GroupDefs, FindAll),
+    [Conf || Conf <- Found, Conf /= 'NOMATCH'].
+
+%% Locate all groups
+find(Mod, all, all, [{Name,Props,Tests} | Gs], Known, Defs, _) 
+  when is_atom(Name), is_list(Props), is_list(Tests) ->
+    cyclic_test(Mod, Name, Known),
+    trim(make_conf(Mod, Name, Props,
+		   find(Mod, all, all, Tests, [Name | Known],
+			Defs, true))) ++
+	find(Mod, all, all, Gs, Known, Defs, true);
+
+%% Locate particular TCs in all groups
+find(Mod, all, TCs, [{Name,Props,Tests} | Gs], Known, Defs, _) 
+  when is_atom(Name), is_list(Props), is_list(Tests) ->
+    cyclic_test(Mod, Name, Known),
+    Tests1 = rm_unwanted_tcs(Tests, TCs, []),
+    trim(make_conf(Mod, Name, Props,
+		   find(Mod, all, TCs, Tests1, [Name | Known],
+			Defs, true))) ++
+	find(Mod, all, TCs, Gs, Known, Defs, true);
+
+%% Found next group is in search path
+find(Mod, [Name|GrNames]=SPath, TCs, [{Name,Props,Tests} | Gs], Known,
+     Defs, FindAll) when is_atom(Name), is_list(Props), is_list(Tests) ->
+    cyclic_test(Mod, Name, Known),
+    Tests1 = rm_unwanted_tcs(Tests, TCs, GrNames),
+    trim(make_conf(Mod, Name, Props,
+		   find(Mod, GrNames, TCs, Tests1, [Name|Known],
+			Defs, FindAll))) ++
+	find(Mod, SPath, TCs, Gs, Known, Defs, FindAll);
+
+%% Group path terminated, stop the search
+find(Mod, [], TCs, Tests, _Known, _Defs, false) ->
+    Cases = lists:flatmap(fun(TC) when is_atom(TC), TCs == all ->
+				  [{Mod,TC}];
+			     ({group,_}) ->
+				  [];
+			     ({_,_}=TC) when TCs == all ->
+				  [TC];
+			     (TC) ->
+				  if is_atom(TC) ->
+					  Tuple = {Mod,TC},
+					  case lists:member(Tuple, TCs) of
+					      true  ->
+						  [Tuple];
+					      false ->
+						  case lists:member(TC, TCs) of
+						      true  -> [{Mod,TC}];
+						      false -> []
+						  end
+					  end;
+				     true ->
+					  []
+				  end
+			  end, Tests),
+    if Cases == [] -> ['NOMATCH'];
+       true -> Cases
+    end;
+
+%% No more groups
+find(_Mod, [_|_], _TCs, [], _Known, _Defs, _) ->
+    ['NOMATCH'];
+
+%% Found group not next in search path
+find(Mod, GrNames, TCs, [{Name,Props,Tests} | Gs], Known,
+     Defs, FindAll) when is_atom(Name), is_list(Props), is_list(Tests) ->
+    cyclic_test(Mod, Name, Known),
+    Tests1 = rm_unwanted_tcs(Tests, TCs, GrNames),
+    trim(make_conf(Mod, Name, Props,
+		   find(Mod, GrNames, TCs, Tests1, [Name|Known],
+			Defs, FindAll))) ++
+	find(Mod, GrNames, TCs, Gs, Known, Defs, FindAll);
+  
+%% A nested group defined on top level found
+find(Mod, GrNames, TCs, [{group,Name1} | Gs], Known, Defs, FindAll) 
+  when is_atom(Name1) ->
+    find(Mod, GrNames, TCs, [expand(Mod, Name1, Defs) | Gs], Known,
+	 Defs, FindAll);
+
+%% Undocumented remote group feature, use with caution
+find(Mod, GrNames, TCs, [{group, ExtMod, ExtGrp} | Gs], Known,
+     Defs, FindAll) when is_atom(ExtMod), is_atom(ExtGrp) ->
+    ExternalDefs = ExtMod:groups(),
+    ExternalTCs = find(ExtMod, ExtGrp, TCs, [{group, ExtGrp}],
+		       [], ExternalDefs, FindAll),
+    ExternalTCs ++ find(Mod, GrNames, TCs, Gs, Known, Defs, FindAll);
+
+%% Group definition without properties, add an empty property list
+find(Mod, GrNames, TCs, [{Name1,Tests} | Gs], Known, Defs, FindAll)
+  when is_atom(Name1), is_list(Tests) ->
+    find(Mod, GrNames, TCs, [{Name1,[],Tests} | Gs], Known, Defs, FindAll);
+
+%% Save, and keep searching
+find(Mod, GrNames, TCs, [{ExternalTC, Case} = TC | Gs], Known,
+     Defs, FindAll) when is_atom(ExternalTC),
+			 is_atom(Case) ->
+    [TC | find(Mod, GrNames, TCs, Gs, Known, Defs, FindAll)];
+
+%% Save test case
+find(Mod, GrNames, all, [TC | Gs], Known,
+     Defs, FindAll) when is_atom(TC) ->
+    [{Mod,TC} | find(Mod, GrNames, all, Gs, Known, Defs, FindAll)];
+
+%% Save test case
+find(Mod, GrNames, all, [{M,TC} | Gs], Known,
+     Defs, FindAll) when is_atom(M), M /= group, is_atom(TC) ->
+    [{M,TC} | find(Mod, GrNames, all, Gs, Known, Defs, FindAll)];
+
+%% Check if test case should be saved
+find(Mod, GrNames, TCs, [TC | Gs], Known,
+     Defs, FindAll) when is_atom(TC) orelse 
+			 ((size(TC) == 2) and (element(1,TC) /= group)) ->
+    Case =
+	if is_atom(TC) ->
+		Tuple = {Mod,TC},
+		case lists:member(Tuple, TCs) of
+		    true  ->
+			Tuple;
+		    false ->
+			case lists:member(TC, TCs) of
+			    true  -> {Mod,TC};
+			    false -> []
+			end
+		end;
+	   true ->
+		case lists:member(TC, TCs) of
+		    true  -> {Mod,TC};
+		    false -> []
+		end
+	end,
+    if Case == [] ->
+	    find(Mod, GrNames, TCs, Gs, Known, Defs, FindAll);
+       true ->
+	    [Case | find(Mod, GrNames, TCs, Gs, Known, Defs, FindAll)]
+    end;
+
+%% Unexpeted term in group list
+find(Mod, _GrNames, _TCs, [BadTerm | _Gs], Known, _Defs, _FindAll) ->
+    Where = if length(Known) == 0 ->
+		    atom_to_list(Mod)++":groups/0";
+	       true ->
+		    "group "++atom_to_list(lists:last(Known))++
+			" in "++atom_to_list(Mod)++":groups/0"
+	    end,		 
+    Term = io_lib:format("~p", [BadTerm]),
+    E = "Bad term "++lists:flatten(Term)++" in "++Where,
+    throw({error,list_to_atom(E)});
+
+%% No more groups
+find(_Mod, _GrNames, _TCs, [], _Known, _Defs, _) ->
+    [].
+
+%%%-----------------------------------------------------------------
+
+%% We have to always search bottom up to only remove a branch
+%% if there's 'NOMATCH' in the leaf (otherwise, the branch should
+%% be kept)
+
+trim({conf,Props,Init,Tests,End}) ->
+    try trim(Tests) of
+	[] -> [];
+	Tests1 -> [{conf,Props,Init,Tests1,End}]
+    catch
+	throw:_ -> []
+    end;
+
+trim(Tests) when is_list(Tests) ->
+    %% we need to compare the result of trimming each test on this
+    %% level, and only let a 'NOMATCH' fail the level if no
+    %% successful sub group can be found
+    Tests1 =
+	lists:flatmap(fun(Test) ->
+			      IsConf = case Test of
+					   {conf,_,_,_,_} ->
+					       true;
+					   _ ->
+					       false
+				       end,
+			      try trim_test(Test) of
+				  [] -> [];
+				  Test1 when IsConf -> [{conf,Test1}];
+				  Test1 -> [Test1]
+			      catch
+				  throw:_ -> ['NOMATCH']
+			      end
+		      end, Tests),
+    case lists:keymember(conf, 1, Tests1) of
+	true ->					% at least one successful group
+	    lists:flatmap(fun({conf,Test}) -> [Test];
+			     ('NOMATCH') -> [];	% ignore any 'NOMATCH'
+			     (Test) -> [Test]
+			  end, Tests1);
+	false ->
+	    case lists:member('NOMATCH', Tests1) of
+		true ->
+		    throw('NOMATCH');
+		false ->
+		    Tests1
+	    end
+    end.
+
+trim_test({conf,Props,Init,Tests,End}) ->
+    case trim(Tests) of
+	[] ->
+	    [];
+	Tests1 ->
+	    {conf,Props,Init,Tests1,End}
+    end;
+
+trim_test('NOMATCH') ->
+    throw('NOMATCH');
+
+trim_test(Test) ->
+    Test.
+
+%% GrNames is [] if the terminating group has been found. From
+%% that point, all specified test should be included (as well as
+%% sub groups for deeper search).
+rm_unwanted_tcs(Tests, all, []) ->
+    Tests;
+
+rm_unwanted_tcs(Tests, TCs, []) ->
+    sort_tests(lists:flatmap(fun(Test) when is_tuple(Test),
+					    (size(Test) > 2) ->
+				     [Test];
+				(Test={group,_}) ->
+				     [Test];
+				(Test={_M,TC}) ->
+				     case lists:member(TC, TCs) of
+					 true  -> [Test];
+					 false -> []
+				     end;
+				(Test) when is_atom(Test) ->
+				     case lists:keysearch(Test, 2, TCs) of
+					 {value,_} ->
+					     [Test];
+					 _ ->
+					     case lists:member(Test, TCs) of
+						 true  -> [Test];
+						 false -> []
+					     end
+				     end;
+				(Test) -> [Test]
+			     end, Tests), TCs);
+					  
+rm_unwanted_tcs(Tests, _TCs, _) ->
+    [Test || Test <- Tests, not is_atom(Test)].
+
+%% make sure the order of tests is according to the order in TCs
+sort_tests(Tests, TCs) when is_list(TCs)->
+    lists:sort(fun(T1, T2) ->
+		       case {is_tc(T1),is_tc(T2)} of
+			   {true,true} ->
+			       (position(T1, TCs) =<
+				position(T2, TCs));
+			   {false,true} ->
+			       (position(T2, TCs) == (length(TCs)+1));
+			   _ -> true
+				   
+		       end
+	       end, Tests);
+sort_tests(Tests, _) ->
+    Tests.
+
+is_tc(T) when is_atom(T)      -> true;
+is_tc({group,_})              -> false;
+is_tc({_M,T}) when is_atom(T) -> true;
+is_tc(_)                      -> false.
+
+position(T, TCs) ->
+    position(T, TCs, 1).
+
+position(T, [T|_TCs], Pos) ->
+    Pos;
+position(T, [{_,T}|_TCs], Pos) ->
+    Pos;
+position({M,T}, [T|_TCs], Pos) when M /= group ->
+    Pos;
+position(T, [_|TCs], Pos) ->
+    position(T, TCs, Pos+1);
+position(_, [], Pos) ->
+    Pos.
+
+%%%-----------------------------------------------------------------
+
+delete_subs([{conf, _,_,_,_} = Conf | Confs], All) ->
+    All1 = delete_conf(Conf, All),
+    case is_sub(Conf, All1) of
+	true ->
+	    delete_subs(Confs, All1);
+	false ->
+	    delete_subs(Confs, All)
+    end;
+delete_subs([_Else | Confs], All) ->
+    delete_subs(Confs, All);
+delete_subs([], All) ->
+    All.
+
+delete_conf({conf,Props,_,_,_}, Confs) ->
+    Name = ?val(name, Props),
+    [Conf || Conf = {conf,Props0,_,_,_} <- Confs,
+	     Name =/= ?val(name, Props0)].
+
+is_sub({conf,Props,_,_,_}=Conf, [{conf,_,_,Tests,_} | Confs]) ->
+    Name = ?val(name, Props),
+    case lists:any(fun({conf,Props0,_,_,_}) ->
+			   case ?val(name, Props0) of
+			       N when N == Name ->
+				   true;
+			       _ ->
+				   false
+			   end;
+		      (_) ->
+			   false
+		   end, Tests) of
+	true ->
+	    true;
+	false ->
+	    is_sub(Conf, Tests) orelse is_sub(Conf, Confs)
+    end;
+
+is_sub(Conf, [_TC | Tests]) ->
+    is_sub(Conf, Tests);
+
+is_sub(_Conf, []) ->
+    false.
+
+
+cyclic_test(Mod, Name, Names) ->
+    case lists:member(Name, Names) of
+	true ->
+	    E = "Cyclic reference to group "++atom_to_list(Name)++
+		" in "++atom_to_list(Mod)++":groups/0",
+	    throw({error,list_to_atom(E)});
+	false ->
+	    ok
+    end.
+
+expand(Mod, Name, Defs) ->
+    case lists:keysearch(Name, 1, Defs) of
+	{value,Def} -> 
+	    Def;
+	false ->
+	    E = "Invalid group "++atom_to_list(Name)++
+		" in "++atom_to_list(Mod)++":groups/0",
+	    throw({error,list_to_atom(E)})
+    end.
+
+make_all_conf(Dir, Mod, Props, TestSpec) ->
+    case code:is_loaded(Mod) of
+	false ->
+	    code:load_abs(filename:join(Dir,atom_to_list(Mod)));
+	_ ->
+	    ok
+    end,
+    make_all_conf(Mod, Props, TestSpec).
+
+make_all_conf(Mod, Props, TestSpec) ->
+    case catch apply(Mod, groups, []) of
+	{'EXIT',_} ->
+	    exit({invalid_group_definition,Mod});
+	GroupDefs when is_list(GroupDefs) ->
+	    case catch find_groups(Mod, all, TestSpec, GroupDefs) of
+		{error,_} = Error ->
+		    %% this makes test_server call error_in_suite as first
+		    %% (and only) test case so we can report Error properly
+		    [{ct_framework,error_in_suite,[[Error]]}];
+		[] ->
+		    exit({invalid_group_spec,Mod});
+		_ConfTests ->
+		    make_conf(Mod, all, Props, TestSpec) 
+	    end
+    end.
+
+make_conf(Dir, Mod, Name, Props, TestSpec) ->
+    case code:is_loaded(Mod) of
+	false ->
+	    code:load_abs(filename:join(Dir,atom_to_list(Mod)));
+	_ ->
+	    ok
+    end,
+    make_conf(Mod, Name, Props, TestSpec).
+
+make_conf(Mod, Name, Props, TestSpec) ->
+    case code:is_loaded(Mod) of
+	false ->
+	    code:load_file(Mod);
+	_ ->
+	    ok
+    end,
+    {InitConf,EndConf,ExtraProps} =
+	case erlang:function_exported(Mod,init_per_group,2) of
+	    true ->
+		{{Mod,init_per_group},{Mod,end_per_group},[]};
+	    false ->
+		ct_logs:log("TEST INFO", "init_per_group/2 and "
+			    "end_per_group/2 missing for group "
+			    "~p in ~p, using default.",
+			    [Name,Mod]),
+		{{ct_framework,init_per_group},
+		 {ct_framework,end_per_group},
+		 [{suite,Mod}]}
+	end,
+    {conf,[{name,Name}|Props++ExtraProps],InitConf,TestSpec,EndConf}.
+
+%%%-----------------------------------------------------------------
+
+expand_groups([H | T], ConfTests, Mod) ->
+    [expand_groups(H, ConfTests, Mod) | expand_groups(T, ConfTests, Mod)];
+expand_groups([], _ConfTests, _Mod) ->
+    [];
+expand_groups({group,Name}, ConfTests, Mod) ->
+    expand_groups({group,Name,default,[]}, ConfTests, Mod);
+expand_groups({group,Name,default}, ConfTests, Mod) ->
+    expand_groups({group,Name,default,[]}, ConfTests, Mod);
+expand_groups({group,Name,ORProps}, ConfTests, Mod) when is_list(ORProps) ->
+    expand_groups({group,Name,ORProps,[]}, ConfTests, Mod);
+expand_groups({group,Name,ORProps,SubORSpec}, ConfTests, Mod) ->
+    FindConf =
+	fun(Conf = {conf,Props,Init,Ts,End}) ->
+		case ?val(name, Props) of
+		    Name when ORProps == default ->
+			[Conf];
+		    Name ->
+			Props1 = case ?val(suite, Props) of
+				     undefined ->
+					 ORProps;
+				     SuiteName ->
+					 [{suite,SuiteName}|ORProps]
+				 end,
+			[{conf,[{name,Name}|Props1],Init,Ts,End}];
+		    _    -> 
+			[]
+		end
+	end,					 
+    case lists:flatmap(FindConf, ConfTests) of
+	[] ->
+	    throw({error,invalid_ref_msg(Name, Mod)});
+	Matching when SubORSpec == [] -> 
+	    Matching;
+	Matching -> 
+	    override_props(Matching, SubORSpec, Name,Mod)
+    end;
+expand_groups(SeqOrTC, _ConfTests, _Mod) ->
+    SeqOrTC.
+
+%% search deep for the matching conf test and modify it and any 
+%% sub tests according to the override specification
+search_and_override([Conf = {conf,Props,Init,Tests,End}], ORSpec, Mod) ->
+    InsProps = fun(GrName, undefined, Ps) ->
+		       [{name,GrName} | Ps];
+		  (GrName, Suite, Ps) ->
+		       [{name,GrName}, {suite,Suite} | Ps]
+	       end,
+    Name = ?val(name, Props),
+    Suite = ?val(suite, Props),
+    case lists:keysearch(Name, 1, ORSpec) of
+	{value,{Name,default}} ->
+	    [Conf];
+	{value,{Name,ORProps}} ->
+	    [{conf,InsProps(Name,Suite,ORProps),Init,Tests,End}];
+	{value,{Name,default,[]}} ->
+	    [Conf];
+	{value,{Name,default,SubORSpec}} ->
+	    override_props([Conf], SubORSpec, Name,Mod);
+	{value,{Name,ORProps,SubORSpec}} ->
+	    override_props([{conf,InsProps(Name,Suite,ORProps),
+			    Init,Tests,End}], SubORSpec, Name,Mod);
+	_ ->
+	    [{conf,Props,Init,search_and_override(Tests,ORSpec,Mod),End}]
+    end.
+
+%% Modify the Tests element according to the override specification
+override_props([{conf,Props,Init,Tests,End} | Confs], SubORSpec, Name,Mod) ->
+    {Subs,SubORSpec1} = override_sub_props(Tests, [], SubORSpec, Mod),
+    [{conf,Props,Init,Subs,End} | override_props(Confs, SubORSpec1, Name,Mod)];
+override_props([], [], _,_) ->
+    [];
+override_props([], SubORSpec, Name,Mod) ->
+    Es = [invalid_ref_msg(Name, element(1,Spec), Mod) || Spec <- SubORSpec],
+    throw({error,Es}).
+
+override_sub_props([], New, ORSpec, _) ->    
+    {?rev(New),ORSpec};
+override_sub_props([T = {conf,Props,Init,Tests,End} | Ts],
+		   New, ORSpec, Mod) ->
+    Name = ?val(name, Props),
+    Suite = ?val(suite, Props),
+    case lists:keysearch(Name, 1, ORSpec) of
+	{value,Spec} ->				% group found in spec
+	    Props1 =
+		case element(2, Spec) of
+		    default -> Props;
+		    ORProps when Suite == undefined -> [{name,Name} | ORProps];
+		    ORProps -> [{name,Name}, {suite,Suite} | ORProps]
+		end,
+	    case catch element(3, Spec) of
+		Undef when Undef == [] ; 'EXIT' == element(1, Undef) ->
+		    override_sub_props(Ts, [{conf,Props1,Init,Tests,End} | New],
+				       lists:keydelete(Name, 1, ORSpec), Mod);
+		SubORSpec when is_list(SubORSpec) ->
+		    case override_sub_props(Tests, [], SubORSpec, Mod) of
+			{Subs,[]} ->
+			    override_sub_props(Ts, [{conf,Props1,Init,
+						     Subs,End} | New],
+					       lists:keydelete(Name, 1, ORSpec),
+					       Mod);
+			{_,NonEmptySpec} ->
+			    Es = [invalid_ref_msg(Name, element(1, GrRef),
+						  Mod) || GrRef <- NonEmptySpec],
+			    throw({error,Es})
+		    end;
+		BadGrSpec ->
+		    throw({error,{invalid_form,BadGrSpec}})
+	    end;
+	_ ->					% not a group in spec
+	    override_sub_props(Ts, [T | New], ORSpec, Mod)
+    end;
+override_sub_props([TC | Ts], New, ORSpec, Mod) ->
+    override_sub_props(Ts, [TC | New], ORSpec, Mod).
+
+invalid_ref_msg(Name, Mod) ->
+    E = "Invalid reference to group "++
+	atom_to_list(Name)++" in "++
+	atom_to_list(Mod)++":all/0",
+    list_to_atom(E).
+
+invalid_ref_msg(Name0, Name1, Mod) ->
+    E = "Invalid reference to group "++
+	atom_to_list(Name1)++" from "++atom_to_list(Name0)++
+	" in "++atom_to_list(Mod)++":all/0",
+    list_to_atom(E).
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl
index 0fe6e03079..1bcc63738e 100644
--- a/lib/common_test/src/ct_hooks.erl
+++ b/lib/common_test/src/ct_hooks.erl
@@ -48,7 +48,7 @@
 
 %% @doc Called before any suites are started
 -spec init(State :: term()) -> ok |
-			       {error, Reason :: term()}.
+			       {fail, Reason :: term()}.
 init(Opts) ->
     call(get_new_hooks(Opts, undefined) ++ get_builtin_hooks(Opts),
 	 ok, init, []).
@@ -192,12 +192,12 @@ call([{Hook, call_id, NextFun} | Rest], Config, Meta, Hooks) ->
 	    case lists:keyfind(NewId, #ct_hook_config.id, Hooks) of
 		false when NextFun =:= undefined ->
 		    {Hooks ++ [NewHook],
-		     [{NewId, call_init} | Rest]};
+		     Rest ++ [{NewId, call_init}]};
 		ExistingHook when is_tuple(ExistingHook) ->
 		    {Hooks, Rest};
 		_ ->
 		    {Hooks ++ [NewHook],
-		     [{NewId, call_init}, {NewId,NextFun} | Rest]}
+		     Rest ++ [{NewId, call_init}, {NewId,NextFun}]}
 	    end,
 	call(resort(NewRest,NewHooks,Meta), Config, Meta, NewHooks)
     catch Error:Reason ->
@@ -353,11 +353,10 @@ pos(Id,[_|Rest],Num) ->
     pos(Id,Rest,Num+1).
 
 
-
 catch_apply(M,F,A, Default) ->
     try
 	apply(M,F,A)
-    catch error:Reason ->
+    catch _:Reason ->
 	    case erlang:get_stacktrace() of
             %% Return the default if it was the CTH module which did not have the function.
 		[{M,F,A,_}|_] when Reason == undef ->
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 1ccbdc3718..0b7a8bb075 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -28,23 +28,25 @@
 
 -module(ct_logs).
 
--export([init/1,close/2,init_tc/1,end_tc/1]).
--export([get_log_dir/0,get_log_dir/1]).
--export([log/3,start_log/1,cont_log/2,end_log/0]).
--export([set_stylesheet/2,clear_stylesheet/1]).
--export([add_external_logs/1,add_link/3]).
+-export([init/2, close/2, init_tc/1, end_tc/1]).
+-export([get_log_dir/0, get_log_dir/1]).
+-export([log/3, start_log/1, cont_log/2, end_log/0]).
+-export([set_stylesheet/2, clear_stylesheet/1]).
+-export([add_external_logs/1, add_link/3]).
 -export([make_last_run_index/0]).
 -export([make_all_suites_index/1,make_all_runs_index/1]).
--export([get_ts_html_wrapper/3]).
--export([xhtml/2, locate_default_css_file/0, make_relative/1]).
+-export([get_ts_html_wrapper/4]).
+-export([xhtml/2, locate_priv_file/1, make_relative/1]).
+-export([insert_javascript/1]).
 
 %% Logging stuff directly from testcase
--export([tc_log/3,tc_log/4,tc_log_async/3,tc_print/3,tc_pal/3,ct_log/3,
-	 basic_html/0]).
+-export([tc_log/3, tc_log/4, tc_log_async/3, tc_print/3, tc_print/4,
+	 tc_pal/3, tc_pal/4, ct_log/3, basic_html/0]).
 
 %% Simulate logger process for use without ct environment running
 -export([simulate/0]).
 
+-include("ct.hrl").
 -include("ct_event.hrl").
 -include("ct_util.hrl").
 -include_lib("kernel/include/file.hrl").
@@ -56,7 +58,6 @@
 -define(all_runs_name, "all_runs.html").
 -define(index_name, "index.html").
 -define(totals_name, "totals.info").
--define(css_default, "ct_default.css").
 
 -define(table_color1,"#ADD8E6").
 -define(table_color2,"#E4F0FE").
@@ -79,9 +80,9 @@
 %%% started. A new directory named ct_run.&lt;timestamp&gt; is created
 %%% and all logs are stored under this directory.</p>
 %%%
-init(Mode) ->
+init(Mode, Verbosity) ->
     Self = self(),
-    Pid = spawn_link(fun() -> logger(Self,Mode) end),
+    Pid = spawn_link(fun() -> logger(Self, Mode, Verbosity) end),
     MRef = erlang:monitor(process,Pid),
     receive 
 	{started,Pid,Result} -> 
@@ -240,7 +241,7 @@ end_tc(TCPid) ->
 %%% activity it is. <code>Format</code> and <code>Args</code> is the
 %%% data to log (as in <code>io:format(Format,Args)</code>).</p>
 log(Heading,Format,Args) ->
-    cast({log,sync,self(),group_leader(),
+    cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
 	  [{int_header(),[log_timestamp(now()),Heading]},
 	   {Format,Args},
 	   {int_footer(),[]}]}),
@@ -262,7 +263,7 @@ log(Heading,Format,Args) ->
 %%% @see cont_log/2
 %%% @see end_log/0
 start_log(Heading) ->
-    cast({log,sync,self(),group_leader(),
+    cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
 	  [{int_header(),[log_timestamp(now()),Heading]}]}),
     ok.
 
@@ -277,7 +278,8 @@ cont_log([],[]) ->
     ok;
 cont_log(Format,Args) ->
     maybe_log_timestamp(),
-    cast({log,sync,self(),group_leader(),[{Format,Args}]}),
+    cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
+	  [{Format,Args}]}),
     ok.
 
 %%%-----------------------------------------------------------------
@@ -288,7 +290,8 @@ cont_log(Format,Args) ->
 %%% @see start_log/1
 %%% @see cont_log/2
 end_log() ->
-    cast({log,sync,self(),group_leader(),[{int_footer(), []}]}),
+    cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
+	  [{int_footer(), []}]}),
     ok.
     
 
@@ -321,10 +324,16 @@ add_link(Heading,File,Type) ->
 	[filename:join("log_private",File),Type,File]).
 
 
-
 %%%-----------------------------------------------------------------
 %%% @spec tc_log(Category,Format,Args) -> ok
+%%% @equiv tc_log(Category,?STD_IMPORTANCE,Format,Args)
+tc_log(Category,Format,Args) ->
+    tc_log(Category,?STD_IMPORTANCE,Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec tc_log(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -333,19 +342,26 @@ add_link(Heading,File,Type) ->
 %%% <p>This function is called by <code>ct</code> when logging
 %%% stuff directly from a testcase (i.e. not from within the CT
 %%% framework).</p>
-tc_log(Category,Format,Args) ->
-    tc_log(Category,"User",Format,Args).
+tc_log(Category,Importance,Format,Args) ->
+    tc_log(Category,Importance,"User",Format,Args).
 
-tc_log(Category,Printer,Format,Args) ->
-    cast({log,sync,self(),group_leader(),[{div_header(Category,Printer),[]},
-					  {Format,Args},
-					  {div_footer(),[]}]}),
+tc_log(Category,Importance,Printer,Format,Args) ->
+    cast({log,sync,self(),group_leader(),Category,Importance,
+	  [{div_header(Category,Printer),[]},
+	   {Format,Args},
+	   {div_footer(),[]}]}),
     ok.
 
-
 %%%-----------------------------------------------------------------
 %%% @spec tc_log_async(Category,Format,Args) -> ok
+%%% @equiv tc_log_async(Category,?STD_IMPORTANCE,Format,Args)
+tc_log_async(Category,Format,Args) ->
+    tc_log_async(Category,?STD_IMPORTANCE,Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec tc_log_async(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -356,40 +372,66 @@ tc_log(Category,Printer,Format,Args) ->
 %%% to avoid deadlocks when e.g. the hook that handles SASL printouts
 %%% prints to the test case log file at the same time test server
 %%% asks ct_logs for an html wrapper.</p>
-tc_log_async(Category,Format,Args) ->
-    cast({log,async,self(),group_leader(),[{div_header(Category),[]},
-					   {Format,Args},
-					   {div_footer(),[]}]}),
+tc_log_async(Category,Importance,Format,Args) ->
+    cast({log,async,self(),group_leader(),Category,Importance,
+	  [{div_header(Category),[]},
+	   {Format,Args},
+	   {div_footer(),[]}]}),
     ok.
+%%%-----------------------------------------------------------------
+%%% @spec tc_print(Category,Format,Args)
+%%% @equiv tc_print(Category,?STD_IMPORTANCE,Format,Args)
+tc_print(Category,Format,Args) ->
+    tc_print(Category,?STD_IMPORTANCE,Format,Args).
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_print(Category,Format,Args) -> ok
+%%% @spec tc_print(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
 %%% @doc Console printout from a testcase. 
 %%%
 %%% <p>This function is called by <code>ct</code> when printing
-%%% stuff a testcase on the user console.</p>
-tc_print(Category,Format,Args) ->
-    Head = get_heading(Category),
-    io:format(user, lists:concat([Head,Format,"\n\n"]), Args),
-    ok.
+%%% stuff from a testcase on the user console.</p>
+tc_print(Category,Importance,Format,Args) ->
+    VLvl = case ct_util:get_testdata({verbosity,Category}) of
+	       undefined -> 
+		   ct_util:get_testdata({verbosity,'$unspecified'});
+	       {error,bad_invocation} ->
+		   ?MAX_VERBOSITY;
+	       Val ->
+		   Val
+	   end,
+    if Importance >= (100-VLvl) ->
+	    Head = get_heading(Category),
+	    io:format(user, lists:concat([Head,Format,"\n\n"]), Args),
+	    ok;
+       true ->
+	    ok
+    end.
 
 get_heading(default) ->
-    io_lib:format("-----------------------------"
+    io_lib:format("\n-----------------------------"
 		  "-----------------------\n~s\n",
 		  [log_timestamp(now())]);
 get_heading(Category) ->
-    io_lib:format("-----------------------------"
+    io_lib:format("\n-----------------------------"
 		  "-----------------------\n~s  ~w\n",
 		  [log_timestamp(now()),Category]).    
     
 
 %%%-----------------------------------------------------------------
 %%% @spec tc_pal(Category,Format,Args) -> ok
+%%% @equiv tc_pal(Category,?STD_IMPORTANCE,Format,Args) -> ok
+tc_pal(Category,Format,Args) ->
+    tc_pal(Category,?STD_IMPORTANCE,Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec tc_pal(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -398,16 +440,17 @@ get_heading(Category) ->
 %%% <p>This function is called by <code>ct</code> when logging
 %%% stuff directly from a testcase. The info is written both in the
 %%% log and on the console.</p>
-tc_pal(Category,Format,Args) ->
-    tc_print(Category,Format,Args),
-    cast({log,sync,self(),group_leader(),[{div_header(Category),[]},
-					  {Format,Args},
-					  {div_footer(),[]}]}),
+tc_pal(Category,Importance,Format,Args) ->
+    tc_print(Category,Importance,Format,Args),
+    cast({log,sync,self(),group_leader(),Category,Importance,
+	  [{div_header(Category),[]},
+	   {Format,Args},
+	   {div_footer(),[]}]}),
     ok.
 
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_pal(Category,Format,Args) -> ok
+%%% @spec ct_pal(Category,Format,Args) -> ok
 %%%      Category = atom()
 %%%      Format = string()
 %%%      Args = list()
@@ -445,7 +488,7 @@ maybe_log_timestamp() ->
 	{MS,S,_} ->
 	    ok;
 	_ ->
-	    cast({log,sync,self(),group_leader(),
+	    cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
 		  [{"<i>~s</i>",[log_timestamp({MS,S,US})]}]})
     end.
 
@@ -469,7 +512,7 @@ log_timestamp({MS,S,US}) ->
 		      stylesheet,
 		      async_print_jobs}).
 
-logger(Parent,Mode) ->
+logger(Parent, Mode, Verbosity) ->
     register(?MODULE,self()),
 
     %%! Below is a temporary workaround for the limitation of
@@ -502,26 +545,27 @@ logger(Parent,Mode) ->
 	    %% dir) so logs are independent of Common Test installation
 	    {ok,Cwd} = file:get_cwd(),
 	    CTPath = code:lib_dir(common_test),
-	    CSSFileSrc = filename:join(filename:join(CTPath, "priv"),
-				       ?css_default),
-	    CSSFileDestTop = filename:join(Cwd, ?css_default),
-	    CSSFileDestRun = filename:join(AbsDir, ?css_default),
-	    case file:copy(CSSFileSrc, CSSFileDestTop) of
-		{error,Reason0} ->
+	    PrivFiles = [?css_default,?jquery_script,?tablesorter_script],
+	    PrivFilesSrc = [filename:join(filename:join(CTPath, "priv"), F) ||
+			       F <- PrivFiles],
+	    PrivFilesDestTop = [filename:join(Cwd, F) || F <- PrivFiles],
+	    PrivFilesDestRun = [filename:join(AbsDir, F) || F <- PrivFiles],
+	    case copy_priv_files(PrivFilesSrc, PrivFilesDestTop) of
+		{error,Src1,Dest1,Reason1} ->
 		    io:format(user, "ERROR! "++
-			      "CSS file ~p could not be copied to ~p. "++
-			      "Reason: ~p~n",
-			      [CSSFileSrc,CSSFileDestTop,Reason0]),
-		    exit({css_file_error,CSSFileDestTop});
-		_ ->
-		    case file:copy(CSSFileSrc, CSSFileDestRun) of
-			{error,Reason1} ->
+				  "Priv file ~p could not be copied to ~p. "++
+				  "Reason: ~p~n",
+			      [Src1,Dest1,Reason1]),
+		    exit({priv_file_error,Dest1});
+		ok ->
+		    case copy_priv_files(PrivFilesSrc, PrivFilesDestRun) of
+			{error,Src2,Dest2,Reason2} ->
 			    io:format(user, "ERROR! "++
-				      "CSS file ~p could not be copied to ~p. "++
-				      "Reason: ~p~n",
-				      [CSSFileSrc,CSSFileDestRun,Reason1]),
-			    exit({css_file_error,CSSFileDestRun});
-			_ ->
+					  "Priv file ~p could not be copied to ~p. "++
+					  "Reason: ~p~n",
+				      [Src2,Dest2,Reason2]),
+			    exit({priv_file_error,Dest2});
+			ok ->
 			    ok
 		    end
 	    end
@@ -541,6 +585,23 @@ logger(Parent,Mode) ->
 	      [log_timestamp(now()),"Common Test Logger started"]),
     Parent ! {started,self(),{Time,filename:absname("")}},
     set_evmgr_gl(CtLogFd),
+
+    %% save verbosity levels in dictionary for fast lookups
+    io:format(CtLogFd, "\nVERBOSITY LEVELS:\n", []),
+    case proplists:get_value('$unspecified', Verbosity) of
+	undefined -> ok;
+	GenLvl    -> io:format(CtLogFd, "~-25s~3w~n",
+			       ["general level",GenLvl])
+    end,
+    [begin put({verbosity,Cat},VLvl),
+	   if Cat == '$unspecified' ->
+		   ok;
+	      true ->
+		   io:format(CtLogFd, "~-25w~3w~n", [Cat,VLvl])
+	   end
+     end || {Cat,VLvl} <- Verbosity],
+    io:nl(CtLogFd),
+
     logger_loop(#logger_state{parent=Parent,
 			      log_dir=AbsDir,
 			      start_time=Time,
@@ -549,31 +610,58 @@ logger(Parent,Mode) ->
 			      tc_groupleaders=[],
 			      async_print_jobs=[]}).
 
+copy_priv_files([SrcF | SrcFs], [DestF | DestFs]) ->
+    case file:copy(SrcF, DestF) of
+	{error,Reason} ->
+	    {error,SrcF,DestF,Reason};
+	_ ->
+	    copy_priv_files(SrcFs, DestFs)
+    end;
+copy_priv_files([], []) ->
+    ok.
+
 logger_loop(State) ->
     receive
-	{log,SyncOrAsync,Pid,GL,List} ->
-	    case get_groupleader(Pid, GL, State) of
-		{tc_log,TCGL,TCGLs} ->
-		    case erlang:is_process_alive(TCGL) of
-			true ->
-			    State1 = print_to_log(SyncOrAsync, Pid, TCGL,
-						  List, State),
-			    logger_loop(State1#logger_state{tc_groupleaders =
-							       TCGLs});
-			false ->
-			    %% Group leader is dead, so write to the
-			    %% CtLog instead
-			    Fd = State#logger_state.ct_log_fd,
-			    [begin io:format(Fd,Str,Args),io:nl(Fd) end || 
+	{log,SyncOrAsync,Pid,GL,Category,Importance,List} ->
+	    VLvl = case Category of
+		       ct_internal ->
+			   ?MAX_VERBOSITY;
+		       _ ->
+			   case get({verbosity,Category}) of
+			       undefined -> get({verbosity,'$unspecified'});
+			       Val       -> Val
+			end
+		end,
+	    if Importance >= (100-VLvl) ->
+		    case get_groupleader(Pid, GL, State) of
+			{tc_log,TCGL,TCGLs} ->
+			    case erlang:is_process_alive(TCGL) of
+				true ->
+				    State1 = print_to_log(SyncOrAsync, Pid,
+							  TCGL, List, State),
+				    logger_loop(State1#logger_state{
+						  tc_groupleaders = TCGLs});
+				false ->
+				    %% Group leader is dead, so write to the
+				    %% CtLog instead
+				    Fd = State#logger_state.ct_log_fd,
+				    [begin io:format(Fd,Str,Args),
+					   io:nl(Fd) end || {Str,Args} <- List],
+				    logger_loop(State)			    
+			    end;
+			{ct_log,Fd,TCGLs} ->
+			    [begin io:format(Fd,Str,Args),io:nl(Fd) end ||
 				{Str,Args} <- List],
-			    logger_loop(State)			    
+			    logger_loop(State#logger_state{
+					  tc_groupleaders = TCGLs})
 		    end;
-		{ct_log,Fd,TCGLs} ->
-		    [begin io:format(Fd,Str,Args),io:nl(Fd) end ||
-			{Str,Args} <- List],
-		    logger_loop(State#logger_state{tc_groupleaders = TCGLs})
-	    end;
+	       true ->
+		    logger_loop(State)
+	    end;			
 	{{init_tc,TCPid,GL,RefreshLog},From} ->
+	    %% make sure no IO for this test case from the
+	    %% CT logger gets rejected
+	    test_server:permit_io(GL, self()),
 	    print_style(GL, State#logger_state.stylesheet),
 	    set_evmgr_gl(GL),
 	    TCGLs = add_tc_gl(TCPid,GL,State),
@@ -659,13 +747,24 @@ create_io_fun(FromPid, State) ->
 
 print_to_log(sync, FromPid, TCGL, List, State) ->
     IoFun = create_io_fun(FromPid, State),
-    io:format(TCGL, "~s", [lists:foldl(IoFun, [], List)]),
+    %% in some situations (exceptions), the printout is made from the
+    %% test server IO process and there's no valid group leader to send to
+    IoProc = if FromPid /= TCGL -> TCGL;
+		true -> State#logger_state.ct_log_fd
+	     end,
+    io:format(IoProc, "~s", [lists:foldl(IoFun, [], List)]),
     State;
 
 print_to_log(async, FromPid, TCGL, List, State) ->
     IoFun = create_io_fun(FromPid, State),
+    %% in some situations (exceptions), the printout is made from the
+    %% test server IO process and there's no valid group leader to send to
+    IoProc = if FromPid /= TCGL -> TCGL;
+		true -> State#logger_state.ct_log_fd
+	     end,
     Printer = fun() ->
-		      io:format(TCGL, "~s", [lists:foldl(IoFun, [], List)])
+		      test_server:permit_io(IoProc, self()),
+		      io:format(IoProc, "~s", [lists:foldl(IoFun, [], List)])
 	      end,
     case State#logger_state.async_print_jobs of
 	[] ->
@@ -770,7 +869,7 @@ set_evmgr_gl(GL) ->
 
 open_ctlog() ->
     {ok,Fd} = file:open(?ct_log_name,[write]),
-    io:format(Fd, header("Common Test Framework Log"), []),
+    io:format(Fd, header("Common Test Framework Log", {[],[1,2],[]}), []),
     case file:consult(ct_run:variables_file_name("../")) of
 	{ok,Vars} ->
 	    io:format(Fd, config_table(Vars), []);
@@ -1080,14 +1179,14 @@ total_row(Success, Fail, UserSkip, AutoSkip, NotBuilt, All) ->
 		    integer_to_list(UserSkip),integer_to_list(AutoSkip)}
 	end,
     [xhtml("<tr valign=top>\n", 
-	   ["<tr class=\"",odd_or_even(),"\">\n"]),
+	   ["</tbody>\n<tfoot>\n<tr class=\"",odd_or_even(),"\">\n"]),
      "<td><b>Total</b></td>\n", Label, TimestampCell,
      "<td align=right><b>",integer_to_list(Success),"<b></td>\n",
      "<td align=right><b>",integer_to_list(Fail),"<b></td>\n",
      "<td align=right>",integer_to_list(AllSkip),
      " (",UserSkipStr,"/",AutoSkipStr,")</td>\n",  
      "<td align=right><b>",integer_to_list(NotBuilt),"<b></td>\n",
-     AllInfo, "</tr>\n"].
+     AllInfo, "</tr>\n</tfoot>\n"].
 
 not_built(_BaseName,_LogDir,_All,[]) ->
     0;
@@ -1144,10 +1243,12 @@ index_header(Label, StartTime) ->
     Head =
 	case Label of
 	    undefined ->
-		header("Test Results", format_time(StartTime));
+		header("Test Results", format_time(StartTime),
+		       {[],[1],[2,3,4,5]});
 	    _ ->
 		header("Test Results for '" ++ Label ++ "'",
-		       format_time(StartTime))
+		       format_time(StartTime),
+		       {[],[1],[2,3,4,5]})
 	end,
     [Head |
      ["<center>\n",
@@ -1159,15 +1260,17 @@ index_header(Label, StartTime) ->
 	     "\">COMMON TEST FRAMEWORK LOG</a>\n</div>"]),
       xhtml("<br>\n", "<br /><br /><br />\n"),
       xhtml(["<table border=\"3\" cellpadding=\"5\" "
-	     "bgcolor=\"",?table_color3,"\">\n"], "<table>\n"),
+	     "bgcolor=\"",?table_color3,"\">\n"],
+	    ["<table id=\"",?sortable_table_name,"\">\n",
+	     "<thead>\n<tr>\n"]),
       "<th><b>Test Name</b></th>\n",
       xhtml(["<th><font color=\"",?table_color3,"\">_</font>Ok"
 	     "<font color=\"",?table_color3,"\">_</font></th>\n"],
 	    "<th>Ok</th>\n"),
       "<th>Failed</th>\n",
       "<th>Skipped", xhtml("<br>", "<br />"), "(User/Auto)</th>\n"
-      "<th>Missing", xhtml("<br>", "<br />"), "Suites</th>\n"
-      "\n"]].
+      "<th>Missing", xhtml("<br>", "<br />"), "Suites</th>\n",
+      xhtml("", "</tr>\n</thead>\n<tbody>\n")]].
 
 all_suites_index_header() ->
     {ok,Cwd} = file:get_cwd(),
@@ -1180,12 +1283,14 @@ all_suites_index_header(IndexDir) ->
     AllRunsLink = xhtml(["<a href=\"",?all_runs_name,"\">",AllRuns,"</a>\n"],
 			["<div id=\"button_holder\" class=\"btn\">\n"
 			 "<a href=\"",?all_runs_name,"\">",AllRuns,"</a>\n</div>"]),
-    [header("Test Results") | 
+    [header("Test Results", {[3],[1,2,8,9,10],[4,5,6,7]}) | 
      ["<center>\n",
       AllRunsLink,
       xhtml("<br><br>\n", "<br /><br />\n"),
       xhtml(["<table border=\"3\" cellpadding=\"5\" "
-	     "bgcolor=\"",?table_color2,"\">\n"], "<table>\n"),
+	     "bgcolor=\"",?table_color2,"\">\n"],
+	    ["<table id=\"",?sortable_table_name,"\">\n",
+	     "<thead>\n<tr>\n"]),
       "<th>Test Name</th>\n",
       "<th>Label</th>\n",
       "<th>Test Run Started</th>\n",
@@ -1198,7 +1303,7 @@ all_suites_index_header(IndexDir) ->
       "<th>Node</th>\n",
       "<th>CT Log</th>\n",
       "<th>Old Runs</th>\n",
-      "\n"]].
+      xhtml("", "</tr>\n</thead>\n<tbody>\n")]].
 
 all_runs_header() ->
     {ok,Cwd} = file:get_cwd(),
@@ -1210,10 +1315,12 @@ all_runs_header() ->
 		     "<a href=\"",?index_name,
 		     "\">TEST INDEX PAGE</a>\n</div>"]),
 	      xhtml("<br>\n", "<br /><br />\n")],
-    [header(Title) |
+    [header(Title, {[1],[2,3,5],[4,6,7,8,9,10]}) |
      ["<center>\n", IxLink,
       xhtml(["<table border=\"3\" cellpadding=\"5\" "
-	     "bgcolor=\"",?table_color1,"\">\n"], "<table>\n"),
+	     "bgcolor=\"",?table_color1,"\">\n"],
+	    ["<table id=\"",?sortable_table_name,"\">\n",
+	     "<thead>\n<tr>\n"]),
       "<th><b>History</b></th>\n"
       "<th><b>Node</b></th>\n"
       "<th><b>Label</b></th>\n"
@@ -1225,23 +1332,29 @@ all_runs_header() ->
 	    "<th>Ok</th>\n"),
       "<th>Failed</th>\n"
       "<th>Skipped<br>(User/Auto)</th>\n"
-      "<th>Missing<br>Suites</th>\n"
-      "\n"]].
+      "<th>Missing<br>Suites</th>\n",
+      xhtml("", "</tr>\n</thead>\n<tbody>\n")]].
 
-header(Title) ->
-    header1(Title, "").
-header(Title, SubTitle) ->
-    header1(Title, SubTitle).
+header(Title, TableCols) ->
+    header1(Title, "", TableCols).
+header(Title, SubTitle, TableCols) ->
+    header1(Title, SubTitle, TableCols).
 
-header1(Title, SubTitle) ->
+header1(Title, SubTitle, TableCols) ->
     SubTitleHTML = if SubTitle =/= "" ->
 			   ["<center>\n",
 			    "<h3>" ++ SubTitle ++ "</h3>\n",
 			    xhtml("</center>\n<br>\n", "</center>\n<br />\n")];
-		      true -> xhtml("<br>\n", "<br />\n")
+		      true -> xhtml("<br>", "<br />")
 		   end,
     CSSFile = xhtml(fun() -> "" end, 
-		    fun() -> make_relative(locate_default_css_file()) end),
+		    fun() -> make_relative(locate_priv_file(?css_default)) end),
+    JQueryFile =
+	xhtml(fun() -> "" end, 
+	      fun() -> make_relative(locate_priv_file(?jquery_script)) end),
+    TableSorterFile =
+	xhtml(fun() -> "" end, 
+	      fun() -> make_relative(locate_priv_file(?tablesorter_script)) end),
     [xhtml(["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n",
 	    "<html>\n"],
 	   ["<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n",
@@ -1252,7 +1365,17 @@ header1(Title, SubTitle) ->
      "<title>" ++ Title ++ " " ++ SubTitle ++ "</title>\n",
      "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
      xhtml("",
-	   ["<link rel=\"stylesheet\" href=\"",CSSFile,"\" type=\"text/css\">"]),
+	   ["<link rel=\"stylesheet\" href=\"",CSSFile,"\" type=\"text/css\">\n"]),
+     xhtml("",
+	   ["<script type=\"text/javascript\" src=\"",JQueryFile,
+	    "\"></script>\n"]),
+     xhtml("",
+	   ["<script type=\"text/javascript\" src=\"",TableSorterFile,
+	    "\"></script>\n"]),
+     xhtml(fun() -> "" end,
+	   fun() -> insert_javascript({tablesorter,?sortable_table_name,
+				       TableCols})
+	   end),
      "</head>\n",
      body_tag(),
      "<center>\n",
@@ -1264,6 +1387,10 @@ index_footer() ->
     ["</table>\n"
      "</center>\n" | footer()].
 
+all_runs_index_footer() ->
+    ["</tbody>\n</table>\n"
+     "</center>\n" | footer()].
+
 footer() ->
      ["<center>\n",
       xhtml("<br><br>\n<hr>\n", "<br /><br />\n"),
@@ -1275,7 +1402,8 @@ footer() ->
       xhtml("<br>\n", "<br />\n"),
       xhtml("</font></p>\n", "</div>\n"),
       "</center>\n"
-      "</body>\n"].
+      "</body>\n"
+      "</html>\n"].
 
 
 body_tag() ->
@@ -1291,7 +1419,7 @@ current_time() ->
 
 format_time({{Y, Mon, D}, {H, Min, S}}) ->
     Weekday = weekday(calendar:day_of_the_week(Y, Mon, D)),
-    lists:flatten(io_lib:format("~s ~s ~p ~w ~2.2.0w:~2.2.0w:~2.2.0w",
+    lists:flatten(io_lib:format("~s ~s ~2.2.0w ~w ~2.2.0w:~2.2.0w:~2.2.0w",
 				[Weekday, month(Mon), D, Y, H, Min, S])).
 
 weekday(1) -> "Mon";
@@ -1417,8 +1545,12 @@ config_table_header() ->
     [
      xhtml(["<h2>Configuration</h2>\n"
 	    "<table border=\"3\" cellpadding=\"5\" bgcolor=\"",?table_color1,"\"\n"],
-	   "<h4>CONFIGURATION</h4>\n<table>\n"),
-     "<tr><th>Key</th><th>Value</th></tr>\n"].
+	   ["<h4>CONFIGURATION</h4>\n",
+	    "<table id=\"",?sortable_table_name,"\">\n",
+	    "<thead>\n"]),
+     "<tr><th>Key</th><th>Value</th></tr>\n",
+     xhtml("", "</thead>\n<tbody>\n")
+    ].
 
 config_table1([{Key,Value}|Vars]) ->
     [xhtml(["<tr><td>", atom_to_list(Key), "</td>\n",
@@ -1428,7 +1560,7 @@ config_table1([{Key,Value}|Vars]) ->
 	    "<td>", io_lib:format("~p",[Value]), "</td>\n</tr>\n"]) | 
      config_table1(Vars)];
 config_table1([]) ->
-    ["</table>\n"].
+    ["</tbody>\n</table>\n"].
 
 
 make_all_runs_index(When) ->
@@ -1442,7 +1574,8 @@ make_all_runs_index(When) ->
     DirsSorted = (catch sort_all_runs(Dirs)),
     Header = all_runs_header(),
     Index = [runentry(Dir) || Dir <- DirsSorted],
-    Result = file:write_file(AbsName,Header++Index++index_footer()),
+    Result = file:write_file(AbsName,Header++Index++
+				 all_runs_index_footer()),
     if When == start -> ok;
        true -> io:put_chars("done\n")
     end,
@@ -1981,7 +2114,7 @@ simulate() ->
 
 simulate_logger_loop() ->
     receive 
-    	{log,_,_,_,List} ->
+    	{log,_,_,_,_,_,List} ->
 	    S = [[io_lib:format(Str,Args),io_lib:nl()] || {Str,Args} <- List],
 	    io:format("~s",[S]),
 	    simulate_logger_loop();
@@ -2078,34 +2211,34 @@ basic_html() ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec locate_default_css_file() -> CSSFile
+%%% @spec locate_priv_file(FileName) -> PrivFile
 %%%
 %%% @doc
 %%%
-locate_default_css_file() ->
+locate_priv_file(FileName) ->
     {ok,CWD} = file:get_cwd(),
-    CSSFileInCwd = filename:join(CWD, ?css_default),
-    case filelib:is_file(CSSFileInCwd) of
+    PrivFileInCwd = filename:join(CWD, FileName),
+    case filelib:is_file(PrivFileInCwd) of
 	true ->
-	    CSSFileInCwd;
+	    PrivFileInCwd;
 	false ->
-	    CSSResultFile =
+	    PrivResultFile =
 		case {whereis(?MODULE),self()} of
 		    {Self,Self} ->
 			%% executed on the ct_logs process
-			filename:join(get(ct_run_dir), ?css_default);
+			filename:join(get(ct_run_dir), FileName);
 		    _ ->			
 			%% executed on other process than ct_logs
 			{ok,RunDir} = get_log_dir(true),
-			filename:join(RunDir, ?css_default)
+			filename:join(RunDir, FileName)
 		end,
-	    case filelib:is_file(CSSResultFile) of
+	    case filelib:is_file(PrivResultFile) of
 		true ->
-		    CSSResultFile;
+		    PrivResultFile;
 		false ->
 		    %% last resort, try use css file in CT installation
 		    CTPath = code:lib_dir(common_test),		
-		    filename:join(filename:join(CTPath, "priv"), ?css_default)
+		    filename:join(filename:join(CTPath, "priv"), FileName)
 	    end
     end.
 
@@ -2144,7 +2277,7 @@ make_relative1(DirTs, CwdTs) ->
 %%%
 %%% @doc
 %%%
-get_ts_html_wrapper(TestName, PrintLabel, Cwd) ->
+get_ts_html_wrapper(TestName, PrintLabel, Cwd, TableCols) ->
     TestName1 = if is_list(TestName) ->
 			lists:flatten(TestName);
 		   true ->
@@ -2204,17 +2337,36 @@ get_ts_html_wrapper(TestName, PrintLabel, Cwd) ->
 		 "Open Telecom Platform</a><br />\n",
 		 "Updated: <!date>", current_time(), "<!/date>",
 		 "<br />\n</div>\n"],
-	    CSSFile = xhtml(fun() -> "" end, 
-			    fun() -> make_relative(locate_default_css_file(), Cwd) end),
+	    CSSFile =
+		xhtml(fun() -> "" end, 
+		      fun() -> make_relative(locate_priv_file(?css_default),
+					     Cwd)
+		      end),
+	    JQueryFile =
+		xhtml(fun() -> "" end, 
+		      fun() -> make_relative(locate_priv_file(?jquery_script),
+					     Cwd)
+		      end),
+	    TableSorterFile =
+		xhtml(fun() -> "" end, 
+		      fun() -> make_relative(locate_priv_file(?tablesorter_script),
+					    Cwd)
+		      end),
+	    TableSorterScript =
+		xhtml(fun() -> "" end, 
+		      fun() -> insert_javascript({tablesorter,
+						  ?sortable_table_name,
+						  TableCols}) end),
 	    {xhtml,
 	     ["<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n",
 	      "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n",
 	      "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n",
 	      "<head>\n<title>", TestName1, "</title>\n",
 	      "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
-	      "<link rel=\"stylesheet\" href=\"", CSSFile, "\" type=\"text/css\">",
-	      "</head>\n","<body>\n", 
-	      LabelStr, "\n"],
+	      "<link rel=\"stylesheet\" href=\"", CSSFile, "\" type=\"text/css\">\n",
+	      "<script type=\"text/javascript\" src=\"", JQueryFile, "\"></script>\n",
+	      "<script type=\"text/javascript\" src=\"", TableSorterFile, "\"></script>\n"] ++
+	      TableSorterScript ++ ["</head>\n","<body>\n", LabelStr, "\n"],
 	     ["<center>\n<br /><hr /><p>\n",
 	      "<a href=\"", AllRuns,
 	      "\">Test run history\n</a>  |  ",
@@ -2222,3 +2374,89 @@ get_ts_html_wrapper(TestName, PrintLabel, Cwd) ->
 	      "\">Top level test index\n</a>\n</p>\n",
 	      Copyright,"</center>\n</body>\n</html>\n"]}
     end.
+
+insert_javascript({tablesorter,_TableName,undefined}) ->
+    [];
+
+insert_javascript({tablesorter,TableName,
+		   {DateCols,TextCols,ValCols}}) ->
+    Headers =
+	lists:flatten(
+	  lists:sort(
+	    lists:flatmap(fun({Sorter,Cols}) ->
+				  [lists:flatten(
+				     io_lib:format("      ~w: "
+						   "{ sorter: '~s' },\n",
+						   [Col-1,Sorter])) || Col<-Cols]
+			  end, [{"CTDateSorter",DateCols},
+				{"CTTextSorter",TextCols},
+				{"CTValSorter",ValCols}]))),
+    Headers1 = string:substr(Headers, 1, length(Headers)-2),
+
+    ["<script type=\"text/javascript\">\n",
+     "// Parser for date format, e.g: Wed Jul 4 2012 11:24:15\n",
+     "var monthNames = {};\n",
+     "monthNames[\"Jan\"] = \"01\"; monthNames[\"Feb\"] = \"02\";\n",
+     "monthNames[\"Mar\"] = \"03\"; monthNames[\"Apr\"] = \"04\";\n",
+     "monthNames[\"May\"] = \"05\"; monthNames[\"Jun\"] = \"06\";\n",
+     "monthNames[\"Jul\"] = \"07\"; monthNames[\"Aug\"] = \"08\";\n",
+     "monthNames[\"Sep\"] = \"09\"; monthNames[\"Oct\"] = \"10\";\n",
+     "monthNames[\"Nov\"] = \"11\"; monthNames[\"Dec\"] = \"12\";\n",
+     "$.tablesorter.addParser({\n",
+     "  id: 'CTDateSorter',\n",
+     "  is: function(s) {\n",
+     "      return false; },\n",
+     "  format: function(s) {\n",
+     %% place empty cells, "-" and "?" at the bottom
+     "      if (s.length < 2) return 999999999;\n",
+     "      else {\n",
+     %% match out each date element
+     "          var date = s.match(/(\\w{3})\\s(\\w{3})\\s(\\d{2})\\s(\\d{4})\\s(\\d{2}):(\\d{2}):(\\d{2})/);\n",
+     "          var y = date[4]; var mo = monthNames[date[2]]; var d = String(date[3]);\n",
+     "          var h = String(date[5]); var mi = String(date[6]); var sec = String(date[7]);\n",
+     "          return (parseInt('' + y + mo + d + h + mi + sec)); }},\n",
+     "  type: 'numeric' });\n",
+
+     "// Parser for general text format\n",
+     "$.tablesorter.addParser({\n",
+     "  id: 'CTTextSorter',\n",
+     "  is: function(s) {\n",
+     "    return false; },\n",
+     "  format: function(s) {\n",
+     %% place empty cells, "?" and "-" at the bottom
+     "    if (s.length < 1) return 'zzzzzzzz';\n",
+     "    else if (s == \"?\") return 'zzzzzzz';\n",
+     "    else if (s == \"-\") return 'zzzzzz';\n",
+     "    else if (s == \"FAILED\") return 'A';\n",
+     "    else if (s == \"SKIPPED\") return 'B';\n",
+     "    else if (s == \"OK\") return 'C';\n",
+     "    else return '' + s; },\n",
+     "  type: 'text' });\n",
+
+     "// Parser for numerical values\n",
+     "$.tablesorter.addParser({\n",
+     "  id: 'CTValSorter',\n",
+     "  is: function(s) {\n",
+     "    return false; },\n",
+     "  format: function(s) {\n"
+     %% place empty cells and "?" at the bottom
+     "    if (s.length < 1) return '-2';\n",
+     "    else if (s == \"?\") return '-1';\n",
+     %% look for skip value, eg "3 (2/1)"
+     "    else if ((s.search(/(\\d{1,})\\s/)) >= 0) {\n",
+     "      var num = s.match(/(\\d{1,})\\s/);\n",
+     %% return only the total skip value for sorting
+     "      return (parseInt('' + num[1])); }\n",
+     "    else if ((s.search(/(\\d{1,})\\.(\\d{3})s/)) >= 0) {\n",
+     "      var num = s.match(/(\\d{1,})\\.(\\d{3})/);\n",
+     "      if (num[1] == \"0\") return (parseInt('' + num[2]));\n",
+     "      else return (parseInt('' + num[1] + num[2])); }\n",
+     "    else return '' + s; },\n",
+     "  type: 'numeric' });\n",
+
+     "$(document).ready(function() {\n",
+     "  $(\"#",TableName,"\").tablesorter({\n",
+     "    headers: { \n", Headers1, "\n    }\n  });\n",
+     "  $(\"#",TableName,"\").trigger(\"update\");\n",
+     "  $(\"#",TableName,"\").trigger(\"appendCache\");\n",
+     "});\n</script>\n"].
diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl
index 042c5ba267..f29eba605c 100644
--- a/lib/common_test/src/ct_master.erl
+++ b/lib/common_test/src/ct_master.erl
@@ -51,7 +51,7 @@
 %%%               {testcase,Cases} | {spec,TestSpecs} | {allow_user_terms,Bool} | 
 %%%               {logdir,LogDir} | {event_handler,EventHandlers} | 
 %%%               {silent_connections,Conns} | {cover,CoverSpecFile} |
-%%%		  {userconfig, UserCfgFiles}
+%%%		  {cover_stop,Bool} | {userconfig, UserCfgFiles}
 %%%       CfgFiles = string() | [string()]
 %%%       TestDirs = string() | [string()]
 %%%       Suites = atom() | [atom()]
@@ -696,8 +696,9 @@ status(MasterPid,Event) ->
 
 log(To,Heading,Str,Args) ->
     if To == all ; To == tty ->
-	    Str1 = ["=== ",Heading," ===\n",io_lib:format(Str,Args),"\n"],
-	    io:format(Str1,[]);
+	    Chars = ["=== ",Heading," ===\n",
+		     io_lib:format(Str,Args),"\n"],
+	    io:put_chars(Chars);
        true ->
 	    ok
     end,
diff --git a/lib/common_test/src/ct_master_logs.erl b/lib/common_test/src/ct_master_logs.erl
index 2a951bc5cf..84f175c0a9 100644
--- a/lib/common_test/src/ct_master_logs.erl
+++ b/lib/common_test/src/ct_master_logs.erl
@@ -26,6 +26,8 @@
 -export([start/2, make_all_runs_index/0, log/3, nodedir/2,
 	 stop/0]).
 
+-include("ct_util.hrl").
+
 -record(state, {log_fd, start_time, logdir, rundir, 
 		nodedir_ix_fd, nodes, nodedirs=[]}).
 
@@ -33,7 +35,6 @@
 -define(all_runs_name, "master_runs.html").
 -define(nodedir_index_name, "index.html").
 -define(details_file_name,"details.info").
--define(css_default, "ct_default.css").
 -define(table_color,"lightblue").
 
 %%%--------------------------------------------------------------------
@@ -95,29 +96,30 @@ init(Parent,LogDir,Nodes) ->
 	    put(basic_html, true);
 	BasicHtml ->
 	    put(basic_html, BasicHtml),
-	    %% copy stylesheet to log dir (both top dir and test run
+	    %% copy priv files to log dir (both top dir and test run
 	    %% dir) so logs are independent of Common Test installation
 	    CTPath = code:lib_dir(common_test),
-	    CSSFileSrc = filename:join(filename:join(CTPath, "priv"),
-				       ?css_default),
-	    CSSFileDestTop = filename:join(LogDir, ?css_default),
-	    CSSFileDestRun = filename:join(RunDirAbs, ?css_default),
-	    case file:copy(CSSFileSrc, CSSFileDestTop) of
-		{error,Reason0} ->
+	    PrivFiles = [?css_default,?jquery_script,?tablesorter_script],
+	    PrivFilesSrc = [filename:join(filename:join(CTPath, "priv"), F) ||
+			       F <- PrivFiles],
+	    PrivFilesDestTop = [filename:join(LogDir, F) || F <- PrivFiles],
+	    PrivFilesDestRun = [filename:join(RunDirAbs, F) || F <- PrivFiles],
+	    case copy_priv_files(PrivFilesSrc, PrivFilesDestTop) of
+		{error,Src1,Dest1,Reason1} ->
 		    io:format(user, "ERROR! "++
-			      "CSS file ~p could not be copied to ~p. "++
+			      "Priv file ~p could not be copied to ~p. "++
 			      "Reason: ~p~n",
-			      [CSSFileSrc,CSSFileDestTop,Reason0]),
-		    exit({css_file_error,CSSFileDestTop});
-		_ ->
-		    case file:copy(CSSFileSrc, CSSFileDestRun) of
-			{error,Reason1} ->
+			      [Src1,Dest1,Reason1]),
+		    exit({priv_file_error,Dest1});
+		ok ->
+		    case copy_priv_files(PrivFilesSrc, PrivFilesDestRun) of
+			{error,Src2,Dest2,Reason2} ->
 			    io:format(user, "ERROR! "++
-				      "CSS file ~p could not be copied to ~p. "++
+				      "Priv file ~p could not be copied to ~p. "++
 				      "Reason: ~p~n",
-				      [CSSFileSrc,CSSFileDestRun,Reason1]),
-			    exit({css_file_error,CSSFileDestRun});
-			_ ->
+				      [Src2,Dest2,Reason2]),
+			    exit({priv_file_error,Dest2});
+			ok ->
 			    ok
 		    end
 	    end
@@ -132,7 +134,7 @@ init(Parent,LogDir,Nodes) ->
 
     io:format(CtLogFd,int_header(),[log_timestamp(now()),"Test Nodes\n"]),
     io:format(CtLogFd,"~s\n",[NodeStr]),
-    io:format(CtLogFd,int_footer()++"\n",[]),
+    io:put_chars(CtLogFd,[int_footer(),"\n"]),
 
     NodeDirIxFd = open_nodedir_index(RunDirAbs,Time),
     Parent ! {started,self(),{Time,RunDirAbs}},
@@ -146,6 +148,16 @@ init(Parent,LogDir,Nodes) ->
 					   {N,""}
 				   end,Nodes)}).
 
+copy_priv_files([SrcF | SrcFs], [DestF | DestFs]) ->
+    case file:copy(SrcF, DestF) of
+	{error,Reason} ->
+	    {error,SrcF,DestF,Reason};
+	_ ->
+	    copy_priv_files(SrcFs, DestFs)
+    end;
+copy_priv_files([], []) ->
+    ok.
+
 loop(State) ->
     receive
 	{log,_From,List} ->
@@ -190,24 +202,21 @@ loop(State) ->
 open_ct_master_log(Dir) ->
     FullName = filename:join(Dir,?ct_master_log_name),
     {ok,Fd} = file:open(FullName,[write]),
-    io:format(Fd,header("Common Test Master Log"),[]),
+    io:put_chars(Fd,header("Common Test Master Log", {[],[1,2],[]})),
     %% maybe add config info here later
-    io:format(Fd, config_table([]), []),
-    io:format(Fd,
-	      "<style>\n"
-	      "div.ct_internal { background:lightgrey; color:black }\n"
-	      "div.default     { background:lightgreen; color:black }\n"
-	      "</style>\n",
-	      []),
-    io:format(Fd, 
-	      xhtml("<br><h2>Progress Log</h2>\n<pre>\n",
-		    "<br /><h2>Progress Log</h2>\n<pre>\n"),
-	      []),
+    io:put_chars(Fd,config_table([])),
+    io:put_chars(Fd,
+		 "<style>\n"
+		 "div.ct_internal { background:lightgrey; color:black }\n"
+		 "div.default     { background:lightgreen; color:black }\n"
+		 "</style>\n"),
+    io:put_chars(Fd, 
+		 xhtml("<br><h2>Progress Log</h2>\n<pre>\n",
+		       "<br /><h2>Progress Log</h2>\n<pre>\n")),
     Fd.
 
 close_ct_master_log(Fd) ->
-    io:format(Fd,"</pre>",[]),
-    io:format(Fd,footer(),[]),
+    io:put_chars(Fd,["</pre>",footer()]),
     file:close(Fd).
 
 config_table(Vars) ->
@@ -216,11 +225,14 @@ config_table(Vars) ->
 config_table_header() ->
     ["<h2>Configuration</h2>\n",
      xhtml(["<table border=\"3\" cellpadding=\"5\" "
-	    "bgcolor=\"",?table_color,"\"\n"], "<table>\n"),
-     "<tr><th>Key</th><th>Value</th></tr>\n"].
+	    "bgcolor=\"",?table_color,"\"\n"],
+	   ["<table id=\"",?sortable_table_name,"\">\n",
+	    "<thead>\n"]),
+     "<tr><th>Key</th><th>Value</th></tr>\n",
+     xhtml("", "</thead>\n<tbody>\n")].
 
 config_table1([]) ->
-    ["</table>\n"].
+    ["</tbody>\n</table>\n"].
 
 int_header() ->
     "<div class=\"ct_internal\"><b>*** CT MASTER ~s *** ~s</b>".
@@ -233,31 +245,33 @@ int_footer() ->
 open_nodedir_index(Dir,StartTime) ->
     FullName = filename:join(Dir,?nodedir_index_name),
     {ok,Fd} = file:open(FullName,[write]),
-    io:format(Fd,nodedir_index_header(StartTime),[]),
+    io:put_chars(Fd,nodedir_index_header(StartTime)),
     Fd.
 
 print_nodedir(Node,RunDir,Fd) ->
     Index = filename:join(RunDir,"index.html"),
-    io:format(Fd,
-	      ["<tr>\n"
-	       "<td align=center>",atom_to_list(Node),"</td>\n",
-	       "<td align=left><a href=\"",Index,"\">",Index,"</a></td>\n",
-	       "</tr>\n"],[]),
+    io:put_chars(Fd,
+		 ["<tr>\n"
+		  "<td align=center>",atom_to_list(Node),"</td>\n",
+		  "<td align=left><a href=\"",Index,"\">",Index,"</a></td>\n",
+		  "</tr>\n"]),
     ok.
 
 close_nodedir_index(Fd) ->
-    io:format(Fd,index_footer(),[]),
+    io:put_chars(Fd,index_footer()),
     file:close(Fd).
 
 nodedir_index_header(StartTime) ->
-    [header("Log Files " ++ format_time(StartTime)) |
+    [header("Log Files " ++ format_time(StartTime), {[],[1,2],[]}) |
      ["<center>\n",
       "<p><a href=\"",?ct_master_log_name,"\">Common Test Master Log</a></p>",
       xhtml(["<table border=\"3\" cellpadding=\"5\" "
-	     "bgcolor=\"",?table_color,"\">\n"], "<table>\n"),
+	     "bgcolor=\"",?table_color,"\">\n"],
+	    ["<table id=\"",?sortable_table_name,"\">\n",
+	     "<thead>\n<tr>\n"]),
       "<th><b>Node</b></th>\n",
       "<th><b>Log</b></th>\n",
-      "\n"]].
+      xhtml("", "</tr>\n</thead>\n<tbody>\n")]].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% All Run Index functions %%%
@@ -315,14 +329,16 @@ runentry(Dir) ->
      "</tr>\n"].
 
 all_runs_header() ->
-    [header("Master Test Runs") |
+    [header("Master Test Runs", {[1],[2,3],[]}) |
      ["<center>\n",
       xhtml(["<table border=\"3\" cellpadding=\"5\" "
-	     "bgcolor=\"",?table_color,"\">\n"], "<table>\n"),
+	     "bgcolor=\"",?table_color,"\">\n"],
+	    ["<table id=\"",?sortable_table_name,"\">\n",
+	     "<thead>\n<tr>\n"]),
       "<th><b>History</b></th>\n"
       "<th><b>Master Host</b></th>\n"
-      "<th><b>Test Nodes</b></th>\n"
-      "\n"]].
+      "<th><b>Test Nodes</b></th>\n",
+      xhtml("", "</tr></thead>\n<tbody>\n")]].
 
 timestamp(Dir) ->
     [S,Min,H,D,M,Y|_] = lists:reverse(string:tokens(Dir,".-_")),
@@ -346,9 +362,16 @@ read_details_file(Dir) ->
 %%% Internal functions
 %%%--------------------------------------------------------------------
 
-header(Title) ->
+header(Title, TableCols) ->
     CSSFile = xhtml(fun() -> "" end, 
-		    fun() -> make_relative(locate_default_css_file()) end),
+		    fun() -> make_relative(locate_priv_file(?css_default)) end),
+    JQueryFile =
+	xhtml(fun() -> "" end, 
+	      fun() -> make_relative(locate_priv_file(?jquery_script)) end),
+    TableSorterFile =
+	xhtml(fun() -> "" end, 
+	      fun() -> make_relative(locate_priv_file(?tablesorter_script)) end),
+
     [xhtml(["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n",
 	    "<html>\n"],
 	   ["<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n",
@@ -360,6 +383,16 @@ header(Title) ->
      "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
      xhtml("",
 	   ["<link rel=\"stylesheet\" href=\"",CSSFile,"\" type=\"text/css\">"]),
+     xhtml("",
+	   ["<script type=\"text/javascript\" src=\"",JQueryFile,
+	    "\"></script>\n"]),
+     xhtml("",
+	   ["<script type=\"text/javascript\" src=\"",TableSorterFile,
+	    "\"></script>\n"]),
+     xhtml(fun() -> "" end,
+	   fun() -> ct_logs:insert_javascript({tablesorter,
+					       ?sortable_table_name,
+					       TableCols}) end),
      "</head>\n",
      body_tag(),
      "<center>\n",
@@ -367,7 +400,7 @@ header(Title) ->
      "</center>\n"].
 
 index_footer() ->
-    ["</table>\n"
+    ["</tbody>\n</table>\n"
      "</center>\n" | footer()].
 
 footer() ->
@@ -393,7 +426,7 @@ current_time() ->
 
 format_time({{Y, Mon, D}, {H, Min, S}}) ->
     Weekday = weekday(calendar:day_of_the_week(Y, Mon, D)),
-    lists:flatten(io_lib:format("~s ~s ~p ~w ~2.2.0w:~2.2.0w:~2.2.0w",
+    lists:flatten(io_lib:format("~s ~s ~2.2.0w ~w ~2.2.0w:~2.2.0w:~2.2.0w",
 				[Weekday, month(Mon), D, Y, H, Min, S])).
 
 weekday(1) -> "Mon";
@@ -446,8 +479,8 @@ basic_html() ->
 xhtml(HTML, XHTML) ->
     ct_logs:xhtml(HTML, XHTML).
 
-locate_default_css_file() ->
-    ct_logs:locate_default_css_file().
+locate_priv_file(File) ->
+    ct_logs:locate_priv_file(File).
 
 make_relative(Dir) ->
     ct_logs:make_relative(Dir).
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
new file mode 100644
index 0000000000..11c8235040
--- /dev/null
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -0,0 +1,1856 @@
+%%----------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%----------------------------------------------------------------------
+%% File: ct_netconfc.erl
+%%
+%% Description:
+%%    This file contains the Netconf client interface
+%%
+%% @author Support
+%%
+%% @doc Netconf client module.
+%%
+%% <p>The Netconf client is compliant with RFC4741 and RFC4742.</p>
+%%
+%% <p> For each server to test against, the following entry can be
+%% added to a configuration file:</p>
+%%
+%% <p>`{server_id(),options()}.'</p>
+%%
+%% <p> The `server_id()' or an associated `target_name()' (see
+%% {@link ct}) shall then be used in calls to {@link open/2}.</p>
+%%
+%% <p>If no configuration exists for a server, a session can still be
+%% opened by calling {@link open/2} with all necessary options given
+%% in the call. The first argument to {@link open/2} can then be any
+%% atom.</p>
+%%
+%% == Logging ==
+%%
+%% The netconf server uses the `error_logger' for logging of netconf
+%% traffic. A special purpose error handler is implemented in
+%% `ct_conn_log_h'. To use this error handler, add the `cth_conn_log'
+%% hook in your test suite, e.g.
+%%
+%% ```
+%% suite() ->
+%%    [{ct_hooks, [{cth_conn_log, [{conn_mod(),hook_options()}]}]}].
+%%'''
+%%
+%% The `conn_mod()' is the name of the common_test module implementing
+%% the connection protocol, e.g. `ct_netconfc'.
+%%
+%% The hook option `log_type' specifies the type of logging:
+%%
+%% <dl>
+%%   <dt>`raw'</dt>
+%%   <dd>The sent and received netconf data is logged to a separate
+%%   text file as is without any formatting. A link to the file is
+%%   added to the test case HTML log.</dd>
+%%
+%%   <dt>`pretty'</dt>
+%%   <dd>The sent and received netconf data is logged to a separate
+%%   text file with XML data nicely indented. A link to the file is
+%%   added to the test case HTML log.</dd>
+%%
+%%   <dt>`html (default)'</dt>
+%%   <dd>The sent and received netconf traffic is pretty printed
+%%   directly in the test case HTML log.</dd>
+%%
+%%   <dt>`silent'</dt>
+%%   <dd>Netconf traffic is not logged.</dd>
+%% </dl>
+%%
+%% By default, all netconf traffic is logged in one single log
+%% file. However, it is possible to have different connections logged
+%% in separate files. To do this, use the hook option `hosts' and
+%% list the names of the servers/connections that will be used in the
+%% suite. Note that the connections must be named for this to work,
+%% i.e. they must be opened with {@link open/2}.
+%%
+%% The `hosts' option has no effect if `log_type' is set to `html' or
+%% `silent'.
+%%
+%% The hook options can also be specified in a configuration file with
+%% the configuration variable `ct_conn_log':
+%%
+%% ```
+%% {ct_conn_log,[{conn_mod(),hook_options()}]}.
+%% '''
+%%
+%% For example:
+%%
+%% ```
+%% {ct_conn_log,[{ct_netconfc,[{log_type,pretty},
+%%                             {hosts,[key_or_name()]}]}]}
+%% '''
+%%
+%% <b>Note</b> that hook options specified in a configuration file
+%% will overwrite the hardcoded hook options in the test suite.
+%%
+%% === Logging example 1 ===
+%%
+%% The following `ct_hooks' statement will cause pretty printing of
+%% netconf traffic to separate logs for the connections named
+%% `nc_server1' and `nc_server2'. Any other connections will be logged
+%% to default netconf log.
+%%
+%% ```
+%% suite() ->
+%%    [{ct_hooks, [{cth_conn_log, [{ct_netconfc,[{log_type,pretty}},
+%%                                               {hosts,[nc_server1,nc_server2]}]}
+%%                                ]}]}].
+%%'''
+%%
+%% Connections must be opened like this:
+%%
+%% ```
+%% open(nc_server1,[...]),
+%% open(nc_server2,[...]).
+%% '''
+%%
+%% === Logging example 2 ===
+%%
+%% The following configuration file will cause raw logging of all
+%% netconf traffic into one single text file.
+%%
+%% ```
+%% {ct_conn_log,[{ct_netconfc,[{log_type,raw}]}]}.
+%% '''
+%%
+%% The `ct_hooks' statement must look like this:
+%%
+%% ```
+%% suite() ->
+%%    [{ct_hooks, [{cth_conn_log, []}]}].
+%% '''
+%%
+%% The same `ct_hooks' statement without the configuration file would
+%% cause HTML logging of all netconf connections into the test case
+%% HTML log.
+%%
+%% == Notifications ==
+%%
+%% The netconf client is also compliant with RFC5277 NETCONF Event
+%% Notifications, which defines a mechanism for an asynchronous
+%% message notification delivery service for the netconf protocol.
+%%
+%% Specific functions to support this are {@link
+%% create_subscription/6} and {@link get_event_streams/3}. (The
+%% functions also exist with other arities.)
+%%
+%% @end
+%%----------------------------------------------------------------------
+-module(ct_netconfc).
+
+-include("ct_netconfc.hrl").
+-include("ct_util.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
+
+%%----------------------------------------------------------------------
+%% External exports
+%%----------------------------------------------------------------------
+-export([open/1,
+	 open/2,
+	 only_open/1,
+	 only_open/2,
+	 hello/1,
+	 hello/2,
+	 close_session/1,
+	 close_session/2,
+	 kill_session/2,
+	 kill_session/3,
+	 send/2,
+	 send/3,
+	 send_rpc/2,
+	 send_rpc/3,
+	 lock/2,
+	 lock/3,
+	 unlock/2,
+	 unlock/3,
+	 get/2,
+	 get/3,
+	 get_config/3,
+	 get_config/4,
+	 edit_config/3,
+	 edit_config/4,
+	 delete_config/2,
+	 delete_config/3,
+	 copy_config/3,
+	 copy_config/4,
+	 action/2,
+	 action/3,
+	 create_subscription/1,
+	 create_subscription/2,
+	 create_subscription/3,
+	 create_subscription/4,
+	 create_subscription/5,
+	 create_subscription/6,
+	 get_event_streams/2,
+	 get_event_streams/3,
+	 get_capabilities/1,
+	 get_capabilities/2,
+	 get_session_id/1,
+	 get_session_id/2]).
+
+%%----------------------------------------------------------------------
+%% Exported types
+%%----------------------------------------------------------------------
+-export_type([hook_options/0,
+	      conn_mod/0,
+	      log_type/0,
+	      key_or_name/0,
+	      notification/0]).
+
+%%----------------------------------------------------------------------
+%% Internal exports
+%%----------------------------------------------------------------------
+%% ct_gen_conn callbacks
+-export([init/3,
+	 handle_msg/3,
+	 handle_msg/2,
+	 terminate/2,
+	 close/1]).
+
+%% ct_conn_log callback
+-export([format_data/2]).
+
+%%----------------------------------------------------------------------
+%% Internal defines
+%%----------------------------------------------------------------------
+-define(APPLICATION,?MODULE).
+-define(VALID_SSH_OPTS,[user, password, user_dir]).
+-define(DEFAULT_STREAM,"NETCONF").
+
+-define(error(ConnName,Report),
+	error_logger:error_report([{ct_connection,ConnName},
+				   {client,self()},
+				   {module,?MODULE},
+				   {line,?LINE} |
+				   Report])).
+
+-define(is_timeout(T), (is_integer(T) orelse T==infinity)).
+-define(is_filter(F),
+	(is_atom(F) orelse (is_tuple(F) andalso is_atom(element(1,F))))).
+-define(is_string(S), (is_list(S) andalso is_integer(hd(S)))).
+
+%%----------------------------------------------------------------------
+%% Records
+%%----------------------------------------------------------------------
+%% Client state
+-record(state, {host,
+		port,
+		connection,      % #connection
+		capabilities,
+		session_id,
+		msg_id = 1,
+		hello_status,
+		buff = <<>>,
+		pending = [],    % [#pending]
+		event_receiver}).% pid
+
+%% Run-time client options.
+-record(options, {ssh = [], % Options for the ssh application
+		  host,
+		  port = ?DEFAULT_PORT,
+		  timeout = ?DEFAULT_TIMEOUT,
+		  name}).
+
+%% Connection reference
+-record(connection, {reference, % {CM,Ch}
+		     host,
+		     port,
+		     name}).
+
+%% Pending replies from server
+-record(pending, {tref,    % timer ref (returned from timer:xxx)
+		  ref,     % pending ref
+		  msg_id,
+		  op,
+		  caller}).% pid which sent the request
+
+%%----------------------------------------------------------------------
+%% Type declarations
+%%----------------------------------------------------------------------
+-type client() :: handle() | server_id() | target_name().
+-type handle() :: term().
+%% An opaque reference for a connection (netconf session). See {@link
+%% ct} for more information.
+
+-type server_id() :: atom().
+%% A `ServerId' which exists in a configuration file.
+-type target_name() :: atom().
+%% A name which is associated to a `server_id()' via a
+%% `require' statement or a call to {@link ct:require/2} in the
+%% test suite.
+-type key_or_name() :: server_id() | target_name().
+
+-type options() :: [option()].
+%% Options used for setting up ssh connection to a netconf server.
+
+-type option() :: {ssh,host()} | {port,inet:port_number()} | {user,string()} |
+		  {password,string()} | {user_dir,string()} |
+		  {timeout,timeout()}.
+-type host() :: inet:hostname() | inet:ip_address().
+
+-type notification() :: {notification, xml_attributes(), notification_content()}.
+-type notification_content() :: [event_time()|simple_xml()].
+-type event_time() :: {eventTime,xml_attributes(),[xs_datetime()]}.
+
+-type stream_name() :: string().
+-type streams() :: [{stream_name(),[stream_data()]}].
+-type stream_data() :: {description,string()} |
+		       {replaySupport,string()} |
+		       {replayLogCreationTime,string()} |
+		       {replayLogAgedTime,string()}.
+%% See XML Schema for Event Notifications found in RFC5277 for further
+%% detail about the data format for the string values.
+
+-type hook_options() :: [hook_option()].
+%% Options that can be given to `cth_conn_log' in the `ct_hook' statement.
+-type hook_option() :: {log_type,log_type()} |
+		       {hosts,[key_or_name()]}.
+-type log_type() :: raw | pretty | html | silent.
+%-type error_handler() :: module().
+-type conn_mod() :: ct_netconfc.
+
+-type error_reason() :: term().
+
+-type simple_xml() :: {xml_tag(), xml_attributes(), xml_content()} |
+		      {xml_tag(), xml_content()} |
+		      xml_tag().
+%% <p>This type is further described in the documentation for the
+%% <tt>Xmerl</tt> application.</p>
+-type xml_tag() :: atom().
+-type xml_attributes() :: [{xml_attribute_tag(),xml_attribute_value()}].
+-type xml_attribute_tag() :: atom().
+-type xml_attribute_value() :: string().
+-type xml_content() :: [simple_xml() | iolist()].
+-type xpath() :: {xpath,string()}.
+
+-type netconf_db() :: running | startup | candidate.
+-type xs_datetime() :: string().
+%% This date and time identifyer has the same format as the XML type
+%% dateTime and compliant to RFC3339. The format is
+%% ```[-]CCYY-MM-DDThh:mm:ss[.s][Z|(+|-)hh:mm]'''
+
+%%----------------------------------------------------------------------
+%% External interface functions
+%%----------------------------------------------------------------------
+
+%%----------------------------------------------------------------------
+-spec open(Options) -> Result when
+      Options :: options(),
+      Result :: {ok,handle()} | {error,error_reason()}.
+%% @doc Open a netconf session and exchange `hello' messages.
+%%
+%% If the server options are specified in a configuration file, or if
+%% a named client is needed for logging purposes (see {@section
+%% Logging}) use {@link open/2} instead.
+%%
+%% The opaque `handler()' reference which is returned from this
+%% function is required as client identifier when calling any other
+%% function in this module.
+%%
+%% The `timeout' option (milli seconds) is used when setting up
+%% the ssh connection and when waiting for the hello message from the
+%% server. It is not used for any other purposes during the lifetime
+%% of the connection.
+%%
+%% @end
+%%----------------------------------------------------------------------
+open(Options) ->
+    open(Options,#options{},[],true).
+
+%%----------------------------------------------------------------------
+-spec open(KeyOrName, ExtraOptions) -> Result when
+      KeyOrName :: key_or_name(),
+      ExtraOptions :: options(),
+      Result :: {ok,handle()} | {error,error_reason()}.
+%% @doc Open a named netconf session and exchange `hello' messages.
+%%
+%% If `KeyOrName' is a configured `server_id()' or a
+%% `target_name()' associated with such an ID, then the options
+%% for this server will be fetched from the configuration file.
+%
+%% The `ExtraOptions' argument will be added to the options found in
+%% the configuration file. If the same options are given, the values
+%% from the configuration file will overwrite `ExtraOptions'.
+%%
+%% If the server is not specified in a configuration file, use {@link
+%% open/1} instead.
+%%
+%% The opaque `handle()' reference which is returned from this
+%% function can be used as client identifier when calling any other
+%% function in this module. However, if `KeyOrName' is a
+%% `target_name()', i.e. if the server is named via a call to
+%% `ct:require/2' or a `require' statement in the test
+%% suite, then this name may be used instead of the `handle()'.
+%%
+%% The `timeout' option (milli seconds) is used when setting up
+%% the ssh connection and when waiting for the hello message from the
+%% server. It is not used for any other purposes during the lifetime
+%% of the connection.
+%%
+%% @see ct:require/2
+%% @end
+%%----------------------------------------------------------------------
+open(KeyOrName, ExtraOpts) ->
+    open(KeyOrName, ExtraOpts, true).
+
+open(KeyOrName, ExtraOpts, Hello) ->
+    SortedExtra = lists:keysort(1,ExtraOpts),
+    SortedConfig = lists:keysort(1,ct:get_config(KeyOrName,[])),
+    AllOpts = lists:ukeymerge(1,SortedConfig,SortedExtra),
+    open(AllOpts,#options{name=KeyOrName},[{name,KeyOrName}],Hello).
+
+open(OptList,InitOptRec,NameOpt,Hello) ->
+    case check_options(OptList,undefined,undefined,InitOptRec) of
+	{Host,Port,Options} ->
+	    case ct_gen_conn:start({Host,Port},Options,?MODULE,
+				   NameOpt ++ [{reconnect,false},
+					       {use_existing_connection,false},
+					       {forward_messages,true}]) of
+		{ok,Client} when Hello==true ->
+		    case hello(Client,Options#options.timeout) of
+			ok ->
+			    {ok,Client};
+			Error ->
+			    Error
+		    end;
+		Other ->
+		    Other
+	    end;
+	Error ->
+	    Error
+    end.
+
+
+%%----------------------------------------------------------------------
+-spec only_open(Options) -> Result when
+      Options :: options(),
+      Result :: {ok,handle()} | {error,error_reason()}.
+%% @doc Open a netconf session, but don't send `hello'.
+%%
+%% As {@link open/1} but does not send a `hello' message.
+%%
+%% @end
+%%----------------------------------------------------------------------
+only_open(Options) ->
+    open(Options,#options{},[],false).
+
+%%----------------------------------------------------------------------
+-spec only_open(KeyOrName,ExtraOptions) -> Result when
+      KeyOrName :: key_or_name(),
+      ExtraOptions :: options(),
+      Result :: {ok,handle()} | {error,error_reason()}.
+%% @doc Open a name netconf session, but don't send `hello'.
+%%
+%% As {@link open/2} but does not send a `hello' message.
+%%
+%% @end
+%%----------------------------------------------------------------------
+only_open(KeyOrName, ExtraOpts) ->
+    open(KeyOrName, ExtraOpts, false).
+
+%%----------------------------------------------------------------------
+%% @spec hello(Client) -> Result
+%% @equiv hello(Client, infinity)
+hello(Client) ->
+    hello(Client,?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec hello(Client,Timeout) -> Result when
+      Client :: handle(),
+      Timeout :: timeout(),
+      Result :: ok | {error,error_reason()}.
+%% @doc Exchange `hello' messages with the server.
+%%
+%% Sends a `hello' message to the server and waits for the return.
+%%
+%% @end
+%%----------------------------------------------------------------------
+hello(Client,Timeout) ->
+    call(Client, {hello, Timeout}).
+
+%%----------------------------------------------------------------------
+%% @spec get_session_id(Client) -> Result
+%% @equiv get_session_id(Client, infinity)
+get_session_id(Client) ->
+    get_session_id(Client, ?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec get_session_id(Client, Timeout) -> Result when
+      Client :: client(),
+      Timeout :: timeout(),
+      Result :: pos_integer() | {error,error_reason()}.
+%% @doc Returns the session id associated with the given client.
+%%
+%% @end
+%%----------------------------------------------------------------------
+get_session_id(Client, Timeout) ->
+    call(Client, get_session_id, Timeout).
+
+%%----------------------------------------------------------------------
+%% @spec get_capabilities(Client) -> Result
+%% @equiv get_capabilities(Client, infinity)
+get_capabilities(Client) ->
+    get_capabilities(Client, ?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec get_capabilities(Client, Timeout) -> Result when
+      Client :: client(),
+      Timeout :: timeout(),
+      Result :: [string()] | {error,error_reason()}.
+%% @doc Returns the server side capabilities
+%%
+%% The following capability identifiers, defined in RFC 4741, can be returned:
+%%
+%% <ul>
+%%   <li>`"urn:ietf:params:netconf:base:1.0"'</li>
+%%   <li>`"urn:ietf:params:netconf:capability:writable-running:1.0"'</li>
+%%   <li>`"urn:ietf:params:netconf:capability:candidate:1.0"'</li>
+%%   <li>`"urn:ietf:params:netconf:capability:confirmed-commit:1.0"'</li>
+%%   <li>`"urn:ietf:params:netconf:capability:rollback-on-error:1.0"'</li>
+%%   <li>`"urn:ietf:params:netconf:capability:startup:1.0"'</li>
+%%   <li>`"urn:ietf:params:netconf:capability:url:1.0"'</li>
+%%   <li>`"urn:ietf:params:netconf:capability:xpath:1.0"'</li>
+%% </ul>
+%%
+%% Note, additional identifiers may exist, e.g. server side namespace.
+%%
+%% @end
+%%----------------------------------------------------------------------
+get_capabilities(Client, Timeout) ->
+    call(Client, get_capabilities, Timeout).
+
+%% @private
+send(Client, SimpleXml) ->
+    send(Client, SimpleXml, ?DEFAULT_TIMEOUT).
+%% @private
+send(Client, SimpleXml, Timeout) ->
+    call(Client,{send, Timeout, SimpleXml}).
+
+%% @private
+send_rpc(Client, SimpleXml) ->
+    send_rpc(Client, SimpleXml, ?DEFAULT_TIMEOUT).
+%% @private
+send_rpc(Client, SimpleXml, Timeout) ->
+    call(Client,{send_rpc, SimpleXml, Timeout}).
+
+
+
+%%----------------------------------------------------------------------
+%% @spec lock(Client, Target) -> Result
+%% @equiv lock(Client, Target, infinity)
+lock(Client, Target) ->
+    lock(Client, Target,?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec lock(Client, Target, Timeout) -> Result when
+      Client :: client(),
+      Target :: netconf_db(),
+      Timeout :: timeout(),
+      Result :: ok | {error,error_reason()}.
+%% @doc Unlock configuration target.
+%%
+%% Which target parameters that can be used depends on if
+%% `:candidate' and/or `:startup' are supported by the
+%% server. If successfull, the configuration system of the device is
+%% not available to other clients (Netconf, CORBA, SNMP etc). Locks
+%% are intended to be short-lived.
+%%
+%% The operations {@link kill_session/2} or {@link kill_session/3} can
+%% be used to force the release of a lock owned by another Netconf
+%% session. How this is achieved by the server side is implementation
+%% specific.
+%%
+%% @end
+%%----------------------------------------------------------------------
+lock(Client, Target, Timeout) ->
+    call(Client,{send_rpc_op,lock,[Target],Timeout}).
+
+%%----------------------------------------------------------------------
+%% @spec unlock(Client, Target) -> Result
+%% @equiv unlock(Client, Target, infinity)
+unlock(Client, Target) ->
+    unlock(Client, Target,?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec unlock(Client, Target, Timeout) -> Result when
+      Client :: client(),
+      Target :: netconf_db(),
+      Timeout :: timeout(),
+      Result :: ok | {error,error_reason()}.
+%% @doc Unlock configuration target.
+%%
+%% If the client earlier has aquired a lock, via {@link lock/2} or
+%% {@link lock/3}, this operation release the associated lock.  To be
+%% able to access another target than `running', the server must
+%% support `:candidate' and/or `:startup'.
+%%
+%% @end
+%%----------------------------------------------------------------------
+unlock(Client, Target, Timeout) ->
+    call(Client, {send_rpc_op, unlock, [Target], Timeout}).
+
+%%----------------------------------------------------------------------
+%% @spec get(Client, Filter) -> Result
+%% @equiv get(Client, Filter, infinity)
+get(Client, Filter) ->
+    get(Client, Filter, ?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec get(Client, Filter, Timeout) -> Result when
+      Client :: client(),
+      Filter :: simple_xml() | xpath(),
+      Timeout :: timeout(),
+      Result :: {ok,simple_xml()} | {error,error_reason()}.
+%% @doc Get data.
+%%
+%% This operation returns both configuration and state data from the
+%% server.
+%%
+%% Filter type `xpath' can only be used if the server supports
+%% `:xpath'.
+%%
+%% @end
+%%----------------------------------------------------------------------
+get(Client, Filter, Timeout) ->
+    call(Client,{send_rpc_op, get, [Filter], Timeout}).
+
+%%----------------------------------------------------------------------
+%% @spec get_config(Client, Source, Filter) -> Result
+%% @equiv get_config(Client, Source, Filter, infinity)
+get_config(Client, Source, Filter) ->
+    get_config(Client, Source, Filter, ?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec get_config(Client, Source, Filter, Timeout) -> Result when
+      Client :: client(),
+      Source :: netconf_db(),
+      Filter :: simple_xml() | xpath(),
+      Timeout :: timeout(),
+      Result :: {ok,simple_xml()} | {error,error_reason()}.
+%% @doc Get configuration data.
+%%
+%% To be able to access another source than `running', the server
+%% must advertise `:candidate' and/or `:startup'.
+%%
+%% Filter type `xpath' can only be used if the server supports
+%% `:xpath'.
+%%
+%%
+%% @end
+%%----------------------------------------------------------------------
+get_config(Client, Source, Filter, Timeout) ->
+    call(Client, {send_rpc_op, get_config, [Source, Filter], Timeout}).
+
+%%----------------------------------------------------------------------
+%% @spec edit_config(Client, Target, Config) -> Result
+%% @equiv edit_config(Client, Target, Config, infinity)
+edit_config(Client, Target, Config) ->
+    edit_config(Client, Target, Config, ?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec edit_config(Client, Target, Config, Timeout) -> Result when
+      Client :: client(),
+      Target :: netconf_db(),
+      Config :: simple_xml(),
+      Timeout :: timeout(),
+      Result :: ok | {error,error_reason()}.
+%% @doc Edit configuration data.
+%%
+%% Per default only the running target is available, unless the server
+%% include `:candidate' or `:startup' in its list of
+%% capabilities.
+%%
+%% @end
+%%----------------------------------------------------------------------
+edit_config(Client, Target, Config, Timeout) ->
+    call(Client, {send_rpc_op, edit_config, [Target,Config], Timeout}).
+
+
+%%----------------------------------------------------------------------
+%% @spec delete_config(Client, Target) -> Result
+%% @equiv delete_config(Client, Target, infinity)
+delete_config(Client, Target) ->
+    delete_config(Client, Target, ?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec delete_config(Client, Target, Timeout) -> Result when
+      Client :: client(),
+      Target :: startup | candidate,
+      Timeout :: timeout(),
+      Result :: ok | {error,error_reason()}.
+%% @doc Delete configuration data.
+%%
+%% The running configuration cannot be deleted and `:candidate'
+%% or `:startup' must be advertised by the server.
+%%
+%% @end
+%%----------------------------------------------------------------------
+delete_config(Client, Target, Timeout) when Target == startup;
+					    Target == candidate ->
+    call(Client,{send_rpc_op, delete_config, [Target], Timeout}).
+
+%%----------------------------------------------------------------------
+%% @spec copy_config(Client, Source, Target) -> Result
+%% @equiv copy_config(Client, Source, Target, infinity)
+copy_config(Client, Source, Target) ->
+    copy_config(Client, Source, Target, ?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec copy_config(Client, Target, Source, Timeout) -> Result when
+      Client :: client(),
+      Target :: netconf_db(),
+      Source :: netconf_db(),
+      Timeout :: timeout(),
+      Result :: ok | {error,error_reason()}.
+%% @doc Copy configuration data.
+%%
+%% Which source and target options that can be issued depends on the
+%% capabilities supported by the server. I.e. `:candidate' and/or
+%% `:startup' are required.
+%%
+%% @end
+%%----------------------------------------------------------------------
+copy_config(Client, Target, Source, Timeout) ->
+    call(Client,{send_rpc_op, copy_config, [Target, Source], Timeout}).
+
+%%----------------------------------------------------------------------
+%% @spec action(Client, Action) -> Result
+%% @equiv action(Client, Action, infinity)
+action(Client,Action) ->
+    action(Client,Action,?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec action(Client, Action, Timeout) -> Result when
+      Client :: client(),
+      Action :: simple_xml(),
+      Timeout :: timeout(),
+      Result :: {ok,simple_xml()} | {error,error_reason()}.
+%% @doc Execute an action.
+%%
+%% @end
+%%----------------------------------------------------------------------
+action(Client,Action,Timeout) ->
+    call(Client,{send_rpc_op, action, [Action], Timeout}).
+
+%%----------------------------------------------------------------------
+create_subscription(Client) ->
+    create_subscription(Client,?DEFAULT_STREAM,?DEFAULT_TIMEOUT).
+
+create_subscription(Client,Timeout)
+  when ?is_timeout(Timeout) ->
+    create_subscription(Client,?DEFAULT_STREAM,Timeout);
+create_subscription(Client,Stream)
+  when is_list(Stream) ->
+    create_subscription(Client,Stream,?DEFAULT_TIMEOUT);
+create_subscription(Client,Filter)
+  when ?is_filter(Filter) ->
+    create_subscription(Client,?DEFAULT_STREAM,Filter,
+			?DEFAULT_TIMEOUT).
+
+create_subscription(Client,Stream,Timeout)
+  when is_list(Stream) andalso
+       ?is_timeout(Timeout) ->
+    call(Client,{send_rpc_op,{create_subscription,self()},
+		 [Stream,undefined,undefined,undefined],
+		 Timeout});
+create_subscription(Client,StartTime,StopTime)
+  when is_list(StartTime) andalso
+       is_list(StopTime) ->
+    create_subscription(Client,?DEFAULT_STREAM,StartTime,StopTime,
+			?DEFAULT_TIMEOUT);
+create_subscription(Client,Filter,Timeout)
+  when ?is_filter(Filter) andalso
+       ?is_timeout(Timeout) ->
+    create_subscription(Client,?DEFAULT_STREAM,Filter,Timeout);
+create_subscription(Client,Stream,Filter)
+  when is_list(Stream) andalso
+       ?is_filter(Filter) ->
+    create_subscription(Client,Stream,Filter,?DEFAULT_TIMEOUT).
+
+create_subscription(Client,StartTime,StopTime,Timeout)
+  when is_list(StartTime) andalso
+       is_list(StopTime) andalso
+       ?is_timeout(Timeout) ->
+    create_subscription(Client,?DEFAULT_STREAM,StartTime,StopTime,Timeout);
+create_subscription(Client,Stream,StartTime,StopTime)
+  when is_list(Stream) andalso
+       is_list(StartTime) andalso
+       is_list(StopTime) ->
+    create_subscription(Client,Stream,StartTime,StopTime,?DEFAULT_TIMEOUT);
+create_subscription(Client,Filter,StartTime,StopTime)
+  when ?is_filter(Filter) andalso
+       is_list(StartTime) andalso
+       is_list(StopTime) ->
+    create_subscription(Client,?DEFAULT_STREAM,Filter,
+			StartTime,StopTime,?DEFAULT_TIMEOUT);
+create_subscription(Client,Stream,Filter,Timeout)
+  when is_list(Stream) andalso
+       ?is_filter(Filter) andalso
+       ?is_timeout(Timeout) ->
+    call(Client,{send_rpc_op,{create_subscription,self()},
+		 [Stream,Filter,undefined,undefined],
+		 Timeout}).
+
+create_subscription(Client,Stream,StartTime,StopTime,Timeout)
+  when is_list(Stream) andalso
+       is_list(StartTime) andalso
+       is_list(StopTime) andalso
+       ?is_timeout(Timeout) ->
+    call(Client,{send_rpc_op,{create_subscription,self()},
+		 [Stream,undefined,StartTime,StopTime],
+		 Timeout});
+create_subscription(Client,Stream,Filter,StartTime,StopTime)
+  when is_list(Stream) andalso
+       ?is_filter(Filter) andalso
+       is_list(StartTime) andalso
+       is_list(StopTime) ->
+    create_subscription(Client,Stream,Filter,StartTime,StopTime,?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec create_subscription(Client, Stream, Filter,StartTime, StopTime, Timeout) ->
+				 Result when
+      Client :: client(),
+      Stream :: stream_name(),
+      Filter :: simple_xml(),
+      StartTime :: xs_datetime(),
+      StopTime :: xs_datetime(),
+      Timeout :: timeout(),
+      Result :: ok | {error,error_reason()}.
+%% @doc Create a subscription for event notifications.
+%%
+%% This function sets up a subscription for netconf event
+%% notifications of the given stream type, matching the given
+%% filter. The calling process will receive notifications as messages
+%% of type `notification()'.
+%%
+%% <dl>
+%%   <dt>Stream:</dt>
+%%   <dd> An optional parameter that indicates which stream of events
+%%   is of interest.  If not present, events in the default NETCONF
+%%   stream will be sent.</dd>
+%%
+%%   <dt>Filter:</dt>
+%%   <dd>An optional parameter that indicates which subset of all
+%%   possible events is of interest.  The format of this parameter is
+%%   the same as that of the filter parameter in the NETCONF protocol
+%%   operations.  If not present, all events not precluded by other
+%%   parameters will be sent.  See section 3.6 for more information on
+%%   filters.</dd>
+%%
+%%   <dt>StartTime:</dt>
+%%   <dd>An optional parameter used to trigger the replay feature and
+%%   indicate that the replay should start at the time specified.  If
+%%   `StartTime' is not present, this is not a replay subscription.
+%%   It is not valid to specify start times that are later than the
+%%   current time.  If the `StartTime' specified is earlier than the
+%%   log can support, the replay will begin with the earliest
+%%   available notification.  This parameter is of type dateTime and
+%%   compliant to [RFC3339].  Implementations must support time
+%%   zones.</dd>
+%%
+%%   <dt>StopTime:</dt>
+%%   <dd>An optional parameter used with the optional replay feature
+%%   to indicate the newest notifications of interest.  If `StopTime'
+%%   is not present, the notifications will continue until the
+%%   subscription is terminated.  Must be used with and be later than
+%%   `StartTime'.  Values of `StopTime' in the future are valid.  This
+%%   parameter is of type dateTime and compliant to [RFC3339].
+%%   Implementations must support time zones.</dd>
+%% </dl>
+%%
+%% See RFC5277 for further details about the event notification
+%% mechanism.
+%%
+%% @end
+%%----------------------------------------------------------------------
+create_subscription(Client,Stream,Filter,StartTime,StopTime,Timeout) ->
+    call(Client,{send_rpc_op,{create_subscription, self()},
+		 [Stream,Filter,StartTime,StopTime],
+		 Timeout}).
+
+%%----------------------------------------------------------------------
+%% @spec get_event_streams(Client, Timeout) -> Result
+%% @equiv get_event_streams(Client, [], Timeout)
+get_event_streams(Client,Timeout) when is_integer(Timeout); Timeout==infinity ->
+    get_event_streams(Client,[],Timeout);
+
+%%----------------------------------------------------------------------
+%% @spec get_event_streams(Client, Streams) -> Result
+%% @equiv get_event_streams(Client, Streams, infinity)
+get_event_streams(Client,Streams) when is_list(Streams) ->
+    get_event_streams(Client,Streams,?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec get_event_streams(Client, Streams, Timeout)
+		       -> Result when
+      Client :: client(),
+      Streams :: [stream_name()],
+      Timeout :: timeout(),
+      Result :: {ok,streams()} | {error,error_reason()}.
+%% @doc Send a request to get the given event streams.
+%%
+%% `Streams' is a list of stream names. The following filter will
+%% be sent to the netconf server in a `get' request:
+%%
+%% ```
+%% <netconf xmlns="urn:ietf:params:xml:ns:netmod:notification">
+%%   <streams>
+%%     <stream>
+%%       <name>StreamName1</name>
+%%     </stream>
+%%     <stream>
+%%       <name>StreamName2</name>
+%%     </stream>
+%%     ...
+%%   </streams>
+%% </netconf>
+%% '''
+%%
+%% If `Streams' is an empty list, ALL streams will be requested
+%% by sending the following filter:
+%%
+%% ```
+%% <netconf xmlns="urn:ietf:params:xml:ns:netmod:notification">
+%%   <streams/>
+%% </netconf>
+%% '''
+%%
+%% If more complex filtering is needed, a use {@link get/2} or {@link
+%% get/3} and specify the exact filter according to XML Schema for
+%% Event Notifications found in RFC5277.
+%%
+%% @end
+%%----------------------------------------------------------------------
+get_event_streams(Client,Streams,Timeout) ->
+    call(Client,{get_event_streams,Streams,Timeout}).
+
+
+%%----------------------------------------------------------------------
+%% @spec close_session(Client) -> Result
+%% @equiv close_session(Client, infinity)
+close_session(Client) ->
+    close_session(Client, ?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec close_session(Client, Timeout) -> Result when
+      Client :: client(),
+      Timeout :: timeout(),
+      Result :: ok | {error,error_reason()}.
+%% @doc Request graceful termination of the session associated with the client.
+%%
+%% When a netconf server receives a `close-session' request, it
+%% will gracefully close the session.  The server will release any
+%% locks and resources associated with the session and gracefully
+%% close any associated connections.  Any NETCONF requests received
+%% after a `close-session' request will be ignored.
+%%
+%% @end
+%%----------------------------------------------------------------------
+close_session(Client, Timeout) ->
+    call(Client,{send_rpc_op, close_session, [], Timeout}, true).
+
+
+%%----------------------------------------------------------------------
+%% @spec kill_session(Client, SessionId) -> Result
+%% @equiv kill_session(Client, SessionId, infinity)
+kill_session(Client, SessionId) ->
+    kill_session(Client, SessionId, ?DEFAULT_TIMEOUT).
+
+%%----------------------------------------------------------------------
+-spec kill_session(Client, SessionId, Timeout) -> Result when
+      Client :: client(),
+      SessionId :: pos_integer(),
+      Timeout :: timeout(),
+      Result :: ok | {error,error_reason()}.
+%% @doc Force termination of the session associated with the supplied
+%% session id.
+%%
+%% The server side shall abort any operations currently in process,
+%% release any locks and resources associated with the session, and
+%% close any associated connections.
+%%
+%% Only if the server is in the confirmed commit phase, the
+%% configuration will be restored to its state before entering the
+%% confirmed commit phase. Otherwise, no configuration roll back will
+%% be performed.
+%%
+%% If the given `SessionId' is equal to the current session id,
+%% an error will be returned.
+%%
+%% @end
+%% ----------------------------------------------------------------------
+kill_session(Client, SessionId, Timeout) ->
+    call(Client,{send_rpc_op, kill_session, [SessionId], Timeout}).
+
+
+%%----------------------------------------------------------------------
+%% Callback functions
+%%----------------------------------------------------------------------
+
+%% @private
+init(_KeyOrName,{_Host,_Port},Options) ->
+    case ssh_open(Options) of
+	{ok, Connection} ->
+	    log(Connection,open),
+	    {ConnPid,_} = Connection#connection.reference,
+	    {ok, ConnPid, #state{connection = Connection}};
+	{error,Reason}->
+	    {error,Reason}
+    end.
+
+%% @private
+terminate(_, #state{connection=Connection}) ->
+    ssh_close(Connection),
+    log(Connection,close),
+    ok.
+
+%% @private
+handle_msg({hello,Timeout}, From,
+	   #state{connection=Connection,hello_status=HelloStatus} = State) ->
+    case do_send(Connection, client_hello()) of
+	ok ->
+	    case HelloStatus of
+		undefined ->
+		    {Ref,TRef} = set_request_timer(Timeout),
+		    {noreply, State#state{hello_status=#pending{tref=TRef,
+								ref=Ref,
+								caller=From}}};
+		received ->
+		    {reply, ok, State#state{hello_status=done}};
+		{error,Reason} ->
+		    {stop, {error,Reason}, State}
+	    end;
+	Error ->
+	    {stop, Error, State}
+    end;
+handle_msg(_, _From, #state{session_id=undefined} = State) ->
+    %% Hello is not yet excanged - this shall never happen
+    {reply,{error,waiting_for_hello},State};
+handle_msg(get_capabilities, _From, #state{capabilities = Caps} = State) ->
+    {reply, Caps, State};
+handle_msg(get_session_id, _From, #state{session_id = Id} = State) ->
+    {reply, Id, State};
+handle_msg({send, Timeout, SimpleXml}, From,
+	    #state{connection=Connection,pending=Pending} = State) ->
+    case do_send(Connection, SimpleXml) of
+	ok ->
+	    {Ref,TRef} = set_request_timer(Timeout),
+	    {noreply, State#state{pending=[#pending{tref=TRef,
+						    ref=Ref,
+						    caller=From} | Pending]}};
+	Error ->
+	    {reply, Error, State}
+    end;
+handle_msg({send_rpc, SimpleXml, Timeout}, From, State) ->
+    do_send_rpc(undefined, SimpleXml, Timeout, From, State);
+handle_msg({send_rpc_op, Op, Data, Timeout}, From, State) ->
+    SimpleXml = encode_rpc_operation(Op,Data),
+    do_send_rpc(Op, SimpleXml, Timeout, From, State);
+handle_msg({get_event_streams=Op,Streams,Timeout}, From, State) ->
+    Filter = {netconf,?NETMOD_NOTIF_NAMESPACE_ATTR,
+             [{streams,[{stream,[{name,[Name]}]} || Name <- Streams]}]},
+    SimpleXml = encode_rpc_operation(get,[Filter]),
+    do_send_rpc(Op, SimpleXml, Timeout, From, State).
+
+handle_msg({ssh_cm, _CM, {data, _Ch, _Type, Data}}, State) ->
+    handle_data(Data, State);
+handle_msg({ssh_cm, _CM, _SshCloseMsg}, State) ->
+    %% _SshCloseMsg can probably be one of
+    %% {eof,Ch}
+    %% {exit_status,Ch,Status}
+    %% {exit_signal,Ch,ExitSignal,ErrorMsg,LanguageString}
+    %% {signal,Ch,Signal}
+
+    %% This might e.g. happen if the server terminates the connection,
+    %% as in kill-session (or if ssh:close is called from somewhere
+    %% unexpected).
+
+    %%! Log this??
+    %%! Currently the log will say that the client closed the
+    %%! connection - due to terminate/2
+
+    {stop, State};
+handle_msg({Ref,timeout},
+	   #state{hello_status=#pending{ref=Ref,caller=Caller}} = State) ->
+    ct_gen_conn:return(Caller,{error,{hello_session_failed,timeout}}),
+    {stop,State#state{hello_status={error,timeout}}};
+handle_msg({Ref,timeout},#state{pending=Pending} = State) ->
+    {value,#pending{caller=Caller},Pending1} =
+	lists:keytake(Ref,#pending.ref,Pending),
+    ct_gen_conn:return(Caller,{error,timeout}),
+    {noreply,State#state{pending=Pending1}}.
+
+%% @private
+%% Called by ct_util_server to close registered connections before terminate.
+close(Client) ->
+    case get_handle(Client) of
+	{ok,Pid} ->
+	    case ct_gen_conn:stop(Pid) of
+		{error,{process_down,Pid,noproc}} ->
+		    {error,already_closed};
+		Result ->
+		    Result
+	    end;
+	Error ->
+	    Error
+    end.
+
+
+%%----------------------------------------------------------------------
+%% Internal functions
+%%----------------------------------------------------------------------
+call(Client, Msg) ->
+    call(Client, Msg, infinity, false).
+call(Client, Msg, Timeout) when is_integer(Timeout); Timeout==infinity ->
+    call(Client, Msg, Timeout, false);
+call(Client, Msg, WaitStop) when is_boolean(WaitStop) ->
+    call(Client, Msg, infinity, WaitStop).
+call(Client, Msg, Timeout, WaitStop) ->
+    case get_handle(Client) of
+	{ok,Pid} ->
+	    case ct_gen_conn:call(Pid,Msg,Timeout) of
+		{error,{process_down,Pid,noproc}} ->
+		    {error,no_such_client};
+		{error,{process_down,Pid,normal}} when WaitStop ->
+		    %% This will happen when server closes connection
+		    %% before clien received rpc-reply on
+		    %% close-session.
+		    ok;
+		{error,{process_down,Pid,normal}} ->
+		    {error,closed};
+		{error,{process_down,Pid,Reason}} ->
+		    {error,{closed,Reason}};
+		Other when WaitStop ->
+		    MRef = erlang:monitor(process,Pid),
+		    receive
+			{'DOWN',MRef,process,Pid,Normal} when Normal==normal;
+							      Normal==noproc ->
+			    Other;
+			{'DOWN',MRef,process,Pid,Reason} ->
+			    {error,{{closed,Reason},Other}}
+		    after Timeout ->
+			    erlang:demonitor(MRef, [flush]),
+			    {error,{timeout,Other}}
+		    end;
+		Other ->
+		    Other
+	    end;
+	Error ->
+	    Error
+    end.
+
+get_handle(Client) when is_pid(Client) ->
+    {ok,Client};
+get_handle(Client) ->
+    case ct_util:get_connections(Client, ?MODULE) of
+	{ok,[{Pid,_}]} ->
+	    {ok,Pid};
+	{ok,[]} ->
+	    {error,{no_connection_found,Client}};
+	{ok,Conns} ->
+	    {error,{multiple_connections_found,Client,Conns}};
+	Error ->
+	    Error
+    end.
+
+check_options([], undefined, _Port, _Options) ->
+    {error, no_host_address};
+check_options([], _Host, undefined, _Options) ->
+    {error, no_port};
+check_options([], Host, Port, Options) ->
+    {Host,Port,Options};
+check_options([{ssh, Host}|T], _, Port, #options{} = Options) ->
+    check_options(T, Host, Port, Options#options{host=Host});
+check_options([{port,Port}|T], Host, _, #options{} = Options) ->
+    check_options(T, Host, Port, Options#options{port=Port});
+check_options([{timeout, Timeout}|T], Host, Port, Options)
+  when is_integer(Timeout); Timeout==infinity ->
+    check_options(T, Host, Port, Options#options{timeout = Timeout});
+check_options([{X,_}=Opt|T], Host, Port, #options{ssh=SshOpts}=Options) ->
+    case lists:member(X,?VALID_SSH_OPTS) of
+	true ->
+	    check_options(T, Host, Port, Options#options{ssh=[Opt|SshOpts]});
+	false ->
+	    {error, {invalid_option, Opt}}
+    end.
+
+%%%-----------------------------------------------------------------
+set_request_timer(infinity) ->
+    {undefined,undefined};
+set_request_timer(T) ->
+    Ref = make_ref(),
+    {ok,TRef} = timer:send_after(T,{Ref,timeout}),
+    {Ref,TRef}.
+
+
+%%%-----------------------------------------------------------------
+client_hello() ->
+    {hello, ?NETCONF_NAMESPACE_ATTR,
+     [{capabilities,
+       [{capability,[?NETCONF_BASE_CAP++?NETCONF_BASE_CAP_VSN]}]}]}.
+
+%%%-----------------------------------------------------------------
+
+encode_rpc_operation(Lock,[Target]) when Lock==lock; Lock==unlock ->
+    {Lock,[{target,[Target]}]};
+encode_rpc_operation(get,[Filter]) ->
+    {get,filter(Filter)};
+encode_rpc_operation(get_config,[Source,Filter]) ->
+    {'get-config',[{source,[Source]}] ++ filter(Filter)};
+encode_rpc_operation(edit_config,[Target,Config]) ->
+    {'edit-config',[{target,[Target]},{config,[Config]}]};
+encode_rpc_operation(delete_config,[Target]) ->
+    {'delete-config',[{target,[Target]}]};
+encode_rpc_operation(copy_config,[Target,Source]) ->
+    {'copy-config',[{target,[Target]},{source,[Source]}]};
+encode_rpc_operation(action,[Action]) ->
+    {action,?ACTION_NAMESPACE_ATTR,[{data,[Action]}]};
+encode_rpc_operation(kill_session,[SessionId]) ->
+    {'kill-session',[{'session-id',[integer_to_list(SessionId)]}]};
+encode_rpc_operation(close_session,[]) ->
+    'close-session';
+encode_rpc_operation({create_subscription,_},
+		     [Stream,Filter,StartTime,StopTime]) ->
+    {'create-subscription',?NETCONF_NOTIF_NAMESPACE_ATTR,
+     [{stream,[Stream]}] ++
+	 filter(Filter) ++
+	 maybe_element(startTime,StartTime) ++
+	 maybe_element(stopTime,StopTime)}.
+
+filter(undefined) ->
+    [];
+filter({xpath,Filter}) when ?is_string(Filter) ->
+    [{filter,[{type,"xpath"},{select, Filter}],[]}];
+filter(Filter) ->
+    [{filter,[{type,"subtree"}],[Filter]}].
+
+maybe_element(_,undefined) ->
+    [];
+maybe_element(Tag,Value) ->
+    [{Tag,[Value]}].
+
+%%%-----------------------------------------------------------------
+%%% Send XML data to server
+do_send_rpc(PendingOp,SimpleXml,Timeout,Caller,
+	    #state{connection=Connection,msg_id=MsgId,pending=Pending} = State) ->
+    case do_send_rpc(Connection, MsgId, SimpleXml) of
+	ok ->
+	    {Ref,TRef} = set_request_timer(Timeout),
+	    {noreply, State#state{msg_id=MsgId+1,
+				  pending=[#pending{tref=TRef,
+						    ref=Ref,
+						    msg_id=MsgId,
+						    op=PendingOp,
+						    caller=Caller} | Pending]}};
+	Error ->
+	    {reply, Error, State#state{msg_id=MsgId+1}}
+    end.
+
+do_send_rpc(Connection, MsgId, SimpleXml) ->
+    do_send(Connection,
+	    {rpc,
+	     [{'message-id',MsgId} | ?NETCONF_NAMESPACE_ATTR],
+	     [SimpleXml]}).
+
+do_send(Connection, SimpleXml) ->
+    Xml=to_xml_doc(SimpleXml),
+    log(Connection,send,Xml),
+    ssh_send(Connection, Xml).
+
+to_xml_doc(Simple) ->
+    Prolog = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
+    Xml = list_to_binary(xmerl:export_simple([Simple],
+					     xmerl_xml,
+					     [#xmlAttribute{name=prolog,
+							    value=Prolog}])),
+    <<Xml/binary,?END_TAG/binary>>.
+
+%%%-----------------------------------------------------------------
+%%% Parse and handle received XML data
+handle_data(NewData,#state{connection=Connection,buff=Buff} = State) ->
+    log(Connection,recv,NewData),
+    Data = <<Buff/binary,NewData/binary>>,
+    case xmerl_sax_parser:stream(<<>>,
+				 [{continuation_fun,fun sax_cont/1},
+				  {continuation_state,{Data,Connection,false}},
+				  {event_fun,fun sax_event/3},
+				  {event_state,[]}]) of
+	{ok, Simple, Rest} ->
+	    decode(Simple,State#state{buff=Rest});
+	{fatal_error,_Loc,Reason,_EndTags,_EventState} ->
+	    ?error(Connection#connection.name,[{parse_error,Reason},
+					       {data,Data}]),
+	    case Reason of
+		{could_not_fetch_data,Msg} ->
+		    handle_msg(Msg,State#state{buff = <<>>});
+		_Other ->
+		    Pending1 =
+			case State#state.pending of
+			    [] ->
+				[];
+			    Pending ->
+				%% Assuming the first request gets the
+				%% first answer
+				P=#pending{tref=TRef,caller=Caller} =
+				    lists:last(Pending),
+				timer:cancel(TRef),
+				Reason1 = {failed_to_parse_received_data,Reason},
+				ct_gen_conn:return(Caller,{error,Reason1}),
+				lists:delete(P,Pending)
+			end,
+		    {noreply,State#state{pending=Pending1,buff = <<>>}}
+	    end
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Parsing of XML data
+%% Contiuation function for the sax parser
+sax_cont(done) ->
+    {<<>>,done};
+sax_cont({Data,Connection,false}) ->
+    case binary:split(Data,[?END_TAG],[]) of
+	[All] ->
+	    %% No end tag found. Remove what could be a part
+	    %% of an end tag from the data and save for next
+	    %% iteration
+	    SafeSize = size(All)-5,
+	    <<New:SafeSize/binary,Save:5/binary>> = All,
+	    {New,{Save,Connection,true}};
+	[_Msg,_Rest]=Msgs ->
+	    %% We have at least one full message. Any excess data will
+	    %% be returned from xmerl_sax_parser:stream/2 in the Rest
+	    %% parameter.
+	    {list_to_binary(Msgs),done}
+    end;
+sax_cont({Data,Connection,true}) ->
+    case ssh_receive_data() of
+	{ok,Bin} ->
+	    log(Connection,recv,Bin),
+	    sax_cont({<<Data/binary,Bin/binary>>,Connection,false});
+	{error,Reason} ->
+	    throw({could_not_fetch_data,Reason})
+    end.
+
+
+
+%% Event function for the sax parser. It builds a simple XML structure.
+%% Care is taken to keep namespace attributes and prefixes as in the original XML.
+sax_event(Event,_Loc,State) ->
+    sax_event(Event,State).
+
+sax_event({startPrefixMapping, Prefix, Uri},Acc) ->
+    %% startPrefixMapping will always come immediately before the
+    %% startElement where the namespace is defined.
+    [{xmlns,{Prefix,Uri}}|Acc];
+sax_event({startElement,_Uri,_Name,QN,Attrs},Acc) ->
+    %% Pick out any namespace attributes inserted due to a
+    %% startPrefixMapping event.The rest of Acc will then be only
+    %% elements.
+    {NsAttrs,NewAcc} = split_attrs_and_elements(Acc,[]),
+    Tag = qn_to_tag(QN),
+    [{Tag,NsAttrs ++ parse_attrs(Attrs),[]}|NewAcc];
+sax_event({endElement,_Uri,_Name,_QN},[{Name,Attrs,Cont},{Parent,PA,PC}|Acc]) ->
+    [{Parent,PA,[{Name,Attrs,lists:reverse(Cont)}|PC]}|Acc];
+sax_event(endDocument,[{Tag,Attrs,Cont}]) ->
+    {Tag,Attrs,lists:reverse(Cont)};
+sax_event({characters,String},[{Name,Attrs,Cont}|Acc]) ->
+    [{Name,Attrs,[String|Cont]}|Acc];
+sax_event(_Event,State) ->
+    State.
+
+split_attrs_and_elements([{xmlns,{Prefix,Uri}}|Rest],Attrs) ->
+    split_attrs_and_elements(Rest,[{xmlnstag(Prefix),Uri}|Attrs]);
+split_attrs_and_elements(Elements,Attrs) ->
+    {Attrs,Elements}.
+
+xmlnstag([]) ->
+    xmlns;
+xmlnstag(Prefix) ->
+    list_to_atom("xmlns:"++Prefix).
+
+qn_to_tag({[],Name}) ->
+    list_to_atom(Name);
+qn_to_tag({Prefix,Name}) ->
+    list_to_atom(Prefix ++ ":" ++ Name).
+
+parse_attrs([{_Uri, [], Name, Value}|Attrs]) ->
+    [{list_to_atom(Name),Value}|parse_attrs(Attrs)];
+parse_attrs([{_Uri, Prefix, Name, Value}|Attrs]) ->
+    [{list_to_atom(Prefix ++ ":" ++ Name),Value}|parse_attrs(Attrs)];
+parse_attrs([]) ->
+    [].
+
+
+%%%-----------------------------------------------------------------
+%%% Decoding of parsed XML data
+decode({Tag,Attrs,_}=E, #state{connection=Connection,pending=Pending}=State) ->
+    ConnName = Connection#connection.name,
+    case get_local_name_atom(Tag) of
+	'rpc-reply' ->
+	    case get_msg_id(Attrs) of
+		undefined ->
+		    case Pending of
+			[#pending{msg_id=MsgId}] ->
+			    ?error(ConnName,[{warning,rpc_reply_missing_msg_id},
+					       {assuming,MsgId}]),
+			    decode_rpc_reply(MsgId,E,State);
+			_ ->
+			    ?error(ConnName,[{error,rpc_reply_missing_msg_id}]),
+			    {noreply,State}
+		    end;
+		MsgId ->
+		    decode_rpc_reply(MsgId,E,State)
+	    end;
+	hello ->
+	    case State#state.hello_status of
+		undefined ->
+		    case decode_hello(E) of
+			{ok,SessionId,Capabilities} ->
+			    {noreply,State#state{session_id = SessionId,
+						 capabilities = Capabilities,
+						 hello_status = received}};
+			{error,Reason} ->
+			    {noreply,State#state{hello_status = {error,Reason}}}
+		    end;
+		#pending{tref=TRef,caller=Caller} ->
+		    timer:cancel(TRef),
+		    case decode_hello(E) of
+			{ok,SessionId,Capabilities} ->
+			    ct_gen_conn:return(Caller,ok),
+			    {noreply,State#state{session_id = SessionId,
+						 capabilities = Capabilities,
+						 hello_status = done}};
+			{error,Reason} ->
+			    ct_gen_conn:return(Caller,{error,Reason}),
+			    {stop,State#state{hello_status={error,Reason}}}
+		    end;
+		Other ->
+		    ?error(ConnName,[{got_unexpected_hello,E},
+				       {hello_status,Other}]),
+		    {noreply,State}
+	    end;
+	notification ->
+	    EventReceiver = State#state.event_receiver,
+	    EventReceiver ! E,
+	    {noreply,State};
+	Other ->
+	    %% Result of send/2, when not sending an rpc request - or
+	    %% if netconf server sends noise. Can handle this only if
+	    %% there is just one pending that matches (i.e. has
+	    %% undefined msg_id and op)
+	    case [P || P = #pending{msg_id=undefined,op=undefined} <- Pending] of
+		[#pending{tref=TRef,
+			  caller=Caller}] ->
+		    timer:cancel(TRef),
+		    ct_gen_conn:return(Caller,E),
+		    {noreply,State#state{pending=[]}};
+		_ ->
+		    ?error(ConnName,[{got_unexpected_msg,Other},
+				       {expecting,Pending}]),
+		    {noreply,State}
+	    end
+
+    end.
+
+get_msg_id(Attrs) ->
+    case lists:keyfind('message-id',1,Attrs) of
+	{_,Str} ->
+	    list_to_integer(Str);
+	false ->
+	    undefined
+    end.
+
+decode_rpc_reply(MsgId,{_,Attrs,Content0}=E,#state{pending=Pending} = State) ->
+    case lists:keytake(MsgId,#pending.msg_id,Pending) of
+	{value, #pending{tref=TRef,op=Op,caller=Caller}, Pending1} ->
+	    timer:cancel(TRef),
+	    Content = forward_xmlns_attr(Attrs,Content0),
+	    {CallerReply,{ServerReply,State2}} =
+		do_decode_rpc_reply(Op,Content,State#state{pending=Pending1}),
+	    ct_gen_conn:return(Caller,CallerReply),
+	    {ServerReply,State2};
+	false ->
+	    %% Result of send/2, when receiving a correct
+	    %% rpc-reply. Can handle this only if there is just one
+	    %% pending that matches (i.e. has undefined msg_id and op)
+	    case [P || P = #pending{msg_id=undefined,op=undefined} <- Pending] of
+		[#pending{tref=TRef,
+			  msg_id=undefined,
+			  op=undefined,
+			  caller=Caller}] ->
+		    timer:cancel(TRef),
+		    ct_gen_conn:return(Caller,E),
+		    {noreply,State#state{pending=[]}};
+		_ ->
+		    ConnName = (State#state.connection)#connection.name,
+		    ?error(ConnName,[{got_unexpected_msg_id,MsgId},
+						   {expecting,Pending}]),
+		    {noreply,State}
+	    end
+    end.
+
+do_decode_rpc_reply(Op,Result,State)
+  when Op==lock; Op==unlock; Op==edit_config; Op==delete_config;
+       Op==copy_config; Op==kill_session ->
+    {decode_ok(Result),{noreply,State}};
+do_decode_rpc_reply(Op,Result,State)
+  when Op==get; Op==get_config; Op==action ->
+    {decode_data(Result),{noreply,State}};
+do_decode_rpc_reply(close_session,Result,State) ->
+    case decode_ok(Result) of
+	ok -> {ok,{stop,State}};
+	Other -> {Other,{noreply,State}}
+    end;
+do_decode_rpc_reply({create_subscription,Caller},Result,State) ->
+    case decode_ok(Result) of
+	ok ->
+	    {ok,{noreply,State#state{event_receiver=Caller}}};
+	Other ->
+	    {Other,{noreply,State}}
+    end;
+do_decode_rpc_reply(get_event_streams,Result,State) ->
+    {decode_streams(decode_data(Result)),{noreply,State}};
+do_decode_rpc_reply(undefined,Result,State) ->
+    {Result,{noreply,State}}.
+
+
+
+decode_ok([{Tag,Attrs,Content}]) ->
+    case get_local_name_atom(Tag) of
+	ok ->
+	    ok;
+	'rpc-error' ->
+	    {error,forward_xmlns_attr(Attrs,Content)};
+	_Other ->
+	    {error,{unexpected_rpc_reply,[{Tag,Attrs,Content}]}}
+    end;
+decode_ok(Other) ->
+    {error,{unexpected_rpc_reply,Other}}.
+
+decode_data([{Tag,Attrs,Content}]) ->
+    case get_local_name_atom(Tag) of
+	data ->
+	    %% Since content of data has nothing from the netconf
+	    %% namespace, we remove the parent's xmlns attribute here
+	    %% - just to make the result cleaner
+	    {ok,forward_xmlns_attr(remove_xmlnsattr_for_tag(Tag,Attrs),Content)};
+	'rpc-error' ->
+	    {error,forward_xmlns_attr(Attrs,Content)};
+	_Other ->
+	    {error,{unexpected_rpc_reply,[{Tag,Attrs,Content}]}}
+    end;
+decode_data(Other) ->
+    {error,{unexpected_rpc_reply,Other}}.
+
+get_qualified_name(Tag) ->
+    case string:tokens(atom_to_list(Tag),":") of
+	[TagStr] -> {[],TagStr};
+	[PrefixStr,TagStr] -> {PrefixStr,TagStr}
+    end.
+
+get_local_name_atom(Tag) ->
+    {_,TagStr} = get_qualified_name(Tag),
+    list_to_atom(TagStr).
+
+
+%% Remove the xmlns attr that points to the tag. I.e. if the tag has a
+%% prefix, remove {'xmlns:prefix',_}, else remove default {xmlns,_}.
+remove_xmlnsattr_for_tag(Tag,Attrs) ->
+    {Prefix,_TagStr} = get_qualified_name(Tag),
+    XmlnsTag = xmlnstag(Prefix),
+    case lists:keytake(XmlnsTag,1,Attrs) of
+	{value,_,NoNsAttrs} ->
+	    NoNsAttrs;
+	false ->
+	    Attrs
+    end.
+
+%% Take all xmlns attributes from the parent's attribute list and
+%% forward into all childrens' attribute lists. But do not overwrite
+%% any.
+forward_xmlns_attr(ParentAttrs,Children) ->
+    do_forward_xmlns_attr(get_all_xmlns_attrs(ParentAttrs,[]),Children).
+
+do_forward_xmlns_attr(XmlnsAttrs,[{ChT,ChA,ChC}|Children]) ->
+    ChA1 = add_xmlns_attrs(XmlnsAttrs,ChA),
+    [{ChT,ChA1,ChC} | do_forward_xmlns_attr(XmlnsAttrs,Children)];
+do_forward_xmlns_attr(_XmlnsAttrs,[]) ->
+    [].
+
+add_xmlns_attrs([{Key,_}=A|XmlnsAttrs],ChA) ->
+    case lists:keymember(Key,1,ChA) of
+	true ->
+	    add_xmlns_attrs(XmlnsAttrs,ChA);
+	false ->
+	    add_xmlns_attrs(XmlnsAttrs,[A|ChA])
+    end;
+add_xmlns_attrs([],ChA) ->
+    ChA.
+
+get_all_xmlns_attrs([{xmlns,_}=Default|Attrs],XmlnsAttrs) ->
+    get_all_xmlns_attrs(Attrs,[Default|XmlnsAttrs]);
+get_all_xmlns_attrs([{Key,_}=Attr|Attrs],XmlnsAttrs) ->
+    case atom_to_list(Key) of
+	"xmlns:"++_Prefix ->
+	    get_all_xmlns_attrs(Attrs,[Attr|XmlnsAttrs]);
+	_ ->
+	    get_all_xmlns_attrs(Attrs,XmlnsAttrs)
+    end;
+get_all_xmlns_attrs([],XmlnsAttrs) ->
+    XmlnsAttrs.
+
+
+%% Decode server hello to pick out session id and capabilities
+decode_hello({hello,_Attrs,Hello}) ->
+    case lists:keyfind('session-id',1,Hello) of
+	{'session-id',_,[SessionId]} ->
+	    case lists:keyfind(capabilities,1,Hello) of
+		{capabilities,_,Capabilities} ->
+		    case decode_caps(Capabilities,[],false) of
+			{ok,Caps} ->
+			    {ok,list_to_integer(SessionId),Caps};
+			Error ->
+			    Error
+		    end;
+		false ->
+		    {error,{incorrect_hello,capabilities_not_found}}
+	    end;
+	false ->
+	    {error,{incorrect_hello,no_session_id_found}}
+    end.
+
+decode_caps([{capability,[],[?NETCONF_BASE_CAP++Vsn=Cap]} |Caps], Acc, _) ->
+    case Vsn of
+	?NETCONF_BASE_CAP_VSN ->
+	    decode_caps(Caps, [Cap|Acc], true);
+	_ ->
+	    {error,{incompatible_base_capability_vsn,Vsn}}
+    end;
+decode_caps([{capability,[],[Cap]}|Caps],Acc,Base) ->
+    decode_caps(Caps,[Cap|Acc],Base);
+decode_caps([H|_T],_,_) ->
+    {error,{unexpected_capability_element,H}};
+decode_caps([],_,false) ->
+    {error,{incorrect_hello,no_base_capability_found}};
+decode_caps([],Acc,true) ->
+    {ok,lists:reverse(Acc)}.
+
+
+%% Return a list of {Name,Data}, where data is a {Tag,Value} list for each stream
+decode_streams({error,Reason}) ->
+    {error,Reason};
+decode_streams({ok,[{netconf,_,Streams}]}) ->
+    {ok,decode_streams(Streams)};
+decode_streams([{streams,_,Streams}]) ->
+    decode_streams(Streams);
+decode_streams([{stream,_,Stream} | Streams]) ->
+    {name,_,[Name]} = lists:keyfind(name,1,Stream),
+    [{Name,[{Tag,Value} || {Tag,_,[Value]} <- Stream, Tag /= name]}
+     | decode_streams(Streams)];
+decode_streams([]) ->
+    [].
+
+
+%%%-----------------------------------------------------------------
+%%% Logging
+
+log(Connection,Action) ->
+    log(Connection,Action,<<>>).
+log(#connection{host=Host,port=Port,name=Name},Action,Data) ->
+    error_logger:info_report(#conn_log{client=self(),
+				       address={Host,Port},
+				       name=Name,
+				       action=Action,
+				       module=?MODULE},
+			     Data).
+
+
+%% Log callback - called from the error handler process
+format_data(raw,Data) ->
+    io_lib:format("~n~s~n",[hide_password(Data)]);
+format_data(pretty,Data) ->
+    io_lib:format("~n~s~n",[indent(Data)]);
+format_data(html,Data) ->
+    io_lib:format("~n~s~n",[html_format(Data)]).
+
+%%%-----------------------------------------------------------------
+%%% Hide password elements from XML data
+hide_password(Bin) ->
+    re:replace(Bin,<<"(<password[^>]*>)[^<]*(</password>)">>,<<"\\1*****\\2">>,
+	       [global,{return,binary}]).
+
+%%%-----------------------------------------------------------------
+%%% HTML formatting
+html_format(Bin) ->
+    binary:replace(indent(Bin),<<"<">>,<<"&lt;">>,[global]).
+
+%%%-----------------------------------------------------------------
+%%% Indentation of XML code
+indent(Bin) ->
+    String = normalize(hide_password(Bin)),
+    IndentedString =
+	case erase(part_of_line) of
+	    undefined ->
+		indent1(String,[]);
+	    Part ->
+		indent1(lists:reverse(Part)++String,erase(indent))
+	end,
+    list_to_binary(IndentedString).
+
+%% Normalizes the XML document by removing all space and newline
+%% between two XML tags.
+%% Returns a list, no matter if the input was a list or a binary.
+normalize(Str) ->
+    re:replace(Str,<<">[ \r\n\t]+<">>,<<"><">>,[global,{return,list}]).
+
+
+indent1("<?"++Rest1,Indent1) ->
+    %% Prolog
+    {Line,Rest2,Indent2} = indent_line(Rest1,Indent1,[$?,$<]),
+    Line++indent1(Rest2,Indent2);
+indent1("</"++Rest1,Indent1) ->
+    %% Stop tag
+    {Line,Rest2,Indent2} = indent_line1(Rest1,Indent1,[$/,$<]),
+    "\n"++Line++indent1(Rest2,Indent2);
+indent1("<"++Rest1,Indent1) ->
+    %% Start- or empty tag
+    put(tag,get_tag(Rest1)),
+    {Line,Rest2,Indent2} = indent_line(Rest1,Indent1,[$<]),
+    "\n"++Line++indent1(Rest2,Indent2);
+indent1([H|T],Indent) ->
+    [H|indent1(T,Indent)];
+indent1([],_Indent) ->
+    [].
+
+indent_line("?>"++Rest,Indent,Line) ->
+    %% Prolog
+    {lists:reverse(Line)++"?>",Rest,Indent};
+indent_line("/></"++Rest,Indent,Line) ->
+    %% Empty tag, and stop of parent tag -> one step out in indentation
+    {Indent++lists:reverse(Line)++"/>","</"++Rest,Indent--"  "};
+indent_line("/>"++Rest,Indent,Line) ->
+    %% Empty tag, then probably next tag -> keep indentation
+    {Indent++lists:reverse(Line)++"/>",Rest,Indent};
+indent_line("></"++Rest,Indent,Line) ->
+    LastTag = erase(tag),
+    case get_tag(Rest) of
+	LastTag ->
+	    %% Start and stop tag, but no content
+	    indent_line1(Rest,Indent,[$/,$<,$>|Line]);
+	_ ->
+	    %% Stop tag completed, and then stop tag of parent -> one step out
+	    {Indent++lists:reverse(Line)++">","</"++Rest,Indent--"  "}
+    end;
+indent_line("><"++Rest,Indent,Line) ->
+    %% Stop tag completed, and new tag comming -> keep indentation
+    {Indent++lists:reverse(Line)++">","<"++Rest,"  "++Indent};
+indent_line("</"++Rest,Indent,Line) ->
+    %% Stop tag starting -> search for end of this tag
+    indent_line1(Rest,Indent,[$/,$<|Line]);
+indent_line([H|T],Indent,Line) ->
+    indent_line(T,Indent,[H|Line]);
+indent_line([],Indent,Line) ->
+    %% The line is not complete - will be continued later
+    put(part_of_line,Line),
+    put(indent,Indent),
+    {[],[],Indent}.
+
+indent_line1("></"++Rest,Indent,Line) ->
+    %% Stop tag completed, and then stop tag of parent -> one step out
+    {Indent++lists:reverse(Line)++">","</"++Rest,Indent--"  "};
+indent_line1(">"++Rest,Indent,Line) ->
+    %% Stop tag completed -> keep indentation
+    {Indent++lists:reverse(Line)++">",Rest,Indent};
+indent_line1([H|T],Indent,Line) ->
+    indent_line1(T,Indent,[H|Line]);
+indent_line1([],Indent,Line) ->
+    %% The line is not complete - will be continued later
+    put(part_of_line,Line),
+    put(indent,Indent),
+    {[],[],Indent}.
+
+get_tag("/>"++_) ->
+    [];
+get_tag(">"++_) ->
+    [];
+get_tag([H|T]) ->
+    [H|get_tag(T)];
+get_tag([]) ->
+    %% The line is not complete - will be continued later.
+    [].
+
+
+%%%-----------------------------------------------------------------
+%%% SSH stuff
+ssh_receive_data() ->
+    receive
+	{ssh_cm, _CM, {data, _Ch, _Type, Data}} ->
+	    {ok, Data};
+        {ssh_cm, _CM, {Closed, _Ch}} = X when Closed == closed; Closed == eof ->
+            {error,X};
+	{_Ref,timeout} = X ->
+	    {error,X}
+    end.
+
+ssh_open(#options{host=Host,timeout=Timeout,port=Port,ssh=SshOpts,name=Name}) ->
+    case ssh:connect(Host, Port,
+		     [{user_interaction,false},
+		      {silently_accept_hosts, true}|SshOpts]) of
+	{ok,CM} ->
+	    case ssh_connection:session_channel(CM, Timeout) of
+		{ok,Ch} ->
+		    case ssh_connection:subsystem(CM, Ch, "netconf", Timeout) of
+			success ->
+			    {ok, #connection{reference = {CM,Ch},
+					     host = Host,
+					     port = Port,
+					     name = Name}};
+			failure ->
+			    ssh:close(CM),
+			    {error,{ssh,could_not_execute_netconf_subsystem}}
+		    end;
+		{error, Reason} ->
+		    ssh:close(CM),
+		    {error,{ssh,could_not_open_channel,Reason}};
+		Other ->
+		    %% Bug in ssh?? got {closed,0} here once...
+		    {error,{ssh,unexpected_from_session_channel,Other}}
+	    end;
+	{error,Reason} ->
+	    {error,{ssh,could_not_connect_to_server,Reason}}
+    end.
+
+ssh_send(#connection{reference = {CM,Ch}}, Data) ->
+    case ssh_connection:send(CM, Ch, Data) of
+	ok -> ok;
+	{error,Reason} -> {error,{ssh,failed_to_send_data,Reason}}
+    end.
+
+ssh_close(#connection{reference = {CM,_Ch}}) ->
+    ssh:close(CM).
+
+
+%%----------------------------------------------------------------------
+%% END OF MODULE
+%%----------------------------------------------------------------------
diff --git a/lib/common_test/src/ct_netconfc.hrl b/lib/common_test/src/ct_netconfc.hrl
new file mode 100644
index 0000000000..295a61a98b
--- /dev/null
+++ b/lib/common_test/src/ct_netconfc.hrl
@@ -0,0 +1,58 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%----------------------------------------------------------------------
+%% File: ct_netconfc.hrl
+%%
+%% Description:
+%%    This file defines constant values and records used by the
+%%    netconf client ct_netconfc.
+%%
+%% @author Support
+%% @doc Netconf Client Interface.
+%% @end
+%%----------------------------------------------------------------------
+%%----------------------------------------------------------------------
+
+
+%% Default port number (RFC 4742/IANA).
+-define(DEFAULT_PORT, 830).
+
+%% Default timeout to wait for netconf server to reply to a request
+-define(DEFAULT_TIMEOUT, infinity). %% msec
+
+%% Namespaces
+-define(NETCONF_NAMESPACE_ATTR,[{xmlns,?NETCONF_NAMESPACE}]).
+-define(ACTION_NAMESPACE_ATTR,[{xmlns,?ACTION_NAMESPACE}]).
+-define(NETCONF_NOTIF_NAMESPACE_ATTR,[{xmlns,?NETCONF_NOTIF_NAMESPACE}]).
+-define(NETMOD_NOTIF_NAMESPACE_ATTR,[{xmlns,?NETMOD_NOTIF_NAMESPACE}]).
+
+-define(NETCONF_NAMESPACE,"urn:ietf:params:xml:ns:netconf:base:1.0").
+-define(ACTION_NAMESPACE,"urn:com:ericsson:ecim:1.0").
+-define(NETCONF_NOTIF_NAMESPACE,
+       "urn:ietf:params:xml:ns:netconf:notification:1.0").
+-define(NETMOD_NOTIF_NAMESPACE,"urn:ietf:params:xml:ns:netmod:notification").
+
+%% Capabilities
+-define(NETCONF_BASE_CAP,"urn:ietf:params:netconf:base:").
+-define(NETCONF_BASE_CAP_VSN,"1.0").
+
+%% Misc
+-define(END_TAG,<<"]]>]]>">>).
+
+-define(FORMAT(_F, _A), lists:flatten(io_lib:format(_F, _A))).
diff --git a/lib/common_test/src/ct_repeat.erl b/lib/common_test/src/ct_repeat.erl
index 8ecd82f771..a47309c6ee 100644
--- a/lib/common_test/src/ct_repeat.erl
+++ b/lib/common_test/src/ct_repeat.erl
@@ -41,72 +41,86 @@ loop_test(If,Args) when is_list(Args) ->
     case get_loop_info(Args) of
 	no_loop ->
 	    false;
-	{error,E} ->
+	E = {error,_} ->
 	    io:format("Common Test error: ~p\n\n",[E]),
 	    file:set_cwd(Cwd),
 	    E;
 	{repeat,N} ->
 	    io:format("\nCommon Test: Will repeat tests ~w times.\n\n",[N]),
 	    Args1 = [{loop_info,[{repeat,1,N}]} | Args],
-	    loop(If,repeat,0,N,undefined,Args1,undefined),
-	    file:set_cwd(Cwd);
+	    Result = loop(If,repeat,0,N,undefined,Args1,undefined,[]),
+	    file:set_cwd(Cwd),
+	    Result;
 	{stop_time,StopTime} ->
-	    case remaining_time(StopTime) of
-		0 ->
-		    io:format("\nCommon Test: No time left to run tests.\n\n",[]),
-		    ok;
-		Secs ->
-		    io:format("\nCommon Test: Will repeat tests for ~s.\n\n",
-			      [ts(Secs)]),
-		    TPid =
-			case lists:keymember(force_stop,1,Args) of 
-			    true ->
-				CtrlPid = self(),
-				spawn(fun() -> stop_after(CtrlPid,Secs) end);
-			    false ->
-				undefined
-			end,
-		    Args1 = [{loop_info,[{stop_time,Secs,StopTime,1}]} | Args],
-		    loop(If,stop_time,0,Secs,StopTime,Args1,TPid)
-	    end,
-	    file:set_cwd(Cwd)
+	    Result =
+		case remaining_time(StopTime) of
+		    0 ->
+			io:format("\nCommon Test: "
+				  "No time left to run tests.\n\n",[]),
+			{error,not_enough_time};
+		    Secs ->
+			io:format("\nCommon Test: "
+				  "Will repeat tests for ~s.\n\n",[ts(Secs)]),
+			TPid =
+			    case lists:keymember(force_stop,1,Args) of 
+				true ->
+				    CtrlPid = self(),
+				    spawn(fun() -> stop_after(CtrlPid,Secs) end);
+				false ->
+				    undefined
+			    end,
+			Args1 = [{loop_info,[{stop_time,Secs,StopTime,1}]} | Args],
+			loop(If,stop_time,0,Secs,StopTime,Args1,TPid,[])
+		end,
+	    file:set_cwd(Cwd),
+	    Result
     end.
     
-loop(_,repeat,N,N,_,_Args,_) ->
-    ok;
+loop(_,repeat,N,N,_,_Args,_,AccResult) ->
+    lists:reverse(AccResult);
 
-loop(If,Type,N,Data0,Data1,Args,TPid) ->
+loop(If,Type,N,Data0,Data1,Args,TPid,AccResult) ->
     Pid = spawn_tester(If,self(),Args),
     receive 
 	{'EXIT',Pid,Reason} ->
-	    io:format("Test run crashed! This could be an internal error "
-		      "- please report!\n\n"
-		      "~p\n\n",[Reason]),
-	    cancel(TPid),
-	    {error,Reason};
+	    case Reason of
+		{user_error,What} ->
+		    io:format("\nTest run failed!\nReason: ~p\n\n\n", [What]),
+		    cancel(TPid),
+		    {error,What};			
+		_ ->
+		    io:format("Test run crashed! This could be an internal error "
+			      "- please report!\n\n"
+			      "~p\n\n\n",[Reason]),
+		    cancel(TPid),
+		    {error,Reason}
+	    end;
 	{Pid,{error,Reason}} ->
-	    io:format("\nTest run failed!\nReason: ~p\n\n",[Reason]),
+	    io:format("\nTest run failed!\nReason: ~p\n\n\n",[Reason]),
 	    cancel(TPid),
 	    {error,Reason};
 	{Pid,Result} ->
 	    if Type == repeat ->
-		    io:format("\nTest run ~w(~w) complete.\n\n",[N+1,Data0]),		    
+		    io:format("\nTest run ~w(~w) complete.\n\n\n",[N+1,Data0]),
 		    lists:keydelete(loop_info,1,Args),
 		    Args1 = [{loop_info,[{repeat,N+2,Data0}]} | Args],
-		    loop(If,repeat,N+1,Data0,Data1,Args1,TPid);
+		    loop(If,repeat,N+1,Data0,Data1,Args1,TPid,[Result|AccResult]);
 	       Type == stop_time ->
 		    case remaining_time(Data1) of
 			0 ->
-			    io:format("\nTest time (~s) has run out.\n\n",[ts(Data0)]),
+			    io:format("\nTest time (~s) has run out.\n\n\n",
+				      [ts(Data0)]),
 			    cancel(TPid),
-			    Result;
+			    lists:reverse([Result|AccResult]);
 			Secs ->
 			    io:format("\n~s of test time remaining, " 
-				      "starting run #~w...\n\n",[ts(Secs),N+2]),
+				      "starting run #~w...\n\n\n",
+				      [ts(Secs),N+2]),
 			    lists:keydelete(loop_info,1,Args),			    
 			    ST = {stop_time,Data0,Data1,N+2},
 			    Args1 = [{loop_info,[ST]} | Args],
-			    loop(If,stop_time,N+1,Data0,Data1,Args1,TPid)
+			    loop(If,stop_time,N+1,Data0,Data1,Args1,TPid,
+				 [Result|AccResult])
 		    end
 	    end
     end.
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 46aec04ec1..eb05c90ba8 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -39,33 +39,46 @@
 %% Misc internal functions
 -export([variables_file_name/1,script_start1/2,run_test2/1]).
 
+-include("ct.hrl").
 -include("ct_event.hrl").
 -include("ct_util.hrl").
 
 -define(abs(Name), filename:absname(Name)).
 -define(testdir(Name, Suite), ct_util:get_testdir(Name, Suite)).
 
+-define(EXIT_STATUS_TEST_SUCCESSFUL, 0).
+-define(EXIT_STATUS_TEST_CASE_FAILED, 1).
+-define(EXIT_STATUS_TEST_RUN_FAILED, 2).
+
+-define(default_verbosity, [{default,?MAX_VERBOSITY},
+			    {'$unspecified',?MAX_VERBOSITY}]).
+
 -record(opts, {label,
 	       profile,
 	       vts,
 	       shell,
 	       cover,
+	       cover_stop,
 	       coverspec,
 	       step,
 	       logdir,
 	       logopts = [],
+	       basic_html,
+	       verbosity = [],
 	       config = [],
 	       event_handlers = [],
 	       ct_hooks = [],
 	       enable_builtin_hooks,
 	       include = [],
-	       silent_connections,
+	       auto_compile,
+	       silent_connections = [],
 	       stylesheet,
 	       multiply_timetraps = 1,
 	       scale_timetraps = false,
 	       create_priv_dir,
 	       testspecs = [],
-	       tests}).
+	       tests,
+	       starter}).
 
 %%%-----------------------------------------------------------------
 %%% @spec script_start() -> void()
@@ -102,7 +115,8 @@ script_start() ->
 						  end, Flags)
 			     end,
 		%% used for purpose of testing the run_test interface
-		io:format(user, "~n-------------------- START ARGS --------------------~n", []),
+		io:format(user, "~n-------------------- START ARGS "
+			  "--------------------~n", []),
 		io:format(user, "--- Init args:~n~p~n", [FlagFilter(Init)]),
 		io:format(user, "--- CT args:~n~p~n", [FlagFilter(CtArgs)]),
 		EnvArgs = opts2args(EnvStartOpts),
@@ -110,7 +124,8 @@ script_start() ->
 			  [EnvStartOpts,EnvArgs]),
 		Merged = merge_arguments(CtArgs ++ EnvArgs),
 		io:format(user, "--- Merged args:~n~p~n", [FlagFilter(Merged)]),
-		io:format(user, "----------------------------------------------------~n~n", []),
+		io:format(user, "-----------------------------------"
+			  "-----------------~n~n", []),
 		Merged;
 	    _ ->
 		merge_arguments(CtArgs)
@@ -122,46 +137,107 @@ script_start() ->
 
 script_start(Args) ->
     Tracing = start_trace(Args),
-    Res =
-	case ct_repeat:loop_test(script, Args) of
-	    false ->
-		{ok,Cwd} = file:get_cwd(),
-		CTVsn =
-		    case filename:basename(code:lib_dir(common_test)) of
-			CTBase when is_list(CTBase) ->
-			    case string:tokens(CTBase, "-") of
-				["common_test",Vsn] -> " v"++Vsn;
-				_ -> ""
-			    end
-		    end,
-		io:format("~nCommon Test~s starting (cwd is ~s)~n~n", [CTVsn,Cwd]),
-		Self = self(),
-		Pid = spawn_link(fun() -> script_start1(Self, Args) end),
-	        receive
-		    {'EXIT',Pid,Reason} ->
-			case Reason of
-			    {user_error,What} ->
-				io:format("\nTest run failed!\nReason: ~p\n\n", [What]),
-				{error,What};
-			    _ ->
-				io:format("Test run crashed! This could be an internal error "
-					  "- please report!\n\n"
-					  "~p\n\n", [Reason]),
-				{error,Reason}				
-			end;
-		    {Pid,{error,Reason}} ->
-			io:format("\nTest run failed! Reason:\n~p\n\n",[Reason]),
-			{error,Reason};
-		    {Pid,Result} ->
-			Result
-		end;
-	    Result ->
-		Result
-	end,
+    case ct_repeat:loop_test(script, Args) of
+	false ->
+	    {ok,Cwd} = file:get_cwd(),
+	    CTVsn =
+		case filename:basename(code:lib_dir(common_test)) of
+		    CTBase when is_list(CTBase) ->
+			case string:tokens(CTBase, "-") of
+			    ["common_test",Vsn] -> " v"++Vsn;
+			    _ -> ""
+			end
+		end,
+	    io:format("~nCommon Test~s starting (cwd is ~s)~n~n",
+	              [CTVsn,Cwd]),
+	    Self = self(),
+	    Pid = spawn_link(fun() -> script_start1(Self, Args) end),
+	    receive
+		{'EXIT',Pid,Reason} ->
+		    case Reason of
+			{user_error,What} ->
+			    io:format("\nTest run failed!\nReason: ~p\n\n\n",
+                                      [What]),
+			    finish(Tracing, ?EXIT_STATUS_TEST_RUN_FAILED, Args);
+			_ ->
+			    io:format("Test run crashed! "
+                                      "This could be an internal error "
+				      "- please report!\n\n"
+				      "~p\n\n\n", [Reason]),
+			    finish(Tracing, ?EXIT_STATUS_TEST_RUN_FAILED, Args)
+		    end;
+		{Pid,{error,Reason}} ->
+		    io:format("\nTest run failed! Reason:\n~p\n\n\n",[Reason]),
+		    finish(Tracing, ?EXIT_STATUS_TEST_RUN_FAILED, Args);
+		{Pid,Result} ->
+		    io:nl(),
+		    finish(Tracing, analyze_test_result(Result, Args), Args)
+	    end;
+	{error,_LoopReason} ->
+	    finish(Tracing, ?EXIT_STATUS_TEST_RUN_FAILED, Args);
+	Result ->
+	    io:nl(),
+	    finish(Tracing, analyze_test_result(Result, Args), Args)
+    end.
+
+%% analyze the result of one test run, or many (in case of looped test)
+analyze_test_result(ok, _) ->
+    ?EXIT_STATUS_TEST_SUCCESSFUL;
+analyze_test_result({error,_Reason}, _) ->
+    ?EXIT_STATUS_TEST_RUN_FAILED;
+analyze_test_result({_Ok,Failed,{_UserSkipped,AutoSkipped}}, Args) ->
+    if Failed > 0 ->
+	    ?EXIT_STATUS_TEST_CASE_FAILED;
+       true ->
+	    case AutoSkipped of
+		0 ->
+		    ?EXIT_STATUS_TEST_SUCCESSFUL;
+		_ ->
+		    case get_start_opt(exit_status,
+				       fun([ExitOpt]) -> ExitOpt end,
+				       Args) of
+			undefined ->
+			    ?EXIT_STATUS_TEST_CASE_FAILED;
+			"ignore_config" ->
+		    	    ?EXIT_STATUS_TEST_SUCCESSFUL
+		    end
+	    end
+    end;
+analyze_test_result([Result|Rs], Args) ->
+    case analyze_test_result(Result, Args) of
+	?EXIT_STATUS_TEST_SUCCESSFUL ->
+	    analyze_test_result(Rs, Args);
+	Other ->
+	    Other
+    end;
+analyze_test_result([], _) ->
+    ?EXIT_STATUS_TEST_SUCCESSFUL;
+analyze_test_result(interactive_mode, _) ->
+    interactive_mode;
+analyze_test_result(Unknown, _) ->
+    io:format("\nTest run failed! Reason:\n~p\n\n\n",[Unknown]),
+    ?EXIT_STATUS_TEST_RUN_FAILED.
+
+finish(Tracing, ExitStatus, Args) ->
     stop_trace(Tracing),
     timer:sleep(1000),
-    io:nl(),
-    Res.
+    if ExitStatus == interactive_mode ->
+	    interactive_mode;
+       true ->
+	    %% it's possible to tell CT to finish execution with a call
+	    %% to a different function than the normal halt/1 BIF
+	    %% (meant to be used mainly for reading the CT exit status)
+	    case get_start_opt(halt_with,
+			       fun([HaltMod,HaltFunc]) -> 
+				       {list_to_atom(HaltMod),
+					list_to_atom(HaltFunc)} end,
+			       Args) of
+		undefined ->
+		    halt(ExitStatus);
+		{M,F} ->
+		    apply(M, F, [ExitStatus])
+	    end
+    end.
 
 script_start1(Parent, Args) ->
     %% read general start flags
@@ -170,9 +246,11 @@ script_start1(Parent, Args) ->
     Vts = get_start_opt(vts, true, Args),
     Shell = get_start_opt(shell, true, Args),
     Cover = get_start_opt(cover, fun([CoverFile]) -> ?abs(CoverFile) end, Args),
+    CoverStop = get_start_opt(cover_stop, fun([CS]) -> list_to_atom(CS) end, Args),
     LogDir = get_start_opt(logdir, fun([LogD]) -> LogD end, Args),
     LogOpts = get_start_opt(logopts, fun(Os) -> [list_to_atom(O) || O <- Os] end,
 			    [], Args),
+    Verbosity = verbosity_args2opts(Args),
     MultTT = get_start_opt(multiply_timetraps,
 			   fun([MT]) -> list_to_integer(MT) end, 1, Args),
     ScaleTT = get_start_opt(scale_timetraps,
@@ -206,7 +284,7 @@ script_start1(Parent, Args) ->
 	    end
     end,
     %% no_auto_compile + include
-    IncludeDirs =
+    {AutoCompile,IncludeDirs} =
 	case proplists:get_value(no_auto_compile, Args) of
 	    undefined ->
 		application:set_env(common_test, auto_compile, true),
@@ -222,46 +300,53 @@ script_start1(Parent, Args) ->
 		case os:getenv("CT_INCLUDE_PATH") of
 		    false ->
 			application:set_env(common_test, include, InclDirs),
-			InclDirs;
+			{undefined,InclDirs};
 		    CtInclPath ->
 			AllInclDirs =
 			    string:tokens(CtInclPath,[$:,$ ,$,]) ++ InclDirs,
 			application:set_env(common_test, include, AllInclDirs),
-			AllInclDirs
+			{undefined,AllInclDirs}
 		end;
 	    _ ->
 		application:set_env(common_test, auto_compile, false),
-		[]
+		{false,[]}
 	end,
     %% silent connections
     SilentConns =
 	get_start_opt(silent_connections,
-		      fun(["all"]) -> [];
+		      fun(["all"]) -> [all];
 			 (Conns) -> [list_to_atom(Conn) || Conn <- Conns]
-		      end, Args),
+		      end, [], Args),
     %% stylesheet
     Stylesheet = get_start_opt(stylesheet,
 			       fun([SS]) -> ?abs(SS) end, Args),
     %% basic_html - used by ct_logs
-    case proplists:get_value(basic_html, Args) of
-	undefined ->
-	    application:set_env(common_test, basic_html, false);
-	_ ->
-	    application:set_env(common_test, basic_html, true)
-    end,
+    BasicHtml = case proplists:get_value(basic_html, Args) of
+		    undefined ->
+			application:set_env(common_test, basic_html, false),
+			undefined;
+		    _ ->
+			application:set_env(common_test, basic_html, true),
+			true
+		end,
 
    StartOpts = #opts{label = Label, profile = Profile,
-		     vts = Vts, shell = Shell, cover = Cover,
+		     vts = Vts, shell = Shell,
+		     cover = Cover, cover_stop = CoverStop,
 		     logdir = LogDir, logopts = LogOpts,
+		     basic_html = BasicHtml,
+		     verbosity = Verbosity,
 		     event_handlers = EvHandlers,
 		     ct_hooks = CTHooks,
 		     enable_builtin_hooks = EnableBuiltinHooks,
+		     auto_compile = AutoCompile,
 		     include = IncludeDirs,
 		     silent_connections = SilentConns,
 		     stylesheet = Stylesheet,
 		     multiply_timetraps = MultTT,
 		     scale_timetraps = ScaleTT,
-		     create_priv_dir = CreatePrivDir},
+		     create_priv_dir = CreatePrivDir,
+		     starter = script},
 
     %% check if log files should be refreshed or go on to run tests...
     Result = run_or_refresh(StartOpts, Args),
@@ -325,9 +410,18 @@ script_start2(StartOpts = #opts{vts = undefined,
 
 			AllLogOpts = merge_vals([StartOpts#opts.logopts,
 						 SpecStartOpts#opts.logopts]),
-
-			Cover = choose_val(StartOpts#opts.cover,
-					   SpecStartOpts#opts.cover),
+			AllVerbosity =
+			    merge_keyvals([StartOpts#opts.verbosity,
+					   SpecStartOpts#opts.verbosity]),
+			AllSilentConns =
+			    merge_vals([StartOpts#opts.silent_connections,
+					SpecStartOpts#opts.silent_connections]),
+			Cover =
+			    choose_val(StartOpts#opts.cover,
+				       SpecStartOpts#opts.cover),
+			CoverStop =
+			    choose_val(StartOpts#opts.cover_stop,
+				       SpecStartOpts#opts.cover_stop),
 			MultTT =
 			    choose_val(StartOpts#opts.multiply_timetraps,
 				       SpecStartOpts#opts.multiply_timetraps),
@@ -352,21 +446,54 @@ script_start2(StartOpts = #opts{vts = undefined,
 			      StartOpts#opts.enable_builtin_hooks,
 			      SpecStartOpts#opts.enable_builtin_hooks),
 			
+			Stylesheet =
+			    choose_val(StartOpts#opts.stylesheet,
+				       SpecStartOpts#opts.stylesheet),
+			    
 			AllInclude = merge_vals([StartOpts#opts.include,
 						 SpecStartOpts#opts.include]),
 			application:set_env(common_test, include, AllInclude),
+			
+			AutoCompile =
+			    case choose_val(StartOpts#opts.auto_compile,
+					    SpecStartOpts#opts.auto_compile) of
+				undefined ->
+				    true;
+				ACBool ->
+				    application:set_env(common_test,
+							auto_compile,
+							ACBool),
+				    ACBool
+			    end,
+
+			BasicHtml =
+			    case choose_val(StartOpts#opts.basic_html,
+					    SpecStartOpts#opts.basic_html) of
+				undefined ->
+				    false;
+				BHBool ->
+				    application:set_env(common_test, basic_html, 
+							BHBool),
+				    BHBool
+			    end,
 
 			{TS,StartOpts#opts{label = Label,
 					   profile = Profile,
 					   testspecs = Specs,
 					   cover = Cover,
+					   cover_stop = CoverStop,
 					   logdir = LogDir,
 					   logopts = AllLogOpts,
+					   basic_html = BasicHtml,
+					   verbosity = AllVerbosity,
+					   silent_connections = AllSilentConns,
 					   config = SpecStartOpts#opts.config,
 					   event_handlers = AllEvHs,
 					   ct_hooks = AllCTHooks,
 					   enable_builtin_hooks =
 					       EnableBuiltinHooks,
+					   stylesheet = Stylesheet,
+					   auto_compile = AutoCompile,
 					   include = AllInclude,
 					   multiply_timetraps = MultTT,
 					   scale_timetraps = ScaleTT,
@@ -519,8 +646,10 @@ script_start4(#opts{label = Label, profile = Profile,
 		    event_handlers = EvHandlers,
 		    ct_hooks = CTHooks,
 		    logopts = LogOpts,
+		    verbosity = Verbosity,
 		    enable_builtin_hooks = EnableBuiltinHooks,
 		    logdir = LogDir, testspecs = Specs}, _Args) ->
+
     %% label - used by ct_logs
     application:set_env(common_test, test_label, Label),
 
@@ -536,11 +665,12 @@ script_start4(#opts{label = Label, profile = Profile,
 		  {ct_hooks, CTHooks},
 		  {enable_builtin_hooks,EnableBuiltinHooks}]) of
 	ok ->
-	    ct_util:start(interactive, LogDir),
+	    ct_util:start(interactive, LogDir,
+			  add_verbosity_defaults(Verbosity)),
 	    ct_util:set_testdata({logopts, LogOpts}),
 	    log_ts_names(Specs),
 	    io:nl(),
-	    ok;
+	    interactive_mode;
 	Error ->
 	    Error
     end;
@@ -553,7 +683,7 @@ script_start4(#opts{vts = true, cover = Cover}, _) ->
 	    %% Add support later (maybe).
 	    io:format("\nCan't run cover in vts mode.\n\n", [])
     end,
-    erlang:halt();
+    {error,no_cover_in_vts_mode};
 
 script_start4(#opts{shell = true, cover = Cover}, _) ->
     case Cover of
@@ -562,7 +692,8 @@ script_start4(#opts{shell = true, cover = Cover}, _) ->
 	_ ->
 	    %% Add support later (maybe).
 	    io:format("\nCan't run cover in interactive mode.\n\n", [])
-    end;
+    end,
+    {error,no_cover_in_interactive_mode};
 
 script_start4(Opts = #opts{tests = Tests}, Args) ->
     do_run(Tests, [], Opts, Args).
@@ -579,6 +710,7 @@ script_usage() ->
 	      "\n\t[-dir TestDir1 TestDir2 .. TestDirN] |"
 	      "\n\t[-suite Suite [-case Case]]"
 	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
+	      "\n\t[-verbosity GenVLvl | [CategoryVLvl1 .. CategoryVLvlN]]"
 	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]"
 	      "\n\t[-no_auto_compile]"
 	      "\n\t[-multiply_timetraps N]"
@@ -593,11 +725,13 @@ script_usage() ->
 	      "\n\t[-userconfig CallbackModule ConfigFile1 .. ConfigFileN]"
 	      "\n\t[-decrypt_key Key] | [-decrypt_file KeyFile]"
 	      "\n\t[-logdir LogDir]"
+	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
+	      "\n\t[-verbosity GenVLvl | [CategoryVLvl1 .. CategoryVLvlN]]"
 	      "\n\t[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]"
-	      "\n\t[-stylesheet CSSFile]"
+	      "\n\t[-stylesheet CSSFile]"	     
 	      "\n\t[-cover CoverCfgFile]"
+	      "\n\t[-cover_stop Bool]"
 	      "\n\t[-event_handler EvHandler1 EvHandler2 .. EvHandlerN]"
-	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
 	      "\n\t[-ct_hooks CTHook1 CTHook2 .. CTHookN]"
 	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]"
 	      "\n\t[-no_auto_compile]"
@@ -613,12 +747,14 @@ script_usage() ->
 	      "\n\t[-config ConfigFile1 ConfigFile2 .. ConfigFileN]"
 	      "\n\t[-decrypt_key Key] | [-decrypt_file KeyFile]"
 	      "\n\t[-logdir LogDir]"
+	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
+	      "\n\t[-verbosity GenVLvl | [CategoryVLvl1 .. CategoryVLvlN]]"
 	      "\n\t[-allow_user_terms]"
 	      "\n\t[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]"
 	      "\n\t[-stylesheet CSSFile]"
 	      "\n\t[-cover CoverCfgFile]"
+	      "\n\t[-cover_stop Bool]"
 	      "\n\t[-event_handler EvHandler1 EvHandler2 .. EvHandlerN]"
-	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
 	      "\n\t[-ct_hooks CTHook1 CTHook2 .. CTHookN]"
 	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]"
 	      "\n\t[-no_auto_compile]"
@@ -702,7 +838,7 @@ run_test(StartOpts) when is_list(StartOpts) ->
     Ref = monitor(process, CTPid),
     receive
 	{'DOWN',Ref,process,CTPid,{user_error,Error}} ->
-		    Error;
+		    {error,Error};
 	{'DOWN',Ref,process,CTPid,Other} ->
 		    Other
     end.
@@ -739,8 +875,10 @@ run_test2(StartOpts) ->
 				    (Lbl) when is_atom(Lbl) -> atom_to_list(Lbl)
 				 end, StartOpts),
     %% profile
-    Profile = get_start_opt(profile, fun(Prof) when is_list(Prof) -> Prof;
-					(Prof) when is_atom(Prof) -> atom_to_list(Prof)
+    Profile = get_start_opt(profile, fun(Prof) when is_list(Prof) ->
+					     Prof;
+					(Prof) when is_atom(Prof) ->
+					     atom_to_list(Prof)
 				     end, StartOpts),
     %% logdir
     LogDir = get_start_opt(logdir, fun(LD) when is_list(LD) -> LD end,
@@ -748,6 +886,19 @@ run_test2(StartOpts) ->
     %% logopts
     LogOpts = get_start_opt(logopts, value, [], StartOpts),
 
+    %% verbosity
+    Verbosity =
+	get_start_opt(verbosity,
+		      fun(VLvls) when is_list(VLvls) ->
+			      lists:map(fun(VLvl = {_Cat,_Lvl}) ->
+						VLvl;
+					   (Lvl) ->
+						{'$unspecified',Lvl}
+					end, VLvls);
+			 (VLvl) when is_integer(VLvl) ->
+			      [{'$unspecified',VLvl}]
+		      end, [], StartOpts),
+
     %% config & userconfig
     CfgFiles = ct_config:get_config_file_list(StartOpts),
 
@@ -786,9 +937,9 @@ run_test2(StartOpts) ->
 
     %% silent connections
     SilentConns = get_start_opt(silent_connections,
-				fun(all) -> [];
+				fun(all) -> [all];
 				   (Conns) -> Conns
-				end, StartOpts),
+				end, [], StartOpts),
     %% stylesheet
     Stylesheet = get_start_opt(stylesheet,
 			       fun(SS) -> ?abs(SS) end,
@@ -796,6 +947,7 @@ run_test2(StartOpts) ->
     %% code coverage
     Cover = get_start_opt(cover,
 			  fun(CoverFile) -> ?abs(CoverFile) end, StartOpts),
+    CoverStop = get_start_opt(cover_stop, value, StartOpts),
 
     %% timetrap manipulation
     MultiplyTT = get_start_opt(multiply_timetraps, value, 1, StartOpts),
@@ -805,7 +957,7 @@ run_test2(StartOpts) ->
     CreatePrivDir = get_start_opt(create_priv_dir, value, StartOpts),
 
     %% auto compile & include files
-    Include =
+    {AutoCompile,Include} =
 	case proplists:get_value(auto_compile, StartOpts) of
 	    undefined ->
 		application:set_env(common_test, auto_compile, true),		
@@ -821,16 +973,16 @@ run_test2(StartOpts) ->
 		case os:getenv("CT_INCLUDE_PATH") of
 		    false ->
 			application:set_env(common_test, include, InclDirs),
-			InclDirs;
+			{undefined,InclDirs};
 		    CtInclPath ->
 			InclDirs1 = string:tokens(CtInclPath, [$:,$ ,$,]),
 			AllInclDirs = InclDirs1++InclDirs,
 			application:set_env(common_test, include, AllInclDirs),
-			AllInclDirs
+			{undefined,AllInclDirs}
 		end;
 	    ACBool ->
 		application:set_env(common_test, auto_compile, ACBool),
-		[]
+		{ACBool,[]}
 	end,
 
     %% decrypt config file
@@ -844,28 +996,36 @@ run_test2(StartOpts) ->
     end,
 
     %% basic html - used by ct_logs
-    case proplists:get_value(basic_html, StartOpts) of
-	undefined ->
-	    application:set_env(common_test, basic_html, false);
-	BasicHtmlBool ->
-	    application:set_env(common_test, basic_html, BasicHtmlBool)
+    BasicHtml =
+	case proplists:get_value(basic_html, StartOpts) of
+	    undefined ->
+		application:set_env(common_test, basic_html, false),
+		undefined;
+	    BasicHtmlBool ->
+		application:set_env(common_test, basic_html, BasicHtmlBool),
+		BasicHtmlBool		
     end,
 
     %% stepped execution
     Step = get_start_opt(step, value, StartOpts),
 
     Opts = #opts{label = Label, profile = Profile,
-		 cover = Cover, step = Step, logdir = LogDir,
-		 logopts = LogOpts, config = CfgFiles,
+		 cover = Cover, cover_stop = CoverStop,
+		 step = Step, logdir = LogDir,
+		 logopts = LogOpts, basic_html = BasicHtml,
+		 config = CfgFiles,
+		 verbosity = Verbosity,
 		 event_handlers = EvHandlers,
 		 ct_hooks = CTHooks,
 		 enable_builtin_hooks = EnableBuiltinHooks,
+		 auto_compile = AutoCompile,
 		 include = Include,
 		 silent_connections = SilentConns,
 		 stylesheet = Stylesheet,
 		 multiply_timetraps = MultiplyTT,
 		 scale_timetraps = ScaleTT,
-		 create_priv_dir = CreatePrivDir},
+		 create_priv_dir = CreatePrivDir,
+		 starter = ct},
 
     %% test specification
     case proplists:get_value(spec, StartOpts) of
@@ -894,7 +1054,7 @@ run_spec_file(Relaxed,
     log_ts_names(AbsSpecs),
     case catch ct_testspec:collect_tests_from_file(AbsSpecs, Relaxed) of
 	{Error,CTReason} when Error == error ; Error == 'EXIT' ->
-	    exit(CTReason);
+	    exit({error,CTReason});
 	TS ->
 	    SpecOpts = get_data_for_node(TS, node()),
 	    Label = choose_val(Opts#opts.label,
@@ -905,9 +1065,17 @@ run_spec_file(Relaxed,
 				SpecOpts#opts.logdir),
 	    AllLogOpts = merge_vals([Opts#opts.logopts,
 				     SpecOpts#opts.logopts]),
+	    Stylesheet = choose_val(Opts#opts.stylesheet,
+				    SpecOpts#opts.stylesheet),
+	    AllVerbosity = merge_keyvals([Opts#opts.verbosity,
+					  SpecOpts#opts.verbosity]),
+	    AllSilentConns = merge_vals([Opts#opts.silent_connections,
+					 SpecOpts#opts.silent_connections]),
 	    AllConfig = merge_vals([CfgFiles, SpecOpts#opts.config]),
 	    Cover = choose_val(Opts#opts.cover,
 			       SpecOpts#opts.cover),
+	    CoverStop = choose_val(Opts#opts.cover_stop,
+				   SpecOpts#opts.cover_stop),
 	    MultTT = choose_val(Opts#opts.multiply_timetraps,
 				SpecOpts#opts.multiply_timetraps),
 	    ScaleTT = choose_val(Opts#opts.scale_timetraps,
@@ -918,21 +1086,46 @@ run_spec_file(Relaxed,
 				  SpecOpts#opts.event_handlers]),
 	    AllInclude = merge_vals([Opts#opts.include,
 				     SpecOpts#opts.include]),
-
 	    AllCTHooks = merge_vals([Opts#opts.ct_hooks,
-				      SpecOpts#opts.ct_hooks]),
+				     SpecOpts#opts.ct_hooks]),
 	    EnableBuiltinHooks = choose_val(Opts#opts.enable_builtin_hooks,
 					    SpecOpts#opts.enable_builtin_hooks),
 	    
 	    application:set_env(common_test, include, AllInclude),
 
+	    AutoCompile = case choose_val(Opts#opts.auto_compile,
+					  SpecOpts#opts.auto_compile) of
+			      undefined ->
+				  true;
+			      ACBool ->
+				  application:set_env(common_test, auto_compile,
+						      ACBool),
+				  ACBool
+			  end,
+
+	    BasicHtml =	case choose_val(Opts#opts.basic_html,
+					SpecOpts#opts.basic_html) of
+			    undefined ->
+				false;
+			    BHBool ->
+				application:set_env(common_test, basic_html,
+						    BHBool),
+				BHBool
+			end,
+
 	    Opts1 = Opts#opts{label = Label,
 			      profile = Profile,
 			      cover = Cover,
+			      cover_stop = CoverStop,
 			      logdir = which(logdir, LogDir),
 			      logopts = AllLogOpts,
+			      stylesheet = Stylesheet,
+			      basic_html = BasicHtml,
+			      verbosity = AllVerbosity,
+			      silent_connections = AllSilentConns,
 			      config = AllConfig,
 			      event_handlers = AllEvHs,
+			      auto_compile = AutoCompile,
 			      include = AllInclude,
 			      testspecs = AbsSpecs,
 			      multiply_timetraps = MultTT,
@@ -948,20 +1141,20 @@ run_spec_file(Relaxed,
 		    {Run,Skip} = ct_testspec:prepare_tests(TS, node()),
 		    reformat_result(catch do_run(Run, Skip, Opts1, StartOpts));
 		{error,GCFReason} ->
-		    exit(GCFReason)
+		    exit({error,GCFReason})
 	    end
     end.
 
 run_prepared(Run, Skip, Opts = #opts{logdir = LogDir,
-				     config = CfgFiles },
+				     config = CfgFiles},
 	     StartOpts) ->
     LogDir1 = which(logdir, LogDir),
     case check_and_install_configfiles(CfgFiles, LogDir1, Opts) of
 	ok ->
 	    reformat_result(catch do_run(Run, Skip, Opts#opts{logdir = LogDir1},
 					 StartOpts));
-	{error,Reason} ->
-	    exit(Reason)
+	{error,_Reason} = Error ->
+	    exit(Error)
     end.
 
 check_config_file(Callback, File)->
@@ -969,7 +1162,7 @@ check_config_file(Callback, File)->
 	false ->
 	    case code:load_file(Callback) of
 		{module,_} -> ok;
-		{error,Why} -> exit({cant_load_callback_module,Why})
+		{error,Why} -> exit({error,{cant_load_callback_module,Why}})
 	    end;
 	_ ->
 	    ok
@@ -980,16 +1173,17 @@ check_config_file(Callback, File)->
 	{ok,{config,_}}->
 	    File;
 	{error,{wrong_config,Message}}->
-	    exit({wrong_config,{Callback,Message}});
+	    exit({error,{wrong_config,{Callback,Message}}});
 	{error,{nofile,File}}->
-	    exit({no_such_file,?abs(File)})
+	    exit({error,{no_such_file,?abs(File)}})
     end.
 
 run_dir(Opts = #opts{logdir = LogDir,
 		     config = CfgFiles,
 		     event_handlers = EvHandlers,
 		     ct_hooks = CTHook,
-		     enable_builtin_hooks = EnableBuiltinHooks }, StartOpts) ->
+		     enable_builtin_hooks = EnableBuiltinHooks},
+	StartOpts) ->
     LogDir1 = which(logdir, LogDir),
     Opts1 = Opts#opts{logdir = LogDir1},
     AbsCfgFiles =
@@ -1002,7 +1196,8 @@ run_dir(Opts = #opts{logdir = LogDir,
 				      {module,Callback}->
 					  ok;
 				      {error,_}->
-					  exit({no_such_module,Callback})
+					  exit({error,{no_such_module,
+						       Callback}})
 				  end
 			  end,
 			  {Callback,
@@ -1015,7 +1210,7 @@ run_dir(Opts = #opts{logdir = LogDir,
 		  {ct_hooks, CTHook},
 		  {enable_builtin_hooks,EnableBuiltinHooks}], LogDir1) of
 	ok -> ok;
-	{error,IReason} -> exit(IReason)
+	{error,_IReason} = IError -> exit(IError)
     end,
     case {proplists:get_value(dir, StartOpts),
 	  proplists:get_value(suite, StartOpts),
@@ -1057,7 +1252,7 @@ run_dir(Opts = #opts{logdir = LogDir,
 					 [], Opts1, StartOpts));
 
 	{undefined,[Hd,_|_],_GsAndCs} when not is_integer(Hd) ->
-	    exit(multiple_suites_and_cases);
+	    exit({error,multiple_suites_and_cases});
 
 	{undefined,Suite=[Hd|Tl],GsAndCs} when is_integer(Hd) ;
 					       (is_list(Hd) and	(Tl == [])) ;
@@ -1067,10 +1262,10 @@ run_dir(Opts = #opts{logdir = LogDir,
 					 [], Opts1, StartOpts));
 
 	{[Hd,_|_],_Suites,[]} when is_list(Hd) ; not is_integer(Hd) ->
-	    exit(multiple_dirs_and_suites);
+	    exit({error,multiple_dirs_and_suites});
 
 	{undefined,undefined,GsAndCs} when GsAndCs /= [] ->
-	    exit(incorrect_start_options);
+	    exit({error,incorrect_start_options});
 
 	{Dir,Suite,GsAndCs} when is_integer(hd(Dir)) ;
 				 (is_atom(Dir) and (Dir /= undefined)) ;
@@ -1079,7 +1274,7 @@ run_dir(Opts = #opts{logdir = LogDir,
 	    Dir1 = if is_atom(Dir) -> atom_to_list(Dir);
 		      true -> Dir end,
 	    if Suite == undefined ->
-		  exit(incorrect_start_options);
+		  exit({error,incorrect_start_options});
 
 	       is_integer(hd(Suite)) ;
 	       (is_atom(Suite) and (Suite /= undefined)) ;
@@ -1091,16 +1286,18 @@ run_dir(Opts = #opts{logdir = LogDir,
 			    reformat_result(catch do_run(tests(Dir2, Mod),
 							 [], Opts1, StartOpts));
 			_ ->
-			    reformat_result(catch do_run(tests(Dir2, Mod, GsAndCs),
+			    reformat_result(catch do_run(tests(Dir2, Mod,
+							       GsAndCs),
 							 [], Opts1, StartOpts))
 		    end;
 
 		is_list(Suite) ->		% multiple suites
 		    case [suite_to_test(Dir1, S) || S <- Suite] of
 			[_,_|_] when GsAndCs /= [] ->
-			    exit(multiple_suites_and_cases);
+			    exit({error,multiple_suites_and_cases});
 			[{Dir2,Mod}] when GsAndCs /= [] ->
-			    reformat_result(catch do_run(tests(Dir2, Mod, GsAndCs),
+			    reformat_result(catch do_run(tests(Dir2, Mod,
+							       GsAndCs),
 							 [], Opts1, StartOpts));
 			DirMods ->
 			    reformat_result(catch do_run(tests(DirMods),
@@ -1109,10 +1306,10 @@ run_dir(Opts = #opts{logdir = LogDir,
 	    end;
 
 	{undefined,undefined,[]} ->
-	    exit(no_test_specified);
+	    exit({error,no_test_specified});
 
 	{Dir,Suite,GsAndCs} ->
-	    exit({incorrect_start_options,{Dir,Suite,GsAndCs}})
+	    exit({error,{incorrect_start_options,{Dir,Suite,GsAndCs}}})
     end.
 
 %%%-----------------------------------------------------------------
@@ -1157,7 +1354,7 @@ run_testspec2(File) when is_list(File), is_integer(hd(File)) ->
 run_testspec2(TestSpec) ->
     case catch ct_testspec:collect_tests_from_list(TestSpec, false) of
 	{E,CTReason}  when E == error ; E == 'EXIT' ->
-	    exit(CTReason);
+	    exit({error,CTReason});
 	TS ->
 	    Opts = get_data_for_node(TS, node()),
 
@@ -1179,8 +1376,8 @@ run_testspec2(TestSpec) ->
 				      include = AllInclude},
 		    {Run,Skip} = ct_testspec:prepare_tests(TS, node()),
 		    reformat_result(catch do_run(Run, Skip, Opts1, []));
-		{error,GCFReason} ->
-		    exit(GCFReason)
+		{error,_GCFReason} = GCFError ->
+		    exit(GCFError)
 	    end
     end.
 
@@ -1188,12 +1385,18 @@ get_data_for_node(#testspec{label = Labels,
 			    profile = Profiles,
 			    logdir = LogDirs,
 			    logopts = LogOptsList,
+			    basic_html = BHs,
+			    stylesheet = SSs,
+			    verbosity = VLvls,
+			    silent_connections = SilentConnsList,
 			    cover = CoverFs,
+			    cover_stop = CoverStops,
 			    config = Cfgs,
 			    userconfig = UsrCfgs,
 			    event_handler = EvHs,
 			    ct_hooks = CTHooks,
 			    enable_builtin_hooks = EnableBuiltinHooks,
+			    auto_compile = ACs,
 			    include = Incl,
 			    multiply_timetraps = MTs,
 			    scale_timetraps = STs,
@@ -1208,7 +1411,18 @@ get_data_for_node(#testspec{label = Labels,
 		  undefined -> [];
 		  LOs -> LOs
 	      end,
+    BasicHtml = proplists:get_value(Node, BHs),
+    Stylesheet = proplists:get_value(Node, SSs),
+    Verbosity = case proplists:get_value(Node, VLvls) of
+		    undefined -> [];
+		    Lvls -> Lvls
+		end,
+    SilentConns = case proplists:get_value(Node, SilentConnsList) of
+		      undefined -> [];
+		      SCs -> SCs
+		  end,
     Cover = proplists:get_value(Node, CoverFs),
+    CoverStop = proplists:get_value(Node, CoverStops),
     MT = proplists:get_value(Node, MTs),
     ST = proplists:get_value(Node, STs),
     CreatePrivDir = proplists:get_value(Node, PDs),
@@ -1216,16 +1430,23 @@ get_data_for_node(#testspec{label = Labels,
 	[CBF || {N,CBF} <- UsrCfgs, N==Node],
     EvHandlers =  [{H,A} || {N,H,A} <- EvHs, N==Node],
     FiltCTHooks = [Hook || {N,Hook} <- CTHooks, N==Node],
+    AutoCompile = proplists:get_value(Node, ACs),
     Include =  [I || {N,I} <- Incl, N==Node],
     #opts{label = Label,
 	  profile = Profile,
 	  logdir = LogDir,
 	  logopts = LogOpts,
+	  basic_html = BasicHtml,
+	  stylesheet = Stylesheet,
+	  verbosity = Verbosity,
+	  silent_connections = SilentConns,
 	  cover = Cover,
+	  cover_stop = CoverStop,
 	  config = ConfigFiles,
 	  event_handlers = EvHandlers,
 	  ct_hooks = FiltCTHooks,
 	  enable_builtin_hooks = EnableBuiltinHooks,
+	  auto_compile = AutoCompile,
 	  include = Include,
 	  multiply_timetraps = MT,
 	  scale_timetraps = ST,
@@ -1267,6 +1488,14 @@ choose_val(V0, _V1) ->
 merge_vals(Vs) ->
     lists:append(Vs).
 
+merge_keyvals(Vs) ->
+    make_unique(lists:append(Vs)).
+
+make_unique([Elem={Key,_} | Elems]) ->
+    [Elem | make_unique(proplists:delete(Key, Elems))];
+make_unique([]) ->
+    [].
+
 listify([C|_]=Str) when is_integer(C) -> [Str];
 listify(L) when is_list(L) -> L;
 listify(E) -> [E].
@@ -1326,17 +1555,36 @@ groups_and_cases(Gs, Cs) when ((Gs == undefined) or (Gs == [])) and
 			      ((Cs == undefined) or (Cs == [])) ->
     [];
 groups_and_cases(Gs, Cs) when Gs == undefined ; Gs == [] ->
-    [ensure_atom(C) || C <- listify(Cs)];
-groups_and_cases(Gs, Cs) when Cs == undefined ; Cs == [] ->
-    [{ensure_atom(G),all} || G <- listify(Gs)];
-groups_and_cases(G, Cs) when is_atom(G) ->
-    [{G,[ensure_atom(C) || C <- listify(Cs)]}];
-groups_and_cases([G], Cs) ->
-    [{ensure_atom(G),[ensure_atom(C) || C <- listify(Cs)]}];
-groups_and_cases([_,_|_] , Cs) when Cs =/= [] ->
-    {error,multiple_groups_and_cases};
-groups_and_cases(_Gs, _Cs) ->
-    {error,incorrect_group_or_case_option}.
+    if (Cs == all) or (Cs == [all]) or (Cs == ["all"]) -> all;
+       true -> [ensure_atom(C) || C <- listify(Cs)]
+    end;
+groups_and_cases(GOrGs, Cs) when (is_atom(GOrGs) orelse
+				  (is_list(GOrGs) andalso
+				   (is_atom(hd(GOrGs)) orelse
+				    (is_list(hd(GOrGs)) andalso
+				     is_atom(hd(hd(GOrGs))))))) ->
+    if (Cs == undefined) or (Cs == []) or
+       (Cs == all) or (Cs == [all]) or (Cs == ["all"]) ->
+	    [{GOrGs,all}];
+       true ->
+	    [{GOrGs,[ensure_atom(C) || C <- listify(Cs)]}]
+    end;
+groups_and_cases(Gs, Cs) when is_integer(hd(hd(Gs))) ->
+    %% if list of strings, this comes from 'ct_run -group G1 G2 ...' and
+    %% we need to parse the strings
+    Gs1 = 
+	if (Gs == [all]) or (Gs == ["all"]) ->
+		all;
+	   true ->
+		lists:map(fun(G) ->
+				  {ok,Ts,_} = erl_scan:string(G++"."),
+				  {ok,Term} = erl_parse:parse_term(Ts),
+				  Term
+			  end, Gs)
+	end,
+    groups_and_cases(Gs1, Cs);
+groups_and_cases(Gs, Cs) ->
+    {error,{incorrect_group_or_case_option,Gs,Cs}}.
 
 tests(TestDir, Suites, []) when is_list(TestDir), is_integer(hd(TestDir)) ->
     [{?testdir(TestDir,Suites),ensure_atom(Suites),all}];
@@ -1366,17 +1614,11 @@ do_run(Tests, Misc, LogDir, LogOpts) when is_list(Misc),
 	    StepOpts ->
 		#opts{step = StepOpts}
 	end,
-    Opts1 =
-	case proplists:get_value(cover, Misc) of
-	    undefined ->
-		Opts;
-	    CoverFile ->
-		Opts#opts{cover = CoverFile}
-	end,
-    do_run(Tests, [], Opts1#opts{logdir = LogDir}, []);
+    do_run(Tests, [], Opts#opts{logdir = LogDir}, []);
 
 do_run(Tests, Skip, Opts, Args) when is_record(Opts, opts) ->
-    #opts{label = Label, profile = Profile, cover = Cover} = Opts,
+    #opts{label = Label, profile = Profile, cover = Cover,
+	  verbosity = VLvls} = Opts,
     %% label - used by ct_logs
     TestLabel =
 	if Label == undefined -> undefined;
@@ -1397,7 +1639,7 @@ do_run(Tests, Skip, Opts, Args) when is_record(Opts, opts) ->
 
     case code:which(test_server) of
 	non_existing ->
-	    exit({error,no_path_to_test_server});
+	    {error,no_path_to_test_server};
 	_ ->
 	    Opts1 = if Cover == undefined ->
 			    Opts;
@@ -1406,7 +1648,13 @@ do_run(Tests, Skip, Opts, Args) when is_record(Opts, opts) ->
 				{error,Reason} ->
 				    exit({error,Reason});
 				CoverSpec ->
-				    Opts#opts{coverspec = CoverSpec}
+				    CoverStop =
+					case Opts#opts.cover_stop of
+					    undefined -> true;
+					    Stop -> Stop
+					end,
+				    Opts#opts{coverspec = CoverSpec,
+					      cover_stop = CoverStop}
 			    end
 		    end,
 	    %% This env variable is used by test_server to determine
@@ -1418,77 +1666,135 @@ do_run(Tests, Skip, Opts, Args) when is_record(Opts, opts) ->
 		"ct_framework" ->
 		    ok;
 		Other ->
-		    erlang:display(list_to_atom("Note: TEST_SERVER_FRAMEWORK = " ++ Other))
+		    erlang:display(
+		      list_to_atom(
+			"Note: TEST_SERVER_FRAMEWORK = " ++ Other))
 	    end,
-	    case ct_util:start(Opts#opts.logdir) of
+	    Verbosity = add_verbosity_defaults(VLvls),
+	    case ct_util:start(Opts#opts.logdir, Verbosity) of
 		{error,interactive_mode} ->
 		    io:format("CT is started in interactive mode. "
-			      "To exit this mode, run ct:stop_interactive().\n"
+			      "To exit this mode, "
+			      "run ct:stop_interactive().\n"
 			      "To enter the interactive mode again, "
 			      "run ct:start_interactive()\n\n",[]),
 		    {error,interactive_mode};
 		_Pid ->
-		    %% save stylesheet info
-		    ct_util:set_testdata({stylesheet,Opts#opts.stylesheet}),
-		    %% save logopts
-		    ct_util:set_testdata({logopts,Opts#opts.logopts}),
-		    %% enable silent connections
-		    case Opts#opts.silent_connections of
-			[] ->
-			    Conns = ct_util:override_silence_all_connections(),
-			    ct_logs:log("Silent connections", "~p", [Conns]);
-			Conns when is_list(Conns) ->
-			    ct_util:override_silence_connections(Conns),
-			    ct_logs:log("Silent connections", "~p", [Conns]);
-			_ ->
-			    ok
-		    end,
-		    log_ts_names(Opts1#opts.testspecs),
-		    TestSuites = suite_tuples(Tests),
-
-		    {_TestSuites1,SuiteMakeErrors,AllMakeErrors} =
-			case application:get_env(common_test, auto_compile) of
-			    {ok,false} ->
-				{TestSuites1,SuitesNotFound} =
-				    verify_suites(TestSuites),
-				{TestSuites1,SuitesNotFound,SuitesNotFound};
-			    _ ->
-				{SuiteErrs,HelpErrs} = auto_compile(TestSuites),
-				{TestSuites,SuiteErrs,SuiteErrs++HelpErrs}
-			end,
+		    ct_util:set_testdata({starter,Opts#opts.starter}),
+		    compile_and_run(Tests, Skip,
+                                    Opts1#opts{verbosity=Verbosity}, Args)
+	    end
+    end.
 
-		    case continue(AllMakeErrors) of
-			true ->
-			    SavedErrors = save_make_errors(SuiteMakeErrors),
-			    ct_repeat:log_loop_info(Args),
+compile_and_run(Tests, Skip, Opts, Args) ->
+    %% save stylesheet info
+    ct_util:set_testdata({stylesheet,Opts#opts.stylesheet}),
+    %% save logopts
+    ct_util:set_testdata({logopts,Opts#opts.logopts}),
+    %% enable silent connections
+    case Opts#opts.silent_connections of
+	[] ->
+	    ok;
+	Conns ->
+	    case lists:member(all, Conns) of
+		true ->
+		    Conns1 = ct_util:override_silence_all_connections(),
+		    ct_logs:log("Silent connections", "~p", [Conns1]);
+		false ->
+		    ct_util:override_silence_connections(Conns),
+		    ct_logs:log("Silent connections", "~p", [Conns])
+	    end
+    end,
+    log_ts_names(Opts#opts.testspecs),
+    TestSuites = suite_tuples(Tests),
+    
+    {_TestSuites1,SuiteMakeErrors,AllMakeErrors} =
+	case application:get_env(common_test, auto_compile) of
+	    {ok,false} ->
+		{TestSuites1,SuitesNotFound} =
+		    verify_suites(TestSuites),
+		{TestSuites1,SuitesNotFound,SuitesNotFound};
+	    _ ->
+		{SuiteErrs,HelpErrs} = auto_compile(TestSuites),
+		{TestSuites,SuiteErrs,SuiteErrs++HelpErrs}
+	end,
+    
+    case continue(AllMakeErrors) of
+	true ->
+	    SavedErrors = save_make_errors(SuiteMakeErrors),
+	    ct_repeat:log_loop_info(Args),
+	    
+	    try final_tests(Tests,Skip,SavedErrors) of
+		{Tests1,Skip1} ->	    
+		    ReleaseSh = proplists:get_value(release_shell, Args),
+		    ct_util:set_testdata({release_shell,ReleaseSh}),
+		    possibly_spawn(ReleaseSh == true, Tests1, Skip1, Opts)
+	    catch
+		_:BadFormat ->
+		    {error,BadFormat}
+	    end;
+	false ->
+	    io:nl(),
+	    ct_util:stop(clean),
+	    BadMods =
+		lists:foldr(
+		  fun({{_,_},Ms}, Acc) ->
+			  Ms ++ lists:foldl(
+				  fun(M, Acc1) ->
+					  lists:delete(M, Acc1)
+				  end, Acc, Ms)
+		  end, [], AllMakeErrors),
+	    {error,{make_failed,BadMods}}
+    end.
 
-			    {Tests1,Skip1} = final_tests(Tests,Skip,SavedErrors),
+%% keep the shell as the top controlling process
+possibly_spawn(false, Tests, Skip, Opts) ->	
+    TestResult = (catch do_run_test(Tests, Skip, Opts)),
+    case TestResult of
+	{EType,_} = Error when EType == user_error;
+			       EType == error ->
+	    ct_util:stop(clean),
+	    exit(Error);
+	_ ->
+	    ct_util:stop(normal),
+	    TestResult
+    end;
 
-			    R = (catch do_run_test(Tests1, Skip1, Opts1)),
-			    case R of
-				{EType,_} = Error when EType == user_error ;
+%% we must return control to the shell now, so we spawn
+%% a test supervisor process to keep an eye on the test run 
+possibly_spawn(true, Tests, Skip, Opts) ->
+    CTUtilSrv = whereis(ct_util_server),
+    Supervisor = 
+	fun() ->
+		process_flag(trap_exit, true),
+		link(CTUtilSrv),
+		TestRun =
+		    fun() ->
+			    TestResult = (catch do_run_test(Tests, Skip, Opts)),
+			    case TestResult of
+				{EType,_} = Error when EType == user_error;
 						       EType == error ->
 				    ct_util:stop(clean),
 				    exit(Error);
 				_ ->
 				    ct_util:stop(normal),
-				    R
-			    end;
-			false ->
-			    io:nl(),
-			    ct_util:stop(clean),
-			    BadMods =
-				lists:foldr(
-				  fun({{_,_},Ms}, Acc) ->
-					  Ms ++ lists:foldl(
-						  fun(M, Acc1) ->
-							  lists:delete(M, Acc1)
-						  end, Acc, Ms)
-				  end, [], AllMakeErrors),
-			    {error,{make_failed,BadMods}}
-		    end
-	    end
-    end.
+				    exit({ok,TestResult})
+			    end
+		    end,
+		TestRunPid = spawn_link(TestRun),
+		receive
+		    {'EXIT',TestRunPid,{ok,TestResult}} ->
+			io:format(user, "~nCommon Test returned ~p~n~n",
+				  [TestResult]);
+		    {'EXIT',TestRunPid,Error} ->
+			exit(Error)				
+		end
+	end,
+    unlink(CTUtilSrv),
+    SupPid = spawn(Supervisor),
+    io:format(user, "~nTest control handed over to process ~p~n~n",
+	      [SupPid]),
+    SupPid.
 
 %% attempt to compile the modules specified in TestSuites
 auto_compile(TestSuites) ->
@@ -1504,11 +1810,13 @@ auto_compile(TestSuites) ->
 	end,
     SuiteMakeErrors =
 	lists:flatmap(fun({TestDir,Suite} = TS) ->
-			      case run_make(suites, TestDir, Suite, UserInclude) of
+			      case run_make(suites, TestDir, 
+					    Suite, UserInclude) of
 				  {error,{make_failed,Bad}} ->
 				      [{TS,Bad}];
 				  {error,_} ->
-				      [{TS,[filename:join(TestDir,"*_SUITE")]}];
+				      [{TS,[filename:join(TestDir,
+							  "*_SUITE")]}];
 				  _ ->
 				      []
 			      end
@@ -1547,23 +1855,29 @@ verify_suites(TestSuites) ->
 				{[DS|Found],NotFound};
 			   true ->
 				Beam = filename:join(TestDir,
-						     atom_to_list(Suite)++".beam"),
+						     atom_to_list(Suite)++
+							 ".beam"),
 				case filelib:is_regular(Beam) of
 				    true  ->
 					{[DS|Found],NotFound};
 				    false ->
 					case code:is_loaded(Suite) of
 					    {file,SuiteFile} ->
-						%% test suite is already loaded and
-						%% since auto_compile == false,
+						%% test suite is already
+						%% loaded and since
+						%% auto_compile == false,
 						%% let's assume the user has
-						%% loaded the beam file explicitly
-						ActualDir = filename:dirname(SuiteFile),
-						{[{ActualDir,Suite}|Found],NotFound};
+						%% loaded the beam file
+						%% explicitly
+						ActualDir = 
+						    filename:dirname(SuiteFile),
+						{[{ActualDir,Suite}|Found],
+						 NotFound};
 					    false ->
 						Name =
 						    filename:join(TestDir,
-								  atom_to_list(Suite)),
+								  atom_to_list(
+								    Suite)),
 						io:format(user,
 							  "Suite ~w not found"
 							  "in directory ~s~n",
@@ -1581,7 +1895,8 @@ verify_suites(TestSuites) ->
 				ActualDir = filename:dirname(SuiteFile),
 				{[{ActualDir,Suite}|Found],NotFound};
 			    false ->
-				io:format(user, "Directory ~s is invalid~n", [Dir]),
+				io:format(user, "Directory ~s is "
+					  "invalid~n", [Dir]),
 				Name = filename:join(Dir, atom_to_list(Suite)),
 				{Found,[{DS,[Name]}|NotFound]}
 			end
@@ -1595,7 +1910,8 @@ save_make_errors([]) ->
 save_make_errors(Errors) ->
     Suites = get_bad_suites(Errors,[]),
     ct_logs:log("MAKE RESULTS",
-		"Error compiling or locating the following suites: ~n~p",[Suites]),
+		"Error compiling or locating the "
+		"following suites: ~n~p",[Suites]),
     %% save the info for logger
     file:write_file(?missing_suites_info,term_to_binary(Errors)),
     Errors.
@@ -1616,8 +1932,9 @@ step(TestDir, Suite, Case) ->
 %%%-----------------------------------------------------------------
 %%% @hidden
 %%% @equiv ct:step/4
-step(TestDir, Suite, Case, Opts) when is_list(TestDir), is_atom(Suite), is_atom(Case),
-				   Suite =/= all, Case =/= all ->
+step(TestDir, Suite, Case, Opts) when is_list(TestDir),
+				      is_atom(Suite), is_atom(Case),
+				      Suite =/= all, Case =/= all ->
     do_run([{TestDir,Suite,Case}], [{step,Opts}]).
 
 
@@ -1685,22 +2002,21 @@ final_tests1([{TestDir,Suite,GrsOrCs}|Tests], Final, Skip, Bad) when
 		  %% for now, only flat group defs are allowed as
 		  %% start options and test spec terms
 		  fun({all,all}) ->
-			  ct_framework:make_all_conf(TestDir,
-						      Suite, []);
+			  [ct_groups:make_conf(TestDir, Suite, all, [], all)];
 		     ({skipped,Group,TCs}) ->
-			  [ct_framework:make_conf(TestDir, Suite,
-						  Group, [skipped], TCs)];
-		     ({GrSpec = {Group,_},TCs}) ->
+			  [ct_groups:make_conf(TestDir, Suite,
+					       Group, [skipped], TCs)];
+		     ({GrSpec = {GroupName,_},TCs}) ->
 			  Props = [{override,GrSpec}],
-			  [ct_framework:make_conf(TestDir, Suite,
-						  Group, Props, TCs)];
-		     ({GrSpec = {Group,_,_},TCs}) ->
+			  [ct_groups:make_conf(TestDir, Suite,
+					       GroupName, Props, TCs)];
+		     ({GrSpec = {GroupName,_,_},TCs}) ->
 			  Props = [{override,GrSpec}],
-			  [ct_framework:make_conf(TestDir, Suite,
-						  Group, Props, TCs)];
-		     ({Group,TCs}) ->
-			  [ct_framework:make_conf(TestDir, Suite,
-						  Group, [], TCs)];
+			  [ct_groups:make_conf(TestDir, Suite,
+					       GroupName, Props, TCs)];
+		     ({GroupOrGroups,TCs}) ->
+			  [ct_groups:make_conf(TestDir, Suite,
+					       GroupOrGroups, [], TCs)];
 		     (TC) ->
 			  [TC]
 		  end, GrsOrCs),
@@ -1712,12 +2028,12 @@ final_tests1([], Final, Skip, _Bad) ->
     {lists:reverse(Final),Skip}.
 
 final_skip([{TestDir,Suite,{all,all},Reason}|Skips], Final) ->
-    SkipConf =  ct_framework:make_conf(TestDir, Suite, all, [], all),
+    SkipConf = ct_groups:make_conf(TestDir, Suite, all, [], all),
     Skip = {TestDir,Suite,SkipConf,Reason},
     final_skip(Skips, [Skip|Final]);
 
 final_skip([{TestDir,Suite,{Group,TCs},Reason}|Skips], Final) ->
-    Conf =  ct_framework:make_conf(TestDir, Suite, Group, [], TCs),
+    Conf =  ct_groups:make_conf(TestDir, Suite, Group, [], TCs),
     Skip = {TestDir,Suite,Conf,Reason},
     final_skip(Skips, [Skip|Final]);
 
@@ -1735,9 +2051,11 @@ continue(_MakeErrors) ->
     case set_group_leader_same_as_shell() of
 	true ->
 	    S = self(),
-	    io:format("Failed to compile or locate one or more test suites\n"
+	    io:format("Failed to compile or locate one "
+		      "or more test suites\n"
 		      "Press \'c\' to continue or \'a\' to abort.\n"
-		      "Will continue in 15 seconds if no answer is given!\n"),
+		      "Will continue in 15 seconds if no "
+		      "answer is given!\n"),
 	    Pid = spawn(fun() ->
 				case io:get_line('(c/a) ') of
 				    "c\n" ->
@@ -1769,7 +2087,8 @@ set_group_leader_same_as_shell() ->
 		     end
 	     end,	
     case [P || P <- processes(), GS2or3(P),
-	       true == lists:keymember(shell,1,element(2,process_info(P,dictionary)))] of
+	       true == lists:keymember(shell,1,
+				       element(2,process_info(P,dictionary)))] of
 	[GL|_] ->
 	    group_leader(GL, self());
 	[] ->
@@ -1815,12 +2134,14 @@ do_run_test(Tests, Skip, Opts) ->
 				incl_mods  = CovIncl,
 				cross      = CovCross,
 				src        = _CovSrc}} ->
-		    ct_logs:log("COVER INFO","Using cover specification file: ~s~n"
+		    ct_logs:log("COVER INFO",
+				"Using cover specification file: ~s~n"
 				"App: ~w~n"
 				"Cross cover: ~w~n"
 				"Including ~w modules~n"
 				"Excluding ~w modules",
-				[CovFile,CovApp,CovCross,length(CovIncl),length(CovExcl)]),
+				[CovFile,CovApp,CovCross,
+				 length(CovIncl),length(CovExcl)]),
 
 		    %% cover export file will be used for export and import
 		    %% between tests so make sure it doesn't exist initially
@@ -1828,7 +2149,8 @@ do_run_test(Tests, Skip, Opts) ->
 			true ->
 			    DelResult = file:delete(CovExport),
 			    ct_logs:log("COVER INFO",
-					"Warning! Export file ~s already exists. "
+					"Warning! "
+					"Export file ~s already exists. "
 					"Deleting with result: ~p",
 					[CovExport,DelResult]);
 			false ->
@@ -1838,13 +2160,15 @@ do_run_test(Tests, Skip, Opts) ->
 		    %% tell test_server which modules should be cover compiled
 		    %% note that actual compilation is done when tests start
 		    test_server_ctrl:cover(CovApp, CovFile, CovExcl, CovIncl,
-					   CovCross, CovExport, CovLevel),
+					   CovCross, CovExport, CovLevel,
+					   Opts#opts.cover_stop),
 		    %% save cover data (used e.g. to add nodes dynamically)
 		    ct_util:set_testdata({cover,CovData}),
 		    %% start cover on specified nodes
 		    if (CovNodes /= []) and (CovNodes /= undefined) ->
 			    ct_logs:log("COVER INFO",
-					"Nodes included in cover session: ~w",
+					"Nodes included in cover "
+					"session: ~w",
 					[CovNodes]),
 			    cover:start(CovNodes);
 		       true ->
@@ -1869,17 +2193,27 @@ do_run_test(Tests, Skip, Opts) ->
 		    ct_logs:log("TEST INFO","~w test(s), ~w suite(s)",
 				[NoOfTests,NoOfSuites]);
 	       true ->
-		    io:format("~nTEST INFO: ~w test(s), ~w case(s) in ~w suite(s)~n~n",
+		    io:format("~nTEST INFO: ~w test(s), ~w case(s) "
+			      "in ~w suite(s)~n~n",
 			      [NoOfTests,NoOfCases,NoOfSuites]),
-		    ct_logs:log("TEST INFO","~w test(s), ~w case(s) in ~w suite(s)",
+		    ct_logs:log("TEST INFO","~w test(s), ~w case(s) "
+				"in ~w suite(s)",
 				[NoOfTests,NoOfCases,NoOfSuites])
 	    end,
-
+	    %% if the verbosity level is set lower than ?STD_IMPORTANCE, tell
+	    %% test_server to ignore stdout printouts to the test case log file
+	    case proplists:get_value(default, Opts#opts.verbosity) of
+		VLvl when is_integer(VLvl), (?STD_IMPORTANCE < (100-VLvl)) ->
+		    test_server_ctrl:reject_io_reqs(true);
+		_Lower ->
+		    ok
+	    end,
 	    test_server_ctrl:multiply_timetraps(Opts#opts.multiply_timetraps),
 	    test_server_ctrl:scale_timetraps(Opts#opts.scale_timetraps),
 
-	    test_server_ctrl:create_priv_dir(choose_val(Opts#opts.create_priv_dir,
-							auto_per_run)),
+	    test_server_ctrl:create_priv_dir(choose_val(
+					       Opts#opts.create_priv_dir,
+					       auto_per_run)),
 	    ct_event:notify(#event{name=start_info,
 				   node=node(),
 				   data={NoOfTests,NoOfSuites,NoOfCases}}),
@@ -1898,9 +2232,24 @@ do_run_test(Tests, Skip, Opts) ->
 				  maybe_cleanup_interpret(Suite, Opts#opts.step)
 			  end, CleanUp),
 	    [code:del_path(Dir) || Dir <- AddedToPath],
-	    ok;
+
+	    %% If a severe error has occurred in the test_server,
+	    %% we will generate an exception here.
+	    case ct_util:get_testdata(severe_error) of
+		undefined -> ok;
+		SevereError ->
+		    ct_logs:log("SEVERE ERROR", "~p\n", [SevereError]),
+		    exit(SevereError)
+	    end,
+
+	    case ct_util:get_testdata(stats) of
+		Stats = {_Ok,_Failed,{_UserSkipped,_AutoSkipped}} ->
+		    Stats;
+		_ ->
+		    {error,test_result_unknown}
+	    end;
 	Error ->
-	    Error
+	    exit(Error)
     end.
 
 delete_dups([S | Suites]) ->
@@ -1957,9 +2306,11 @@ add_jobs([{TestDir,all,_}|Tests], Skip, Opts, CleanUp) ->
 	    wait_for_idle(),
 	    add_jobs(Tests, Skip, Opts, CleanUp)
     end;
-add_jobs([{TestDir,[Suite],all}|Tests], Skip, Opts, CleanUp) when is_atom(Suite) ->
+add_jobs([{TestDir,[Suite],all}|Tests], Skip,
+	 Opts, CleanUp) when is_atom(Suite) ->
     add_jobs([{TestDir,Suite,all}|Tests], Skip, Opts, CleanUp);
-add_jobs([{TestDir,Suites,all}|Tests], Skip, Opts, CleanUp) when is_list(Suites) ->
+add_jobs([{TestDir,Suites,all}|Tests], Skip,
+	 Opts, CleanUp) when is_list(Suites) ->
     Name = get_name(TestDir) ++ ".suites",
     case catch test_server_ctrl:add_module_with_skip(Name, Suites,
 						     skiplist(TestDir,Skip)) of
@@ -1974,7 +2325,8 @@ add_jobs([{TestDir,Suite,all}|Tests], Skip, Opts, CleanUp) ->
 	ok ->
 	    Name =  get_name(TestDir) ++ "." ++ atom_to_list(Suite),
 	    case catch test_server_ctrl:add_module_with_skip(Name, [Suite],
-							     skiplist(TestDir,Skip)) of
+							     skiplist(TestDir,
+								      Skip)) of
 		{'EXIT',_} ->
 		    CleanUp;
 		_ ->
@@ -1997,15 +2349,24 @@ add_jobs([{TestDir,Suite,Confs}|Tests], Skip, Opts, CleanUp) when
     GrTestName =
 	case Confs of
 	    [Conf] ->
-		"." ++ atom_to_list(Group(Conf)) ++ TCTestName(TestCases(Conf));
+		case Group(Conf) of
+		    GrName when is_atom(GrName) ->
+			"." ++ atom_to_list(GrName) ++
+			    TCTestName(TestCases(Conf));
+		    _ ->
+			".groups" ++ TCTestName(TestCases(Conf))
+		end;
 	    _ ->
 		".groups"
 	end,
     TestName = get_name(TestDir) ++ "." ++ atom_to_list(Suite) ++ GrTestName,
     case maybe_interpret(Suite, init_per_group, Opts) of
 	ok ->
-	    case catch test_server_ctrl:add_conf_with_skip(TestName, Suite, Confs,
-							   skiplist(TestDir,Skip)) of
+	    case catch test_server_ctrl:add_conf_with_skip(TestName,
+							   Suite,
+							   Confs,
+							   skiplist(TestDir,
+								    Skip)) of
 		{'EXIT',_} ->
 		    CleanUp;
 		_ ->
@@ -2017,18 +2378,21 @@ add_jobs([{TestDir,Suite,Confs}|Tests], Skip, Opts, CleanUp) when
     end;
 
 %% test case
-add_jobs([{TestDir,Suite,[Case]}|Tests], Skip, Opts, CleanUp) when is_atom(Case) ->
+add_jobs([{TestDir,Suite,[Case]}|Tests],
+	 Skip, Opts, CleanUp) when is_atom(Case) ->
     add_jobs([{TestDir,Suite,Case}|Tests], Skip, Opts, CleanUp);
 
-add_jobs([{TestDir,Suite,Cases}|Tests], Skip, Opts, CleanUp) when is_list(Cases) ->
+add_jobs([{TestDir,Suite,Cases}|Tests],
+	 Skip, Opts, CleanUp) when is_list(Cases) ->
     Cases1 = lists:map(fun({GroupName,_}) when is_atom(GroupName) -> GroupName;
 			  (Case) -> Case
 		       end, Cases),
     case maybe_interpret(Suite, Cases1, Opts) of
 	ok ->
-	    Name =  get_name(TestDir) ++ "." ++	atom_to_list(Suite) ++ ".cases",
+	    Name =  get_name(TestDir) ++ "." ++ atom_to_list(Suite) ++ ".cases",
 	    case catch test_server_ctrl:add_cases_with_skip(Name, Suite, Cases1,
-							    skiplist(TestDir,Skip)) of
+							    skiplist(TestDir,
+								     Skip)) of
 		{'EXIT',_} ->
 		    CleanUp;
 		_ ->
@@ -2044,7 +2408,8 @@ add_jobs([{TestDir,Suite,Case}|Tests], Skip, Opts, CleanUp) when is_atom(Case) -
 	    Name = get_name(TestDir) ++	"." ++ atom_to_list(Suite) ++ "." ++
 		atom_to_list(Case),
 	    case catch test_server_ctrl:add_case_with_skip(Name, Suite, Case,
-							   skiplist(TestDir,Skip)) of
+							   skiplist(TestDir,
+								    Skip)) of
 		{'EXIT',_} ->
 		    CleanUp;
 		_ ->
@@ -2079,7 +2444,8 @@ skiplist(Dir, [{Dir,all,Cmt}|Skip]) ->
     %% we need to turn 'all' into list of modules since
     %% test_server doesn't do skips on Dir level
     Ss = filelib:wildcard(filename:join(Dir, "*_SUITE.beam")),
-    [{list_to_atom(filename:basename(S,".beam")),Cmt} || S <- Ss] ++ skiplist(Dir,Skip);
+    [{list_to_atom(filename:basename(S,".beam")),Cmt} || S <- Ss] ++
+	skiplist(Dir,Skip);
 skiplist(Dir, [{Dir,S,Cmt}|Skip]) ->
     [{S,Cmt} | skiplist(Dir, Skip)];
 skiplist(Dir, [{Dir,S,C,Cmt}|Skip]) ->
@@ -2139,8 +2505,10 @@ run_make(Targets, TestDir0, Mod, UserInclude) ->
 				FileTest = fun(F, suites) -> is_suite(F);
 					      (F, helpmods) -> not is_suite(F)
 					   end,
-				Files = lists:flatmap(fun({F,out_of_date}) ->
-							      case FileTest(F, Targets) of
+				Files =
+				    lists:flatmap(fun({F,out_of_date}) ->
+							  case FileTest(F,
+									Targets) of
 								  true -> [F];
 								  false -> []
 							      end;
@@ -2276,6 +2644,9 @@ merge_arguments([LogDir={logdir,_}|Args], Merged) ->
 merge_arguments([CoverFile={cover,_}|Args], Merged) ->
     merge_arguments(Args, handle_arg(replace, CoverFile, Merged));
 
+merge_arguments([CoverStop={cover_stop,_}|Args], Merged) ->
+    merge_arguments(Args, handle_arg(replace, CoverStop, Merged));
+
 merge_arguments([{'case',TC}|Args], Merged) ->
     merge_arguments(Args, handle_arg(merge, {testcase,TC}, Merged));
 
@@ -2357,7 +2728,6 @@ parse_cth_args(String) ->
 	    String
     end.
 
-
 event_handler_args2opts(Args) ->
     case proplists:get_value(event_handler, Args) of
 	undefined ->
@@ -2380,6 +2750,42 @@ event_handler_init_args2opts([EH, Arg]) ->
 event_handler_init_args2opts([]) ->
     [].
 
+verbosity_args2opts(Args) ->
+    case proplists:get_value(verbosity, Args) of
+	undefined ->
+	    [];
+	VArgs ->	
+	    GetVLvls =
+		fun("and", {new,SoFar}) when is_list(SoFar) ->
+			{new,SoFar};
+		   ("and", {Lvl,SoFar}) when is_list(SoFar) -> 
+			{new,[{'$unspecified',list_to_integer(Lvl)} | SoFar]};
+		   (CatOrLvl, {new,SoFar}) when is_list(SoFar) -> 
+			{CatOrLvl,SoFar};
+		   (Lvl, {Cat,SoFar}) ->
+			{new,[{list_to_atom(Cat),list_to_integer(Lvl)} | SoFar]}
+		end,
+		case lists:foldl(GetVLvls, {new,[]}, VArgs) of
+		    {new,Parsed} ->
+			Parsed;
+		    {Lvl,Parsed} ->
+			[{'$unspecified',list_to_integer(Lvl)} | Parsed]
+		end
+    end.
+
+add_verbosity_defaults(VLvls) ->
+    case {proplists:get_value('$unspecified', VLvls),
+	  proplists:get_value(default, VLvls)} of
+	{undefined,undefined} ->	    
+	    ?default_verbosity ++ VLvls;
+	{Lvl,undefined} ->
+	    [{default,Lvl} | VLvls];
+	{undefined,_Lvl} ->
+	    [{'$unspecified',?MAX_VERBOSITY} | VLvls];
+	_ ->
+	    VLvls
+    end.
+
 %% This function reads pa and pz arguments, converts dirs from relative
 %% to absolute, and re-inserts them in the code path. The order of the
 %% dirs in the code path remain the same. Note however that since this
@@ -2446,21 +2852,40 @@ make_abs1([], Path) ->
 %% to ct_run start arguments (on the init arguments format) -
 %% this is useful mainly for testing the ct_run start functions.
 opts2args(EnvStartOpts) ->
-    lists:flatmap(fun({config,CfgFiles}) ->
-			  [{ct_config,[CfgFiles]}];
+    lists:flatmap(fun({exit_status,ExitStatusOpt}) when is_atom(ExitStatusOpt) ->
+			  [{exit_status,[atom_to_list(ExitStatusOpt)]}];
+		     ({halt_with,{HaltM,HaltF}}) ->
+			  [{halt_with,[atom_to_list(HaltM),
+				       atom_to_list(HaltF)]}];
+		     ({interactive_mode,true}) ->
+			  [{shell,[]}];
+		     ({config,CfgFile}) when is_integer(hd(CfgFile)) ->
+			  [{ct_config,[CfgFile]}];
+		     ({config,CfgFiles}) when is_list(hd(CfgFiles)) ->
+			  [{ct_config,CfgFiles}];
 		     ({userconfig,{CBM,CfgStr=[X|_]}}) when is_integer(X) ->
 			  [{userconfig,[atom_to_list(CBM),CfgStr]}];
 		     ({userconfig,{CBM,CfgStrs}}) when is_list(CfgStrs) ->
 			  [{userconfig,[atom_to_list(CBM) | CfgStrs]}];
 		     ({userconfig,UserCfg}) when is_list(UserCfg) ->
 			  Strs =
-			      lists:map(fun({CBM,CfgStr=[X|_]}) when is_integer(X) ->
-						[atom_to_list(CBM),CfgStr,"and"];
-					   ({CBM,CfgStrs}) when is_list(CfgStrs) ->
-						[atom_to_list(CBM) | CfgStrs] ++ ["and"]
+			      lists:map(fun({CBM,CfgStr=[X|_]})
+					      when is_integer(X) ->
+						[atom_to_list(CBM),
+						 CfgStr,"and"];
+					   ({CBM,CfgStrs})
+					      when is_list(CfgStrs) ->
+						[atom_to_list(CBM) | CfgStrs] ++
+						    ["and"]
 					end, UserCfg),
 			  [_LastAnd|StrsR] = lists:reverse(lists:flatten(Strs)),
 			  [{userconfig,lists:reverse(StrsR)}];
+		     ({group,G}) when is_atom(G) ->
+			  [{group,[atom_to_list(G)]}];
+		     ({group,Gs}) when is_list(Gs) ->
+			  LOfGStrs = [lists:flatten(io_lib:format("~w",[G])) ||
+					 G <- Gs],
+			  [{group,LOfGStrs}];
 		     ({testcase,Case}) when is_atom(Case) ->
 			  [{'case',[atom_to_list(Case)]}];
 		     ({testcase,Cases}) ->
@@ -2492,7 +2917,7 @@ opts2args(EnvStartOpts) ->
 		     ({decrypt,{file,File}}) ->
 			  [{ct_decrypt_file,[File]}];
 		     ({basic_html,true}) ->
-			  ({basic_html,[]});
+			  [{basic_html,[]}];
 		     ({basic_html,false}) ->
 			  [];
 		     ({event_handler,EH}) when is_atom(EH) ->
@@ -2505,12 +2930,32 @@ opts2args(EnvStartOpts) ->
 		     ({event_handler,{EHs,Arg}}) when is_list(EHs) ->
 			  ArgStr = lists:flatten(io_lib:format("~p", [Arg])),
 			  Strs = lists:map(fun(EH) ->
-						   [atom_to_list(EH),ArgStr,"and"]
+						   [atom_to_list(EH),
+						    ArgStr,"and"]
 					   end, EHs),
 			  [_LastAnd|StrsR] = lists:reverse(lists:flatten(Strs)),
 			  [{event_handler_init,lists:reverse(StrsR)}];
 		     ({logopts,LOs}) when is_list(LOs) ->
 			  [{logopts,[atom_to_list(LO) || LO <- LOs]}];
+		     ({verbosity,?default_verbosity}) ->
+			  [];
+		     ({verbosity,VLvl}) when is_integer(VLvl) ->
+			  [{verbosity,[integer_to_list(VLvl)]}];
+		     ({verbosity,VLvls}) when is_list(VLvls) ->
+			  VLvlArgs =
+			      lists:flatmap(fun({'$unspecified',Lvl}) ->
+						    [integer_to_list(Lvl),
+						     "and"];
+					       ({Cat,Lvl}) ->
+						    [atom_to_list(Cat),
+						     integer_to_list(Lvl),
+						     "and"];
+					       (Lvl) ->
+						    [integer_to_list(Lvl),
+						     "and"]
+					    end, VLvls),
+			  [_LastAnd|VLvlArgsR] = lists:reverse(VLvlArgs),
+			  [{verbosity,lists:reverse(VLvlArgsR)}];
 		     ({ct_hooks,[]}) ->
 			  [];
 		     ({ct_hooks,CTHs}) when is_list(CTHs) ->
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index aa3413fa89..58633b7de6 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -37,7 +37,7 @@
 
 -record(options, {username, password, boot_timeout, init_timeout,
 		  startup_timeout, startup_functions, monitor_master,
-		  kill_if_fail, erl_flags}).
+		  kill_if_fail, erl_flags, env}).
 
 %%%-----------------------------------------------------------------
 %%% @spec start(Node) -> Result
@@ -85,7 +85,8 @@ start(Host, Node) ->
 %%%		  {startup_functions, StartupFunctions} |
 %%%		  {monitor_master, Monitor} |
 %%%		  {kill_if_fail, KillIfFail} |
-%%%		  {erl_flags, ErlangFlags}
+%%%		  {erl_flags, ErlangFlags} |
+%%%               {env, [{EnvVar,Value}]}
 %%%   Username = string()
 %%%   Password = string()
 %%%   BootTimeout = integer()
@@ -99,6 +100,8 @@ start(Host, Node) ->
 %%%   Monitor = bool()
 %%%   KillIfFail = bool()
 %%%   ErlangFlags = string()
+%%%   EnvVar = string()
+%%%   Value = string()
 %%%   Result = {ok, NodeName} | {error, already_started, NodeName} |
 %%%	       {error, started_not_connected, NodeName} |
 %%%	       {error, boot_timeout, NodeName} |
@@ -152,6 +155,9 @@ start(Host, Node) ->
 %%% <p>Option <code>erlang_flags</code> specifies, which flags will be added
 %%% to the parameters of the <code>erl</code> executable.</p>
 %%%
+%%% <p>Option <code>env</code> specifies a list of environment variables
+%%% that will extended the environment.</p>
+%%%
 %%% <p>Special return values are:
 %%% <list>
 %%%  <item><code>{error, already_started, NodeName}</code> - if the node with
@@ -233,10 +239,12 @@ fetch_options(Options) ->
     Monitor = get_option_value(monitor_master, Options, false),
     KillIfFail = get_option_value(kill_if_fail, Options, true),
     ErlFlags = get_option_value(erl_flags, Options, []),
+    EnvVars = get_option_value(env, Options, []),
     #options{username=UserName, password=Password,
 	     boot_timeout=BootTimeout, init_timeout=InitTimeout,
 	     startup_timeout=StartupTimeout, startup_functions=StartupFunctions,
-	     monitor_master=Monitor, kill_if_fail=KillIfFail, erl_flags=ErlFlags}.
+	     monitor_master=Monitor, kill_if_fail=KillIfFail,
+	     erl_flags=ErlFlags, env=EnvVars}.
 
 % send a message when slave node is started
 % @hidden
@@ -306,11 +314,19 @@ do_start(Host, Node, Options) ->
 	true->
 	    spawn_remote_node(Host, Node, Options)
     end,
+
     BootTimeout = Options#options.boot_timeout,
     InitTimeout = Options#options.init_timeout,
     StartupTimeout = Options#options.startup_timeout,
     Result = case wait_for_node_alive(ENode, BootTimeout) of
 	pong->
+	    case test_server:is_cover() of
+		true ->
+		    MainCoverNode = cover:get_main_node(),
+		    rpc:call(MainCoverNode,cover,start,[ENode]);
+		false ->
+		    ok
+	    end,
             call_functions(ENode, Functions2),
 	    receive
 		{node_started, ENode}->
@@ -365,9 +381,9 @@ get_cmd(Node, Flags) ->
 
 % spawn node locally
 spawn_local_node(Node, Options) ->
-    ErlFlags = Options#options.erl_flags,
+    #options{env=Env,erl_flags=ErlFlags} = Options,
     Cmd = get_cmd(Node, ErlFlags),
-    open_port({spawn, Cmd}, [stream]).
+    open_port({spawn, Cmd}, [stream,{env,Env}]).
 
 % start crypto and ssh if not yet started
 check_for_ssh_running() ->
@@ -386,9 +402,10 @@ check_for_ssh_running() ->
 
 % spawn node remotely
 spawn_remote_node(Host, Node, Options) ->
-    Username = Options#options.username,
-    Password = Options#options.password,
-    ErlFlags = Options#options.erl_flags,
+    #options{username=Username,
+	     password=Password,
+	     erl_flags=ErlFlags,
+	     env=Env} = Options,
     SSHOptions = case {Username, Password} of
 	{[], []}->
 	    [];
@@ -400,8 +417,17 @@ spawn_remote_node(Host, Node, Options) ->
     check_for_ssh_running(),
     {ok, SSHConnRef} = ssh:connect(atom_to_list(Host), 22, SSHOptions),
     {ok, SSHChannelId} = ssh_connection:session_channel(SSHConnRef, infinity),
+    ssh_setenv(SSHConnRef, SSHChannelId, Env),
     ssh_connection:exec(SSHConnRef, SSHChannelId, get_cmd(Node, ErlFlags), infinity).
 
+
+ssh_setenv(SSHConnRef, SSHChannelId, [{Var, Value} | Vars])
+  when is_list(Var), is_list(Value) ->
+    success = ssh_connection:setenv(SSHConnRef, SSHChannelId,
+				    Var, Value, infinity),
+    ssh_setenv(SSHConnRef, SSHChannelId, Vars);
+ssh_setenv(_SSHConnRef, _SSHChannelId, []) -> ok.
+
 % call functions on a remote Erlang node
 call_functions(_Node, []) ->
     ok;
@@ -423,6 +449,13 @@ wait_for_node_alive(Node, N) ->
 
 % call init:stop on a remote node
 do_stop(ENode) ->
+    case test_server:is_cover() of
+	true ->
+	    MainCoverNode = cover:get_main_node(),
+	    rpc:call(MainCoverNode,cover,flush,[ENode]);
+	false ->
+	    ok
+    end,
     spawn(ENode, init, stop, []),
     wait_for_node_dead(ENode, 5).
 
diff --git a/lib/common_test/src/ct_snmp.erl b/lib/common_test/src/ct_snmp.erl
index 8fe63e8ed1..71038bd4f4 100644
--- a/lib/common_test/src/ct_snmp.erl
+++ b/lib/common_test/src/ct_snmp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -39,7 +39,7 @@
 %%%        %%% Manager config
 %%%        [{start_manager, boolean()}    % Optional - default is true
 %%%        {users, [{user_name(), [call_back_module(), user_data()]}]}, %% Optional 
-%%%        {usm_users, [{usm_user_name(), usm_config()}]},%% Optional - snmp v3 only
+%%%        {usm_users, [{usm_user_name(), [usm_config()]}]},%% Optional - snmp v3 only
 %%%        % managed_agents is optional 
 %%%        {managed_agents,[{agent_name(), [user_name(), agent_ip(), agent_port(), [agent_config()]]}]},   
 %%%        {max_msg_size, integer()},     % Optional - default is 484
@@ -130,7 +130,7 @@
 %%% @type agent_config() = {Item, Value} 
 %%% @type user_name() = atom() 
 %%% @type usm_user_name() = string() 
-%%% @type usm_config() = string()  
+%%% @type usm_config() = {Item, Value}
 %%% @type call_back_module() = atom()
 %%% @type user_data() = term() 
 %%% @type oids() = [oid()]
@@ -157,8 +157,9 @@
 %%% API
 -export([start/2, start/3, stop/1, get_values/3, get_next_values/3, set_values/4, 
 	 set_info/1, register_users/2, register_agents/2, register_usm_users/2,
-	 unregister_users/1, unregister_agents/1, update_usm_users/2, 
-	 load_mibs/1]).
+	 unregister_users/1, unregister_users/2, unregister_agents/1,
+	 unregister_agents/2, unregister_usm_users/1, unregister_usm_users/2,
+	 load_mibs/1, unload_mibs/1]).
 
 %% Manager values
 -define(CT_SNMP_LOG_FILE, "ct_snmp_set.log").
@@ -250,10 +251,8 @@ stop(Config) ->
 %%%
 %%% @doc Issues a synchronous snmp get request. 
 get_values(Agent, Oids, MgrAgentConfName) ->
-    [Uid, AgentIp, AgentUdpPort | _] = 
-	agent_conf(Agent, MgrAgentConfName),
-    {ok, SnmpReply, _} =
-	snmpm:g(Uid, AgentIp, AgentUdpPort, Oids),
+    [Uid | _] = agent_conf(Agent, MgrAgentConfName),
+    {ok, SnmpReply, _} = snmpm:sync_get2(Uid, target_name(Agent), Oids),
     SnmpReply.
 
 %%% @spec get_next_values(Agent, Oids, MgrAgentConfName) -> SnmpReply 
@@ -265,10 +264,8 @@ get_values(Agent, Oids, MgrAgentConfName) ->
 %%%
 %%% @doc Issues a synchronous snmp get next request. 
 get_next_values(Agent, Oids, MgrAgentConfName) ->
-    [Uid, AgentIp, AgentUdpPort | _] = 
-	agent_conf(Agent, MgrAgentConfName),
-    {ok, SnmpReply, _} =
-	snmpm:gn(Uid, AgentIp, AgentUdpPort, Oids),
+    [Uid | _] = agent_conf(Agent, MgrAgentConfName),
+    {ok, SnmpReply, _} = snmpm:sync_get_next2(Uid, target_name(Agent), Oids),
     SnmpReply.
 
 %%% @spec set_values(Agent, VarsAndVals, MgrAgentConfName, Config) -> SnmpReply
@@ -282,13 +279,11 @@ get_next_values(Agent, Oids, MgrAgentConfName) ->
 %%% @doc Issues a synchronous snmp set request. 
 set_values(Agent, VarsAndVals, MgrAgentConfName, Config) ->
     PrivDir = ?config(priv_dir, Config),
-    [Uid, AgentIp, AgentUdpPort | _] = 
-	agent_conf(Agent, MgrAgentConfName),
+    [Uid | _] = agent_conf(Agent, MgrAgentConfName),
     Oids = lists:map(fun({Oid, _, _}) -> Oid end, VarsAndVals),
-    {ok, SnmpGetReply, _} =
-	snmpm:g(Uid, AgentIp, AgentUdpPort, Oids),
-    {ok, SnmpSetReply, _} =
-	snmpm:s(Uid, AgentIp, AgentUdpPort, VarsAndVals),
+    TargetName = target_name(Agent),
+    {ok, SnmpGetReply, _} = snmpm:sync_get2(Uid, TargetName, Oids),
+    {ok, SnmpSetReply, _} = snmpm:sync_set2(Uid, TargetName, VarsAndVals),
     case SnmpSetReply of
 	{noError, 0, _} when PrivDir /= false ->
 	    log(PrivDir, Agent, SnmpGetReply, VarsAndVals);
@@ -328,12 +323,23 @@ set_info(Config) ->
 %%%      Reason = term()    
 %%%
 %%% @doc Register the manager entity (=user) responsible for specific agent(s).
-%%% Corresponds to making an entry in users.conf
+%%% Corresponds to making an entry in users.conf.
+%%%
+%%% This function will try to register the given users, without
+%%% checking if any of them already exist. In order to change an
+%%% already registered user, the user must first be unregistered.
 register_users(MgrAgentConfName, Users) ->
-    {snmp, SnmpVals} = ct:get_config(MgrAgentConfName),
-    NewSnmpVals = lists:keyreplace(users, 1, SnmpVals, {users, Users}),
-    ct_config:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
-    setup_users(Users).
+    case setup_users(Users) of
+	ok ->
+	    SnmpVals = ct:get_config(MgrAgentConfName),
+	    OldUsers = ct:get_config({MgrAgentConfName,users},[]),
+	    NewSnmpVals = lists:keystore(users, 1, SnmpVals,
+					 {users, Users ++ OldUsers}),
+	    ct_config:update_config(MgrAgentConfName, NewSnmpVals),
+	    ok;
+	Error ->
+	    Error
+    end.
 
 %%% @spec register_agents(MgrAgentConfName, ManagedAgents) -> ok | {error, Reason}
 %%%
@@ -343,12 +349,24 @@ register_users(MgrAgentConfName, Users) ->
 %%%
 %%% @doc Explicitly instruct the manager to handle this agent.
 %%% Corresponds to making an entry in agents.conf 
+%%%
+%%% This function will try to register the given managed agents,
+%%% without checking if any of them already exist. In order to change
+%%% an already registered managed agent, the agent must first be
+%%% unregistered.
 register_agents(MgrAgentConfName, ManagedAgents) ->
-    {snmp, SnmpVals} = ct:get_config(MgrAgentConfName),
-    NewSnmpVals = lists:keyreplace(managed_agents, 1, SnmpVals,
-				   {managed_agents, ManagedAgents}),
-    ct_config:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
-    setup_managed_agents(ManagedAgents).
+    case setup_managed_agents(MgrAgentConfName,ManagedAgents) of
+	ok ->
+	    SnmpVals = ct:get_config(MgrAgentConfName),
+	    OldAgents = ct:get_config({MgrAgentConfName,managed_agents},[]),
+	    NewSnmpVals = lists:keystore(managed_agents, 1, SnmpVals,
+					 {managed_agents,
+					  ManagedAgents ++ OldAgents}),
+	    ct_config:update_config(MgrAgentConfName, NewSnmpVals),
+	    ok;
+	Error ->
+	    Error
+    end.
 
 %%% @spec register_usm_users(MgrAgentConfName, UsmUsers) ->  ok | {error, Reason}
 %%%
@@ -358,60 +376,115 @@ register_agents(MgrAgentConfName, ManagedAgents) ->
 %%%
 %%% @doc Explicitly instruct the manager to handle this USM user.
 %%% Corresponds to making an entry in usm.conf 
+%%%
+%%% This function will try to register the given users, without
+%%% checking if any of them already exist. In order to change an
+%%% already registered user, the user must first be unregistered.
 register_usm_users(MgrAgentConfName, UsmUsers) ->
-    {snmp, SnmpVals} = ct:get_config(MgrAgentConfName),
-    NewSnmpVals = lists:keyreplace(users, 1, SnmpVals, {usm_users, UsmUsers}),
-    ct_config:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
     EngineID = ct:get_config({MgrAgentConfName, engine_id}, ?ENGINE_ID),
-    setup_usm_users(UsmUsers, EngineID).
+    case setup_usm_users(UsmUsers, EngineID) of
+	ok ->
+	    SnmpVals = ct:get_config(MgrAgentConfName),
+	    OldUsmUsers = ct:get_config({MgrAgentConfName,usm_users},[]),
+	    NewSnmpVals = lists:keystore(usm_users, 1, SnmpVals,
+					 {usm_users, UsmUsers ++ OldUsmUsers}),
+	    ct_config:update_config(MgrAgentConfName, NewSnmpVals),
+	    ok;
+	Error ->
+	    Error
+    end.
 
-%%% @spec unregister_users(MgrAgentConfName) ->  ok | {error, Reason}
+%%% @spec unregister_users(MgrAgentConfName) ->  ok
 %%%
 %%%      MgrAgentConfName = atom()
 %%%      Reason = term()
 %%%
-%%% @doc Removes information added when calling register_users/2. 
+%%% @doc Unregister all users.
 unregister_users(MgrAgentConfName) ->
-    Users = lists:map(fun({UserName, _}) -> UserName end,
-		      ct:get_config({MgrAgentConfName, users})),
-    {snmp, SnmpVals} = ct:get_config(MgrAgentConfName),
-    NewSnmpVals = lists:keyreplace(users, 1, SnmpVals, {users, []}),
-    ct_config:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
-    takedown_users(Users).
+    Users = [Id || {Id,_} <- ct:get_config({MgrAgentConfName, users},[])],
+    unregister_users(MgrAgentConfName,Users).
 
-%%% @spec unregister_agents(MgrAgentConfName) ->  ok | {error, Reason}
+%%% @spec unregister_users(MgrAgentConfName,Users) ->  ok
 %%%
 %%%      MgrAgentConfName = atom()
+%%%      Users = [user_name()]
 %%%      Reason = term()
 %%%
-%%% @doc  Removes information added when calling register_agents/2. 
+%%% @doc Unregister the given users.
+unregister_users(MgrAgentConfName,Users) ->
+    takedown_users(Users),
+    SnmpVals = ct:get_config(MgrAgentConfName),
+    AllUsers = ct:get_config({MgrAgentConfName, users},[]),
+    RemainingUsers = lists:filter(fun({Id,_}) ->
+					  not lists:member(Id,Users)
+				  end,
+				  AllUsers),
+    NewSnmpVals = lists:keyreplace(users, 1, SnmpVals, {users,RemainingUsers}),
+    ct_config:update_config(MgrAgentConfName, NewSnmpVals),
+    ok.
+
+%%% @spec unregister_agents(MgrAgentConfName) ->  ok
+%%%
+%%%      MgrAgentConfName = atom()
+%%%      Reason = term()
+%%%
+%%% @doc  Unregister all managed agents.
 unregister_agents(MgrAgentConfName) ->    
-    ManagedAgents = lists:map(fun({_, [Uid, AgentIP, AgentPort, _]}) -> 
-				      {Uid, AgentIP, AgentPort} 
-			      end,
-			      ct:get_config({MgrAgentConfName, managed_agents})),
-    {snmp, SnmpVals} = ct:get_config(MgrAgentConfName),
-    NewSnmpVals = lists:keyreplace(managed_agents, 1, SnmpVals, 
-				   {managed_agents, []}),
-    ct_config:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
-    takedown_managed_agents(ManagedAgents).
+    ManagedAgents =  [AgentName ||
+			 {AgentName, _} <-
+			     ct:get_config({MgrAgentConfName,managed_agents},[])],
+    unregister_agents(MgrAgentConfName,ManagedAgents).
 
+%%% @spec unregister_agents(MgrAgentConfName,ManagedAgents) ->  ok
+%%%
+%%%      MgrAgentConfName = atom()
+%%%      ManagedAgents = [agent_name()]
+%%%      Reason = term()
+%%%
+%%% @doc  Unregister the given managed agents.
+unregister_agents(MgrAgentConfName,ManagedAgents) ->
+    takedown_managed_agents(MgrAgentConfName, ManagedAgents),
+    SnmpVals = ct:get_config(MgrAgentConfName),
+    AllAgents = ct:get_config({MgrAgentConfName,managed_agents},[]),
+    RemainingAgents = lists:filter(fun({Name,_}) ->
+					  not lists:member(Name,ManagedAgents)
+				   end,
+				   AllAgents),
+    NewSnmpVals = lists:keyreplace(managed_agents, 1, SnmpVals,
+				   {managed_agents,RemainingAgents}),
+    ct_config:update_config(MgrAgentConfName, NewSnmpVals),
+    ok.
 
-%%% @spec update_usm_users(MgrAgentConfName, UsmUsers) -> ok | {error, Reason}
+%%% @spec unregister_usm_users(MgrAgentConfName) ->  ok
 %%%
 %%%      MgrAgentConfName = atom()
-%%%      UsmUsers = usm_users()
 %%%      Reason = term()
 %%%
-%%% @doc  Alters information added when calling register_usm_users/2. 
-update_usm_users(MgrAgentConfName, UsmUsers) ->    
-   
-    {snmp, SnmpVals} = ct:get_config(MgrAgentConfName),
-    NewSnmpVals = lists:keyreplace(usm_users, 1, SnmpVals, 
-				   {usm_users, UsmUsers}),
-    ct_config:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
+%%% @doc Unregister all usm users.
+unregister_usm_users(MgrAgentConfName) ->
+    UsmUsers = [Id || {Id,_} <- ct:get_config({MgrAgentConfName, usm_users},[])],
+    unregister_usm_users(MgrAgentConfName,UsmUsers).
+
+%%% @spec unregister_usm_users(MgrAgentConfName,UsmUsers) ->  ok
+%%%
+%%%      MgrAgentConfName = atom()
+%%%      UsmUsers = [usm_user_name()]
+%%%      Reason = term()
+%%%
+%%% @doc Unregister the given usm users.
+unregister_usm_users(MgrAgentConfName,UsmUsers) ->
     EngineID = ct:get_config({MgrAgentConfName, engine_id}, ?ENGINE_ID),
-    do_update_usm_users(UsmUsers, EngineID). 
+    takedown_usm_users(UsmUsers,EngineID),
+    SnmpVals = ct:get_config(MgrAgentConfName),
+    AllUsmUsers = ct:get_config({MgrAgentConfName, usm_users},[]),
+    RemainingUsmUsers = lists:filter(fun({Id,_}) ->
+					     not lists:member(Id,UsmUsers)
+				     end,
+				     AllUsmUsers),
+    NewSnmpVals = lists:keyreplace(usm_users, 1, SnmpVals,
+				   {usm_users,RemainingUsmUsers}),
+    ct_config:update_config(MgrAgentConfName, NewSnmpVals),
+    ok.
 
 %%% @spec load_mibs(Mibs) -> ok | {error, Reason}
 %%%
@@ -423,6 +496,15 @@ update_usm_users(MgrAgentConfName, UsmUsers) ->
 load_mibs(Mibs) ->       
     snmpa:load_mibs(snmp_master_agent, Mibs).
  
+%%% @spec unload_mibs(Mibs) -> ok | {error, Reason}
+%%%
+%%%      Mibs = [MibName]
+%%%      MibName = string()
+%%%      Reason = term()
+%%%
+%%% @doc Unload the mibs from the agent 'snmp_master_agent'.
+unload_mibs(Mibs) ->
+    snmpa:unload_mibs(snmp_master_agent, Mibs).
 
 %%%========================================================================
 %%% Internal functions
@@ -486,9 +568,8 @@ setup_agent(true, AgentConfName, SnmpConfName,
     file:make_dir(DbDir),    
     snmp_config:write_agent_snmp_files(ConfDir, Vsns, ManagerIP, TrapUdp, 
 				       AgentIP, AgentUdp, SysName, 
-				       atom_to_list(NotifType), 
-				       SecType, Passwd, AgentEngineID, 
-				       AgentMaxMsgSize),
+				       NotifType, SecType, Passwd,
+				       AgentEngineID, AgentMaxMsgSize),
 
     override_default_configuration(Config, AgentConfName),
     
@@ -497,7 +578,8 @@ setup_agent(true, AgentConfName, SnmpConfName,
 					 {verbosity, trace}]},
 			       {agent_type, master},
 			       {agent_verbosity, trace},
-			       {net_if, [{verbosity, trace}]}],
+			       {net_if, [{verbosity, trace}]},
+			       {versions, Vsns}],
 			      ct:get_config({SnmpConfName,agent})),
     application:set_env(snmp, agent, SnmpEnv).
 %%%---------------------------------------------------------------------------
@@ -535,65 +617,61 @@ manager_register(true, MgrAgentConfName) ->
 
     setup_usm_users(UsmUsers, EngineID),
     setup_users(Users),
-    setup_managed_agents(Agents).
+    setup_managed_agents(MgrAgentConfName,Agents).
 
 %%%---------------------------------------------------------------------------
 setup_users(Users) ->
-    lists:foreach(fun({Id, [Module, Data]}) ->
-			  snmpm:register_user(Id, Module, Data)
-		  end, Users).
+    while_ok(fun({Id, [Module, Data]}) ->
+		     snmpm:register_user(Id, Module, Data)
+	     end, Users).
 %%%---------------------------------------------------------------------------   
-setup_managed_agents([]) ->
-    ok;
-
-setup_managed_agents([{_, [Uid, AgentIp, AgentUdpPort, AgentConf]} |
-		      Rest]) ->
-    NewAgentIp = case AgentIp of
-		     IpTuple when is_tuple(IpTuple) ->
-			 IpTuple;
-		     HostName when is_list(HostName) ->
-			 {ok,Hostent} = inet:gethostbyname(HostName),
-			 [IpTuple|_] = Hostent#hostent.h_addr_list,
-			 IpTuple
-		 end,
-    ok = snmpm:register_agent(Uid, NewAgentIp, AgentUdpPort),   
-    lists:foreach(fun({Item, Val}) ->
-			  snmpm:update_agent_info(Uid, NewAgentIp, 
-						  AgentUdpPort, Item, Val)
-		  end, AgentConf),
-    setup_managed_agents(Rest).
+setup_managed_agents(AgentConfName,Agents) ->
+    Fun =
+	fun({AgentName, [Uid, AgentIp, AgentUdpPort, AgentConf0]}) ->
+		NewAgentIp = case AgentIp of
+				 IpTuple when is_tuple(IpTuple) ->
+				     IpTuple;
+				 HostName when is_list(HostName) ->
+				     {ok,Hostent} = inet:gethostbyname(HostName),
+				     [IpTuple|_] = Hostent#hostent.h_addr_list,
+				     IpTuple
+			     end,
+		AgentConf =
+		    case lists:keymember(engine_id,1,AgentConf0) of
+			true ->
+			    AgentConf0;
+			false ->
+			    DefaultEngineID =
+				ct:get_config({AgentConfName,agent_engine_id},
+					      ?AGENT_ENGINE_ID),
+			    [{engine_id,DefaultEngineID}|AgentConf0]
+		    end,
+		snmpm:register_agent(Uid, target_name(AgentName),
+				     [{address,NewAgentIp},{port,AgentUdpPort} |
+				      AgentConf])
+	end,
+    while_ok(Fun,Agents).
 %%%---------------------------------------------------------------------------
 setup_usm_users(UsmUsers, EngineID)->
-    lists:foreach(fun({UsmUser, Conf}) ->
-			  snmpm:register_usm_user(EngineID, UsmUser, Conf)
-		  end, UsmUsers).
+    while_ok(fun({UsmUser, Conf}) ->
+		     snmpm:register_usm_user(EngineID, UsmUser, Conf)
+	     end, UsmUsers).
 %%%---------------------------------------------------------------------------
 takedown_users(Users) ->
-     lists:foreach(fun({Id}) ->
+     lists:foreach(fun(Id) ->
 			  snmpm:unregister_user(Id)
 		   end, Users).
 %%%---------------------------------------------------------------------------
-takedown_managed_agents([{Uid, AgentIp, AgentUdpPort} |
-			 Rest]) ->
-    NewAgentIp = case AgentIp of
-		     IpTuple when is_tuple(IpTuple) ->
-			 IpTuple;
-		     HostName when is_list(HostName) ->
-			 {ok,Hostent} = inet:gethostbyname(HostName),
-			 [IpTuple|_] = Hostent#hostent.h_addr_list,
-			 IpTuple
-		 end,
-    ok = snmpm:unregister_agent(Uid, NewAgentIp, AgentUdpPort),   
-    takedown_managed_agents(Rest);
-
-takedown_managed_agents([]) ->
-    ok.
+takedown_managed_agents(MgrAgentConfName,ManagedAgents) ->
+    lists:foreach(fun(AgentName) ->
+			  [Uid | _] = agent_conf(AgentName, MgrAgentConfName),
+			  snmpm:unregister_agent(Uid, target_name(AgentName))
+		  end, ManagedAgents).
 %%%---------------------------------------------------------------------------
-do_update_usm_users(UsmUsers, EngineID) ->
-    lists:foreach(fun({UsmUser, {Item, Val}}) ->
-			  snmpm:update_usm_user_info(EngineID, UsmUser, 
-						     Item, Val)
-		  end, UsmUsers).
+takedown_usm_users(UsmUsers, EngineID) ->
+     lists:foreach(fun(Id) ->
+			  snmpm:unregister_usm_user(EngineID, Id)
+		   end, UsmUsers).
 %%%---------------------------------------------------------------------------  
 log(PrivDir, Agent, {_, _, Varbinds}, NewVarsAndVals) ->
 
@@ -657,7 +735,7 @@ override_contexts(Config, {data_dir_file, File}) ->
     override_contexts(Config, ContextInfo);
 
 override_contexts(Config, Contexts) ->
-    Dir = ?config(priv_dir, Config),    
+    Dir = filename:join(?config(priv_dir, Config),"conf"),
     File = filename:join(Dir,"context.conf"),
     file:delete(File),
     snmp_config:write_agent_context_config(Dir, "", Contexts).
@@ -673,7 +751,7 @@ override_sysinfo(Config, {data_dir_file, File}) ->
     override_sysinfo(Config, SysInfo);
 
 override_sysinfo(Config, SysInfo) ->   
-    Dir = ?config(priv_dir, Config),  
+    Dir = filename:join(?config(priv_dir, Config),"conf"),
     File = filename:join(Dir,"standard.conf"),
     file:delete(File),
     snmp_config:write_agent_standard_config(Dir, "", SysInfo).
@@ -688,7 +766,7 @@ override_target_address(Config, {data_dir_file, File}) ->
     override_target_address(Config, TargetAddressConf);
 
 override_target_address(Config, TargetAddressConf) ->
-    Dir = ?config(priv_dir, Config),  
+    Dir = filename:join(?config(priv_dir, Config),"conf"),
     File = filename:join(Dir,"target_addr.conf"),
     file:delete(File),
     snmp_config:write_agent_target_addr_config(Dir, "", TargetAddressConf).
@@ -704,7 +782,7 @@ override_target_params(Config, {data_dir_file, File}) ->
     override_target_params(Config, TargetParamsConf);
 
 override_target_params(Config, TargetParamsConf) ->
-    Dir = ?config(priv_dir, Config),  
+    Dir = filename:join(?config(priv_dir, Config),"conf"),
     File = filename:join(Dir,"target_params.conf"),
     file:delete(File),
     snmp_config:write_agent_target_params_config(Dir, "", TargetParamsConf). 
@@ -719,7 +797,7 @@ override_notify(Config, {data_dir_file, File}) ->
     override_notify(Config, NotifyConf);
 
 override_notify(Config, NotifyConf) ->
-    Dir = ?config(priv_dir, Config),  
+    Dir = filename:join(?config(priv_dir, Config),"conf"),
     File = filename:join(Dir,"notify.conf"),
     file:delete(File),
     snmp_config:write_agent_notify_config(Dir, "", NotifyConf).
@@ -734,7 +812,7 @@ override_usm(Config, {data_dir_file, File}) ->
     override_usm(Config, UsmConf);
 
 override_usm(Config, UsmConf) ->
-    Dir = ?config(priv_dir, Config),  
+    Dir = filename:join(?config(priv_dir, Config),"conf"),
     File = filename:join(Dir,"usm.conf"),
     file:delete(File),
     snmp_config:write_agent_usm_config(Dir, "", UsmConf).
@@ -749,7 +827,7 @@ override_community(Config, {data_dir_file, File}) ->
     override_community(Config, CommunityConf);
 
 override_community(Config, CommunityConf) ->
-    Dir = ?config(priv_dir, Config),  
+    Dir = filename:join(?config(priv_dir, Config),"conf"),
     File = filename:join(Dir,"community.conf"),
     file:delete(File),
     snmp_config:write_agent_community_config(Dir, "", CommunityConf).
@@ -765,7 +843,20 @@ override_vacm(Config, {data_dir_file, File}) ->
     override_vacm(Config, VacmConf);
 
 override_vacm(Config, VacmConf) ->
-    Dir = ?config(priv_dir, Config),  
-       File = filename:join(Dir,"vacm.conf"),
+    Dir = filename:join(?config(priv_dir, Config),"conf"),
+    File = filename:join(Dir,"vacm.conf"),
     file:delete(File),
     snmp_config:write_agent_vacm_config(Dir, "", VacmConf).
+
+%%%---------------------------------------------------------------------------
+
+target_name(Agent) ->
+    atom_to_list(Agent).
+
+while_ok(Fun,[H|T]) ->
+    case Fun(H) of
+	ok -> while_ok(Fun,T);
+	Error -> Error
+    end;
+while_ok(_Fun,[]) ->
+    ok.
diff --git a/lib/common_test/src/ct_ssh.erl b/lib/common_test/src/ct_ssh.erl
index aebb28bc42..c6ea27b10e 100644
--- a/lib/common_test/src/ct_ssh.erl
+++ b/lib/common_test/src/ct_ssh.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -133,10 +133,11 @@ connect(KeyOrName, ExtraOpts) when is_list(ExtraOpts) ->
 %%%      is used to identify the connection, this name may
 %%%      be used as connection reference for subsequent calls.
 %%%      It's only possible to have one open connection at a time 
-%%%      associated with <code>Name</code>. If <code>Key</code> is 
+%%%      associated with <code>Name</code>. If <code>Key</code> is
 %%%      used, the returned handle must be used for subsequent calls
 %%%      (multiple connections may be opened using the config
-%%%      data specified by <code>Key</code>).</p>
+%%%      data specified by <code>Key</code>). See <c>ct:require/2</c>
+%%%      for how to create a new <c>Name</c></p>
 %%%
 %%%      <p><code>ConnType</code> will always override the type
 %%%      specified in the address tuple in the configuration data (and
@@ -152,6 +153,8 @@ connect(KeyOrName, ExtraOpts) when is_list(ExtraOpts) ->
 %%%      The extra options will override any existing options with the
 %%%      same key in the config data. For details on valid SSH
 %%%      options, see the documentation for the OTP ssh application.</p>
+%%%
+%%% @see ct:require/2
 connect(KeyOrName, ConnType, ExtraOpts) ->
     case ct:get_config(KeyOrName) of
 	undefined ->
@@ -182,19 +185,22 @@ connect(KeyOrName, ConnType, ExtraOpts) ->
 				    undefined ->
 					{ssh,undefined,AllOpts};
 				    SFTPAddr ->
-					log(heading(connect,KeyOrName), 
-					    "Note: Opening ssh connection to sftp host.\n",
+					try_log(heading(connect,KeyOrName), 
+						"Note: Opening ssh connection "
+						"to sftp host.\n",
 					    []),
 					{ssh,SFTPAddr,
-					 [{ssh,SFTPAddr}|proplists:delete(sftp, AllOpts)]}
+					 [{ssh,SFTPAddr} |
+					  proplists:delete(sftp, AllOpts)]}
 				end;
 			    undefined when ConnType == sftp ->
 				case proplists:get_value(ssh, AllOpts) of
 				    undefined ->
 					{sftp,undefined,AllOpts};
 				    SSHAddr ->
-					log(heading(connect,KeyOrName), 
-					    "Note: Opening sftp connection to ssh host.\n",
+					try_log(heading(connect,KeyOrName), 
+						"Note: Opening sftp connection "
+						"to ssh host.\n",
 					    []),
 					{sftp,SSHAddr,
 					 [{sftp,SSHAddr}|proplists:delete(ssh, AllOpts)]}
@@ -209,15 +215,15 @@ connect(KeyOrName, ConnType, ExtraOpts) ->
 			[{not_available,{KeyOrName,ConnType1}}]),
 		    {error,{not_available,{KeyOrName,ConnType1}}};
 		{_,undefined} ->
-		    log(heading(connect,KeyOrName), 
-			"Opening ~w connection to ~p:22\n",
-			[ConnType1,Addr]),
+		    try_log(heading(connect,KeyOrName), 
+			    "Opening ~w connection to ~p:22\n",
+			    [ConnType1,Addr]),
 		    ct_gen_conn:start(KeyOrName, {ConnType1,Addr,22}, 
 				      AllOpts1, ?MODULE);		    
 		{_,Port} ->
-		    log(heading(connect,KeyOrName), 
-			"Opening ~w connection to ~p:~w\n",
-			[ConnType1,Addr,Port]),
+		    try_log(heading(connect,KeyOrName), 
+			    "Opening ~w connection to ~p:~w\n",
+			    [ConnType1,Addr,Port]),
 		    ct_gen_conn:start(KeyOrName, {ConnType1,Addr,Port}, 
 				      AllOpts1, ?MODULE)
 	    end
@@ -232,7 +238,7 @@ connect(KeyOrName, ConnType, ExtraOpts) ->
 disconnect(SSH) ->
     case get_handle(SSH) of
 	{ok,Pid} ->
-	    log(heading(disconnect,SSH), "Handle: ~p", [Pid]),
+	    try_log(heading(disconnect,SSH), "Handle: ~p", [Pid], 5000),
 	    case ct_gen_conn:stop(Pid) of
 		{error,{process_down,Pid,noproc}} ->
 		    {error,already_closed};
@@ -968,8 +974,9 @@ init(KeyOrName, {ConnType,Addr,Port}, AllOpts) ->
 	    Error;
 	Ok ->
 	    SSHRef = element(2, Ok),
-	    log(heading(init,KeyOrName), 
-		"Opened ~w connection:\nHost: ~p (~p)\nUser: ~p\nPassword: ~p\n",
+	    try_log(heading(init,KeyOrName), 
+		    "Opened ~w connection:\n"
+		    "Host: ~p (~p)\nUser: ~p\nPassword: ~p\n",
 		[ConnType,Addr,Port,User,lists:duplicate(length(Password),$*)]),
 	    {ok,SSHRef,#state{ssh_ref=SSHRef, conn_type=ConnType,
 			      target=KeyOrName}}
@@ -978,25 +985,26 @@ init(KeyOrName, {ConnType,Addr,Port}, AllOpts) ->
 %% @hidden
 handle_msg(sftp_connect, State) ->
     #state{ssh_ref=SSHRef, target=Target} = State,
-    log(heading(sftp_connect,Target), "SSH Ref: ~p", [SSHRef]),
+    try_log(heading(sftp_connect,Target), "SSH Ref: ~p", [SSHRef]),
     {ssh_sftp:start_channel(SSHRef),State};
 
 handle_msg({session_open,TO}, State) ->
     #state{ssh_ref=SSHRef, target=Target} = State,
-    log(heading(session_open,Target), "SSH Ref: ~p, Timeout: ~p", [SSHRef,TO]),
+    try_log(heading(session_open,Target), "SSH Ref: ~p, Timeout: ~p",
+	    [SSHRef,TO]),
     {ssh_connection:session_channel(SSHRef, TO),State};
 
 handle_msg({session_close,Chn}, State) ->
     #state{ssh_ref=SSHRef, target=Target} = State,
-    log(heading(session_close,Target), "SSH Ref: ~p, Chn: ~p", [SSHRef,Chn]),
+    try_log(heading(session_close,Target), "SSH Ref: ~p, Chn: ~p", [SSHRef,Chn]),
     {ssh_connection:close(SSHRef, Chn),State};
 
 handle_msg({exec,Chn,Command,TO}, State) ->
     #state{ssh_ref=SSHRef, target=Target} = State,
     Chn1 = 
 	if Chn == undefined ->
-		log(heading(exec,Target), 
-		    "Opening channel for exec, SSH Ref: ~p", [SSHRef]),
+		try_log(heading(exec,Target), 
+			"Opening channel for exec, SSH Ref: ~p", [SSHRef]),
 		case ssh_connection:session_channel(SSHRef, TO) of	
 		    {ok,C} -> C;
 		    CErr -> CErr
@@ -1009,9 +1017,9 @@ handle_msg({exec,Chn,Command,TO}, State) ->
 	    log(heading(exec,Target), "Opening channel failed: ~p", [ChnError]),
 	    {ChnError,State};
 	_ ->
-	    log(heading(exec,Target), 
-		"SSH Ref: ~p, Chn: ~p, Command: ~p, Timeout: ~p", 
-		[SSHRef,Chn1,Command,TO]),
+	    try_log(heading(exec,Target), 
+		    "SSH Ref: ~p, Chn: ~p, Command: ~p, Timeout: ~p", 
+		    [SSHRef,Chn1,Command,TO]),
 	    case ssh_connection:exec(SSHRef, Chn1, Command, TO) of
 		success ->
 		    Result = do_recv_response(SSHRef, Chn1, [], close, TO),
@@ -1024,24 +1032,24 @@ handle_msg({exec,Chn,Command,TO}, State) ->
 
 handle_msg({receive_response,Chn,End,TO}, State) ->
     #state{ssh_ref=SSHRef, target=Target} = State,
-    log(heading(receive_response,Target), 
-	"SSH Ref: ~p, Chn: ~p, Timeout: ~p", [SSHRef,Chn,TO]),
+    try_log(heading(receive_response,Target), 
+	    "SSH Ref: ~p, Chn: ~p, Timeout: ~p", [SSHRef,Chn,TO]),
     Result = do_recv_response(SSHRef, Chn, [], End, TO),
     {Result,State};
 
 handle_msg({send,Chn,Type,Data,TO}, State) ->
     #state{ssh_ref=SSHRef, target=Target} = State,
-    log(heading(send,Target), 
-	"SSH Ref: ~p, Chn: ~p, Type: ~p, Timeout: ~p~n"
-	"Data: ~p", [SSHRef,Chn,Type,TO,Data]),
+    try_log(heading(send,Target), 
+	    "SSH Ref: ~p, Chn: ~p, Type: ~p, Timeout: ~p~n"
+	    "Data: ~p", [SSHRef,Chn,Type,TO,Data]),
     Result = ssh_connection:send(SSHRef, Chn, Type, Data, TO),
     {Result,State};
 
 handle_msg({send_and_receive,Chn,Type,Data,End,TO}, State) -> 
     #state{ssh_ref=SSHRef, target=Target} = State,   
-    log(heading(send_and_receive,Target), 
-	"SSH Ref: ~p, Chn: ~p, Type: ~p, Timeout: ~p~n"
-	"Data: ~p", [SSHRef,Chn,Type,TO,Data]),
+    try_log(heading(send_and_receive,Target), 
+	    "SSH Ref: ~p, Chn: ~p, Type: ~p, Timeout: ~p~n"
+	    "Data: ~p", [SSHRef,Chn,Type,TO,Data]),
     case ssh_connection:send(SSHRef, Chn, Type, Data, TO) of
 	ok ->
 	    Result = do_recv_response(SSHRef, Chn, [], End, TO),
@@ -1052,137 +1060,162 @@ handle_msg({send_and_receive,Chn,Type,Data,End,TO}, State) ->
 
 handle_msg({subsystem,Chn,Subsystem,TO}, State) ->
     #state{ssh_ref=SSHRef, target=Target} = State,
-    log(heading(subsystem,Target), 
-	"SSH Ref: ~p, Chn: ~p, Subsys: ~p, Timeout: ~p", 
-	[SSHRef,Chn,Subsystem,TO]),
+    try_log(heading(subsystem,Target), 
+	    "SSH Ref: ~p, Chn: ~p, Subsys: ~p, Timeout: ~p", 
+	    [SSHRef,Chn,Subsystem,TO]),
     Result = ssh_connection:subsystem(SSHRef, Chn, Subsystem, TO),
     {Result,State};
 
 %% --- SFTP Commands ---
 
 handle_msg({read_file,Srv,File}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:read_file(ref(Srv,SSHRef), File),S};
 
 handle_msg({write_file,Srv,File,Iolist}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:write_file(ref(Srv,SSHRef), File, Iolist),S};
 
 handle_msg({list_dir,Srv,Path}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:list_dir(ref(Srv,SSHRef), Path),S};
 
 handle_msg({open,Srv,File,Mode}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:open(ref(Srv,SSHRef), File, Mode),S};
 
 handle_msg({opendir,Srv,Path}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:opendir(ref(Srv,SSHRef), Path),S};
 
 handle_msg({close,Srv,Handle}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:close(ref(Srv,SSHRef), Handle),S};
 
 handle_msg({read,Srv,Handle,Len}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:read(ref(Srv,SSHRef), Handle, Len),S};
 
 handle_msg({pread,Srv,Handle,Position,Length}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:pread(ref(Srv,SSHRef),Handle,Position,Length),S};
 
 handle_msg({aread,Srv,Handle,Len}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:aread(ref(Srv,SSHRef), Handle, Len),S};
 
 handle_msg({apread,Srv,Handle,Position,Length}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:apread(ref(Srv,SSHRef), Handle, Position, Length),S};
 
 handle_msg({write,Srv,Handle,Data}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:write(ref(Srv,SSHRef), Handle, Data),S};
 
 handle_msg({pwrite,Srv,Handle,Position,Data}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:pwrite(ref(Srv,SSHRef), Handle, Position, Data),S};
 
 handle_msg({awrite,Srv,Handle,Data}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:awrite(ref(Srv,SSHRef), Handle, Data),S};
 
 handle_msg({apwrite,Srv,Handle,Position,Data}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:apwrite(ref(Srv,SSHRef), Handle, Position, Data),S};
 
 handle_msg({position,Srv,Handle,Location}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:position(ref(Srv,SSHRef), Handle, Location),S};
 
 handle_msg({read_file_info,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:read_file_info(ref(Srv,SSHRef), Name),S};
 
 handle_msg({get_file_info,Srv,Handle}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:get_file_info(ref(Srv,SSHRef), Handle),S};
 
 handle_msg({read_link_info,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:read_link_info(ref(Srv,SSHRef), Name),S};
 
 handle_msg({write_file_info,Srv,Name,Info}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:write_file_info(ref(Srv,SSHRef), Name, Info),S};
 
 handle_msg({read_link,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:read_link(ref(Srv,SSHRef), Name),S};
 
 handle_msg({make_symlink,Srv,Name,Target}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:make_symlink(ref(Srv,SSHRef), Name, Target),S};
 
 handle_msg({rename,Srv,OldName,NewName}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:rename(ref(Srv,SSHRef), OldName, NewName),S};
 
 handle_msg({delete,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:delete(ref(Srv,SSHRef), Name),S};
 
 handle_msg({make_dir,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:make_dir(ref(Srv,SSHRef), Name),S};
 
 handle_msg({del_dir,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
-    log(heading(sftp,S#state.target), 
-	"SSH Ref: ~p, Server: ~p~nCmd: ~p", [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
+    try_log(heading(sftp,S#state.target), 
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:del_dir(ref(Srv,SSHRef), Name),S}.
 
 %% @hidden
@@ -1197,12 +1230,12 @@ close(SSHRef) ->
 terminate(SSHRef, State) ->
     case State#state.conn_type of
 	ssh ->
-	    log(heading(disconnect_ssh,State#state.target),
-		"SSH Ref: ~p",[SSHRef]),
+	    try_log(heading(disconnect_ssh,State#state.target),
+		    "SSH Ref: ~p",[SSHRef], 5000),
 	    ssh:close(SSHRef);
 	sftp ->
-	    log(heading(disconnect_sftp,State#state.target),
-		"SFTP Ref: ~p",[SSHRef]),
+	    try_log(heading(disconnect_sftp,State#state.target),
+		    "SFTP Ref: ~p",[SSHRef], 5000),
 	    ssh_sftp:stop_channel(SSHRef)
     end.
 
@@ -1217,7 +1250,7 @@ do_recv_response(SSH, Chn, Data, End, Timeout) ->
 	{ssh_cm, SSH, {open,Chn,RemoteChn,{session}}} ->
 	    debug("RECVD open"),
 	    {ok,{open,Chn,RemoteChn,{session}}};
-	
+
 	{ssh_cm, SSH, {closed,Chn}} ->
 	    ssh_connection:close(SSH, Chn),
 	    debug("CLSD~n~p ~p", [SSH,Chn]),
@@ -1245,38 +1278,38 @@ do_recv_response(SSH, Chn, Data, End, Timeout) ->
 	{ssh_cm, SSH, {exit_signal,Chn,Signal,Err,_Lang}} ->
 	    debug("RECVD exit_signal~n~p ~p~n~p ~p", [SSH,Chn,Signal,Err]),
 	    do_recv_response(SSH, Chn, Data, End, Timeout);
-%%	    {ok,{exit_signal,Chn,Signal,Err,_Lang}};
+	%%	    {ok,{exit_signal,Chn,Signal,Err,_Lang}};
 
 	{ssh_cm, SSH, {exit_status,Chn,Status}} ->
 	    debug("RECVD exit_status~n~p ~p~n~p", [SSH,Chn,Status]),
 	    do_recv_response(SSH, Chn, Data, End, Timeout);
-%%	    {ok,{exit_status,Chn,_Status}};
+	%%	    {ok,{exit_status,Chn,_Status}};
 
 
-%%      --- INTERACTIVE MESSAGES - NOT HANDLED ---
-%%
-%% 	{ssh_cm, SSH, {subsystem,Chn,WantReply,Name}} ->
-%% 	    debug("RECVD SUBS WNTRPLY~n~p ~p~n~p~n~p",
-%% 		  [SSH,Chn,WantReply]),
-%% 	    ssh_connection:reply_request(SSH, WantReply, success, Chn),
-%% 	    do_recv_response(SSH, Chn, Data, End, Timeout);
-	
-%% 	{ssh_cm, SSH, {shell,WantReply}} ->
-%% 	    debug("RECVD SHELL WNTRPLY~n~p ~p~n~p~n~p",
-%% 		  [SSH,Chn,WantReply]),
-%% 	    ssh_connection:reply_request(SSH, WantReply, success, Chn),
-%% 	    do_recv_response(SSH,Chn,Data,End,Timeout);
-	
-%% 	{ssh_cm, SSH, {pty,Chn,WantReply,Pty}} ->
-%% 	    debug("RECVD PTY WNTRPLY~n~p ~p~n~p~n~p",
-%% 		  [SSH,Chn,WantReply,Pty]),
-%% 	    ssh_connection:reply_request(SSH, WantReply, success, Chn),
-%% 	    do_recv_response(SSH, Chn, Data, End, Timeout);
-
-%%	{ssh_cm, SSH, WCh={window_change,_Chn,_Width,_Height,_PixWidth,_PixHeight}} ->
-%%	    debug("RECVD WINCH"),
-%%	    {ok,WCh};
-	
+	%%      --- INTERACTIVE MESSAGES - NOT HANDLED ---
+	%%
+	%% 	{ssh_cm, SSH, {subsystem,Chn,WantReply,Name}} ->
+	%% 	    debug("RECVD SUBS WNTRPLY~n~p ~p~n~p~n~p",
+	%% 		  [SSH,Chn,WantReply]),
+	%% 	    ssh_connection:reply_request(SSH, WantReply, success, Chn),
+	%% 	    do_recv_response(SSH, Chn, Data, End, Timeout);
+
+	%% 	{ssh_cm, SSH, {shell,WantReply}} ->
+	%% 	    debug("RECVD SHELL WNTRPLY~n~p ~p~n~p~n~p",
+	%% 		  [SSH,Chn,WantReply]),
+	%% 	    ssh_connection:reply_request(SSH, WantReply, success, Chn),
+	%% 	    do_recv_response(SSH,Chn,Data,End,Timeout);
+
+	%% 	{ssh_cm, SSH, {pty,Chn,WantReply,Pty}} ->
+	%% 	    debug("RECVD PTY WNTRPLY~n~p ~p~n~p~n~p",
+	%% 		  [SSH,Chn,WantReply,Pty]),
+	%% 	    ssh_connection:reply_request(SSH, WantReply, success, Chn),
+	%% 	    do_recv_response(SSH, Chn, Data, End, Timeout);
+
+	%%	{ssh_cm, SSH, WCh={window_change,_Chn,_Width,_Height,_PixWidth,_PixHeight}} ->
+	%%	    debug("RECVD WINCH"),
+	%%	    {ok,WCh};
+
 	Other ->
 	    debug("UNEXPECTED MESSAGE~n~p ~p~n~p", [SSH,Chn,Other]),
 	    do_recv_response(SSH, Chn, Data, End, Timeout)
@@ -1307,9 +1340,12 @@ get_handle(SSH) ->
 %%%-----------------------------------------------------------------
 %%% 
 call(SSH, Msg) ->
+    call(SSH, Msg, infinity).
+	
+call(SSH, Msg, Timeout) ->
     case get_handle(SSH) of
 	{ok,Pid} ->
-	    ct_gen_conn:call(Pid, Msg);
+	    ct_gen_conn:call(Pid, Msg, Timeout);
 	Error ->
 	    Error
     end.
@@ -1318,13 +1354,13 @@ call(SSH, Msg) ->
 %%% 
 ref(sftp, SSHRef) -> SSHRef;
 ref(Server, _) -> Server.
-    
+
 %%%-----------------------------------------------------------------
 %%% 
 mod(Cmd) ->
     [Op,_Server|Args] = tuple_to_list(Cmd),
     list_to_tuple([Op|Args]).
-	
+
 %%%-----------------------------------------------------------------
 %%% 	  
 heading(Function, Ref) ->
@@ -1335,6 +1371,20 @@ heading(Function, Ref) ->
 log(Heading, Str, Args) ->
     ct_gen_conn:log(Heading, Str, Args).  
 
+%%%-----------------------------------------------------------------
+%%% 
+try_log(Heading, Str, Args) ->
+    try_log(Heading, Str, Args, infinity).
+
+try_log(Heading, Str, Args, Timeout) ->
+    case ct_util:is_silenced(ssh, Timeout) of
+	true ->
+	    ok;
+	false ->
+	    ct_gen_conn:log(Heading, Str, Args);
+	_Error ->
+	    ok
+    end.
 
 %%%-----------------------------------------------------------------
 %%% 
@@ -1342,5 +1392,5 @@ debug(Str) ->
     debug(Str, []).
 
 debug(_Str, _Args) ->
-%%    io:format("~n--- ct_ssh debug ---~n" ++ _Str ++ "~n", _Args),
+    %%    io:format("~n--- ct_ssh debug ---~n" ++ _Str ++ "~n", _Args),
     ok.
diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index f4a551e3ff..b13c050e32 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -155,6 +155,8 @@ open(KeyOrName,ConnType,TargetMod) ->
 %%% <p><code>TargetMod</code> is a module which exports the functions
 %%% <code>connect(Ip,Port,KeepAlive,Extra)</code> and <code>get_prompt_regexp()</code>
 %%% for the given <code>TargetType</code> (e.g. <code>unix_telnet</code>).</p>
+%%%
+%%% @see ct:require/2
 open(KeyOrName,ConnType,TargetMod,Extra) ->
     case ct:get_config({KeyOrName,ConnType}) of
 	undefined ->
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index 4c05f57520..202d8f9373 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -29,6 +29,8 @@
 
 -include("ct_util.hrl").
 
+-define(testspec_fields, record_info(fields, testspec)).
+
 %%%------------------------------------------------------------------
 %%% NOTE:
 %%% Multiple testspecs may be used as input with the result that
@@ -46,7 +48,8 @@
 %%% Version 1 - extract and return all tests and skips for Node 
 %%%             (incl all_nodes)
 %%%-------------------------------------------------------------------
-prepare_tests(TestSpec,Node) when is_record(TestSpec,testspec), is_atom(Node) ->
+prepare_tests(TestSpec,Node) when is_record(TestSpec,testspec),
+				  is_atom(Node) ->
     case lists:keysearch(Node,1,prepare_tests(TestSpec)) of
 	{value,{Node,Run,Skip}} ->
 	    {Run,Skip};
@@ -249,22 +252,23 @@ collect_tests_from_file1([Spec|Specs],TestSpec,Relaxed) ->
     SpecDir = filename:dirname(filename:absname(Spec)),
     case file:consult(Spec) of
 	{ok,Terms} ->	    
-	    TestSpec1 = collect_tests(Terms,
-				      TestSpec#testspec{spec_dir=SpecDir},
-				      Relaxed),
-	    collect_tests_from_file1(Specs,TestSpec1,Relaxed);
+	    case collect_tests(Terms,
+			       TestSpec#testspec{spec_dir=SpecDir},
+			       Relaxed) of
+		TS = #testspec{tests=Tests, logdir=LogDirs} when Specs == [] ->
+		    LogDirs1 = lists:delete(".",LogDirs) ++ ["."],
+		    TS#testspec{tests=lists:flatten(Tests), logdir=LogDirs1};  
+		TS = #testspec{alias = As, nodes = Ns} ->
+		    TS1 = TS#testspec{alias = lists:reverse(As),
+				      nodes = lists:reverse(Ns)},
+		    collect_tests_from_file1(Specs,TS1,Relaxed)
+	    end;
 	{error,Reason} ->
 	    ReasonStr =
 		lists:flatten(io_lib:format("~s",
 					    [file:format_error(Reason)])),
 	    throw({error,{Spec,ReasonStr}})
-    end;
-collect_tests_from_file1([],TS=#testspec{config=Cfgs,event_handler=EvHs,
-					 include=Incl,tests=Tests},_) ->
-    TS#testspec{config=lists:reverse(Cfgs),
-		event_handler=lists:reverse(EvHs),
-		include=lists:reverse(Incl),
-		tests=lists:flatten(Tests)}.
+    end.
 
 collect_tests_from_list(Terms,Relaxed) ->
     collect_tests_from_list(Terms,[node()],Relaxed).
@@ -278,30 +282,163 @@ collect_tests_from_list(Terms,Nodes,Relaxed) when is_list(Nodes) ->
 	E = {error,_} ->
 	    E;
 	TS ->
-	    #testspec{config=Cfgs,event_handler=EvHs,include=Incl,tests=Tests} = TS,
-	    TS#testspec{config=lists:reverse(Cfgs),
-			event_handler=lists:reverse(EvHs),
-			include=lists:reverse(Incl),
-			tests=lists:flatten(Tests)}
+	    #testspec{tests=Tests, logdir=LogDirs} = TS,
+	    LogDirs1 = lists:delete(".",LogDirs) ++ ["."],
+	    TS#testspec{tests=lists:flatten(Tests), logdir=LogDirs1}
     end.
     
 collect_tests(Terms,TestSpec,Relaxed) ->
     put(relaxed,Relaxed),
-    TestSpec1 = get_global(Terms,TestSpec),
-    TestSpec2 = get_all_nodes(Terms,TestSpec1),
-    {Terms2, TestSpec3} = filter_init_terms(Terms, [], TestSpec2),
+    Terms1 = replace_names(Terms),
+    TestSpec1 = get_global(Terms1,TestSpec),
+    TestSpec2 = get_all_nodes(Terms1,TestSpec1),
+    {Terms2, TestSpec3} = filter_init_terms(Terms1, [], TestSpec2),
     add_tests(Terms2,TestSpec3).
 
-get_global([{merge_tests, Bool} | Ts], Spec) ->
-    get_global(Ts,Spec#testspec{ merge_tests = Bool });
+%% replace names (atoms) in the testspec matching those in 'define' terms by
+%% searching recursively through tuples and lists
+replace_names(Terms) ->
+    Defs =
+	lists:flatmap(fun(Def={define,Name,_Replacement}) ->
+			      %% check that name follows convention
+			      if not is_atom(Name) ->
+				      throw({illegal_name_in_testspec,Name});
+				 true ->
+				      [First|_] = atom_to_list(Name),
+				      if ((First == $?) or (First == $$)
+					  or (First == $_)
+					  or ((First >= $A)
+					      and (First =< $Z))) ->
+					      [Def];
+					 true ->
+					      throw({illegal_name_in_testspec,
+						     Name})
+				      end
+			      end;
+			 (_) -> []
+		      end, Terms),
+    DefProps = replace_names_in_defs(Defs,[]),
+    replace_names(Terms,[],DefProps).
+
+replace_names_in_defs([Def|Left],ModDefs) ->
+    [{define,Name,Replacement}] = replace_names([Def],[],ModDefs),
+    replace_names_in_defs(Left,[{Name,Replacement}|ModDefs]);
+replace_names_in_defs([],ModDefs) ->
+    ModDefs.
+
+replace_names([Term|Ts],Modified,Defs) when is_tuple(Term) ->
+    [TypeTag|Data] = tuple_to_list(Term),
+    Term1 = list_to_tuple([TypeTag|replace_names_in_elems(Data,[],Defs)]),
+    replace_names(Ts,[Term1|Modified],Defs);
+replace_names([Term|Ts],Modified,Defs) when is_atom(Term) ->
+    case proplists:get_value(Term,Defs) of
+	undefined ->
+	    replace_names(Ts,[Term|Modified],Defs);
+	Replacement ->
+	    replace_names(Ts,[Replacement|Modified],Defs)
+    end;
+replace_names([Term=[Ch|_]|Ts],Modified,Defs) when is_integer(Ch) ->
+    %% Term *could* be a string, attempt to search through it
+    Term1 = replace_names_in_string(Term,Defs),
+    replace_names(Ts,[Term1|Modified],Defs);
+replace_names([Term|Ts],Modified,Defs) ->
+    replace_names(Ts,[Term|Modified],Defs);
+replace_names([],Modified,_Defs) ->
+    lists:reverse(Modified).
+
+replace_names_in_elems([Elem|Es],Modified,Defs) when is_tuple(Elem) ->
+    Elem1 = list_to_tuple(replace_names_in_elems(tuple_to_list(Elem),[],Defs)),
+    replace_names_in_elems(Es,[Elem1|Modified],Defs);
+replace_names_in_elems([Elem|Es],Modified,Defs) when is_atom(Elem) ->
+    case proplists:get_value(Elem,Defs) of
+	undefined ->
+	    %% if Term is a node name, check it for replacements as well
+	    Elem1 = replace_names_in_node(Elem,Defs),
+	    replace_names_in_elems(Es,[Elem1|Modified],Defs);
+	Replacement ->
+	    replace_names_in_elems(Es,[Replacement|Modified],Defs)
+    end;
+replace_names_in_elems([Elem=[Ch|_]|Es],Modified,Defs) when is_integer(Ch) ->
+    %% Term *could* be a string, attempt to search through it
+    case replace_names_in_string(Elem,Defs) of
+	Elem ->
+	    List = replace_names_in_elems(Elem,[],Defs),
+	    replace_names_in_elems(Es,[List|Modified],Defs);
+	Elem1 ->
+	    replace_names_in_elems(Es,[Elem1|Modified],Defs)
+    end;
+replace_names_in_elems([Elem|Es],Modified,Defs) when is_list(Elem) ->
+    List = replace_names_in_elems(Elem,[],Defs),
+    replace_names_in_elems(Es,[List|Modified],Defs);
+replace_names_in_elems([Elem|Es],Modified,Defs) ->
+    replace_names_in_elems(Es,[Elem|Modified],Defs);
+replace_names_in_elems([],Modified,_Defs) ->
+    lists:reverse(Modified).
+
+replace_names_in_string(Term,Defs=[{Name,Replacement=[Ch|_]}|Ds])
+  when is_integer(Ch) ->
+    try re:replace(Term,[$'|atom_to_list(Name)]++"'",
+		   Replacement,[{return,list}]) of
+	Term ->					% no match, proceed
+	    replace_names_in_string(Term,Ds);
+	Term1 ->
+	    replace_names_in_string(Term1,Defs)
+    catch
+	_:_ -> Term			% Term is not a string
+    end;
+replace_names_in_string(Term,[_|Ds]) ->
+    replace_names_in_string(Term,Ds);
+replace_names_in_string(Term,[]) ->
+    Term.
+
+replace_names_in_node(Node,Defs) ->
+    String = atom_to_list(Node),
+    case lists:member($@,String) of
+	true ->
+	    list_to_atom(replace_names_in_node1(String,Defs));
+	false ->
+	    Node
+    end.
+
+replace_names_in_node1(NodeStr,Defs=[{Name,Replacement}|Ds]) ->
+    ReplStr = case Replacement of
+		  [Ch|_] when is_integer(Ch) -> Replacement;
+		  _ when is_atom(Replacement) -> atom_to_list(Replacement);
+		  _ -> false
+	      end,
+    if ReplStr == false ->
+	    replace_names_in_node1(NodeStr,Ds);
+       true ->
+	    case re:replace(NodeStr,atom_to_list(Name),
+			    ReplStr,[{return,list}]) of
+		NodeStr ->			% no match, proceed
+		    replace_names_in_node1(NodeStr,Ds);
+		NodeStr1 ->
+		    replace_names_in_node1(NodeStr1,Defs)
+	    end
+    end;
+replace_names_in_node1(NodeStr,[]) ->
+    NodeStr.
+
+
+%% global terms that will be used for analysing all other terms in the spec
+get_global([{merge_tests,Bool} | Ts], Spec) ->
+    get_global(Ts,Spec#testspec{merge_tests=Bool});
+
+%% the 'define' term replaces the 'alias' and 'node' terms, but we need to keep
+%% the latter two for backwards compatibility...
 get_global([{alias,Ref,Dir}|Ts],Spec=#testspec{alias=Refs}) ->
     get_global(Ts,Spec#testspec{alias=[{Ref,get_absdir(Dir,Spec)}|Refs]});
 get_global([{node,Ref,Node}|Ts],Spec=#testspec{nodes=Refs}) ->
-    get_global(Ts,Spec#testspec{nodes=[{Ref,Node}|lists:keydelete(Node,2,Refs)]});
-get_global([_|Ts],Spec) -> get_global(Ts,Spec);
-get_global([],Spec) -> Spec.
+    get_global(Ts,Spec#testspec{nodes=[{Ref,Node} |
+				       lists:keydelete(Node,2,Refs)]});
 
-get_absfile(Callback, FullName,#testspec{spec_dir=SpecDir}) ->
+get_global([_|Ts],Spec) ->
+    get_global(Ts,Spec);
+get_global([],Spec=#testspec{nodes=Ns, alias=As}) ->
+    Spec#testspec{nodes=lists:reverse(Ns), alias=lists:reverse(As)}.
+
+get_absfile(Callback,FullName,#testspec{spec_dir=SpecDir}) ->
     % we need to temporary switch to new cwd here, because
     % otherwise config files cannot be found
     {ok, OldWd} = file:get_cwd(),
@@ -329,29 +466,45 @@ get_absfile(FullName,#testspec{spec_dir=SpecDir}) ->
 get_absdir(Dir,#testspec{spec_dir=SpecDir}) ->
     get_absname(Dir,SpecDir).
 
-get_absname(TestDir,SpecDir) ->
-    AbsName = filename:absname(TestDir,SpecDir),
-    TestDirName = filename:basename(AbsName),
-    Path = filename:dirname(AbsName),
-    TopDir = filename:basename(Path),
-    Path1 =
-	case TopDir of
-	    "." ->
-		[_|Rev] = lists:reverse(filename:split(Path)),
-		filename:join(lists:reverse(Rev));
-	    ".." ->
-		[_,_|Rev] = lists:reverse(filename:split(Path)),
-		filename:join(lists:reverse(Rev));
-	    _ ->
-		Path
-	end,
-    filename:join(Path1,TestDirName).
+get_absname(Dir,SpecDir) ->
+    AbsName = filename:absname(Dir,SpecDir),
+    shorten_path(AbsName,SpecDir).
+
+shorten_path(Path,SpecDir) ->
+    case shorten_split_path(filename:split(Path),[]) of
+	[] ->
+	    [Root|_] = filename:split(SpecDir),
+	    Root;
+	Short ->	    
+	    filename:join(Short)
+    end.
+
+shorten_split_path([".."|Path],SoFar) ->
+    shorten_split_path(Path,tl(SoFar));
+shorten_split_path(["."|Path],SoFar) ->
+    shorten_split_path(Path,SoFar);
+shorten_split_path([Dir|Path],SoFar) ->
+    shorten_split_path(Path,[Dir|SoFar]);
+shorten_split_path([],SoFar) ->
+    lists:reverse(SoFar).
 
 %% go through all tests and register all nodes found
 get_all_nodes([{suites,Nodes,_,_}|Ts],Spec) when is_list(Nodes) ->
     get_all_nodes(Ts,save_nodes(Nodes,Spec));
 get_all_nodes([{suites,Node,_,_}|Ts],Spec) ->
     get_all_nodes(Ts,save_nodes([Node],Spec));
+get_all_nodes([{groups,[Char|_],_,_,_}|Ts],Spec) when is_integer(Char) ->
+    get_all_nodes(Ts,Spec);
+get_all_nodes([{groups,Nodes,_,_,_}|Ts],Spec) when is_list(Nodes) ->
+    get_all_nodes(Ts,save_nodes(Nodes,Spec));
+get_all_nodes([{groups,Nodes,_,_,_,_}|Ts],Spec) when is_list(Nodes) ->
+    get_all_nodes(Ts,save_nodes(Nodes,Spec));
+get_all_nodes([{groups,_,_,_,{cases,_}}|Ts],Spec) ->
+    get_all_nodes(Ts,Spec);
+get_all_nodes([{groups,Node,_,_,_}|Ts],Spec) ->
+    get_all_nodes(Ts,save_nodes([Node],Spec));
+get_all_nodes([{groups,Node,_,_,_,_}|Ts],Spec) ->
+    get_all_nodes(Ts,save_nodes([Node],Spec));
 get_all_nodes([{cases,Nodes,_,_,_}|Ts],Spec) when is_list(Nodes) ->
     get_all_nodes(Ts,save_nodes(Nodes,Spec));
 get_all_nodes([{cases,Node,_,_,_}|Ts],Spec) ->
@@ -360,74 +513,93 @@ get_all_nodes([{skip_suites,Nodes,_,_,_}|Ts],Spec) when is_list(Nodes) ->
     get_all_nodes(Ts,save_nodes(Nodes,Spec));
 get_all_nodes([{skip_suites,Node,_,_,_}|Ts],Spec) ->
     get_all_nodes(Ts,save_nodes([Node],Spec));
+get_all_nodes([{skip_groups,[Char|_],_,_,_,_}|Ts],Spec) when is_integer(Char) ->
+    get_all_nodes(Ts,Spec);
+get_all_nodes([{skip_groups,Nodes,_,_,_,_}|Ts],Spec) when is_list(Nodes) ->
+    get_all_nodes(Ts,save_nodes(Nodes,Spec));
+get_all_nodes([{skip_groups,Node,_,_,_,_}|Ts],Spec) ->
+    get_all_nodes(Ts,save_nodes([Node],Spec));
+get_all_nodes([{skip_groups,Nodes,_,_,_,_,_}|Ts],Spec) when is_list(Nodes) ->
+    get_all_nodes(Ts,save_nodes(Nodes,Spec));
+get_all_nodes([{skip_groups,Node,_,_,_,_,_}|Ts],Spec) ->
+    get_all_nodes(Ts,save_nodes([Node],Spec));
 get_all_nodes([{skip_cases,Nodes,_,_,_,_}|Ts],Spec) when is_list(Nodes) ->
     get_all_nodes(Ts,save_nodes(Nodes,Spec));
 get_all_nodes([{skip_cases,Node,_,_,_,_}|Ts],Spec) ->
     get_all_nodes(Ts,save_nodes([Node],Spec));
-get_all_nodes([_|Ts],Spec) ->
+get_all_nodes([_Other|Ts],Spec) ->
     get_all_nodes(Ts,Spec);
 get_all_nodes([],Spec) ->
     Spec.
 
-filter_init_terms([{init, InitOptions}|Ts], NewTerms, Spec)->
-    filter_init_terms([{init, list_nodes(Spec), InitOptions}|Ts], NewTerms, Spec);
-filter_init_terms([{init, NodeRef, InitOptions}|Ts], NewTerms, Spec)
-    when is_atom(NodeRef)->
-    filter_init_terms([{init, [NodeRef], InitOptions}|Ts], NewTerms, Spec);
-filter_init_terms([{init, NodeRefs, InitOption}|Ts], NewTerms, Spec) when is_tuple(InitOption) ->
-    filter_init_terms([{init, NodeRefs, [InitOption]}|Ts], NewTerms, Spec);
-filter_init_terms([{init, [NodeRef|NodeRefs], InitOptions}|Ts], NewTerms, Spec=#testspec{init=InitData})->
-    NodeStartOptions = case lists:keyfind(node_start, 1, InitOptions) of
-	{node_start, NSOptions}->
-	    case lists:keyfind(callback_module, 1, NSOptions) of
-		{callback_module, _Callback}->
-		    NSOptions;
-		false->
-		    [{callback_module, ct_slave}|NSOptions]
-	    end;
-	false->
-	    []
-    end,
-    EvalTerms = case lists:keyfind(eval, 1, InitOptions) of
-	{eval, MFA} when is_tuple(MFA)->
-	    [MFA];
-	{eval, MFAs} when is_list(MFAs)->
-	    MFAs;
-	false->
-	    []
-    end,
+filter_init_terms([{init,InitOptions}|Ts],NewTerms,Spec) ->
+    filter_init_terms([{init,list_nodes(Spec),InitOptions}|Ts],
+		      NewTerms,Spec);
+filter_init_terms([{init,all_nodes,InitOptions}|Ts],NewTerms,Spec) ->
+    filter_init_terms([{init,list_nodes(Spec),InitOptions}|Ts],
+		      NewTerms,Spec);
+filter_init_terms([{init,NodeRef,InitOptions}|Ts],
+		  NewTerms,Spec) when is_atom(NodeRef) ->
+    filter_init_terms([{init,[NodeRef],InitOptions}|Ts],NewTerms,Spec);
+filter_init_terms([{init,NodeRefs,InitOption}|Ts],
+		  NewTerms,Spec) when is_tuple(InitOption) ->
+    filter_init_terms([{init,NodeRefs,[InitOption]}|Ts],NewTerms,Spec);
+filter_init_terms([{init,[NodeRef|NodeRefs],InitOptions}|Ts],
+		  NewTerms,Spec=#testspec{init=InitData}) ->
+    NodeStartOptions =
+	case lists:keyfind(node_start,1,InitOptions) of
+	    {node_start,NSOptions}->
+		case lists:keyfind(callback_module,1,NSOptions) of
+		    {callback_module,_Callback}->
+			NSOptions;
+		    false->
+			[{callback_module,ct_slave}|NSOptions]
+		end;
+	    false->
+		[]
+	end,
+    EvalTerms = case lists:keyfind(eval,1,InitOptions) of
+		    {eval,MFA} when is_tuple(MFA) ->
+			[MFA];
+		    {eval,MFAs} when is_list(MFAs) ->
+			MFAs;
+		    false->
+			[]
+		end,
     Node = ref2node(NodeRef,Spec#testspec.nodes),
-    InitData2 = add_option({node_start, NodeStartOptions}, Node, InitData, true),
-    InitData3 = add_option({eval, EvalTerms}, Node, InitData2, false),
-    filter_init_terms([{init, NodeRefs, InitOptions}|Ts], NewTerms, Spec#testspec{init=InitData3});
-filter_init_terms([{init, [], _}|Ts], NewTerms, Spec)->
-    filter_init_terms(Ts, NewTerms, Spec);
-filter_init_terms([Term|Ts], NewTerms, Spec)->
-    filter_init_terms(Ts, [Term|NewTerms], Spec);
-filter_init_terms([], NewTerms, Spec)->
-    {lists:reverse(NewTerms), Spec}.
-
-add_option({Key, Value}, Node, List, WarnIfExists) when is_list(Value)->
-    OldOptions = case lists:keyfind(Node, 1, List) of
-	{Node, Options}->
+    InitData2 = add_option({node_start,NodeStartOptions},Node,InitData,true),
+    InitData3 = add_option({eval,EvalTerms},Node,InitData2,false),
+    filter_init_terms([{init,NodeRefs,InitOptions}|Ts],
+		      NewTerms,Spec#testspec{init=InitData3});
+filter_init_terms([{init,[],_}|Ts],NewTerms,Spec) ->
+    filter_init_terms(Ts,NewTerms,Spec);
+filter_init_terms([Term|Ts],NewTerms,Spec) ->
+    filter_init_terms(Ts,[Term|NewTerms],Spec);
+filter_init_terms([],NewTerms,Spec) ->
+    {lists:reverse(NewTerms),Spec}.
+
+add_option({Key,Value},Node,List,WarnIfExists) when is_list(Value) ->
+    OldOptions = case lists:keyfind(Node,1,List) of
+	{Node,Options}->
 	    Options;
 	false->
 	    []
     end,
-    NewOption = case lists:keyfind(Key, 1, OldOptions) of
-	{Key, OldOption} when WarnIfExists, OldOption/=[]->
-	    io:format("There is an option ~w=~w already defined for node ~p, skipping new ~w~n",
-		[Key, OldOption, Node, Value]),
+    NewOption = case lists:keyfind(Key,1,OldOptions) of
+	{Key,OldOption} when WarnIfExists,OldOption/=[]->
+	    io:format("There is an option ~w=~w already "
+		      "defined for node ~p, skipping new ~w~n",
+		[Key,OldOption,Node,Value]),
 	    OldOption;
-	{Key, OldOption}->
+	{Key,OldOption}->
 	    OldOption ++ Value;
 	false->
 	    Value
     end,
-    lists:keystore(Node, 1, List,
-	{Node, lists:keystore(Key, 1, OldOptions, {Key, NewOption})});
-add_option({Key, Value}, Node, List, WarnIfExists)->
-    add_option({Key, [Value]}, Node, List, WarnIfExists).
+    lists:keystore(Node,1,List,
+	{Node,lists:keystore(Key,1,OldOptions,{Key,NewOption})});
+add_option({Key,Value},Node,List,WarnIfExists) ->
+    add_option({Key,[Value]},Node,List,WarnIfExists).
 
 save_nodes(Nodes,Spec=#testspec{nodes=NodeRefs}) ->
     NodeRefs1 =
@@ -446,267 +618,18 @@ save_nodes(Nodes,Spec=#testspec{nodes=NodeRefs}) ->
 				    end
 			    end
 		    end,NodeRefs,Nodes),
-    Spec#testspec{nodes=NodeRefs1}.    							
+    Spec#testspec{nodes=NodeRefs1}.
 
 list_nodes(#testspec{nodes=NodeRefs}) ->
     lists:map(fun({_Ref,Node}) -> Node end, NodeRefs).		      
 
 
-
-%%     ---------------------------------------------------------
-%%   /                                                           \
-%%  |  When adding tests, remember to update valid_terms/0 also!  |
-%%   \                                                           /
-%%     ---------------------------------------------------------
-
-
-%% Associate a "global" logdir with all nodes
-%% except those with specific logdir, e.g:
-%% ["/tmp/logdir",{ct1@finwe,"/tmp/logdir2"}]
-%% means all nodes should write to /tmp/logdir
-%% except ct1@finwe that should use /tmp/logdir2.
-
-%% --- logdir ---
-add_tests([{logdir,all_nodes,Dir}|Ts],Spec) ->
-    Dirs = Spec#testspec.logdir,
-    Tests = [{logdir,N,get_absdir(Dir,Spec)} || 
-		N <- list_nodes(Spec),
-		lists:keymember(ref2node(N,Spec#testspec.nodes),
-				1,Dirs) == false],
-    add_tests(Tests++Ts,Spec);
-add_tests([{logdir,Nodes,Dir}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,logdir,[Dir],Ts,Spec#testspec.nodes),
-    add_tests(Ts1,Spec);    
-add_tests([{logdir,Node,Dir}|Ts],Spec) ->
-    Dirs = Spec#testspec.logdir,
-    Dirs1 = [{ref2node(Node,Spec#testspec.nodes),get_absdir(Dir,Spec)} |
-	     lists:keydelete(ref2node(Node,Spec#testspec.nodes),1,Dirs)],
-    add_tests(Ts,Spec#testspec{logdir=Dirs1});
-add_tests([{logdir,Dir}|Ts],Spec) ->
-    add_tests([{logdir,all_nodes,Dir}|Ts],Spec);
-
-%% --- logopts ---
-add_tests([{logopts,all_nodes,Opts}|Ts],Spec) ->
-    LogOpts = Spec#testspec.logopts,
-    Tests = [{logopts,N,Opts} ||
-		N <- list_nodes(Spec),
-		lists:keymember(ref2node(N,Spec#testspec.nodes),1,
-				LogOpts) == false],
-    add_tests(Tests++Ts,Spec);
-add_tests([{logopts,Nodes,Opts}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,logopts,[Opts],Ts,Spec#testspec.nodes),
-    add_tests(Ts1,Spec);
-add_tests([{logopts,Node,Opts}|Ts],Spec) ->
-    LogOpts = Spec#testspec.logopts,
-    LogOpts1 = [{ref2node(Node,Spec#testspec.nodes),Opts} |
-		lists:keydelete(ref2node(Node,Spec#testspec.nodes),
-				1,LogOpts)],
-    add_tests(Ts,Spec#testspec{logopts=LogOpts1});
-add_tests([{logopts,Opts}|Ts],Spec) ->
-    add_tests([{logopts,all_nodes,Opts}|Ts],Spec);
-
-%% --- label ---
-add_tests([{label,all_nodes,Lbl}|Ts],Spec) ->
-    Labels = Spec#testspec.label,
-    Tests = [{label,N,Lbl} || N <- list_nodes(Spec),
-			      lists:keymember(ref2node(N,Spec#testspec.nodes),
-					      1,Labels) == false],
-    add_tests(Tests++Ts,Spec);
-add_tests([{label,Nodes,Lbl}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,label,[Lbl],Ts,Spec#testspec.nodes),
-    add_tests(Ts1,Spec);
-add_tests([{label,Node,Lbl}|Ts],Spec) ->
-    Labels = Spec#testspec.label,
-    Labels1 = [{ref2node(Node,Spec#testspec.nodes),Lbl} |
-	       lists:keydelete(ref2node(Node,Spec#testspec.nodes),1,Labels)],
-    add_tests(Ts,Spec#testspec{label=Labels1});
-add_tests([{label,Lbl}|Ts],Spec) ->
-    add_tests([{label,all_nodes,Lbl}|Ts],Spec);
-
-%% --- cover ---
-add_tests([{cover,all_nodes,File}|Ts],Spec) ->
-    Tests = lists:map(fun(N) -> {cover,N,File} end, list_nodes(Spec)),
-    add_tests(Tests++Ts,Spec);
-add_tests([{cover,Nodes,File}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,cover,[File],Ts,Spec#testspec.nodes),
-    add_tests(Ts1,Spec);    
-add_tests([{cover,Node,File}|Ts],Spec) ->
-    CoverFs = Spec#testspec.cover,
-    CoverFs1 = [{ref2node(Node,Spec#testspec.nodes),get_absfile(File,Spec)} |
-		lists:keydelete(ref2node(Node,Spec#testspec.nodes),1,CoverFs)],
-    add_tests(Ts,Spec#testspec{cover=CoverFs1});
-add_tests([{cover,File}|Ts],Spec) ->
-    add_tests([{cover,all_nodes,File}|Ts],Spec);
-
-%% --- multiply_timetraps ---
-add_tests([{multiply_timetraps,all_nodes,MT}|Ts],Spec) ->
-    Tests = lists:map(fun(N) -> {multiply_timetraps,N,MT} end, list_nodes(Spec)),
-    add_tests(Tests++Ts,Spec);
-add_tests([{multiply_timetraps,Nodes,MT}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,multiply_timetraps,[MT],Ts,Spec#testspec.nodes),
-    add_tests(Ts1,Spec);
-add_tests([{multiply_timetraps,Node,MT}|Ts],Spec) ->
-    MTs = Spec#testspec.multiply_timetraps,
-    MTs1 = [{ref2node(Node,Spec#testspec.nodes),MT} |
-	    lists:keydelete(ref2node(Node,Spec#testspec.nodes),1,MTs)],
-    add_tests(Ts,Spec#testspec{multiply_timetraps=MTs1});
-add_tests([{multiply_timetraps,MT}|Ts],Spec) ->
-    add_tests([{multiply_timetraps,all_nodes,MT}|Ts],Spec);
-
-%% --- scale_timetraps ---
-add_tests([{scale_timetraps,all_nodes,ST}|Ts],Spec) ->
-    Tests = lists:map(fun(N) -> {scale_timetraps,N,ST} end, list_nodes(Spec)),
-    add_tests(Tests++Ts,Spec);
-add_tests([{scale_timetraps,Nodes,ST}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,scale_timetraps,[ST],Ts,Spec#testspec.nodes),
-    add_tests(Ts1,Spec);
-add_tests([{scale_timetraps,Node,ST}|Ts],Spec) ->
-    STs = Spec#testspec.scale_timetraps,
-    STs1 = [{ref2node(Node,Spec#testspec.nodes),ST} |
-	    lists:keydelete(ref2node(Node,Spec#testspec.nodes),1,STs)],
-    add_tests(Ts,Spec#testspec{scale_timetraps=STs1});
-add_tests([{scale_timetraps,ST}|Ts],Spec) ->
-    add_tests([{scale_timetraps,all_nodes,ST}|Ts],Spec);
-
-%% --- create_priv_dir ---
-add_tests([{create_priv_dir,all_nodes,PD}|Ts],Spec) ->
-    Tests = lists:map(fun(N) -> {create_priv_dir,N,PD} end, list_nodes(Spec)),
-    add_tests(Tests++Ts,Spec);
-add_tests([{create_priv_dir,Nodes,PD}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,create_priv_dir,[PD],Ts,Spec#testspec.nodes),
-    add_tests(Ts1,Spec);
-add_tests([{create_priv_dir,Node,PD}|Ts],Spec) ->
-    PDs = Spec#testspec.create_priv_dir,
-    PDs1 = [{ref2node(Node,Spec#testspec.nodes),PD} |
-	    lists:keydelete(ref2node(Node,Spec#testspec.nodes),1,PDs)],
-    add_tests(Ts,Spec#testspec{create_priv_dir=PDs1});
-add_tests([{create_priv_dir,PD}|Ts],Spec) ->
-    add_tests([{create_priv_dir,all_nodes,PD}|Ts],Spec);
-
-%% --- config ---
-add_tests([{config,all_nodes,Files}|Ts],Spec) ->
-    Tests = lists:map(fun(N) -> {config,N,Files} end, list_nodes(Spec)),
-    add_tests(Tests++Ts,Spec);
-add_tests([{config,Nodes,Files}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,config,[Files],Ts,Spec#testspec.nodes),
-    add_tests(Ts1,Spec);
-add_tests([{config,Node,[F|Fs]}|Ts],Spec) when is_list(F) ->
-    Cfgs = Spec#testspec.config,
-    Node1 = ref2node(Node,Spec#testspec.nodes),
-    add_tests([{config,Node,Fs}|Ts],
-	      Spec#testspec{config=[{Node1,get_absfile(F,Spec)}|Cfgs]});
-add_tests([{config,_Node,[]}|Ts],Spec) ->
-    add_tests(Ts,Spec);
-add_tests([{config,Node,F}|Ts],Spec) ->
-    add_tests([{config,Node,[F]}|Ts],Spec);
-add_tests([{config,Files}|Ts],Spec) ->
-    add_tests([{config,all_nodes,Files}|Ts],Spec);
-
-
-%% --- userconfig ---
-add_tests([{userconfig,all_nodes,CBF}|Ts],Spec) ->
-    Tests = lists:map(fun(N) -> {userconfig,N,CBF} end, list_nodes(Spec)),
-    add_tests(Tests++Ts,Spec);
-add_tests([{userconfig,Nodes,CBF}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,userconfig,[CBF],Ts,Spec#testspec.nodes),
-    add_tests(Ts1,Spec);
-add_tests([{userconfig,Node,[{Callback, Config}|CBF]}|Ts],Spec) ->
-    Cfgs = Spec#testspec.userconfig,
-    Node1 = ref2node(Node,Spec#testspec.nodes),
-    add_tests([{userconfig,Node,CBF}|Ts],
-	      Spec#testspec{userconfig=[{Node1,{Callback,
-				get_absfile(Callback, Config ,Spec)}}|Cfgs]});
-add_tests([{userconfig,_Node,[]}|Ts],Spec) ->
-    add_tests(Ts,Spec);
-add_tests([{userconfig,Node,CBF}|Ts],Spec) ->
-    add_tests([{userconfig,Node,[CBF]}|Ts],Spec);
-add_tests([{userconfig,CBF}|Ts],Spec) ->
-    add_tests([{userconfig,all_nodes,CBF}|Ts],Spec);
-
-%% --- event_handler ---
-add_tests([{event_handler,all_nodes,Hs}|Ts],Spec) ->
-    Tests = lists:map(fun(N) -> {event_handler,N,Hs,[]} end, list_nodes(Spec)),
-    add_tests(Tests++Ts,Spec);
-add_tests([{event_handler,all_nodes,Hs,Args}|Ts],Spec) when is_list(Args) ->
-    Tests = lists:map(fun(N) -> {event_handler,N,Hs,Args} end, list_nodes(Spec)),
-    add_tests(Tests++Ts,Spec);
-add_tests([{event_handler,Hs}|Ts],Spec) ->
-    add_tests([{event_handler,all_nodes,Hs,[]}|Ts],Spec);
-add_tests([{event_handler,HsOrNodes,HsOrArgs}|Ts],Spec) ->
-    case is_noderef(HsOrNodes,Spec#testspec.nodes) of
-	true ->					% HsOrNodes == Nodes, HsOrArgs == Hs
-	    case {HsOrNodes,HsOrArgs} of
-		{Nodes,Hs} when is_list(Nodes) ->
-		    Ts1 = separate(Nodes,event_handler,[Hs,[]],Ts,
-				   Spec#testspec.nodes),
-		    add_tests(Ts1,Spec);
-		{_Node,[]} ->		    
-		    add_tests(Ts,Spec);
-		{Node,HOrHs} ->
-		    EvHs = Spec#testspec.event_handler,
-		    Node1 = ref2node(Node,Spec#testspec.nodes),
-		    case HOrHs of
-			[H|Hs] when is_atom(H) ->
-			    add_tests([{event_handler,Node,Hs}|Ts],
-				      Spec#testspec{event_handler=[{Node1,H,[]}|EvHs]});
-			H when is_atom(H) ->
-			    add_tests(Ts,Spec#testspec{event_handler=[{Node1,H,[]}|EvHs]})
-		    end
-	    end;
-	false ->				% HsOrNodes == Hs, HsOrArgs == Args
-	    add_tests([{event_handler,all_nodes,HsOrNodes,HsOrArgs}|Ts],Spec)
-    end;
-add_tests([{event_handler,Nodes,Hs,Args}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,event_handler,[Hs,Args],Ts,Spec#testspec.nodes),
-    add_tests(Ts1,Spec);
-add_tests([{event_handler,Node,[H|Hs],Args}|Ts],Spec) when is_atom(H) ->
-    EvHs = Spec#testspec.event_handler,
-    Node1 = ref2node(Node,Spec#testspec.nodes),
-    add_tests([{event_handler,Node,Hs,Args}|Ts],
-	      Spec#testspec{event_handler=[{Node1,H,Args}|EvHs]});
-add_tests([{event_handler,_Node,[],_Args}|Ts],Spec) ->
-    add_tests(Ts,Spec);
-add_tests([{event_handler,Node,H,Args}|Ts],Spec) when is_atom(H) ->
-    EvHs = Spec#testspec.event_handler,
-    Node1 = ref2node(Node,Spec#testspec.nodes),
-    add_tests(Ts,Spec#testspec{event_handler=[{Node1,H,Args}|EvHs]});
-
-%% --- ct_hooks --
-add_tests([{ct_hooks, all_nodes, Hooks} | Ts], Spec) ->
-    Tests = [{ct_hooks,N,Hooks} || N <- list_nodes(Spec)],
-    add_tests(Tests ++ Ts, Spec);
-add_tests([{ct_hooks, Node, [Hook|Hooks]}|Ts], Spec) ->
-    SuiteCbs = Spec#testspec.ct_hooks,
-    Node1 = ref2node(Node,Spec#testspec.nodes),
-    add_tests([{ct_hooks, Node, Hooks} | Ts],
-	      Spec#testspec{ct_hooks = [{Node1,Hook} | SuiteCbs]});
-add_tests([{ct_hooks, _Node, []}|Ts], Spec) ->
-    add_tests(Ts, Spec);
-add_tests([{ct_hooks, Hooks}|Ts], Spec) ->
-    add_tests([{ct_hooks, all_nodes, Hooks}|Ts], Spec);
-
-%% -- enable_builtin_hooks --
-add_tests([{enable_builtin_hooks,Bool}|Ts],Spec) ->
-    add_tests(Ts, Spec#testspec{ enable_builtin_hooks = Bool });
-
-%% --- include ---
-add_tests([{include,all_nodes,InclDirs}|Ts],Spec) ->
-    Tests = lists:map(fun(N) -> {include,N,InclDirs} end, list_nodes(Spec)),
-    add_tests(Tests++Ts,Spec);
-add_tests([{include,Nodes,InclDirs}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,include,[InclDirs],Ts,Spec#testspec.nodes),
-    add_tests(Ts1,Spec);
-add_tests([{include,Node,[D|Ds]}|Ts],Spec) when is_list(D) ->
-    Dirs = Spec#testspec.include,
-    Node1 = ref2node(Node,Spec#testspec.nodes),
-    add_tests([{include,Node,Ds}|Ts],
-	      Spec#testspec{include=[{Node1,get_absdir(D,Spec)}|Dirs]});
-add_tests([{include,_Node,[]}|Ts],Spec) ->
-    add_tests(Ts,Spec);
-add_tests([{include,Node,D}|Ts],Spec) ->
-    add_tests([{include,Node,[D]}|Ts],Spec);
-add_tests([{include,InclDirs}|Ts],Spec) ->
-    add_tests([{include,all_nodes,InclDirs}|Ts],Spec);
+%%     -----------------------------------------------------
+%%   /                                                       \
+%%  |  When adding test/config terms, remember to update      |
+%%  |  valid_terms/0 also!                                    |
+%%   \                                                       /
+%%     -----------------------------------------------------
 
 %% --- suites ---
 add_tests([{suites,all_nodes,Dir,Ss}|Ts],Spec) ->
@@ -719,7 +642,7 @@ add_tests([{suites,Nodes,Dir,Ss}|Ts],Spec) when is_list(Nodes) ->
 add_tests([{suites,Node,Dir,Ss}|Ts],Spec) ->
     Tests = Spec#testspec.tests,
     Tests1 = insert_suites(ref2node(Node,Spec#testspec.nodes),
-			   ref2dir(Dir,Spec#testspec.alias),
+			   ref2dir(Dir,Spec),
 			   Ss,Tests, Spec#testspec.merge_tests),
     add_tests(Ts,Spec#testspec{tests=Tests1});
 
@@ -739,20 +662,22 @@ add_tests([{groups,Dir,Suite,Gs,{cases,TCs}}|Ts],Spec) ->
 add_tests([{groups,Nodes,Dir,Suite,Gs}|Ts],Spec) when is_list(Nodes) ->
     Ts1 = separate(Nodes,groups,[Dir,Suite,Gs],Ts,Spec#testspec.nodes),
     add_tests(Ts1,Spec);
-add_tests([{groups,Nodes,Dir,Suite,Gs,{cases,TCs}}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,groups,[Dir,Suite,Gs,{cases,TCs}],Ts,Spec#testspec.nodes),
+add_tests([{groups,Nodes,Dir,Suite,Gs,{cases,TCs}}|Ts],
+	  Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,groups,[Dir,Suite,Gs,{cases,TCs}],Ts,
+		   Spec#testspec.nodes),
     add_tests(Ts1,Spec);
 add_tests([{groups,Node,Dir,Suite,Gs}|Ts],Spec) ->
     Tests = Spec#testspec.tests,
     Tests1 = insert_groups(ref2node(Node,Spec#testspec.nodes),
-			   ref2dir(Dir,Spec#testspec.alias),
+			   ref2dir(Dir,Spec),
 			   Suite,Gs,all,Tests,
 			   Spec#testspec.merge_tests),
     add_tests(Ts,Spec#testspec{tests=Tests1});
 add_tests([{groups,Node,Dir,Suite,Gs,{cases,TCs}}|Ts],Spec) ->
     Tests = Spec#testspec.tests,
     Tests1 = insert_groups(ref2node(Node,Spec#testspec.nodes),
-			   ref2dir(Dir,Spec#testspec.alias),
+			   ref2dir(Dir,Spec),
 			   Suite,Gs,TCs,Tests,
 			   Spec#testspec.merge_tests),
     add_tests(Ts,Spec#testspec{tests=Tests1});
@@ -768,7 +693,7 @@ add_tests([{cases,Nodes,Dir,Suite,Cs}|Ts],Spec) when is_list(Nodes) ->
 add_tests([{cases,Node,Dir,Suite,Cs}|Ts],Spec) ->
     Tests = Spec#testspec.tests,
     Tests1 = insert_cases(ref2node(Node,Spec#testspec.nodes),
-			  ref2dir(Dir,Spec#testspec.alias),
+			  ref2dir(Dir,Spec),
 			  Suite,Cs,Tests, Spec#testspec.merge_tests),
     add_tests(Ts,Spec#testspec{tests=Tests1});
 
@@ -783,7 +708,7 @@ add_tests([{skip_suites,Nodes,Dir,Ss,Cmt}|Ts],Spec) when is_list(Nodes) ->
 add_tests([{skip_suites,Node,Dir,Ss,Cmt}|Ts],Spec) ->
     Tests = Spec#testspec.tests,
     Tests1 = skip_suites(ref2node(Node,Spec#testspec.nodes),
-			 ref2dir(Dir,Spec#testspec.alias),
+			 ref2dir(Dir,Spec),
 			 Ss,Cmt,Tests,
 			 Spec#testspec.merge_tests),
     add_tests(Ts,Spec#testspec{tests=Tests1});
@@ -792,7 +717,8 @@ add_tests([{skip_suites,Node,Dir,Ss,Cmt}|Ts],Spec) ->
 add_tests([{skip_groups,all_nodes,Dir,Suite,Gs,Cmt}|Ts],Spec) ->
     add_tests([{skip_groups,list_nodes(Spec),Dir,Suite,Gs,Cmt}|Ts],Spec);
 add_tests([{skip_groups,all_nodes,Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],Spec) ->
-    add_tests([{skip_groups,list_nodes(Spec),Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],Spec);
+    add_tests([{skip_groups,list_nodes(Spec),Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],
+	      Spec);
 add_tests([{skip_groups,Dir,Suite,Gs,Cmt}|Ts],Spec) ->
     add_tests([{skip_groups,all_nodes,Dir,Suite,Gs,Cmt}|Ts],Spec);
 add_tests([{skip_groups,Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],Spec) ->
@@ -800,20 +726,22 @@ add_tests([{skip_groups,Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],Spec) ->
 add_tests([{skip_groups,Nodes,Dir,Suite,Gs,Cmt}|Ts],Spec) when is_list(Nodes) ->
     Ts1 = separate(Nodes,skip_groups,[Dir,Suite,Gs,Cmt],Ts,Spec#testspec.nodes),
     add_tests(Ts1,Spec);
-add_tests([{skip_groups,Nodes,Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],Spec) when is_list(Nodes) ->
-    Ts1 = separate(Nodes,skip_groups,[Dir,Suite,Gs,{cases,TCs},Cmt],Ts,Spec#testspec.nodes),
+add_tests([{skip_groups,Nodes,Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],
+	  Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,skip_groups,[Dir,Suite,Gs,{cases,TCs},Cmt],Ts,
+		   Spec#testspec.nodes),
     add_tests(Ts1,Spec);
 add_tests([{skip_groups,Node,Dir,Suite,Gs,Cmt}|Ts],Spec) ->
     Tests = Spec#testspec.tests,
     Tests1 = skip_groups(ref2node(Node,Spec#testspec.nodes),
-			 ref2dir(Dir,Spec#testspec.alias),
+			 ref2dir(Dir,Spec),
 			 Suite,Gs,all,Cmt,Tests,
 			 Spec#testspec.merge_tests),
     add_tests(Ts,Spec#testspec{tests=Tests1});
 add_tests([{skip_groups,Node,Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],Spec) ->
     Tests = Spec#testspec.tests,
     Tests1 = skip_groups(ref2node(Node,Spec#testspec.nodes),
-			 ref2dir(Dir,Spec#testspec.alias),
+			 ref2dir(Dir,Spec),
 			 Suite,Gs,TCs,Cmt,Tests,
 			 Spec#testspec.merge_tests),
     add_tests(Ts,Spec#testspec{tests=Tests1});
@@ -829,45 +757,101 @@ add_tests([{skip_cases,Nodes,Dir,Suite,Cs,Cmt}|Ts],Spec) when is_list(Nodes) ->
 add_tests([{skip_cases,Node,Dir,Suite,Cs,Cmt}|Ts],Spec) ->
     Tests = Spec#testspec.tests,
     Tests1 = skip_cases(ref2node(Node,Spec#testspec.nodes),
-			ref2dir(Dir,Spec#testspec.alias),
+			ref2dir(Dir,Spec),
 			Suite,Cs,Cmt,Tests,Spec#testspec.merge_tests),
     add_tests(Ts,Spec#testspec{tests=Tests1});
 
+%% --- various configuration terms ---
+add_tests([{config,Nodes,CfgDir,Files}|Ts],Spec) when is_list(Nodes);
+						      Nodes == all_nodes ->
+    add_tests([{config,Nodes,{CfgDir,Files}}|Ts],Spec);
+add_tests([{config,Node,CfgDir,FileOrFiles}|Ts],Spec) ->
+    add_tests([{config,Node,{CfgDir,FileOrFiles}}|Ts],Spec);
+add_tests([{config,CfgDir=[Ch|_],Files}|Ts],Spec) when is_integer(Ch) ->
+    add_tests([{config,all_nodes,{CfgDir,Files}}|Ts],Spec);
+
+add_tests([{event_handler,Nodes,Hs,Args}|Ts],Spec) when is_list(Nodes);
+							Nodes == all_nodes ->
+    add_tests([{event_handler,Nodes,{Hs,Args}}|Ts],Spec);
+add_tests([{event_handler,Node,HOrHs,Args}|Ts],Spec) ->
+    add_tests([{event_handler,Node,{HOrHs,Args}}|Ts],Spec);
+
+add_tests([{enable_builtin_hooks,Bool}|Ts],Spec) ->
+    add_tests(Ts, Spec#testspec{enable_builtin_hooks = Bool});
+
+add_tests([{release_shell,Bool}|Ts],Spec) ->
+    add_tests(Ts, Spec#testspec{release_shell = Bool});
+
 %% --- handled/errors ---
+add_tests([{define,_,_}|Ts],Spec) ->		% handled
+    add_tests(Ts,Spec);
+
 add_tests([{alias,_,_}|Ts],Spec) ->		% handled
     add_tests(Ts,Spec);
 
 add_tests([{node,_,_}|Ts],Spec) ->		% handled
     add_tests(Ts,Spec);
 
-add_tests([{merge_tests, _} | Ts], Spec) -> % handled
+add_tests([{merge_tests, _} | Ts], Spec) ->     % handled
     add_tests(Ts,Spec);
 
-%% check if it's a CT term that has bad format or if the user seems to
-%% have added something of his/her own, which we'll let pass if relaxed
-%% mode is enabled.
-add_tests([Other|Ts],Spec) when is_tuple(Other) ->
-    [Name|_] = tuple_to_list(Other),
-    case lists:keymember(Name,1,valid_terms()) of
-	true ->					% halt
-	    throw({error,{bad_term_in_spec,Other}});
-	false ->				% ignore
-	    case get(relaxed) of
-		true ->
-		    %% warn if name resembles a CT term
-		    case resembles_ct_term(Name,size(Other)) of
-			true ->
-			    io:format("~nSuspicious term, please check:~n"
-				      "~p~n", [Other]);
-			false ->
-			    ok
-		    end,
-		    add_tests(Ts,Spec);
-		false ->
-		    throw({error,{undefined_term_in_spec,Other}})
-	    end
+%%     --------------------------------------------------
+%%   /                                                    \
+%%  |  General add_tests/2 clauses below will work for     |
+%%  |  most test spec configuration terms                  |
+%%   \                                                    /
+%%     --------------------------------------------------
+
+%% create one test entry per known node and reinsert
+add_tests([Term={Tag,all_nodes,Data}|Ts],Spec) ->
+    case check_term(Term) of
+	valid ->
+	    Tests = [{Tag,Node,Data} ||	Node <- list_nodes(Spec),
+					should_be_added(Tag,Node,Data,Spec)],
+	    add_tests(Tests++Ts,Spec);
+	invalid ->				% ignore term
+	    add_tests(Ts,Spec)
     end;
-
+%% create one test entry per node in Nodes and reinsert
+add_tests([{Tag,[],Data}|Ts],Spec) ->
+    add_tests([{Tag,all_nodes,Data}|Ts],Spec);
+add_tests([{Tag,String=[Ch|_],Data}|Ts],Spec) when is_integer(Ch) ->
+    add_tests([{Tag,all_nodes,{String,Data}}|Ts],Spec);
+add_tests([{Tag,NodesOrOther,Data}|Ts],Spec) when is_list(NodesOrOther) ->
+    case lists:all(fun(Test) -> is_node(Test,Spec#testspec.nodes)
+		   end, NodesOrOther) of
+	true ->
+	    Ts1 = separate(NodesOrOther,Tag,[Data],Ts,Spec#testspec.nodes),
+	    add_tests(Ts1,Spec);
+	false ->
+	    add_tests([{Tag,all_nodes,{NodesOrOther,Data}}|Ts],Spec)
+    end;
+%% update data for testspec term of type Tag
+add_tests([Term={Tag,NodeOrOther,Data}|Ts],Spec) ->
+    case is_node(NodeOrOther,Spec#testspec.nodes) of
+	true ->
+	    case check_term(Term) of
+		valid ->
+		    Node = ref2node(NodeOrOther,Spec#testspec.nodes),
+		    NodeIxData =
+			update_recorded(Tag,Node,Spec) ++
+			handle_data(Tag,Node,Data,Spec),
+		    add_tests(Ts,mod_field(Spec,Tag,NodeIxData));
+		invalid ->			% ignore term
+		    add_tests(Ts,Spec)
+	    end;
+	false ->
+	    add_tests([{Tag,all_nodes,{NodeOrOther,Data}}|Ts],Spec)
+    end;
+%% this test should be added for all known nodes
+add_tests([Term={Tag,Data}|Ts],Spec) ->
+    case check_term(Term) of
+	valid ->
+	    add_tests([{Tag,all_nodes,Data}|Ts],Spec);
+	invalid ->
+	    add_tests(Ts,Spec)
+    end;
+%% some other data than a tuple
 add_tests([Other|Ts],Spec) ->	
     case get(relaxed) of
 	true ->		
@@ -879,6 +863,120 @@ add_tests([Other|Ts],Spec) ->
 add_tests([],Spec) ->				% done
     Spec.
 
+%% check if it's a CT term that has bad format or if the user seems to
+%% have added something of his/her own, which we'll let pass if relaxed
+%% mode is enabled.
+check_term(Term) ->
+    Size = size(Term),
+    [Name|_] = tuple_to_list(Term),
+    Valid = valid_terms(),
+    case lists:member({Name,Size},Valid) of
+	true ->
+	    valid;
+	false ->
+	    case lists:keymember(Name,1,Valid) of
+		true ->					% halt
+		    throw({error,{bad_term_in_spec,Term}});
+		false ->				% ignore
+		    case get(relaxed) of
+			true ->
+			    %% warn if name resembles a CT term
+			    case resembles_ct_term(Name,size(Term)) of
+				true ->
+				    io:format("~nSuspicious term, "
+					      "please check:~n"
+					      "~p~n", [Term]),
+				    invalid;
+				false ->
+				    invalid
+			    end;
+			false ->
+			    throw({error,{undefined_term_in_spec,Term}})
+		    end
+	    end
+    end.
+
+%% specific data handling before saving in testspec record, e.g.
+%% converting relative paths to absolute for directories and files
+%% (introduce a clause *only* if the data value needs processing)
+handle_data(logdir,Node,Dir,Spec) ->
+    [{Node,ref2dir(Dir,Spec)}];
+handle_data(cover,Node,File,Spec) ->
+    [{Node,get_absfile(File,Spec)}];
+handle_data(cover_stop,Node,Stop,_Spec) ->
+    [{Node,Stop}];
+handle_data(include,Node,Dirs=[D|_],Spec) when is_list(D) ->
+    [{Node,ref2dir(Dir,Spec)} || Dir <- Dirs];
+handle_data(include,Node,Dir=[Ch|_],Spec) when is_integer(Ch) ->
+    handle_data(include,Node,[Dir],Spec);
+handle_data(config,Node,File=[Ch|_],Spec) when is_integer(Ch) ->
+    handle_data(config,Node,[File],Spec);
+handle_data(config,Node,{CfgDir,File=[Ch|_]},Spec) when is_integer(Ch) ->
+    handle_data(config,Node,{CfgDir,[File]},Spec);
+handle_data(config,Node,Files=[F|_],Spec) when is_list(F) ->
+    [{Node,get_absfile(File,Spec)} || File <- Files];
+handle_data(config,Node,{CfgDir,Files=[F|_]},Spec) when is_list(F) ->
+    [{Node,filename:join(ref2dir(CfgDir,Spec),File)} || File <- Files];
+handle_data(userconfig,Node,CBs,Spec) when is_list(CBs) ->
+    [{Node,{Callback,get_absfile(Callback,Config,Spec)}} ||
+	{Callback,Config} <- CBs];
+handle_data(userconfig,Node,CB,Spec) when is_tuple(CB) ->
+    handle_data(userconfig,Node,[CB],Spec);
+handle_data(event_handler,Node,H,Spec) when is_atom(H) ->
+    handle_data(event_handler,Node,{[H],[]},Spec);
+handle_data(event_handler,Node,{H,Args},Spec) when is_atom(H) ->
+    handle_data(event_handler,Node,{[H],Args},Spec);
+handle_data(event_handler,Node,Hs,_Spec) when is_list(Hs) ->
+    [{Node,EvH,[]} || EvH <- Hs];
+handle_data(event_handler,Node,{Hs,Args},_Spec) when is_list(Hs) ->
+    [{Node,EvH,Args} || EvH <- Hs];
+handle_data(ct_hooks,Node,Hooks,_Spec) when is_list(Hooks) ->
+    [{Node,Hook} || Hook <- Hooks ];
+handle_data(ct_hooks,Node,Hook,_Spec) ->
+    [{Node,Hook}];
+handle_data(stylesheet,Node,CSSFile,Spec) ->
+    [{Node,get_absfile(CSSFile,Spec)}];
+handle_data(verbosity,Node,VLvls,_Spec) when is_integer(VLvls) ->
+    [{Node,[{'$unspecified',VLvls}]}];
+handle_data(verbosity,Node,VLvls,_Spec) when is_list(VLvls) ->
+    VLvls1 = lists:map(fun(VLvl = {_Cat,_Lvl}) -> VLvl;
+			  (Lvl) -> {'$unspecified',Lvl} end, VLvls),
+    [{Node,VLvls1}];
+handle_data(silent_connections,Node,all,_Spec) ->
+    [{Node,[all]}];
+handle_data(silent_connections,Node,Conn,_Spec) when is_atom(Conn) ->
+    [{Node,[Conn]}];
+handle_data(silent_connections,Node,Conns,_Spec) ->
+    [{Node,Conns}];
+handle_data(_Tag,Node,Data,_Spec) ->
+    [{Node,Data}].
+
+%% check if duplicates should be saved or not
+should_be_added(Tag,Node,_Data,Spec) ->
+    if 
+	%% list terms *without* possible duplicates here
+	Tag == logdir;       Tag == logopts;
+	Tag == basic_html;   Tag == label;
+	Tag == auto_compile; Tag == stylesheet;
+	Tag == verbosity;    Tag == silent_connections ->
+	    lists:keymember(ref2node(Node,Spec#testspec.nodes),1,
+			    read_field(Spec,Tag)) == false;
+	%% for terms *with* possible duplicates
+	true ->
+	    true
+    end.
+
+%% check if previous elements for Node should be deleted
+update_recorded(Tag,Node,Spec) ->
+    if Tag == config; Tag == userconfig; Tag == event_handler;
+       Tag == ct_hooks; Tag == include ->
+	    read_field(Spec,Tag);
+       true ->
+	    %% delete previous value for Tag
+	    lists:keydelete(Node,1,read_field(Spec,Tag))
+    end.
+
+%% create one test term per node
 separate(Nodes,Tag,Data,Tests,Refs) ->
     Separated = separate(Nodes,Tag,Data,Refs),
     Separated ++ Tests.
@@ -886,7 +984,25 @@ separate([N|Ns],Tag,Data,Refs) ->
     [list_to_tuple([Tag,ref2node(N,Refs)|Data])|separate(Ns,Tag,Data,Refs)];
 separate([],_,_,_) ->
     [].
-    
+
+%% read the value for FieldName in record Rec#testspec
+read_field(Rec, FieldName) ->
+    catch lists:foldl(fun(F, Pos) when F == FieldName ->
+			      throw(element(Pos, Rec));
+			 (_,Pos)  ->
+			      Pos+1
+		      end,2,?testspec_fields).
+
+%% modify the value for FieldName in record Rec#testspec
+mod_field(Rec, FieldName, NewVal) ->
+    [_testspec|RecList] = tuple_to_list(Rec),
+    RecList1 =
+	(catch lists:foldl(fun(F, {Prev,[_OldVal|Rest]}) when F == FieldName ->
+				   throw(lists:reverse(Prev) ++ [NewVal|Rest]);
+			      (_,{Prev,[Field|Rest]})  ->
+				   {[Field|Prev],Rest}
+			   end,{[],RecList},?testspec_fields)),
+    list_to_tuple([testspec|RecList1]).
 
 %% Representation:
 %% {{Node,Dir},[{Suite1,[GrOrCase11,GrOrCase12,...]},
@@ -912,20 +1028,24 @@ insert_groups(Node,Dir,Suite,Group,Cases,Tests,MergeTests)
     insert_groups(Node,Dir,Suite,[Group],Cases,Tests,MergeTests);
 insert_groups(Node,Dir,Suite,Groups,Cases,Tests,false) when
       ((Cases == all) or is_list(Cases)) and is_list(Groups) ->
-    Groups1 = [{Gr,Cases} || Gr <- Groups],
+    Groups1 = [if is_list(Gr) ->		% preserve group path
+		       {[Gr],Cases};
+		  true ->
+		       {Gr,Cases} end || Gr <- Groups],
     append({{Node,Dir},[{Suite,Groups1}]},Tests);
 insert_groups(Node,Dir,Suite,Groups,Cases,Tests,true) when
       ((Cases == all) or is_list(Cases)) and is_list(Groups) ->
+    Groups1 = [if is_list(Gr) ->		% preserve group path
+		       {[Gr],Cases};
+		  true ->
+		       {Gr,Cases} end || Gr <- Groups],
     case lists:keysearch({Node,Dir},1,Tests) of
 	{value,{{Node,Dir},[{all,_}]}} ->
 	    Tests;
 	{value,{{Node,Dir},Suites0}} ->
-	    Suites1 = insert_groups1(Suite,
-				     [{Gr,Cases} || Gr <- Groups],
-				     Suites0),
+	    Suites1 = insert_groups1(Suite,Groups1,Suites0),
 	    insert_in_order({{Node,Dir},Suites1},Tests);
 	false ->
-	    Groups1 = [{Gr,Cases} || Gr <- Groups],
 	    insert_in_order({{Node,Dir},[{Suite,Groups1}]},Tests)
     end;
 insert_groups(Node,Dir,Suite,Groups,Case,Tests, MergeTests) 
@@ -948,13 +1068,13 @@ insert_groups1(Suite,Groups,Suites0) ->
 
 insert_groups2(_Groups,all) ->
     all;
-insert_groups2([Group={GrName,Cases}|Groups],GrAndCases) ->
-    case lists:keysearch(GrName,1,GrAndCases) of
-	{value,{GrName,all}} ->
+insert_groups2([Group={Gr,Cases}|Groups],GrAndCases) ->
+    case lists:keysearch(Gr,1,GrAndCases) of
+	{value,{Gr,all}} ->
 	    GrAndCases;
-	{value,{GrName,Cases0}} ->
+	{value,{Gr,Cases0}} ->
 	    Cases1 = insert_in_order(Cases,Cases0),
-	    insert_groups2(Groups,insert_in_order({GrName,Cases1},GrAndCases));
+	    insert_groups2(Groups,insert_in_order({Gr,Cases1},GrAndCases));
 	false ->
 	    insert_groups2(Groups,insert_in_order(Group,GrAndCases))
     end;
@@ -1094,33 +1214,40 @@ ref2node(all_nodes,_Refs) ->
 ref2node(master,_Refs) ->
     master;
 ref2node(RefOrNode,Refs) ->
-    case string:chr(atom_to_list(RefOrNode),$@) of
-	0 ->					% a ref	    
+    case lists:member($@,atom_to_list(RefOrNode)) of
+	false ->				% a ref	    
 	    case lists:keysearch(RefOrNode,1,Refs) of
 		{value,{RefOrNode,Node}} ->
 		    Node;
 		false ->
 		    throw({error,{noderef_missing,RefOrNode}})
 	    end;
-	_ ->					% a node
+	true ->					% a node
 	    RefOrNode
     end.
 
-ref2dir(Ref,Refs) when is_atom(Ref) ->
+ref2dir(Ref,Spec) ->
+    ref2dir(Ref,Spec#testspec.alias,Spec).
+
+ref2dir(Ref,Refs,Spec) when is_atom(Ref) ->
     case lists:keysearch(Ref,1,Refs) of
 	{value,{Ref,Dir}} ->
-	    Dir;
+	    get_absdir(Dir,Spec);
 	false ->
 	    throw({error,{alias_missing,Ref}})
     end;
-ref2dir(Dir,_) when is_list(Dir) ->
-    Dir.
-
-is_noderef(What,Nodes) when is_atom(What) ->
-    is_noderef([What],Nodes);
-is_noderef([master|_],_Nodes) ->
+ref2dir(Dir,_,Spec) when is_list(Dir) ->
+    get_absdir(Dir,Spec);
+ref2dir(What,_,_) ->
+    throw({error,{invalid_directory_name,What}}).
+
+is_node(What,Nodes) when is_atom(What) ->
+    is_node([What],Nodes);
+is_node([master|_],_Nodes) ->
     true;
-is_noderef([What|_],Nodes) ->
+is_node(What={N,H},Nodes) when is_atom(N), is_atom(H) ->
+    is_node([What],Nodes);
+is_node([What|_],Nodes) ->
     case lists:keymember(What,1,Nodes) or
 	 lists:keymember(What,2,Nodes) of
 	true ->					
@@ -1128,24 +1255,34 @@ is_noderef([What|_],Nodes) ->
 	false ->
 	    false
     end;
-is_noderef([],_) ->
+is_node([],_) ->
     false.
 
 valid_terms() ->
     [
+     {define,3},
      {node,3},
      {cover,2},
      {cover,3},
+     {cover_stop,2},
+     {cover_stop,3},
      {config,2},
      {config,3},
+     {config,4},
      {userconfig,2},
      {userconfig,3},
      {alias,3},
-     {merge_tests,1},
+     {merge_tests,2},
      {logdir,2},
      {logdir,3},
      {logopts,2},
      {logopts,3},
+     {basic_html,2},
+     {basic_html,3},
+     {verbosity,2},
+     {verbosity,3},
+     {silent_connections,2},
+     {silent_connections,3},
      {label,2},
      {label,3},
      {event_handler,2},
@@ -1153,13 +1290,18 @@ valid_terms() ->
      {event_handler,4},
      {ct_hooks,2},
      {ct_hooks,3},
-     {enable_builtin_hooks,1},
+     {enable_builtin_hooks,2},
+     {release_shell,2},
      {multiply_timetraps,2},
      {multiply_timetraps,3},
      {scale_timetraps,2},
      {scale_timetraps,3},
      {include,2},
      {include,3},
+     {auto_compile,2},
+     {auto_compile,3},
+     {stylesheet,2},
+     {stylesheet,3},
      {suites,3},
      {suites,4},
      {groups,4},
@@ -1174,7 +1316,8 @@ valid_terms() ->
      {skip_groups,7},
      {skip_cases,5},
      {skip_cases,6},
-     {create_priv_dir,2}
+     {create_priv_dir,2},
+     {create_priv_dir,3}
     ].
 
 %% this function "guesses" if the user has misspelled a term name
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 9d6ee3c8b9..cf891ed043 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -25,7 +25,8 @@
 %%%
 -module(ct_util).
 
--export([start/0,start/1,start/2,stop/1,update_last_run_index/0]).
+-export([start/0,start/1,start/2,start/3,
+	 stop/1,update_last_run_index/0]).
 
 -export([register_connection/4,unregister_connection/1,
 	 does_connection_exist/3,get_key_from_name/1]).
@@ -36,14 +37,15 @@
 	 save_suite_data_async/3, save_suite_data_async/2,
 	 read_suite_data/1, 
 	 delete_suite_data/0, delete_suite_data/1, match_delete_suite_data/1,
-	 delete_testdata/0, delete_testdata/1, set_testdata/1, get_testdata/1,
-	 set_testdata_async/1, update_testdata/2]).
+	 delete_testdata/0, delete_testdata/1,
+	 set_testdata/1, get_testdata/1, get_testdata/2,
+	 set_testdata_async/1, update_testdata/2, update_testdata/3]).
 
 -export([override_silence_all_connections/0, override_silence_connections/1, 
 	 get_overridden_silenced_connections/0, 
 	 delete_overridden_silenced_connections/0, 
-	 silence_all_connections/0, silence_connections/1, is_silenced/1, 
-	 reset_silent_connections/0]).
+	 silence_all_connections/0, silence_connections/1,
+	 is_silenced/1, is_silenced/2, reset_silent_connections/0]).
 
 -export([get_mode/0, create_table/3, read_opts/0]).
 
@@ -64,9 +66,13 @@
 -export([get_profile_data/0, get_profile_data/1,
 	 get_profile_data/2, open_url/3]).
 
+-include("ct.hrl").
 -include("ct_event.hrl").
 -include("ct_util.hrl").
 
+-define(default_verbosity, [{default,?MAX_VERBOSITY},
+			    {'$unspecified',?MAX_VERBOSITY}]).
+
 -record(suite_data, {key,name,value}).
 
 %%%-----------------------------------------------------------------
@@ -85,18 +91,21 @@
 %%%
 %%% @see ct
 start() ->
-    start(normal,".").
+    start(normal, ".", ?default_verbosity).
 
 start(LogDir) when is_list(LogDir) ->
-    start(normal,LogDir);
+    start(normal, LogDir, ?default_verbosity);
 start(Mode) ->
-    start(Mode,".").
+    start(Mode, ".", ?default_verbosity).
+
+start(LogDir, Verbosity) when is_list(LogDir) ->
+    start(normal, LogDir, Verbosity).
 
-start(Mode,LogDir) ->
+start(Mode, LogDir, Verbosity) ->
     case whereis(ct_util_server) of
 	undefined ->
 	    S = self(),
-	    Pid = spawn_link(fun() -> do_start(S,Mode,LogDir) end),
+	    Pid = spawn_link(fun() -> do_start(S, Mode, LogDir, Verbosity) end),
 	    receive 
 		{Pid,started} -> Pid;
 		{Pid,Error} -> exit(Error);
@@ -113,7 +122,7 @@ start(Mode,LogDir) ->
 	    end
     end.
 
-do_start(Parent,Mode,LogDir) ->
+do_start(Parent, Mode, LogDir, Verbosity) ->
     process_flag(trap_exit,true),
     register(ct_util_server,self()),
     create_table(?conn_table,#conn.handle),
@@ -173,7 +182,7 @@ do_start(Parent,Mode,LogDir) ->
 	false ->
 	    ok
     end,
-    {StartTime,TestLogDir} = ct_logs:init(Mode),
+    {StartTime,TestLogDir} = ct_logs:init(Mode, Verbosity),
 
     ct_event:notify(#event{name=test_start,
 			   node=node(),
@@ -193,7 +202,7 @@ do_start(Parent,Mode,LogDir) ->
 	    self() ! {{stop,{self(),{user_error,CTHReason}}},
 		      {Parent,make_ref()}}
     end,
-    loop(Mode,[],StartDir).
+    loop(Mode, [{{verbosity,Cat},Lvl} || {Cat,Lvl} <- Verbosity], StartDir).
 
 create_table(TableName,KeyPos) ->
     create_table(TableName,set,KeyPos).
@@ -243,7 +252,10 @@ delete_testdata(Key) ->
     call({delete_testdata, Key}).
 
 update_testdata(Key, Fun) ->
-    call({update_testdata, Key, Fun}).
+    update_testdata(Key, Fun, []).
+
+update_testdata(Key, Fun, Opts) ->
+    call({update_testdata, Key, Fun, Opts}).
 
 set_testdata(TestData) ->
     call({set_testdata, TestData}).
@@ -254,6 +266,9 @@ set_testdata_async(TestData) ->
 get_testdata(Key) ->
     call({get_testdata, Key}).
 
+get_testdata(Key, Timeout) ->
+    call({get_testdata, Key}, Timeout).
+
 set_cwd(Dir) ->
     call({set_cwd,Dir}).
 
@@ -321,7 +336,7 @@ loop(Mode,TestData,StartDir) ->
 		    return(From,undefined)
 	    end,
 	    loop(From,TestData,StartDir);
-	{{update_testdata,Key,Fun},From} ->
+	{{update_testdata,Key,Fun,Opts},From} ->
 	    TestData1 =
 		case lists:keysearch(Key,1,TestData) of
 		    {value,{Key,Val}} ->
@@ -329,8 +344,15 @@ loop(Mode,TestData,StartDir) ->
 			return(From,NewVal),
 			[{Key,NewVal}|lists:keydelete(Key,1,TestData)];
 		    _ ->
-			return(From,undefined),
-			TestData
+			case lists:member(create,Opts) of
+			    true ->
+				InitVal = Fun(undefined),
+				return(From,InitVal),
+				[{Key,InitVal}|TestData];
+			    false ->
+				return(From,undefined),
+				TestData
+			end
 		end,
 	    loop(From,TestData1,StartDir);	    
 	{{set_cwd,Dir},From} ->
@@ -369,14 +391,25 @@ loop(Mode,TestData,StartDir) ->
 	{'EXIT',_Pid,normal} ->
 	    loop(Mode,TestData,StartDir);
 	{'EXIT',Pid,Reason} ->
-	    %% Let process crash in case of error, this shouldn't happen!
-	    io:format("\n\nct_util_server got EXIT from ~p: ~p\n\n",
-		      [Pid,Reason]),
-	    file:set_cwd(StartDir),
-	    exit(Reason)
+	    case ets:lookup(?conn_table,Pid) of
+		[#conn{address=A,callback=CB}] ->
+		    %% A connection crashed - remove the connection but don't die
+		    ct_logs:tc_log_async(ct_error_notify,
+					 "Connection process died: "
+					 "Pid: ~p, Address: ~p, Callback: ~p\n"
+					 "Reason: ~p\n\n",
+					 [Pid,A,CB,Reason]),
+		    catch CB:close(Pid),
+		    loop(Mode,TestData,StartDir);
+		_ ->
+		    %% Let process crash in case of error, this shouldn't happen!
+		    io:format("\n\nct_util_server got EXIT from ~p: ~p\n\n",
+			      [Pid,Reason]),
+		    file:set_cwd(StartDir),
+		    exit(Reason)
+	    end
     end.
 
-
 close_connections([#conn{handle=Handle,callback=CB}|Conns]) ->
     CB:close(Handle),
     close_connections(Conns);
@@ -508,7 +541,7 @@ close_connections() ->
 %%%
 %%% @doc 
 override_silence_all_connections() ->
-    Protocols = [telnet,ftp,rpc,snmp],
+    Protocols = [telnet,ftp,rpc,snmp,ssh],
     override_silence_connections(Protocols),
     Protocols.
 
@@ -545,7 +578,10 @@ silence_connections(Conns) when is_list(Conns) ->
     set_testdata({silent_connections,Conns1}).
 
 is_silenced(Conn) ->
-    case get_testdata(silent_connections) of
+    is_silenced(Conn, infinity).
+
+is_silenced(Conn, Timeout) ->
+    case get_testdata(silent_connections, Timeout) of
 	Conns when is_list(Conns) ->
 	    case lists:keysearch(Conn,1,Conns) of
 		{value,{Conn,true}} ->
@@ -553,6 +589,8 @@ is_silenced(Conn) ->
 		_ ->
 		    false
 	    end;
+	Error = {error,_} ->
+	    Error;
 	_ ->
 	    false
     end.
@@ -827,19 +865,28 @@ get_profile_data(Profile, Key, StartDir) ->
 %%%-----------------------------------------------------------------
 %%% Internal functions
 call(Msg) ->
-    case whereis(ct_util_server) of
-	undefined ->
+    call(Msg, infinity).
+
+call(Msg, Timeout) ->
+    case {self(),whereis(ct_util_server)} of
+	{_,undefined} ->
 	    {error,ct_util_server_not_running};
-	Pid ->
+	{Pid,Pid} ->
+	    %% the caller is ct_util_server, which must
+	    %% be a mistake
+	    {error,bad_invocation};
+	{Self,Pid} ->
 	    MRef = erlang:monitor(process, Pid),
 	    Ref = make_ref(),
-	    ct_util_server ! {Msg,{self(),Ref}},
+	    ct_util_server ! {Msg,{Self,Ref}},
 	    receive
 		{Ref, Result} -> 
 		    erlang:demonitor(MRef, [flush]),
 		    Result;
 		{'DOWN',MRef,process,_,Reason}  -> 
 		    {error,{ct_util_server_down,Reason}}
+	    after
+		Timeout -> {error,timeout}
 	    end
     end.
 
diff --git a/lib/common_test/src/ct_util.hrl b/lib/common_test/src/ct_util.hrl
index 6b016e95df..c9c6514fa4 100644
--- a/lib/common_test/src/ct_util.hrl
+++ b/lib/common_test/src/ct_util.hrl
@@ -34,13 +34,20 @@
 		   profile=[],
 		   logdir=["."],
 		   logopts=[],
+		   basic_html=[],
+		   verbosity=[],
+		   silent_connections=[],
 		   cover=[],
+		   cover_stop=[],
 		   config=[],
 		   userconfig=[],
 		   event_handler=[],
 		   ct_hooks=[],
 		   enable_builtin_hooks=true,
+		   release_shell=false,
 		   include=[],
+		   auto_compile=[],
+		   stylesheet=[],
 		   multiply_timetraps=[],
 		   scale_timetraps=[],
 		   create_priv_dir=[],
@@ -64,3 +71,11 @@
 -define(ct_config_txt, ct_config_plain).
 
 -define(ct_profile_file, ".common_test").
+
+-define(css_default, "ct_default.css").
+-define(sortable_table_name, "SortableTable").
+-define(jquery_script, "jquery-latest.js").
+-define(tablesorter_script, "jquery.tablesorter.min.js").
+
+%% Logging information for error handler
+-record(conn_log, {client, name, address, action, module}).
diff --git a/lib/common_test/src/cth_conn_log.erl b/lib/common_test/src/cth_conn_log.erl
new file mode 100644
index 0000000000..255f3ec78a
--- /dev/null
+++ b/lib/common_test/src/cth_conn_log.erl
@@ -0,0 +1,124 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%----------------------------------------------------------------------
+%% CT hook for logging of connections.
+%%
+%% HookOptions can be hardcoded in the test suite:
+%%
+%% suite() ->
+%%    [{ct_hooks, [{cth_conn_log,
+%%                  [{ct_netconfc:conn_mod(),ct_netconfc:hook_options()}]}]}].
+%%
+%% or specified in a configuration file:
+%%
+%% {ct_conn_log,[{ct_netconfc:conn_mod(),ct_netconfc:hook_options()}]}.
+%%
+%% The conn_mod() is the common test module implementing the protocol,
+%% e.g. ct_netconfc, ct_telnet, etc. This module must log by calling
+%%
+%% error_logger:info_report(ConnLogInfo,Data).
+%% ConnLogInfo = #conn_log{} | {ct_connection,Action,ConnName}
+%% Action = open | close | send | recv | term()
+%% ConnName = atom() - The 'KeyOrName' argument used when opening the connection
+%%
+%% ct_conn_log_h will print to html log or separate file (depending on
+%% log_type() option). conn_mod() must implement and export
+%%
+%% format_data(log_type(), Data).
+%%
+%% If logging to separate file, ct_conn_log_h will also log error
+%% reports which are witten like this:
+%%
+%% error_logger:error_report([{ct_connection,ConnName} | Report]).
+%%
+%%----------------------------------------------------------------------
+-module(cth_conn_log).
+
+-include_lib("common_test/include/ct.hrl").
+
+-export([init/2,
+	 pre_init_per_testcase/3,
+	 post_end_per_testcase/4]).
+
+-spec init(Id, HookOpts) -> Result when
+      Id :: term(),
+      HookOpts :: ct_netconfc:hook_options(),
+      Result :: {ok,[{ct_netconfc:conn_mod(),
+		      {ct_netconfc:log_type(),[ct_netconfc:key_or_name()]}}]}.
+init(_Id, HookOpts) ->
+    ConfOpts = ct:get_config(ct_conn_log,[]),
+    {ok,merge_log_info(ConfOpts,HookOpts)}.
+
+merge_log_info([{Mod,ConfOpts}|ConfList],HookList) ->
+    {Opts,HookList1} =
+	case lists:keytake(Mod,1,HookList) of
+	    false ->
+		{ConfOpts,HookList};
+	    {value,{_,HookOpts},HL1} ->
+		{ConfOpts ++ HookOpts, HL1} % ConfOpts overwrites HookOpts!
+	end,
+    [{Mod,get_log_opts(Opts)} | merge_log_info(ConfList,HookList1)];
+merge_log_info([],HookList) ->
+    [{Mod,get_log_opts(Opts)} || {Mod,Opts} <- HookList].
+
+get_log_opts(Opts) ->
+    LogType = proplists:get_value(log_type,Opts,html),
+    Hosts = proplists:get_value(hosts,Opts,[]),
+    {LogType,Hosts}.
+
+
+pre_init_per_testcase(TestCase,Config,CthState) ->
+    Logs =
+	lists:map(
+	  fun({ConnMod,{LogType,Hosts}}) ->
+		  case LogType of
+		      LogType when LogType==raw; LogType==pretty ->
+			  Dir = ?config(priv_dir,Config),
+			  TCStr = atom_to_list(TestCase),
+			  ConnModStr = atom_to_list(ConnMod),
+			  DefLogName = TCStr  ++ "-" ++ ConnModStr ++ ".txt",
+			  DefLog = filename:join(Dir,DefLogName),
+			  Ls = [{Host,
+				 filename:join(Dir,TCStr ++ "-"++
+						   atom_to_list(Host) ++ "-" ++
+						   ConnModStr ++
+						   ".txt")}
+				|| Host <- Hosts]
+			      ++[{default,DefLog}],
+			  Str =
+			      "<table borders=1>"
+			      "<b>" ++ ConnModStr ++ " logs:</b>\n" ++
+			      [io_lib:format(
+				 "<tr><td>~p</td><td><a href=~p>~s</a></td></tr>",
+				 [S,L,filename:basename(L)])
+			       || {S,L} <- Ls] ++
+			      "</table>",
+			  io:format(Str,[]),
+			  {ConnMod,{LogType,Ls}};
+		      _ ->
+			  {ConnMod,{LogType,[]}}
+		  end
+	  end,
+	  CthState),
+    error_logger:add_report_handler(ct_conn_log_h,{group_leader(),Logs}),
+    {Config,CthState}.
+
+post_end_per_testcase(_TestCase,_Config,Return,CthState) ->
+    error_logger:delete_report_handler(ct_conn_log_h),
+    {Return,CthState}.
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl
index 77f57c6195..78ae70f37e 100644
--- a/lib/common_test/src/cth_log_redirect.erl
+++ b/lib/common_test/src/cth_log_redirect.erl
@@ -54,7 +54,7 @@ post_init_per_group(_Group, _Config, Result, State) ->
 post_end_per_testcase(_TC, _Config, Result, State) ->
     %% Make sure that the event queue is flushed
     %% before ending this test case.
-    gen_event:call(error_logger, ?MODULE, flush),
+    gen_event:call(error_logger, ?MODULE, flush, 300000),
     {Result, State}.
 
 pre_end_per_group(Group, Config, {ct_log, Group}) ->
diff --git a/lib/common_test/src/cth_surefire.erl b/lib/common_test/src/cth_surefire.erl
index c42f956b3a..76b0f0b5ea 100644
--- a/lib/common_test/src/cth_surefire.erl
+++ b/lib/common_test/src/cth_surefire.erl
@@ -49,9 +49,12 @@ init(Path, Opts) ->
 	    properties = proplists:get_value(properties,Opts,[]),
 	    timer = now() }.
 
-pre_init_per_suite(Suite,Config,State) ->
+pre_init_per_suite(Suite,Config,#state{ test_cases = [] } = State) ->
     {Config, init_tc(State#state{ curr_suite = Suite, curr_suite_ts = now() },
-		     Config) }.
+		     Config) };
+pre_init_per_suite(Suite,Config,State) ->
+    %% Have to close the previous suite
+    pre_init_per_suite(Suite,Config,close_suite(State)).
 
 post_init_per_suite(_Suite,Config, Result, State) ->
     {Result, end_tc(init_per_suite,Config,Result,State)}.
@@ -59,11 +62,7 @@ post_init_per_suite(_Suite,Config, Result, State) ->
 pre_end_per_suite(_Suite,Config,State) -> {Config, init_tc(State, Config)}.
 
 post_end_per_suite(_Suite,Config,Result,State) ->
-    NewState = end_tc(end_per_suite,Config,Result,State),
-    TCs = NewState#state.test_cases,
-    Suite = get_suite(NewState, TCs),
-    {Result, State#state{ test_cases = [],
-			  test_suites = [Suite | State#state.test_suites]}}.
+    {Result, end_tc(end_per_suite,Config,Result,State)}.
 
 pre_init_per_group(Group,Config,State) ->
     {Config, init_tc(State#state{ curr_group = [Group|State#state.curr_group]},
@@ -83,24 +82,36 @@ pre_init_per_testcase(_TC,Config,State) -> {Config, init_tc(State, Config)}.
 post_end_per_testcase(TC,Config,Result,State) ->
     {Result, end_tc(TC,Config, Result,State)}.
 
+on_tc_fail(_TC, _Res, State = #state{test_cases = []}) ->
+    State;
 on_tc_fail(_TC, Res, State) ->
     TCs = State#state.test_cases,
-    TC = hd(State#state.test_cases),
-    NewTC = TC#testcase{ failure =
-			     {fail,lists:flatten(io_lib:format("~p",[Res]))} },
+    TC = hd(TCs),
+    NewTC = TC#testcase{
+	      failure =
+		  {fail,lists:flatten(io_lib:format("~p",[Res]))} },
     State#state{ test_cases = [NewTC | tl(TCs)]}.
 
+on_tc_skip(Tc,{Type,_Reason} = Res, State) when Type == tc_auto_skip ->
+    do_tc_skip(Res, end_tc(Tc,[],Res,init_tc(State,[])));
+on_tc_skip(_Tc, _Res, State = #state{test_cases = []}) ->
+    State;
 on_tc_skip(_Tc, Res, State) ->
+    do_tc_skip(Res, State).
+
+do_tc_skip(Res, State) ->
     TCs = State#state.test_cases,
-    TC = hd(State#state.test_cases),
+    TC = hd(TCs),
     NewTC = TC#testcase{
 	      failure =
 		  {skipped,lists:flatten(io_lib:format("~p",[Res]))} },
     State#state{ test_cases = [NewTC | tl(TCs)]}.
 
+init_tc(State, Config) when is_list(Config) == false ->
+    State#state{ timer = now(), tc_log =  "" };
 init_tc(State, Config) ->
     State#state{ timer = now(),
-		 tc_log =  proplists:get_value(tc_logfile, Config)}.
+		 tc_log =  proplists:get_value(tc_logfile, Config, [])}.
 
 end_tc(Func, Config, Res, State) when is_atom(Func) ->
     end_tc(atom_to_list(Func), Config, Res, State);
@@ -118,26 +129,35 @@ end_tc(Name, _Config, _Res, State = #state{ curr_suite = Suite,
 					  name = Name,
 					  time = TimeTakes,
 					  failure = passed }| State#state.test_cases]}.
-
-get_suite(State, TCs) ->
+close_suite(#state{ test_cases = [] } = State) ->
+    State;
+close_suite(#state{ test_cases = TCs } = State) ->
     Total = length(TCs),
     Succ = length(lists:filter(fun(#testcase{ failure = F }) ->
 				       F == passed
 			       end,TCs)),
     Fail = Total - Succ,
     TimeTaken = timer:now_diff(now(),State#state.curr_suite_ts) / 1000000,
-    #testsuite{ name = atom_to_list(State#state.curr_suite),
-		package = State#state.package,
-		time = io_lib:format("~f",[TimeTaken]),
-		timestamp = now_to_string(State#state.curr_suite_ts),
-		errors = Fail, tests = Total, testcases = lists:reverse(TCs) }.
-
-terminate(State) ->
-    {ok,D} = file:open(State#state.filepath,[write]),
+    Suite = #testsuite{ name = atom_to_list(State#state.curr_suite),
+			package = State#state.package,
+			time = io_lib:format("~f",[TimeTaken]),
+			timestamp = now_to_string(State#state.curr_suite_ts),
+			errors = Fail, tests = Total,
+			testcases = lists:reverse(TCs) },
+    State#state{ test_cases = [],
+		 test_suites = [Suite | State#state.test_suites]}.
+
+terminate(State = #state{ test_cases = [] }) ->
+    {ok,D} = file:open(State#state.filepath,[write,{encoding,utf8}]),
     io:format(D, "<?xml version=\"1.0\" encoding= \"UTF-8\" ?>", []),
     io:format(D, to_xml(State), []),
     catch file:sync(D),
-    catch file:close(D).
+    catch file:close(D);
+terminate(State) ->
+    %% Have to close the last suite
+    terminate(close_suite(State)).
+
+
 
 to_xml(#testcase{ group = Group, classname = CL, log = L, name = N, time = T, timestamp = TS, failure = F}) ->
     ["<testcase ",
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index 2a52f8ed74..df816f9a61 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -39,13 +39,24 @@ MODULES= \
 	ct_sequence_1_SUITE \
 	ct_repeat_1_SUITE \
 	ct_testspec_1_SUITE \
+	ct_testspec_2_SUITE \
 	ct_skip_SUITE \
 	ct_error_SUITE \
 	ct_test_server_if_1_SUITE \
 	ct_config_SUITE \
 	ct_master_SUITE \
 	ct_misc_1_SUITE \
-	ct_hooks_SUITE
+	ct_hooks_SUITE \
+	ct_netconfc_SUITE \
+	ct_basic_html_SUITE \
+	ct_auto_compile_SUITE \
+	ct_verbosity_SUITE \
+	ct_shell_SUITE \
+	ct_system_error_SUITE \
+	ct_snmp_SUITE \
+	ct_group_leader_SUITE \
+	ct_cover_SUITE \
+	ct_groups_search_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -97,10 +108,10 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec:
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(ERL_FILES) $(COVERFILE) $(RELSYSDIR)
-	$(INSTALL_DATA) common_test.spec $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(ERL_FILES) $(COVERFILE) "$(RELSYSDIR)"
+	$(INSTALL_DATA) common_test.spec common_test.cover "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/common_test/test/common_test.cover b/lib/common_test/test/common_test.cover
new file mode 100644
index 0000000000..66697854ea
--- /dev/null
+++ b/lib/common_test/test/common_test.cover
@@ -0,0 +1,10 @@
+%% -*- erlang -*-
+{incl_app,common_test,details}.
+{cross_apps,common_test,[erl2html2,
+			 test_server,
+			 test_server_ctrl,
+			 test_server_gl,
+			 test_server_h,
+			 test_server_io,
+			 test_server_node,
+			 test_server_sup]}.
diff --git a/lib/common_test/test/common_test.spec b/lib/common_test/test/common_test.spec
index 8755b08117..8bec66d6f2 100644
--- a/lib/common_test/test/common_test.spec
+++ b/lib/common_test/test/common_test.spec
@@ -1 +1 @@
-{suites,"../common_test_test",all}.
\ No newline at end of file
+{suites,"../common_test_test",all}.
diff --git a/lib/common_test/test/ct_auto_compile_SUITE.erl b/lib/common_test/test/ct_auto_compile_SUITE.erl
new file mode 100644
index 0000000000..cc546ed30d
--- /dev/null
+++ b/lib/common_test/test/ct_auto_compile_SUITE.erl
@@ -0,0 +1,187 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_auto_compile_SUITE
+%%%
+%%% Description: 
+%%% 
+%%%
+%%% The suites used for the test are located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_auto_compile_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [ac_flag, ac_spec].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%% 
+ac_flag(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+    file:copy(filename:join(DataDir, "bad_SUITE.erl"),
+	      filename:join(PrivDir, "bad_SUITE.erl")), 
+    Suite = filename:join(DataDir, "dummy_SUITE"),
+    compile:file(Suite, [{outdir,PrivDir}]),
+    {Opts,ERPid} = setup([{dir,PrivDir},
+			  {auto_compile,false},
+			  {label,"ac_flag"}],
+			 Config),
+
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(ac_flag, 
+			       reformat(Events, ?eh),
+			       PrivDir,
+			       Opts),
+
+    TestEvents = events_to_check(ac_flag),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+%%%-----------------------------------------------------------------
+%%% 
+ac_spec(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+    file:copy(filename:join(DataDir, "bad_SUITE.erl"),
+	      filename:join(PrivDir, "bad_SUITE.erl")),
+    TestSpec = [{label,ac_spec},
+		{auto_compile,false},
+		{suites,PrivDir,all}],
+    FileName = filename:join(?config(priv_dir, Config),"ac_spec.spec"),
+    {ok,Dev} = file:open(FileName, [write]),
+    [io:format(Dev, "~p.~n", [Term]) || Term <- TestSpec],
+    file:close(Dev),
+
+    {Opts,ERPid} = setup([{spec,FileName}], Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(ac_spec, 
+			       reformat(Events, ?eh),
+			       PrivDir,
+			       Opts),
+
+    TestEvents = events_to_check(ac_spec),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+						%reformat(Events, _EH) ->
+						%    Events.
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+events_to_check(Test) ->
+    %% 2 tests (ct:run_test + script_start) is default
+    events_to_check(Test, 2).
+
+events_to_check(_, 0) ->
+    [];
+events_to_check(Test, N) ->
+    test_events(Test) ++ events_to_check(Test, N-1).
+
+test_events(ac_flag) ->
+    [
+     {ct_test_support_eh,start_logging,{'DEF','RUNDIR'}},
+     {ct_test_support_eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {ct_test_support_eh,start_info,{1,1,3}},
+     {ct_test_support_eh,tc_start,{dummy_SUITE,init_per_suite}},
+     {ct_test_support_eh,tc_done,{dummy_SUITE,init_per_suite,ok}},
+     {ct_test_support_eh,test_stats,{1,1,{1,0}}},
+     {ct_test_support_eh,tc_start,{dummy_SUITE,end_per_suite}},
+     {ct_test_support_eh,tc_done,{dummy_SUITE,end_per_suite,ok}},
+     {ct_test_support_eh,test_done,{'DEF','STOP_TIME'}},
+     {ct_test_support_eh,stop_logging,[]}
+    ];
+
+test_events(ac_spec) ->
+    [
+     {ct_test_support_eh,start_logging,{'DEF','RUNDIR'}},
+     {ct_test_support_eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {ct_test_support_eh,start_info,{1,1,3}},
+     {ct_test_support_eh,tc_start,{dummy_SUITE,init_per_suite}},
+     {ct_test_support_eh,tc_done,{dummy_SUITE,init_per_suite,ok}},
+     {ct_test_support_eh,test_stats,{1,1,{1,0}}},
+     {ct_test_support_eh,tc_start,{dummy_SUITE,end_per_suite}},
+     {ct_test_support_eh,tc_done,{dummy_SUITE,end_per_suite,ok}},
+     {ct_test_support_eh,test_done,{'DEF','STOP_TIME'}},
+     {ct_test_support_eh,stop_logging,[]}
+    ].
diff --git a/lib/test_server/test/test_server_line_SUITE_data/parse_transform_test.erl b/lib/common_test/test/ct_auto_compile_SUITE_data/bad_SUITE.erl
index 8f3477d3ac..b270c28849 100644
--- a/lib/test_server/test/test_server_line_SUITE_data/parse_transform_test.erl
+++ b/lib/common_test/test/ct_auto_compile_SUITE_data/bad_SUITE.erl
@@ -1,59 +1,23 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
-%% %CopyrightEnd%
 %%
--module(parse_transform_test).
-
--include("test_server_line.hrl").
--no_lines([{excluded,0}]).
-
--export([excluded/0, func/0]).
-
-
-excluded() ->
-    line1,
-    line2,
-    ok.
-
+%% %CopyrightEnd%
 
-func() ->
-    hello,
-    func1(),
-    case func2() of
-	ok ->
-	    helloagain,
-	    case func3() of
-		ok ->
-		    ok;
-		error ->
-		    error
-	    end;
-	error ->
-	    error
-    end,
-    excluded(),
-    func4().
+-module(bad_SUITE).
 
-func1() ->
-    ok.
-func2() ->
-    ok.
-func3() ->
-    error.
-func4() ->
-    ok.
+-compile(export_all).
 
+bad_bad_suite
diff --git a/lib/common_test/test/ct_auto_compile_SUITE_data/dummy_SUITE.erl b/lib/common_test/test/ct_auto_compile_SUITE_data/dummy_SUITE.erl
new file mode 100644
index 0000000000..0bb2e388c7
--- /dev/null
+++ b/lib/common_test/test/ct_auto_compile_SUITE_data/dummy_SUITE.erl
@@ -0,0 +1,130 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+
+-module(dummy_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% @spec suite() -> Info
+%% Info = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+%%--------------------------------------------------------------------
+%% @spec init_per_suite(Config0) ->
+%%     Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1} | {fail,Reason}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%% @end
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+all() -> 
+    [ok,fail,skip].
+
+
+ok(_Config) -> 
+    ok.
+
+fail(Config) ->
+    tuple_to_list(Config),
+    ok.
+
+skip(_Config) ->
+    {skip,"should be skipped"}.
diff --git a/lib/common_test/test/ct_basic_html_SUITE.erl b/lib/common_test/test/ct_basic_html_SUITE.erl
new file mode 100644
index 0000000000..a5f2e6197e
--- /dev/null
+++ b/lib/common_test/test/ct_basic_html_SUITE.erl
@@ -0,0 +1,180 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_basic_html_SUITE
+%%%
+%%% Description: 
+%%% 
+%%%
+%%% The suites used for the test are located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_basic_html_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic_flag, basic_spec].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%% 
+basic_flag(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+    Suites = [filename:join(DataDir, "babbling_SUITE")],
+    {Opts,ERPid} = setup([{suite,Suites},
+			  {basic_html,true},
+			  {label,"basic_flag"}],
+			 Config),
+
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(basic_flag, 
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(basic_flag),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+%%%-----------------------------------------------------------------
+%%% 
+basic_spec(Config) when is_list(Config) -> 
+    DataDir = ?config(data_dir, Config),
+    TestSpec = [{label,basic_spec},
+		{basic_html,true},
+		{suites,DataDir,babbling_SUITE}],
+    FileName = filename:join(?config(priv_dir, Config),"basic_spec.spec"),
+    {ok,Dev} = file:open(FileName, [write]),
+    [io:format(Dev, "~p.~n", [Term]) || Term <- TestSpec],
+    file:close(Dev),
+
+    {Opts,ERPid} = setup([{spec,FileName}], Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(basic_spec, 
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(basic_spec),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+						%reformat(Events, _EH) ->
+						%    Events.
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+events_to_check(Test) ->
+    %% 2 tests (ct:run_test + script_start) is default
+    events_to_check(Test, 2).
+
+events_to_check(_, 0) ->
+    [];
+events_to_check(Test, N) ->
+    test_events(Test) ++ events_to_check(Test, N-1).
+
+test_events(basic_flag) ->
+    [
+     {ct_test_support_eh,start_logging,{'DEF','RUNDIR'}},
+     {ct_test_support_eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {ct_test_support_eh,start_info,{1,1,3}},
+     {ct_test_support_eh,tc_start,{babbling_SUITE,init_per_suite}},
+     {ct_test_support_eh,tc_done,{babbling_SUITE,init_per_suite,ok}},
+     {ct_test_support_eh,test_stats,{1,1,{1,0}}},
+     {ct_test_support_eh,tc_start,{babbling_SUITE,end_per_suite}},
+     {ct_test_support_eh,tc_done,{babbling_SUITE,end_per_suite,ok}},
+     {ct_test_support_eh,test_done,{'DEF','STOP_TIME'}},
+     {ct_test_support_eh,stop_logging,[]}
+    ];
+
+test_events(basic_spec) ->
+    [
+     {ct_test_support_eh,start_logging,{'DEF','RUNDIR'}},
+     {ct_test_support_eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {ct_test_support_eh,start_info,{1,1,3}},
+     {ct_test_support_eh,tc_start,{babbling_SUITE,init_per_suite}},
+     {ct_test_support_eh,tc_done,{babbling_SUITE,init_per_suite,ok}},
+     {ct_test_support_eh,test_stats,{1,1,{1,0}}},
+     {ct_test_support_eh,tc_start,{babbling_SUITE,end_per_suite}},
+     {ct_test_support_eh,tc_done,{babbling_SUITE,end_per_suite,ok}},
+     {ct_test_support_eh,test_done,{'DEF','STOP_TIME'}},
+     {ct_test_support_eh,stop_logging,[]}
+    ].
diff --git a/lib/common_test/test/ct_basic_html_SUITE_data/babbling_SUITE.erl b/lib/common_test/test/ct_basic_html_SUITE_data/babbling_SUITE.erl
new file mode 100644
index 0000000000..7a3ccf30e0
--- /dev/null
+++ b/lib/common_test/test/ct_basic_html_SUITE_data/babbling_SUITE.erl
@@ -0,0 +1,130 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+
+-module(babbling_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% @spec suite() -> Info
+%% Info = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+%%--------------------------------------------------------------------
+%% @spec init_per_suite(Config0) ->
+%%     Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1} | {fail,Reason}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%% @end
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+all() -> 
+    [ok,fail,skip].
+
+
+ok(_Config) -> 
+    ok.
+
+fail(Config) ->
+    tuple_to_list(Config),
+    ok.
+
+skip(_Config) ->
+    {skip,"should be skipped"}.
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
index 18218bee47..d92be9ec6e 100644
--- a/lib/common_test/test/ct_config_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -88,7 +88,8 @@ require(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
     run_test(config_static_SUITE,
 	     Config,
-	     {config, filename:join(DataDir, "config/config.txt")},
+	     [{config, [filename:join(DataDir, "config/shadow.txt"),
+			filename:join(DataDir, "config/config.txt")]}],
              ["config_static_SUITE"]).
 
 install_config(Config) when is_list(Config) ->
@@ -106,7 +107,8 @@ userconfig_static(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
     run_test(config_static_SUITE,
 	     Config,
-	     {userconfig, {ct_config_xml, filename:join(DataDir, "config/config.xml")}},
+	     [{userconfig, {ct_config_xml, filename:join(DataDir, "config/config.xml")}},
+	      {config, filename:join(DataDir, "config/shadow.txt")}],
              ["config_static_SUITE"]).
 
 userconfig_dynamic(Config) when is_list(Config) ->
@@ -121,7 +123,8 @@ testspec_legacy(Config) when is_list(Config) ->
     make_spec(DataDir, ConfigDir,
 	      "spec_legacy.spec",
 	      [config_static_SUITE],
-	      [{config, filename:join(DataDir, "config/config.txt")}]),
+	      [{config, filename:join(DataDir, "config/shadow.txt")},
+	       {config, filename:join(DataDir, "config/config.txt")}]),
     run_test(config_static_SUITE,
 	     Config,
 	     {spec, filename:join(ConfigDir, "spec_legacy.spec")},
@@ -134,7 +137,8 @@ testspec_static(Config) when is_list(Config) ->
     make_spec(DataDir, ConfigDir,
 	      "spec_static.spec",
 	      [config_static_SUITE],
-	      [{userconfig, {ct_config_xml, filename:join(DataDir, "config/config.xml")}}]),
+	      [{userconfig, {ct_config_xml, filename:join(DataDir, "config/config.xml")}},
+	       {config, filename:join(DataDir, "config/shadow.txt")}]),
     run_test(config_static_SUITE,
 	     Config,
 	     {spec, filename:join(ConfigDir, "spec_static.spec")},
@@ -170,6 +174,7 @@ run_test(Name, Config, CTConfig, SuiteNames)->
     Joiner = fun(Suite) -> filename:join(DataDir, "config/test/"++Suite) end,
     Suites = lists:map(Joiner, SuiteNames),
     {Opts,ERPid} = setup_env({suite,Suites}, Config, CTConfig),
+
     ok = ct_test_support:run(Opts, Config),
     TestEvents = ct_test_support:get_events(ERPid, Config),
     ct_test_support:log_events(Name,
@@ -179,13 +184,15 @@ run_test(Name, Config, CTConfig, SuiteNames)->
     ExpEvents = events_to_check(Name),
     ok = ct_test_support:verify_events(ExpEvents, TestEvents, Config).
 
-setup_env(Test, Config, CTConfig) ->
+setup_env(Test, Config, CTConfig) when is_list(CTConfig) ->
     Opts0 = ct_test_support:get_opts(Config),
     Level = ?config(trace_level, Config),
     EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
-    Opts = Opts0 ++ [Test,{event_handler,{?eh,EvHArgs}}, CTConfig],
+    Opts = Opts0 ++ [Test,{event_handler,{?eh,EvHArgs}} | CTConfig],
     ERPid = ct_test_support:start_event_receiver(Config),
-    {Opts,ERPid}.
+    {Opts,ERPid};
+setup_env(Test, Config, CTConfig) ->
+    setup_env(Test, Config, [CTConfig]).
 
 reformat_events(Events, EH) ->
     ct_test_support:reformat(Events, EH).
@@ -202,40 +209,50 @@ events_to_check(_, 0) ->
 events_to_check(Test, N) ->
     expected_events(Test) ++ events_to_check(Test, N-1).
 
+-define(ok(Name,Suite,Stat),{?eh,tc_start,{Suite,Name}},
+	{?eh,tc_done,{Suite,Name,ok}},
+	{?eh,test_stats,Stat}).
+-define(nok(Name,Suite,Reason,Stat),{?eh,tc_start,{Suite,Name}},
+     {?eh,tc_done,{Suite,Name,Reason}},
+     {?eh,test_stats,Stat}).
+
+-define(sok(Name,Stat),?ok(Name,config_static_SUITE,Stat)).
+-define(snok(Name,Reason,Stat),?nok(Name,config_static_SUITE,Reason,Stat)).
+
+-define(dok(Name,Stat),?ok(Name,config_dynamic_SUITE,Stat)).
+-define(dnok(Name,Reason,Stat),?nok(Name,config_dynamic_SUITE,Reason,Stat)).
+
 expected_events(config_static_SUITE)->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{1,1,8}},
+     {?eh,start_info,{1,1,'_'}},
      {?eh,tc_start,{config_static_SUITE,init_per_suite}},
      {?eh,tc_done,{config_static_SUITE,init_per_suite,ok}},
-     {?eh,tc_start,{config_static_SUITE,test_get_config_simple}},
-     {?eh,tc_done,{config_static_SUITE,test_get_config_simple,ok}},
-     {?eh,test_stats,{1,0,{0,0}}},
-     {?eh,tc_start,{config_static_SUITE,test_get_config_nested}},
-     {?eh,tc_done,{config_static_SUITE,test_get_config_nested,ok}},
-     {?eh,test_stats,{2,0,{0,0}}},
-     {?eh,tc_start,{config_static_SUITE,test_default_suitewide}},
-     {?eh,tc_done,{config_static_SUITE,test_default_suitewide,ok}},
-     {?eh,test_stats,{3,0,{0,0}}},
-     {?eh,tc_start,{config_static_SUITE,test_config_name_already_in_use1}},
-     {?eh,tc_done,
-      {config_static_SUITE,test_config_name_already_in_use1,{skipped,{config_name_already_in_use,[x1]}}}},
-     {?eh,test_stats,{3,0,{1,0}}},
-     {?eh,tc_start,{config_static_SUITE,test_default_tclocal}},
-     {?eh,tc_done,{config_static_SUITE,test_default_tclocal,ok}},
-     {?eh,test_stats,{4,0,{1,0}}},
-     {?eh,tc_start,{config_static_SUITE,test_config_name_already_in_use2}},
-     {?eh,tc_done,
-      {config_static_SUITE,test_config_name_already_in_use2,
-       {skipped,{config_name_already_in_use,[alias,x1]}}}},
-     {?eh,test_stats,{4,0,{2,0}}},
-     {?eh,tc_start,{config_static_SUITE,test_alias_tclocal}},
-     {?eh,tc_done,{config_static_SUITE,test_alias_tclocal,ok}},
-     {?eh,test_stats,{5,0,{2,0}}},
-     {?eh,tc_start,{config_static_SUITE,test_get_config_undefined}},
-     {?eh,tc_done,{config_static_SUITE,test_get_config_undefined,ok}},
-     {?eh,test_stats,{6,0,{2,0}}},
+     ?sok(test_get_config_simple,{1,0,{0,0}}),
+     ?sok(test_get_config_nested,{2,0,{0,0}}),
+     ?sok(test_get_config_deep_nested,{3,0,{0,0}}),
+     ?sok(test_default_suitewide,{4,0,{0,0}}),
+     ?snok(test_config_name_already_in_use1,
+	  {skipped,{config_name_already_in_use,[x1]}},{4,0,{1,0}}),
+     ?sok(test_default_tclocal,{5,0,{1,0}}),
+     ?snok(test_config_name_already_in_use2,
+	  {skipped,{config_name_already_in_use,[alias,x1]}},{5,0,{2,0}}),
+     ?sok(test_alias_tclocal,{6,0,{2,0}}),
+     ?sok(test_get_config_undefined,{7,0,{2,0}}),
+     ?sok(test_require_subvals,{8,0,{2,0}}),
+     ?snok(test_require_subvals2,
+	  {skipped,{require_failed,
+		    {not_available,{gen_cfg,[a,b,c,d]}}}},{8,0,{2,1}}),
+     ?sok(test_require_deep_config,{9,0,{2,1}}),
+     ?sok(test_shadow_all,{10,0,{2,1}}),
+     ?sok(test_element,{11,0,{2,1}}),
+     ?sok(test_shadow_all_element,{12,0,{2,1}}),
+     ?sok(test_internal_deep,{13,0,{2,1}}),
+     ?sok(test_alias_tclocal_nested,{14,0,{2,1}}),
+     ?sok(test_alias_tclocal_nested_backward_compat,{15,0,{2,1}}),
+     ?sok(test_alias_tclocal_nested_backward_compat_subvals,{16,0,{2,1}}),
+     ?sok(test_config_same_name_already_in_use,{17,0,{2,1}}),
      {?eh,tc_start,{config_static_SUITE,end_per_suite}},
      {?eh,tc_done,{config_static_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
@@ -246,29 +263,14 @@ expected_events(config_dynamic_SUITE)->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{1,1,5}},
+     {?eh,start_info,{1,1,'_'}},
      {?eh,tc_start,{config_dynamic_SUITE,init_per_suite}},
      {?eh,tc_done,{config_dynamic_SUITE,init_per_suite,ok}},
-     {?eh,tc_start,{config_dynamic_SUITE,test_get_known_variable}},
-     {?eh,tc_done,
-      {config_dynamic_SUITE,test_get_known_variable,ok}},
-     {?eh,test_stats,{1,0,{0,0}}},
-     {?eh,tc_start,{config_dynamic_SUITE,test_localtime_update}},
-     {?eh,tc_done,{config_dynamic_SUITE,test_localtime_update,ok}},
-     {?eh,test_stats,{2,0,{0,0}}},
-     {?eh,tc_start,{config_dynamic_SUITE,test_server_pid}},
-     {?eh,tc_done,{config_dynamic_SUITE,test_server_pid,ok}},
-     {?eh,test_stats,{3,0,{0,0}}},
-     {?eh,tc_start,
-      {config_dynamic_SUITE,test_disappearable_variable}},
-     {?eh,tc_done,
-      {config_dynamic_SUITE,test_disappearable_variable,ok}},
-     {?eh,test_stats,{4,0,{0,0}}},
-     {?eh,tc_start,
-      {config_dynamic_SUITE,test_disappearable_variable_alias}},
-     {?eh,tc_done,
-      {config_dynamic_SUITE,test_disappearable_variable_alias,ok}},
-     {?eh,test_stats,{5,0,{0,0}}},
+     ?dok(test_get_known_variable,{1,0,{0,0}}),
+     ?dok(test_localtime_update,{2,0,{0,0}}),
+     ?dok(test_server_pid,{3,0,{0,0}}),
+     ?dok(test_disappearable_variable,{4,0,{0,0}}),
+     ?dok(test_disappearable_variable_alias,{5,0,{0,0}}),
      {?eh,tc_start,{config_dynamic_SUITE,end_per_suite}},
      {?eh,tc_done,{config_dynamic_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/config.txt b/lib/common_test/test/ct_config_SUITE_data/config/config.txt
index fcbffcd7f3..e4bcc5ba6b 100644
--- a/lib/common_test/test/ct_config_SUITE_data/config/config.txt
+++ b/lib/common_test/test/ct_config_SUITE_data/config/config.txt
@@ -2,7 +2,8 @@
 {gen_cfg,
 	[
 		{a,a_value},
-		{b,b_value}
+		{b,b_value},
+		{c,[{d,d_value}]}
 	]}.
 {gen_cfg2,
 	[
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/config.xml b/lib/common_test/test/ct_config_SUITE_data/config/config.xml
index 0a3e5f2e31..8eeff1482f 100644
--- a/lib/common_test/test/ct_config_SUITE_data/config/config.xml
+++ b/lib/common_test/test/ct_config_SUITE_data/config/config.xml
@@ -3,6 +3,7 @@
 	<gen_cfg>
 		<a>a_value</a>
 		<b>b_value</b>
+		<c><d>d_value</d></c>
 	</gen_cfg>
 	<gen_cfg2>
 		<c>"Hello, world!"</c>
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/shadow.txt b/lib/common_test/test/ct_config_SUITE_data/config/shadow.txt
new file mode 100644
index 0000000000..865bf9255a
--- /dev/null
+++ b/lib/common_test/test/ct_config_SUITE_data/config/shadow.txt
@@ -0,0 +1,12 @@
+{x, suite}.
+{gen_cfg3,
+	[
+		{l,
+		[
+			{m,
+			[
+				{n, "n"},
+				{o, 'o'}
+			]}
+		]}
+	]}.
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl
index 8751a2e8f3..19f1dab4af 100644
--- a/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -46,7 +46,7 @@ suite() ->
      {require, gen_cfg3},
      {require, alias, gen_cfg},
      %% x1 default value
-     {x1, {x,suite}}
+     {default_config, x1, {x,suite}}
     ].
 
 init_per_suite(Config) ->
@@ -55,14 +55,25 @@ init_per_suite(Config) ->
 end_per_suite(_) ->
     ok.
 
-all() -> [test_get_config_simple, test_get_config_nested, test_default_suitewide,
+all() -> [test_get_config_simple, test_get_config_nested,
+	  test_get_config_deep_nested, test_default_suitewide,
 	  test_config_name_already_in_use1, test_default_tclocal,
 	  test_config_name_already_in_use2, test_alias_tclocal,
-	  test_get_config_undefined].
-
-init_per_testcase(_, Config) ->
+	  test_get_config_undefined,
+	  test_require_subvals,test_require_subvals2,test_require_deep_config,
+	  test_shadow_all,test_element,test_shadow_all_element,
+	  test_internal_deep, test_alias_tclocal_nested,
+	  test_alias_tclocal_nested_backward_compat,
+	  test_alias_tclocal_nested_backward_compat_subvals,
+	  test_config_same_name_already_in_use
+].
+
+init_per_testcase(_,Config) ->
     Config.
 
+end_per_testcase(test_alias_tclocal_nested_backward_compat, _) ->
+    os:putenv("COMMON_TEST_ALIAS_TOP",""),
+    ok;
 end_per_testcase(_, _) ->
     ok.
 
@@ -76,6 +87,11 @@ test_get_config_nested(_)->
     a_value = ct:get_config({gen_cfg, a}),
     ok.
 
+%% test getting a deep nested value
+test_get_config_deep_nested(_)->
+    d_value = ct:get_config({gen_cfg, c, d}),
+    ok.
+
 %% test suite-wide default value
 test_default_suitewide(_)->
     suite = ct:get_config(x1),
@@ -109,15 +125,83 @@ test_config_name_already_in_use2(_) ->
     ct:fail("Test should've been skipped, you shouldn't see this!"),
     ok.
 
+
+test_config_same_name_already_in_use() ->
+    [].
+test_config_same_name_already_in_use(_) ->
+    ok = ct:require(x2,{gen_cfg,c}),
+    ok = ct:require(x2,{gen_cfg,c}).
+
 %% test aliases
 test_alias_tclocal() ->
     [{require,newalias,gen_cfg}].
-test_alias_tclocal(_) ->
-    A = [{a,a_value},{b,b_value}] = ct:get_config(newalias),
+test_alias_tclocal(C) when is_list(C) ->
+    test_alias_tclocal(newalias);
+test_alias_tclocal(Alias) when is_atom(Alias) ->
+    A = [{a,a_value},{b,b_value},{c,[{d,d_value}]}] = ct:get_config(Alias),
     A = ct:get_config(gen_cfg),
+    B = b_value = ct:get_config({Alias,b}),
+    B = ct:get_config({gen_cfg,b}),
     ok.
 
+%% test nested aliases
+test_alias_tclocal_nested() ->
+    [{require,newalias2,{gen_cfg,c}}].
+test_alias_tclocal_nested(_) ->
+    A = [{d,d_value}] = ct:get_config(newalias2),
+    A = ct:get_config({gen_cfg,c}),
+    B = d_value = ct:get_config({newalias2,d}),
+    B = ct:get_config({gen_cfg,c,d}),
+    ok.
+
+%% test nested aliases backward compat option
+test_alias_tclocal_nested_backward_compat() ->
+    os:putenv("COMMON_TEST_ALIAS_TOP","true"),
+    [{require,newalias3,{gen_cfg,c}}].
+test_alias_tclocal_nested_backward_compat(_) ->
+    test_alias_tclocal(newalias3).
+
+%% test nested aliases backward compat option
+test_alias_tclocal_nested_backward_compat_subvals() ->
+    [{require,newalias4,{gen_cfg,[c]}}].
+test_alias_tclocal_nested_backward_compat_subvals(_) ->
+    test_alias_tclocal(newalias4).
+
 %% test for getting undefined variables
 test_get_config_undefined(_) ->
     undefined = ct:get_config(y1),
     ok.
+
+test_require_subvals() ->
+    [{require, {gen_cfg,[a,b,c]}}].
+test_require_subvals(_) ->
+    ok.
+
+test_require_subvals2() ->
+    [{require, {gen_cfg,[a,b,c,d]}}].
+test_require_subvals2(_) ->
+    ct:fail("Test should've been skipped, you shouldn't see this!"),
+    ok.
+
+test_require_deep_config() ->
+    [{require, {gen_cfg3, m, n}}].
+test_require_deep_config(_) ->
+    ok.
+
+
+test_shadow_all(_) ->
+    ["n","N"] = ct:get_config({gen_cfg3,l, m, n}, [], [all]).
+
+test_element(_) ->
+    {{gen_cfg3,l, m, n},"n"} = ct:get_config({gen_cfg3,l, m, n}, [], [element]).
+
+test_shadow_all_element(_) ->
+    [{{gen_cfg3,l, m, n},"n"},{{gen_cfg3,l, m, n},"N"}] =
+	ct:get_config({gen_cfg3,l, m, n}, [], [all,element]).
+
+%% The tests below are needed to verify that things like ct:telnet can use
+%% nested configs
+test_internal_deep(_) ->
+    "n" = ct:get_config({{gen_cfg3,l,m},n}),
+    a_value = ct:get_config({{gen_cfg},a}),
+    undefined = ct:get_config({{gen_cfg3,l,m},p}).
diff --git a/lib/common_test/test/ct_config_info_SUITE.erl b/lib/common_test/test/ct_config_info_SUITE.erl
index 40da377ee5..10fe8286dd 100644
--- a/lib/common_test/test/ct_config_info_SUITE.erl
+++ b/lib/common_test/test/ct_config_info_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -123,8 +123,7 @@ test_events(config_info) ->
      {?eh,tc_done,{config_info_1_SUITE,init_per_suite,ok}},
 
      [{?eh,tc_start,{config_info_1_SUITE,{init_per_group,g1,[]}}},
-      {?eh,tc_done,{config_info_1_SUITE,
-		    {init_per_group,unknown,[]},
+      {?eh,tc_done,{config_info_1_SUITE,{init_per_group,g1,[]},
 		    {failed,{timetrap_timeout,350}}}},
       {?eh,tc_auto_skip,{config_info_1_SUITE,t11,
 	{failed,{config_info_1_SUITE,init_per_group,{timetrap_timeout,350}}}}},
@@ -136,14 +135,12 @@ test_events(config_info) ->
       {?eh,tc_done,{config_info_1_SUITE,{init_per_group,g2,[]},ok}},
       {?eh,tc_done,{config_info_1_SUITE,t21,ok}},
       {?eh,tc_start,{config_info_1_SUITE,{end_per_group,g2,[]}}},
-      {?eh,tc_done,{config_info_1_SUITE,
-		    {end_per_group,unknown,[]},
+      {?eh,tc_done,{config_info_1_SUITE,{end_per_group,g2,[]},
 		    {failed,{timetrap_timeout,450}}}}],
      [{?eh,tc_start,{config_info_1_SUITE,{init_per_group,g3,[]}}},
       {?eh,tc_done,{config_info_1_SUITE,{init_per_group,g3,[]},ok}},
       [{?eh,tc_start,{config_info_1_SUITE,{init_per_group,g4,[]}}},
-       {?eh,tc_done,{config_info_1_SUITE,
-		     {init_per_group,unknown,[]},
+       {?eh,tc_done,{config_info_1_SUITE,{init_per_group,g4,[]},
 		     {failed,{timetrap_timeout,400}}}},
        {?eh,tc_auto_skip,{config_info_1_SUITE,t41,
 	 {failed,{config_info_1_SUITE,init_per_group,
@@ -164,8 +161,7 @@ test_events(config_info) ->
        {?eh,tc_done,{config_info_1_SUITE,{init_per_group,g5,[]},ok}},
        {?eh,tc_done,{config_info_1_SUITE,t51,ok}},
        {?eh,tc_start,{config_info_1_SUITE,{end_per_group,g5,[]}}},
-       {?eh,tc_done,{config_info_1_SUITE,
-		     {end_per_group,unknown,[]},
+       {?eh,tc_done,{config_info_1_SUITE,{end_per_group,g5,[]},
 		     {failed,{timetrap_timeout,400}}}}],
       {?eh,tc_start,{config_info_1_SUITE,{end_per_group,g3,[]}}},
       {?eh,tc_done,{config_info_1_SUITE,{end_per_group,g3,[]},ok}}],
diff --git a/lib/common_test/test/ct_cover_SUITE.erl b/lib/common_test/test/ct_cover_SUITE.erl
new file mode 100644
index 0000000000..bebfce70d0
--- /dev/null
+++ b/lib/common_test/test/ct_cover_SUITE.erl
@@ -0,0 +1,271 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_cover_SUITE
+%%%
+%%% Description:
+%%% Test code cover analysis support
+%%%
+%%%-------------------------------------------------------------------
+-module(ct_cover_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+-define(suite, cover_SUITE).
+-define(mod, cover_test_mod).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    case test_server:is_cover() of
+	true ->
+	    {skip,"Test server is running cover already - skipping"};
+	false ->
+	    ct_test_support:init_per_suite(Config)
+    end.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    Node = fullname(existing_node),
+    case lists:member(Node,nodes()) of
+	true -> rpc:call(Node,erlang,halt,[]);
+	false -> ok
+    end,
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [
+     default,
+     cover_stop_true,
+     cover_stop_false,
+     slave,
+     slave_start_slave,
+     cover_node_option,
+     ct_cover_add_remove_nodes,
+     otp_9956
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%% Check that cover is collected from test node
+%% Also check that cover is by default stopped after test is completed
+default(Config) ->
+    {ok,Events} = run_test(default,Config),
+    false = check_cover(Config),
+    check_calls(Events,1),
+    ok.
+
+%% Check that cover is stopped when cover_stop option is set to true
+cover_stop_true(Config) ->
+    {ok,_Events} = run_test(cover_stop_true,[{cover_stop,true}],Config),
+    false = check_cover(Config).
+
+%% Check that cover is not stopped when cover_stop option is set to false
+cover_stop_false(Config) ->
+    {ok,_Events} = run_test(cover_stop_false,[{cover_stop,false}],Config),
+    {true,[],[?mod]} = check_cover(Config),
+    CTNode = proplists:get_value(ct_node, Config),
+    ok = rpc:call(CTNode,cover,stop,[]),
+    false = check_cover(Config),
+    ok.
+
+%% Let test node start a slave node - check that cover is collected
+%% from both nodes
+slave(Config) ->
+    {ok,Events} = run_test(slave,slave,[],Config),
+    check_calls(Events,2),
+    ok.
+
+%% Let test node start a slave node which in turn starts another slave
+%% node - check that cover is collected from all three nodes
+slave_start_slave(Config) ->
+    {ok,Events} = run_test(slave_start_slave,slave_start_slave,[],Config),
+    check_calls(Events,3),
+    ok.
+
+%% Start a slave node before test starts - the node is listed in cover
+%% spec file.
+%% Check that cover is collected from test node and slave node.
+cover_node_option(Config) ->
+    {ok, HostStr}=inet:gethostname(),
+    Host = list_to_atom(HostStr),
+    DataDir = ?config(data_dir,Config),
+    {ok,Node} = ct_slave:start(Host,existing_node,
+			       [{erl_flags,"-pa " ++ DataDir}]),
+    false = check_cover(Node),
+    CoverSpec = default_cover_file_content() ++ [{nodes,[Node]}],
+    CoverFile = create_cover_file(cover_node_option,CoverSpec,Config),
+    {ok,Events} = run_test(cover_node_option,cover_node_option,
+			   [{cover,CoverFile}],Config),
+    check_calls(Events,2),
+    {ok,Node} = ct_slave:stop(existing_node),
+    ok.
+
+%% Test ct_cover:add_nodes/1 and ct_cover:remove_nodes/1
+%% Check that cover is collected from added node
+ct_cover_add_remove_nodes(Config) ->
+    {ok, HostStr}=inet:gethostname(),
+    Host = list_to_atom(HostStr),
+    DataDir = ?config(data_dir,Config),
+    {ok,Node} = ct_slave:start(Host,existing_node,
+			       [{erl_flags,"-pa " ++ DataDir}]),
+    false = check_cover(Node),
+    {ok,Events} = run_test(ct_cover_add_remove_nodes,ct_cover_add_remove_nodes,
+			   [],Config),
+    check_calls(Events,2),
+    {ok,Node} = ct_slave:stop(existing_node),
+    ok.
+
+%% Test that the test suite itself can be cover compiled and that
+%% data_dir is set correctly (OTP-9956)
+otp_9956(Config) ->
+    CoverFile = create_cover_file(otp_9956,[{incl_mods,[?suite]}],Config),
+    {ok,Events} = run_test(otp_9956,otp_9956,[{cover,CoverFile}],Config),
+    check_calls(Events,{?suite,otp_9956,1},1),
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+run_test(Label,Config) ->
+    run_test(Label,[],Config).
+run_test(Label,ExtraOpts,Config) ->
+    run_test(Label,default,ExtraOpts,Config).
+run_test(Label,Testcase,ExtraOpts,Config) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, ?suite),
+    CoverFile =
+	case proplists:get_value(cover,ExtraOpts) of
+	    undefined ->
+		create_default_cover_file(Label,Config);
+	    CF ->
+		CF
+	end,
+    RestOpts = lists:keydelete(cover,1,ExtraOpts),
+    {Opts,ERPid} = setup([{suite,Suite},{testcase,Testcase},
+			  {cover,CoverFile},{label,Label}] ++ RestOpts, Config),
+    execute(Label, Testcase, Opts, ERPid, Config).
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+execute(Name, Testcase, Opts, ERPid, Config) ->
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(Name,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+    TestEvents = events_to_check(Testcase),
+    R = ct_test_support:verify_events(TestEvents, Events, Config),
+   {R,Events}.
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+events_to_check(Testcase) ->
+    OneTest =
+	[{?eh,start_logging,{'DEF','RUNDIR'}}] ++
+	[{?eh,tc_done,{?suite,Testcase,ok}}] ++
+	[{?eh,stop_logging,[]}],
+
+    %% 2 tests (ct:run_test + script_start) is default
+    OneTest ++ OneTest.
+
+check_cover(Config) when is_list(Config) ->
+    CTNode = proplists:get_value(ct_node, Config),
+    check_cover(CTNode);
+check_cover(Node) when is_atom(Node) ->
+    case rpc:call(Node,test_server,is_cover,[]) of
+	true ->
+	    {true,
+	     rpc:call(Node,cover,which_nodes,[]),
+	     rpc:call(Node,cover,modules,[])};
+	false ->
+	    false
+    end.
+
+%% Check that each coverlog includes N calls to ?mod:foo/0
+check_calls(Events,N) ->
+    check_calls(Events,{?mod,foo,0},N).
+check_calls(Events,MFA,N) ->
+    CoverLogs =
+	[filename:join(filename:dirname(TCLog),"all.coverdata") ||
+	    {ct_test_support_eh,
+	     {event,tc_logfile,ct@falco,
+	      {{?suite,init_per_suite},TCLog}}} <- Events],
+    do_check_logs(CoverLogs,MFA,N).
+
+do_check_logs([CoverLog|CoverLogs],{Mod,_,_} = MFA,N) ->
+    {ok,_} = cover:start(),
+    ok = cover:import(CoverLog),
+    {ok,Calls} = cover:analyse(Mod,calls,function),
+    ok = cover:stop(),
+    {MFA,N} = lists:keyfind(MFA,1,Calls),
+    do_check_logs(CoverLogs,MFA,N);
+do_check_logs([],_,_) ->
+    ok.
+
+fullname(Name) ->
+    {ok,Host} = inet:gethostname(),
+    list_to_atom(atom_to_list(Name) ++ "@" ++ Host).
+
+default_cover_file_content() ->
+    [{incl_mods,[?mod]}].
+
+create_default_cover_file(Filename,Config) ->
+    create_cover_file(Filename,default_cover_file_content(),Config).
+
+create_cover_file(Filename,Terms,Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    File = filename:join(PrivDir,Filename) ++ ".cover",
+    {ok,Fd} = file:open(File,[write]),
+    lists:foreach(fun(Term) ->
+			  file:write(Fd,io_lib:format("~p.~n",[Term]))
+		  end,Terms),
+    ok = file:close(Fd),
+    File.
diff --git a/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE.erl b/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE.erl
new file mode 100644
index 0000000000..fdc3323f0a
--- /dev/null
+++ b/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE.erl
@@ -0,0 +1,156 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%----------------------------------------------------------------------
+%% File: cover_SUITE.erl
+%%
+%% Description:
+%%    This file contains the test cases for the code coverage support
+%%
+%% @author Support
+%% @doc Test  of code coverage support in common_test
+%% @end
+%%----------------------------------------------------------------------
+%%----------------------------------------------------------------------
+-module(cover_SUITE).
+-include_lib("common_test/include/ct.hrl").
+
+-compile(export_all).
+
+%% Default timetrap timeout (set in init_per_testcase).
+-define(default_timeout, ?t:minutes(1)).
+
+suite() ->
+    [].
+
+all() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    Config.
+
+init_per_testcase(_Case, Config) ->
+    Dog = test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(Case, Config) ->
+    %% try apply(?MODULE,Case,[cleanup,Config])
+    %% catch error:undef -> ok
+    %% end,
+
+    kill_slaves(Case,nodes()),
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+break(_Config) ->
+    test_server:break(""),
+    ok.
+
+default(Config) ->
+    cover_compiled = code:which(cover_test_mod),
+    cover_test_mod:foo(),
+    ok.
+
+slave(Config) ->
+    cover_compiled = code:which(cover_test_mod),
+    cover_test_mod:foo(),
+    N1 = nodename(slave,1),
+    {ok,Node} = ct_slave:start(N1),
+    cover_compiled = rpc:call(Node,code,which,[cover_test_mod]),
+    rpc:call(Node,cover_test_mod,foo,[]),
+    {ok,Node} = ct_slave:stop(N1),
+    ok.
+
+slave_start_slave(Config) ->
+    cover_compiled = code:which(cover_test_mod),
+    cover_test_mod:foo(),
+    N1 = nodename(slave_start_slave,1),
+    N2 = nodename(slave_start_slave,2),
+    {ok,Node} = ct_slave:start(N1),
+    cover_compiled = rpc:call(Node,code,which,[cover_test_mod]),
+    rpc:call(Node,cover_test_mod,foo,[]),
+    {ok,Node2} = rpc:call(Node,ct_slave,start,[N2]),
+    rpc:call(Node2,cover_test_mod,foo,[]),
+    {ok,Node2} = rpc:call(Node,ct_slave,stop,[N2]),
+    {ok,Node} = ct_slave:stop(N1),
+    ok.
+
+cover_node_option(Config) ->
+    cover_compiled = code:which(cover_test_mod),
+    cover_test_mod:foo(),
+    Node = fullname(existing_node),
+    cover_compiled = rpc:call(Node,code,which,[cover_test_mod]),
+    rpc:call(Node,cover_test_mod,foo,[]),
+    ok.
+
+ct_cover_add_remove_nodes(Config) ->
+    cover_compiled = code:which(cover_test_mod),
+    cover_test_mod:foo(),
+    Node = fullname(existing_node),
+    Beam = rpc:call(Node,code,which,[cover_test_mod]),
+    false = (Beam == cover_compiled),
+
+    rpc:call(Node,cover_test_mod,foo,[]), % should not be collected
+    {ok,[Node]} = ct_cover:add_nodes([Node]),
+    cover_compiled = rpc:call(Node,code,which,[cover_test_mod]),
+    rpc:call(Node,cover_test_mod,foo,[]), % should be collected
+    ok = ct_cover:remove_nodes([Node]),
+    rpc:call(Node,cover_test_mod,foo,[]), % should not be collected
+
+    Beam = rpc:call(Node,code,which,[cover_test_mod]),
+
+    ok.
+
+otp_9956(Config) ->
+    cover_compiled = code:which(?MODULE),
+    DataDir = ?config(data_dir,Config),
+    absolute = filename:pathtype(DataDir),
+    true = filelib:is_dir(DataDir),
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% Internal
+nodename(Case,N) ->
+    list_to_atom(nodeprefix(Case) ++ integer_to_list(N)).
+
+nodeprefix(Case) ->
+    atom_to_list(?MODULE) ++ "_" ++ atom_to_list(Case) ++ "_node".
+
+
+fullname(Name) ->
+    {ok,Host} = inet:gethostname(),
+    list_to_atom(atom_to_list(Name) ++ "@" ++ Host).
+
+kill_slaves(Case, [Node|Nodes]) ->
+    Prefix = nodeprefix(Case),
+    case lists:prefix(Prefix,atom_to_list(Node)) of
+	true ->
+	    rpc:call(Node,erlang,halt,[]);
+	_ ->
+	    ok
+    end,
+    kill_slaves(Case,Nodes);
+kill_slaves(_,[]) ->
+    ok.
diff --git a/lib/inviso/doc/html/.gitignore b/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE_data/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/inviso/doc/html/.gitignore
+++ b/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE_data/.gitignore
diff --git a/lib/common_test/test/ct_cover_SUITE_data/cover_test_mod.erl b/lib/common_test/test/ct_cover_SUITE_data/cover_test_mod.erl
new file mode 100644
index 0000000000..d4f69452c3
--- /dev/null
+++ b/lib/common_test/test/ct_cover_SUITE_data/cover_test_mod.erl
@@ -0,0 +1,4 @@
+-module(cover_test_mod).
+-compile(export_all).
+foo() ->
+    ok.
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index c9ee47e01b..6d90b29f41 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -61,7 +61,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     [cfg_error, lib_error, no_compile, timetrap_end_conf,
      timetrap_normal, timetrap_extended, timetrap_parallel,
-     timetrap_fun, misc_errors].
+     timetrap_fun, timetrap_fun_group, misc_errors].
 
 groups() -> 
     [].
@@ -251,6 +251,24 @@ timetrap_fun(Config) when is_list(Config) ->
 
 %%%-----------------------------------------------------------------
 %%%
+timetrap_fun_group(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Join = fun(D, S) -> filename:join(D, "error/test/"++S) end,
+    Suites = [Join(DataDir, "timetrap_8_SUITE")],
+    {Opts,ERPid} = setup([{suite,Suites}], Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(timetrap_fun_group,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(timetrap_fun_group),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+%%%-----------------------------------------------------------------
+%%%
 misc_errors(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
     Join = fun(D, S) -> filename:join(D, "error/test/"++S) end,
@@ -429,8 +447,7 @@ test_events(cfg_error) ->
 		 {'EXIT',{init_per_group_fails,g1}}}}}}],
 
      [{?eh,tc_start,{cfg_error_8_SUITE,{init_per_group,g2,[]}}},
-      {?eh,tc_done,{cfg_error_8_SUITE,
-		    {init_per_group,unknown,[]},
+      {?eh,tc_done,{cfg_error_8_SUITE,{init_per_group,g2,[]},
 		    {failed,{timetrap_timeout,2000}}}},
       {?eh,tc_auto_skip,{cfg_error_8_SUITE,tc1,
 			 {failed,{cfg_error_8_SUITE,init_per_group,
@@ -500,7 +517,7 @@ test_events(cfg_error) ->
       {?eh,tc_done,{cfg_error_8_SUITE,tc1,ok}},
       {?eh,test_stats,{9,0,{0,14}}},
       {?eh,tc_start,{cfg_error_8_SUITE,{end_per_group,g12,[]}}},
-      {?eh,tc_done,{cfg_error_8_SUITE,{end_per_group,unknown,[]},
+      {?eh,tc_done,{cfg_error_8_SUITE,{end_per_group,g12,[]},
 		    {failed,{timetrap_timeout,2000}}}}],
 
      {?eh,tc_start,{cfg_error_8_SUITE,end_per_suite}},
@@ -878,11 +895,11 @@ test_events(timetrap_fun) ->
 		   {failed,{timetrap_timeout,{'$approx',1000}}}}},
      {?eh,test_stats,{0,5,{0,0}}},
      {?eh,tc_start,{timetrap_5_SUITE,tc1}},
-     {?eh,tc_done,{undefined,undefined,{user_timetrap_error,
+     {?eh,tc_done,{timetrap_5_SUITE,tc1,{user_timetrap_error,
 					{kaboom,'_'}}}},
      {?eh,test_stats,{0,6,{0,0}}},
      {?eh,tc_start,{timetrap_5_SUITE,tc2}},
-     {?eh,tc_done,{undefined,undefined,{user_timetrap_error,
+     {?eh,tc_done,{timetrap_5_SUITE,tc2,{user_timetrap_error,
 					{kaboom,'_'}}}},
      {?eh,test_stats,{0,7,{0,0}}},
      {?eh,tc_start,{timetrap_5_SUITE,tc3}},
@@ -937,7 +954,7 @@ test_events(timetrap_fun) ->
      {?eh,tc_done,{timetrap_5_SUITE,end_per_suite,ok}},
 
      {?eh,tc_start,{timetrap_6_SUITE,init_per_suite}},
-     {?eh,tc_done,{undefined,undefined,{user_timetrap_error,
+     {?eh,tc_done,{timetrap_6_SUITE,init_per_suite,{user_timetrap_error,
 					{kaboom,'_'}}}},
      {?eh,tc_auto_skip,{timetrap_6_SUITE,tc0,
 			{failed,{timetrap_6_SUITE,init_per_suite,
@@ -971,11 +988,423 @@ test_events(timetrap_fun) ->
      {?eh,stop_logging,[]}
     ];
 
+test_events(timetrap_fun_group) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,58}},
+     {?eh,tc_start,{timetrap_8_SUITE,init_per_suite}},
+     {?eh,tc_done,{timetrap_8_SUITE,init_per_suite,ok}},
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g0,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g0,[]},ok}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc0}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc0,
+		    {failed,{timetrap_timeout,{'$approx',1000}}}}},
+      {?eh,test_stats,{0,1,{0,0}}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc2}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc2,
+		    {failed,{timetrap_timeout,{'$approx',500}}}}},
+      {?eh,test_stats,{0,2,{0,0}}},
+      {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,g0,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,g0,[]},ok}}],
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g1,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g1,[]},ok}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc0}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc0,
+		    {failed,{timetrap_timeout,{'$approx',1000}}}}},
+      {?eh,test_stats,{0,3,{0,0}}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc2}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc2,
+		    {failed,{timetrap_timeout,{'$approx',500}}}}},
+      {?eh,test_stats,{0,4,{0,0}}},
+      {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,g1,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,g1,[]},ok}}],
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g2,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g2,[]},ok}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc1}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc1,
+		    {failed,{timetrap_timeout,{'$approx',1000}}}}},
+      {?eh,test_stats,{0,5,{0,0}}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc2}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc2,
+		    {failed,{timetrap_timeout,{'$approx',500}}}}},
+      {?eh,test_stats,{0,6,{0,0}}},
+      {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,g2,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,g2,[]},ok}}],
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g3,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g3,[]},ok}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc4}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc4,
+		    {failed,{timetrap_timeout,{'$approx',2000}}}}},
+      {?eh,test_stats,{0,7,{0,0}}},
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g1,[]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g1,[]},ok}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc0}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc0,
+		     {failed,{timetrap_timeout,{'$approx',1000}}}}},
+       {?eh,test_stats,{0,8,{0,0}}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc2}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc2,
+		     {failed,{timetrap_timeout,{'$approx',500}}}}},
+       {?eh,test_stats,{0,9,{0,0}}},
+       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,g1,[]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,g1,[]},ok}}],
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g2,[]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g2,[]},ok}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc1}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc1,
+		     {failed,{timetrap_timeout,{'$approx',1000}}}}},
+       {?eh,test_stats,{0,10,{0,0}}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc2}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc2,
+		     {failed,{timetrap_timeout,{'$approx',500}}}}},
+       {?eh,test_stats,{0,11,{0,0}}},
+       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,g2,[]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,g2,[]},ok}}],
+      {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,g3,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,g3,[]},ok}}],
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g4,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g4,[]},
+		    {user_timetrap_error,{kaboom,'_'}}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+			 {failed,{timetrap_8_SUITE,init_per_group,
+				  {user_timetrap_error,{kaboom,'_'}}}}}},
+      {?eh,test_stats,{0,11,{0,1}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+			 {failed,{timetrap_8_SUITE,init_per_group,
+				  {user_timetrap_error,{kaboom,'_'}}}}}},
+      {?eh,test_stats,{0,11,{0,2}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,end_per_group,
+			 {failed,{timetrap_8_SUITE,init_per_group,
+				  {user_timetrap_error,{kaboom,'_'}}}}}}],
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g5,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g5,[]},
+		    {user_timetrap_error,{kaboom,'_'}}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+			 {failed,{timetrap_8_SUITE,init_per_group,
+				  {user_timetrap_error,{kaboom,'_'}}}}}},
+      {?eh,test_stats,{0,11,{0,3}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+			 {failed,{timetrap_8_SUITE,init_per_group,
+				  {user_timetrap_error,{kaboom,'_'}}}}}},
+      {?eh,test_stats,{0,11,{0,4}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,end_per_group,
+			 {failed,{timetrap_8_SUITE,init_per_group,
+				  {user_timetrap_error,{kaboom,'_'}}}}}}],
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g6,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g6,[]},
+		    {failed,{timetrap_timeout,{'$approx',500}}}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+			 {failed,{timetrap_8_SUITE,init_per_group,
+				  {timetrap_timeout,'_'}}}}},
+      {?eh,test_stats,{0,11,{0,5}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+			 {failed,{timetrap_8_SUITE,init_per_group,
+				  {timetrap_timeout,'_'}}}}},
+      {?eh,test_stats,{0,11,{0,6}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,end_per_group,
+			 {failed,{timetrap_8_SUITE,init_per_group,
+				  {timetrap_timeout,'_'}}}}}],
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g7,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g7,[]},ok}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc5}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc5,ok}},
+      {?eh,test_stats,{1,11,{0,6}}},
+      {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,g7,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,g7,[]},
+		    {user_timetrap_error,{kaboom,'_'}}}}],
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g8,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g8,[]},ok}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc5}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc5,ok}},
+      {?eh,test_stats,{2,11,{0,6}}},
+      {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,g8,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,g8,[]},
+		    {failed,{timetrap_timeout,{'$approx',500}}}}}],
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g9,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g9,[]},ok}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc5}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc5,ok}},
+      {?eh,test_stats,{3,11,{0,6}}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc0}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc0,
+		    {user_timetrap_error,{kaboom,'_'}}}},
+      {?eh,test_stats,{3,12,{0,6}}},
+      {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,g9,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,g9,[]},ok}}],
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g10,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g10,[]},ok}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc0}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc0,
+		    {user_timetrap_error,{kaboom,'_'}}}},
+      {?eh,test_stats,{3,13,{0,6}}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc5}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc5,ok}},
+      {?eh,test_stats,{4,13,{0,6}}},
+      {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,g10,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,g10,[]},ok}}],
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g11,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g11,[]},ok}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc3}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc3,
+		    {failed,{timetrap_timeout,{'$approx',4000}}}}},
+      {?eh,test_stats,{4,14,{0,6}}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc2}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc2,
+		    {failed,{timetrap_timeout,{'$approx',500}}}}},
+      {?eh,test_stats,{4,15,{0,6}}},
+      {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,g11,[]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,g11,[]},ok}}],
+
+     {parallel,
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg0,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg0,[parallel]},ok}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc0}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc0,
+		     {failed,{timetrap_timeout,{'$approx',1000}}}}},
+       {?eh,test_stats,{4,16,{0,6}}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc2}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc2,
+		     {failed,{timetrap_timeout,{'$approx',500}}}}},
+       {?eh,test_stats,{4,17,{0,6}}},
+       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,pg0,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,pg0,[parallel]},ok}}]},
+
+     {parallel,
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg1,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg1,[parallel]},ok}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc0}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc0,
+		     {failed,{timetrap_timeout,{'$approx',1000}}}}},
+       {?eh,test_stats,{4,18,{0,6}}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc2}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc2,
+		     {failed,{timetrap_timeout,{'$approx',500}}}}},
+       {?eh,test_stats,{4,19,{0,6}}},
+       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,pg1,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,pg1,[parallel]},ok}}]},
+
+     {parallel,
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg2,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg2,[parallel]},ok}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc1}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc1,
+		     {failed,{timetrap_timeout,{'$approx',1000}}}}},
+       {?eh,test_stats,{4,20,{0,6}}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc2}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc2,
+		     {failed,{timetrap_timeout,{'$approx',500}}}}},
+       {?eh,test_stats,{4,21,{0,6}}},
+       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,pg2,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,pg2,[parallel]},ok}}]},
+
+     {parallel,
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg3,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg3,[parallel]},ok}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc4}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc4,
+		     {failed,{timetrap_timeout,{'$approx',2000}}}}},
+       {?eh,test_stats,{4,22,{0,6}}},
+       {parallel,
+	[{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg1,[parallel]}}},
+	 {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg1,[parallel]},
+		       ok}},
+	 {?eh,tc_start,{timetrap_8_SUITE,tc0}},
+	 {?eh,tc_done,{timetrap_8_SUITE,tc0,
+		       {failed,{timetrap_timeout,{'$approx',1000}}}}},
+	 {?eh,test_stats,{4,23,{0,6}}},
+	 {?eh,tc_start,{timetrap_8_SUITE,tc2}},
+	 {?eh,tc_done,{timetrap_8_SUITE,tc2,
+		       {failed,{timetrap_timeout,{'$approx',500}}}}},
+	 {?eh,test_stats,{4,24,{0,6}}},
+	 {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,pg1,[parallel]}}},
+	 {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,pg1,[parallel]},
+		       ok}}]},
+       {parallel,
+	[{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg2,[parallel]}}},
+	 {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg2,[parallel]},
+		       ok}},
+	 {?eh,tc_start,{timetrap_8_SUITE,tc1}},
+	 {?eh,tc_done,{timetrap_8_SUITE,tc1,
+		       {failed,{timetrap_timeout,{'$approx',1000}}}}},
+	 {?eh,test_stats,{4,25,{0,6}}},
+	 {?eh,tc_start,{timetrap_8_SUITE,tc2}},
+	 {?eh,tc_done,{timetrap_8_SUITE,tc2,
+		       {failed,{timetrap_timeout,{'$approx',500}}}}},
+	 {?eh,test_stats,{4,26,{0,6}}},
+	 {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,pg2,[parallel]}}},
+	 {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,pg2,[parallel]},
+		       ok}}]},
+       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,pg3,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,pg3,[parallel]},ok}}]},
+
+     {parallel,
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg4,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg4,[parallel]},
+		     {user_timetrap_error,{kaboom,'_'}}}},
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+			  {failed,{timetrap_8_SUITE,init_per_group,
+				   {user_timetrap_error,{kaboom,'_'}}}}}},
+       {?eh,test_stats,{4,26,{0,7}}},
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+			  {failed,{timetrap_8_SUITE,init_per_group,
+				   {user_timetrap_error,{kaboom,'_'}}}}}},
+       {?eh,test_stats,{4,26,{0,8}}},
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,end_per_group,
+			  {failed,{timetrap_8_SUITE,init_per_group,
+				   {user_timetrap_error,{kaboom,'_'}}}}}}]},
+
+     {parallel,
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg5,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg5,[parallel]},
+		     {user_timetrap_error,{kaboom,'_'}}}},
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+			  {failed,{timetrap_8_SUITE,init_per_group,
+				   {user_timetrap_error,{kaboom,'_'}}}}}},
+       {?eh,test_stats,{4,26,{0,9}}},
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+			  {failed,{timetrap_8_SUITE,init_per_group,
+				   {user_timetrap_error,{kaboom,'_'}}}}}},
+       {?eh,test_stats,{4,26,{0,10}}},
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,end_per_group,
+			  {failed,{timetrap_8_SUITE,init_per_group,
+				   {user_timetrap_error,{kaboom,'_'}}}}}}]},
+
+     {parallel,
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg6,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg6,[parallel]},
+		     {failed,{timetrap_timeout,{'$approx',500}}}}},
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+			  {failed,{timetrap_8_SUITE,init_per_group,
+				   {timetrap_timeout,'_'}}}}},
+       {?eh,test_stats,{4,26,{0,11}}},
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+			  {failed,{timetrap_8_SUITE,init_per_group,
+				   {timetrap_timeout,'_'}}}}},
+       {?eh,test_stats,{4,26,{0,12}}},
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,end_per_group,
+			  {failed,{timetrap_8_SUITE,init_per_group,
+				   {timetrap_timeout,'_'}}}}}]},
+
+     {parallel,
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg7,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg7,[parallel]},ok}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc5}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc5,ok}},
+       {?eh,test_stats,{5,26,{0,12}}},
+       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,pg7,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,pg7,[parallel]},
+		     {user_timetrap_error,{kaboom,'_'}}}}]},
+
+     {parallel,
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg8,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg8,[parallel]},ok}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc5}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc5,ok}},
+       {?eh,test_stats,{6,26,{0,12}}},
+       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,pg8,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,pg8,[parallel]},
+		     {failed,{timetrap_timeout,{'$approx',500}}}}}]},
+
+     {parallel,
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg9,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg9,[parallel]},ok}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc5}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc5,ok}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc0}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc0,
+		     {user_timetrap_error,{kaboom,'_'}}}},
+       %% Due to parallelism only checking final test stat in group
+       {?eh,test_stats,{7,27,{0,12}}},
+       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,pg9,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,pg9,[parallel]},ok}}]},
+
+     {parallel,
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg10,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg10,[parallel]},ok}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc0}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc0,
+		     {user_timetrap_error,{kaboom,'_'}}}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc5}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc5,ok}},
+       %% Due to parallelism only checking final test stat in group
+       {?eh,test_stats,{8,28,{0,12}}},
+       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,pg10,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,pg10,[parallel]},ok}}]},
+
+     {parallel,
+      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg11,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg11,[parallel]},ok}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc3}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc3,
+		     {failed,{timetrap_timeout,{'$approx',4000}}}}},
+       {?eh,test_stats,{8,29,{0,12}}},
+       {?eh,tc_start,{timetrap_8_SUITE,tc2}},
+       {?eh,tc_done,{timetrap_8_SUITE,tc2,
+		     {failed,{timetrap_timeout,{'$approx',500}}}}},
+       {?eh,test_stats,{8,30,{0,12}}},
+       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,pg11,[parallel]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,pg11,[parallel]},ok}}]},
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,sg1,[sequence]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,sg1,[sequence]},ok}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc5}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc5,ok}},
+      {?eh,test_stats,{9,30,{0,12}}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc0}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc0,
+		    {user_timetrap_error,{kaboom,'_'}}}},
+      {?eh,test_stats,{9,31,{0,12}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc1,
+			 {failed,{timetrap_8_SUITE,tc0}}}},
+      {?eh,test_stats,{9,31,{0,13}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+			 {failed,{timetrap_8_SUITE,tc0}}}},
+      {?eh,test_stats,{9,31,{0,14}}},
+       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,sg1,[sequence]}}},
+       {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,sg1,[sequence]},ok}}],
+
+     [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,sg2,[sequence]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,sg2,[sequence]},ok}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc5}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc5,ok}},
+      {?eh,test_stats,{10,31,{0,14}}},
+      {?eh,tc_start,{timetrap_8_SUITE,tc0}},
+      {?eh,tc_done,{timetrap_8_SUITE,tc0,
+		    {failed,{timetrap_timeout,{'$approx',1000}}}}},
+      {?eh,test_stats,{10,32,{0,14}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc1,
+			 {failed,{timetrap_8_SUITE,tc0}}}},
+      {?eh,test_stats,{10,32,{0,15}}},
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+			 {failed,{timetrap_8_SUITE,tc0}}}},
+      {?eh,test_stats,{10,32,{0,16}}},
+      {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,sg2,[sequence]}}},
+      {?eh,tc_done,{timetrap_8_SUITE,{end_per_group,sg2,[sequence]},ok}}],
+
+     {?eh,tc_start,{timetrap_8_SUITE,end_per_suite}},
+     {?eh,tc_done,{timetrap_8_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
 test_events(misc_errors) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{1,1,7}},
+     {?eh,start_info,{1,1,9}},
      {?eh,tc_start,{misc_error_1_SUITE,ct_fail_1}},
      {?eh,tc_done,{misc_error_1_SUITE,ct_fail_1,
 		   {failed,{error,{test_case_failed,{error,this_is_expected}}}}}},
@@ -1002,7 +1431,12 @@ test_events(misc_errors) ->
      {?eh,tc_start,{misc_error_1_SUITE,killed_by_signal_2}},
      {?eh,tc_done,{misc_error_1_SUITE,killed_by_signal_2,
 		   {failed,testcase_aborted_or_killed}}},
-     {?eh,test_stats,{0,7,{0,0}}},
+     {parallel,
+      [{?eh,tc_start,{misc_error_1_SUITE,p1}},
+       {?eh,tc_done,{misc_error_1_SUITE,p1,ok}},
+       {?eh,tc_start,{misc_error_1_SUITE,p2}},
+       {?eh,tc_done,{misc_error_1_SUITE,p2,ok}}]},
+     {?eh,test_stats,{2,7,{0,0}}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ].
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/misc_error_1_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/misc_error_1_SUITE.erl
index 99c3ed05ec..61f3fa7e59 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/misc_error_1_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/misc_error_1_SUITE.erl
@@ -96,7 +96,7 @@ end_per_testcase(_TestCase, _Config) ->
 %% N = integer() | forever
 %%--------------------------------------------------------------------
 groups() ->
-    [].
+    [{p,[parallel],[p1,p2]}].
 
 %%--------------------------------------------------------------------
 %% Function: all() -> GroupsAndTestCases | {skip,Reason}
@@ -107,7 +107,8 @@ groups() ->
 %%--------------------------------------------------------------------
 all() -> 
     [ct_fail_1, ct_fail_2, ct_fail_3, ts_fail_1, ts_fail_2,
-     killed_by_signal_1, killed_by_signal_2].
+     killed_by_signal_1, killed_by_signal_2,
+     {group,p}].
 
 ct_fail_1(_) ->
     ct:fail({error,this_is_expected}),
@@ -152,3 +153,10 @@ killed_by_signal_2(_) ->
 	       end),
     ct:sleep(1000),
     exit(this_should_not_be_seen).
+
+p1(_) ->
+    {error,parallel_group} = ct:abort_current_testcase(aborted),
+    ok.
+
+p2(_) ->
+    receive after 1000 -> ok end.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_8_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_8_SUITE.erl
new file mode 100644
index 0000000000..ff138f38b5
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_8_SUITE.erl
@@ -0,0 +1,258 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(timetrap_8_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(TO, 4).
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{timetrap_utils,timetrap_val,[{seconds,?TO}]}}].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(G6, Config) when G6==g6; G6==pg6 ->
+    ct:sleep({seconds,1}),
+    Config;
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_group(G7or8, _Config) when G7or8==g7; G7or8==pg7; G7or8==g8; G7or8==pg8 ->
+    ct:sleep({seconds,5}),
+    ok;
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(_, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%%--------------------------------------------------------------------
+groups() ->
+    [
+     {g0,[],[tc0,tc2]}, % group override suite and tc overrides group
+     {g1,[],[tc0,tc2]}, % group override suite and tc overrides group
+     {g2,[],[tc1,tc2]}, % tc override group
+     {g3,[],[tc4,{group,g1},{group,g2}]},  % subgroup override group
+     {g4,[],[tc0,tc2]}, % exit during init_per_group
+     {g5,[],[tc0,tc2]}, % exit during init_per_group
+     {g6,[],[tc0,tc2]}, % timeout during init_per_group
+     {g7,[],[tc5]},     % exit during end_per_group
+     {g8,[],[tc5]},     % timeout during end_per_group
+     {g9,[],[tc5,tc0]}, % exit during testcase
+     {g10,[],[tc0,tc5]}, % exit during testcase
+     {g11,[],[tc3,tc2]}, % suite is valid if nothing else is specified
+     {pg0,[parallel],[tc0,tc2]}, % group override suite and tc overrides group
+     {pg1,[parallel],[tc0,tc2]}, % group override suite and tc overrides group
+     {pg2,[parallel],[tc1,tc2]}, % tc override group
+     {pg3,[parallel],[tc4,{group,pg1},{group,pg2}]},  % subgroup override group
+     {pg4,[parallel],[tc0,tc2]}, % exit during init_per_group
+     {pg5,[parallel],[tc0,tc2]}, % exit during init_per_group
+     {pg6,[parallel],[tc0,tc2]}, % timeout during init_per_group
+     {pg7,[parallel],[tc5]},     % exit during end_per_group
+     {pg8,[parallel],[tc5]},     % timeout during end_per_group
+     {pg9,[parallel],[tc5,tc0]}, % exit during testcase
+     {pg10,[parallel],[tc0,tc5]},% exit during testcase
+     {pg11,[parallel],[tc3,tc2]},% suite is valid if nothing else is specified
+     {sg1,[sequence],[tc5,tc0,tc1,tc2]}, % exit during sequencial testcase
+     {sg2,[sequence],[tc5,tc0,tc1,tc2]}].% timeout during sequencial testcase
+
+group(g0) ->
+    [{timetrap,{timetrap_utils,timetrap_val,[{seconds,1}]}}];
+group(g1) ->
+    [{timetrap,fun() -> timetrap_utils:timetrap_val(1000) end}];
+group(g2) ->
+    [{timetrap,fun() -> timetrap_utils:timetrap_val(3000) end}];
+group(g3) ->
+    [{timetrap,fun() -> timetrap_utils:timetrap_val(2000) end}];
+group(g4) ->
+    [{timetrap,{timetrap_utils,timetrap_exit,[kaboom]}}];
+group(g5) ->
+    [{timetrap,fun() -> exit(kaboom) end}];
+group(g6) ->
+    [{timetrap,{timetrap_utils,timetrap_val,[500]}}];
+group(g7) ->
+    [{timetrap,fun() -> ct:sleep(1000),exit(kaboom) end}];
+group(g8) ->
+    [{timetrap,{timetrap_utils,timetrap_val,[500]}}];
+group(g9) ->
+    [{timetrap,fun() -> ct:sleep(1000),exit(kaboom) end}];
+group(g10) ->
+    [{timetrap,fun() -> ct:sleep(1000),exit(kaboom) end}];
+group(g11) ->
+    [];
+group(pg0) ->
+    [{timetrap,{timetrap_utils,timetrap_val,[{seconds,1}]}}];
+group(pg1) ->
+    [{timetrap,fun() -> timetrap_utils:timetrap_val(1000) end}];
+group(pg2) ->
+    [{timetrap,fun() -> timetrap_utils:timetrap_val(3000) end}];
+group(pg3) ->
+    [{timetrap,fun() -> timetrap_utils:timetrap_val(2000) end}];
+group(pg4) ->
+    [{timetrap,{timetrap_utils,timetrap_exit,[kaboom]}}];
+group(pg5) ->
+    [{timetrap,fun() -> exit(kaboom) end}];
+group(pg6) ->
+    [{timetrap,{timetrap_utils,timetrap_val,[500]}}];
+group(pg7) ->
+    [{timetrap,fun() -> ct:sleep(1000),exit(kaboom) end}];
+group(pg8) ->
+    [{timetrap,{timetrap_utils,timetrap_val,[500]}}];
+group(pg9) ->
+    [{timetrap,fun() -> ct:sleep(1000),exit(kaboom) end}];
+group(pg10) ->
+    [{timetrap,fun() -> ct:sleep(1000),exit(kaboom) end}];
+group(pg11) ->
+    [];
+group(sg1) ->
+    [{timetrap,fun() -> ct:sleep(1000),exit(kaboom) end}];
+group(sg2) ->
+    [{timetrap,{timetrap_utils,timetrap_val,[{seconds,1}]}}].
+
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() ->
+    [
+     {group,g0},
+     {group,g1},
+     {group,g2},
+     {group,g3},
+     {group,g4},
+     {group,g5},
+     {group,g6},
+     {group,g7},
+     {group,g8},
+     {group,g9},
+     {group,g10},
+     {group,g11},
+     {group,pg0},
+     {group,pg1},
+     {group,pg2},
+     {group,pg3},
+     {group,pg4},
+     {group,pg5},
+     {group,pg6},
+     {group,pg7},
+     {group,pg8},
+     {group,pg9},
+     {group,pg10},
+     {group,pg11},
+     {group,sg1},
+     {group,sg2}].
+
+
+
+tc0(_) ->
+    ct:comment("TO set by group"),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc1() ->
+    [{timetrap,{timetrap_utils,timetrap_val,[1000]}}].
+tc1(_) ->
+    ct:comment("TO after 1 sec"),
+    ct:sleep({seconds,2}),
+    ok.
+
+tc2() ->
+    [{timetrap,fun() -> timetrap_utils:timetrap_val(500) end}].
+tc2(_) ->
+    ct:comment("TO after 0.5 sec"),
+    ct:sleep({seconds,2}),
+    ok.
+
+tc3(_) ->
+    ct:comment(io_lib:format("TO after ~w sec", [?TO])),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc4(_) ->
+    ct:comment("TO set by group"),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc5(_) ->
+    ct:comment("No TO in this testcase, maybe later"),
+    ok.
diff --git a/lib/common_test/test/ct_group_leader_SUITE.erl b/lib/common_test/test/ct_group_leader_SUITE.erl
new file mode 100644
index 0000000000..cde3061d6a
--- /dev/null
+++ b/lib/common_test/test/ct_group_leader_SUITE.erl
@@ -0,0 +1,181 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_system_error_SUITE
+%%%
+%%% Description:
+%%%
+%%% Test the group leader functionality in the test_server application.
+%%%-------------------------------------------------------------------
+-module(ct_group_leader_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [
+     basic
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+basic(Config) ->
+    TC = basic,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "group_leader_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC}], Config),
+    SuiteLog = execute(TC, Opts, ERPid, Config),
+    {ok,Data} = file:read_file(SuiteLog),
+    Lines = binary:split(Data, <<"\n">>, [global]),
+    {ok,RE} = re:compile("(\\S+):(\\S+)$"),
+    Cases0 = [begin
+		  {match,[M,F]} = re:run(Case, RE, [{capture,all_but_first,list}]),
+		  {list_to_atom(M),list_to_atom(F)}
+	      end || <<"=case ",Case/binary>> <- Lines],
+    Cases = [MF || {_,F}=MF <- Cases0,
+		   F =/= init_per_suite,
+		   F =/= end_per_suite,
+		   F =/= init_per_group,
+		   F =/= end_per_group],
+    io:format("~p\n", [Cases]),
+    [] = verify_cases(events_to_check(TC), Cases, false),
+    ok.
+
+verify_cases([{parallel,P}|Ts], Cases0, Par) ->
+    Cases = verify_cases(P, Cases0, true),
+    verify_cases(Ts, Cases, Par);
+verify_cases([{?eh,tc_done,{M,F,_}}|Ts], Cases0, false) ->
+    [{M,F}|Cases] = Cases0,
+    verify_cases(Ts, Cases, false);
+verify_cases([{?eh,tc_done,{M,F,_}}|Ts], Cases0, true) ->
+    case lists:member({M,F}, Cases0) of
+	true ->
+	    Cases = Cases0 -- [{M,F}],
+	    verify_cases(Ts, Cases, true);
+	false ->
+	    io:format("~p not found\n", [{M,F}]),
+	    ?t:fail()
+    end;
+verify_cases([{?eh,_,_}|Ts], Cases, Par) ->
+    verify_cases(Ts, Cases, Par);
+verify_cases([], Cases, _) ->
+    Cases;
+verify_cases([List|Ts], Cases0, Par) when is_list(List) ->
+    Cases = verify_cases(List, Cases0, false),
+    verify_cases(Ts, Cases, Par).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+execute(Name, Opts, ERPid, Config) ->
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(Name,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(Name),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config),
+    {event,tc_logfile,_,{_,File}} =
+	lists:keyfind(tc_logfile, 2, [Ev || {?eh,Ev} <- Events]),
+    LogDir = filename:dirname(File),
+    filename:join(LogDir, "suite.log").
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+
+events_to_check(_Test) ->
+    [{?eh,tc_done,{group_leader_SUITE,tc1,ok}},
+     {parallel,[{?eh,tc_start,{group_leader_SUITE,p1}},
+		{?eh,tc_done,{group_leader_SUITE,p1,ok}},
+		{?eh,tc_start,{group_leader_SUITE,p2}},
+		{?eh,tc_done,{group_leader_SUITE,p2,ok}}]},
+     {?eh,tc_done,{group_leader_SUITE,p_restart_my_io_server,ok}},
+     {?eh,tc_done,{group_leader_SUITE,p3,ok}},
+     {parallel,[
+		{?eh,tc_start,{group_leader_SUITE,p10}},
+		{?eh,tc_start,{group_leader_SUITE,p11}},
+		{?eh,tc_done,{group_leader_SUITE,p10,ok}},
+		{?eh,tc_done,{group_leader_SUITE,p11,ok}},
+		[{?eh,tc_done,{group_leader_SUITE,s1,ok}},
+		 {?eh,tc_done,{group_leader_SUITE,s2,ok}},
+		 {?eh,tc_done,{group_leader_SUITE,s3,ok}}],
+		{?eh,tc_start,{group_leader_SUITE,p12}},
+		{?eh,tc_done,{group_leader_SUITE,p12,ok}},
+		[{?eh,tc_done,{group_leader_SUITE,s4,ok}},
+		 {?eh,tc_done,{group_leader_SUITE,s5,ok}}],
+		{?eh,tc_start,{group_leader_SUITE,p13}},
+		{?eh,tc_done,{group_leader_SUITE,p13,ok}} ]},
+     {?eh,tc_done,{group_leader_SUITE,cap1,ok}},
+     {?eh,tc_done,{group_leader_SUITE,cap2,ok}},
+     {parallel,[{?eh,tc_start,{group_leader_SUITE,cap1}},
+		{?eh,tc_done,{group_leader_SUITE,cap1,ok}},
+		{?eh,tc_start,{group_leader_SUITE,cap2}},
+		{?eh,tc_done,{group_leader_SUITE,cap2,ok}}]},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
diff --git a/lib/common_test/test/ct_group_leader_SUITE_data/group_leader_SUITE.erl b/lib/common_test/test/ct_group_leader_SUITE_data/group_leader_SUITE.erl
new file mode 100644
index 0000000000..3f1844b4ae
--- /dev/null
+++ b/lib/common_test/test/ct_group_leader_SUITE_data/group_leader_SUITE.erl
@@ -0,0 +1,252 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(group_leader_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% @spec suite() -> Info
+%% Info = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,10}}].
+
+%%--------------------------------------------------------------------
+%% @spec init_per_suite(Config0) ->
+%%     Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    start_my_io_server(),
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    my_io_server ! die,
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1} | {fail,Reason}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%% @end
+%%--------------------------------------------------------------------
+groups() ->
+    [{p,[parallel],[p1,p2]},
+     {p_restart,[parallel],[p_restart_my_io_server]},
+     {seq,[],[s1,s2,s3]},
+     {seq2,[],[s4,s5]},
+     {seq_in_par,[parallel],[p10,p11,{group,seq},p12,{group,seq2},p13]},
+     {capture_io,[parallel],[cap1,cap2]}].
+
+%%--------------------------------------------------------------------
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+all() ->
+    [tc1,{group,p},{group,p_restart},p3,
+     {group,seq_in_par},
+     cap1,cap2,
+     {group,capture_io}].
+
+tc1(_C) ->
+    ok.
+
+p1(_) ->
+    %% OTP-10101:
+    %%
+    %% External apps/processes started by init_per_suite (common operation),
+    %% will inherit the group leader of the init_per_suite process, i.e. the
+    %% test_server test case control process (executing run_test_case_msgloop/7).
+    %% If, later, a parallel test case triggers the external app to print with
+    %% e.g. io:format() (also common operation), the calling process will hang!
+    %% The reason for this is that a parallel test case has a dedicated IO
+    %% server process, other than the central test case control process. The
+    %% latter process is not executing run_test_case_msgloop/7 and will not
+    %% respond to IO messages. The process is still group leader for the
+    %% external app, however, which is wrong. It's the IO process for the
+    %% parallel test case that should be group leader - but only for the
+    %% particular invokation, since other parallel test cases could be
+    %% invoking the external app too.
+    print("hej\n").
+
+p2(_) ->
+    print("hopp\n").
+
+p_restart_my_io_server(_) ->
+    %% Restart the IO server and change its group leader. This used
+    %% to set to the group leader to a process that would soon die.
+    Ref = erlang:monitor(process, my_io_server),
+    my_io_server ! die,
+    receive
+	{'DOWN',Ref,_,_,_} ->
+	    start_my_io_server()
+    end.
+
+p3(_) ->
+    %% OTP-10125. This would crash since the group leader process
+    %% for the my_io_server had died.
+    print("hoppsan\n").
+
+print(String) ->
+    my_io_server ! {print,self(),String},
+    receive
+	{printed,String} ->
+	    ok
+    end.
+
+start_my_io_server() ->
+    Parent = self(),
+    Pid = spawn(fun() -> my_io_server(Parent) end),
+    receive
+	{Pid,started} ->
+	    io:format("~p\n", [process_info(Pid)]),
+	    ok
+    end.
+
+my_io_server(Parent) ->
+    register(my_io_server, self()),
+    Parent ! {self(),started},
+    my_io_server_loop().
+
+my_io_server_loop() ->
+    receive
+	{print,From,String} ->
+	    io:put_chars(String),
+	    From ! {printed,String},
+	    my_io_server_loop();
+	die ->
+	    ok
+    end.
+
+p10(_) ->
+    receive after 1 -> ok end.
+
+p11(_) ->
+    ok.
+
+p12(_) ->
+    ok.
+
+p13(_) ->
+    ok.
+
+s1(_) ->
+    ok.
+
+s2(_) ->
+    ok.
+
+s3(_) ->
+    ok.
+
+s4(_) ->
+    ok.
+
+s5(_) ->
+    ok.
+
+cap1(_) ->
+    ct:capture_start(),
+    IO = gen_io(cap1, 10, []),
+    ct:capture_stop(),
+    IO = ct:capture_get(),
+    ok.
+
+cap2(_) ->
+    ct:capture_start(),
+    {Pid,Ref} = spawn_monitor(fun() ->
+				      exit(gen_io(cap2, 42, []))
+			      end),
+    receive
+	{'DOWN',Ref,process,Pid,IO} ->
+	    ct:capture_stop(),
+	    IO = ct:capture_get(),
+	    ok
+    end.
+
+gen_io(_, 0, Acc) ->
+    lists:reverse(Acc);
+gen_io(Label, N, Acc) ->
+    S = lists:flatten(io_lib:format("~s: ~p\n", [Label,N])),
+    io:put_chars(S),
+    gen_io(Label, N-1, [S|Acc]).
diff --git a/lib/common_test/test/ct_groups_search_SUITE.erl b/lib/common_test/test/ct_groups_search_SUITE.erl
new file mode 100644
index 0000000000..6b1c1f4634
--- /dev/null
+++ b/lib/common_test/test/ct_groups_search_SUITE.erl
@@ -0,0 +1,1245 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: 
+%%%
+%%% Description:
+%%% 
+%%%
+%%% The suites used for the test are located in the data directory.
+%%%
+%%% The group(s) and case(s) are specified according to this:
+%%%
+%%% Tests = ct_groups:find_groups(Mod, GroupPaths, TestCases, GroupDef)
+%%%
+%%% GroupPaths = GroupPath | [GroupPath]
+%%% GroupPath = atom() | [atom()]
+%%%
+%%% CT will find all paths that include GroupPath. GroupPath can be a
+%%% single group, or a list of groups along the path to TestCases.
+%%% If GroupPath is the latter, the last group in the list must be
+%%% the "terminating" group in the path, or it will be impossible to
+%%% execute test cases in higher level groups *only*, as in this case:
+%%% groups() -> [{g1,[],[tc1,{g2,[],[tc2]}]}].
+%%% Compare: find_groups(x, g1, all, groups()), and
+%%%          find_groups(x, [[g1]], all, groups())
+%%%
+%%% Some examples:
+%%%
+%%% GroupPaths = g1, means find all paths with g1 included
+%%% GroupPaths = [g1], -''-
+%%% GroupPaths = [g1,g2], search twice - once for g1 and once for g2
+%%% GroupPaths = [[g1,g2]], find cases under group g1 and sub group g2
+%%% GroupPaths = [[g1,g2],[g1,g3]], find cases for g1-g2 AND g1-g3
+%%%
+%%% TestCases = all | atom() | [atom()]
+%%%
+%%%-------------------------------------------------------------------
+
+-module(ct_groups_search_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/src/ct_util.hrl").
+
+
+-define(eh, ct_test_support_eh).
+
+-define(M1, groups_search_dummy_1_SUITE).
+-define(M2, groups_search_dummy_2_SUITE).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    DataDir = proplists:get_value(data_dir, Config),
+    code:add_patha(DataDir),
+    M1Erl = filename:join(DataDir, atom_to_list(?M1)++".erl"),
+    M2Erl = filename:join(DataDir, atom_to_list(?M2)++".erl"),
+    {ok,?M1} = compile:file(M1Erl, [{outdir,DataDir}]),
+    {ok,?M2} = compile:file(M2Erl, [{outdir,DataDir}]),
+    {module,?M1} = code:load_file(?M1),
+    {module,?M2} = code:load_file(?M2),
+
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+groups() -> 
+    [
+     {find_groups,[],[all_groups,
+		      testcases_in_all_groups,
+		      all_in_top_group1,
+		      all_in_top_group2,
+		      all_in_sub_group1,
+		      all_in_sub_group2,
+		      testcase_in_top_group1,
+		      testcase_in_top_group2,
+		      testcase_in_sub_group1,
+		      testcase_in_sub_group2,
+		      testcase_in_top_groups1,
+		      testcase_in_top_groups2,
+		      testcase_in_top_groups3,
+		      testcase_in_top_groups4,
+		      testcase_in_top_groups5,
+		      testcase_in_top_groups6,
+		      testcase_in_top_groups7,
+		      testcase_in_sub_groups1,
+		      testcase_in_sub_groups2,
+		      testcase_in_sub_groups3,
+		      testcase_in_sub_groups4,
+		      testcase_in_sub_groups5,
+		      testcase_in_sub_groups6,
+		      testcase_in_sub_groups7,
+		      testcase_in_sub_groups8,
+		      testcase_in_sub_groups9,
+		      testcase_in_sub_groups10,
+		      testcase_in_sub_groups11,
+		      testcase_in_sub_groups12,
+		      testcase_in_sub_groups13,
+		      bad_testcase_in_sub_groups1]},
+
+     {run_groups,[sequence],[run_groups_with_options,
+			     run_groups_with_testspec]}
+    ].
+
+all() ->
+    [{group,find_groups,[parallel]},
+     {group,run_groups}].
+
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES CHECKING RETURN VALUE ONLY
+%%--------------------------------------------------------------------
+
+all_groups(_) ->
+    GPath = all, TCs = all,
+
+    Found = ct_groups:find_groups(?M1, GPath, TCs, groups1()),
+    
+    Top1 = ct_groups:find_groups(?M1, top1, TCs, groups1()),
+    Top2 = ct_groups:find_groups(?M1, top2, TCs, groups1()),
+    
+    All = Top1 ++ Top2 ++ [{conf,[{name,sub2}],
+ 			    {?M1,init_per_group},
+ 			    [{?M1,sub2_tc1},{?M1,sub2_tc2}],
+ 			    {?M1,end_per_group}}],
+
+    All = Found,
+
+    {?M1,GPath,TCs,Top1++Top2}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcases_in_all_groups(_) ->
+    GPath = all, TCs = [tc3,sub_tc2],
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [Top1 =
+	 {conf,[{name,top1}],{?M2,init_per_group},
+	  [{?M2,tc3},
+	   {conf,[{name,sub11}],
+	    {?M2,init_per_group},[{?M2,tc3},{?M2,sub_tc2}],
+	    {?M2,end_per_group}},
+	   {conf,[{name,sub12}],
+	    {?M2,init_per_group},
+	    [{?M2,tc3},{?M2,sub_tc2},
+	     {conf,[{name,sub121}],
+	      {?M2,init_per_group},[{?M2,tc3},{?M2,sub_tc2}],
+	      {?M2,end_per_group}}],
+	    {?M2,end_per_group}}],
+	  {?M2,end_per_group}},
+     
+     Top2 =
+	 {conf,[{name,top2}],{?M2,init_per_group},
+	  [{?M2,tc3},
+	   {conf,[{name,sub21}],
+	    {?M2,init_per_group},
+	    [{?M2,tc3},{?M2,sub_tc2},
+	     {conf,[{name,sub2xx}],
+	      {?M2,init_per_group},[{?M2,tc3},{?M2,sub_tc2}],
+	      {?M2,end_per_group}}],
+	    {?M2,end_per_group}},
+	   
+	   {conf,[{name,sub22}],
+	    {?M2,init_per_group},
+	    [{?M2,tc3},{?M2,sub_tc2},
+	     {conf,[{name,sub221}],
+	      {?M2,init_per_group},[{?M2,tc3},{?M2,sub_tc2}],
+	      {?M2,end_per_group}},
+	     {conf,[{name,sub2xx}],
+	      {?M2,init_per_group},[{?M2,tc3},{?M2,sub_tc2}],
+	      {?M2,end_per_group}}],
+	    {?M2,end_per_group}}],
+	  {?M2,end_per_group}},
+
+     {conf,[{name,sub21}],
+      {?M2,init_per_group},
+      [{?M2,tc3},{?M2,sub_tc2},
+       {conf,[{name,sub2xx}],
+	{?M2,init_per_group},[{?M2,tc3},{?M2,sub_tc2}],{?M2,end_per_group}}],
+      {?M2,end_per_group}},
+
+     {conf,[{name,sub22}],
+      {?M2,init_per_group},
+      [{?M2,tc3},{?M2,sub_tc2},
+       {conf,[{name,sub221}],
+	{?M2,init_per_group},[{?M2,tc3},{?M2,sub_tc2}],{?M2,end_per_group}},
+       {conf,[{name,sub2xx}],
+	{?M2,init_per_group},[{?M2,tc3},{?M2,sub_tc2}],{?M2,end_per_group}}],
+      {?M2,end_per_group}},
+
+     {conf,[{name,sub221}],
+      {?M2,init_per_group},[{?M2,tc3},{?M2,sub_tc2}],{?M2,end_per_group}},
+
+     {conf,[{name,sub2xx}],
+      {?M2,init_per_group},[{?M2,tc3},{?M2,sub_tc2}],{?M2,end_per_group}}]
+
+	= Found,
+
+    {?M2,GPath,TCs,[Top1,Top2]}.
+
+%%%-----------------------------------------------------------------
+%%% 
+all_in_top_group1(_) ->
+    GPath= top1, TCs = all,
+
+    Found = ct_groups:find_groups(?M1, GPath, TCs, groups1()),
+
+    [{conf,[{name,top1}],
+      {?M1,init_per_group},
+      [{?M1,top1_tc1},{?M1,top1_tc2},
+       {conf,[{name,sub1}],
+	{?M1,init_per_group},
+	[{?M1,sub1_tc1},{?M1,sub1_tc2}],
+	{?M1,end_per_group}}],
+      {?M1,end_per_group}}] = Found,
+
+    {?M1,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%% 
+all_in_top_group2(_) ->
+    GPath= top2, TCs = all,
+
+    Found = ct_groups:find_groups(?M1, GPath, TCs, groups1()),
+
+    [{conf,[{name,top2}],
+      {?M1,init_per_group},
+      [{conf,[{name,sub2}],
+	{?M1,init_per_group},
+	[{?M1,sub2_tc1},{?M1,sub2_tc2}],
+	{?M1,end_per_group}},
+       {?M1,top2_tc1},{?M1,top2_tc2}],
+      {?M1,end_per_group}}] = Found,
+
+    {?M1,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%% 
+all_in_sub_group1(_) ->
+    GPath = sub1, TCs = all,
+
+    Found = ct_groups:find_groups(?M1, GPath, TCs, groups1()),
+
+    [{conf,[{name,top1}],
+      {?M1,init_per_group},
+      [{conf,[{name,sub1}],
+	{?M1,init_per_group},
+	[{?M1,sub1_tc1},{?M1,sub1_tc2}],
+	{?M1,end_per_group}}],
+      {?M1,end_per_group}}] = Found,
+
+    {?M1,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%% 
+all_in_sub_group2(_) ->
+    GPath = sub2, TCs = all,
+
+    Found = ct_groups:find_groups(?M1, GPath, TCs, groups1()),
+
+    [Top2 =
+	 {conf,[{name,top2}],
+	  {?M1,init_per_group},
+	  [{conf,[{name,sub2}],
+	    {?M1,init_per_group},
+	    [{?M1,sub2_tc1},{?M1,sub2_tc2}],
+	    {?M1,end_per_group}}],
+	  {?M1,end_per_group}},
+     
+     {conf,[{name,sub2}],
+      {?M1,init_per_group},
+      [{?M1,sub2_tc1},{?M1,sub2_tc2}],
+      {?M1,end_per_group}}] = Found,
+    
+    {?M1,GPath,TCs,Top2}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_top_group1(_) ->
+    GPath = top1, TCs = [top1_tc2],
+
+    Found = ct_groups:find_groups(?M1, GPath, TCs, groups1()),
+
+    [{conf,[{name,top1}],
+      {?M1,init_per_group},
+      [{?M1,top1_tc2}],
+      {?M1,end_per_group}}] = Found,
+
+    {?M1,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_top_group2(_) ->
+    GPath = top2, TCs = [top2_tc2],
+
+    Found = ct_groups:find_groups(?M1, GPath, TCs, groups1()),
+
+    [{conf,[{name,top2}],
+      {?M1,init_per_group},
+      [{?M1,top2_tc2}],
+      {?M1,end_per_group}}] = Found,
+
+    {?M1,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_group1(_) ->
+    GPath = sub1, TCs = [sub1_tc2],
+
+    Found = ct_groups:find_groups(?M1, GPath, TCs, groups1()),
+
+    [{conf,[{name,top1}],
+      {?M1,init_per_group},
+      [{conf,[{name,sub1}],
+	{?M1,init_per_group},
+	[{?M1,sub1_tc2}],
+	{?M1,end_per_group}}],
+      {?M1,end_per_group}}] = Found,
+
+    {?M1,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_group2(_) ->
+    GPath = sub2, TCs = [sub2_tc2],
+
+    Found = ct_groups:find_groups(?M1, GPath, TCs, groups1()),
+
+    [Top2 =
+	 {conf,[{name,top2}],
+	  {?M1,init_per_group},
+	  [{conf,[{name,sub2}],
+	    {?M1,init_per_group},
+	    [{?M1,sub2_tc2}],
+	    {?M1,end_per_group}}],
+	  {?M1,end_per_group}},
+     
+     {conf,[{name,sub2}],
+      {?M1,init_per_group},
+      [{?M1,sub2_tc2}],
+      {?M1,end_per_group}}] = Found,
+    
+    {?M1,GPath,TCs,Top2}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_top_groups1(_) ->
+    GPath = [top1,top2], TCs = all,
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [{conf,[{name,top1}],
+      {?M2,init_per_group},
+      [{?M2,top1_tc1},{?M2,top_tc2},{?M2,tc3},
+       {conf,[{name,sub11}],
+	{?M2,init_per_group},
+	[{?M2,sub11_tc1},{?M2,sub_tc2},{?M2,tc3}],
+	{?M2,end_per_group}},
+       {conf,[{name,sub12}],
+	{?M2,init_per_group},
+	[{?M2,sub12_tc1},{?M2,sub_tc2},{?M2,tc3},
+	 {conf,[{name,sub121}],
+	  {?M2,init_per_group},
+	  [{?M2,sub121_tc1},{?M2,sub_tc2},{?M2,tc3}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}},
+     
+     {conf,[{name,top2}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub21}],
+	{?M2,init_per_group},
+	[{?M2,sub21_tc1},{?M2,sub_tc2},{?M2,tc3},
+	 {conf,[{name,sub2xx}],
+	  {?M2,init_per_group},
+	  [{?M2,sub2xx_tc1},{?M2,sub_tc2},{?M2,tc3}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}},
+       {?M2,top2_tc1},{?M2,top_tc2},{?M2,tc3},
+       {conf,[{name,sub22}],
+	{?M2,init_per_group},
+	[{conf,[{name,sub221}],
+	  {?M2,init_per_group},
+	  [{?M2,sub221_tc1},{?M2,sub_tc2},{?M2,tc3}],
+	  {?M2,end_per_group}},
+	 {?M2,sub22_tc1},{?M2,sub_tc2},{?M2,tc3},
+	 {conf,[{name,sub2xx}],
+	  {?M2,init_per_group},
+	  [{?M2,sub2xx_tc1},{?M2,sub_tc2},{?M2,tc3}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_top_groups2(_) ->
+    GPath = [top1,top2], TCs = tc3,
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [{conf,[{name,top1}],
+      {?M2,init_per_group},
+      [{?M2,tc3},
+       {conf,[{name,sub11}],
+	{?M2,init_per_group},
+	[{?M2,tc3}],
+	{?M2,end_per_group}},
+       {conf,[{name,sub12}],
+	{?M2,init_per_group},
+	[{?M2,tc3},
+	 {conf,[{name,sub121}],
+	  {?M2,init_per_group},
+	  [{?M2,tc3}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}},
+
+     {conf,[{name,top2}],
+      {?M2,init_per_group},
+      [{?M2,tc3},
+       {conf,[{name,sub21}],
+	{?M2,init_per_group},
+	[{?M2,tc3},
+	 {conf,[{name,sub2xx}],
+	  {?M2,init_per_group},
+	  [{?M2,tc3}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}},
+       
+       {conf,[{name,sub22}],
+	{?M2,init_per_group},
+	[{?M2,tc3},
+	 {conf,[{name,sub221}],
+	  {?M2,init_per_group},
+	  [{?M2,tc3}],
+	  {?M2,end_per_group}},	 
+	 {conf,[{name,sub2xx}],
+	  {?M2,init_per_group},
+	  [{?M2,tc3}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_top_groups3(_) ->
+    GPath = [top1,top2], TCs = top1_tc1,
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [{conf,[{name,top1}],
+      {?M2,init_per_group},
+      [{?M2,top1_tc1}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_top_groups4(_) ->
+    GPath = [top1,top2], TCs = sub2xx_tc1,
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [{conf,[{name,top2}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub21}],
+	{?M2,init_per_group},
+	[{conf,[{name,sub2xx}],
+	  {?M2,init_per_group},
+	  [{?M2,sub2xx_tc1}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}},
+       {conf,[{name,sub22}],
+	{?M2,init_per_group},
+	[{conf,[{name,sub2xx}],
+	  {?M2,init_per_group},
+	  [{?M2,sub2xx_tc1}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_top_groups5(_) ->
+    GPath = [top1,top2], TCs = [sub21_tc1,sub22_tc1],
+
+    Found = ct_groups:find_groups(?M2, [top1,top2], [sub21_tc1,sub22_tc1],
+				  groups2()),
+
+    [{conf,[{name,top2}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub21}],
+	{?M2,init_per_group},
+	[{?M2,sub21_tc1}],
+	{?M2,end_per_group}},
+       {conf,[{name,sub22}],
+	{?M2,init_per_group},
+	[{?M2,sub22_tc1}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_top_groups6(_) ->
+    GPath = [[top1],[top2]], TCs = tc3,
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+    
+    [{conf,[{name,top1}],
+      {?M2,init_per_group},
+      [{?M2,tc3}],
+      {?M2,end_per_group}},
+     {conf,[{name,top2}],
+      {?M2,init_per_group},
+      [{?M2,tc3}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_top_groups7(_) ->
+    GPath = [[top1],[top2]], TCs = all,
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [{conf,[{name,top1}],
+      {?M2,init_per_group},
+      [{?M2,top1_tc1},
+       {?M2,top_tc2},
+       {?M2,tc3}],
+      {?M2,end_per_group}},
+     {conf,[{name,top2}],
+      {?M2,init_per_group},
+      [{?M2,top2_tc1},
+       {?M2,top_tc2},
+       {?M2,tc3}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups1(_) ->
+    GPath = [sub121], TCs = tc3,
+
+    Found = ct_groups:find_groups(?M2, sub121, tc3, groups2()),
+    Found = ct_groups:find_groups(?M2, [sub121], tc3, groups2()),
+
+    [{conf,[{name,top1}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub12}],
+	{?M2,init_per_group},
+	[{conf,[{name,sub121}],
+	  {?M2,init_per_group},
+	  [{?M2,tc3}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups2(_) ->
+    GPath = sub12, TCs = tc3,
+
+    Found = ct_groups:find_groups(?M2, sub12, tc3, groups2()),
+    Found = ct_groups:find_groups(?M2, [sub12], tc3, groups2()),
+
+    [{conf,[{name,top1}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub12}],
+	{?M2,init_per_group},
+	[{?M2,tc3},
+	 {conf,[{name,sub121}],
+	  {?M2,init_per_group},
+	  [{?M2,tc3}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    FoundX = ct_groups:find_groups(?M2, [[sub12]], tc3, groups2()),
+
+    [{conf,[{name,top1}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub12}],
+	{?M2,init_per_group},
+	[{?M2,tc3}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = FoundX,
+    
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups3(_) ->
+    GPath = [sub121,sub221], TCs = all,
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+    
+    [Top1 =
+	 {conf,[{name,top1}],
+	  {?M2,init_per_group},
+	  [{conf,[{name,sub12}],
+	    {?M2,init_per_group},
+	    [{conf,[{name,sub121}],
+	      {?M2,init_per_group},
+	      [{?M2,sub121_tc1},
+	       {?M2,sub_tc2},
+	       {?M2,tc3}],
+	      {?M2,end_per_group}}],
+	    {?M2,end_per_group}}],
+	  {?M2,end_per_group}},
+     
+     Top2 =
+	 {conf,[{name,top2}],
+	  {?M2,init_per_group},
+	  [{conf,[{name,sub22}],
+	    {?M2,init_per_group},
+	    [{conf,[{name,sub221}],
+	      {?M2,init_per_group},
+	      [{?M2,sub221_tc1},
+	       {?M2,sub_tc2},
+	       {?M2,tc3}],
+	      {?M2,end_per_group}}],
+	    {?M2,end_per_group}}],
+	  {?M2,end_per_group}},
+     
+     {conf,[{name,sub22}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub221}],
+	{?M2,init_per_group},
+	[{?M2,sub221_tc1},
+	 {?M2,sub_tc2},
+	 {?M2,tc3}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}},
+     
+     {conf,[{name,sub221}],
+      {?M2,init_per_group},
+      [{?M2,sub221_tc1},
+       {?M2,sub_tc2},
+       {?M2,tc3}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,[Top1,Top2]}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups4(_) ->
+    GPath = [top1,sub21], TCs = sub_tc2,
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [Top1 =
+	 {conf,[{name,top1}],
+	  {?M2,init_per_group},
+	  [{conf,[{name,sub11}],
+	    {?M2,init_per_group},
+	    [{?M2,sub_tc2}],
+	    {?M2,end_per_group}},
+	   {conf,[{name,sub12}],
+	    {?M2,init_per_group},
+	    [{?M2,sub_tc2},
+	     {conf,[{name,sub121}],
+	      {?M2,init_per_group},
+	      [{?M2,sub_tc2}],
+	      {?M2,end_per_group}}],
+	    {?M2,end_per_group}}],
+	  {?M2,end_per_group}},
+
+     Top2 =
+	 {conf,[{name,top2}],
+	  {?M2,init_per_group},
+	  [{conf,[{name,sub21}],
+	    {?M2,init_per_group},
+	    [{?M2,sub_tc2},
+	     {conf,[{name,sub2xx}],
+	      {?M2,init_per_group},
+	      [{?M2,sub_tc2}],
+	      {?M2,end_per_group}}],
+	    {?M2,end_per_group}}],
+	  {?M2,end_per_group}},
+     
+     {conf,[{name,sub21}],
+      {?M2,init_per_group},
+      [{?M2,sub_tc2},
+       {conf,[{name,sub2xx}],
+	{?M2,init_per_group},
+	[{?M2,sub_tc2}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+    
+    {?M2,GPath,TCs,[Top1,Top2]}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups5(_) ->
+    GPath = [[top1,sub12]], TCs = sub12_tc1,
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [{conf,[{name,top1}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub12}],
+	{?M2,init_per_group},
+	[{?M2,sub12_tc1}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups6(_) ->
+    GPath = [[top1,sub12]], TCs = [sub_tc2],
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [{conf,[{name,top1}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub12}],
+	{?M2,init_per_group},
+	[{?M2,sub_tc2}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups7(_) ->
+    GPath = [[top1,sub12]], TCs = [sub12_tc1,sub_tc2],
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [{conf,[{name,top1}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub12}],
+	{?M2,init_per_group},
+	[{?M2,sub12_tc1},
+	 {?M2,sub_tc2}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups8(_) ->
+    GPath = [[top2,sub22]], TCs = [sub22_tc1,sub_tc2],
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [{conf,[{name,top2}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub22}],
+	{?M2,init_per_group},
+	[{?M2,sub22_tc1},
+	 {?M2,sub_tc2}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups9(_) ->
+    GPath = [[sub2xx]], TCs = tc3,
+
+    Found = ct_groups:find_groups(?M2, sub2xx, tc3, groups2()),
+    Found = ct_groups:find_groups(?M2, [[sub2xx]], tc3, groups2()),
+
+    [Top2 =
+	 {conf,[{name,top2}],
+	  {?M2,init_per_group},
+	  [{conf,[{name,sub21}],
+	    {?M2,init_per_group},
+	    [{conf,[{name,sub2xx}],
+	      {?M2,init_per_group},
+	      [{?M2,tc3}],
+	      {?M2,end_per_group}}],
+	    {?M2,end_per_group}},
+	   {conf,[{name,sub22}],
+	    {?M2,init_per_group},
+	    [{conf,[{name,sub2xx}],
+	      {?M2,init_per_group},
+	      [{?M2,tc3}],
+	      {?M2,end_per_group}}],
+	    {?M2,end_per_group}}],
+	  {?M2,end_per_group}},
+     
+     {conf,[{name,sub21}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub2xx}],
+	{?M2,init_per_group},
+	[{?M2,tc3}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}},
+
+     {conf,[{name,sub22}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub2xx}],
+	{?M2,init_per_group},
+	[{?M2,tc3}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}},
+
+     {conf,[{name,sub2xx}],
+      {?M2,init_per_group},
+      [{?M2,tc3}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Top2}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups10(_) ->
+    GPath = [[sub22,sub2xx]], TCs = tc3,
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [Top2 = 
+	 {conf,[{name,top2}],
+	  {?M2,init_per_group},
+	  [{conf,[{name,sub22}],
+	    {?M2,init_per_group},
+	    [{conf,[{name,sub2xx}],
+	      {?M2,init_per_group},
+	      [{?M2,tc3}],
+	      {?M2,end_per_group}}],
+	    {?M2,end_per_group}}],
+	  {?M2,end_per_group}},
+
+     {conf,[{name,sub22}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub2xx}],
+	{?M2,init_per_group},
+	[{?M2,tc3}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Top2}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups11(_) ->
+    GPath = [[top1,sub12,sub121]], TCs = all,
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [{conf,[{name,top1}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub12}],
+	{?M2,init_per_group},
+	[{conf,[{name,sub121}],
+	  {?M2,init_per_group},
+	  [{?M2,sub121_tc1},
+	   {?M2,sub_tc2},
+	   {?M2,tc3}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups12(_) ->
+    GPath = [[top2,sub2xx]], TCs = [sub2xx_tc1,tc3],
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [{conf,[{name,top2}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub21}],
+	{?M2,init_per_group},
+	[{conf,[{name,sub2xx}],
+	  {?M2,init_per_group},
+	  [{?M2,sub2xx_tc1},
+	   {?M2,tc3}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}},
+       {conf,[{name,sub22}],
+	{?M2,init_per_group},
+	[{conf,[{name,sub2xx}],
+	  {?M2,init_per_group},
+	  [{?M2,sub2xx_tc1},
+	   {?M2,tc3}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+testcase_in_sub_groups13(_) ->
+    GPath = [[top2,sub22,sub2xx]], TCs = [top2_tc1,sub2xx_tc1,tc3],
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [{conf,[{name,top2}],
+      {?M2,init_per_group},
+      [{conf,[{name,sub22}],
+	{?M2,init_per_group},
+	[{conf,[{name,sub2xx}],
+	  {?M2,init_per_group},
+	  [{?M2,sub2xx_tc1},
+	   {?M2,tc3}],
+	  {?M2,end_per_group}}],
+	{?M2,end_per_group}}],
+      {?M2,end_per_group}}] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+bad_testcase_in_sub_groups1(_) ->
+    GPath = [sub2xx], TCs = [top2_tc1],
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%%
+bad_testcase_in_sub_groups2(_) ->
+    GPath = [sub12,sub2xx], TCs = [top1_tc1,top2_tc1],
+
+    Found = ct_groups:find_groups(?M2, GPath, TCs, groups2()),
+
+    [] = Found,
+
+    {?M2,GPath,TCs,Found}.
+
+%%%-----------------------------------------------------------------
+%%% CASES EXECUTING THE TESTS
+%%%-----------------------------------------------------------------
+
+run_groups_with_options(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    {M1All,M1Rest,M2All,M2Rest} = get_all_groups_and_cases(Config),
+
+    M1AllGrs = lists:flatmap(fun({Path,_,_}) when is_atom(hd(Path)) -> Path;
+				({Path,_,_}) when is_list(hd(Path)) -> Path;
+				({Path,_,_}) -> [Path]
+			     end, M1All),
+
+    %% ct:pal("NOW RUNNING M1 TEST: ~p", [M1All]),
+
+    {OptsM11,ERPidM11} = setup([{dir,DataDir},{suite,?M1},
+				{group,M1AllGrs},{label,m1_all_cases}], Config),
+    M1AllGrInfo = {M1AllGrs,lists:flatten([Found || {_,_,Found} <- M1All])},
+    ok = execute(m1_all_cases, M1AllGrInfo, OptsM11, ERPidM11, Config),
+
+    lists:foldl(
+      fun({GrPath,TCs,Found}, N) ->
+    	      TestName = list_to_atom("m1_spec_cases_" ++ integer_to_list(N)),
+	      %% ct:pal("NOW RUNNING M1 TEST ~p: ~p + ~p",
+		%%     [TestName,GrPath,TCs]),
+    	      {OptsM12,ERPidM12} = setup([{dir,DataDir},{suite,?M1},
+    					  {group,GrPath},{testcase,TCs},
+    					  {label,TestName}], Config),
+    	      ok = execute(TestName, {GrPath,TCs,Found},
+    			   OptsM12, ERPidM12, Config),
+    	      N+1
+      end, 1, M1Rest),
+    
+    %% ct:pal("NOW RUNNING M2 TEST: ~p", [M2All]),
+
+    M2AllGrs = lists:flatmap(fun({Path,_,_}) when is_atom(hd(Path)) -> Path;
+				({Path,_,_}) when is_list(hd(Path)) -> Path;
+				({Path,_,_}) -> [Path]
+			     end, M2All),
+
+
+    {OptsM21,ERPidM21} = setup([{dir,DataDir},{suite,?M2},
+    				{group,M2AllGrs},{testcase,all},
+    				{label,m2_all_cases}], Config),
+    M2AllGrInfo = {M2AllGrs,lists:flatten([Found || {_,_,Found} <- M2All])},
+    ok = execute(m2_all_cases, M2AllGrInfo, OptsM21, ERPidM21, Config),
+
+    lists:foldl(
+      fun({GrPath,TCs,Found}, N) ->
+    	      TestName = list_to_atom("m2_spec_cases_" ++ integer_to_list(N)),
+           %% ct:pal("NOW RUNNING M2 TEST ~p: ~p + ~p", [TestName,GrPath,TCs]),
+    	      {OptsM22,ERPidM22} = setup([{dir,DataDir},{suite,?M2},
+    					  {group,GrPath},{testcase,TCs},
+    					  {label,TestName}], Config),
+    	      ok = execute(TestName, {GrPath,TCs,Found},
+    			   OptsM22, ERPidM22, Config),
+    	      N+1
+      end, 1, M2Rest),
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% 
+run_groups_with_testspec(Config) ->
+    Name = run_groups_with_testspec,
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+
+    {M1All,M1Rest,M2All,M2Rest} = get_all_groups_and_cases(Config),
+
+    M1AllGrs = lists:flatmap(fun({Path,_,_}) when is_atom(hd(Path)) -> Path;
+				({Path,_,_}) when is_list(hd(Path)) -> Path;
+				({Path,_,_}) -> [Path]
+			     end, M1All),
+    M1AllTerm =	{groups,DataDir,?M1,M1AllGrs},
+
+    M1RestTerms = lists:map(
+		    fun({GrPath,TCs,_}) ->
+			    {groups,DataDir,?M1,GrPath,{cases,TCs}}
+		    end, M1Rest),
+
+    M2AllGrs = lists:flatmap(fun({Path,_,_}) when is_atom(hd(Path)) -> Path;
+				({Path,_,_}) when is_list(hd(Path)) -> Path;
+				({Path,_,_}) -> [Path]
+			     end, M2All),
+    M2AllTerm =	{groups,DataDir,?M2,M2AllGrs,{cases,all}},
+
+    M2RestTerms = lists:map(
+		    fun({GrPath,TCs,_}) ->
+			    {groups,DataDir,?M2,GrPath,{cases,TCs}}
+		    end, M2Rest),
+
+    GroupTerms = lists:flatten([M1AllTerm,
+				M1RestTerms,
+				M2AllTerm,
+				M2RestTerms]),
+
+    TestSpec = [{merge_tests,false},
+		{label,Name}] ++ GroupTerms,
+
+    ct:pal("Here's the test spec:~n~p", [TestSpec]),
+
+    TestSpecName = ct_test_support:write_testspec(TestSpec, PrivDir,
+						  "groups_search_spec"),
+
+    {Opts,ERPid} = setup([{spec,TestSpecName}], Config),
+    GroupInfo = 
+	[{M1AllTerm,lists:flatten([Found || {_,_,Found} <- M1All])} |
+	 M1Rest] ++
+	[{M2AllTerm,lists:flatten([Found || {_,_,Found} <- M2All])} |
+	 M2Rest],
+    ok = execute(Name, GroupInfo, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+groups1() ->
+    [{top1,[],[top1_tc1,top1_tc2,{sub1,[],[sub1_tc1,sub1_tc2]}]},
+     {top2,[],[{group,sub2},top2_tc1,top2_tc2]},
+     {sub2,[],[sub2_tc1,sub2_tc2]}].
+
+groups2() ->
+    [{top1,[],[top1_tc1,top_tc2,tc3,
+	       {sub11,[],[sub11_tc1,sub_tc2,tc3]},
+	       {sub12,[],[sub12_tc1,sub_tc2,tc3,
+			  {sub121,[],[sub121_tc1,sub_tc2,tc3]}]}]},
+     {top2,[],[{group,sub21},top2_tc1,top_tc2,tc3,{group,sub22}]},
+     {sub21,[],[sub21_tc1,sub_tc2,tc3,{group,sub2xx}]},
+     {sub22,[],[{group,sub221},sub22_tc1,sub_tc2,tc3,{group,sub2xx}]},
+     {sub221,[],[sub221_tc1,sub_tc2,tc3]},
+     {sub2xx,[],[sub2xx_tc1,sub_tc2,tc3]}].
+
+get_all_groups_and_cases(Config) ->
+    {value,{_,_,FindGrTCs}} = lists:keysearch(find_groups, 1, groups()),
+
+    MGTFs = [apply(?MODULE, TC, [Config]) || TC <- FindGrTCs],
+
+    ct:pal("Extracted data from ~p test cases", [length(MGTFs)]),
+
+    lists:foldr(fun({M,Gs,TCs,F},
+		    {M11,M12,M21,M22}) ->
+			case {M,Gs,TCs} of
+			    {?M1,all,_} -> {M11,[{Gs,TCs,F}|M12],M21,M22};
+			    {?M1,_,all} -> {[{Gs,all,F}|M11],M12,M21,M22};
+			    {?M1,_,_} -> {M11,[{Gs,TCs,F}|M12],M21,M22};
+			    {?M2,all,_} -> {M11,M12,M21,[{Gs,TCs,F}|M22]};
+			    {?M2,_,all} -> {M11,M12,[{Gs,all,F}|M21],M22};
+			    {?M2,_,_} -> {M11,M12,M21,[{Gs,TCs,F}|M22]}
+			end
+		end, {[],[],[],[]}, MGTFs).
+    
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+execute(Name, TestParams, Opts, ERPid, Config) ->
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+    Events1 = reformat(Events, ?eh),
+    ct_test_support:log_events(Name, 
+			       Events1,
+			       ?config(priv_dir, Config),
+			       Opts),
+    verify_events(Name, TestParams, Events1).
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+verify_events(Name, Params, Events) ->
+    %% 2 tests (ct:run_test + script_start) is default
+    verify_events(Name, Params, Events, 2).
+
+verify_events(_, _, _, 0) ->
+    ok;
+verify_events(Name, Params, Events, N) ->
+    test_events(Name, Params, Events),
+    verify_events(Name, Params, Events, N-1).
+
+%%%-----------------------------------------------------------------
+%%% check run_groups_with_options
+
+test_events(TestName, {GrPath,Found}, Events) ->
+    test_events(TestName, {GrPath,all,Found}, Events);
+
+test_events(TestName, {GrPath,TCs,Found}, Events)
+  when TestName /= run_groups_with_testspec ->
+    try check_events(Events, flatten_tests(Found)) of
+	ok -> ok
+    catch
+	throw:Reason ->
+	    ct:pal("Test failed for ~p with group path ~p and cases ~p"
+		   "~nReason: ~p", [TestName,GrPath,TCs,Reason]),
+	    throw(failed)
+    end;
+
+%%%-----------------------------------------------------------------
+%%% check run_groups_with_testspec
+
+test_events(run_groups_with_testspec, Params, Events) ->
+    AllFound = lists:flatmap(fun({_All,Found}) when is_tuple(Found) ->
+				     [Found];
+				({_All,Found}) -> 
+				     Found;
+				({_Gr,_TCs,Found}) when is_tuple(Found) ->
+				     [Found];
+				({_Gr,_TCs,Found}) ->
+				     Found
+			     end, Params),
+    try check_events(Events, flatten_tests(AllFound)) of
+	ok -> ok
+    catch
+	throw:Reason ->
+	    ct:pal("Test failed for run_groups_with_testspec."
+		   "~nReason: ~p", [Reason]),
+	    throw(failed)
+    end.
+
+flatten_tests({conf,[{name,G}|_],{Mod,_I},Tests,_E}) ->
+    lists:flatten([{group,Mod,G} | flatten_tests(Tests)]);
+flatten_tests([{conf,[{name,G}|_],{Mod,_I},Tests,_E} | Confs]) ->
+    lists:flatten([{group,Mod,G} | flatten_tests(Tests)]) ++
+	lists:flatten(flatten_tests(Confs));
+flatten_tests([{_Mod,_TC} = Case | Tests]) ->
+    lists:flatten([Case | flatten_tests(Tests)]); 
+flatten_tests([]) ->
+    [].
+
+check_events([{_,tc_start,{Mod,{init_per_group,G,_}}} | Evs],
+	     [{group,Mod,G} | Check]) ->
+    check_events(Evs, Check);
+check_events([{_,tc_start,{Mod,TC}} | Evs],
+	     [{Mod,TC} | Check]) when is_atom(TC) ->
+    check_events(Evs, Check);
+check_events([{_,tc_start,{Mod,{init_per_group,G,_}}} | _Evs], Check) ->
+    ct:pal("CHECK FAILED!~nGroup ~p in ~p not found in ~p.",
+	   [G,Mod,Check]),
+    throw({test_not_found,{Mod,G}});
+check_events([{_,tc_start,{Mod,TC}} | _Evs], Check)
+  when is_atom(TC), TC /= init_per_suite, TC /= end_per_suite ->
+    ct:pal("CHECK FAILED!~nCase ~p in ~p not found in ~p.",
+	   [TC,Mod,Check]),
+    throw({test_not_found,{Mod,TC}});
+check_events([Group | Evs], Check) when is_list(Group) ->
+    Check1 = check_events(Group, Check),
+    check_events(Evs, Check1);
+check_events(_, []) ->
+    ok;
+check_events([Elem | Evs], Check) when is_tuple(Elem) ->
+    check_events(Evs, Check);
+check_events([], Check = [_|_]) ->
+    ct:pal("CHECK FAILED!~nTests remain: ~p", [Check]),
+    throw({tests_remain,Check});
+check_events([Wut | _],_) ->
+    throw({unexpected,Wut}).
+
diff --git a/lib/common_test/test/ct_groups_search_SUITE_data/groups_search_dummy_1_SUITE.erl b/lib/common_test/test/ct_groups_search_SUITE_data/groups_search_dummy_1_SUITE.erl
new file mode 100644
index 0000000000..1c5b572f92
--- /dev/null
+++ b/lib/common_test/test/ct_groups_search_SUITE_data/groups_search_dummy_1_SUITE.erl
@@ -0,0 +1,83 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(groups_search_dummy_1_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+
+all() ->
+    [{group,top1},
+     {group,top2}].
+
+groups() ->
+    [{top1,[],[top1_tc1,top1_tc2,{sub1,[],[sub1_tc1,sub1_tc2]}]},
+     {top2,[],[{group,sub2},top2_tc1,top2_tc2]},
+     {sub2,[],[sub2_tc1,sub2_tc2]}].
+
+%%%-----------------------------------------------------------------
+%%% CONFIG FUNCS
+%%%-----------------------------------------------------------------
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_, _Config) ->
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% TEST CASES
+%%%-----------------------------------------------------------------
+
+top1_tc1(_) ->
+    ok.
+
+top1_tc2(_) ->
+    ok.
+
+sub1_tc1(_) ->
+    ok.
+
+sub1_tc2(_) ->
+    ok.
+
+top2_tc1(_) ->
+    ok.
+
+top2_tc2(_) ->
+    ok.
+
+sub2_tc1(_) ->
+    ok.
+
+sub2_tc2(_) ->
+    ok.
diff --git a/lib/common_test/test/ct_groups_search_SUITE_data/groups_search_dummy_2_SUITE.erl b/lib/common_test/test/ct_groups_search_SUITE_data/groups_search_dummy_2_SUITE.erl
new file mode 100644
index 0000000000..060012de29
--- /dev/null
+++ b/lib/common_test/test/ct_groups_search_SUITE_data/groups_search_dummy_2_SUITE.erl
@@ -0,0 +1,102 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(groups_search_dummy_2_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+
+all() ->
+    [{group,top1},
+     {group,top2}].
+
+groups() ->
+    [{top1,[],[top1_tc1,top_tc2,tc3,
+	       {sub11,[],[sub11_tc1,sub_tc2,tc3]},
+	       {sub12,[],[sub12_tc1,sub_tc2,tc3,
+			  {sub121,[],[sub121_tc1,sub_tc2,tc3]}]}]},
+     
+     {top2,[],[{group,sub21},top2_tc1,top_tc2,tc3,{group,sub22}]},
+     {sub21,[],[sub21_tc1,sub_tc2,tc3,{group,sub2xx}]},
+     {sub22,[],[{group,sub221},sub22_tc1,sub_tc2,tc3,{group,sub2xx}]},
+     {sub221,[],[sub221_tc1,sub_tc2,tc3]},
+     {sub2xx,[],[sub2xx_tc1,sub_tc2,tc3]}].
+
+%%%-----------------------------------------------------------------
+%%% CONFIG FUNCS
+%%%-----------------------------------------------------------------
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_, _Config) ->
+    ok.
+
+%%%------------------------------------------------------------------
+%%% TEST CASES
+%%%------------------------------------------------------------------
+
+top1_tc1(_) ->
+    ok.
+
+top_tc2(_) ->
+    ok.
+
+tc3(_) ->
+    ok.
+
+sub_tc2(_) ->
+    ok.
+
+sub11_tc1(_) ->
+    ok.
+
+sub12_tc1(_) ->
+    ok.
+
+sub121_tc1(_) ->
+    ok.
+     
+top2_tc1(_) ->
+    ok.
+
+sub21_tc1(_) ->
+    ok.
+
+sub22_tc1(_) ->
+    ok.
+
+sub221_tc1(_) ->
+    ok.
+
+sub2xx_tc1(_) ->
+    ok.
diff --git a/lib/common_test/test/ct_master_SUITE.erl b/lib/common_test/test/ct_master_SUITE.erl
index 27243a0067..56a343a96f 100644
--- a/lib/common_test/test/ct_master_SUITE.erl
+++ b/lib/common_test/test/ct_master_SUITE.erl
@@ -117,14 +117,8 @@ ct_master_test(Config) when is_list(Config) ->
 			       reformat(Events, ?eh),
 			       PrivDir, []),
 
-    find_events(NodeNames, [{tc_start,{master_SUITE,init_per_suite}},
-			    {tc_start,{master_SUITE,first_testcase}},
-			    {tc_start,{master_SUITE,second_testcase}},
-			    {tc_start,{master_SUITE,third_testcase}},
-			    {tc_start,{master_SUITE,end_per_suite}}],
-	       Events),
-    
-    ok.
+    TestEvents = events_to_check(ct_master_test),
+    ok = find_events(NodeNames, TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
@@ -153,13 +147,15 @@ make_spec(DataDir, FileName, NodeNames, Suites, Config) ->
     
     CM = [{config,master,filename:join(DataDir,"master/config.txt")}],
 
+    Env = [{"THIS_MUST_BE_SET","yes"},
+	   {"SO_MUST_THIS","value"}],
     NS = lists:map(
 	   fun(NodeName) ->
 		   {init,NodeName,[
 				   {node_start,[{startup_functions,[]},
-						{monitor_master,true}]},
-				   {eval,{erlang,nodes,[]}}
-				  ]
+						{monitor_master,true},
+						{env,Env}]},
+				   {eval,{erlang,nodes,[]}}]
 		   }
 	   end,
 	   NodeNames),
@@ -199,7 +195,6 @@ run_test(_Name, FileName, Config) ->
     [{FileName,ok}] = ct_test_support:run({ct_master,run,[FileName]},
 					  [{ct_master,basic_html,[true]}],
 					  Config),
-    timer:sleep(5000),
     [{FileName,ok}] = ct_test_support:run({ct_master,run,[FileName]},
 					  [{ct_master,basic_html,[false]}],
 					  Config).
@@ -210,28 +205,26 @@ reformat(Events, EH) ->
 %%%-----------------------------------------------------------------
 %%% TEST EVENTS
 %%%-----------------------------------------------------------------
-find_events([], _CheckEvents, _) ->
-    ok;
-find_events([NodeName|NodeNames],CheckEvents,AllEvents) ->
-    find_events(NodeNames, CheckEvents,
-		remove_events(add_host(NodeName),CheckEvents, AllEvents, [])).
-
-remove_events(Node,[{Name,Data} | RestChecks],
-	      [{?eh,#event{ name = Name, node = Node, data = Data }}|RestEvs],
-	       Acc) ->
-    remove_events(Node, RestChecks, RestEvs, Acc);
-remove_events(Node, Checks, [Event|RestEvs], Acc) ->
-    remove_events(Node, Checks, RestEvs, [Event | Acc]);
-remove_events(_Node, [], [], Acc) ->
-    lists:reverse(Acc);
-remove_events(Node, Events, [], Acc) ->
-    test_server:format("Could not find events: ~p in ~p for node ~p",
-	   [Events, lists:reverse(Acc), Node]),
-    exit(event_not_found).
+
+find_events(NodeNames, TestEvents, Events, Config) ->
+    [begin
+	 Node = add_host(Node0),
+	 io:format("Searching for events for node: ~s", [Node]),
+	 ok = ct_test_support:verify_events(TestEvents, Events, Node, Config),
+	 io:nl()
+     end || Node0 <- NodeNames],
+    ok.
 
 add_host(NodeName) ->
     {ok, HostName} = inet:gethostname(),
     list_to_atom(atom_to_list(NodeName)++"@"++HostName).
     
-expected_events(_) ->
-    [].
+events_to_check(_) ->
+    [{?eh,tc_start,{master_SUITE,first_testcase}},
+     {?eh,tc_done,{master_SUITE,first_testcase,ok}},
+     {?eh,tc_start,{master_SUITE,second_testcase}},
+     {?eh,tc_done,{master_SUITE,second_testcase,ok}},
+     {?eh,tc_start,{master_SUITE,third_testcase}},
+     {?eh,tc_done,{master_SUITE,third_testcase,ok}},
+     {?eh,tc_start,{master_SUITE,env_vars}},
+     {?eh,tc_done,{master_SUITE,env_vars,ok}}].
diff --git a/lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl b/lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl
index 032d69ad9f..8a5009ad62 100644
--- a/lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl
+++ b/lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl
@@ -39,7 +39,8 @@ init_per_suite(Config) ->
 end_per_suite(_) ->
     ok.
 
-all() -> [first_testcase, second_testcase, third_testcase].
+all() -> [first_testcase, second_testcase, third_testcase,
+	  env_vars].
 
 init_per_testcase(_, Config) ->
     Config.
@@ -56,3 +57,9 @@ second_testcase(_)->
 third_testcase(_)->
     A = 4,
     A = 2*2.
+
+env_vars(_) ->
+    io:format("~p\n", [os:getenv()]),
+    "yes" = os:getenv("THIS_MUST_BE_SET"),
+    "value" = os:getenv("SO_MUST_THIS"),
+    ok.
diff --git a/lib/common_test/test/ct_misc_1_SUITE.erl b/lib/common_test/test/ct_misc_1_SUITE.erl
index cb17af9ab5..9ff4e6a65f 100644
--- a/lib/common_test/test/ct_misc_1_SUITE.erl
+++ b/lib/common_test/test/ct_misc_1_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -106,7 +106,7 @@ beam_me_up(Config) when is_list(Config) ->
 
     {Opts,ERPid} = setup([{suite,Suites},{auto_compile,false}], Config),
 
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    {_Ok,_Fail,_Skip} = ct_test_support:run(ct, run_test, [Opts], Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(beam_me_up,
diff --git a/lib/common_test/test/ct_netconfc_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE.erl
new file mode 100644
index 0000000000..3042a924fe
--- /dev/null
+++ b/lib/common_test/test/ct_netconfc_SUITE.erl
@@ -0,0 +1,129 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_netconfc_SUITE
+%%%
+%%% Description:
+%%% Test ct_netconfc module
+%%%
+%%%-------------------------------------------------------------------
+-module(ct_netconfc_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    case application:load(crypto) of
+	{error,Reason} ->
+	    {skip, Reason};
+	_ ->
+	    Config1
+    end.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [
+     default
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+default(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "netconfc1_SUITE"),
+    CfgFile = filename:join(DataDir, "netconfc1.cfg"),
+    {Opts,ERPid} = setup([{suite,Suite},{config,CfgFile},
+			  {label,default}], Config),
+
+    ok = execute(default, Opts, ERPid, Config).
+
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+execute(Name, Opts, ERPid, Config) ->
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(Name,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(Name,Config),
+    ct_test_support:verify_events(TestEvents, Events, Config).
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+events_to_check(default,Config) ->
+    {module,_} = code:load_abs(filename:join(?config(data_dir,Config),
+					     netconfc1_SUITE)),
+    TCs = netconfc1_SUITE:all(),
+    code:purge(netconfc1_SUITE),
+    code:delete(netconfc1_SUITE),
+
+    OneTest =
+	[{?eh,start_logging,{'DEF','RUNDIR'}}] ++
+	[{?eh,tc_done,{netconfc1_SUITE,TC,ok}} || TC <- TCs] ++
+	[{?eh,stop_logging,[]}],
+
+    %% 2 tests (ct:run_test + script_start) is default
+    OneTest ++ OneTest.
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1.cfg b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1.cfg
new file mode 100644
index 0000000000..b431301df6
--- /dev/null
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1.cfg
@@ -0,0 +1,6 @@
+%% -*- erlang -*-
+{netconf1,[{ssh,"127.0.0.1"},
+	   {port,2060},
+	   {user,"xxx"},
+	   {password,"xxx"}]}.
+{ct_conn_log,[{ct_netconfc,[{log_type,pretty}]}]}. %overrides args to cth_conn_log
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
new file mode 100644
index 0000000000..d337158bce
--- /dev/null
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -0,0 +1,1132 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%----------------------------------------------------------------------
+%% File: ct_netconfc_SUITE.erl
+%%
+%% Description:
+%%    This file contains the test cases for the ct_netconfc API.
+%%
+%% @author Support
+%% @doc Netconf Client Interface.
+%% @end
+%%----------------------------------------------------------------------
+%%----------------------------------------------------------------------
+-module(netconfc1_SUITE).
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/src/ct_netconfc.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+-compile(export_all).
+
+%% Default timetrap timeout (set in init_per_testcase).
+-define(default_timeout, ?t:minutes(1)).
+
+-define(NS,ns).
+-define(LOCALHOST, "127.0.0.1").
+-define(SSH_PORT, 2060).
+
+-define(DEFAULT_SSH_OPTS,[{ssh,?LOCALHOST},
+			  {port,?SSH_PORT},
+			  {user,"xxx"},
+			  {password,"xxx"}]).
+-define(DEFAULT_SSH_OPTS(Dir), ?DEFAULT_SSH_OPTS++[{user_dir,Dir}]).
+
+-define(ok,ok).
+
+suite() ->
+    [{ct_hooks, [{cth_conn_log,
+		  [{ct_netconfc,[{log_type,html}, %will be overwritten by config
+				 {hosts,[my_named_connection,netconf1]}]
+		   }]
+		 }]
+     }].
+
+all() ->
+    case os:find_executable("ssh") of
+	false ->
+	    {skip, "SSH not installed on host"};
+	_ ->
+	    [hello,
+	     hello_from_server_first,
+	     hello_named,
+	     hello_configured,
+	     hello_configured_extraopts,
+	     hello_required,
+	     hello_required_exists,
+	     hello_global_pwd,
+	     hello_no_session_id,
+	     hello_incomp_base_vsn,
+	     hello_no_base_cap,
+	     hello_no_caps,
+	     no_server_hello,
+	     no_client_hello,
+	     get_session_id,
+	     get_capabilities,
+	     faulty_user,
+	     faulty_passwd,
+	     faulty_port,
+	     no_host,
+	     no_port,
+	     invalid_opt,
+	     get,
+	     get_xpath,
+	     get_config,
+	     get_config_xpath,
+	     edit_config,
+	     copy_config,
+	     delete_config,
+	     lock,
+	     unlock,
+	     kill_session,
+	     get_no_such_client,
+	     action,
+	     send_any_rpc,
+	     send_any,
+	     hide_password,
+	     not_proper_xml,
+	     prefixed_namespace,
+	     receive_chunked_data,
+	     timeout_receive_chunked_data,
+	     close_while_waiting_for_chunked_data,
+	     connection_crash,
+	     get_event_streams,
+	     create_subscription,
+	     receive_event
+	    ]
+    end.
+
+
+groups() ->
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+init_per_testcase(_Case, Config) ->
+    ets:delete_all_objects(ns_tab),
+    Dog = test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) ->
+    case catch {crypto:start(), ssh:start()} of
+	{ok, ok} ->
+	    {ok, _} =  get_id_keys(Config),
+	    make_dsa_files(Config),
+	    Server = ?NS:start(?config(data_dir,Config)),
+	    [{server,Server}|Config];
+	_ ->
+	    {skip, "Crypto and/or SSH could not be started!"}
+    end.
+
+end_per_suite(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    ?NS:stop(?config(server,Config)),
+    ssh:stop(),
+    crypto:stop(),
+    remove_id_keys(PrivDir),
+    Config.
+
+hello(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+hello_from_server_first(Config) ->
+    DataDir = ?config(data_dir,Config),
+    ?NS:hello(1),
+    {ok,Client} = ct_netconfc:only_open(?DEFAULT_SSH_OPTS(DataDir)),
+    ct:sleep(500),
+    ?NS:expect(hello),
+    ?ok = ct_netconfc:hello(Client),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+hello_named(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(any_name,DataDir),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+hello_configured() ->
+    [{require, netconf1}].
+hello_configured(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_configured_success(netconf1,DataDir),
+    ?NS:expect_do_reply('close-session',close,ok),
+    {error, {no_such_name,netconf1}} = ct_netconfc:close_session(netconf1),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+hello_configured_extraopts() ->
+    [{require, netconf1}].
+hello_configured_extraopts(Config) ->
+    DataDir = ?config(data_dir,Config),
+    %% Test that the cofiguration overwrites the ExtraOpts parameter
+    %% to ct_netconfc:open/2.
+    {ok,Client} = open_configured_success(netconf1,DataDir,[{password,"faulty"}]),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+hello_required() ->
+    [{require, my_named_connection, netconf1}].
+hello_required(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,_Client} = open_configured_success(my_named_connection,DataDir),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(my_named_connection),
+    ok.
+
+hello_required_exists() ->
+    [{require, my_named_connection, netconf1}].
+hello_required_exists(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,_Client1} = open_configured_success(my_named_connection,DataDir),
+
+    %% Check that same name can not be used twice
+    {error,{connection_exists,_Client1}} =
+	ct_netconfc:open(my_named_connection,[{user_dir,DataDir}]),
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(my_named_connection),
+    timer:sleep(500),
+
+    %% Then check that it can be used again after the first is closed
+    {ok,_Client2} = open_configured_success(my_named_connection,DataDir),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(my_named_connection),
+    ok.
+
+hello_global_pwd(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir,[{user,"any-user"},
+					{password,"global-xxx"}]),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+hello_no_session_id(Config) ->
+    DataDir = ?config(data_dir,Config),
+    ?NS:hello(no_session_id),
+    ?NS:expect(no_session_id,hello),
+    {error,{incorrect_hello,no_session_id_found}} = open(DataDir),
+    ok.
+
+hello_incomp_base_vsn(Config) ->
+    DataDir = ?config(data_dir,Config),
+    ?NS:hello(1,{base,"1.1"}),
+    ?NS:expect(hello),
+    {error,{incompatible_base_capability_vsn,"1.1"}} = open(DataDir),
+    ok.
+
+hello_no_base_cap(Config) ->
+    DataDir = ?config(data_dir,Config),
+    ?NS:hello(1,no_base),
+    ?NS:expect(hello),
+    {error,{incorrect_hello,no_base_capability_found}} = open(DataDir),
+    ok.
+
+hello_no_caps(Config) ->
+    DataDir = ?config(data_dir,Config),
+    ?NS:hello(1,no_caps),
+    ?NS:expect(hello),
+    {error,{incorrect_hello,capabilities_not_found}} = open(DataDir),
+    ok.
+
+no_server_hello(Config) ->
+    DataDir = ?config(data_dir,Config),
+    ?NS:expect(undefined,hello),
+    {error,{hello_session_failed,timeout}} = open(DataDir,[{timeout,2000}]),
+    ok.
+
+no_client_hello(Config) ->
+    DataDir = ?config(data_dir,Config),
+    ?NS:hello(1),
+    {ok,Client} = ct_netconfc:only_open(?DEFAULT_SSH_OPTS(DataDir)),
+
+    %% Allow server hello to arrive
+    ct:sleep(500),
+
+    %% Tell server to receive a get request and then die without
+    %% replying since no hello has been received. (is this correct
+    %% behavoiur??)
+    ?NS:expect_do(get,close),
+    {error,closed} = ct_netconfc:get(Client,whatever),
+    ok.
+
+get_session_id(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+
+    1 = ct_netconfc:get_session_id(Client),
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+get_capabilities(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+
+    Caps = ct_netconfc:get_capabilities(Client),
+    BaseCap = ?NETCONF_BASE_CAP ++ ?NETCONF_BASE_CAP_VSN,
+    [BaseCap,"urn:ietf:params:netconf:capability:writable-running:1.0" |_] = Caps,
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+faulty_user(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {error,{ssh,could_not_connect_to_server,
+	    "Unable to connect using the available authentication methods"}} =
+	open(DataDir,[{user,"yyy"}]),
+    ok.
+
+faulty_passwd(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {error,{ssh,could_not_connect_to_server,
+	    "Unable to connect using the available authentication methods"}} =
+	open(DataDir,[{password,"yyy"}]),
+    ok.
+
+faulty_port(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {error,{ssh,could_not_connect_to_server,econnrefused}} =
+	open(DataDir,[{port,2062}]),
+    ok.
+
+no_host(Config) ->
+    DataDir = ?config(data_dir,Config),
+    Opts = lists:keydelete(ssh,1,?DEFAULT_SSH_OPTS(DataDir)),
+    {error,no_host_address} = ct_netconfc:open(Opts),
+    ok.
+
+no_port(Config) ->
+    DataDir = ?config(data_dir,Config),
+    Opts = lists:keydelete(port,1,?DEFAULT_SSH_OPTS(DataDir)),
+    {error,no_port} = ct_netconfc:open(Opts),
+    ok.
+
+invalid_opt(Config) ->
+    DataDir = ?config(data_dir,Config),
+    Opts1 = ?DEFAULT_SSH_OPTS(DataDir) ++ [{timeout,invalidvalue}],
+    {error,{invalid_option,{timeout,invalidvalue}}} = ct_netconfc:open(Opts1),
+    Opts2 = ?DEFAULT_SSH_OPTS(DataDir) ++ [{some_other_opt,true}],
+    {error,{invalid_option,{some_other_opt,true}}} = ct_netconfc:open(Opts2),
+    ok.
+
+get(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
+    ?NS:expect_reply('get',{data,Data}),
+    {ok,Data} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+get_xpath(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
+    ?NS:expect_reply({'get',xpath},{data,Data}),
+    {ok,Data} = ct_netconfc:get(Client,{xpath,"/server"}),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+get_config(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
+    ?NS:expect_reply('get-config',{data,Data}),
+    {ok,Data} = ct_netconfc:get_config(Client,running,
+				       {server,[{xmlns,"myns"}],[]}),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+get_config_xpath(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
+    ?NS:expect_reply({'get-config',xpath},{data,Data}),
+    {ok,Data} = ct_netconfc:get_config(Client,running,{xpath,"/server"}),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+edit_config(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    ?NS:expect_reply('edit-config',ok),
+    ?ok = ct_netconfc:edit_config(Client,running,
+				  {server,[{xmlns,"myns"}],
+				   [{name,["myserver"]}]}),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+copy_config(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    ?NS:expect_reply('copy-config',ok),
+    ?ok = ct_netconfc:copy_config(Client,startup,running),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+delete_config(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    ?NS:expect_reply('delete-config',ok),
+    ?ok = ct_netconfc:delete_config(Client,startup),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+lock(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    ?NS:expect_reply('lock',ok),
+    ?ok = ct_netconfc:lock(Client,running),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+unlock(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    ?NS:expect_reply('unlock',ok),
+    ?ok = ct_netconfc:unlock(Client,running),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+kill_session(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+
+    ?NS:hello(2),
+    ?NS:expect(2,hello),
+    {ok,_OtherClient} = open(DataDir),
+
+    ?NS:expect_do_reply('kill-session',{kill,2},ok),
+    ?ok = ct_netconfc:kill_session(Client,2),
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+
+    ok.
+
+get_no_such_client(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    case ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}) of
+	{error,no_such_client} ->
+	    ok;
+	{error,closed} ->
+	    %% Means that the Client process was not terminated before the call.
+	    %% Give it one more go.
+	    {error,no_such_client} =
+		ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]})
+    end,
+    ok.
+
+action(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    Data = [{myactionreturn,[{xmlns,"myns"}],["value"]}],
+    ?NS:expect_reply(action,{data,Data}),
+    {ok,Data} = ct_netconfc:action(Client,{myaction,[{xmlns,"myns"}],[]}),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+send_any_rpc(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
+    GetConf = {'get-config',
+	       [{source,["running"]},
+		{filter,[{type,"subtree"}],
+		 [{server,[{xmlns,"myns"}],[]}]}]},
+    ?NS:expect_reply('get-config',{data,Data}),
+    [{data,?NETCONF_NAMESPACE_ATTR,Data}] = ct_netconfc:send_rpc(Client,GetConf),
+
+    EditConf = {'edit-config',
+		[{target,["running"]},
+		 {config,[{server,[{xmlns,"myns"}],
+			   [{name,["myserver"]}]}]}]},
+    ?NS:expect_reply('edit-config',ok),
+    [{ok,?NETCONF_NAMESPACE_ATTR,[]}] = ct_netconfc:send_rpc(Client,EditConf),
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+send_any(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+
+    %% Correct get-config rpc
+    Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
+    RpcAttr1 = ?NETCONF_NAMESPACE_ATTR ++ [{'message-id',"1"}],
+    RpcGetConf = {rpc,RpcAttr1,
+		  [{'get-config',
+		    [{source,["running"]},
+		     {filter,[{type,"subtree"}],
+		      [{server,[{xmlns,"myns"}],[]}]}]}]},
+    ?NS:expect_reply('get-config',{data,Data}),
+    {'rpc-reply',RpcAttr1,[{data,_,Data}]} = ct_netconfc:send(Client,RpcGetConf),
+
+    %% Correct edit-config rpc
+    RpcAttr2 = ?NETCONF_NAMESPACE_ATTR ++ [{'message-id',"2"}],
+    RpcEditConf = {rpc,RpcAttr2,
+		   [{'edit-config',
+		     [{target,["running"]},
+		      {config,[{server,[{xmlns,"myns"}],
+				[{name,["myserver"]}]}]}]}]},
+    ?NS:expect_reply('edit-config',ok),
+    {'rpc-reply',RpcAttr2,[{ok,_,[]}]} = ct_netconfc:send(Client,RpcEditConf),
+
+    %% Send any data
+    ?NS:expect_reply(any,{ok,[],[]}),
+    {ok,_,[]} = ct_netconfc:send(Client,{any,[],[]}),
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+hide_password(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    Password = "my_very_secret_password",
+    Data = [{passwords,[{xmlns,"myns"}],
+	     [{password,[{xmlns,"pwdns"}],[Password]},
+	      {password,[],[Password]}]}],
+    ?NS:expect_reply('get',{data,Data}),
+    ct:capture_start(), % in case of html logging
+    {ok,Data} = ct_netconfc:get(Client,{passwords,[{xmlns,"myns"}],[]}),
+    ct:capture_stop(),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+
+    Log = filename:join(?config(priv_dir,Config),"hide_password-netconf.txt"),
+
+    Text =
+	case file:read_file(Log) of
+	    {ok,Bin} ->
+		Bin;
+	    _NoLog ->
+		%% Assume html logging
+		list_to_binary(ct:capture_get())
+	end,
+
+    nomatch = binary:match(Text,list_to_binary(Password)),
+
+    ok.
+
+not_proper_xml(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    NS = list_to_binary(?NETCONF_NAMESPACE),
+    NotProper = <<"<rpc-reply message-id=\"1\" xmlns=\"",
+		  NS/binary,"\"><data></rpc-reply>">>,
+    ?NS:expect_reply('get',NotProper),
+    {error,{failed_to_parse_received_data,_}} =
+	ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+prefixed_namespace(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    NS = list_to_binary(?NETCONF_NAMESPACE),
+
+    %% Test that data element can be properly decoded and that
+    %% prefixed namespace attributes (exepct the netconf namespace)
+    %% are forwarded to the content of the data element - i.e. that
+    %% the xmlns:my is forwarded from the rpc-reply element to the
+    %% server element below.
+    Data = <<"<nc:rpc-reply message-id=\"1\" xmlns:nc=\"",
+	     NS/binary,"\" xmlns:my=\"myns\"><nc:data><my:server>",
+	     "<my:name my:lang=\"en\">myserver</my:name></my:server>"
+	     "</nc:data></nc:rpc-reply>">>,
+    ?NS:expect_reply('get',Data),
+    {ok,[{'my:server',[{'xmlns:my',"myns"}],
+	  [{'my:name',[{'my:lang',"en"}],["myserver"]}]}]} =
+	ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}),
+
+    Ok = <<"<nc:rpc-reply message-id=\"2\" xmlns:nc=\"",
+	   NS/binary,"\"><nc:ok/></nc:rpc-reply>">>,
+    ?NS:expect_reply('edit-config',Ok),
+    ?ok = ct_netconfc:edit_config(Client,running,
+				  {server,[{xmlns,"myns"}],
+				   [{name,["myserver"]}]}),
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+%% Test that the client can parse data which is received in chunks,
+%% i.e. when the complete rpc-reply is not contained in one single ssh
+%% data message.
+receive_chunked_data(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+
+    %% Construct the data to return from netconf server
+    Data = [{servers,[{xmlns,"myns"}],
+	     [{server,[],[{name,[],["server0"]}]},
+	      {server,[],[{name,[],["server1"]}]},
+	      {server,[],[{name,[],["server2"]}]},
+	      {server,[],[{name,[],["server3"]}]},
+	      {server,[],[{name,[],["server4"]}]},
+	      {server,[],[{name,[],["server5"]}]},
+	      {server,[],[{name,[],["server6"]}]},
+	      {server,[],[{name,[],["server7"]}]},
+	      {server,[],[{name,[],["server8"]}]},
+	      {server,[],[{name,[],["server9"]}]}]
+	    }],
+    Rpc = {'rpc-reply',?NETCONF_NAMESPACE_ATTR ++ [{'message-id',"1"}],
+	   [{data,Data}]},
+    Xml = list_to_binary(xmerl:export_simple_element(Rpc,xmerl_xml)),
+    Netconf =
+	<<"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
+	  Xml/binary,"\n",?END_TAG/binary>>,
+
+    %% Split the data in some chunks
+    PartLength = size(Netconf) div 3,
+    <<Part1:PartLength/binary,Part2:PartLength/binary,Part3:PartLength/binary,
+      Part4/binary>> = Netconf,
+
+    %% Spawn a process which will wait a bit for the client to send
+    %% the request (below), then order the server to the chunks of the
+    %% rpc-reply one by one.
+    spawn(fun() -> timer:sleep(500),?NS:hupp(send,Part1),
+		   timer:sleep(100),?NS:hupp(send,Part2),
+		   timer:sleep(100),?NS:hupp(send,Part3),
+		   timer:sleep(100),?NS:hupp(send,Part4)
+	  end),
+
+    %% Order server to expect a get - then the process above will make
+    %% sure the rpc-reply is sent.
+    ?NS:expect('get'),
+    {ok,Data} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}),
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+%% Same as receive_chunked_data, but timeout waiting for last part.
+timeout_receive_chunked_data(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+
+    %% Construct the data to return from netconf server
+    Data = [{servers,[{xmlns,"myns"}],
+	     [{server,[],[{name,[],["server0"]}]},
+	      {server,[],[{name,[],["server1"]}]},
+	      {server,[],[{name,[],["server2"]}]},
+	      {server,[],[{name,[],["server3"]}]},
+	      {server,[],[{name,[],["server4"]}]},
+	      {server,[],[{name,[],["server5"]}]},
+	      {server,[],[{name,[],["server6"]}]},
+	      {server,[],[{name,[],["server7"]}]},
+	      {server,[],[{name,[],["server8"]}]},
+	      {server,[],[{name,[],["server9"]}]}]
+	    }],
+    Rpc = {'rpc-reply',?NETCONF_NAMESPACE_ATTR ++ [{'message-id',"1"}],
+	   [{data,Data}]},
+    Xml = list_to_binary(xmerl:export_simple_element(Rpc,xmerl_xml)),
+    Netconf =
+	<<"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
+	  Xml/binary,"\n",?END_TAG/binary>>,
+
+    %% Split the data in some chunks
+    PartLength = size(Netconf) div 3,
+    <<Part1:PartLength/binary,Part2:PartLength/binary,_Part3:PartLength/binary,
+      _Part4/binary>> = Netconf,
+
+    %% Spawn a process which will wait a bit for the client to send
+    %% the request (below), then order the server to the chunks of the
+    %% rpc-reply one by one.
+    spawn(fun() -> timer:sleep(500),?NS:hupp(send,Part1),
+		   timer:sleep(100),?NS:hupp(send,Part2)
+	  end),
+
+    %% Order server to expect a get - then the process above will make
+    %% sure the rpc-reply is sent - but only a part of it - then timeout.
+    ?NS:expect('get'),
+    {error,timeout} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]},2000),
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+%% Same as receive_chunked_data, but timeout waiting for last part.
+close_while_waiting_for_chunked_data(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+
+    %% Construct the data to return from netconf server
+    Data = [{servers,[{xmlns,"myns"}],
+	     [{server,[],[{name,[],["server0"]}]},
+	      {server,[],[{name,[],["server1"]}]},
+	      {server,[],[{name,[],["server2"]}]},
+	      {server,[],[{name,[],["server3"]}]},
+	      {server,[],[{name,[],["server4"]}]},
+	      {server,[],[{name,[],["server5"]}]},
+	      {server,[],[{name,[],["server6"]}]},
+	      {server,[],[{name,[],["server7"]}]},
+	      {server,[],[{name,[],["server8"]}]},
+	      {server,[],[{name,[],["server9"]}]}]
+	    }],
+    Rpc = {'rpc-reply',?NETCONF_NAMESPACE_ATTR ++ [{'message-id',"1"}],
+	   [{data,Data}]},
+    Xml = list_to_binary(xmerl:export_simple_element(Rpc,xmerl_xml)),
+    Netconf =
+	<<"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
+	  Xml/binary,"\n",?END_TAG/binary>>,
+
+    %% Split the data in some chunks
+    PartLength = size(Netconf) div 3,
+    <<Part1:PartLength/binary,Part2:PartLength/binary,_Part3:PartLength/binary,
+      _Part4/binary>> = Netconf,
+
+    %% Spawn a process which will wait a bit for the client to send
+    %% the request (below), then order the server to the chunks of the
+    %% rpc-reply one by one.
+    spawn(fun() -> timer:sleep(500),?NS:hupp(send,Part1),
+		   timer:sleep(100),?NS:hupp(send,Part2),
+		   timer:sleep(100),?NS:hupp(kill)
+	  end),
+
+    %% Order server to expect a get - then the process above will make
+    %% sure the rpc-reply is sent - but only a part of it - then close.
+    ?NS:expect('get'),
+    {error,closed} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]},2000),
+    ok.
+
+connection_crash(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+
+    %% Test that if the test survives killing the connection
+    %% process. Earlier this caused ct_util_server to terminate, and
+    %% this aborting the complete test run.
+    spawn(fun() -> timer:sleep(500),exit(Client,kill) end),
+    ?NS:expect(get),
+    {error,{closed,killed}}=ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}),
+    ok.
+
+get_event_streams(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    StreamNames = ["NETCONF","stream1","stream2"],
+    Streams = [{N,[{description,"descr of " ++ N}]} || N <- StreamNames],
+    StreamsXml = [{stream,[{name,[N]}|[{Tag,[Value]} || {Tag,Value} <- Data]]}
+                  || {N,Data} <- Streams],
+    ReplyData = [{netconf,?NETMOD_NOTIF_NAMESPACE_ATTR,[{streams,StreamsXml}]}],
+    ?NS:expect_reply('get',{data,ReplyData}),
+    {ok,Streams} = ct_netconfc:get_event_streams(Client,StreamNames),
+
+    ?NS:expect_reply('get',{data,ReplyData}),
+    {ok,Streams} = ct_netconfc:get_event_streams(Client,StreamNames,5000),
+
+    ?NS:expect('get'),
+    {error,timeout} = ct_netconfc:get_event_streams(Client,100),
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
+create_subscription(Config) ->
+    DataDir = ?config(data_dir,Config),
+
+    %% All defaults
+    {ok,Client1} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream]},ok),
+    ?ok = ct_netconfc:create_subscription(Client1),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client1),
+
+    %% All defaults with timeout
+    {ok,Client1a} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream]},ok),
+    ?ok = ct_netconfc:create_subscription(Client1a,5000),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client1a),
+
+    %% All defaults timing out
+    {ok,Client1b} = open_success(DataDir),
+    ?NS:expect({'create-subscription',[stream]}),
+    {error,timeout} = ct_netconfc:create_subscription(Client1b,100),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client1b),
+
+    %% Stream
+    {ok,Client2} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream]},ok),
+    Stream = "some_stream",
+    ?ok = ct_netconfc:create_subscription(Client2,Stream),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client2),
+
+    %% Filter
+    {ok,Client3} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream,filter]},ok),
+    Filter = {notification,?NETMOD_NOTIF_NAMESPACE_ATTR,
+	      [eventTime]},
+    ?ok = ct_netconfc:create_subscription(Client3,Filter),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client3),
+
+    %% Filter with timeout
+    {ok,Client3a} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream,filter]},ok),
+    ?ok = ct_netconfc:create_subscription(Client3a,Filter,5000),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client3a),
+
+    %% Filter timing out
+    {ok,Client3b} = open_success(DataDir),
+    ?NS:expect({'create-subscription',[stream,filter]}),
+    {error,timeout}=ct_netconfc:create_subscription(Client3b,Filter,100),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client3b),
+
+    %% Stream and filter
+    {ok,Client4} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream,filter]},ok),
+    ?ok = ct_netconfc:create_subscription(Client4,Stream,Filter),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client4),
+
+    %% Start/stop time
+    {ok,Client5} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream,startTime,stopTime]},ok),
+    StartTime = xs_datetime({D,{H,M,S}}= calendar:local_time()),
+    StopTime = xs_datetime({D,{H+2,M,S}}),
+    ?ok = ct_netconfc:create_subscription(Client5,StartTime,StopTime),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client5),
+
+    %% Start/stop time with timeout
+    {ok,Client5a} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream,startTime,stopTime]},ok),
+    ?ok = ct_netconfc:create_subscription(Client5a,StartTime,StopTime,5000),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client5a),
+
+    %% Start/stop time timing out
+    {ok,Client5b} = open_success(DataDir),
+    ?NS:expect({'create-subscription',[stream,startTime,stopTime]}),
+    {error,timeout} =
+	ct_netconfc:create_subscription(Client5b,StartTime,StopTime,100),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client5b),
+
+    %% Stream and start/stop time
+    {ok,Client6} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream,startTime,stopTime]},ok),
+    ?ok = ct_netconfc:create_subscription(Client6,Stream,StartTime,StopTime),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client6),
+
+    %% Filter and start/stop time
+    {ok,Client7} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream,filter,startTime,stopTime]},
+		    ok),
+    ?ok = ct_netconfc:create_subscription(Client7,Filter,
+					  StartTime,StopTime),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client7),
+
+    %% Stream, filter and start/stop time
+    {ok,Client8} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream,filter,startTime,stopTime]},
+		    ok),
+    ?ok = ct_netconfc:create_subscription(Client8,Stream,Filter,
+					  StartTime,StopTime),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client8),
+
+    ok.
+
+receive_event(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream]},ok),
+    ?ok = ct_netconfc:create_subscription(Client),
+
+    ?NS:hupp(send_event),
+
+    receive
+	%% Matching ?NS:make_msg(event)
+	{notification,?NETCONF_NOTIF_NAMESPACE_ATTR,
+	 [{eventTime,[],[_Time]},
+	  {event,[{xmlns,"http://my.namespaces.com/event"}],
+	   [{severity,_,_},
+	    {description,_,_}]}]} ->
+	    ok;
+	Other ->
+	    ct:fail({got_unexpected_while_waiting_for_event, Other})
+    after 3000 ->
+	    ct:fail(timeout_waiting_for_event)
+    end,
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+
+    ok.
+
+%%%-----------------------------------------------------------------
+
+break(_Config) ->
+    test_server:break("break test case").
+
+br() ->
+    test_server:break("").
+
+%%%-----------------------------------------------------------------
+%% Open a netconf session which is not specified in a config file
+open_success(Dir) ->
+    open_success(Dir,[]).
+
+%% Open a netconf session which is not specified in a config file, and
+%% give som extra options in addition to the test defaults.
+open_success(Dir,ExtraOpts) when is_list(Dir), is_list(ExtraOpts) ->
+    ?NS:hello(1), % tell server to send hello with session id 1
+    ?NS:expect(hello), % tell server to expect a hello message from client
+    open(Dir,ExtraOpts);
+
+%% Open a named netconf session which is not specified in a config file
+open_success(KeyOrName,Dir) when is_atom(KeyOrName), is_list(Dir) ->
+    ?NS:hello(1),
+    ?NS:expect(hello),
+    ct_netconfc:open(KeyOrName,?DEFAULT_SSH_OPTS(Dir)).
+
+open(Dir) ->
+    open(Dir,[]).
+open(Dir,ExtraOpts) ->
+    Opts = lists:ukeymerge(1,lists:keysort(1,ExtraOpts),
+			   lists:keysort(1,?DEFAULT_SSH_OPTS(Dir))),
+    ct_netconfc:open(Opts).
+
+%%%-----------------------------------------------------------------
+%%% Open a netconf session which is specified in a config file
+%%% KeyOrName is the config key (server_id()) or name given in a
+%%% require statement (target_name()).
+open_configured_success(KeyOrName,Dir) when is_atom(KeyOrName) ->
+    open_configured_success(KeyOrName,Dir,[]).
+open_configured_success(KeyOrName,Dir,ExtraOpts) when is_atom(KeyOrName) ->
+    ?NS:hello(1),
+    ?NS:expect(hello),
+    ct_netconfc:open(KeyOrName,[{user_dir,Dir}|ExtraOpts]).
+
+%%%-----------------------------------------------------------------
+%%% Convert erlang datetime to the simplest variant of XML dateTime
+xs_datetime({{Y,M,D},{H,Mi,S}}) ->
+    lists:flatten(
+      io_lib:format("~p-~s-~sT~s:~s:~s",[Y,pad(M),pad(D),pad(H),pad(Mi),pad(S)])).
+
+pad(I) when I<10 ->
+    "0"++integer_to_list(I);
+pad(I) ->
+    integer_to_list(I).
+
+
+%%%-----------------------------------------------------------------
+%%% BEGIN SSH key management
+%% copy private keys to given dir from ~/.ssh
+get_id_keys(Config) ->
+    DstDir = ?config(priv_dir, Config),
+    SrcDir = filename:join(os:getenv("HOME"), ".ssh"),
+    RsaOk = copyfile(SrcDir, DstDir, "id_rsa"),
+    DsaOk = copyfile(SrcDir, DstDir, "id_dsa"),
+    case {RsaOk, DsaOk} of
+	{{ok, _}, {ok, _}} -> {ok, both};
+	{{ok, _}, _} -> {ok, rsa};
+	{_, {ok, _}} -> {ok, dsa};
+	{Error, _} -> Error
+    end.
+
+%% Remove later on. Use make_dsa_files instead.
+remove_id_keys(Config) ->
+    Dir = ?config(priv_dir, Config),
+    file:delete(filename:join(Dir, "id_rsa")),
+    file:delete(filename:join(Dir, "id_dsa")).
+
+
+make_dsa_files(Config) ->
+    make_dsa_files(Config, rfc4716_public_key).
+make_dsa_files(Config, Type) ->
+    {DSA, EncodedKey} = gen_dsa(128, 20),
+    PKey = DSA#'DSAPrivateKey'.y,
+    P = DSA#'DSAPrivateKey'.p,
+    Q = DSA#'DSAPrivateKey'.q,
+    G = DSA#'DSAPrivateKey'.g,
+    Dss = #'Dss-Parms'{p=P, q=Q, g=G},
+    {ok, Hostname} = inet:gethostname(),
+    {ok, {A, B, C, D}} = inet:getaddr(Hostname, inet),
+    IP = lists:concat([A, ".", B, ".", C, ".", D]),
+    Attributes = [], % Could be [{comment,"user@" ++ Hostname}],
+    HostNames = [{hostnames,[IP, IP]}],
+    PublicKey = [{{PKey, Dss}, Attributes}],
+    KnownHosts = [{{PKey, Dss}, HostNames}],
+
+    KnownHostsEnc = public_key:ssh_encode(KnownHosts, known_hosts),
+    KnownHosts = public_key:ssh_decode(KnownHostsEnc, known_hosts),
+
+    PublicKeyEnc = public_key:ssh_encode(PublicKey, Type),
+
+    SystemTmpDir = ?config(data_dir, Config),
+    filelib:ensure_dir(SystemTmpDir),
+    file:make_dir(SystemTmpDir),
+
+    DSAFile = filename:join(SystemTmpDir, "ssh_host_dsa_key.pub"),
+    file:delete(DSAFile),
+
+    DSAPrivateFile  = filename:join(SystemTmpDir, "ssh_host_dsa_key"),
+    file:delete(DSAPrivateFile),
+
+    KHFile = filename:join(SystemTmpDir, "known_hosts"),
+    file:delete(KHFile),
+
+    PemBin = public_key:pem_encode([EncodedKey]),
+
+    file:write_file(DSAFile, PublicKeyEnc),
+    file:write_file(KHFile, KnownHostsEnc),
+    file:write_file(DSAPrivateFile, PemBin),
+    ok.
+
+%%--------------------------------------------------------------------
+%% Creates a dsa key (OBS: for testing only)
+%%   the sizes are in bytes
+%% gen_dsa(::integer()) -> {::atom(), ::binary(), ::opaque()}
+%%--------------------------------------------------------------------
+gen_dsa(LSize,NSize) when is_integer(LSize), is_integer(NSize) ->
+    Key = gen_dsa2(LSize, NSize),
+    {Key, encode_key(Key)}.
+
+encode_key(Key = #'RSAPrivateKey'{}) ->
+    {ok, Der} = 'OTP-PUB-KEY':encode('RSAPrivateKey', Key),
+    {'RSAPrivateKey', list_to_binary(Der), not_encrypted};
+encode_key(Key = #'DSAPrivateKey'{}) ->
+    {ok, Der} = 'OTP-PUB-KEY':encode('DSAPrivateKey', Key),
+    {'DSAPrivateKey', list_to_binary(Der), not_encrypted}.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% DSA key generation  (OBS: for testing only)
+%% See http://en.wikipedia.org/wiki/Digital_Signature_Algorithm
+%% and the fips_186-3.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+gen_dsa2(LSize, NSize) ->
+    Q  = prime(NSize),  %% Choose N-bit prime Q
+    X0 = prime(LSize),
+    P0 = prime((LSize div 2) +1),
+
+    %% Choose L-bit prime modulus P such that p-1 is a multiple of q.
+    case dsa_search(X0 div (2*Q*P0), P0, Q, 1000) of
+	error ->
+	    gen_dsa2(LSize, NSize);
+	P ->
+	    G = crypto:mod_exp(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
+	    %%                 such that This may be done by setting g = h^(p-1)/q mod p, commonly h=2 is used.
+
+	    X = prime(20),               %% Choose x by some random method, where 0 < x < q.
+	    Y = crypto:mod_exp(G, X, P), %% Calculate y = g^x mod p.
+
+	    #'DSAPrivateKey'{version=0, p=P, q=Q, g=G, y=Y, x=X}
+    end.
+
+%% See fips_186-3.pdf
+dsa_search(T, P0, Q, Iter) when Iter > 0 ->
+    P = 2*T*Q*P0 + 1,
+    case is_prime(crypto:mpint(P), 50) of
+	true -> P;
+	false -> dsa_search(T+1, P0, Q, Iter-1)
+    end;
+dsa_search(_,_,_,_) ->
+    error.
+
+
+%%%%%%% Crypto Math %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+prime(ByteSize) ->
+    Rand = odd_rand(ByteSize),
+    crypto:erlint(prime_odd(Rand, 0)).
+
+prime_odd(Rand, N) ->
+    case is_prime(Rand, 50) of
+	true ->
+	    Rand;
+	false ->
+	    NotPrime = crypto:erlint(Rand),
+	    prime_odd(crypto:mpint(NotPrime+2), N+1)
+    end.
+
+%% see http://en.wikipedia.org/wiki/Fermat_primality_test
+is_prime(_, 0) -> true;
+is_prime(Candidate, Test) ->
+    CoPrime = odd_rand(<<0,0,0,4, 10000:32>>, Candidate),
+    case crypto:mod_exp(CoPrime, Candidate, Candidate) of
+	CoPrime -> is_prime(Candidate, Test-1);
+	_       -> false
+    end.
+
+odd_rand(Size) ->
+    Min = 1 bsl (Size*8-1),
+    Max = (1 bsl (Size*8))-1,
+    odd_rand(crypto:mpint(Min), crypto:mpint(Max)).
+
+odd_rand(Min,Max) ->
+    Rand = <<Sz:32, _/binary>> = crypto:rand_uniform(Min,Max),
+    BitSkip = (Sz+4)*8-1,
+    case Rand of
+	Odd  = <<_:BitSkip,  1:1>> -> Odd;
+	Even = <<_:BitSkip,  0:1>> ->
+	    crypto:mpint(crypto:erlint(Even)+1)
+    end.
+
+copyfile(SrcDir, DstDir, Fn) ->
+    file:copy(filename:join(SrcDir, Fn),
+	      filename:join(DstDir, Fn)).
+
+%%% END SSH key management
+%%%-----------------------------------------------------------------
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
new file mode 100644
index 0000000000..2427f37f52
--- /dev/null
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -0,0 +1,555 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%----------------------------------------------------------------------
+%% A netconf server used for testing of netconfc
+-module(ns).
+
+%-compile(export_all).
+-include_lib("common_test/src/ct_netconfc.hrl").
+
+
+%%%-----------------------------------------------------------------
+%%% API
+-export([start/1,
+	 stop/1,
+	 hello/1,
+	 hello/2,
+	 expect/1,
+	 expect/2,
+	 expect_reply/2,
+	 expect_reply/3,
+	 expect_do/2,
+	 expect_do/3,
+	 expect_do_reply/3,
+	 expect_do_reply/4,
+	 hupp/1,
+	 hupp/2]).
+
+%%%-----------------------------------------------------------------
+%%% ssh_channel callbacks
+-export([init/1,
+	 terminate/2,
+	 handle_ssh_msg/2,
+	 handle_msg/2]).
+
+%%%-----------------------------------------------------------------
+%% Server specifications
+-define(SERVER_DATA_NAMESPACE, "ClientTest").
+-define(CAPABILITIES,?CAPABILITIES_VSN("1.0")).
+-define(CAPABILITIES_VSN(Vsn),
+	[
+	 ?NETCONF_BASE_CAP ++ Vsn,
+	 "urn:ietf:params:netconf:capability:writable-running:1.0",
+	 "urn:ietf:params:netconf:capability:candidate:1.0",
+	 "urn:ietf:params:netconf:capability:confirmed-commit:1.0",
+	 "urn:ietf:params:netconf:capability:rollback-on-error:1.0",
+	 "urn:ietf:params:netconf:capability:startup:1.0",
+	 "urn:ietf:params:netconf:capability:url:1.0",
+	 "urn:ietf:params:netconf:capability:xpath:1.0",
+	 "urn:ietf:params:netconf:capability:notification:1.0",
+	 "urn:ietf:params:netconf:capability:interleave:1.0",
+	 ?ACTION_NAMESPACE,
+	 ?SERVER_DATA_NAMESPACE
+	]).
+-define(SSH_PORT, 2060).
+-define(ssh_config(Dir),[{port, ?SSH_PORT},
+			 {interface, {127,0,0,1}},
+			 {system_dir, Dir},
+			 {user_dir, Dir},
+			 {user_passwords, [{"xxx","xxx"}]},
+			 {password, "global-xxx"}]).
+
+%% Some help for debugging
+%-define(dbg(F,A),io:format(F,A)).
+-define(dbg(F,A),ok).
+-define(dbg_event(Event,Expect),
+	?dbg("Event: ~p~nExpected: ~p~n",[Event,Expect])).
+
+%% State
+-record(session, {cb,
+		  connection,
+		  buffer = <<>>,
+		  session_id}).
+
+
+%%%-----------------------------------------------------------------
+%%% API
+
+%% Start the netconf server and use the given directory as system_dir
+%% and user_dir
+start(Dir) ->
+    spawn(fun() -> init_server(Dir) end).
+
+%% Stop the netconf server
+stop(Pid) ->
+    Pid ! {stop,self()},
+    receive stopped -> ok end.
+
+%% Set the session id for the hello message.
+%% If this is not called prior to starting the session, no hello
+%% message will be sent.
+%% 'Stuff' indicates some special handling to e.g. provoke error cases
+hello(SessionId) ->
+    hello(SessionId,undefined).
+hello(SessionId,Stuff) ->
+    insert(hello,{SessionId,Stuff}).
+
+%% Tell server to expect the given message without doing any further
+%% actions. To be called directly before sending a request.
+expect(Expect) ->
+    expect_do_reply(Expect,undefined,undefined).
+expect(SessionId,Expect) ->
+    expect_do_reply(SessionId,Expect,undefined,undefined).
+
+%% Tell server to expect the given message and reply with the give
+%% reply. To be called directly before sending a request.
+expect_reply(Expect,Reply) ->
+    expect_do_reply(Expect,undefined,Reply).
+expect_reply(SessionId,Expect,Reply) ->
+    expect_do_reply(SessionId,Expect,undefined,Reply).
+
+%% Tell server to expect the given message and perform an action. To
+%% be called directly before sending a request.
+expect_do(Expect,Do) ->
+    expect_do_reply(Expect,Do,undefined).
+expect_do(SessionId,Expect,Do) ->
+    expect_do_reply(SessionId,Expect,Do,undefined).
+
+%% Tell server to expect the given message, perform an action and
+%% reply with the given reply. To be called directly before sending a
+%% request.
+expect_do_reply(Expect,Do,Reply) ->
+    add_expect(1,{Expect,Do,Reply}).
+expect_do_reply(SessionId,Expect,Do,Reply) ->
+    add_expect(SessionId,{Expect,Do,Reply}).
+
+%% Hupp the server - i.e. tell it to do something -
+%% e.g. hupp(send_event) will cause send_event(State) to be called on
+%% the session channel process.
+hupp(send_event) ->
+    hupp(send,[make_msg(event)]);
+hupp(kill) ->
+    hupp(1,fun hupp_kill/1,[]).
+
+hupp(send,Data) ->
+    hupp(1,fun hupp_send/2,[Data]).
+
+hupp(SessionId,Fun,Args) when is_function(Fun) ->
+    [{_,Pid}] = lookup({channel_process,SessionId}),
+    Pid ! {hupp,Fun,Args}.
+
+%%%-----------------------------------------------------------------
+%%% Main loop of the netconf server
+init_server(Dir) ->
+    register(main_ns_proc,self()),
+    ets:new(ns_tab,[set,named_table,public]),
+    Config = ?ssh_config(Dir),
+    {_,Host} = lists:keyfind(interface, 1, Config),
+    {_,Port} = lists:keyfind(port, 1, Config),
+    Opts = lists:filter(fun({Key,_}) ->
+				lists:member(Key,[system_dir,
+						  password,
+						  user_passwords,
+						  pwdfun])
+			end,
+			Config),
+    {ok, Daemon} =
+	ssh:daemon(Host, Port,
+		   [{subsystems,[{"netconf",{?MODULE,[]}}]}
+		    |Opts]),
+    loop(Daemon).
+
+loop(Daemon) ->
+    receive
+	{stop,From} ->
+	    ssh:stop_daemon(Daemon),
+	    From ! stopped;
+	{table_trans,Fun,Args,From} ->
+	    %% Simple transaction mechanism for ets table
+	    R = apply(Fun,Args),
+	    From ! {table_trans_done,R},
+	    loop(Daemon)
+    end.
+
+%%----------------------------------------------------------------------
+%% Behaviour callback functions (ssh_channel)
+%%----------------------------------------------------------------------
+init([]) ->
+    {ok, undefined}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+handle_ssh_msg({ssh_cm,CM,{data, Ch, _Type = 0, Data}}, State) ->
+    %% io:format("~p~n",[{self(),Data,CM,Ch,State}]),
+    data_for_channel(CM, Ch, Data, State);
+handle_ssh_msg({ssh_cm,CM,{closed, Ch}}, State)  ->
+    %% erlang:display({self(),closed,CM,Ch,State}),
+    stop_channel(CM, Ch, State);
+handle_ssh_msg({ssh_cm,CM,{eof, Ch}}, State) ->
+    %% erlang:display({self(),eof,CM,Ch,State}),
+    data_for_channel(CM,Ch, <<>>, State).
+
+
+handle_msg({'EXIT', _Pid, _Reason}, State) ->
+    {ok, State};
+handle_msg({ssh_channel_up,Ch,CM},undefined) ->
+    %% erlang:display({self(),up,CM,Ch}),
+    ConnRef = {CM,Ch},
+    SessionId = maybe_hello(ConnRef),
+    insert({channel_process,SessionId},self()), % used to hupp the server
+    {ok, #session{connection = ConnRef,
+		  session_id = SessionId}};
+handle_msg({hupp,Fun,Args},State) ->
+    {ok,apply(Fun,Args ++ [State])}.
+
+data_for_channel(CM, Ch, Data, State) ->
+    try data(Data, State) of
+	{ok, NewState} ->
+	    case erase(stop) of
+		true ->
+		    stop_channel(CM, Ch, NewState);
+		_ ->
+		    {ok, NewState}
+	    end
+    catch
+	Class:Reason ->
+	    Stacktrace = erlang:get_stacktrace(),
+	    error_logger:error_report([{?MODULE, data_for_channel},
+				       {request, Data},
+				       {buffer, State#session.buffer},
+				       {reason, {Class, Reason}},
+				       {stacktrace, Stacktrace}]),
+	    stop_channel(CM, Ch, State)
+    end.
+
+data(Data, State = #session{connection = ConnRef,
+			    buffer = Buffer,
+			    session_id = SessionId}) ->
+    AllData = <<Buffer/binary,Data/binary>>,
+    case find_endtag(AllData) of
+	{ok,Msgs,Rest} ->
+	    [check_expected(SessionId,ConnRef,Msg) || Msg <- Msgs],
+	    {ok,State#session{buffer=Rest}};
+	need_more ->
+	    {ok,State#session{buffer=AllData}}
+    end.
+
+stop_channel(CM, Ch, State) ->
+    ssh:close(CM),
+    {stop, Ch, State}.
+
+
+%%%-----------------------------------------------------------------
+%%% Functions to trigg via hupp/1:
+
+%% Send data spontaneously - e.g. an event
+hupp_send(Data,State = #session{connection = ConnRef}) ->
+    send(ConnRef,Data),
+    State.
+hupp_kill(State = #session{connection = ConnRef}) ->
+    kill(ConnRef),
+    State.
+
+%%%-----------------------------------------------------------------
+%%% Internal functions
+
+
+%%% Send ssh data to the client
+send({CM,Ch},Data) ->
+    ssh_connection:send(CM, Ch, Data).
+
+%%% Kill ssh connection
+kill({CM,_Ch}) ->
+    ssh:close(CM).
+
+add_expect(SessionId,Add) ->
+    table_trans(fun do_add_expect/2,[SessionId,Add]).
+
+table_trans(Fun,Args) ->
+    S = self(),
+    case whereis(main_ns_proc) of
+	S ->
+	    apply(Fun,Args);
+	Pid ->
+	    Pid ! {table_trans,Fun,Args,self()},
+	    receive
+		{table_trans_done,Result} ->
+		    Result
+	    after 5000 ->
+		    exit(table_trans_timeout)
+	    end
+    end.
+
+do_add_expect(SessionId,Add) ->
+    case lookup({expect,SessionId}) of
+	[] ->
+	    insert({expect,SessionId},[Add]);
+	[{_,First}] ->
+	    insert({expect,SessionId},First ++ [Add])
+    end,
+    ok.
+
+do_get_expect(SessionId) ->
+    case lookup({expect,SessionId}) of
+	[{_,[{Expect,Do,Reply}|Rest]}] ->
+	    insert({expect,SessionId},Rest),
+	    {Expect,Do,Reply};
+	_ ->
+	    error
+    end.
+
+insert(Key,Value) ->
+    ets:insert(ns_tab,{Key,Value}).
+lookup(Key) ->
+    ets:lookup(ns_tab,Key).
+
+maybe_hello(ConnRef) ->
+    case lookup(hello) of
+	[{hello,{SessionId,Stuff}}] ->
+	    %% erlang:display({SessionId,Stuff}),
+	    ets:delete(ns_tab,hello),
+	    insert({session,SessionId},ConnRef),
+	    reply(ConnRef,{hello,SessionId,Stuff}),
+	    SessionId;
+	[] ->
+	    undefined
+    end.
+
+find_endtag(Data) ->
+    case binary:split(Data,[?END_TAG],[global]) of
+	[Data] ->
+	    need_more;
+	Msgs ->
+	    {ok,lists:sublist(Msgs,length(Msgs)-1),lists:last(Msgs)}
+    end.
+
+check_expected(SessionId,ConnRef,Msg) ->
+    %% io:format("~p~n",[{check_expected,SessionId,Msg}]),
+    case table_trans(fun do_get_expect/1,[SessionId]) of
+	{Expect,Do,Reply} ->
+	    %% erlang:display({got,io_lib:format("~s",[Msg])}),
+	    %% erlang:display({expected,Expect}),
+	    match(Msg,Expect),
+	    do(ConnRef, Do),
+	    reply(ConnRef,Reply);
+	error ->
+	    timer:sleep(1000),
+	    exit({error,{got_unexpected,SessionId,Msg,ets:tab2list(ns_tab)}})
+    end.
+
+match(Msg,Expect) ->
+    ?dbg("Match: ~p~n",[Msg]),
+    {ok,ok,<<>>} = xmerl_sax_parser:stream(Msg,[{event_fun,fun event/3},
+						{event_state,Expect}]).
+
+event(Event,_Loc,Expect) ->
+    ?dbg_event(Event,Expect),
+    event(Event,Expect).
+
+event(startDocument,Expect) -> match(Expect);
+event({startElement,_,Name,_,Attrs},[{se,Name}|Match]) ->
+    msg_id(Name,Attrs),
+    Match;
+event({startElement,_,Name,_,Attrs},[ignore,{se,Name}|Match]) ->
+    msg_id(Name,Attrs),
+    Match;
+event({startElement,_,Name,_,Attrs},[{se,Name,As}|Match]) ->
+    msg_id(Name,Attrs),
+    match_attrs(Name,As,Attrs),
+    Match;
+event({startElement,_,Name,_,Attrs},[ignore,{se,Name,As}|Match]) ->
+    msg_id(Name,Attrs),
+    match_attrs(Name,As,Attrs),
+    Match;
+event({startPrefixMapping,_,Ns},[{ns,Ns}|Match]) -> Match;
+event({startPrefixMapping,_,Ns},[ignore,{ns,Ns}|Match]) -> Match;
+event({endPrefixMapping,_},Match) -> Match;
+event({endElement,_,Name,_},[{ee,Name}|Match]) -> Match;
+event({endElement,_,Name,_},[ignore,{ee,Name}|Match]) -> Match;
+event(endDocument,Match) when Match==[]; Match==[ignore] -> ok;
+event(_,[ignore|_]=Match) -> Match;
+event(Event,Match) -> throw({nomatch,{Event,Match}}).
+
+msg_id("rpc",Attrs) ->
+    case lists:keyfind("message-id",3,Attrs) of
+	{_,_,_,Str} -> put(msg_id,Str);
+	false -> erase(msg_id)
+    end;
+msg_id(_,_) ->
+    ok.
+
+match_attrs(Name,[{Key,Value}|As],Attrs) ->
+    case lists:keyfind(atom_to_list(Key),3,Attrs) of
+	{_,_,_,Value} -> match_attrs(Name,As,Attrs);
+	false -> throw({missing_attr,Key,Name,Attrs});
+	_ -> throw({faulty_attr_value,Key,Name,Attrs})
+    end;
+match_attrs(_,[],_) ->
+    ok.
+
+do(ConnRef, close) ->
+    ets:match_delete(ns_tab,{{session,'_'},ConnRef}),
+    put(stop,true);
+do(_ConnRef, {kill,SessionId}) ->
+    case lookup({session,SessionId}) of
+	[{_,Owner}] ->
+	    ets:delete(ns_tab,{session,SessionId}),
+	    kill(Owner);
+	_ ->
+	    exit({no_session_to_kill,SessionId})
+    end;
+do(_, undefined) ->
+    ok.
+
+reply(_,undefined) ->
+    ?dbg("no reply~n",[]),
+    ok;
+reply(ConnRef,Reply) ->
+    ?dbg("Reply: ~p~n",[Reply]),
+    send(ConnRef, make_msg(Reply)).
+
+from_simple(Simple) ->
+    list_to_binary(xmerl:export_simple_element(Simple,xmerl_xml)).
+
+xml(Content) ->
+    <<"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
+      Content/binary,"\n",?END_TAG/binary>>.
+
+rpc_reply(Content) when is_binary(Content) ->
+    MsgId = case erase(msg_id) of
+		undefined -> <<>>;
+		Id -> list_to_binary([" message-id=\"",Id,"\""])
+	    end,
+    <<"<rpc-reply xmlns=\"",?NETCONF_NAMESPACE,"\"",MsgId/binary,">\n",
+      Content/binary,"\n</rpc-reply>">>;
+rpc_reply(Content) ->
+    rpc_reply(list_to_binary(Content)).
+
+session_id(no_session_id) ->
+    <<>>;
+session_id(SessionId0) ->
+    SessionId = list_to_binary(integer_to_list(SessionId0)),
+    <<"<session-id>",SessionId/binary,"</session-id>\n">>.
+
+capabilities(undefined) ->
+    CapsXml = list_to_binary([["<capability>",C,"</capability>\n"]
+			      || C <- ?CAPABILITIES]),
+    <<"<capabilities>\n",CapsXml/binary,"</capabilities>\n">>;
+capabilities({base,Vsn}) ->
+    CapsXml = list_to_binary([["<capability>",C,"</capability>\n"]
+			      || C <- ?CAPABILITIES_VSN(Vsn)]),
+    <<"<capabilities>\n",CapsXml/binary,"</capabilities>\n">>;
+capabilities(no_base) ->
+    [_|Caps] = ?CAPABILITIES,
+    CapsXml = list_to_binary([["<capability>",C,"</capability>\n"] || C <- Caps]),
+    <<"<capabilities>\n",CapsXml/binary,"</capabilities>\n">>;
+capabilities(no_caps) ->
+    <<>>.
+
+%%%-----------------------------------------------------------------
+%%% Match received netconf message from the client.  Add a new clause
+%%% for each new message to recognize. The clause argument shall match
+%%% the Expect argument in expect/1, expect_reply/2 or
+%%% expect_do_reply/3.
+%%%
+%%% match(term()) -> [Match].
+%%% Match = ignore | {se,Name} | {se,Name,Attrs} | {ee,Name} | {ns,Namespace}
+%%% Name = string()
+%%% Attrs = [{atom(),string()}]
+%%% Namespace = string()
+%%%
+%%% 'se' means start element, 'ee' means end element - i.e. to match
+%%% an XML element you need one 'se' entry and one 'ee' entry with the
+%%% same name in the match list.
+match(hello) ->
+    [ignore,{se,"hello"},ignore,{ee,"hello"},ignore];
+match('close-session') ->
+    [ignore,{se,"rpc"},{se,"close-session"},
+     {ee,"close-session"},{ee,"rpc"},ignore];
+match('edit-config') ->
+    [ignore,{se,"rpc"},{se,"edit-config"},{se,"target"},ignore,{ee,"target"},
+     {se,"config"},ignore,{ee,"config"},{ee,"edit-config"},{ee,"rpc"},ignore];
+match('get') ->
+    match({get,subtree});
+match({'get',FilterType}) ->
+    [ignore,{se,"rpc"},{se,"get"},{se,"filter",[{type,atom_to_list(FilterType)}]},
+     ignore,{ee,"filter"},{ee,"get"},{ee,"rpc"},ignore];
+match('get-config') ->
+    match({'get-config',subtree});
+match({'get-config',FilterType}) ->
+    [ignore,{se,"rpc"},{se,"get-config"},{se,"source"},ignore,{ee,"source"},
+     {se,"filter",[{type,atom_to_list(FilterType)}]},ignore,{ee,"filter"},
+     {ee,"get-config"},{ee,"rpc"},ignore];
+match('copy-config') ->
+    [ignore,{se,"rpc"},{se,"copy-config"},{se,"target"},ignore,{ee,"target"},
+     {se,"source"},ignore,{ee,"source"},{ee,"copy-config"},{ee,"rpc"},ignore];
+match('delete-config') ->
+    [ignore,{se,"rpc"},{se,"delete-config"},{se,"target"},ignore,{ee,"target"},
+     {ee,"delete-config"},{ee,"rpc"},ignore];
+match('lock') ->
+    [ignore,{se,"rpc"},{se,"lock"},{se,"target"},ignore,{ee,"target"},
+     {ee,"lock"},{ee,"rpc"},ignore];
+match('unlock') ->
+    [ignore,{se,"rpc"},{se,"unlock"},{se,"target"},ignore,{ee,"target"},
+     {ee,"unlock"},{ee,"rpc"},ignore];
+match('kill-session') ->
+    [ignore,{se,"rpc"},{se,"kill-session"},{se,"session-id"},ignore,
+     {ee,"session-id"},{ee,"kill-session"},{ee,"rpc"},ignore];
+match(action) ->
+    [ignore,{se,"rpc"},{ns,?ACTION_NAMESPACE},{se,"action"},{se,"data"},ignore,
+     {ee,"data"},{ee,"action"},{ee,"rpc"},ignore];
+match({'create-subscription',Content}) ->
+    [ignore,{se,"rpc"},{ns,?NETCONF_NOTIF_NAMESPACE},
+     {se,"create-subscription"}] ++
+	lists:flatmap(fun(X) ->
+			      [{se,atom_to_list(X)},ignore,{ee,atom_to_list(X)}]
+		      end, Content) ++
+	[{ee,"create-subscription"},{ee,"rpc"},ignore];
+match(any) ->
+    [ignore].
+
+
+
+%%%-----------------------------------------------------------------
+%%% Make message to send to the client.
+%%% Add a new clause for each new message that shall be sent. The
+%%% clause shall match the Reply argument in expect_reply/2 or
+%%% expect_do_reply/3.
+make_msg({hello,SessionId,Stuff}) ->
+    SessionIdXml = session_id(SessionId),
+    CapsXml = capabilities(Stuff),
+    xml(<<"<hello xmlns=\"",?NETCONF_NAMESPACE,"\">\n",CapsXml/binary,
+	  SessionIdXml/binary,"</hello>">>);
+make_msg(ok) ->
+    xml(rpc_reply("<ok/>"));
+make_msg({data,Data}) ->
+    xml(rpc_reply(from_simple({data,Data})));
+make_msg(event) ->
+    xml(<<"<notification xmlns=\"",?NETCONF_NOTIF_NAMESPACE,"\">"
+	  "<eventTime>2012-06-14T14:50:54+02:00</eventTime>"
+	  "<event xmlns=\"http://my.namespaces.com/event\">"
+	  "<severity>major</severity>"
+	  "<description>Something terrible happened</description>"
+	  "</event>"
+	  "</notification>">>);
+make_msg(Xml) when is_binary(Xml) ->
+    xml(Xml);
+make_msg(Simple) when is_tuple(Simple) ->
+    xml(from_simple(Simple)).
diff --git a/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl b/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl
index 423cb2999b..7704a29768 100644
--- a/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl
+++ b/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl
@@ -1,11 +1,21 @@
-%%%-------------------------------------------------------------------
-%%% @author Peter Andersson <[email protected]>
-%%% @copyright (C) 2012, Peter Andersson
-%%% @doc
-%%%
-%%% @end
-%%% Created : 23 Jan 2012 by Peter Andersson <[email protected]>
-%%%-------------------------------------------------------------------
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
 -module(priv_dir_SUITE).
 
 -compile(export_all).
diff --git a/lib/common_test/test/ct_shell_SUITE.erl b/lib/common_test/test/ct_shell_SUITE.erl
new file mode 100644
index 0000000000..4b8c43d800
--- /dev/null
+++ b/lib/common_test/test/ct_shell_SUITE.erl
@@ -0,0 +1,133 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_shell_SUITE
+%%%
+%%% Description:
+%%% Test that the interactive mode starts properly
+%%%
+%%% The suites used for the test are located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_shell_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [start_interactive].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+start_interactive(Config) ->
+    DataDir = ?config(data_dir, Config),
+    CfgFile = filename:join(DataDir, "cfgdata"),
+
+    {Opts,ERPid} = setup([{interactive_mode,true},{config,CfgFile}],
+			 Config),
+    CTNode = proplists:get_value(ct_node, Config),
+    Level = proplists:get_value(trace_level, Config),
+    test_server:format(Level, "Saving start opts on ~p: ~p~n",
+		       [CTNode, Opts]),
+    rpc:call(CTNode, application, set_env,
+	     [common_test, run_test_start_opts, Opts]),
+    test_server:format(Level, "Calling ct_run:script_start() on ~p~n",
+		       [CTNode]),
+
+    interactive_mode = rpc:call(CTNode, ct_run, script_start, []),
+
+    ok = rpc:call(CTNode, ct, require, [key1]),
+    value1 = rpc:call(CTNode, ct, get_config, [key1]),
+    ok = rpc:call(CTNode, ct, require, [x,key2]),
+    value2 = rpc:call(CTNode, ct, get_config, [x]),
+
+    ok = rpc:call(CTNode, ct, stop_interactive, []),
+
+    case rpc:call(CTNode, erlang, whereis, [ct_util_server]) of
+	undefined ->
+	    ok;
+	_ ->
+	    test_server:format(Level,
+			       "ct_util_server not stopped on ~p yet, waiting 5 s...~n",
+			       [CTNode]),
+	    timer:sleep(5000),
+	    undefined = rpc:call(CTNode, erlang, whereis, [ct_util_server])
+    end,
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(start_interactive,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+    TestEvents = test_events(start_interactive),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+
+test_events(start_interactive) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
diff --git a/lib/common_test/test/ct_shell_SUITE_data/cfgdata b/lib/common_test/test/ct_shell_SUITE_data/cfgdata
new file mode 100644
index 0000000000..23a40ad21a
--- /dev/null
+++ b/lib/common_test/test/ct_shell_SUITE_data/cfgdata
@@ -0,0 +1,2 @@
+{key1,value1}.
+{key2,value2}.
diff --git a/lib/common_test/test/ct_snmp_SUITE.erl b/lib/common_test/test/ct_snmp_SUITE.erl
new file mode 100644
index 0000000000..f8b4543770
--- /dev/null
+++ b/lib/common_test/test/ct_snmp_SUITE.erl
@@ -0,0 +1,141 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_snmp_SUITE
+%%%
+%%% Description:
+%%% Test ct_snmp module
+%%%
+%%%-------------------------------------------------------------------
+-module(ct_snmp_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [
+     default
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+default(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "snmp_SUITE"),
+    CfgFile = filename:join(DataDir, "snmp.cfg"),
+    {Opts,ERPid} = setup([{suite,Suite},{config,CfgFile},
+			  {label,default}], Config),
+
+    ok = execute(default, Opts, ERPid, Config).
+
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+execute(Name, Opts, ERPid, Config) ->
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(Name,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(Name,Config),
+    ct_test_support:verify_events(TestEvents, Events, Config).
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+events_to_check(_TestName,Config) ->
+    {module,_} = code:load_abs(filename:join(?config(data_dir,Config),
+					     snmp_SUITE)),
+    TCs = get_tcs(),
+    code:purge(snmp_SUITE),
+    code:delete(snmp_SUITE),
+
+    OneTest =
+	[{?eh,start_logging,{'DEF','RUNDIR'}}] ++
+	[{?eh,tc_done,{snmp_SUITE,TC,ok}} || TC <- TCs] ++
+	[{?eh,stop_logging,[]}],
+
+    %% 2 tests (ct:run_test + script_start) is default
+    OneTest ++ OneTest.
+
+
+get_tcs() ->
+    All = snmp_SUITE:all(),
+    Groups =
+	try snmp_SUITE:groups()
+	catch error:undef -> []
+	end,
+    flatten_tcs(All,Groups).
+
+flatten_tcs([H|T],Groups) when is_atom(H) ->
+    [H|flatten_tcs(T,Groups)];
+flatten_tcs([{group,Group}|T],Groups) ->
+    TCs = proplists:get_value(Group,Groups),
+    flatten_tcs(TCs ++ T,Groups);
+flatten_tcs([],_) ->
+    [].
diff --git a/lib/common_test/test/ct_snmp_SUITE_data/snmp.cfg b/lib/common_test/test/ct_snmp_SUITE_data/snmp.cfg
new file mode 100644
index 0000000000..895e097de6
--- /dev/null
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp.cfg
@@ -0,0 +1,44 @@
+%% -*- erlang -*-
+{snmp1, [{start_agent,true},
+	 {users,[{user_name,[snmpm_user_default,[]]}]},
+	 {managed_agents,[{agent_name, [user_name, {127,0,0,1}, 4000,
+					[{engine_id,"ct_snmp-test-engine"},
+					 {version,v2}]]}]},
+	 {engine_id,"ct_snmp-test-engine"},
+	 {agent_vsns,[v2]}
+	]}.
+{snmp2, [{start_agent,true},
+	 {engine_id,"ct_snmp-test-engine"}
+	]}.
+{snmp3, [{start_agent,true},
+	 {engine_id,"ct_snmp-test-engine"},
+	 {agent_vsns,[v1,v2,v3]},
+	 {agent_contexts,{data_dir_file,"context.conf"}},
+	 {agent_usm,{data_dir_file,"usm.conf"}},
+	 {agent_community,{data_dir_file,"community.conf"}},
+	 {agent_notify_def,{data_dir_file,"notify.conf"}},
+	 {agent_sysinfo,{data_dir_file,"standard.conf"}},
+	 {agent_target_address_def,{data_dir_file,"target_addr.conf"}},
+	 {agent_target_param_def,{data_dir_file,"target_params.conf"}},
+	 {agent_vacm,{data_dir_file,"vacm.conf"}}]}.
+{snmp_app1,[{manager, [{config, [{verbosity, silence}]},
+		       {server,[{verbosity,silence}]},
+		       {net_if,[{verbosity,silence}]},
+		       {versions,[v2]}
+		      ]},
+	    {agent, [{config, [{verbosity, silence}]},
+		     {net_if,[{verbosity,silence}]},
+		     {mib_server,[{verbosity,silence}]},
+		     {local_db,[{verbosity,silence}]},
+		     {agent_verbosity,silence}
+		    ]}]}.
+{snmp_app2,[{manager, [{config, [{verbosity, silence}]},
+		       {server,[{verbosity,silence}]},
+		       {net_if,[{verbosity,silence}]}
+		      ]},
+	    {agent, [{config, [{verbosity, silence}]},
+		     {net_if,[{verbosity,silence}]},
+		     {mib_server,[{verbosity,silence}]},
+		     {local_db,[{verbosity,silence}]},
+		     {agent_verbosity,silence}
+		    ]}]}.
diff --git a/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE.erl b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE.erl
new file mode 100644
index 0000000000..16b2b5690c
--- /dev/null
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE.erl
@@ -0,0 +1,395 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%----------------------------------------------------------------------
+%% File: ct_snmp_SUITE.erl
+%%
+%% Description:
+%%    This file contains the test cases for the ct_snmp API.
+%%
+%% @author Support
+%% @doc Test  of SNMP support in common_test
+%% @end
+%%----------------------------------------------------------------------
+%%----------------------------------------------------------------------
+-module(snmp_SUITE).
+-include_lib("common_test/include/ct.hrl").
+-include_lib("snmp/include/STANDARD-MIB.hrl").
+-include_lib("snmp/include/SNMP-USER-BASED-SM-MIB.hrl").
+-include_lib("snmp/include/snmp_types.hrl").
+
+-compile(export_all).
+
+%% Default timetrap timeout (set in init_per_testcase).
+-define(default_timeout, ?t:minutes(1)).
+
+-define(AGENT_UDP, 4000).
+
+suite() ->
+    [
+     {require, snmp1, snmp1},
+     {require, snmp_app1, snmp_app1},
+     {require, snmp2, snmp2},
+     {require, snmp_app2, snmp_app2},
+     {require, snmp3, snmp3}
+    ].
+
+all() ->
+    [start_stop,
+     {group,get_set},
+     {group,register},
+     {group,override},
+     set_info].
+
+
+groups() ->
+    [{get_set,[get_values,
+	       get_next_values,
+	       set_values,
+	       load_mibs]},
+     {register,[register_users,
+		register_users_fail,
+		register_agents,
+		register_agents_fail,
+		register_usm_users,
+		register_usm_users_fail]},
+     {override,[override_usm,
+		override_standard,
+		override_context,
+		override_community,
+		override_notify,
+		override_target_addr,
+		override_target_params,
+		override_vacm]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    Config.
+
+init_per_group(get_set, Config) ->
+    ok = ct_snmp:start(Config,snmp1,snmp_app1),
+    Config;
+init_per_group(register, Config) ->
+    ok = ct_snmp:start(Config,snmp2,snmp_app2),
+    Config;
+init_per_group(_, Config) ->
+    ok = ct_snmp:start(Config,snmp3,snmp_app2),
+    Config.
+
+end_per_group(_Group, Config) ->
+    catch ct_snmp:stop(Config),
+    Config.
+
+init_per_testcase(_Case, Config) ->
+    Dog = test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(Case, Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+break(_Config) ->
+    test_server:break(""),
+    ok.
+
+start_stop(Config) ->
+    ok = ct_snmp:start(Config,snmp1,snmp_app1),
+    timer:sleep(1000),
+    {snmp,_,_} = lists:keyfind(snmp,1,application:which_applications()),
+    [_|_] = filelib:wildcard("*/*.conf",?config(priv_dir,Config)),
+
+    ok = ct_snmp:stop(Config),
+    timer:sleep(1000),
+    false = lists:keyfind(snmp,1,application:which_applications()),
+    [] = filelib:wildcard("*/*.conf",?config(priv_dir,Config)),
+    ok.
+
+get_values(_Config) ->
+    Oids1 = [?sysDescr_instance, ?sysName_instance],
+    {noError,_,V1} = ct_snmp:get_values(agent_name,Oids1,snmp1),
+    [#varbind{oid=?sysDescr_instance,value="Erlang SNMP agent"},
+     #varbind{oid=?sysName_instance,value="ct_test"}] = V1,
+    ok.
+
+get_next_values(_Config) ->
+    Oids2 = [?system],
+    {noError,_,V2} = ct_snmp:get_next_values(agent_name,Oids2,snmp1),
+    [#varbind{oid=?sysDescr_instance,value="Erlang SNMP agent"}] = V2,
+    ok.
+
+set_values(Config) ->
+    Oid3 = ?sysName_instance,
+    NewName = "ct_test changed by " ++ atom_to_list(?MODULE),
+    VarsAndVals = [{Oid3,s,NewName}],
+    {noError,_,_} =
+	ct_snmp:set_values(agent_name,VarsAndVals,snmp1,Config),
+
+    Oids4 = [?sysName_instance],
+    {noError,_,V4} = ct_snmp:get_values(agent_name,Oids4,snmp1),
+    [#varbind{oid=?sysName_instance,value=NewName}] = V4,
+
+    ok.
+
+load_mibs(_Config) ->
+    [{'SNMPv2-MIB',_}=SnmpV2Mib] = snmpa:which_mibs(),
+    Mib = filename:join([code:priv_dir(snmp),"mibs","SNMP-USER-BASED-SM-MIB"]),
+    ok = ct_snmp:load_mibs([Mib]),
+    TwoMibs = [_,_] = snmpa:which_mibs(),
+    [{'SNMP-USER-BASED-SM-MIB',_}] = lists:delete(SnmpV2Mib,TwoMibs),
+    ok = ct_snmp:unload_mibs([Mib]),
+    [{'SNMPv2-MIB',_}] = snmpa:which_mibs(),
+    ok.
+
+
+register_users(_Config) ->
+    [] = snmpm:which_users(),
+    ok = ct_snmp:register_users(snmp2,[{reg_user1,[snmpm_user_default,[]]}]),
+    [_] = snmpm:which_users(),
+    [_] = ct:get_config({snmp2,users}),
+    ok = ct_snmp:register_users(snmp2,[{reg_user2,[snmpm_user_default,[]]}]),
+    [_,_] = snmpm:which_users(),
+    [_,_] = ct:get_config({snmp2,users}),
+    ok = ct_snmp:register_users(snmp2,[{reg_user3,[snmpm_user_default,[]]}]),
+    [_,_,_] = snmpm:which_users(),
+    [_,_,_] = ct:get_config({snmp2,users}),
+    ok = ct_snmp:unregister_users(snmp2,[reg_user3]),
+    [_,_] = snmpm:which_users(),
+    [_,_] = ct:get_config({snmp2,users}),
+    ok = ct_snmp:unregister_users(snmp2),
+    [] = snmpm:which_users(),
+    [] = ct:get_config({snmp2,users}),
+    ok.
+register_users(cleanup,_Config) ->
+    ct_snmp:unregister_users(snmp2).
+
+register_users_fail(_Config) ->
+    [] = snmpm:which_users(),
+    {error,_} = ct_snmp:register_users(snmp2,[{reg_user3,[unknown_module,[]]}]),
+    [] = snmpm:which_users(),
+    ok.
+register_users_fail(cleanup,_Config) ->
+    ct_snmp:unregister_users(snmp2).
+
+register_agents(_Config) ->
+    {ok, HostName} = inet:gethostname(),
+    {ok, Addr} = inet:getaddr(HostName, inet),
+
+    [] = snmpm:which_agents(),
+    ok = ct_snmp:register_users(snmp2,[{reg_user1,[snmpm_user_default,[]]}]),
+    ok = ct_snmp:register_agents(snmp2,[{reg_agent1,
+					 [reg_user1,Addr,?AGENT_UDP,[]]}]),
+    [_] = snmpm:which_agents(),
+    [_] = ct:get_config({snmp2,managed_agents}),
+    ok = ct_snmp:register_agents(snmp2,[{reg_agent2,
+					 [reg_user1,Addr,?AGENT_UDP,[]]}]),
+    [_,_] = snmpm:which_agents(),
+    [_,_] = ct:get_config({snmp2,managed_agents}),
+
+    ok = ct_snmp:register_agents(snmp2,[{reg_agent3,
+					 [reg_user1,Addr,?AGENT_UDP,[]]}]),
+    [_,_,_] = snmpm:which_agents(),
+    [_,_,_] = ct:get_config({snmp2,managed_agents}),
+
+    ok = ct_snmp:unregister_agents(snmp2,[reg_agent3]),
+    [_,_] = snmpm:which_agents(),
+    [_,_] = ct:get_config({snmp2,managed_agents}),
+
+    ok = ct_snmp:unregister_agents(snmp2),
+    ok = ct_snmp:unregister_users(snmp2),
+    [] = snmpm:which_agents(),
+    [] = ct:get_config({snmp2,managed_agents}),
+    ok.
+register_agents(cleanup,_Config) ->
+    ct_snmp:unregister_agents(snmp2),
+    ct_snmp:unregister_users(snmp2).
+
+register_agents_fail(_Config) ->
+    {ok, HostName} = inet:gethostname(),
+    {ok, Addr} = inet:getaddr(HostName, inet),
+
+    [] = snmpm:which_agents(),
+    {error,_}
+	= ct_snmp:register_agents(snmp2,[{reg_agent3,
+					  [unknown_user,Addr,?AGENT_UDP,[]]}]),
+    [] = snmpm:which_agents(),
+    ok.
+register_agents_fail(cleanup,_Config) ->
+    ct_snmp:unregister_agents(snmp2).
+
+register_usm_users(_Config) ->
+    [] = snmpm:which_usm_users(),
+    ok = ct_snmp:register_usm_users(snmp2,[{"reg_usm_user1",[]}]),
+    [_] = snmpm:which_usm_users(),
+    [_] = ct:get_config({snmp2,usm_users}),
+    ok = ct_snmp:register_usm_users(snmp2,[{"reg_usm_user2",[]}]),
+    [_,_] = snmpm:which_usm_users(),
+    [_,_] = ct:get_config({snmp2,usm_users}),
+    ok = ct_snmp:register_usm_users(snmp2,[{"reg_usm_user3",[]}]),
+    [_,_,_] = snmpm:which_usm_users(),
+    [_,_,_] = ct:get_config({snmp2,usm_users}),
+    ok = ct_snmp:unregister_usm_users(snmp2,["reg_usm_user3"]),
+    [_,_] = snmpm:which_usm_users(),
+    [_,_] = ct:get_config({snmp2,usm_users}),
+    ok = ct_snmp:unregister_usm_users(snmp2),
+    [] = snmpm:which_usm_users(),
+    [] = ct:get_config({snmp2,usm_users}),
+    ok.
+register_usm_users(cleanup,_Config) ->
+    ct_snmp:unregister_usm_users(snmp2).
+
+register_usm_users_fail(_Config) ->
+    [] = snmpm:which_usm_users(),
+    {error,_}
+	= ct_snmp:register_usm_users(snmp2,[{"reg_usm_user3",
+					     [{sec_name,invalid_data_type}]}]),
+    [] = snmpm:which_usm_users(),
+    ok.
+register_usm_users_fail(cleanup,_Config) ->
+    ct_snmp:unregister_usm_users(snmp2).
+
+%% Test that functionality for overriding default configuration file
+%% works - i.e. that the files are written and that the configuration
+%% is actually used.
+%%
+%% Note that the config files used in this test case do not
+%% necessarily make up a reasonable configuration for the snmp
+%% application...
+override_usm(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    ConfDir = filename:join(PrivDir,"conf"),
+
+    Mib = filename:join([code:priv_dir(snmp),"mibs","SNMP-USER-BASED-SM-MIB"]),
+    ok = ct_snmp:load_mibs([Mib]),
+
+    %% Check that usm.conf is overwritten
+    {ok,MyUsm} = snmpa_conf:read_usm_config(DataDir),
+    {ok,UsedUsm} = snmpa_conf:read_usm_config(ConfDir),
+    true = (MyUsm == UsedUsm),
+
+    %% Check that the usm user is actually configured...
+    [{Index,"secname"}] =
+	snmp_user_based_sm_mib:usmUserTable(get_next,?usmUserEntry,[3]),
+    true = lists:suffix("usm_user_name",Index),
+    ok.
+
+override_standard(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    ConfDir = filename:join(PrivDir,"conf"),
+
+    %% Check that standard.conf is overwritten
+    {ok,MyStandard} = snmpa_conf:read_standard_config(DataDir),
+    {ok,UsedStandard} = snmpa_conf:read_standard_config(ConfDir),
+    true = (MyStandard == UsedStandard),
+
+    %% Check that the values from standard.conf is actually configured...
+    {value,"name for override test"} = snmp_standard_mib:sysName(get),
+    {value,"agent for ct_snmp override test"} = snmp_standard_mib:sysDescr(get),
+    ok.
+
+override_context(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    ConfDir = filename:join(PrivDir,"conf"),
+
+    %% Check that context.conf is overwritten
+    {ok,MyContext} = snmpa_conf:read_context_config(DataDir),
+    {ok,UsedContext} = snmpa_conf:read_context_config(ConfDir),
+    true = (MyContext == UsedContext),
+    ok.
+
+override_community(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    ConfDir = filename:join(PrivDir,"conf"),
+
+    %% Check that community.conf is overwritten
+    {ok,MyCommunity} = snmpa_conf:read_community_config(DataDir),
+    {ok,UsedCommunity} = snmpa_conf:read_community_config(ConfDir),
+    true = (MyCommunity == UsedCommunity),
+    ok.
+
+override_notify(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    ConfDir = filename:join(PrivDir,"conf"),
+
+    %% Check that notify.conf is overwritten
+    {ok,MyNotify} = snmpa_conf:read_notify_config(DataDir),
+    {ok,UsedNotify} = snmpa_conf:read_notify_config(ConfDir),
+    true = (MyNotify == UsedNotify),
+    ok.
+
+override_target_addr(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    ConfDir = filename:join(PrivDir,"conf"),
+
+    %% Check that target_addr.conf is overwritten
+    {ok,MyTargetAddr} = snmpa_conf:read_target_addr_config(DataDir),
+    {ok,UsedTargetAddr} = snmpa_conf:read_target_addr_config(ConfDir),
+    true = (MyTargetAddr == UsedTargetAddr),
+    ok.
+
+override_target_params(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    ConfDir = filename:join(PrivDir,"conf"),
+
+    %% Check that target_params.conf is overwritten
+    {ok,MyTargetParams} = snmpa_conf:read_target_params_config(DataDir),
+    {ok,UsedTargetParams} = snmpa_conf:read_target_params_config(ConfDir),
+    true = (MyTargetParams == UsedTargetParams),
+    ok.
+
+override_vacm(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    ConfDir = filename:join(PrivDir,"conf"),
+
+    %% Check that vacm.conf is overwritten
+    {ok,MyVacm} = snmpa_conf:read_vacm_config(DataDir),
+    {ok,UsedVacm} = snmpa_conf:read_vacm_config(ConfDir),
+    true = (MyVacm == UsedVacm),
+    ok.
+
+
+
+
+%% NOTE!! This test must always be executed last in the suite, and
+%% should match all set requests performed in the suite. I.e. if you
+%% add a set request, you must add an entry in the return value of
+%% ct_snmp:set_info/1 below.
+set_info(Config) ->
+    %% From test case set_values/1:
+    Oid1 = ?sysName_instance,
+    NewValue1 = "ct_test changed by " ++ atom_to_list(?MODULE),
+
+    %% The test...
+    [{_AgentName,_,[{Oid1,_,NewValue1}]}]
+      = ct_snmp:set_info(Config),
+    ok.
diff --git a/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/community.conf b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/community.conf
new file mode 100644
index 0000000000..5a64df6605
--- /dev/null
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/community.conf
@@ -0,0 +1 @@
+{"public", "public", "initial", "", ""}.
diff --git a/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/context.conf b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/context.conf
new file mode 100644
index 0000000000..feed5e1d11
--- /dev/null
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/context.conf
@@ -0,0 +1 @@
+"testcontext".
diff --git a/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/notify.conf b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/notify.conf
new file mode 100644
index 0000000000..367ba3aa4b
--- /dev/null
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/notify.conf
@@ -0,0 +1 @@
+{"standard inform", "std_inform", inform}.
diff --git a/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/standard.conf b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/standard.conf
new file mode 100644
index 0000000000..79908fb355
--- /dev/null
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/standard.conf
@@ -0,0 +1,7 @@
+{sysDescr, "agent for ct_snmp override test"}.
+{sysObjectID, [1,2,3]}.
+{sysContact, "[email protected]"}.
+{sysLocation, "erlang"}.
+{sysServices, 72}.
+{snmpEnableAuthenTraps, enabled}.
+{sysName, "name for override test"}.
diff --git a/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/target_addr.conf b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/target_addr.conf
new file mode 100644
index 0000000000..d02672a074
--- /dev/null
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/target_addr.conf
@@ -0,0 +1,2 @@
+{"target1", snmpUDPDomain, [147,214,122,73], 5000, 1500, 3, "std_trap", "target_v3", "", [], 2048}.
+{"target2", snmpUDPDomain, [147,214,122,73], 5000, 1500, 3, "std_inform", "target_v3", "", [], 2048}.
diff --git a/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/target_params.conf b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/target_params.conf
new file mode 100644
index 0000000000..5a9a619422
--- /dev/null
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/target_params.conf
@@ -0,0 +1 @@
+{"target_v3", v3, usm, "initial", noAuthNoPriv}.
diff --git a/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/usm.conf b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/usm.conf
new file mode 100644
index 0000000000..d6e245914e
--- /dev/null
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/usm.conf
@@ -0,0 +1 @@
+{"ct_snmp-test-engine","usm_user_name","secname",zeroDotZero,usmNoAuthProtocol,"","",usmNoPrivProtocol,"","","","",""}.
diff --git a/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/vacm.conf b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/vacm.conf
new file mode 100644
index 0000000000..158fe02e3b
--- /dev/null
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE_data/vacm.conf
@@ -0,0 +1,6 @@
+{vacmSecurityToGroup, usm, "initial", "initial"}.
+{vacmAccess, "initial", "", any, noAuthNoPriv, exact, "restricted", "", "restricted"}.
+{vacmAccess, "initial", "", usm, authNoPriv, exact, "internet", "internet", "internet"}.
+{vacmAccess, "initial", "", usm, authPriv, exact, "internet", "internet", "internet"}.
+{vacmViewTreeFamily, "restricted", [1,3,6,1], included, null}.
+{vacmViewTreeFamily, "internet", [1,3,6,1], included, null}.
diff --git a/lib/common_test/test/ct_system_error_SUITE.erl b/lib/common_test/test/ct_system_error_SUITE.erl
new file mode 100644
index 0000000000..f2d6ef4b1b
--- /dev/null
+++ b/lib/common_test/test/ct_system_error_SUITE.erl
@@ -0,0 +1,132 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_system_error_SUITE
+%%%
+%%% Description:
+%%%
+%%% Test that severe system errors (such as failure to write logs) are
+%%% noticed and handled.
+%%%-------------------------------------------------------------------
+-module(ct_system_error_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [
+     test_server_failing_logs
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+test_server_failing_logs(Config) ->
+    TC = test_server_failing_logs,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "a_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC}], Config),
+    crash_test_server(Config),
+    {error,{cannot_create_log_dir,__}} = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+    ct_test_support:log_events(TC,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(TC),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+crash_test_server(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Root = proplists:get_value(logdir, ct_test_support:get_opts(Config)),
+    [$@|Host] = lists:dropwhile(fun(C) ->
+					C =/= $@
+				end, atom_to_list(node())),
+    Format = filename:join(Root,
+			   "ct_run.ct@" ++ Host ++
+			       ".~4..0w-~2..0w-~2..0w_"
+			   "~2..0w.~2..0w.~2..0w"),
+    [C2,C1|_] = lists:reverse(filename:split(DataDir)),
+    LogDir = C1 ++ "." ++ C2 ++ ".a_SUITE.logs",
+    T = calendar:datetime_to_gregorian_seconds(calendar:local_time()),
+    [begin
+	 {{Y,Mon,D},{H,Min,S}} =
+	     calendar:gregorian_seconds_to_datetime(T+Offset),
+	 Dir0 = io_lib:format(Format, [Y,Mon,D,H,Min,S]),
+	 Dir = lists:flatten(Dir0),
+	 file:make_dir(Dir),
+	 File = filename:join(Dir, LogDir),
+	 file:write_file(File, "anything goes\n")
+     end || Offset <- lists:seq(0, 20)],
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+
+events_to_check(_Test) ->
+    [{?eh,severe_error,{cannot_create_log_dir,{'_','_'}}}].
diff --git a/lib/common_test/test/ct_system_error_SUITE_data/a_SUITE.erl b/lib/common_test/test/ct_system_error_SUITE_data/a_SUITE.erl
new file mode 100644
index 0000000000..c6e3ddfd5d
--- /dev/null
+++ b/lib/common_test/test/ct_system_error_SUITE_data/a_SUITE.erl
@@ -0,0 +1,122 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(a_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% @spec suite() -> Info
+%% Info = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,10}}].
+
+%%--------------------------------------------------------------------
+%% @spec init_per_suite(Config0) ->
+%%     Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1} | {fail,Reason}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%% @end
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+all() ->
+    [tc1].
+
+tc1(_C) ->
+    ok.
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 02246b5763..e5e2e68fcb 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -32,9 +32,11 @@
 	 run/2, run/3, run/4, get_opts/1, wait_for_ct_stop/1]).
 
 -export([handle_event/2, start_event_receiver/1, get_events/2,
-	 verify_events/3, reformat/2, log_events/4,
+	 verify_events/3, verify_events/4, reformat/2, log_events/4,
 	 join_abs_dirs/2]).
 
+-export([ct_test_halt/1]).
+
 -include_lib("kernel/include/file.hrl").
 
 %%%-----------------------------------------------------------------
@@ -115,7 +117,10 @@ end_per_suite(Config) ->
     CTNode = proplists:get_value(ct_node, Config),
     PrivDir = proplists:get_value(priv_dir, Config),
     true = rpc:call(CTNode, code, del_path, [filename:join(PrivDir,"")]),
-    cover:stop(CTNode),
+    case test_server:is_cover() of
+	true -> cover:flush(CTNode);
+	false -> ok
+    end,
     slave:stop(CTNode),
     ok.
 
@@ -147,7 +152,10 @@ end_per_testcase(_TestCase, Config) ->
     case wait_for_ct_stop(CTNode) of
 	%% Common test was not stopped to we restart node.
 	false ->
-	    cover:stop(CTNode),
+	    case test_server:is_cover() of
+		true -> cover:flush(CTNode);
+		false -> ok
+	    end,
 	    slave:stop(CTNode),
 	    start_slave(Config,proplists:get_value(trace_level,Config)),
 	    {fail, "Could not stop common_test"};
@@ -229,8 +237,9 @@ run(Opts, Config) when is_list(Opts) ->
     %% use ct interface
     test_server:format(Level, "~n[RUN #1] Calling ct:run_test(~p) on ~p~n",
 		       [Opts, CTNode]),
-    Result1 = rpc:call(CTNode, ct, run_test, [Opts]),
-
+    CtRunTestResult = rpc:call(CTNode, ct, run_test, [Opts]),
+    test_server:format(Level, "~n[RUN #1] Got return value ~p~n",
+		       [CtRunTestResult]),
     case rpc:call(CTNode, erlang, whereis, [ct_util_server]) of
 	undefined ->
 	    ok;
@@ -242,17 +251,36 @@ run(Opts, Config) when is_list(Opts) ->
 	    undefined = rpc:call(CTNode, erlang, whereis, [ct_util_server])
     end,
     %% use run_test interface (simulated)
-    test_server:format(Level, "Saving start opts on ~p: ~p~n", [CTNode,Opts]),
-    rpc:call(CTNode, application, set_env, [common_test, run_test_start_opts, Opts]),
-    test_server:format(Level, "[RUN #2] Calling ct_run:script_start() on ~p~n", [CTNode]),
-    Result2 = rpc:call(CTNode, ct_run, script_start, []),
-    case {Result1,Result2} of
-	{ok,ok} ->
+    Opts1 = [{halt_with,{?MODULE,ct_test_halt}} | Opts],
+    test_server:format(Level, "Saving start opts on ~p: ~p~n",
+		       [CTNode, Opts1]),
+    rpc:call(CTNode, application, set_env,
+	     [common_test, run_test_start_opts, Opts1]),
+    test_server:format(Level, "[RUN #2] Calling ct_run:script_start() on ~p~n",
+		       [CTNode]),
+    ExitStatus = rpc:call(CTNode, ct_run, script_start, []),
+    test_server:format(Level, "[RUN #2] Got exit status value ~p~n",
+		       [ExitStatus]),
+    case {CtRunTestResult,ExitStatus} of
+	{{_Ok,Failed,{_UserSkipped,_AutoSkipped}},1} when Failed > 0 ->
+	    ok;
+	{{_Ok,0,{_UserSkipped,AutoSkipped}},ExitStatus} when AutoSkipped > 0 ->
+	    case proplists:get_value(exit_status, Opts1) of
+		ignore_config when ExitStatus == 1 ->
+		    {error,{wrong_exit_status,ExitStatus}};
+		_ ->
+		    ok
+	    end;
+	{{error,_}=Error,ExitStatus} ->
+	    if ExitStatus /= 2 ->
+		    {error,{wrong_exit_status,ExitStatus}};
+	       ExitStatus == 2 ->
+		    Error
+	    end;
+	{{_Ok,0,{_UserSkipped,_AutoSkipped}},0} ->
 	    ok;
-	{E,_} when E =/= ok ->
-	    E;
-	{_,E} when E =/= ok ->
-	    E
+	Unexpected ->
+	    {error,{unexpected_return_value,Unexpected}}
     end.
 
 run(M, F, A, Config) ->
@@ -272,6 +300,10 @@ run({M,F,A}, InitCalls, Config) ->
 		       [M, F, A, CTNode]),
     rpc:call(CTNode, M, F, A).
 
+%% this is the last function that ct_run:script_start() calls, so the
+%% return value here is what rpc:call/4 above returns
+ct_test_halt(ExitStatus) ->
+    ExitStatus.	    
 
 %%%-----------------------------------------------------------------
 %%% wait_for_ct_stop/1
@@ -338,6 +370,14 @@ verify_events(TEvs, Evs, Config) ->
 	    ok
     end.
 
+verify_events(TEvs, Evs, Node, Config) ->
+    case catch verify_events1(TEvs, Evs, Node, Config) of
+	{'EXIT',Reason} ->
+	    Reason;
+	_ ->
+	    ok
+    end.
+
 verify_events1([TestEv|_], [{TEH,#event{name=stop_logging,node=Node,data=_}}|_], Node, _)
   when element(1,TestEv) == TEH, element(2,TestEv) =/= stop_logging ->
     test_server:format("Failed to find ~p in the list of events!~n", [TestEv]),
@@ -586,8 +626,11 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 				fun({EH,#event{name=tc_auto_skip,
 					       node=EvNode,
 					       data={Mod,end_per_group,Reason}}}) when
-				   EH == TEH, EvNode == Node, Mod == M, Reason == R ->
-					false;
+				   EH == TEH, EvNode == Node, Mod == M ->
+					case match_data(R, Reason) of
+					    match -> false;
+					    _ -> true
+					end;
 				   ({EH,#event{name=stop_logging,
 					       node=EvNode,data=_}}) when
 					  EH == TEH, EvNode == Node ->
@@ -601,23 +644,12 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 			      [_AutoSkip | RemEvs2] ->
 				  {Done,RemEvs2,length(RemEvs2)}
 			  end;
-		     %% match other event than test case
-		     (TEv={TEH,N,D}, Acc) when D == '_' ->
-			  case [E || E={EH,#event{name=Name,
-						  node=EvNode,
-						  data=_}} <- Evs1, 
-				     EH == TEH, EvNode == Node, Name == N] of
-			      [] ->
-				  exit({unmatched,TEv});
-			      _ ->
-				  test_server:format("Found ~p!", [TEv]),
-				  Acc
-			  end;
 		     (TEv={TEH,N,D}, Acc) ->
 			  case [E || E={EH,#event{name=Name,
 						  node=EvNode,
 						  data=Data}} <- Evs1, 
-				     EH == TEH, EvNode == Node, Name == N, Data == D] of
+				     EH == TEH, EvNode == Node, Name == N,
+				     match == match_data(D,Data)] of
 			      [] ->
 				  exit({unmatched,TEv});
 			      _ ->
@@ -976,33 +1008,39 @@ locate({TEH,Name,Data}, Node, [{TEH,#event{name=Name,
 					   data = EvData,
 					   node = Node}}|Evs],
        Config) ->
-    try match_data(Data, EvData) of
+    case match_data(Data, EvData) of
 	match ->
-	    {Config,Evs}
-    catch _:_ ->
+	    {Config,Evs};
+	_ ->
 	    nomatch
     end;
 
 locate({_TEH,_Name,_Data}, _Node, [_|_Evs], _Config) ->
     nomatch.
 
-match_data(D,D) ->
+match_data(Data, EvData) ->
+    try do_match_data(Data, EvData)
+    catch _:_ ->
+	    nomatch
+    end.
+
+do_match_data(D,D) ->
     match;
-match_data('_',_) ->
+do_match_data('_',_) ->
     match;
-match_data(Fun,Data) when is_function(Fun) ->
+do_match_data(Fun,Data) when is_function(Fun) ->
     Fun(Data);
-match_data('$proplist',Proplist) ->
-    match_data(
+do_match_data('$proplist',Proplist) ->
+    do_match_data(
       fun(List) ->
 	      lists:foreach(fun({_,_}) -> ok end,List)
       end,Proplist);
-match_data([H1|MatchT],[H2|ValT]) ->
-    match_data(H1,H2),
-    match_data(MatchT,ValT);
-match_data(Tuple1,Tuple2) when is_tuple(Tuple1),is_tuple(Tuple2) ->
-    match_data(tuple_to_list(Tuple1),tuple_to_list(Tuple2));
-match_data([],[]) ->
+do_match_data([H1|MatchT],[H2|ValT]) ->
+    do_match_data(H1,H2),
+    do_match_data(MatchT,ValT);
+do_match_data(Tuple1,Tuple2) when is_tuple(Tuple1),is_tuple(Tuple2) ->
+    do_match_data(tuple_to_list(Tuple1),tuple_to_list(Tuple2));
+do_match_data([],[]) ->
     match.
 
 result_match({SkipOrFail,{ErrorInd,{Why,'_'}}},
@@ -1017,6 +1055,9 @@ result_match({failed,{timetrap_timeout,{'$approx',Num}}},
        Value =< trunc(Num+0.02*Num) -> true;
        true -> false
     end;
+result_match({user_timetrap_error,{Why,'_'}},
+	     {user_timetrap_error,{Why,_Stack}}) ->
+    true;
 result_match(Result, Result) ->
     true;
 result_match(_, _) ->
diff --git a/lib/common_test/test/ct_testspec_1_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE.erl
index b6dcf63fdf..6a4a4acd80 100644
--- a/lib/common_test/test/ct_testspec_1_SUITE.erl
+++ b/lib/common_test/test/ct_testspec_1_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -58,7 +58,7 @@ end_per_testcase(TestCase, Config) ->
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
+all() ->
     [all_suites, skip_all_suites, suite, skip_suite,
      all_testcases, skip_all_testcases, testcase,
      skip_testcase, all_groups, skip_all_groups, group,
@@ -67,23 +67,23 @@ all() ->
      skip_group_testcase, topgroup, subgroup, skip_subgroup,
      subgroup_all_testcases, skip_subgroup_all_testcases,
      subgroup_testcase, skip_subgroup_testcase,
-     sub_skipped_by_top, testcase_in_multiple_groups,
-     order_of_tests_in_multiple_dirs_no_merge_tests,
-     order_of_tests_in_multiple_suites_no_merge_tests,
-     order_of_suites_in_multiple_dirs_no_merge_tests,
-     order_of_groups_in_multiple_dirs_no_merge_tests,
-     order_of_groups_in_multiple_suites_no_merge_tests,
-     order_of_tests_in_multiple_dirs,
-     order_of_tests_in_multiple_suites,
-     order_of_suites_in_multiple_dirs,
-     order_of_groups_in_multiple_dirs,
-     order_of_groups_in_multiple_suites,
-     order_of_tests_in_multiple_suites_with_skip_no_merge_tests,
-     order_of_tests_in_multiple_suites_with_skip,
+     sub_skipped_by_top, testcase_many_groups,
+     order_of_tests_many_dirs_no_merge_tests,
+     order_of_tests_many_suites_no_merge_tests,
+     order_of_suites_many_dirs_no_merge_tests,
+     order_of_groups_many_dirs_no_merge_tests,
+     order_of_groups_many_suites_no_merge_tests,
+     order_of_tests_many_dirs,
+     order_of_tests_many_suites,
+     order_of_suites_many_dirs,
+     order_of_groups_many_dirs,
+     order_of_groups_many_suites,
+     order_of_tests_many_suites_with_skip_no_merge_tests,
+     order_of_tests_many_suites_with_skip,
      all_plus_one_tc_no_merge_tests,
      all_plus_one_tc].
 
-groups() -> 
+groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
@@ -373,19 +373,19 @@ sub_skipped_by_top(Config) when is_list(Config) ->
 %%%-----------------------------------------------------------------
 %%%
 
-testcase_in_multiple_groups(Config) when is_list(Config) ->
+testcase_many_groups(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
     TestDir = filename:join(DataDir, "groups_1"),
     TestSpec = [{cases,TestDir,groups_12_SUITE,[testcase_1a,testcase_1b]},
 		{skip_cases,TestDir,groups_12_SUITE,[testcase_1b],"SKIPPED!"}],
 
-    setup_and_execute(testcase_in_multiple_groups, TestSpec, Config).
+    setup_and_execute(testcase_many_groups, TestSpec, Config).
 
 %%%-----------------------------------------------------------------
 %%%
 
-order_of_tests_in_multiple_dirs_no_merge_tests(Config) when is_list(Config) ->
+order_of_tests_many_dirs_no_merge_tests(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
     TestDir1 = filename:join(DataDir, "groups_1"),
@@ -395,13 +395,13 @@ order_of_tests_in_multiple_dirs_no_merge_tests(Config) when is_list(Config) ->
 		{cases,TestDir2,groups_22_SUITE,[testcase_1]},
 		{cases,TestDir1,groups_12_SUITE,[testcase_1b]}],
 
-    setup_and_execute(order_of_tests_in_multiple_dirs_no_merge_tests, 
+    setup_and_execute(order_of_tests_many_dirs_no_merge_tests, 
 		      TestSpec, Config).
 
 %%%-----------------------------------------------------------------
 %%%
 
-order_of_tests_in_multiple_suites_no_merge_tests(Config) when is_list(Config) ->
+order_of_tests_many_suites_no_merge_tests(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
     TestDir1 = filename:join(DataDir, "groups_1"),
@@ -410,13 +410,13 @@ order_of_tests_in_multiple_suites_no_merge_tests(Config) when is_list(Config) ->
 		{cases,TestDir1,groups_11_SUITE,[testcase_1]},
 		{cases,TestDir1,groups_12_SUITE,[testcase_1b]}],
 
-    setup_and_execute(order_of_tests_in_multiple_suites_no_merge_tests, 
+    setup_and_execute(order_of_tests_many_suites_no_merge_tests, 
 		      TestSpec, Config).
 
 %%%-----------------------------------------------------------------
 %%%
 
-order_of_suites_in_multiple_dirs_no_merge_tests(Config) when is_list(Config) ->
+order_of_suites_many_dirs_no_merge_tests(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
     TestDir1 = filename:join(DataDir, "groups_1"),
@@ -426,13 +426,13 @@ order_of_suites_in_multiple_dirs_no_merge_tests(Config) when is_list(Config) ->
 		{suites,TestDir2,groups_22_SUITE},
 		{suites,TestDir1,groups_11_SUITE}],
 
-    setup_and_execute(order_of_suites_in_multiple_dirs_no_merge_tests, 
+    setup_and_execute(order_of_suites_many_dirs_no_merge_tests, 
 		      TestSpec, Config).
 
 %%%-----------------------------------------------------------------
 %%%
 
-order_of_groups_in_multiple_dirs_no_merge_tests(Config) when is_list(Config) ->
+order_of_groups_many_dirs_no_merge_tests(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
     TestDir1 = filename:join(DataDir, "groups_1"),
@@ -442,13 +442,13 @@ order_of_groups_in_multiple_dirs_no_merge_tests(Config) when is_list(Config) ->
 		{groups,TestDir2,groups_22_SUITE,test_group_1a},
 		{groups,TestDir1,groups_12_SUITE,test_group_1b}],
 
-    setup_and_execute(order_of_groups_in_multiple_dirs_no_merge_tests, 
+    setup_and_execute(order_of_groups_many_dirs_no_merge_tests, 
 		      TestSpec, Config).
 
 %%%-----------------------------------------------------------------
 %%%
 
-order_of_groups_in_multiple_suites_no_merge_tests(Config) 
+order_of_groups_many_suites_no_merge_tests(Config) 
   when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
@@ -458,13 +458,13 @@ order_of_groups_in_multiple_suites_no_merge_tests(Config)
 		{groups,TestDir1,groups_11_SUITE,test_group_1a},
 		{groups,TestDir1,groups_12_SUITE,test_group_1b}],
 
-    setup_and_execute(order_of_groups_in_multiple_suites_no_merge_tests, 
+    setup_and_execute(order_of_groups_many_suites_no_merge_tests, 
 		      TestSpec, Config).
 
 %%%-----------------------------------------------------------------
 %%%
 
-order_of_tests_in_multiple_suites_with_skip_no_merge_tests(Config) 
+order_of_tests_many_suites_with_skip_no_merge_tests(Config) 
   when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
@@ -477,14 +477,14 @@ order_of_tests_in_multiple_suites_with_skip_no_merge_tests(Config)
 		{skip_cases,TestDir1,groups_12_SUITE,[testcase_1b],"Skip it"}],
 
     setup_and_execute(
-      order_of_tests_in_multiple_suites_with_skip_no_merge_tests,
+      order_of_tests_many_suites_with_skip_no_merge_tests,
       TestSpec, Config).
      
 
 %%%-----------------------------------------------------------------
 %%%
 
-order_of_tests_in_multiple_dirs(Config) when is_list(Config) ->
+order_of_tests_many_dirs(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
     TestDir1 = filename:join(DataDir, "groups_1"),
@@ -493,13 +493,13 @@ order_of_tests_in_multiple_dirs(Config) when is_list(Config) ->
 		{cases,TestDir2,groups_22_SUITE,[testcase_1]},
 		{cases,TestDir1,groups_12_SUITE,[testcase_1b]}],
 
-    setup_and_execute(order_of_tests_in_multiple_dirs, 
+    setup_and_execute(order_of_tests_many_dirs, 
 		      TestSpec, Config).
 
 %%%-----------------------------------------------------------------
 %%%
 
-order_of_tests_in_multiple_suites(Config) when is_list(Config) ->
+order_of_tests_many_suites(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
     TestDir1 = filename:join(DataDir, "groups_1"),
@@ -507,13 +507,13 @@ order_of_tests_in_multiple_suites(Config) when is_list(Config) ->
 		{cases,TestDir1,groups_11_SUITE,[testcase_1]},
 		{cases,TestDir1,groups_12_SUITE,[testcase_1b]}],
 
-    setup_and_execute(order_of_tests_in_multiple_suites, 
+    setup_and_execute(order_of_tests_many_suites, 
 		      TestSpec, Config).
 
 %%%-----------------------------------------------------------------
 %%%
 
-order_of_suites_in_multiple_dirs(Config) when is_list(Config) ->
+order_of_suites_many_dirs(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
     TestDir1 = filename:join(DataDir, "groups_1"),
@@ -522,13 +522,13 @@ order_of_suites_in_multiple_dirs(Config) when is_list(Config) ->
 		{suites,TestDir2,groups_22_SUITE},
 		{suites,TestDir1,groups_11_SUITE}],
 
-    setup_and_execute(order_of_suites_in_multiple_dirs, 
+    setup_and_execute(order_of_suites_many_dirs, 
 		      TestSpec, Config).
 
 %%%-----------------------------------------------------------------
 %%%
 
-order_of_groups_in_multiple_dirs(Config) when is_list(Config) ->
+order_of_groups_many_dirs(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
     TestDir1 = filename:join(DataDir, "groups_1"),
@@ -537,13 +537,13 @@ order_of_groups_in_multiple_dirs(Config) when is_list(Config) ->
 		{groups,TestDir2,groups_22_SUITE,test_group_1a},
 		{groups,TestDir1,groups_12_SUITE,test_group_1b}],
 
-    setup_and_execute(order_of_groups_in_multiple_dirs, 
+    setup_and_execute(order_of_groups_many_dirs, 
 		      TestSpec, Config).
 
 %%%-----------------------------------------------------------------
 %%%
 
-order_of_groups_in_multiple_suites(Config) when is_list(Config) ->
+order_of_groups_many_suites(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
     TestDir1 = filename:join(DataDir, "groups_1"),
@@ -551,13 +551,13 @@ order_of_groups_in_multiple_suites(Config) when is_list(Config) ->
 		{groups,TestDir1,groups_11_SUITE,test_group_1a},
 		{groups,TestDir1,groups_12_SUITE,test_group_1b}],
 
-    setup_and_execute(order_of_groups_in_multiple_suites, 
+    setup_and_execute(order_of_groups_many_suites, 
 		      TestSpec, Config).
 
 %%%-----------------------------------------------------------------
 %%%
 
-order_of_tests_in_multiple_suites_with_skip(Config) when is_list(Config) ->
+order_of_tests_many_suites_with_skip(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
 
     TestDir1 = filename:join(DataDir, "groups_1"),
@@ -567,7 +567,7 @@ order_of_tests_in_multiple_suites_with_skip(Config) when is_list(Config) ->
 		{cases,TestDir1,groups_11_SUITE,[testcase_2]},
 		{skip_cases,TestDir1,groups_12_SUITE,[testcase_1b],"Skip it!"}],
 
-    setup_and_execute(order_of_tests_in_multiple_suites_with_skip, 
+    setup_and_execute(order_of_tests_many_suites_with_skip, 
 		      TestSpec, Config).
 
 %%%-----------------------------------------------------------------
@@ -621,7 +621,9 @@ setup_and_execute(TCName, TestSpec, Config) ->
     ok = ct_test_support:run(Opts, Config),
     TestSpec1 = [{logdir,proplists:get_value(logdir,Opts)},
 		 {label,proplists:get_value(label,TestTerms)} | TestSpec],
-    ok = ct_test_support:run(ct, run_testspec, [TestSpec1], Config),
+    {_Ok,_Failed,{_USkipped,_ASkipped}} = 
+	ct_test_support:run(ct, run_testspec, [TestSpec1], Config),
+
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(TCName,
@@ -1202,10 +1204,10 @@ test_events(sub_skipped_by_top) ->
      {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
     ];
 
-test_events(testcase_in_multiple_groups) ->
+test_events(testcase_many_groups) ->
     [];
 
-test_events(order_of_tests_in_multiple_dirs_no_merge_tests) ->
+test_events(order_of_tests_many_dirs_no_merge_tests) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,tc_start,{groups_12_SUITE,testcase_1a}},
      {?eh,tc_done, {groups_12_SUITE,testcase_1a,
@@ -1217,7 +1219,7 @@ test_events(order_of_tests_in_multiple_dirs_no_merge_tests) ->
 		    {failed,{error,{test_case_failed,no_group_data}}}}},
      {?eh,stop_logging,[]}
     ];
-test_events(order_of_tests_in_multiple_suites_no_merge_tests) ->
+test_events(order_of_tests_many_suites_no_merge_tests) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,tc_start,{groups_12_SUITE,testcase_1a}},
      {?eh,tc_done,{groups_12_SUITE,testcase_1a,'_'}},
@@ -1227,7 +1229,7 @@ test_events(order_of_tests_in_multiple_suites_no_merge_tests) ->
      {?eh,tc_done,{groups_12_SUITE,testcase_1b,'_'}},
      {?eh,stop_logging,[]}
     ];
-test_events(order_of_suites_in_multiple_dirs_no_merge_tests) ->
+test_events(order_of_suites_many_dirs_no_merge_tests) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
      {?eh,tc_done,{groups_12_SUITE,init_per_suite,'_'}},
@@ -1242,7 +1244,7 @@ test_events(order_of_suites_in_multiple_dirs_no_merge_tests) ->
      {?eh,tc_start,{groups_11_SUITE,end_per_suite}},
      {?eh,tc_done,{groups_11_SUITE,end_per_suite,'_'}},
      {?eh,stop_logging,[]}];
-test_events(order_of_groups_in_multiple_dirs_no_merge_tests) ->
+test_events(order_of_groups_many_dirs_no_merge_tests) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      
      {?eh,tc_start, {groups_12_SUITE,{init_per_group,test_group_1a,'_'}}},
@@ -1255,7 +1257,7 @@ test_events(order_of_groups_in_multiple_dirs_no_merge_tests) ->
      {?eh,tc_done, {groups_12_SUITE,{end_per_group,test_group_1b,'_'},'_'}},
 
      {?eh,stop_logging,[]}];
-test_events(order_of_groups_in_multiple_suites_no_merge_tests) ->
+test_events(order_of_groups_many_suites_no_merge_tests) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      
      {?eh,tc_start, {groups_12_SUITE,{init_per_group,test_group_1a,'_'}}},
@@ -1268,7 +1270,7 @@ test_events(order_of_groups_in_multiple_suites_no_merge_tests) ->
      {?eh,tc_done, {groups_12_SUITE,{end_per_group,test_group_1b,'_'},'_'}},
 
      {?eh,stop_logging,[]}];
-test_events(order_of_tests_in_multiple_suites_with_skip_no_merge_tests) ->
+test_events(order_of_tests_many_suites_with_skip_no_merge_tests) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,tc_start,{groups_12_SUITE,testcase_1a}},
      {?eh,tc_done,{groups_12_SUITE,testcase_1a,'_'}},
@@ -1280,7 +1282,7 @@ test_events(order_of_tests_in_multiple_suites_with_skip_no_merge_tests) ->
      {?eh,stop_logging,[]}
     ];
 
-test_events(order_of_tests_in_multiple_dirs) ->
+test_events(order_of_tests_many_dirs) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,tc_start,{groups_12_SUITE,testcase_1a}},
      {?eh,tc_done,
@@ -1294,7 +1296,7 @@ test_events(order_of_tests_in_multiple_dirs) ->
      {?eh,tc_done,{groups_22_SUITE,testcase_1,ok}},
      {?eh,stop_logging,[]}
     ];
-test_events(order_of_tests_in_multiple_suites) ->
+test_events(order_of_tests_many_suites) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,tc_start,{groups_12_SUITE,testcase_1a}},
      {?eh,tc_done,{groups_12_SUITE,testcase_1a,'_'}},
@@ -1306,7 +1308,7 @@ test_events(order_of_tests_in_multiple_suites) ->
      {?eh,tc_done,{groups_11_SUITE,testcase_1,ok}},
      {?eh,stop_logging,[]}
     ];
-test_events(order_of_suites_in_multiple_dirs) ->
+test_events(order_of_suites_many_dirs) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
      {?eh,tc_done,{groups_12_SUITE,init_per_suite,'_'}},
@@ -1323,7 +1325,7 @@ test_events(order_of_suites_in_multiple_dirs) ->
      {?eh,tc_start,{groups_22_SUITE,end_per_suite}},
      {?eh,tc_done,{groups_22_SUITE,end_per_suite,'_'}},
      {?eh,stop_logging,[]}];
-test_events(order_of_groups_in_multiple_dirs) ->
+test_events(order_of_groups_many_dirs) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      
      {?eh,tc_start, {groups_12_SUITE,{init_per_group,test_group_1a,'_'}}},
@@ -1336,7 +1338,7 @@ test_events(order_of_groups_in_multiple_dirs) ->
      {?eh,tc_done, {groups_22_SUITE,{end_per_group,test_group_1a,'_'},'_'}},
 
      {?eh,stop_logging,[]}];
-test_events(order_of_groups_in_multiple_suites) ->
+test_events(order_of_groups_many_suites) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      
      {?eh,tc_start, {groups_12_SUITE,{init_per_group,test_group_1a,'_'}}},
@@ -1350,7 +1352,7 @@ test_events(order_of_groups_in_multiple_suites) ->
 
      {?eh,stop_logging,[]}];
 
-test_events(order_of_tests_in_multiple_suites_with_skip) ->
+test_events(order_of_tests_many_suites_with_skip) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,tc_start,{groups_12_SUITE,testcase_1a}},
      {?eh,tc_done,{groups_12_SUITE,testcase_1a,'_'}},
diff --git a/lib/common_test/test/ct_testspec_2_SUITE.erl b/lib/common_test/test/ct_testspec_2_SUITE.erl
new file mode 100644
index 0000000000..9d2dc84ad3
--- /dev/null
+++ b/lib/common_test/test/ct_testspec_2_SUITE.erl
@@ -0,0 +1,759 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_testspec_2_SUITE
+%%%
+%%% Description:
+%%% Test test specifications
+%%%
+%%% The suites used for the test are located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_testspec_2_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/src/ct_util.hrl").
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%% suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic_compatible_no_nodes,
+     basic_compatible_nodes,
+     unknown_terms,
+     no_merging,
+     multiple_specs,
+     misc_config_terms,
+     define_names_1].
+
+
+%%--------------------------------------------------------------------
+%% VALID TEST SPEC TERMS (R15B02):
+%%
+%% {node,3}
+%% {cover,2}
+%% {cover,3}
+%% {config,2}
+%% {config,3}
+%% {config,4}
+%% {userconfig,2}
+%% {userconfig,3}
+%% {alias,3}
+%% {merge_tests,2}
+%% {logdir,2}
+%% {logdir,3}
+%% {logopts,2}
+%% {logopts,3}
+%% {basic_html,2}
+%% {basic_html,3}
+%% {verbosity,2}
+%% {verbosity,3}
+%% {silent_connections,2}
+%% {silent_connections,3}
+%% {label,2}
+%% {label,3}
+%% {event_handler,2}
+%% {event_handler,3}
+%% {event_handler,4}
+%% {ct_hooks,2}
+%% {ct_hooks,3}
+%% {enable_builtin_hooks,2}
+%% {release_shell,2}
+%% {multiply_timetraps,2}
+%% {multiply_timetraps,3}
+%% {scale_timetraps,2}
+%% {scale_timetraps,3}
+%% {include,2}
+%% {include,3}
+%% {auto_compile,2}
+%% {auto_compile,3}
+%% {stylesheet,2}
+%% {stylesheet,3}
+%% {suites,3}
+%% {suites,4}
+%% {groups,4}
+%% {groups,5}
+%% {groups,6}
+%% {cases,4}
+%% {cases,5}
+%% {skip_suites,4}
+%% {skip_suites,5}
+%% {skip_groups,5}
+%% {skip_groups,6}
+%% {skip_groups,7}
+%% {skip_cases,5}
+%% {skip_cases,6}
+%% {create_priv_dir,2}
+%%
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+basic_compatible_no_nodes(_Config) ->
+
+    AliasDir1 = "../tests/to1",
+    AliasDir2 = "../tests/to2",
+    CfgDir1 = "../cfgs/to1/x.cfg",
+    CfgDir2 = ["../cfgs/to2/x.cfg","../cfgs/to2/y.cfg"],
+    LogDir = "../logs",
+    IncludeDir1 = "../../include",
+    IncludeDir2 = ["../tests/to1/include","../tests/to2/include"],
+
+    Spec =
+	[
+	 {label,"basic_compatible_no_nodes"},
+	 {alias,to1,AliasDir1},
+	 {alias,to2,AliasDir2},
+	 {config,CfgDir1},
+	 {config,CfgDir2},
+	 {userconfig,{?MODULE,"cfg_str1"}},
+	 {userconfig,{?MODULE,"cfg_str2"}},
+	 {logdir,LogDir},
+	 {logopts,[no_nl]},
+	 {event_handler,evh1,[1]},
+	 {event_handler,[evh2,evh3],[[2,3]]},
+	 {ct_hooks,[{cth_mod1,[]}]},
+	 {ct_hooks,[{cth_mod2,[]}]},
+	 {multiply_timetraps,2},
+	 {include,IncludeDir1},
+	 {include,IncludeDir2},
+	 {suites,to1,[x_SUITE]},
+	 {groups,to1,y_SUITE,[g1,g2]},
+	 {cases,to1,y_SUITE,[tc1,tc2]},
+	 {skip_suites,to1,z_SUITE,"skipped"},
+	 {suites,to2,[x_SUITE,y_SUITE]},
+	 {skip_groups,to2,x_SUITE,[g1,g2],"skipped"},
+	 {skip_cases,to2,y_SUITE,[tc1,tc2],"skipped"}
+	],
+    
+    {ok,SpecDir} = file:get_cwd(),
+    
+    ListResult = ct_testspec:collect_tests_from_list(Spec, false),
+    ct:pal("TESTSPEC RECORD FROM LIST:~n~p~n", [rec2proplist(ListResult)]),	
+    SpecFile = ct_test_support:write_testspec(Spec,SpecDir,
+					      "basic_compatible_no_nodes.spec"),
+    FileResult = ct_testspec:collect_tests_from_file([SpecFile], false),
+    ct:pal("TESTSPEC RECORD FROM FILE:~n~p~n", [rec2proplist(FileResult)]),
+    
+    Node = node(),
+    LogDirV = get_absdir(filename:join(SpecDir,"../logs")),
+    Alias1V = get_absdir(filename:join(SpecDir,AliasDir1)),
+    Alias2V = get_absdir(filename:join(SpecDir,AliasDir2)),
+    CFGs = [{Node,get_absdir(filename:join(SpecDir,CfgDir))} ||
+	       CfgDir <- [CfgDir1 | CfgDir2]],
+    Incls = [{Node,get_absdir(filename:join(SpecDir,IncludeDir))} ||
+		IncludeDir <- [IncludeDir1 | IncludeDir2]],
+    
+    Verify = #testspec{spec_dir = SpecDir,
+		       nodes = [{undefined,Node}],
+		       init = [],
+		       label = [{Node,"basic_compatible_no_nodes"}],
+		       logdir = [{Node,LogDirV},"."],
+		       logopts = [{Node,[no_nl]}],
+		       basic_html = [],
+		       cover = [],
+		       config = CFGs,
+		       userconfig = [{Node,{?MODULE,"cfg_str1"}},
+				     {Node,{?MODULE,"cfg_str2"}}],
+		       event_handler = [{Node,evh1,[1]},
+					{Node,evh2,[[2,3]]},
+					{Node,evh3,[[2,3]]}],
+		       ct_hooks = [{Node,{cth_mod1,[]}},
+				   {Node,{cth_mod2,[]}}],
+		       enable_builtin_hooks = true,
+		       release_shell = false,
+		       include = Incls,
+		       auto_compile = [],
+		       stylesheet = [],
+		       multiply_timetraps = [{Node,2}],
+		       scale_timetraps = [],
+		       create_priv_dir = [],
+		       alias = [{to1,Alias1V},{to2,Alias2V}],			
+		       tests = [{{Node,Alias1V},
+				 [{x_SUITE,[all]},
+				  {y_SUITE,[{g1,all},{g2,all},tc1,tc2]},
+				  {z_SUITE,[{all,{skip,"skipped"}}]}]},
+				{{Node,Alias2V},
+				 [{x_SUITE,[all,
+					    {{g1,all},{skip,"skipped"}},
+					    {{g2,all},{skip,"skipped"}}]},
+				  {y_SUITE,[all,
+					    {tc1,{skip,"skipped"}},
+					    {tc2,{skip,"skipped"}}]}]}],
+		       merge_tests = true},
+
+    verify_result(Verify,ListResult,FileResult).
+
+%%%-----------------------------------------------------------------
+%%%
+basic_compatible_nodes(_Config) ->
+
+    Node1 = node1@host1,
+    Node2 = node2@host2,
+    TODir1 = "../tests/to1",
+    TODir2 = "../tests/to2",
+    CfgDir1 = "../cfgs/to1/x.cfg",
+    CfgDir2 = ["../cfgs/to2/x.cfg","../cfgs/to2/y.cfg"],
+    LogDir = "../logs",
+    MasterLogDir = "../master_logs",
+    IncludeDir1 = "../../include",
+    IncludeDir2 = ["../tests/to1/include","../tests/to2/include"],
+
+    Spec =
+	[
+	 {node,n1,Node1},
+	 {node,n2,Node2},
+	 {init,[n1],[{node_start,[{callback_module,cbm}]}]},
+	 {init,n2,[{node_start,[]}]},
+	 {init,all_nodes,{eval,{mod,func,[]}}},
+	 {label,"basic_compatible_nodes"},
+	 {label,n1,basic_compatible_nodes_1},
+	 {config,n1,CfgDir1},
+	 {config,n2,CfgDir2},
+	 {userconfig,{?MODULE,"cfg_str1"}},
+	 {userconfig,{?MODULE,"cfg_str2"}},
+	 {logdir,all_nodes,LogDir},
+	 {logdir,master,MasterLogDir},
+	 {logopts,node2@host2,[no_nl]},
+	 {event_handler,master,evh1,[1]},
+	 {event_handler,[n1,n2],[evh2,evh3],[[2,3]]},
+	 {ct_hooks,all_nodes,[{cth_mod1,[]}]},
+	 {ct_hooks,[{cth_mod2,[]}]},
+	 {multiply_timetraps,node1@host1,2},
+	 {include,n1,IncludeDir1},
+	 {include,[n1,n2],IncludeDir2},
+	 {suites,n1,TODir1,[x_SUITE]},
+	 {groups,n1,TODir1,y_SUITE,[g1,g2]},
+	 {cases,n1,TODir1,y_SUITE,[tc1,tc2]},
+	 {skip_suites,n1,TODir1,z_SUITE,"skipped"},
+	 {suites,n2,TODir2,[x_SUITE,y_SUITE]},
+	 {skip_groups,n2,TODir2,x_SUITE,[g1,g2],"skipped"},
+	 {skip_cases,n2,TODir2,y_SUITE,[tc1,tc2],"skipped"}
+	],
+    
+    {ok,SpecDir} = file:get_cwd(),
+    
+    ListResult = ct_testspec:collect_tests_from_list(Spec, false),
+    ct:pal("TESTSPEC RECORD FROM LIST:~n~p~n", [rec2proplist(ListResult)]),	
+    SpecFile = ct_test_support:write_testspec(Spec,SpecDir,
+					      "basic_compatible_nodes.spec"),
+    FileResult = ct_testspec:collect_tests_from_file([SpecFile], false),
+    ct:pal("TESTSPEC RECORD FROM FILE:~n~p~n", [rec2proplist(FileResult)]),
+    
+    Node = node(),
+    LogDirV = get_absdir(filename:join(SpecDir,"../logs")),
+    MasterLogDirV = get_absdir(filename:join(SpecDir,"../master_logs")),
+    TO1V = get_absdir(filename:join(SpecDir,TODir1)),
+    TO2V = get_absdir(filename:join(SpecDir,TODir2)),
+    CFGs = [{Node1,get_absdir(filename:join(SpecDir,CfgDir1))} |
+	    [{Node2,get_absdir(filename:join(SpecDir,CfgDir))} || CfgDir <- CfgDir2]],
+    Incls = [{Node1,get_absdir(filename:join(SpecDir,IncludeDir1))} |
+	     [{Node1,get_absdir(filename:join(SpecDir,IncludeDir))} ||
+		 IncludeDir <- IncludeDir2] ++
+	     [{Node2,get_absdir(filename:join(SpecDir,IncludeDir))} ||
+		 IncludeDir <- IncludeDir2]],
+    
+    Verify = #testspec{spec_dir = SpecDir,
+		       nodes = [{undefined,Node},{n1,Node1},{n2,Node2}],
+		       init = [{Node1,[{node_start,[{callback_module,cbm}]},
+				       {eval,[{mod,func,[]}]}]},
+			       {Node2,[{node_start,[{callback_module,ct_slave}]},
+				       {eval,[{mod,func,[]}]}]},
+			       {Node,[{node_start,[]},
+				      {eval,[{mod,func,[]}]}]}],
+		       label = [{Node,"basic_compatible_nodes"},
+				{Node2,"basic_compatible_nodes"},
+				{Node1,basic_compatible_nodes_1}],
+		       logdir = [{Node,LogDirV},{Node1,LogDirV},{Node2,LogDirV},
+				 {master,MasterLogDirV},"."],
+		       logopts = [{Node2,[no_nl]}],
+		       basic_html = [],
+		       cover = [],
+		       config = CFGs,
+		       userconfig = [{Node,{?MODULE,"cfg_str1"}},
+				     {Node1,{?MODULE,"cfg_str1"}},
+				     {Node2,{?MODULE,"cfg_str1"}},
+				     {Node,{?MODULE,"cfg_str2"}},
+				     {Node1,{?MODULE,"cfg_str2"}},
+				     {Node2,{?MODULE,"cfg_str2"}}],
+		       event_handler = [{master,evh1,[1]},
+					{Node1,evh2,[[2,3]]},
+					{Node1,evh3,[[2,3]]},
+					{Node2,evh2,[[2,3]]},
+					{Node2,evh3,[[2,3]]}],
+		       ct_hooks = [{Node,{cth_mod1,[]}},
+				   {Node1,{cth_mod1,[]}},
+				   {Node2,{cth_mod1,[]}},
+				   {Node,{cth_mod2,[]}},
+				   {Node1,{cth_mod2,[]}},
+				   {Node2,{cth_mod2,[]}}],
+		       enable_builtin_hooks = true,
+		       release_shell = false,
+		       include = Incls,
+		       auto_compile = [],
+		       stylesheet = [],
+		       multiply_timetraps = [{Node1,2}],
+		       scale_timetraps = [],
+		       create_priv_dir = [],
+		       tests = [{{Node1,TO1V},
+				 [{x_SUITE,[all]},
+				  {y_SUITE,[{g1,all},{g2,all},tc1,tc2]},
+				  {z_SUITE,[{all,{skip,"skipped"}}]}]},
+				{{Node2,TO2V},
+				 [{x_SUITE,[all,
+					    {{g1,all},{skip,"skipped"}},
+					    {{g2,all},{skip,"skipped"}}]},
+				  {y_SUITE,[all,
+					    {tc1,{skip,"skipped"}},
+					    {tc2,{skip,"skipped"}}]}]}],
+		       merge_tests = true},
+
+    verify_result(Verify,ListResult,FileResult).
+
+%%%-----------------------------------------------------------------
+%%%
+unknown_terms(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+
+    Spec1 = [{suites,PrivDir,all},
+	     {userdata,"I've got news for you"}],
+    {error,{undefined_term_in_spec,{userdata,_}}} =
+	(catch ct_testspec:collect_tests_from_list(Spec1, false)),
+    true = is_record(ct_testspec:collect_tests_from_list(Spec1, true),
+		      testspec),
+    
+    Spec2 = [{logdir,{logdir,PrivDir}}],
+    {error,{invalid_directory_name,_}} =
+	(catch ct_testspec:collect_tests_from_list(Spec2, false)),
+    
+    Spec3 = [{suite,PrivDir,all}],
+    {error,{undefined_term_in_spec,{suite,_,_}}} =
+	(catch ct_testspec:collect_tests_from_list(Spec3, false)),
+    true = is_record(ct_testspec:collect_tests_from_list(Spec3, true), testspec),
+    
+    Spec4 = [{suites,PrivDir,all},
+	     {skip_suites,PrivDir,x_SUITE}],
+    {error,{bad_term_in_spec,{skip_suites,_,_}}} =
+	(catch ct_testspec:collect_tests_from_list(Spec4, false)),
+    {error,{bad_term_in_spec,{skip_suites,_,_}}} =
+	(catch ct_testspec:collect_tests_from_list(Spec4, true)),
+
+    Spec5 = [{configs,all_nodes,PrivDir}],
+    {error,{undefined_term_in_spec,{configs,_,_}}} =
+	(catch ct_testspec:collect_tests_from_list(Spec5, false)),
+    true = is_record(ct_testspec:collect_tests_from_list(Spec5, true), testspec),
+  
+    ok.
+
+%%%-----------------------------------------------------------------
+%%%
+no_merging(_Config) ->    
+    Node1 = node1@host1,
+    Node2 = node2@host2,
+    TODir1 = "../tests/to1",
+    TODir2 = "../tests/to2",
+    Spec =
+	[
+	 {merge_tests,false},
+	 {node,n1,Node1},
+	 {node,n2,Node2},
+	 {suites,n1,TODir1,[x_SUITE]},
+	 {groups,n1,TODir1,y_SUITE,[g1,g2]},
+	 {cases,n1,TODir1,y_SUITE,[tc1,tc2]},
+	 {skip_suites,n1,TODir1,z_SUITE,"skipped"},
+	 {suites,n2,TODir2,[x_SUITE,y_SUITE]},
+	 {skip_groups,n2,TODir2,x_SUITE,[g1,g2],"skipped"},
+	 {skip_cases,n2,TODir2,y_SUITE,[tc1,tc2],"skipped"}
+	],
+    
+    {ok,SpecDir} = file:get_cwd(),
+    
+    ListResult = ct_testspec:collect_tests_from_list(Spec, false),
+    ct:pal("TESTSPEC RECORD FROM LIST:~n~p~n", [rec2proplist(ListResult)]),	
+    SpecFile = ct_test_support:write_testspec(Spec,SpecDir,
+					      "no_merging.spec"),
+    FileResult = ct_testspec:collect_tests_from_file([SpecFile], false),
+    ct:pal("TESTSPEC RECORD FROM FILE:~n~p~n", [rec2proplist(FileResult)]),
+    
+    Node = node(),
+    TO1V = get_absdir(filename:join(SpecDir,TODir1)),
+    TO2V = get_absdir(filename:join(SpecDir,TODir2)),
+    
+    Verify = #testspec{merge_tests = false,
+		       spec_dir = SpecDir,
+		       nodes = [{undefined,Node},{n1,Node1},{n2,Node2}],
+		       tests = [{{Node1,TO1V},
+				 [{x_SUITE,[all]}]},
+				{{Node1,TO1V},
+				 [{y_SUITE,[{g1,all},{g2,all}]}]},
+				{{Node1,TO1V},
+				 [{y_SUITE,[tc1,tc2]}]},
+				{{Node1,TO1V},
+				 [{z_SUITE,[{all,{skip,"skipped"}}]}]},
+				{{Node2,TO2V},
+				 [{x_SUITE,[all]}]},
+				{{Node2,TO2V},
+				 [{y_SUITE,[all]}]},
+				{{Node2,TO2V},
+				 [{x_SUITE,[{{g1,all},{skip,"skipped"}},
+					    {{g2,all},{skip,"skipped"}}]}]},
+				{{Node2,TO2V},
+				 [{y_SUITE,[{tc1,{skip,"skipped"}},
+					    {tc2,{skip,"skipped"}}]}]}]},
+		       
+    verify_result(Verify,ListResult,FileResult).
+
+%%%-----------------------------------------------------------------
+%%%
+multiple_specs(_Config) ->
+    Node1 = node1@host1,
+    Node2 = node2@host2,
+    TODir1 = "../tests/to1",
+    TODir2 = "../tests/to2",
+    CfgDir1 = "../cfgs/to1/x.cfg",
+    CfgDir2 = ["../cfgs/to2/x.cfg","../cfgs/to2/y.cfg"],
+    LogDir = "../logs",
+    Spec1 =
+	[
+	 {node,n1,Node1},
+	 {node,n2,Node2},
+	 {alias,to1,TODir1},
+	 {alias,to2,TODir2},
+	 {label,"multiple_specs1"},
+	 {config,n1,CfgDir1},
+	 {config,n2,CfgDir2},
+	 {logdir,all_nodes,LogDir}
+	],
+    Spec2 =
+	[
+	 {merge_tests,false},
+	 {label,"multiple_specs2"},
+	 {suites,n1,TODir1,[x_SUITE]},
+	 {groups,n1,TODir1,y_SUITE,[g1,g2]},
+	 {cases,n1,TODir1,y_SUITE,[tc1,tc2]},
+	 {skip_suites,n1,TODir1,z_SUITE,"skipped"},
+	 {suites,n2,TODir2,[x_SUITE,y_SUITE]},
+	 {skip_groups,n2,TODir2,x_SUITE,[g1,g2],"skipped"},
+	 {skip_cases,n2,TODir2,y_SUITE,[tc1,tc2],"skipped"}
+	],
+    
+    {ok,SpecDir} = file:get_cwd(),    
+    SpecFile1 = ct_test_support:write_testspec(Spec1,SpecDir,
+					      "multiple_specs.1.spec"),
+    SpecFile2 = ct_test_support:write_testspec(Spec2,SpecDir,
+					      "multiple_specs.2.spec"),
+    FileResult = ct_testspec:collect_tests_from_file([SpecFile1,SpecFile2],
+						     false),
+    ct:pal("TESTSPEC RECORD FROM FILE:~n~p~n", [rec2proplist(FileResult)]),
+    
+    Node = node(),
+    TO1V = get_absdir(filename:join(SpecDir,TODir1)),
+    TO2V = get_absdir(filename:join(SpecDir,TODir2)),
+    CFGs = [{Node1,get_absdir(filename:join(SpecDir,CfgDir1))} |
+	    [{Node2,get_absdir(filename:join(SpecDir,CfgDir))} || CfgDir <- CfgDir2]],
+    LogDirV = get_absdir(filename:join(SpecDir,"../logs")),
+
+    Verify = #testspec{merge_tests = false,
+		       spec_dir = SpecDir,
+		       nodes = [{undefined,Node},{n1,Node1},{n2,Node2}],
+		       alias = [{to1,TO1V},{to2,TO2V}],
+		       label = [{Node,"multiple_specs1"},
+				{Node1,"multiple_specs1"},
+				{Node2,"multiple_specs1"}],
+		       logdir = [{Node,LogDirV},{Node1,LogDirV},{Node2,LogDirV},"."],
+		       config = CFGs,
+		       tests = [{{Node1,TO1V},
+				 [{x_SUITE,[all]}]},
+				{{Node1,TO1V},
+				 [{y_SUITE,[{g1,all},{g2,all}]}]},
+				{{Node1,TO1V},
+				 [{y_SUITE,[tc1,tc2]}]},
+				{{Node1,TO1V},
+				 [{z_SUITE,[{all,{skip,"skipped"}}]}]},
+				{{Node2,TO2V},
+				 [{x_SUITE,[all]}]},
+				{{Node2,TO2V},
+				 [{y_SUITE,[all]}]},
+				{{Node2,TO2V},
+				 [{x_SUITE,[{{g1,all},{skip,"skipped"}},
+					    {{g2,all},{skip,"skipped"}}]}]},
+				{{Node2,TO2V},
+				 [{y_SUITE,[{tc1,{skip,"skipped"}},
+					    {tc2,{skip,"skipped"}}]}]}]},
+		       
+    verify_result(Verify,FileResult,FileResult).
+
+%%%-----------------------------------------------------------------
+%%% 
+misc_config_terms(_Config) ->
+    CfgDir = "../cfgs/to1",
+
+    Spec =
+	[{node,x,n1@h1},{node,y,n2@h2},
+
+	 {config,CfgDir,"a.cfg"},
+	 {config,n1@h1,CfgDir,"b.cfg"},
+	 {config,all_nodes,CfgDir,"c.cfg"},
+	 {config,all_nodes,filename:join(CfgDir,"d.cfg")},
+
+	 {basic_html,true},
+	 {basic_html,n1@h1,false},
+	 {basic_html,n2@h2,true},
+	 
+	 {silent_connections,n1@h1,all},
+	 {silent_connections,n2@h2,[ssh]},
+
+	 {enable_builtin_hooks,false},
+
+	 {release_shell,true},
+
+	 {auto_compile,false},
+	 {auto_compile,n1@h1,true},
+	 {auto_compile,n2@h2,false},
+
+	 {stylesheet,"../css"},
+	 {stylesheet,n1@h1,"./n1/css"},
+	 {stylesheet,n2@h2,"./n2/css"},
+
+	 {create_priv_dir,[auto_per_tc]},
+	 {create_priv_dir,n1@h1,[manual_per_tc]},
+	 {create_priv_dir,n2@h2,[auto_per_run]}
+	],
+    
+    {ok,SpecDir} = file:get_cwd(),
+    
+    ListResult = ct_testspec:collect_tests_from_list(Spec, false),
+    ct:pal("TESTSPEC RECORD FROM LIST:~n~p~n", [rec2proplist(ListResult)]),	
+    SpecFile = ct_test_support:write_testspec(Spec,SpecDir,
+					      "misc_config_terms.spec"),
+    FileResult = ct_testspec:collect_tests_from_file([SpecFile], false),
+    ct:pal("TESTSPEC RECORD FROM FILE:~n~p~n", [rec2proplist(FileResult)]),
+    
+    Node = node(),
+    CfgA = get_absdir(filename:join(filename:join(SpecDir,CfgDir), "a.cfg")),
+    CfgB = get_absdir(filename:join(filename:join(SpecDir,CfgDir), "b.cfg")),
+    CfgC = get_absdir(filename:join(filename:join(SpecDir,CfgDir), "c.cfg")),
+    CfgD = get_absdir(filename:join(filename:join(SpecDir,CfgDir), "d.cfg")),
+    CSS = get_absdir(filename:join(SpecDir,"../css")),
+    CSS1 = get_absdir(filename:join(SpecDir,"./n1/css")),
+    CSS2 = get_absdir(filename:join(SpecDir,"./n2/css")),
+    
+    Verify = #testspec{spec_dir = SpecDir,
+		       nodes = [{undefined,Node},{x,n1@h1},{y,n2@h2}],
+		       basic_html = [{Node,true},{n1@h1,false},{n2@h2,true}],
+		       silent_connections = [{n1@h1,[all]},{n2@h2,[ssh]}],
+		       config = [{Node,CfgA},
+				 {n1@h1,CfgA},
+				 {n2@h2,CfgA},
+				 {n1@h1,CfgB},
+				 {Node,CfgC},
+				 {n1@h1,CfgC},
+				 {n2@h2,CfgC},
+				 {Node,CfgD},
+				 {n1@h1,CfgD},
+				 {n2@h2,CfgD}],
+		       enable_builtin_hooks = false,
+		       release_shell = true,
+		       auto_compile = [{Node,false},
+				       {n1@h1,true},
+				       {n2@h2,false}],
+		       stylesheet = [{Node,CSS},
+				     {n1@h1,CSS1},
+				     {n2@h2,CSS2}],	       
+		       create_priv_dir = [{Node,[auto_per_tc]},
+					  {n1@h1,[manual_per_tc]},
+					  {n2@h2,[auto_per_run]}]
+		      },
+    
+    verify_result(Verify,ListResult,FileResult).
+
+%%%-----------------------------------------------------------------
+%%% 
+define_names_1(_Config) ->
+    Spec =
+	[
+	 {define,'HOST','eniac'},
+	 {define,'NODE1',testnode1},
+	 {define,'NODE2',testnode2},
+	 {define,'NODES',['NODE1@HOST',
+			  'NODE2@HOST']},
+	 {define,'TOPDIR',".."},
+	 {define,'TO1',"to1"},
+	 {define,'TO2',"to2"},
+	 {define,'LOGDIR',"'TOPDIR'/logdir"},
+	 {define,'LOGDIR1',"'TOPDIR'/logdir1"},
+	 {define,'LOGDIR2',"'TOPDIR'/logdir2"},
+	 {define,'CFGDIR',"'TOPDIR'/cfgs"},
+	 {define,'CFGFILES',["cfgX","cfgY"]},
+	 {define,'TESTDIR',"'TOPDIR'/test"},
+	 {define,'TO1DIR',"'TESTDIR'/'TO1'"},
+	 {define,'TO2DIR',"'TESTDIR'/'TO2'"},
+	 {define,'EXSUITE',ex_SUITE},
+	 {define,'EXGRS',[g1,g2]},
+
+	 {logdir,'LOGDIR'},
+	 {logdir,'NODE1@HOST','LOGDIR1'},
+	 {logdir,'NODE2@HOST','LOGDIR2'},
+
+	 {config,["a.cfg","b.cfg"]},
+	 {config,'NODES',"./'CFGDIR'/c.cfg"},
+	 {config,'CFGDIR',["d.cfg","e.cfg"]},
+	 {config,'NODE2@HOST','CFGDIR','CFGFILES'},
+
+	 {suites,'NODE1@HOST','TO1DIR',all},
+	 {suites,'NODES','TO2DIR',all},
+
+	 {groups,'TO1DIR','EXSUITE','EXGRS'}
+	],
+    
+    {ok,SpecDir} = file:get_cwd(),
+    
+    ListResult = ct_testspec:collect_tests_from_list(Spec, false),
+    ct:pal("TESTSPEC RECORD FROM LIST:~n~p~n", [rec2proplist(ListResult)]),	
+    SpecFile = ct_test_support:write_testspec(Spec,SpecDir,
+					      "define_names_1.spec"),
+    FileResult = ct_testspec:collect_tests_from_file([SpecFile], false),
+    ct:pal("TESTSPEC RECORD FROM FILE:~n~p~n", [rec2proplist(FileResult)]),
+    
+    N = node(),
+    N1 = testnode1@eniac,
+    N2 = testnode2@eniac,
+    Join = fun(Dir) -> shorten_path(filename:join(SpecDir,Dir),SpecDir) end,
+
+    Verify = #testspec{spec_dir = SpecDir,
+		       nodes = [{undefined,N2},
+				{undefined,N1},
+				{undefined,N}],
+		       config = [{N2,Join("a.cfg")},{N2,Join("b.cfg")},
+				 {N1,Join("a.cfg")},{N1,Join("b.cfg")},
+				 {N,Join("a.cfg")},{N,Join("b.cfg")},
+				 {N1,Join("../cfgs/c.cfg")},{N2,Join("../cfgs/c.cfg")},
+				 {N2,Join("../cfgs/d.cfg")},{N2,Join("../cfgs/e.cfg")},
+				 {N1,Join("../cfgs/d.cfg")},{N1,Join("../cfgs/e.cfg")},
+				 {N,Join("../cfgs/d.cfg")},{N,Join("../cfgs/e.cfg")},
+				 {N2,Join("../cfgs/cfgX")},{N2,Join("../cfgs/cfgY")}],
+		       logdir = [{N,Join("../logdir")},
+				 {N1,Join("../logdir1")},
+				 {N2,Join("../logdir2")},
+				 "."],
+		       tests = [{{N1,Join("../test/to1")},[{all,[all]}]},
+				{{N1,Join("../test/to2")},[{all,[all]}]},
+				{{N2,Join("../test/to2")},[{all,[all]}]},
+				{{N2,Join("../test/to1")},
+				 [{ex_SUITE,[{g1,all},{g2,all}]}]},
+				{{N,Join("../test/to1")},
+				 [{ex_SUITE,[{g1,all},{g2,all}]}]}]
+		      },    
+    verify_result(Verify,ListResult,FileResult).
+
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+verify_result(Verify,ListResult,FileResult) ->
+    {_,TSLTuples} = rec2proplist(ListResult),
+    {_,TSFTuples} = rec2proplist(FileResult),
+    {_,VTuples} = rec2proplist(Verify),    
+    VResult =
+	(catch lists:foldl(fun({Tag,Val},{[{Tag,Val}|TSL],[{Tag,Val}|TSF]}) ->
+				   {TSL,TSF};
+			      ({Tag,Val},{[{_Tag,TSLVal}|_TSL],[{Tag,Val}|_TSF]}) ->
+				   exit({ts_list_mismatch,Tag,Val,TSLVal});
+			      ({Tag,Val},{[{Tag,Val}|_TSL],[{_Tag,TSFVal}|_TSF]}) ->
+				   exit({ts_file_mismatch,Tag,Val,TSFVal});
+			      ({Tag,Val},{_,[{_Tag,TSFVal}|_TSF]}) ->
+				   exit({ts_mismatch,Tag,Val,TSFVal})
+			   end, {TSLTuples,TSFTuples}, VTuples)),
+	       case VResult of
+		  {'EXIT',Reason} ->
+		      ct:fail(Reason);
+		  _ ->
+		      ok
+	       end,
+    ok.
+
+
+check_parameter(S="cfg_str1") ->
+    {ok,{config,S}};
+check_parameter(S="cfg_str2") ->
+    {ok,{config,S}}.
+read_config(S) ->
+    {ok,[{cfg,S}]}.
+
+rec2proplist(E={error,_What}) ->
+    exit({invalid_testspec_record,E});
+rec2proplist(Rec) ->
+    [RecName|RecList] = tuple_to_list(Rec),
+    FieldNames = 
+	if RecName == testspec ->
+		record_info(fields, testspec);
+	   true ->
+		undefined
+	end,
+    {RecName,combine_names_and_vals(FieldNames,RecList)}.
+
+combine_names_and_vals([FN|FNs], [V|Vs]) ->
+    [{FN,V} | combine_names_and_vals(FNs, Vs)];
+combine_names_and_vals([], []) ->
+    [];
+combine_names_and_vals(_, _) ->
+    [].
+
+get_absdir(Dir) ->
+    shorten_path(filename:absname(Dir),Dir).
+
+shorten_path(Path,SpecDir) ->
+    case shorten_split_path(filename:split(Path),[]) of
+	[] ->
+	    [Root|_] = filename:split(SpecDir),
+	    Root;
+	Short ->	    
+	    filename:join(Short)
+    end.
+
+shorten_split_path([".."|Path],SoFar) ->
+    shorten_split_path(Path,tl(SoFar));
+shorten_split_path(["."|Path],SoFar) ->
+    shorten_split_path(Path,SoFar);
+shorten_split_path([Dir|Path],SoFar) ->
+    shorten_split_path(Path,[Dir|SoFar]);
+shorten_split_path([],SoFar) ->
+    lists:reverse(SoFar).
diff --git a/lib/common_test/test/ct_verbosity_SUITE.erl b/lib/common_test/test/ct_verbosity_SUITE.erl
new file mode 100644
index 0000000000..349319de94
--- /dev/null
+++ b/lib/common_test/test/ct_verbosity_SUITE.erl
@@ -0,0 +1,244 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_verbosity_SUITE
+%%%
+%%% Description: 
+%%% Test that verbosity levels vs the importance parameter works as
+%%% expected.
+%%%
+%%%-------------------------------------------------------------------
+-module(ct_verbosity_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [
+     no_levels,
+     general_level_low,
+     general_level_std,
+     general_level_hi,
+     change_default,
+     combine_categories,
+     testspec_only,
+     merge_with_testspec
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+no_levels(Config) ->
+    TC = no_levels,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "io_test_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC}], Config),
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+general_level_low(Config) ->
+    TC = general_level_low,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "io_test_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC},
+			  {verbosity,0}], Config),
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+general_level_std(Config) ->
+    TC = general_level_std,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "io_test_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC},
+			  {verbosity,50}], Config),
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+general_level_hi(Config) ->
+    TC = general_level_high,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "io_test_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC},
+			  {verbosity,100}], Config),
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+change_default(Config) ->
+    TC = change_default,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "io_test_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC},
+			  {verbosity,[{default,49}]}], Config),
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+combine_categories(Config) ->
+    TC = combine_categories,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "io_test_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC},
+			  {verbosity,[{error,?HI_VERBOSITY},
+				      {default,?LOW_VERBOSITY}]}], Config),
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+testspec_only(Config) ->
+    TC = testspec_only,
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+
+    TestSpec = [{verbosity,[{default,1},{error,75},100]},
+		{suites,DataDir,[io_test_SUITE]},
+		{label,TC}],
+
+    TestSpecName = ct_test_support:write_testspec(TestSpec, PrivDir,
+						  "verbosity_1_spec"),
+    {Opts,ERPid} = setup([{spec,TestSpecName}], Config),
+
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+merge_with_testspec(Config) ->
+    TC = merge_with_testspec,
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+
+    TestSpec = [{verbosity,[{default,100},{error,100}]},
+		{suites,DataDir,[io_test_SUITE]},
+		{label,TC}],
+
+    TestSpecName = ct_test_support:write_testspec(TestSpec, PrivDir,
+						  "verbosity_2_spec"),
+
+    %% below should override verbosity categories in testspec
+    {Opts,ERPid} = setup([{spec,TestSpecName},
+			  {verbosity,[{default,0},0]}],
+			 Config),
+
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+execute(Name, Opts, ERPid, Config) ->
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(Name, 
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(Name),
+    ct_test_support:verify_events(TestEvents, Events, Config).
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+events_to_check(Test) ->
+    %% 2 tests (ct:run_test + script_start) is default
+    events_to_check(Test, 2).
+
+events_to_check(_, 0) ->
+    [];
+events_to_check(Test, N) ->
+    test_events(Test) ++ events_to_check(Test, N-1).
+
+
+test_events(_) ->
+    [
+     {?eh,tc_done,{io_test_SUITE,tc1,ok}},
+     {?eh,tc_done,{io_test_SUITE,tc2,ok}},
+     {?eh,tc_done,{io_test_SUITE,tc3,ok}},
+
+     {parallel,
+      [
+       {?eh,tc_start,{io_test_SUITE,tc1}},
+       {?eh,tc_start,{io_test_SUITE,tc2}},
+       {?eh,tc_start,{io_test_SUITE,tc3}},
+       {?eh,tc_done,{io_test_SUITE,tc1,ok}},
+       {?eh,tc_done,{io_test_SUITE,tc2,ok}},
+       {?eh,tc_done,{io_test_SUITE,tc3,ok}},
+       {parallel,
+	[
+	 {?eh,tc_start,{io_test_SUITE,tc1}},
+	 {?eh,tc_start,{io_test_SUITE,tc2}},
+	 {?eh,tc_start,{io_test_SUITE,tc3}},
+	 {?eh,tc_done,{io_test_SUITE,tc1,ok}},
+	 {?eh,tc_done,{io_test_SUITE,tc2,ok}},
+	 {?eh,tc_done,{io_test_SUITE,tc3,ok}},
+	 {?eh,test_stats,{9,0,{0,0}}}
+	]}
+       ]},
+
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
+
diff --git a/lib/common_test/test/ct_verbosity_SUITE_data/io_test_SUITE.erl b/lib/common_test/test/ct_verbosity_SUITE_data/io_test_SUITE.erl
new file mode 100644
index 0000000000..946e1c1989
--- /dev/null
+++ b/lib/common_test/test/ct_verbosity_SUITE_data/io_test_SUITE.erl
@@ -0,0 +1,156 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(io_test_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% @spec suite() -> Info
+%% Info = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,10}}].
+
+%%--------------------------------------------------------------------
+%% @spec init_per_suite(Config0) ->
+%%     Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+    
+%%--------------------------------------------------------------------
+%% @spec end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1} | {fail,Reason}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%% @end
+%%--------------------------------------------------------------------
+groups() ->
+    [{g1, [parallel], [tc1,tc2,tc3,{group,g2}]},
+     {g2, [parallel], [tc1,tc2,tc3]}].
+
+%%--------------------------------------------------------------------
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+all() -> 
+    [tc1,tc2,tc3,{group,g1}].
+
+tc1(_C) ->
+    io:format("This is an io:format(~p)~n", [[]]),
+    ct:log("ct:log(default)", []),
+    ct:log(?STD_IMPORTANCE, "ct:log(default,~p)", [?STD_IMPORTANCE]),
+    ct:log(error, "ct:log(error)", []),
+    ct:log(error, ?STD_IMPORTANCE, "ct:log(error,~p)", [?STD_IMPORTANCE]),
+    ct:log(1, "ct:log(default,~p)", [1]),
+    ct:log(error, 1, "ct:log(error,~p)", [1]),
+    ct:log(99, "ct:log(default,~p)", [99]),
+    ct:log(error, 99, "ct:log(error,~p)", [99]),
+    ok.
+
+tc2(_C) ->
+    io:format("This is an io:format(~p)~n", [[]]),
+    ct:pal("ct:pal(default)", []),
+    ct:pal(?STD_IMPORTANCE, "ct:pal(default,~p)", [?STD_IMPORTANCE]),
+    ct:pal(error, "ct:pal(error)", []),
+    ct:pal(error, ?STD_IMPORTANCE, "ct:pal(error,~p)", [?STD_IMPORTANCE]),
+    ct:pal(1, "ct:pal(default,~p)", [1]),
+    ct:pal(error, 1, "ct:pal(error,~p)", [1]),
+    ct:pal(99, "ct:pal(default,~p)", [99]),
+    ct:pal(error, 99, "ct:pal(error,~p)", [99]),
+    ok.
+
+tc3(_C) ->
+    io:format("This is an io:format(~p)~n", [[]]),
+    ct:print("ct:print(default)", []),
+    ct:print(?STD_IMPORTANCE, "ct:print(default,~p)", [?STD_IMPORTANCE]),
+    ct:print(error, "ct:print(error)", []),
+    ct:print(error, ?STD_IMPORTANCE, "ct:print(error,~p)", [?STD_IMPORTANCE]),
+    ct:print(1, "ct:print(default,~p)", [1]),
+    ct:print(error, 1, "ct:print(error,~p)", [1]),
+    ct:print(99, "ct:print(default,~p)", [99]),
+    ct:print(error, 99, "ct:print(error,~p)", [99]),
+    ok.
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index b94f7f7593..f9bb22867e 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.6.1
+COMMON_TEST_VSN = 1.6.3
diff --git a/lib/compiler/doc/src/Makefile b/lib/compiler/doc/src/Makefile
index ee41a7074f..13a73a5d31 100644
--- a/lib/compiler/doc/src/Makefile
+++ b/lib/compiler/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -99,14 +99,14 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index 84e9922847..27d750f929 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -294,6 +294,12 @@ module.beam: module.erl \
               describing what it is doing.</p>
           </item>
 
+	  <tag><c>{source,FileName}</c></tag>
+          <item>
+            <p>Sets the value of the source, as returned by
+              <c>module_info(compile)</c>.</p>
+          </item>
+
 	  <tag><c>{outdir,Dir}</c></tag>
           <item>
             <p>Sets a new directory for the object code. The current
@@ -310,7 +316,7 @@ module.beam: module.erl \
           <item>
             <p>Add <c>Dir</c> to the list of directories to be searched
               when including a file. When encountering an
-	      <c>-include</c> or <c>-include_dir</c> directive,
+	      <c>-include</c> or <c>-include_lib</c> directive,
 	      the compiler searches for header files in the following
 	      directories:</p>
             <list type="ordered">
@@ -333,7 +339,8 @@ module.beam: module.erl \
           <tag><c>{d,Macro,Value}</c></tag>
           <item>
             <p>Defines a macro <c>Macro</c> to have the value
-	      <c>Value</c>. The default is <c>true</c>.</p>
+            <c>Value</c>. <c>Macro</c> is of type atom, and <c>Value</c> can be any term.
+            The default <c>Value</c> is <c>true</c>.</p>
           </item>
 
 	  <tag><c>{parse_transform,Module}</c></tag>
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index e2a921a6f2..6d51074d4a 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,82 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 4.8.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Modules with very many functions would compile very
+	    slowly.</p>
+          <p>
+	    Own Id: OTP-10123</p>
+        </item>
+        <item>
+          <p>
+	    <c>compile:forms/2</c> will now use a
+	    {source,SourceFilePath} to set the source returned by
+	    <c>module_info(compile)</c> (Thanks to Jos� Valim)</p>
+          <p>
+	    Own Id: OTP-10150</p>
+        </item>
+        <item>
+          <p>
+	    A process which had enabled trap_exit would receive EXIT
+	    messages after calling the compiler. (Thanks to Jeremy
+	    Heater.)</p>
+          <p>
+	    Own Id: OTP-10171</p>
+        </item>
+        <item>
+          <p>
+	    Fix messages ordering with column numbers</p>
+          <p>
+	    Own Id: OTP-10183</p>
+        </item>
+        <item>
+          <p>
+	    sys_pre_expand: Fix BASE never being set</p>
+          <p>
+	    Commit a612e99fb5aaa934fe5a8591db0f083d7fa0b20a turned
+	    module attributes from 2-tuples to 3-tuples but forgot to
+	    update get_base/1, breaking BASE for parametric modules.</p>
+          <p>
+	    Own Id: OTP-10184</p>
+        </item>
+        <item>
+          <p>
+	    The compiler will now issue a warning if literal tuple
+	    funs are used. For example, {erlang,is_tuple}(X) will now
+	    generate a warning.</p>
+          <p>
+	    Own Id: OTP-10185</p>
+        </item>
+        <item>
+          <p>
+	    The compiler will now warn for illegal sizes for segments
+	    in binary construction. For example,
+	    &lt;&lt;X:(2.5)&gt;&gt; will now cause the compiler to
+	    issue a warning.</p>
+          <p>
+	    Own Id: OTP-10197</p>
+        </item>
+        <item>
+          <p>
+	    Fix the erlc -MP flag</p>
+          <p>
+	    Because of a copy-and-paste error in erlc.c, the -MP flag
+	    had the same effect as -MG. As a workaround, you had to
+	    pass +makedep_phony to enable the MP option. This patch
+	    makes -MP work as intended.</p>
+          <p>
+	    Own Id: OTP-10211</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 4.8.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
index 3415517fff..cbcbf79839 100644
--- a/lib/compiler/src/Makefile
+++ b/lib/compiler/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2011. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -45,6 +45,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/compiler-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 MODULES =  \
+	beam_a \
 	beam_asm \
 	beam_block \
 	beam_bool \
@@ -65,6 +66,7 @@ MODULES =  \
 	beam_type \
 	beam_utils \
 	beam_validator \
+        beam_z \
 	cerl \
 	cerl_clauses \
 	cerl_inline \
@@ -163,11 +165,11 @@ $(EBIN)/cerl_inline.beam: $(ESRC)/cerl_inline.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
-		$(YRL_FILE) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
+		$(YRL_FILE) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/compiler/src/beam_a.erl b/lib/compiler/src/beam_a.erl
new file mode 100644
index 0000000000..1c51226314
--- /dev/null
+++ b/lib/compiler/src/beam_a.erl
@@ -0,0 +1,97 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%% Purpose: Run directly after code generation to do any normalization
+%%          or preparation to simplify the optimization passes.
+%%          (Mandatory.)
+
+-module(beam_a).
+
+-export([module/2]).
+
+module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
+    Fs = [function(F) || F <- Fs0],
+    {ok,{Mod,Exp,Attr,Fs,Lc}}.
+
+function({function,Name,Arity,CLabel,Is0}) ->
+    try
+	%% Rename certain operations to simplify the optimization passes.
+	Is1 = rename_instrs(Is0),
+
+	%% Remove unusued labels for cleanliness and to help
+	%% optimization passes and HiPE.
+	Is = beam_jump:remove_unused_labels(Is1),
+	{function,Name,Arity,CLabel,Is}
+    catch
+	Class:Error ->
+	    Stack = erlang:get_stacktrace(),
+	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+	    erlang:raise(Class, Error, Stack)
+    end.
+
+rename_instrs([{apply_last,A,N}|Is]) ->
+    [{apply,A},{deallocate,N},return|rename_instrs(Is)];
+rename_instrs([{call_last,A,F,N}|Is]) ->
+    [{call,A,F},{deallocate,N},return|rename_instrs(Is)];
+rename_instrs([{call_ext_last,A,F,N}|Is]) ->
+    [{call_ext,A,F},{deallocate,N},return|rename_instrs(Is)];
+rename_instrs([{call_only,A,F}|Is]) ->
+    [{call,A,F},return|rename_instrs(Is)];
+rename_instrs([{call_ext_only,A,F}|Is]) ->
+    [{call_ext,A,F},return|rename_instrs(Is)];
+rename_instrs([I|Is]) ->
+    [rename_instr(I)|rename_instrs(Is)];
+rename_instrs([]) -> [].
+
+rename_instr({bs_put_binary=I,F,Sz,U,Fl,Src}) ->
+    {bs_put,F,{I,U,Fl},[Sz,Src]};
+rename_instr({bs_put_float=I,F,Sz,U,Fl,Src}) ->
+    {bs_put,F,{I,U,Fl},[Sz,Src]};
+rename_instr({bs_put_integer=I,F,Sz,U,Fl,Src}) ->
+    {bs_put,F,{I,U,Fl},[Sz,Src]};
+rename_instr({bs_put_utf8=I,F,Fl,Src}) ->
+    {bs_put,F,{I,Fl},[Src]};
+rename_instr({bs_put_utf16=I,F,Fl,Src}) ->
+    {bs_put,F,{I,Fl},[Src]};
+rename_instr({bs_put_utf32=I,F,Fl,Src}) ->
+    {bs_put,F,{I,Fl},[Src]};
+%% rename_instr({bs_put_string,_,_}=I) ->
+%%     {bs_put,{f,0},I,[]};
+rename_instr({bs_add=I,F,[Src1,Src2,U],Dst}) when is_integer(U) ->
+    {bif,I,F,[Src1,Src2,{integer,U}],Dst};
+rename_instr({bs_utf8_size=I,F,Src,Dst}) ->
+    {bif,I,F,[Src],Dst};
+rename_instr({bs_utf16_size=I,F,Src,Dst}) ->
+    {bif,I,F,[Src],Dst};
+rename_instr({bs_init2=I,F,Sz,Extra,Live,Flags,Dst}) ->
+    {bs_init,F,{I,Extra,Flags},Live,[Sz],Dst};
+rename_instr({bs_init_bits=I,F,Sz,Extra,Live,Flags,Dst}) ->
+    {bs_init,F,{I,Extra,Flags},Live,[Sz],Dst};
+rename_instr({bs_append=I,F,Sz,Extra,Live,U,Src,Flags,Dst}) ->
+    {bs_init,F,{I,Extra,U,Flags},Live,[Sz,Src],Dst};
+rename_instr({bs_private_append=I,F,Sz,U,Src,Flags,Dst}) ->
+    {bs_init,F,{I,U,Flags},none,[Sz,Src],Dst};
+rename_instr(bs_init_writable=I) ->
+    {bs_init,{f,0},I,1,[{x,0}],{x,0}};
+rename_instr({select_val=I,Reg,Fail,{list,List}}) ->
+    {select,I,Reg,Fail,List};
+rename_instr({select_tuple_arity=I,Reg,Fail,{list,List}}) ->
+    {select,I,Reg,Fail,List};
+rename_instr(send) ->
+    {call_ext,2,send};
+rename_instr(I) -> I.
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl
index cd568097fa..3e0050382c 100644
--- a/lib/compiler/src/beam_block.erl
+++ b/lib/compiler/src/beam_block.erl
@@ -31,19 +31,16 @@ module({Mod,Exp,Attr,Fs0,Lc0}, _Opt) ->
 
 function({function,Name,Arity,CLabel,Is0}, Lc0) ->
     try
-	%% Extra labels may thwart optimizations.
-	Is1 = beam_jump:remove_unused_labels(Is0),
-
 	%% Collect basic blocks and optimize them.
-	Is2 = blockify(Is1),
-	Is3 = embed_lines(Is2),
-	Is4 = move_allocates(Is3),
-	Is5 = beam_utils:live_opt(Is4),
-	Is6 = opt_blocks(Is5),
-	Is7 = beam_utils:delete_live_annos(Is6),
+	Is1 = blockify(Is0),
+	Is2 = embed_lines(Is1),
+	Is3 = move_allocates(Is2),
+	Is4 = beam_utils:live_opt(Is3),
+	Is5 = opt_blocks(Is4),
+	Is6 = beam_utils:delete_live_annos(Is5),
 
 	%% Optimize bit syntax.
-	{Is,Lc} = bsm_opt(Is7, Lc0),
+	{Is,Lc} = bsm_opt(Is6, Lc0),
 
 	%% Done.
 	{{function,Name,Arity,CLabel,Is},Lc}
@@ -74,9 +71,9 @@ blockify([{bs_save2,R,Point}=I,{test,is_eq_exact,_,_}=Test,
 
 %% Do other peep-hole optimizations.
 blockify([{test,is_atom,{f,Fail},[Reg]}=I|
-	  [{select_val,Reg,{f,Fail},
-	    {list,[{atom,false},{f,_}=BrFalse,
-		   {atom,true}=AtomTrue,{f,_}=BrTrue]}}|Is]=Is0],
+	  [{select,select_val,Reg,{f,Fail},
+	    [{atom,false},{f,_}=BrFalse,
+	     {atom,true}=AtomTrue,{f,_}=BrTrue]}|Is]=Is0],
 	 [{block,Bl}|_]=Acc) ->
     case is_last_bool(Bl, Reg) of
 	false ->
@@ -89,9 +86,9 @@ blockify([{test,is_atom,{f,Fail},[Reg]}=I|
 			  {test,is_eq_exact,BrFalse,[Reg,AtomTrue]}|Acc])
     end;
 blockify([{test,is_atom,{f,Fail},[Reg]}=I|
-	  [{select_val,Reg,{f,Fail},
-	    {list,[{atom,true}=AtomTrue,{f,_}=BrTrue,
-		   {atom,false},{f,_}=BrFalse]}}|Is]=Is0],
+	  [{select,select_val,Reg,{f,Fail},
+	    [{atom,true}=AtomTrue,{f,_}=BrTrue,
+	     {atom,false},{f,_}=BrFalse]}|Is]=Is0],
 	 [{block,Bl}|_]=Acc) ->
     case is_last_bool(Bl, Reg) of
 	false ->
@@ -423,8 +420,8 @@ inverse_comp_op(_) -> none.
 %%% Evaluation of constant bit fields.
 %%%
 
-is_bs_put({bs_put_integer,_,_,_,_,_}) -> true;
-is_bs_put({bs_put_float,_,_,_,_,_}) -> true;
+is_bs_put({bs_put,_,{bs_put_integer,_,_},_}) -> true;
+is_bs_put({bs_put,_,{bs_put_float,_,_},_}) -> true;
 is_bs_put(_) -> false.
 
 collect_bs_puts(Is) ->
@@ -439,20 +436,24 @@ collect_bs_puts_1([I|Is]=Is0, Acc) ->
 opt_bs_puts(Is) ->
     opt_bs_1(Is, []).
 
-opt_bs_1([{bs_put_float,Fail,{integer,Sz},1,Flags0,Src}=I0|Is], Acc) ->
+opt_bs_1([{bs_put,Fail,
+	   {bs_put_float,1,Flags0},[{integer,Sz},Src]}=I0|Is], Acc) ->
     try eval_put_float(Src, Sz, Flags0) of
 	<<Int:Sz>> ->
 	    Flags = force_big(Flags0),
-	    I = {bs_put_integer,Fail,{integer,Sz},1,Flags,{integer,Int}},
+	    I = {bs_put,Fail,{bs_put_integer,1,Flags},
+		 [{integer,Sz},{integer,Int}]},
 	    opt_bs_1([I|Is], Acc)
     catch
 	error:_ ->
 	    opt_bs_1(Is, [I0|Acc])
     end;
-opt_bs_1([{bs_put_integer,_,{integer,8},1,_,{integer,_}}|_]=IsAll, Acc0) ->
+opt_bs_1([{bs_put,_,{bs_put_integer,1,_},[{integer,8},{integer,_}]}|_]=IsAll,
+	 Acc0) ->
     {Is,Acc} = bs_collect_string(IsAll, Acc0),
     opt_bs_1(Is, Acc);
-opt_bs_1([{bs_put_integer,Fail,{integer,Sz},1,F,{integer,N}}=I|Is0], Acc) when Sz > 8 ->
+opt_bs_1([{bs_put,Fail,{bs_put_integer,1,F},[{integer,Sz},{integer,N}]}=I|Is0],
+	 Acc) when Sz > 8 ->
     case field_endian(F) of
 	big ->
 	    %% We can do this optimization for any field size without risk
@@ -466,14 +467,14 @@ opt_bs_1([{bs_put_integer,Fail,{integer,Sz},1,F,{integer,N}}=I|Is0], Acc) when S
 	    %% an explosion in code size.
 	    <<Int:Sz>> = <<N:Sz/little>>,
 	    Flags = force_big(F),
-	    Is = [{bs_put_integer,Fail,{integer,Sz},1,
-		   Flags,{integer,Int}}|Is0],
+	    Is = [{bs_put,Fail,{bs_put_integer,1,Flags},
+		   [{integer,Sz},{integer,Int}]}|Is0],
 	    opt_bs_1(Is, Acc);
 	_ -> 					%native or too wide little field
 	    opt_bs_1(Is0, [I|Acc])
     end;
-opt_bs_1([{Op,Fail,{integer,Sz},U,F,Src}|Is], Acc) when U > 1 ->
-    opt_bs_1([{Op,Fail,{integer,U*Sz},1,F,Src}|Is], Acc);
+opt_bs_1([{bs_put,Fail,{Op,U,F},[{integer,Sz},Src]}|Is], Acc) when U > 1 ->
+    opt_bs_1([{bs_put,Fail,{Op,1,F},[{integer,U*Sz},Src]}|Is], Acc);
 opt_bs_1([I|Is], Acc) ->
     opt_bs_1(Is, [I|Acc]);
 opt_bs_1([], Acc) -> reverse(Acc).
@@ -489,17 +490,17 @@ eval_put_float(Src, Sz, Flags) when Sz =< 256 -> %Only evaluate if Sz is reasona
 value({integer,I}) -> I;
 value({float,F}) -> F.
 
-bs_collect_string(Is, [{bs_put_string,Len,{string,Str}}|Acc]) ->
+bs_collect_string(Is, [{bs_put,_,{bs_put_string,Len,{string,Str}},[]}|Acc]) ->
     bs_coll_str_1(Is, Len, reverse(Str), Acc);
 bs_collect_string(Is, Acc) ->
     bs_coll_str_1(Is, 0, [], Acc).
     
-bs_coll_str_1([{bs_put_integer,_,{integer,Sz},U,_,{integer,V}}|Is],
+bs_coll_str_1([{bs_put,_,{bs_put_integer,U,_},[{integer,Sz},{integer,V}]}|Is],
 	      Len, StrAcc, IsAcc) when U*Sz =:= 8 ->
     Byte = V band 16#FF,
     bs_coll_str_1(Is, Len+1, [Byte|StrAcc], IsAcc);
 bs_coll_str_1(Is, Len, StrAcc, IsAcc) ->
-    {Is,[{bs_put_string,Len,{string,reverse(StrAcc)}}|IsAcc]}.
+    {Is,[{bs_put,{f,0},{bs_put_string,Len,{string,reverse(StrAcc)}},[]}|IsAcc]}.
 
 field_endian({field_flags,F}) -> field_endian_1(F).
 
@@ -531,15 +532,17 @@ bs_split_int(N, Sz, Fail, Acc) ->
     bs_split_int_1(N, FirstByteSz, Sz, Fail, Acc).
 
 bs_split_int_1(-1, _, Sz, Fail, Acc) when Sz > 64 ->
-    I = {bs_put_integer,Fail,{integer,Sz},1,{field_flags,[big]},{integer,-1}},
+    I = {bs_put,Fail,{bs_put_integer,1,{field_flags,[big]}},
+	 [{integer,Sz},{integer,-1}]},
     [I|Acc];
 bs_split_int_1(0, _, Sz, Fail, Acc) when Sz > 64 ->
-    I = {bs_put_integer,Fail,{integer,Sz},1,{field_flags,[big]},{integer,0}},
+    I = {bs_put,Fail,{bs_put_integer,1,{field_flags,[big]}},
+	 [{integer,Sz},{integer,0}]},
     [I|Acc];
 bs_split_int_1(N, ByteSz, Sz, Fail, Acc) when Sz > 0 ->
     Mask = (1 bsl ByteSz) - 1,
-    I = {bs_put_integer,Fail,{integer,ByteSz},1,
-	 {field_flags,[big]},{integer,N band Mask}},
+    I = {bs_put,Fail,{bs_put_integer,1,{field_flags,[big]}},
+	 [{integer,ByteSz},{integer,N band Mask}]},
     bs_split_int_1(N bsr ByteSz, 8, Sz-ByteSz, Fail, [I|Acc]);
 bs_split_int_1(_, _, _, _, Acc) -> Acc.
 
@@ -577,9 +580,9 @@ bsm_reroute([{bs_restore2,Reg,Save}=I|Is], D, _, Acc) ->
     bsm_reroute(Is, D, {Reg,Save}, [I|Acc]);
 bsm_reroute([{label,_}=I|Is], D, S, Acc) ->
     bsm_reroute(Is, D, S, [I|Acc]);
-bsm_reroute([{select_val,Reg,F0,{list,Lbls0}}|Is], D, {_,Save}=S, Acc0) ->
+bsm_reroute([{select,select_val,Reg,F0,Lbls0}|Is], D, {_,Save}=S, Acc0) ->
     [F|Lbls] = bsm_subst_labels([F0|Lbls0], Save, D),
-    Acc = [{select_val,Reg,F,{list,Lbls}}|Acc0],
+    Acc = [{select,select_val,Reg,F,Lbls}|Acc0],
     bsm_reroute(Is, D, S, Acc);
 bsm_reroute([{test,TestOp,F0,TestArgs}=I|Is], D, {_,Save}=S, Acc0) ->
     F = bsm_subst_label(F0, Save, D),
@@ -615,10 +618,6 @@ bsm_opt_2([{test,bs_skip_bits2,F,[Ctx,{integer,I1},Unit1,_]}|Is],
 	  [{test,bs_skip_bits2,F,[Ctx,{integer,I2},Unit2,Flags]}|Acc]) ->
     bsm_opt_2(Is, [{test,bs_skip_bits2,F,
 		    [Ctx,{integer,I1*Unit1+I2*Unit2},1,Flags]}|Acc]);
-bsm_opt_2([{test,bs_match_string,F,[Ctx,Bin1]},
-	   {test,bs_match_string,F,[Ctx,Bin2]}|Is], Acc) ->
-    I = {test,bs_match_string,F,[Ctx,<<Bin1/bitstring,Bin2/bitstring>>]},
-    bsm_opt_2([I|Is], Acc);
 bsm_opt_2([I|Is], Acc) ->
     bsm_opt_2(Is, [I|Acc]);
 bsm_opt_2([], Acc) -> reverse(Acc).
diff --git a/lib/compiler/src/beam_bool.erl b/lib/compiler/src/beam_bool.erl
index d9ea6f5a70..81be262d6d 100644
--- a/lib/compiler/src/beam_bool.erl
+++ b/lib/compiler/src/beam_bool.erl
@@ -168,18 +168,18 @@ bopt_block(Reg, Fail, OldIs, [{block,Bl0}|Acc0], St0) ->
     end.
 
 %% ensure_opt_safe(OriginalCode, OptCode, FollowingCode, Fail,
-%%             ReversedPreceedingCode, State) -> ok
+%%             ReversedPrecedingCode, State) -> ok
 %%  Comparing the original code to the optimized code, determine
 %%  whether the optimized code is guaranteed to work in the same
 %%  way as the original code.
 %%
 %%  Throw an exception if the optimization is not safe.
 %%
-ensure_opt_safe(Bl, NewCode, OldIs, Fail, PreceedingCode, St) ->
+ensure_opt_safe(Bl, NewCode, OldIs, Fail, PrecedingCode, St) ->
     %% Here are the conditions that must be true for the
     %% optimization to be safe.
     %%
-    %% 1. If a register is INITIALIZED by PreceedingCode,
+    %% 1. If a register is INITIALIZED by PrecedingCode,
     %%    then if that register assigned a value in the original
     %%    code, but not in the optimized code, it must be UNUSED or KILLED
     %%    in the code that follows.
@@ -190,29 +190,50 @@ ensure_opt_safe(Bl, NewCode, OldIs, Fail, PreceedingCode, St) ->
     %%    by the code that follows.
     %%
     %% 3. Any register that is assigned a value in the optimized
-    %%    code must be UNUSED or KILLED in the following code
-    %%    (because the register might be assigned the wrong value,
-    %%    and even if the value is right it might no longer be
-    %%    assigned on *all* paths leading to its use).
+    %%    code must be UNUSED or KILLED in the following code,
+    %%    unless we can be sure that it is always assigned the same
+    %%    value.
 
-    InitInPreceeding = initialized_regs(PreceedingCode),
+    InitInPreceding = initialized_regs(PrecedingCode),
 
     PrevDst = dst_regs(Bl),
     NewDst = dst_regs(NewCode),
     NotSet = ordsets:subtract(PrevDst, NewDst),
-    MustBeKilled = ordsets:subtract(NotSet, InitInPreceeding),
-    MustBeUnused = ordsets:subtract(ordsets:union(NotSet, NewDst), MustBeKilled),
+    MustBeKilled = ordsets:subtract(NotSet, InitInPreceding),
 
     case all_killed(MustBeKilled, OldIs, Fail, St) of
 	false -> throw(all_registers_not_killed);
 	true -> ok
     end,
+    Same = assigned_same_value(Bl, NewCode),
+    MustBeUnused = ordsets:subtract(ordsets:union(NotSet, NewDst),
+				    ordsets:union(MustBeKilled, Same)),
     case none_used(MustBeUnused, OldIs, Fail, St) of
 	false -> throw(registers_used);
 	true -> ok
     end,
     ok.
 
+%% assigned_same_value(OldCode, NewCodeReversed) -> [DestinationRegs]
+%%  Return an ordset with a list of all y registers that are always
+%%  assigned the same value in the old and new code. Currently, we
+%%  are very conservative in that we only consider identical move
+%%  instructions in the same order.
+%%
+assigned_same_value(Old, New) ->
+    case reverse(New) of
+	[{block,Bl}|_] ->
+	    assigned_same_value(Old, Bl, []);
+	_ ->
+	    ordsets:new()
+    end.
+
+assigned_same_value([{set,[{y,_}=D],[S],move}|T1],
+		    [{set,[{y,_}=D],[S],move}|T2], Acc) ->
+    assigned_same_value(T1, T2, [D|Acc]);
+assigned_same_value(_, _, Acc) ->
+    ordsets:from_list(Acc).
+
 update_fail_label([{set,_,_,move}=I|Is], Fail, Acc) ->
     update_fail_label(Is, Fail, [I|Acc]);
 update_fail_label([{set,Ds,As,{bif,N,{f,_}}}|Is], Fail, Acc) ->
diff --git a/lib/compiler/src/beam_bsm.erl b/lib/compiler/src/beam_bsm.erl
index 1217f7f777..02794a8e18 100644
--- a/lib/compiler/src/beam_bsm.erl
+++ b/lib/compiler/src/beam_bsm.erl
@@ -204,16 +204,6 @@ btb_reaches_match_1(Is, Regs, D) ->
 btb_reaches_match_2([{block,Bl}|Is], Regs0, D) ->
     Regs = btb_reaches_match_block(Bl, Regs0),
     btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{call_only,Arity,{f,Lbl}}|_], Regs0, D) ->
-    Regs = btb_kill_not_live(Arity, Regs0),
-    btb_tail_call(Lbl, Regs, D);
-btb_reaches_match_2([{call_ext_only,Arity,Func}|_], Regs0, D) ->
-    Regs = btb_kill_not_live(Arity, Regs0),
-    btb_tail_call(Func, Regs, D);
-btb_reaches_match_2([{call_last,Arity,{f,Lbl},_}|_], Regs0, D) ->
-    Regs1 = btb_kill_not_live(Arity, Regs0),
-    Regs = btb_kill_yregs(Regs1),
-    btb_tail_call(Lbl, Regs, D);
 btb_reaches_match_2([{call,Arity,{f,Lbl}}|Is], Regs, D) ->
     btb_call(Arity, Lbl, Regs, Is, D);
 btb_reaches_match_2([{apply,Arity}|Is], Regs, D) ->
@@ -222,19 +212,16 @@ btb_reaches_match_2([{call_fun,Live}=I|Is], Regs, D) ->
     btb_call(Live, I, Regs, Is, D);
 btb_reaches_match_2([{make_fun2,_,_,_,Live}|Is], Regs, D) ->
     btb_call(Live, make_fun2, Regs, Is, D);
-btb_reaches_match_2([{call_ext,Arity,{extfunc,Mod,Name,Arity}=Func}|Is], Regs0, D) ->
+btb_reaches_match_2([{call_ext,Arity,Func}=I|Is], Regs0, D) ->
     %% Allow us scanning beyond the call in case the match
     %% context is saved on the stack.
-    case erl_bifs:is_exit_bif(Mod, Name, Arity) of
+    case beam_jump:is_exit_instruction(I) of
 	false ->
 	    btb_call(Arity, Func, Regs0, Is, D);
 	true ->
 	    Regs = btb_kill_not_live(Arity, Regs0),
 	    btb_tail_call(Func, Regs, D)
     end;
-btb_reaches_match_2([{call_ext_last,Arity,_,_}=I|_], Regs, D) ->
-    btb_ensure_not_used(btb_regs_from_arity(Arity), I, Regs),
-    D;
 btb_reaches_match_2([{kill,Y}|Is], Regs, D) ->
     btb_reaches_match_1(Is, btb_kill([Y], Regs), D);
 btb_reaches_match_2([{deallocate,_}|Is], Regs0, D) ->
@@ -254,21 +241,45 @@ btb_reaches_match_2([{bif,_,{f,F},Ss,Dst}=I|Is], Regs0, D0) ->
     Regs = btb_kill([Dst], Regs0),
     D = btb_follow_branch(F, Regs, D0),
     btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{test,bs_start_match2,_,_,[Ctx,_],Ctx}|Is], Regs, D) ->
-    case btb_context_regs(Regs) of
-	[Ctx] ->
-	    D;
-	CtxRegs ->
-	    case member(Ctx, CtxRegs) of
-		false -> btb_reaches_match_2(Is, Regs, D);
-		true -> btb_error(unsuitable_bs_start_match)
+btb_reaches_match_2([{test,bs_start_match2,{f,F},Live,[Ctx,_],Ctx}=I|Is],
+		    Regs0, D0) ->
+    CtxRegs = btb_context_regs(Regs0),
+    case member(Ctx, CtxRegs) of
+	false ->
+	    %% This bs_start_match2 instruction does not use "our"
+	    %% match state. Therefore we can continue the search
+	    %% for another bs_start_match2 instruction.
+	    D = btb_follow_branch(F, Regs0, D0),
+	    Regs = btb_kill_not_live(Live, Regs0),
+	    btb_reaches_match_2(Is, Regs, D);
+	true ->
+	    %% OK. This instruction will use "our" match state,
+	    %% but we must make sure that all other copies of the
+	    %% match state are killed in the code that follows
+	    %% the instruction. (We know that the fail branch cannot
+	    %% be taken in this case.)
+	    OtherCtxRegs = CtxRegs -- [Ctx],
+	    case btb_are_all_unused(OtherCtxRegs, Is, D0) of
+		false -> btb_error({OtherCtxRegs,not_all_unused_after,I});
+		true -> D0
 	    end
     end;
-btb_reaches_match_2([{test,bs_start_match2,_,_,[Bin,_],Ctx}|Is], Regs, D) ->
-    CtxRegs = btb_context_regs(Regs),
+btb_reaches_match_2([{test,bs_start_match2,{f,F},Live,[Bin,_],Ctx}|Is],
+		    Regs0, D0) ->
+    CtxRegs = btb_context_regs(Regs0),
     case member(Bin, CtxRegs) orelse member(Ctx, CtxRegs) of
-	false -> btb_reaches_match_2(Is, Regs, D);
-	true -> btb_error(unsuitable_bs_start_match)
+	false ->
+	    %% This bs_start_match2 does not reference any copy of the
+	    %% match state. Therefore it can safely be passed on the
+	    %% way to another (perhaps more suitable) bs_start_match2
+	    %% instruction.
+	    D = btb_follow_branch(F, Regs0, D0),
+	    Regs = btb_kill_not_live(Live, Regs0),
+	    btb_reaches_match_2(Is, Regs, D);
+	true ->
+	    %% This variant of the bs_start_match2 instruction does
+	    %% not accept a match state as source.
+	    btb_error(unsuitable_bs_start_match)
     end;
 btb_reaches_match_2([{test,_,{f,F},Ss}=I|Is], Regs, D0) ->
     btb_ensure_not_used(Ss, I, Regs),
@@ -278,12 +289,7 @@ btb_reaches_match_2([{test,_,{f,F},_,Ss,_}=I|Is], Regs, D0) ->
     btb_ensure_not_used(Ss, I, Regs),
     D = btb_follow_branch(F, Regs, D0),
     btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{select_val,Src,{f,F},{list,Conds}}=I|Is], Regs, D0) ->
-    btb_ensure_not_used([Src], I, Regs),
-    D1 = btb_follow_branch(F, Regs, D0),
-    D = btb_follow_branches(Conds, Regs, D1),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{select_tuple_arity,Src,{f,F},{list,Conds}}=I|Is], Regs, D0) ->
+btb_reaches_match_2([{select,_,Src,{f,F},Conds}=I|Is], Regs, D0) ->
     btb_ensure_not_used([Src], I, Regs),
     D1 = btb_follow_branch(F, Regs, D0),
     D = btb_follow_branches(Conds, Regs, D1),
@@ -293,46 +299,11 @@ btb_reaches_match_2([{jump,{f,Lbl}}|_], Regs, #btb{index=Li}=D) ->
     btb_reaches_match_2(Is, Regs, D);
 btb_reaches_match_2([{label,_}|Is], Regs, D) ->
     btb_reaches_match_2(Is, Regs, D);
-btb_reaches_match_2([{bs_add,{f,0},_,Dst}|Is], Regs, D) ->
-    btb_reaches_match_1(Is, btb_kill([Dst], Regs), D);
-btb_reaches_match_2([bs_init_writable|Is], Regs0, D) ->
-    Regs = btb_kill_not_live(0, Regs0),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{bs_init2,{f,0},_,_,_,_,Dst}|Is], Regs, D) ->
-    btb_reaches_match_1(Is, btb_kill([Dst], Regs), D);
-btb_reaches_match_2([{bs_init_bits,{f,0},_,_,_,_,Dst}|Is], Regs, D) ->
-    btb_reaches_match_1(Is, btb_kill([Dst], Regs), D);
-btb_reaches_match_2([{bs_append,{f,0},_,_,_,_,Src,_,Dst}=I|Is], Regs, D) ->
-    btb_ensure_not_used([Src], I, Regs),
-    btb_reaches_match_1(Is, btb_kill([Dst], Regs), D);
-btb_reaches_match_2([{bs_private_append,{f,0},_,_,Src,_,Dst}=I|Is], Regs, D) ->
-    btb_ensure_not_used([Src], I, Regs),
-    btb_reaches_match_1(Is, btb_kill([Dst], Regs), D);
-btb_reaches_match_2([{bs_put_integer,{f,0},_,_,_,Src}=I|Is], Regs, D) ->
-    btb_ensure_not_used([Src], I, Regs),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{bs_put_float,{f,0},_,_,_,Src}=I|Is], Regs, D) ->
-    btb_ensure_not_used([Src], I, Regs),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{bs_put_binary,{f,0},_,_,_,Src}=I|Is], Regs, D) ->
-    btb_ensure_not_used([Src], I, Regs),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{bs_put_string,_,_}|Is], Regs, D) ->
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{bs_utf8_size,_,Src,Dst}=I|Is], Regs, D) ->
-    btb_ensure_not_used([Src], I, Regs),
-    btb_reaches_match_1(Is, btb_kill([Dst], Regs), D);
-btb_reaches_match_2([{bs_utf16_size,_,Src,Dst}=I|Is], Regs, D) ->
-    btb_ensure_not_used([Src], I, Regs),
+btb_reaches_match_2([{bs_init,{f,0},_,_,Ss,Dst}=I|Is], Regs, D) ->
+    btb_ensure_not_used(Ss, I, Regs),
     btb_reaches_match_1(Is, btb_kill([Dst], Regs), D);
-btb_reaches_match_2([{bs_put_utf8,_,_,Src}=I|Is], Regs, D) ->
-    btb_ensure_not_used([Src], I, Regs),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{bs_put_utf16,_,_,Src}=I|Is], Regs, D) ->
-    btb_ensure_not_used([Src], I, Regs),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{bs_put_utf32,_,_,Src}=I|Is], Regs, D) ->
-    btb_ensure_not_used([Src], I, Regs),
+btb_reaches_match_2([{bs_put,{f,0},_,Ss}=I|Is], Regs, D) ->
+    btb_ensure_not_used(Ss, I, Regs),
     btb_reaches_match_1(Is, Regs, D);
 btb_reaches_match_2([{bs_restore2,Src,_}=I|Is], Regs0, D) ->
     case btb_contains_context(Src, Regs0) of
@@ -340,11 +311,11 @@ btb_reaches_match_2([{bs_restore2,Src,_}=I|Is], Regs0, D) ->
 	    btb_reaches_match_1(Is, Regs0, D);
 	true ->
 	    %% Check that all other copies of the context registers
-	    %% are killed by the following instructions.
+	    %% are unused by the following instructions.
 	    Regs = btb_kill([Src], Regs0),
 	    CtxRegs = btb_context_regs(Regs),
-	    case btb_are_all_killed(CtxRegs, Is, D) of
-		false -> btb_error({CtxRegs,not_all_killed_after,I});
+	    case btb_are_all_unused(CtxRegs, Is, D) of
+		false -> btb_error({CtxRegs,not_all_unused_after,I});
 		true -> D#btb{must_not_save=true}
 	    end
     end;
@@ -354,11 +325,11 @@ btb_reaches_match_2([{bs_context_to_binary,Src}=I|Is], Regs0, D) ->
 	    btb_reaches_match_1(Is, Regs0, D);
 	true ->
 	    %% Check that all other copies of the context registers
-	    %% are killed by the following instructions.
+	    %% are unused by the following instructions.
 	    Regs = btb_kill([Src], Regs0),
 	    CtxRegs = btb_context_regs(Regs),
-	    case btb_are_all_killed(CtxRegs, Is, D) of
-		false -> btb_error({CtxRegs,not_all_killed_after,I});
+	    case btb_are_all_unused(CtxRegs, Is, D) of
+		false -> btb_error({CtxRegs,not_all_unused_after,I});
 		true -> D#btb{must_not_save=true}
 	    end
     end;
@@ -389,13 +360,16 @@ btb_call(Arity, Lbl, Regs0, Is, D0) ->
 	    %% First handle the call as if it were a tail call.
 	    D = btb_tail_call(Lbl, Regs, D0),
 
-	    %% No problem so far, but now we must make sure that
-	    %% we don't have any copies of the match context
-	    %% tucked away in an y register.
+	    %% No problem so far (the called function can handle a
+	    %% match context). Now we must make sure that the rest
+	    %% of this function following the call does not attempt
+	    %% to use the match context in case there is a copy
+	    %% tucked away in a y register.
 	    RegList = btb_context_regs(Regs),
-	    case [R || {y,_}=R <- RegList] of
-		[] -> D;
-		[_|_] -> btb_error({multiple_uses,RegList})
+	    YRegs = [R || {y,_}=R <- RegList],
+	    case btb_are_all_unused(YRegs, Is, D) of
+		true -> D;
+		false -> btb_error({multiple_uses,RegList})
 	    end;
 	true ->
 	    %% No match context in any x register. It could have been
@@ -475,21 +449,12 @@ btb_reaches_match_block([{set,Ds,Ss,_}=I|Is], Regs0) ->
 btb_reaches_match_block([], Regs) ->
     Regs.
 
-%% btb_regs_from_arity(Arity) -> [Register])
-%%  Create a list of x registers from a function arity.
-
-btb_regs_from_arity(Arity) ->
-    btb_regs_from_arity_1(Arity, []).
-
-btb_regs_from_arity_1(0, Acc) -> Acc;
-btb_regs_from_arity_1(N, Acc) -> btb_regs_from_arity_1(N-1, [{x,N-1}|Acc]).
-
 %% btb_are_all_killed([Register], [Instruction], D) -> true|false
-%%  Test whether all of the register are killed in the instruction stream.
+%%  Test whether all of the register are unused in the instruction stream.
 
-btb_are_all_killed(RegList, Is, #btb{index=Li}) ->
+btb_are_all_unused(RegList, Is, #btb{index=Li}) ->
     all(fun(R) ->
-		beam_utils:is_killed(R, Is, Li)
+		beam_utils:is_not_used(R, Is, Li)
 	end, RegList).
 
 %% btp_regs_from_list([Register]) -> RegisterSet.
diff --git a/lib/compiler/src/beam_clean.erl b/lib/compiler/src/beam_clean.erl
index a7994ab3b3..26ba93b91c 100644
--- a/lib/compiler/src/beam_clean.erl
+++ b/lib/compiler/src/beam_clean.erl
@@ -74,10 +74,6 @@ find_all_used([], _All, Used) -> Used.
 
 update_work_list([{call,_,{f,L}}|Is], Sets) ->
     update_work_list(Is, add_to_work_list(L, Sets));
-update_work_list([{call_last,_,{f,L},_}|Is], Sets) ->
-    update_work_list(Is, add_to_work_list(L, Sets));
-update_work_list([{call_only,_,{f,L}}|Is], Sets) ->
-    update_work_list(Is, add_to_work_list(L, Sets));
 update_work_list([{make_fun2,{f,L},_,_,_}|Is], Sets) ->
     update_work_list(Is, add_to_work_list(L, Sets));
 update_work_list([_|Is], Sets) ->
@@ -200,7 +196,7 @@ replace([{test,Test,{f,Lbl},Ops}|Is], Acc, D) ->
     replace(Is, [{test,Test,{f,label(Lbl, D)},Ops}|Acc], D);
 replace([{test,Test,{f,Lbl},Live,Ops,Dst}|Is], Acc, D) ->
     replace(Is, [{test,Test,{f,label(Lbl, D)},Live,Ops,Dst}|Acc], D);
-replace([{select_val,R,{f,Fail0},{list,Vls0}}|Is], Acc, D) ->
+replace([{select,I,R,{f,Fail0},Vls0}|Is], Acc, D) ->
     Vls1 = map(fun ({f,L}) -> {f,label(L, D)};
 		   (Other) -> Other end, Vls0),
     Fail = label(Fail0, D),
@@ -210,12 +206,8 @@ replace([{select_val,R,{f,Fail0},{list,Vls0}}|Is], Acc, D) ->
 	    %% Convert to a plain jump.
 	    replace(Is, [{jump,{f,Fail}}|Acc], D);
 	Vls ->
-	    replace(Is, [{select_val,R,{f,Fail},{list,Vls}}|Acc], D)
+	    replace(Is, [{select,I,R,{f,Fail},Vls}|Acc], D)
     end;
-replace([{select_tuple_arity,R,{f,Fail},{list,Vls0}}|Is], Acc, D) ->
-    Vls = map(fun ({f,L}) -> {f,label(L, D)};
-		  (Other) -> Other end, Vls0),
-    replace(Is, [{select_tuple_arity,R,{f,label(Fail, D)},{list,Vls}}|Acc], D);
 replace([{'try',R,{f,Lbl}}|Is], Acc, D) ->
     replace(Is, [{'try',R,{f,label(Lbl, D)}}|Acc], D);
 replace([{'catch',R,{f,Lbl}}|Is], Acc, D) ->
@@ -236,37 +228,12 @@ replace([{gc_bif,Name,{f,Lbl},Live,As,R}|Is], Acc, D) when Lbl =/= 0 ->
     replace(Is, [{gc_bif,Name,{f,label(Lbl, D)},Live,As,R}|Acc], D);
 replace([{call,Ar,{f,Lbl}}|Is], Acc, D) ->
     replace(Is, [{call,Ar,{f,label(Lbl,D)}}|Acc], D);
-replace([{call_last,Ar,{f,Lbl},N}|Is], Acc, D) ->
-    replace(Is, [{call_last,Ar,{f,label(Lbl,D)},N}|Acc], D);
-replace([{call_only,Ar,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{call_only,Ar,{f,label(Lbl, D)}}|Acc], D);
 replace([{make_fun2,{f,Lbl},U1,U2,U3}|Is], Acc, D) ->
     replace(Is, [{make_fun2,{f,label(Lbl, D)},U1,U2,U3}|Acc], D);
-replace([{bs_init2,{f,Lbl},Sz,Words,R,F,Dst}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_init2,{f,label(Lbl, D)},Sz,Words,R,F,Dst}|Acc], D);
-replace([{bs_init_bits,{f,Lbl},Sz,Words,R,F,Dst}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_init_bits,{f,label(Lbl, D)},Sz,Words,R,F,Dst}|Acc], D);
-replace([{bs_put_integer,{f,Lbl},Bits,Unit,Fl,Val}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_put_integer,{f,label(Lbl, D)},Bits,Unit,Fl,Val}|Acc], D);
-replace([{bs_put_utf8=I,{f,Lbl},Fl,Val}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{I,{f,label(Lbl, D)},Fl,Val}|Acc], D);
-replace([{bs_put_utf16=I,{f,Lbl},Fl,Val}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{I,{f,label(Lbl, D)},Fl,Val}|Acc], D);
-replace([{bs_put_utf32=I,{f,Lbl},Fl,Val}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{I,{f,label(Lbl, D)},Fl,Val}|Acc], D);
-replace([{bs_put_binary,{f,Lbl},Bits,Unit,Fl,Val}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_put_binary,{f,label(Lbl, D)},Bits,Unit,Fl,Val}|Acc], D);
-replace([{bs_put_float,{f,Lbl},Bits,Unit,Fl,Val}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_put_float,{f,label(Lbl, D)},Bits,Unit,Fl,Val}|Acc], D);
-replace([{bs_add,{f,Lbl},Src,Dst}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_add,{f,label(Lbl, D)},Src,Dst}|Acc], D);
-replace([{bs_append,{f,Lbl},_,_,_,_,_,_,_}=I0|Is], Acc, D) when Lbl =/= 0 ->
-    I = setelement(2, I0, {f,label(Lbl, D)}),
-    replace(Is, [I|Acc], D);
-replace([{bs_utf8_size=I,{f,Lbl},Src,Dst}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{I,{f,label(Lbl, D)},Src,Dst}|Acc], D);
-replace([{bs_utf16_size=I,{f,Lbl},Src,Dst}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{I,{f,label(Lbl, D)},Src,Dst}|Acc], D);
+replace([{bs_init,{f,Lbl},Info,Live,Ss,Dst}|Is], Acc, D) when Lbl =/= 0 ->
+    replace(Is, [{bs_init,{f,label(Lbl, D)},Info,Live,Ss,Dst}|Acc], D);
+replace([{bs_put,{f,Lbl},Info,Ss}|Is], Acc, D) when Lbl =/= 0 ->
+    replace(Is, [{bs_put,{f,label(Lbl, D)},Info,Ss}|Acc], D);
 replace([I|Is], Acc, D) ->
     replace(Is, [I|Acc], D);
 replace([], Acc, _) -> Acc.
diff --git a/lib/compiler/src/beam_dead.erl b/lib/compiler/src/beam_dead.erl
index 5f12a98f09..92d8e5acb3 100644
--- a/lib/compiler/src/beam_dead.erl
+++ b/lib/compiler/src/beam_dead.erl
@@ -182,7 +182,7 @@ forward(Is, Lc) ->
 forward([{block,[]}|Is], D, Lc, Acc) ->
     %% Empty blocks can prevent optimizations.
     forward(Is, D, Lc, Acc);
-forward([{select_val,Reg,_,{list,List}}=I|Is], D0, Lc, Acc) ->
+forward([{select,select_val,Reg,_,List}=I|Is], D0, Lc, Acc) ->
     D = update_value_dict(List, Reg, D0),
     forward(Is, D, Lc, [I|Acc]);
 forward([{label,Lbl}=LblI,{block,[{set,[Dst],[Lit],move}|BlkIs]}=Blk|Is], D, Lc, Acc) ->
@@ -271,11 +271,11 @@ backward([{test,is_eq_exact,Fail,[Dst,{integer,Arity}]}=I|
     end;
 backward([{label,Lbl}=L|Is], D, Acc) ->
     backward(Is, beam_utils:index_label(Lbl, Acc, D), [L|Acc]);
-backward([{select_val,Reg,{f,Fail0},{list,List0}}|Is], D, Acc) ->
+backward([{select,select_val,Reg,{f,Fail0},List0}|Is], D, Acc) ->
     List = shortcut_select_list(List0, Reg, D, []),
     Fail1 = shortcut_label(Fail0, D),
     Fail = shortcut_bs_test(Fail1, Is, D),
-    Sel = {select_val,Reg,{f,Fail},{list,List}},
+    Sel = {select,select_val,Reg,{f,Fail},List},
     backward(Is, D, [Sel|Acc]);
 backward([{jump,{f,To0}},{move,Src,Reg}=Move0|Is], D, Acc) ->
     {To,Move} = case Src of
@@ -382,7 +382,7 @@ shortcut_select_label(To0, Reg, Val, D) ->
     case beam_utils:code_at(To0, D) of
  	[{jump,{f,To}}|_] ->
  	    shortcut_select_label(To, Reg, Val, D);
-	[{test,is_atom,_,[Reg]},{select_val,Reg,{f,Fail},{list,Map}}|_] ->
+	[{test,is_atom,_,[Reg]},{select,select_val,Reg,{f,Fail},Map}|_] ->
 	    To = find_select_val(Map, Val, Fail),
 	    shortcut_select_label(To, Reg, Val, D);
   	[{test,is_eq_exact,{f,_},[Reg,{atom,Val}]},{label,To}|_] when is_atom(Val) ->
@@ -472,10 +472,10 @@ combine_eqs(To, [Reg,{Type,_}=Lit1]=Ops, D, [{label,L1}|_])
     case beam_utils:code_at(To, D) of
 	[{test,is_eq_exact,{f,F2},[Reg,{Type,_}=Lit2]},
 	 {label,L2}|_] when Lit1 =/= Lit2 ->
-	    {select_val,Reg,{f,F2},{list,[Lit1,{f,L1},Lit2,{f,L2}]}};
-	[{select_val,Reg,{f,F2},{list,[{Type,_}|_]=List0}}|_] ->
+	    {select,select_val,Reg,{f,F2},[Lit1,{f,L1},Lit2,{f,L2}]};
+	[{select,select_val,Reg,{f,F2},[{Type,_}|_]=List0}|_] ->
 	    List = remove_from_list(Lit1, List0),
-	    {select_val,Reg,{f,F2},{list,[Lit1,{f,L1}|List]}};
+	    {select,select_val,Reg,{f,F2},[Lit1,{f,L1}|List]};
 	_Is ->
 	    {test,is_eq_exact,{f,To},Ops}
 	end;
@@ -527,6 +527,8 @@ count_bits_matched([{test,_,_,_,[_,Sz,U,{field_flags,_}],_}|Is], SavePoint, Bits
 	{integer,N} -> count_bits_matched(Is, SavePoint, Bits+N*U);
 	_ -> count_bits_matched(Is, SavePoint, Bits)
     end;
+count_bits_matched([{test,bs_match_string,_,[_,Bits,_]}|Is], SavePoint, Bits0) ->
+    count_bits_matched(Is, SavePoint, Bits0+Bits);
 count_bits_matched([{test,_,_,_}|Is], SavePoint, Bits) ->
     count_bits_matched(Is, SavePoint, Bits);
 count_bits_matched([{bs_save2,Reg,SavePoint}|_], {Reg,SavePoint}, Bits) ->
diff --git a/lib/compiler/src/beam_except.erl b/lib/compiler/src/beam_except.erl
index fb1a43cd9e..14e9943f88 100644
--- a/lib/compiler/src/beam_except.erl
+++ b/lib/compiler/src/beam_except.erl
@@ -65,10 +65,6 @@ function_1(Is0) ->
 
 translate([{call_ext,Ar,{extfunc,erlang,error,Ar}}=I|Is], St, Acc) ->
     translate_1(Ar, I, Is, St, Acc);
-translate([{call_ext_only,Ar,{extfunc,erlang,error,Ar}}=I|Is], St, Acc) ->
-    translate_1(Ar, I, Is, St, Acc);
-translate([{call_ext_last,Ar,{extfunc,erlang,error,Ar},_}=I|Is], St, Acc) ->
-    translate_1(Ar, I, Is, St, Acc);
 translate([I|Is], St, Acc) ->
     translate(Is, St, [I|Acc]);
 translate([], _, Acc) ->
diff --git a/lib/compiler/src/beam_flatten.erl b/lib/compiler/src/beam_flatten.erl
index 6c7cb849aa..04232d8fd2 100644
--- a/lib/compiler/src/beam_flatten.erl
+++ b/lib/compiler/src/beam_flatten.erl
@@ -79,49 +79,28 @@ norm_allocate({nozero,Ns,Nh,Inits}, Regs) ->
 
 %% insert_alloc_in_bs_init(ReverseInstructionStream, AllocationInfo) ->
 %%                                  impossible | ReverseInstructionStream'
-%%   A bs_init2/6 instruction should not be followed by a test heap instruction.
+%%   A bs_init/6 instruction should not be followed by a test heap instruction.
 %%   Given the AllocationInfo from a test heap instruction, merge the
-%%   allocation amounts into the previous bs_init2/6 instruction (if any).
+%%   allocation amounts into the previous bs_init/6 instruction (if any).
 %%
-insert_alloc_in_bs_init([I|_]=Is, Alloc) ->
-    case is_bs_constructor(I) of
-	false -> impossible;
-	true -> insert_alloc_1(Is, Alloc, [])
-    end.
-
-insert_alloc_1([{bs_init2=Op,Fail,Bs,Ws1,Regs,F,Dst}|Is], {_,nostack,Ws2,[]}, Acc) ->
-    Al = beam_utils:combine_heap_needs(Ws1, Ws2),
-    I = {Op,Fail,Bs,Al,Regs,F,Dst},
-    reverse(Acc, [I|Is]);
-insert_alloc_1([{bs_init_bits=Op,Fail,Bs,Ws1,Regs,F,Dst}|Is], {_,nostack,Ws2,[]}, Acc) ->
-    Al = beam_utils:combine_heap_needs(Ws1, Ws2),
-    I = {Op,Fail,Bs,Al,Regs,F,Dst},
-    reverse(Acc, [I|Is]);
-insert_alloc_1([{bs_append,Fail,Sz,Ws1,Regs,U,Bin,Fl,Dst}|Is],
-	       {_,nostack,Ws2,[]}, Acc) ->
+insert_alloc_in_bs_init([{bs_put,_,_,_}=I|Is], Alloc) ->
+    %% The instruction sequence ends with an bs_put/4 instruction.
+    %% We'll need to search backwards for the bs_init/6 instruction.
+    insert_alloc_1(Is, Alloc, [I]);
+insert_alloc_in_bs_init(_, _) -> impossible.
+
+insert_alloc_1([{bs_init=Op,Fail,Info0,Live,Ss,Dst}|Is],
+	       {_,nostack,Ws2,[]}, Acc) when is_integer(Live) ->
+    %% The number of extra heap words is always in the second position
+    %% in the Info tuple.
+    Ws1 = element(2, Info0),
     Al = beam_utils:combine_heap_needs(Ws1, Ws2),
-    I = {bs_append,Fail,Sz,Al,Regs,U,Bin,Fl,Dst},
+    Info = setelement(2, Info0, Al),
+    I = {Op,Fail,Info,Live,Ss,Dst},
     reverse(Acc, [I|Is]);
-insert_alloc_1([I|Is], Alloc, Acc) ->
+insert_alloc_1([{bs_put,_,_,_}=I|Is], Alloc, Acc) ->
     insert_alloc_1(Is, Alloc, [I|Acc]).
 
-
-%% is_bs_constructor(Instruction) -> true|false.
-%%  Test whether the instruction is a bit syntax construction
-%%  instruction that can occur at the end of a bit syntax
-%%  construction. (Since an empty binary would be expressed
-%%  as a literal, the bs_init2/6 instruction will not occur
-%%  at the end and therefore it is no need to test for it here.)
-%%
-is_bs_constructor({bs_put_integer,_,_,_,_,_}) -> true;
-is_bs_constructor({bs_put_utf8,_,_,_}) -> true;
-is_bs_constructor({bs_put_utf16,_,_,_}) -> true;
-is_bs_constructor({bs_put_utf32,_,_,_}) -> true;
-is_bs_constructor({bs_put_float,_,_,_,_,_}) -> true;
-is_bs_constructor({bs_put_binary,_,_,_,_,_}) -> true;
-is_bs_constructor({bs_put_string,_,_}) -> true;
-is_bs_constructor(_) -> false.
-
 %% opt(Is0) -> Is
 %%  Simple peep-hole optimization to move a {move,Any,{x,0}} past
 %%  any kill up to the next call instruction. (To give the loader
diff --git a/lib/compiler/src/beam_jump.erl b/lib/compiler/src/beam_jump.erl
index db67d24514..636c299e47 100644
--- a/lib/compiler/src/beam_jump.erl
+++ b/lib/compiler/src/beam_jump.erl
@@ -20,7 +20,7 @@
 
 -module(beam_jump).
 
--export([module/2,module_labels/1,
+-export([module/2,
 	 is_unreachable_after/1,is_exit_instruction/1,
 	 remove_unused_labels/1,is_label_used_in/2]).
 
@@ -46,10 +46,13 @@
 %%%     such as a jump that never transfers control to the instruction
 %%%     following it.
 %%%
-%%% (2) case_end, if_end, and badmatch, and function calls that cause an
-%%%     exit (such as calls to exit/1) are moved to the end of the function.
-%%%     The purpose is to allow further optimizations at the place from
-%%%     which the code was moved.
+%%% (2) Short sequences starting with a label and ending in case_end, if_end,
+%%%     and badmatch, and function calls that cause an exit (such as calls
+%%%     to exit/1) are moved to the end of the function, but only if the
+%%%     the block is not entered via a fallthrough. The purpose of this move
+%%%     is to allow further optimizations at the place from which the
+%%%     code was moved (a jump around the block could be replaced with a
+%%%     fallthrough).
 %%%
 %%% (3) Any unreachable code is removed.  Unreachable code is code
 %%%     after jump, call_last and other instructions which never
@@ -130,13 +133,6 @@ module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
     Fs = [function(F) || F <- Fs0],
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
-module_labels({Mod,Exp,Attr,Fs,Lc}) ->
-    {Mod,Exp,Attr,[function_labels(F) || F <- Fs],Lc}.
-
-function_labels({function,Name,Arity,CLabel,Asm0}) ->
-    Asm = remove_unused_labels(Asm0),
-    {function,Name,Arity,CLabel,Asm}.    
-
 %% function(Function) -> Function'
 %%  Optimize jumps and branches.
 %%
@@ -224,6 +220,8 @@ extract_seq([{line,_}=Line|Is], Acc) ->
     extract_seq(Is, [Line|Acc]);
 extract_seq([{block,_}=Bl|Is], Acc) ->
     extract_seq_1(Is, [Bl|Acc]);
+extract_seq([{bs_context_to_binary,_}=I|Is], Acc) ->
+    extract_seq_1(Is, [I|Acc]);
 extract_seq([{label,_}|_]=Is, Acc) ->
     extract_seq_1(Is, Acc);
 extract_seq(_, _) -> no.
@@ -232,6 +230,9 @@ extract_seq_1([{line,_}=Line|Is], Acc) ->
     extract_seq_1(Is, [Line|Acc]);
 extract_seq_1([{label,_},{func_info,_,_,_}|_], _) ->
     no;
+extract_seq_1([{label,Lbl},{jump,{f,Lbl}}|_], _) ->
+    %% Don't move a sequence which have a fallthrough entering it.
+    no;
 extract_seq_1([{label,_}=Lbl|Is], Acc) ->
     {yes,[Lbl|Acc],Is};
 extract_seq_1(_, _) -> no.
@@ -260,43 +261,39 @@ find_fixpoint(OptFun, Is0) ->
 	Is -> find_fixpoint(OptFun, Is)
     end.
 
-opt([{test,Test0,{f,Lnum}=Lbl,Ops}=I|Is0], Acc, St) ->
-    case Is0 of
-	[{jump,{f,Lnum}}|Is] ->
-	    %% We have
-	    %%    Test Label Ops
-	    %%    jump Label
-	    %% The test instruction is definitely not needed.
-	    %% The jump instruction is not needed if there is
-	    %% a definition of Label following the jump instruction.
-	    case is_label_defined(Is, Lnum) of
-		false ->
-		    %% The jump instruction is still needed.
-		    opt(Is0, [I|Acc], label_used(Lbl, St));
-		true ->
-		    %% Neither the test nor the jump are needed.
-		    opt(Is, Acc, St)
-	    end;
-	[{jump,To}|Is] ->
-	    case is_label_defined(Is, Lnum) of
-		false ->
+opt([{test,_,{f,L}=Lbl,_}=I|[{jump,{f,L}}|_]=Is], Acc, St) ->
+    %% We have
+    %%    Test Label Ops
+    %%    jump Label
+    %% The test instruction is not needed if the test is pure
+    %% (it modifies neither registers nor bit syntax state).
+    case beam_utils:is_pure_test(I) of
+	false ->
+	    %% Test is not pure; we must keep it.
+	    opt(Is, [I|Acc], label_used(Lbl, St));
+	true ->
+	    %% The test is pure and its failure label is the same
+	    %% as in the jump that follows -- thus it is not needed.
+	    opt(Is, Acc, St)
+    end;
+opt([{test,Test0,{f,L}=Lbl,Ops}=I|[{jump,To}|Is]=Is0], Acc, St) ->
+    case is_label_defined(Is, L) of
+	false ->
+	    opt(Is0, [I|Acc], label_used(Lbl, St));
+	true ->
+	    case invert_test(Test0) of
+		not_possible ->
 		    opt(Is0, [I|Acc], label_used(Lbl, St));
-		true ->
-		    case invert_test(Test0) of
-			not_possible ->
-			    opt(Is0, [I|Acc], label_used(Lbl, St));
-			Test ->
-			    opt([{test,Test,To,Ops}|Is], Acc, St)
-		    end
-	    end;
-	_Other ->
-	    opt(Is0, [I|Acc], label_used(Lbl, St))
+		Test ->
+		    %% Invert the test and remove the jump.
+		    opt([{test,Test,To,Ops}|Is], Acc, St)
+	    end
     end;
+opt([{test,_,{f,_}=Lbl,_}=I|Is], Acc, St) ->
+    opt(Is, [I|Acc], label_used(Lbl, St));
 opt([{test,_,{f,_}=Lbl,_,_,_}=I|Is], Acc, St) ->
     opt(Is, [I|Acc], label_used(Lbl, St));
-opt([{select_val,_R,Fail,{list,Vls}}=I|Is], Acc, St) ->
-    skip_unreachable(Is, [I|Acc], label_used([Fail|Vls], St));
-opt([{select_tuple_arity,_R,Fail,{list,Vls}}=I|Is], Acc, St) ->
+opt([{select,_,_R,Fail,Vls}=I|Is], Acc, St) ->
     skip_unreachable(Is, [I|Acc], label_used([Fail|Vls], St));
 opt([{label,L}=I|Is], Acc, #st{entry=L}=St) ->
     %% NEVER move the entry label.
@@ -412,14 +409,8 @@ is_label_used(L, St) ->
 
 is_unreachable_after({func_info,_M,_F,_A}) -> true;
 is_unreachable_after(return) -> true;
-is_unreachable_after({call_ext_last,_Ar,_ExtFunc,_D}) -> true;
-is_unreachable_after({call_ext_only,_Ar,_ExtFunc}) -> true;
-is_unreachable_after({call_last,_Ar,_Lbl,_D}) -> true;
-is_unreachable_after({call_only,_Ar,_Lbl}) -> true;
-is_unreachable_after({apply_last,_Ar,_N}) -> true;
 is_unreachable_after({jump,_Lbl}) -> true;
-is_unreachable_after({select_val,_R,_Lbl,_Cases}) -> true;
-is_unreachable_after({select_tuple_arity,_R,_Lbl,_Cases}) -> true;
+is_unreachable_after({select,_What,_R,_Lbl,_Cases}) -> true;
 is_unreachable_after({loop_rec_end,_}) -> true;
 is_unreachable_after({wait,_}) -> true;
 is_unreachable_after(I) -> is_exit_instruction(I).
@@ -430,10 +421,6 @@ is_unreachable_after(I) -> is_exit_instruction(I).
 
 is_exit_instruction({call_ext,_,{extfunc,M,F,A}}) ->
     erl_bifs:is_exit_bif(M, F, A);
-is_exit_instruction({call_ext_last,_,{extfunc,M,F,A},_}) ->
-    erl_bifs:is_exit_bif(M, F, A);
-is_exit_instruction({call_ext_only,_,{extfunc,M,F,A}}) ->
-    erl_bifs:is_exit_bif(M, F, A);
 is_exit_instruction(if_end) -> true;
 is_exit_instruction({case_end,_}) -> true;
 is_exit_instruction({try_case_end,_}) -> true;
@@ -516,9 +503,7 @@ ulbl({test,_,Fail,_}, Used) ->
     mark_used(Fail, Used);
 ulbl({test,_,Fail,_,_,_}, Used) ->
     mark_used(Fail, Used);
-ulbl({select_val,_,Fail,{list,Vls}}, Used) ->
-    mark_used_list(Vls, mark_used(Fail, Used));
-ulbl({select_tuple_arity,_,Fail,{list,Vls}}, Used) ->
+ulbl({select,_,_,Fail,Vls}, Used) ->
     mark_used_list(Vls, mark_used(Fail, Used));
 ulbl({'try',_,Lbl}, Used) ->
     mark_used(Lbl, Used);
@@ -538,29 +523,9 @@ ulbl({bif,_Name,Lbl,_As,_R}, Used) ->
     mark_used(Lbl, Used);
 ulbl({gc_bif,_Name,Lbl,_Live,_As,_R}, Used) ->
     mark_used(Lbl, Used);
-ulbl({bs_init2,Lbl,_,_,_,_,_}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_init_bits,Lbl,_,_,_,_,_}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_put_integer,Lbl,_Bits,_Unit,_Fl,_Val}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_put_float,Lbl,_Bits,_Unit,_Fl,_Val}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_put_binary,Lbl,_Bits,_Unit,_Fl,_Val}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_put_utf8,Lbl,_Fl,_Val}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_put_utf16,Lbl,_Fl,_Val}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_put_utf32,Lbl,_Fl,_Val}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_add,Lbl,_,_}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_append,Lbl,_,_,_,_,_,_,_}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_utf8_size,Lbl,_,_}, Used) ->
+ulbl({bs_init,Lbl,_,_,_,_}, Used) ->
     mark_used(Lbl, Used);
-ulbl({bs_utf16_size,Lbl,_,_}, Used) ->
+ulbl({bs_put,Lbl,_,_}, Used) ->
     mark_used(Lbl, Used);
 ulbl(_, Used) -> Used.
 
diff --git a/lib/compiler/src/beam_peep.erl b/lib/compiler/src/beam_peep.erl
index f39fc50b95..a199aa50ed 100644
--- a/lib/compiler/src/beam_peep.erl
+++ b/lib/compiler/src/beam_peep.erl
@@ -120,13 +120,13 @@ peep([{test,Op,_,Ops}=I|Is], SeenTests0, Acc) ->
 		    peep(Is, SeenTests, [I|Acc])
 	    end
     end;
-peep([{select_val,Src,Fail,
-	{list,[{atom,false},{f,L},{atom,true},{f,L}]}}|
+peep([{select,select_val,Src,Fail,
+       [{atom,false},{f,L},{atom,true},{f,L}]}|
       [{label,L}|_]=Is], SeenTests, Acc) ->
     I = {test,is_boolean,Fail,[Src]},
     peep([I|Is], SeenTests, Acc);
-peep([{select_val,Src,Fail,
-       {list,[{atom,true},{f,L},{atom,false},{f,L}]}}|
+peep([{select,select_val,Src,Fail,
+       [{atom,true},{f,L},{atom,false},{f,L}]}|
       [{label,L}|_]=Is], SeenTests, Acc) ->
     I = {test,is_boolean,Fail,[Src]},
     peep([I|Is], SeenTests, Acc);
diff --git a/lib/compiler/src/beam_receive.erl b/lib/compiler/src/beam_receive.erl
index bd1f44f66b..fe95a7e35b 100644
--- a/lib/compiler/src/beam_receive.erl
+++ b/lib/compiler/src/beam_receive.erl
@@ -84,13 +84,29 @@ function({function,Name,Arity,Entry,Is}) ->
 	    erlang:raise(Class, Error, Stack)
     end.
 
+opt([{call_ext,A,{extfunc,erlang,spawn_monitor,A}}=I0|Is0], D, Acc)
+  when A =:= 1; A =:= 3 ->
+    case ref_in_tuple(Is0) of
+	no ->
+	    opt(Is0, D, [I0|Acc]);
+	{yes,Regs,Is1,MatchReversed} ->
+	    %% The call creates a brand new reference. Now
+	    %% search for a receive statement in the same
+	    %% function that will match against the reference.
+	    case opt_recv(Is1, Regs, D) of
+		no ->
+		    opt(Is0, D, [I0|Acc]);
+		{yes,Is,Lbl} ->
+		    opt(Is, D, MatchReversed++[I0,{recv_mark,{f,Lbl}}|Acc])
+	    end
+    end;
 opt([{call_ext,Arity,{extfunc,erlang,Name,Arity}}=I|Is0], D, Acc) ->
     case creates_new_ref(Name, Arity) of
 	true ->
 	    %% The call creates a brand new reference. Now
 	    %% search for a receive statement in the same
 	    %% function that will match against the reference.
-	    case opt_recv(Is0, D) of
+	    case opt_recv(Is0, regs_init_x0(), D) of
 		no ->
 		    opt(Is0, D, [I|Acc]);
 		{yes,Is,Lbl} ->
@@ -104,19 +120,34 @@ opt([I|Is], D, Acc) ->
 opt([], _, Acc) ->
     reverse(Acc).
 
+ref_in_tuple([{test,is_tuple,_,[{x,0}]}=I1,
+	      {test,test_arity,_,[{x,0},2]}=I2,
+	      {block,[{set,[_],[{x,0}],{get_tuple_element,0}},
+		      {set,[Dst],[{x,0}],{get_tuple_element,1}}|Bl]}=I3|Is]) ->
+    ref_in_tuple_1(Bl, Dst, Is, [I3,I2,I1]);
+ref_in_tuple([{test,is_tuple,_,[{x,0}]}=I1,
+	      {test,test_arity,_,[{x,0},2]}=I2,
+	      {block,[{set,[Dst],[{x,0}],{get_tuple_element,1}}|Bl]}=I3|Is]) ->
+    ref_in_tuple_1(Bl, Dst, Is, [I3,I2,I1]);
+ref_in_tuple(_) -> no.
+
+ref_in_tuple_1(Bl, Dst, Is, MatchReversed) ->
+    Regs0 = regs_init_singleton(Dst),
+    Regs = opt_update_regs_bl(Bl, Regs0),
+    {yes,Regs,Is,MatchReversed}.
+
 %% creates_new_ref(Name, Arity) -> true|false.
 %%  Return 'true' if the BIF Name/Arity will create a new reference.
 creates_new_ref(monitor, 2) -> true;
 creates_new_ref(make_ref, 0) -> true;
 creates_new_ref(_, _) -> false.
 
-%% opt_recv([Instruction], LabelIndex) -> no|{yes,[Instruction]}
+%% opt_recv([Instruction], Regs, LabelIndex) -> no|{yes,[Instruction]}
 %%  Search for a receive statement that will only retrieve messages
 %%  that contain the newly created reference (which is currently in {x,0}).
-opt_recv(Is, D) ->
-    R = regs_init_x0(),
+opt_recv(Is, Regs, D) ->
     L = gb_sets:empty(),
-    opt_recv(Is, D, R, L, []).
+    opt_recv(Is, D, Regs, L, []).
 
 opt_recv([{label,L}=Lbl,{loop_rec,{f,Fail},_}=Loop|Is], D, R0, _, Acc) ->
     R = regs_kill_not_live(0, R0),
@@ -157,8 +188,6 @@ opt_update_regs({call_fun,_}, R, L) ->
     {regs_kill_not_live(0, R),L};
 opt_update_regs({kill,Y}, R, L) ->
     {regs_kill([Y], R),L};
-opt_update_regs(send, R, L) ->
-    {regs_kill_not_live(0, R),L};
 opt_update_regs({'catch',_,{f,Lbl}}, R, L) ->
     {R,gb_sets:add(Lbl, L)};
 opt_update_regs({catch_end,_}, R, L) ->
@@ -253,10 +282,7 @@ opt_ref_used_1([{test,is_ne_exact,{f,Fail},Args}|Is], RefReg, D, Done0, Regs) ->
 opt_ref_used_1([{test,_,{f,Fail},_}|Is], RefReg, D, Done0, Regs) ->
     Done = opt_ref_used_at(Fail, RefReg, D, Done0, Regs),
     opt_ref_used_1(Is, RefReg, D, Done, Regs);
-opt_ref_used_1([{select_tuple_arity,_,{f,Fail},{list,List}}|_], RefReg, D, Done, Regs) ->
-    Lbls = [F || {f,F} <- List] ++ [Fail],
-    opt_ref_used_in_all(Lbls, RefReg, D, Done, Regs);
-opt_ref_used_1([{select_val,_,{f,Fail},{list,List}}|_], RefReg, D, Done, Regs) ->
+opt_ref_used_1([{select,_,_,{f,Fail},List}|_], RefReg, D, Done, Regs) ->
     Lbls = [F || {f,F} <- List] ++ [Fail],
     opt_ref_used_in_all(Lbls, RefReg, D, Done, Regs);
 opt_ref_used_1([{label,Lbl}|Is], RefReg, D, Done, Regs) ->
@@ -323,6 +349,12 @@ opt_ref_used_bl([], Regs) -> Regs.
 regs_init() ->
     {0,0}.
 
+%% regs_init_singleton(Register) -> RegisterSet
+%%  Return a set that only contains one register.
+
+regs_init_singleton(Reg) ->
+    regs_add(Reg, regs_init()).
+
 %% regs_init_x0() -> RegisterSet
 %%  Return a set that only contains the {x,0} register.
 
diff --git a/lib/compiler/src/beam_trim.erl b/lib/compiler/src/beam_trim.erl
index 5f4fa3b1f8..d95db1f681 100644
--- a/lib/compiler/src/beam_trim.erl
+++ b/lib/compiler/src/beam_trim.erl
@@ -172,38 +172,16 @@ remap([{bif,Name,Fail,Ss,D}|Is], Map, Acc) ->
 remap([{gc_bif,Name,Fail,Live,Ss,D}|Is], Map, Acc) ->
     I = {gc_bif,Name,Fail,Live,[Map(S) || S <- Ss],Map(D)},
     remap(Is, Map, [I|Acc]);
-remap([{bs_add,Fail,[SrcA,SrcB,U],D}|Is], Map, Acc) ->
-    I = {bs_add,Fail,[Map(SrcA),Map(SrcB),U],Map(D)},
+remap([{bs_init,Fail,Info,Live,Ss0,Dst0}|Is], Map, Acc) ->
+    Ss = [Map(Src) || Src <- Ss0],
+    Dst = Map(Dst0),
+    I = {bs_init,Fail,Info,Live,Ss,Dst},
     remap(Is, Map, [I|Acc]);
-remap([{bs_append=Op,Fail,Bits,Heap,Live,Unit,Bin,Flags,D}|Is], Map, Acc) ->
-    I = {Op,Fail,Map(Bits),Heap,Live,Unit,Map(Bin),Flags,Map(D)},
-    remap(Is, Map, [I|Acc]);
-remap([{bs_private_append=Op,Fail,Bits,Unit,Bin,Flags,D}|Is], Map, Acc) ->
-    I = {Op,Fail,Map(Bits),Unit,Map(Bin),Flags,Map(D)},
-    remap(Is, Map, [I|Acc]);
-remap([bs_init_writable=I|Is], Map, Acc) ->
-    remap(Is, Map, [I|Acc]);
-remap([{bs_init2,Fail,Src,Live,U,Flags,D}|Is], Map, Acc) ->
-    I = {bs_init2,Fail,Map(Src),Live,U,Flags,Map(D)},
-    remap(Is, Map, [I|Acc]);
-remap([{bs_init_bits,Fail,Src,Live,U,Flags,D}|Is], Map, Acc) ->
-    I = {bs_init_bits,Fail,Map(Src),Live,U,Flags,Map(D)},
-    remap(Is, Map, [I|Acc]);
-remap([{bs_put_binary=Op,Fail,Src,U,Flags,D}|Is], Map, Acc) ->
-    I = {Op,Fail,Map(Src),U,Flags,Map(D)},
-    remap(Is, Map, [I|Acc]);
-remap([{bs_put_integer=Op,Fail,Src,U,Flags,D}|Is], Map, Acc) ->
-    I = {Op,Fail,Map(Src),U,Flags,Map(D)},
-    remap(Is, Map, [I|Acc]);
-remap([{bs_put_float=Op,Fail,Src,U,Flags,D}|Is], Map, Acc) ->
-    I = {Op,Fail,Map(Src),U,Flags,Map(D)},
-    remap(Is, Map, [I|Acc]);
-remap([{bs_put_string,_,_}=I|Is], Map, Acc) ->
+remap([{bs_put=Op,Fail,Info,Ss}|Is], Map, Acc) ->
+    I = {Op,Fail,Info,[Map(S) || S <- Ss]},
     remap(Is, Map, [I|Acc]);
 remap([{kill,Y}|T], Map, Acc) ->
     remap(T, Map, [{kill,Map(Y)}|Acc]);
-remap([send=I|T], Map, Acc) ->
-    remap(T, Map, [I|Acc]);
 remap([{make_fun2,_,_,_,_}=I|T], Map, Acc) ->
     remap(T, Map, [I|Acc]);
 remap([{deallocate,N}|Is], Map, Acc) ->
@@ -217,12 +195,6 @@ remap([{test,Name,Fail,Live,Ss,Dst}|Is], Map, Acc) ->
     remap(Is, Map, [I|Acc]);
 remap([return|_]=Is, _, Acc) ->
     reverse(Acc, Is);
-remap([{call_last,Ar,Name,N}|Is], Map, Acc) ->
-    I = {call_last,Ar,Name,Map({frame_size,N})},
-    reverse(Acc, [I|Is]);
-remap([{call_ext_last,Ar,Name,N}|Is], Map, Acc) ->
-    I = {call_ext_last,Ar,Name,Map({frame_size,N})},
-    reverse(Acc, [I|Is]);
 remap([{line,_}=I|Is], Map, Acc) ->
     remap(Is, Map, [I|Acc]).
     
@@ -280,8 +252,8 @@ frame_size([{call_fun,_}|Is], Safe) ->
     frame_size(Is, Safe);
 frame_size([{call,_,_}|Is], Safe) ->
     frame_size(Is, Safe);
-frame_size([{call_ext,A,{extfunc,M,F,A}}|Is], Safe) ->
-    case erl_bifs:is_exit_bif(M, F, A) of
+frame_size([{call_ext,_,_}=I|Is], Safe) ->
+    case beam_jump:is_exit_instruction(I) of
 	true -> throw(not_possible);
 	false -> frame_size(Is, Safe)
     end;
@@ -295,35 +267,15 @@ frame_size([{test,_,{f,L},_}|Is], Safe) ->
     frame_size_branch(L, Is, Safe);
 frame_size([{test,_,{f,L},_,_,_}|Is], Safe) ->
     frame_size_branch(L, Is, Safe);
-frame_size([{bs_add,{f,L},_,_}|Is], Safe) ->
+frame_size([{bs_init,{f,L},_,_,_,_}|Is], Safe) ->
     frame_size_branch(L, Is, Safe);
-frame_size([{bs_append,{f,L},_,_,_,_,_,_,_}|Is], Safe) ->
+frame_size([{bs_put,{f,L},_,_}|Is], Safe) ->
     frame_size_branch(L, Is, Safe);
-frame_size([{bs_private_append,{f,L},_,_,_,_,_}|Is], Safe) ->
-    frame_size_branch(L, Is, Safe);
-frame_size([bs_init_writable|Is], Safe) ->
-    frame_size(Is, Safe);
-frame_size([{bs_init2,{f,L},_,_,_,_,_}|Is], Safe) ->
-    frame_size_branch(L, Is, Safe);
-frame_size([{bs_init_bits,{f,L},_,_,_,_,_}|Is], Safe) ->
-    frame_size_branch(L, Is, Safe);
-frame_size([{bs_put_binary,{f,L},_,_,_,_}|Is], Safe) ->
-    frame_size_branch(L, Is, Safe);
-frame_size([{bs_put_integer,{f,L},_,_,_,_}|Is], Safe) ->
-    frame_size_branch(L, Is, Safe);
-frame_size([{bs_put_float,{f,L},_,_,_,_}|Is], Safe) ->
-    frame_size_branch(L, Is, Safe);
-frame_size([{bs_put_string,_,_}|Is], Safe) ->
-    frame_size(Is, Safe);
 frame_size([{kill,_}|Is], Safe) ->
     frame_size(Is, Safe);
-frame_size([send|Is], Safe) ->
-    frame_size(Is, Safe);
 frame_size([{make_fun2,_,_,_,_}|Is], Safe) ->
     frame_size(Is, Safe);
 frame_size([{deallocate,N}|_], _) -> N;
-frame_size([{call_last,_,_,N}|_], _) -> N;
-frame_size([{call_ext_last,_,_,N}|_], _) -> N;
 frame_size([{line,_}|Is], Safe) ->
     frame_size(Is, Safe);
 frame_size([_|_], _) -> throw(not_possible).
diff --git a/lib/compiler/src/beam_type.erl b/lib/compiler/src/beam_type.erl
index 6f0ffb5b25..7392f99fb6 100644
--- a/lib/compiler/src/beam_type.erl
+++ b/lib/compiler/src/beam_type.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -29,10 +29,17 @@ module({Mod,Exp,Attr,Fs0,Lc}, _Opts) ->
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
 function({function,Name,Arity,CLabel,Asm0}) ->
-    Asm1 = beam_utils:live_opt(Asm0),
-    Asm2 = opt(Asm1, [], tdb_new()),
-    Asm = beam_utils:delete_live_annos(Asm2),
-    {function,Name,Arity,CLabel,Asm}.
+    try
+	Asm1 = beam_utils:live_opt(Asm0),
+	Asm2 = opt(Asm1, [], tdb_new()),
+	Asm = beam_utils:delete_live_annos(Asm2),
+	{function,Name,Arity,CLabel,Asm}
+    catch
+	Class:Error ->
+	    Stack = erlang:get_stacktrace(),
+	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+	    erlang:raise(Class, Error, Stack)
+    end.
 
 %% opt([Instruction], Accumulator, TypeDb) -> {[Instruction'],TypeDb'}
 %%  Keep track of type information; try to simplify.
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index abcd93f280..8af0447f63 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -87,7 +87,7 @@ is_killed_at(R, Lbl, D) when is_integer(Lbl) ->
 %%  across branches.
 
 is_not_used(R, Is, D) ->
-    St = #live{bl=fun check_used_block/2,lbl=D,res=gb_trees:empty()},
+    St = #live{bl=check_used_block_fun(D),lbl=D,res=gb_trees:empty()},
     case check_liveness(R, Is, St) of
 	{killed,_} -> true;
 	{used,_} -> false;
@@ -102,7 +102,7 @@ is_not_used(R, Is, D) ->
 %%  across branches.
 
 is_not_used_at(R, Lbl, D) ->
-    St = #live{bl=fun check_used_block/2,lbl=D,res=gb_trees:empty()},
+    St = #live{bl=check_used_block_fun(D),lbl=D,res=gb_trees:empty()},
     case check_liveness_at(R, Lbl, St) of
 	{killed,_} -> true;
 	{used,_} -> false;
@@ -263,26 +263,14 @@ check_liveness(R, [{test,_,{f,Fail},As}|Is], St0) ->
 		{_,_}=Other -> Other
 	    end
     end;
-check_liveness(R, [{test,_,{f,Fail},Live,Ss,_}|Is], St0) ->
-    case R of
-	{x,X} ->
-	    case X < Live orelse member(R, Ss) of
-		true -> {used,St0};
-		false -> check_liveness_at(R, Fail, St0)
-	    end;
-	{y,_} ->
-	    case check_liveness_at(R, Fail, St0) of
-		{killed,St} -> check_liveness(R, Is, St);
-		{_,_}=Other -> Other
-	    end
-    end;
-check_liveness(R, [{select_val,R,_,_}|_], St) ->
-    {used,St};
-check_liveness(R, [{select_val,_,Fail,{list,Branches}}|_], St) ->
-    check_liveness_everywhere(R, [Fail|Branches], St);
-check_liveness(R, [{select_tuple_arity,R,_,_}|_], St) ->
+check_liveness(R, [{test,Op,Fail,Live,Ss,Dst}|Is], St) ->
+    %% Check this instruction as a block to get a less conservative
+    %% result if the caller is is_not_used/3.
+    Block = [{set,[Dst],Ss,{alloc,Live,{bif,Op,Fail}}}],
+    check_liveness(R, [{block,Block}|Is], St);
+check_liveness(R, [{select,_,R,_,_}|_], St) ->
     {used,St};
-check_liveness(R, [{select_tuple_arity,_,Fail,{list,Branches}}|_], St) ->
+check_liveness(R, [{select,_,_,Fail,Branches}|_], St) ->
     check_liveness_everywhere(R, [Fail|Branches], St);
 check_liveness(R, [{jump,{f,F}}|_], St) ->
     check_liveness_at(R, F, St);
@@ -301,37 +289,33 @@ check_liveness(R, [{kill,R}|_], St) ->
     {killed,St};
 check_liveness(R, [{kill,_}|Is], St) ->
     check_liveness(R, Is, St);
-check_liveness(R, [bs_init_writable|Is], St) ->
-    if
-	R =:= {x,0} -> {used,St};
-	true -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{bs_private_append,_,Bits,_,Bin,_,Dst}|Is], St) ->
-    case R of
-	Bits -> {used,St};
-	Bin -> {used,St};
-	Dst -> {killed,St};
-	_ -> check_liveness(R, Is, St)
+check_liveness(R, [{bs_init,_,_,none,Ss,Dst}|Is], St) ->
+    case member(R, Ss) of
+	true ->
+	    {used,St};
+	false ->
+	    if
+		R =:= Dst -> {killed,St};
+		true -> check_liveness(R, Is, St)
+	    end
     end;
-check_liveness(R, [{bs_append,_,Bits,_,_,_,Bin,_,Dst}|Is], St) ->
+check_liveness(R, [{bs_init,_,_,Live,Ss,Dst}|Is], St) ->
     case R of
-	Bits -> {used,St};
-	Bin -> {used,St};
-	Dst -> {killed,St};
-	_ -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{bs_init2,_,_,_,_,_,Dst}|Is], St) ->
-    if
-	R =:= Dst -> {killed,St};
-	true -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{bs_init_bits,_,_,_,_,_,Dst}|Is], St) ->
-    if
-	R =:= Dst -> {killed,St};
-	true -> check_liveness(R, Is, St)
+	{x,X} ->
+	    case X < Live orelse member(R, Ss) of
+		true -> {used,St};
+		false -> {killed,St}
+	    end;
+	{y,_} ->
+	    case member(R, Ss) of
+		true -> {used,St};
+		false ->
+		    if
+			R =:= Dst -> {killed,St};
+			true -> check_liveness(R, Is, St)
+		    end
+	    end
     end;
-check_liveness(R, [{bs_put_string,_,_}|Is], St) ->
-    check_liveness(R, Is, St);
 check_liveness(R, [{deallocate,_}|Is], St) ->
     case R of
 	{y,_} -> {killed,St};
@@ -339,29 +323,20 @@ check_liveness(R, [{deallocate,_}|Is], St) ->
     end;
 check_liveness(R, [return|_], St) ->
     check_liveness_live_ret(R, 1, St);
-check_liveness(R, [{call_last,Live,_,_}|_], St) ->
-    check_liveness_live_ret(R, Live, St);
-check_liveness(R, [{call_only,Live,_}|_], St) ->
-    check_liveness_live_ret(R, Live, St);
-check_liveness(R, [{call_ext_last,Live,_,_}|_], St) ->
-    check_liveness_live_ret(R, Live, St);
-check_liveness(R, [{call_ext_only,Live,_}|_], St) ->
-    check_liveness_live_ret(R, Live, St);
 check_liveness(R, [{call,Live,_}|Is], St) ->
     case R of
 	{x,X} when X < Live -> {used,St};
 	{x,_} -> {killed,St};
 	{y,_} -> check_liveness(R, Is, St)
     end;
-check_liveness(R, [{call_ext,Live,Func}|Is], St) ->
+check_liveness(R, [{call_ext,Live,_}=I|Is], St) ->
     case R of
 	{x,X} when X < Live ->
 	    {used,St};
 	{x,_} ->
 	    {killed,St};
 	{y,_} ->
-	    {extfunc,Mod,Name,Arity} = Func,
-	    case erl_bifs:is_exit_bif(Mod, Name, Arity) of
+	    case beam_jump:is_exit_instruction(I) of
 		false ->
 		    check_liveness(R, Is, St);
 		true ->
@@ -387,14 +362,6 @@ check_liveness(R, [{apply,Args}|Is], St) ->
 	{x,_} -> {killed,St};
 	{y,_} -> check_liveness(R, Is, St)
     end;
-check_liveness(R, [{apply_last,Args,_}|_], St) ->
-    check_liveness_live_ret(R, Args+2, St);
-check_liveness(R, [send|Is], St) ->
-    case R of
-	{x,X} when X < 2 -> {used,St};
-	{x,_} -> {killed,St};
-	{y,_} -> check_liveness(R, Is, St)
-    end;
 check_liveness({x,R}, [{'%live',Live}|Is], St) ->
     if
 	R < Live -> check_liveness(R, Is, St);
@@ -429,25 +396,9 @@ check_liveness(R, [{gc_bif,Op,{f,Fail},Live,Ss,D}|Is], St0) ->
 		    Other
 	    end
     end;
-check_liveness(R, [{bs_add,{f,0},Ss,D}|Is], St) ->
+check_liveness(R, [{bs_put,{f,0},_,Ss}|Is], St) ->
     case member(R, Ss) of
 	true -> {used,St};
-	false when R =:= D -> {killed,St};
-	false -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{bs_put_binary,{f,0},Sz,_,_,Src}|Is], St) ->
-    case member(R, [Sz,Src]) of
-	true -> {used,St};
-	false -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{bs_put_integer,{f,0},Sz,_,_,Src}|Is], St) ->
-    case member(R, [Sz,Src]) of
-	true -> {used,St};
-	false -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{bs_put_float,{f,0},Sz,_,_,Src}|Is], St) ->
-    case member(R, [Sz,Src]) of
-	true -> {used,St};
 	false -> check_liveness(R, Is, St)
     end;
 check_liveness(R, [{bs_restore2,S,_}|Is], St) ->
@@ -472,6 +423,16 @@ check_liveness(R, [{make_fun2,_,_,_,NumFree}|Is], St) ->
 	{x,_} -> {killed,St};
 	_ -> check_liveness(R, Is, St)
     end;
+check_liveness({x,_}=R, [{'catch',_,_}|Is], St) ->
+    %% All x registers will be killed if an exception occurs.
+    %% Therefore we only need to check the liveness for the
+    %% instructions following the catch instruction.
+    check_liveness(R, Is, St);
+check_liveness({x,_}=R, [{'try',_,_}|Is], St) ->
+    %% All x registers will be killed if an exception occurs.
+    %% Therefore we only need to check the liveness for the
+    %% instructions inside the 'try' block.
+    check_liveness(R, Is, St);
 check_liveness(R, [{try_end,Y}|Is], St) ->
     case R of
 	Y ->
@@ -602,26 +563,50 @@ check_killed_block(_, []) -> transparent.
 %%  
 %%    (Unknown instructions will cause an exception.)
 
-check_used_block({x,X}=R, [{set,_,_,{alloc,Live,_}}|Is]) ->
+check_used_block_fun(D) ->
+    fun(R, Is) -> check_used_block(R, Is, D) end.
+
+check_used_block({x,X}=R, [{set,Ds,Ss,{alloc,Live,Op}}|Is], D) ->
     if 
 	X >= Live -> killed;
-	true -> check_used_block(R, Is)
+	true ->
+	    case member(R, Ss) orelse
+		is_reg_used_at(R, Op, D) of
+		true -> used;
+		false ->
+		    case member(R, Ds) of
+			true -> killed;
+			false -> check_used_block(R, Is, D)
+		    end
+	    end
     end;
-check_used_block(R, [{set,Ds,Ss,_Op}|Is]) ->
-    case member(R, Ss) of
+check_used_block(R, [{set,Ds,Ss,Op}|Is], D) ->
+    case member(R, Ss) orelse
+	is_reg_used_at(R, Op, D) of
 	true -> used;
 	false ->
 	    case member(R, Ds) of
 		true -> killed;
-		false -> check_used_block(R, Is)
+		false -> check_used_block(R, Is, D)
 	    end
     end;
-check_used_block(R, [{'%live',Live}|Is]) ->
+check_used_block(R, [{'%live',Live}|Is], D) ->
     case R of
 	{x,X} when X >= Live -> killed;
-	_ -> check_used_block(R, Is)
+	_ -> check_used_block(R, Is, D)
     end;
-check_used_block(_, []) -> transparent.
+check_used_block(_, [], _) -> transparent.
+
+is_reg_used_at(R, {gc_bif,_,{f,Lbl}}, D) ->
+    is_reg_used_at_1(R, Lbl, D);
+is_reg_used_at(R, {bif,_,{f,Lbl}}, D) ->
+    is_reg_used_at_1(R, Lbl, D);
+is_reg_used_at(_, _, _) -> false.
+
+is_reg_used_at_1(_, 0, _) ->
+    false;
+is_reg_used_at_1(R, Lbl, D) ->
+    not is_not_used_at(R, Lbl, D).
 
 index_labels_1([{label,Lbl}|Is0], Acc) ->
     Is = lists:dropwhile(fun({label,_}) -> true;
@@ -654,49 +639,21 @@ combine_alloc_lists_1([]) -> [].
 live_opt([{bs_context_to_binary,Src}=I|Is], Regs0, D, Acc) ->
     Regs = x_live([Src], Regs0),
     live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_add,Fail,[Src1,Src2,_],Dst}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live([Src1,Src2], x_dead([Dst], Regs0)),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_init2,Fail,_,_,Live,_,_}=I|Is], _, D, Acc) ->
-    Regs1 = live_call(Live),
+live_opt([{bs_init,Fail,_,none,Ss,Dst}=I|Is], Regs0, D, Acc) ->
+    Regs1 = x_live(Ss, x_dead([Dst], Regs0)),
     Regs = live_join_label(Fail, D, Regs1),
     live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_init_bits,Fail,Src1,_,Live,_,Src2}=I|Is], _, D, Acc) ->
-    Regs1 = live_call(Live),
-    Regs2 = x_live([Src1,Src2], Regs1),
-    Regs = live_join_label(Fail, D, Regs2),
+live_opt([{bs_init,Fail,Info,Live0,Ss,Dst}|Is], Regs0, D, Acc) ->
+    Regs1 = x_dead([Dst], Regs0),
+    Live = live_regs(Regs1),
+    true = Live =< Live0,	%Assertion.
+    Regs2 = live_call(Live),
+    Regs3 = x_live(Ss, Regs2),
+    Regs = live_join_label(Fail, D, Regs3),
+    I = {bs_init,Fail,Info,Live,Ss,Dst},
     live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_append,Fail,Src1,_,Live,_,Src2,_,Dst}=I|Is], _Regs0, D, Acc) ->
-    Regs1 = x_dead([Dst], x_live([Src1,Src2], live_call(Live))),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_private_append,Fail,Src1,_,Src2,_,Dst}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live([Src1,Src2], x_dead([Dst], Regs0)),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_put_binary,Fail,Src1,_,_,Src2}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live([Src1,Src2], Regs0),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_put_float,Fail,Src1,_,_,Src2}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live([Src1,Src2], Regs0),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_put_integer,Fail,Src1,_,_,Src2}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live([Src1,Src2], Regs0),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_put_utf8,Fail,_,Src}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live([Src], Regs0),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_put_utf16,Fail,_,Src}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live([Src], Regs0),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_put_utf32,Fail,_,Src}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live([Src], Regs0),
+live_opt([{bs_put,Fail,_,Ss}=I|Is], Regs0, D, Acc) ->
+    Regs1 = x_live(Ss, Regs0),
     Regs = live_join_label(Fail, D, Regs1),
     live_opt(Is, Regs, D, [I|Acc]);
 live_opt([{bs_restore2,Src,_}=I|Is], Regs0, D, Acc) ->
@@ -705,14 +662,6 @@ live_opt([{bs_restore2,Src,_}=I|Is], Regs0, D, Acc) ->
 live_opt([{bs_save2,Src,_}=I|Is], Regs0, D, Acc) ->
     Regs = x_live([Src], Regs0),
     live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_utf8_size,Fail,Src,Dst}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live([Src], x_dead([Dst], Regs0)),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_utf16_size,Fail,Src,Dst}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live([Src], x_dead([Dst], Regs0)),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
 live_opt([{test,bs_start_match2,Fail,Live,[Src,_],_}=I|Is], _, D, Acc) ->
     Regs0 = live_call(Live),
     Regs1 = x_live([Src], Regs0),
@@ -741,33 +690,22 @@ live_opt([{badmatch,Src}=I|Is], _, D, Acc) ->
 live_opt([{case_end,Src}=I|Is], _, D, Acc) ->
     Regs = x_live([Src], 0),
     live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{try_case_end,Src}=I|Is], _, D, Acc) ->
+    Regs = x_live([Src], 0),
+    live_opt(Is, Regs, D, [I|Acc]);
 live_opt([if_end=I|Is], _, D, Acc) ->
     Regs = 0,
     live_opt(Is, Regs, D, [I|Acc]);
-live_opt([bs_init_writable=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(1), D, [I|Acc]);
 live_opt([{call,Arity,_}=I|Is], _, D, Acc) ->
     live_opt(Is, live_call(Arity), D, [I|Acc]);
 live_opt([{call_ext,Arity,_}=I|Is], _, D, Acc) ->
     live_opt(Is, live_call(Arity), D, [I|Acc]);
 live_opt([{call_fun,Arity}=I|Is], _, D, Acc) ->
     live_opt(Is, live_call(Arity+1), D, [I|Acc]);
-live_opt([{call_last,Arity,_,_}=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(Arity), D, [I|Acc]);
-live_opt([{call_ext_last,Arity,_,_}=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(Arity), D, [I|Acc]);
 live_opt([{apply,Arity}=I|Is], _, D, Acc) ->
     live_opt(Is, live_call(Arity+2), D, [I|Acc]);
-live_opt([{apply_last,Arity,_}=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(Arity+2), D, [I|Acc]);
-live_opt([{call_only,Arity,_}=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(Arity), D, [I|Acc]);
-live_opt([{call_ext_only,Arity,_}=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(Arity), D, [I|Acc]);
 live_opt([{make_fun2,_,_,_,Arity}=I|Is], _, D, Acc) ->
     live_opt(Is, live_call(Arity), D, [I|Acc]);
-live_opt([send=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(2), D, [I|Acc]);
 live_opt([{test,_,Fail,Ss}=I|Is], Regs0, D, Acc) ->
     Regs1 = x_live(Ss, Regs0),
     Regs = live_join_label(Fail, D, Regs1),
@@ -777,16 +715,14 @@ live_opt([{test,_,Fail,Live,Ss,_}=I|Is], _, D, Acc) ->
     Regs1 = x_live(Ss, Regs0),
     Regs = live_join_label(Fail, D, Regs1),
     live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{select_val,Src,Fail,{list,List}}=I|Is], Regs0, D, Acc) ->
+live_opt([{select,_,Src,Fail,List}=I|Is], Regs0, D, Acc) ->
     Regs1 = x_live([Src], Regs0),
     Regs = live_join_labels([Fail|List], D, Regs1),
     live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{select_tuple_arity,Src,Fail,{list,List}}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live([Src], Regs0),
-    Regs = live_join_labels([Fail|List], D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{'try',_,Fail}=I|Is], Regs0, D, Acc) ->
-    Regs = live_join_label(Fail, D, Regs0),
+live_opt([{'try',_,_}=I|Is], Regs, D, Acc) ->
+    %% If an exeption happens, all x registers will be killed.
+    %% Therefore, we should only base liveness of the code inside
+    %% the try.
     live_opt(Is, Regs, D, [I|Acc]);
 live_opt([{try_case,_}=I|Is], _, D, Acc) ->
     live_opt(Is, live_call(1), D, [I|Acc]);
@@ -796,14 +732,10 @@ live_opt([timeout=I|Is], _, D, Acc) ->
     live_opt(Is, 0, D, [I|Acc]);
 
 %% Transparent instructions - they neither use nor modify x registers.
-live_opt([{bs_put_string,_,_}=I|Is], Regs, D, Acc) ->
-    live_opt(Is, Regs, D, [I|Acc]);
 live_opt([{deallocate,_}=I|Is], Regs, D, Acc) ->
     live_opt(Is, Regs, D, [I|Acc]);
 live_opt([{kill,_}=I|Is], Regs, D, Acc) ->
     live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{try_case_end,_}=I|Is], Regs, D, Acc) ->
-    live_opt(Is, Regs, D, [I|Acc]);
 live_opt([{try_end,_}=I|Is], Regs, D, Acc) ->
     live_opt(Is, Regs, D, [I|Acc]);
 live_opt([{loop_rec_end,_}=I|Is], Regs, D, Acc) ->
@@ -826,13 +758,24 @@ live_opt([{allocate_heap,_,_,Live}=I|Is], _, D, Acc) ->
 
 live_opt([], _, _, Acc) -> Acc.
 
-live_opt_block([{set,[],[],{alloc,Live,_}}=I|Is], _, D, Acc) ->
-    live_opt_block(Is, live_call(Live), D, [I|Acc]);
-live_opt_block([{set,Ds,Ss,Op}=I|Is], Regs0, D, Acc) ->
-    Regs = case Op of
-	       {alloc,Live,_} -> live_call(Live);
-	       _ -> x_live(Ss, x_dead(Ds, Regs0))
-	   end,
+live_opt_block([{set,Ds,Ss,Op}=I0|Is], Regs0, D, Acc) ->
+    Regs1 = x_live(Ss, x_dead(Ds, Regs0)),
+    {I,Regs} = case Op of
+		   {alloc,Live0,Alloc} ->
+		       %% The life-time analysis used by the code generator
+		       %% is sometimes too conservative, so it may be
+		       %% possible to lower the number of live registers
+		       %% based on the exact liveness information.
+		       %% The main benefit is that more optimizations that
+		       %% depend on liveness information (such as the
+		       %% beam_bool and beam_dead passes) may be applied.
+		       Live = live_regs(Regs1),
+		       true = Live =< Live0,	%Assertion.
+		       I1 = {set,Ds,Ss,{alloc,Live,Alloc}},
+		       {I1,live_call(Live)};
+		   _ ->
+		       {I0,Regs1}
+	       end,
     case Ds of
 	[{x,X}] ->
 	    case (not is_live(X, Regs0)) andalso Op =:= move of
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index a52e7bb761..29758b8fb4 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -783,15 +783,27 @@ valfun_4({bs_utf16_size,{f,Fail},A,Dst}, Vst) ->
 valfun_4({bs_bits_to_bytes,{f,Fail},Src,Dst}, Vst) ->
     assert_term(Src, Vst),
     set_type_reg({integer,[]}, Dst, branch_state(Fail, Vst));
-valfun_4({bs_init2,{f,Fail},_,Heap,Live,_,Dst}, Vst0) ->
+valfun_4({bs_init2,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
     verify_live(Live, Vst0),
+    if
+	is_integer(Sz) ->
+	    ok;
+	true ->
+	    assert_term(Sz, Vst0)
+    end,
     Vst1 = heap_alloc(Heap, Vst0),
     Vst2 = branch_state(Fail, Vst1),
     Vst3 = prune_x_regs(Live, Vst2),
     Vst = bs_zero_bits(Vst3),
     set_type_reg(binary, Dst, Vst);
-valfun_4({bs_init_bits,{f,Fail},_,Heap,Live,_,Dst}, Vst0) ->
+valfun_4({bs_init_bits,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
     verify_live(Live, Vst0),
+    if
+	is_integer(Sz) ->
+	    ok;
+	true ->
+	    assert_term(Sz, Vst0)
+    end,
     Vst1 = heap_alloc(Heap, Vst0),
     Vst2 = branch_state(Fail, Vst1),
     Vst3 = prune_x_regs(Live, Vst2),
diff --git a/lib/compiler/src/beam_z.erl b/lib/compiler/src/beam_z.erl
new file mode 100644
index 0000000000..8c6b0c916d
--- /dev/null
+++ b/lib/compiler/src/beam_z.erl
@@ -0,0 +1,79 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%% Purpose: Run right before beam_asm to do any final fix-ups or clean-ups.
+%%          (Mandatory.)
+
+-module(beam_z).
+
+-export([module/2]).
+
+module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
+    Fs = [function(F) || F <- Fs0],
+    {ok,{Mod,Exp,Attr,Fs,Lc}}.
+
+function({function,Name,Arity,CLabel,Is0}) ->
+    try
+	Is = undo_renames(Is0),
+	{function,Name,Arity,CLabel,Is}
+    catch
+	Class:Error ->
+	    Stack = erlang:get_stacktrace(),
+	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+	    erlang:raise(Class, Error, Stack)
+    end.
+
+undo_renames([{call_ext,2,send}|Is]) ->
+    [send|undo_renames(Is)];
+undo_renames([{apply,A},{deallocate,N},return|Is]) ->
+    [{apply_last,A,N}|undo_renames(Is)];
+undo_renames([{call,A,F},{deallocate,N},return|Is]) ->
+    [{call_last,A,F,N}|undo_renames(Is)];
+undo_renames([{call_ext,A,F},{deallocate,N},return|Is]) ->
+    [{call_ext_last,A,F,N}|undo_renames(Is)];
+undo_renames([{call,A,F},return|Is]) ->
+    [{call_only,A,F}|undo_renames(Is)];
+undo_renames([{call_ext,A,F},return|Is]) ->
+    [{call_ext_only,A,F}|undo_renames(Is)];
+undo_renames([I|Is]) ->
+    [undo_rename(I)|undo_renames(Is)];
+undo_renames([]) -> [].
+
+undo_rename({bs_put,F,{I,U,Fl},[Sz,Src]}) ->
+    {I,F,Sz,U,Fl,Src};
+undo_rename({bs_put,F,{I,Fl},[Src]}) ->
+    {I,F,Fl,Src};
+undo_rename({bs_put,{f,0},{bs_put_string,_,_}=I,[]}) ->
+    I;
+undo_rename({bif,bs_add=I,F,[Src1,Src2,{integer,U}],Dst}) ->
+    {I,F,[Src1,Src2,U],Dst};
+undo_rename({bif,bs_utf8_size=I,F,[Src],Dst}) ->
+    {I,F,Src,Dst};
+undo_rename({bif,bs_utf16_size=I,F,[Src],Dst}) ->
+    {I,F,Src,Dst};
+undo_rename({bs_init,F,{I,U,Flags},none,[Sz,Src],Dst}) ->
+    {I,F,Sz,U,Src,Flags,Dst};
+undo_rename({bs_init,F,{I,Extra,Flags},Live,[Sz],Dst}) ->
+    {I,F,Sz,Extra,Live,Flags,Dst};
+undo_rename({bs_init,F,{I,Extra,U,Flags},Live,[Sz,Src],Dst}) ->
+    {I,F,Sz,Extra,Live,U,Src,Flags,Dst};
+undo_rename({bs_init,_,bs_init_writable=I,_,_,_}) ->
+    I;
+undo_rename({select,I,Reg,Fail,List}) ->
+    {I,Reg,Fail,{list,List}};
+undo_rename(I) -> I.
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index 9b505ad15c..df1af36eeb 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -146,10 +146,17 @@ env_default_opts() ->
 
 do_compile(Input, Opts0) ->
     Opts = expand_opts(Opts0),
-    Self = self(),
-    Serv = spawn_link(fun() -> internal(Self, Input, Opts) end),
+    {Pid,Ref} =
+	spawn_monitor(fun() ->
+			      exit(try
+				       internal(Input, Opts)
+				   catch
+				       error:Reason ->
+					   {error,Reason}
+				   end)
+		      end),
     receive
-	{Serv,Rep} -> Rep
+	{'DOWN',Ref,process,Pid,Rep} -> Rep
     end.
 
 expand_opts(Opts0) ->
@@ -217,6 +224,8 @@ format_error({delete_temp,File,Error}) ->
 		  [File,file:format_error(Error)]);
 format_error({parse_transform,M,R}) ->
     io_lib:format("error in parse transform '~s': ~p", [M, R]);
+format_error({undef_parse_transform,M}) ->
+    io_lib:format("undefined parse transform '~s'", [M]);
 format_error({core_transform,M,R}) ->
     io_lib:format("error in core transform '~s': ~p", [M, R]);
 format_error({crash,Pass,Reason}) ->
@@ -242,15 +251,12 @@ format_error({module_name,Mod,Filename}) ->
 		  errors=[],
 		  warnings=[]}).
 
-internal(Master, Input, Opts) ->
-    Master ! {self(), try internal(Input, Opts)
-		      catch error:Reason -> {error, Reason}
-		      end}.
-
-internal({forms,Forms}, Opts) ->
-    {_,Ps} = passes(forms, Opts),
-    internal_comp(Ps, "", "", #compile{code=Forms,options=Opts,
-				       mod_options=Opts});
+internal({forms,Forms}, Opts0) ->
+    {_,Ps} = passes(forms, Opts0),
+    Source = proplists:get_value(source, Opts0, ""),
+    Opts1 = proplists:delete(source, Opts0),
+    Compile = #compile{code=Forms,options=Opts1,mod_options=Opts1},
+    internal_comp(Ps, Source, "", Compile);
 internal({file,File}, Opts) ->
     {Ext,Ps} = passes(file, Opts),
     Compile = #compile{options=Opts,mod_options=Opts},
@@ -547,12 +553,12 @@ select_list_passes_1([{iff,Flag,{done,Ext}}|Ps], Opts, Acc) ->
     end;
 select_list_passes_1([{iff=Op,Flag,List0}|Ps], Opts, Acc) when is_list(List0) ->
     case select_list_passes(List0, Opts) of
-	{done,_}=Done -> Done;
+	{done,List} -> {done,reverse(Acc) ++ List};
 	{not_done,List} -> select_list_passes_1(Ps, Opts, [{Op,Flag,List}|Acc])
     end;
 select_list_passes_1([{unless=Op,Flag,List0}|Ps], Opts, Acc) when is_list(List0) ->
     case select_list_passes(List0, Opts) of
-	{done,_}=Done -> Done;
+	{done,List} -> {done,reverse(Acc) ++ List};
 	{not_done,List} -> select_list_passes_1(Ps, Opts, [{Op,Flag,List}|Acc])
     end;
 select_list_passes_1([P|Ps], Opts, Acc) ->
@@ -626,7 +632,8 @@ kernel_passes() ->
 asm_passes() ->
     %% Assembly level optimisations.
     [{delay,
-      [{unless,no_postopt,
+      [{pass,beam_a},
+       {unless,no_postopt,
 	[{pass,beam_block},
 	 {iff,dblk,{listing,"block"}},
 	 {unless,no_except,{pass,beam_except}},
@@ -653,13 +660,11 @@ asm_passes() ->
 	 {iff,dtrim,{listing,"trim"}},
 	 {pass,beam_flatten}]},
 
-       %% If post optimizations are turned off, we still coalesce
-       %% adjacent labels and remove unused labels to keep the
-       %% HiPE compiler happy.
-       {iff,no_postopt,
-	[?pass(beam_unused_labels),
-	 {pass,beam_clean}]},
+       %% If post optimizations are turned off, we still
+       %% need to do a few clean-ups to code.
+       {iff,no_postopt,[{pass,beam_clean}]},
 
+       {pass,beam_z},
        {iff,dopt,{listing,"optimize"}},
        {iff,'S',{listing,"S"}},
        {iff,'to_asm',{done,"S"}}]},
@@ -846,6 +851,10 @@ foldl_transform(St, [T|Ts]) ->
 	{error,Es,Ws} ->
 	    {error,St#compile{warnings=St#compile.warnings ++ Ws,
 			      errors=St#compile.errors ++ Es}};
+	{'EXIT',{undef,_}} ->
+	    Es = [{St#compile.ifile,[{none,compile,
+				      {undef_parse_transform,T}}]}],
+	    {error,St#compile{errors=St#compile.errors ++ Es}};
 	{'EXIT',R} ->
 	    Es = [{St#compile.ifile,[{none,compile,{parse_transform,T,R}}]}],
 	    {error,St#compile{errors=St#compile.errors ++ Es}};
@@ -1232,10 +1241,6 @@ random_bytes_1(N, Acc) -> random_bytes_1(N-1, [random:uniform(255)|Acc]).
 save_core_code(St) ->
     {ok,St#compile{core_code=cerl:from_records(St#compile.code)}}.
 
-beam_unused_labels(#compile{code=Code0}=St) ->
-    Code = beam_jump:module_labels(Code0),
-    {ok,St#compile{code=Code}}.
-
 beam_asm(#compile{ifile=File,code=Code0,
 		  abstract_code=Abst,mod_options=Opts0}=St) ->
     Source = filename:absname(File),
diff --git a/lib/compiler/src/compiler.app.src b/lib/compiler/src/compiler.app.src
index 1133882728..94c78e68f9 100644
--- a/lib/compiler/src/compiler.app.src
+++ b/lib/compiler/src/compiler.app.src
@@ -20,6 +20,7 @@
  [{description, "ERTS  CXC 138 10"},
   {vsn, "%VSN%"},
   {modules, [
+	     beam_a,
 	     beam_asm,
 	     beam_block,
 	     beam_bool,
@@ -40,6 +41,7 @@
 	     beam_type,
 	     beam_utils,
 	     beam_validator,
+	     beam_z,
 	     cerl,
 	     cerl_clauses,
 	     cerl_inline,
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl
index ba9cde1de0..e55fb2a037 100644
--- a/lib/compiler/src/sys_pre_expand.erl
+++ b/lib/compiler/src/sys_pre_expand.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -42,7 +42,7 @@
                  compile=[],                    %Compile flags
                  attributes=[],                 %Attributes
                  callbacks=[],                  %Callbacks
-                 defined=[],                    %Defined functions
+                 defined,			%Defined functions (gb_set)
                  vcount=0,                      %Variable counter
                  func=[],                       %Current function
                  arity=[],                      %Arity for current function
@@ -83,7 +83,7 @@ module(Fs0, Opts0) ->
     {Efs,St2} = expand_pmod(Tfs, St1),
     %% Get the correct list of exported functions.
     Exports = case member(export_all, St2#expand.compile) of
-                  true -> St2#expand.defined;
+                  true -> gb_sets:to_list(St2#expand.defined);
                   false -> St2#expand.exports
               end,
     %% Generate all functions from stored info.
@@ -106,10 +106,11 @@ expand_pmod(Fs0, St0) ->
 		    true ->
 			 Ps0
 		 end,
+	    Def = gb_sets:to_list(St0#expand.defined),
             {Fs1,Xs,Ds} = sys_expand_pmod:forms(Fs0, Ps,
                                                 St0#expand.exports,
-                                                St0#expand.defined),
-	    St1 = St0#expand{exports=Xs, defined=Ds},
+						Def),
+	    St1 = St0#expand{exports=Xs,defined=gb_sets:from_list(Ds)},
 	    {Fs2,St2} = add_instance(Ps, Fs1, St1),
 	    {Fs3,St3} = ensure_new(Base, Ps0, Fs2, St2),
             {Fs3,St3#expand{attributes = [{abstract, 0, [true]}
@@ -118,7 +119,7 @@ expand_pmod(Fs0, St0) ->
 
 get_base(As) ->
     case lists:keyfind(extends, 1, As) of
-	{extends,[Base]} when is_atom(Base) ->
+	{extends,_,[Base]} when is_atom(Base) ->
 	    Base;
 	_ ->
 	    []
@@ -159,7 +160,7 @@ add_func(Name, Args, Body, Fs, St) ->
     F = {function,0,Name,A,[{clause,0,Args,[],Body}]},
     NA = {Name,A},
     {[F|Fs],St#expand{exports=add_element(NA, St#expand.exports),
-		      defined=add_element(NA, St#expand.defined)}}.
+		      defined=gb_sets:add_element(NA, St#expand.defined)}}.
 
 %% define_function(Form, State) -> State.
 %%  Add function to defined if form is a function.
@@ -168,7 +169,7 @@ define_functions(Forms, #expand{defined=Predef}=St) ->
     Fs = foldl(fun({function,_,N,A,_Cs}, Acc) -> [{N,A}|Acc];
                   (_, Acc) -> Acc
                end, Predef, Forms),
-    St#expand{defined=ordsets:from_list(Fs)}.
+    St#expand{defined=gb_sets:from_list(Fs)}.
 
 module_attrs(#expand{attributes=Attributes}=St) ->
     Attrs = [{attribute,Line,Name,Val} || {Name,Line,Val} <- Attributes],
@@ -187,7 +188,7 @@ module_predef_func_beh_info(#expand{callbacks=Callbacks,defined=Defined,
     PreDef=[{behaviour_info,1}],
     PreExp=PreDef,
     {[gen_beh_info(Callbacks)],
-     St#expand{defined=union(from_list(PreDef), Defined),
+     St#expand{defined=gb_sets:union(gb_sets:from_list(PreDef), Defined),
 	       exports=union(from_list(PreExp), Exports)}}.
 
 gen_beh_info(Callbacks) ->
@@ -215,7 +216,8 @@ module_predef_funcs_mod_info(St) ->
        [{clause,0,[{var,0,'X'}],[],
         [{call,0,{remote,0,{atom,0,erlang},{atom,0,get_module_info}},
           [{atom,0,St#expand.module},{var,0,'X'}]}]}]}],
-     St#expand{defined=union(from_list(PreDef), St#expand.defined),
+     St#expand{defined=gb_sets:union(gb_sets:from_list(PreDef),
+				     St#expand.defined),
                exports=union(from_list(PreExp), St#expand.exports)}}.
 
 %% forms(Forms, State) ->
@@ -452,9 +454,6 @@ expr({call,Line,{remote,Lr,M,F},As0}, St0) ->
     M1 = expand_package(M, St0),
     {[M2,F1|As1],St1} = expr_list([M1,F|As0], St0),
     {{call,Line,{remote,Lr,M2,F1},As1},St1};
-expr({call,Line,{tuple,_,[{atom,_,_}=M,{atom,_,_}=F]},As}, St) ->
-    %% Rewrite {Mod,Function}(Args...) to Mod:Function(Args...).
-    expr({call,Line,{remote,Line,M,F},As}, St);
 expr({call,Line,F,As0}, St0) ->
     {[Fun1|As1],St1} = expr_list([F|As0], St0),
     {{call,Line,Fun1,As1},St1};
@@ -721,4 +720,4 @@ imported(F, A, St) ->
     end.
 
 defined(F, A, St) ->
-    ordsets:is_element({F,A}, St#expand.defined).
+    gb_sets:is_element({F,A}, St#expand.defined).
diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl
index be15495672..6a13495523 100644
--- a/lib/compiler/src/v3_codegen.erl
+++ b/lib/compiler/src/v3_codegen.erl
@@ -123,15 +123,24 @@ cg_fun(Les, Hvs, Vdb, AtomMod, NameArity, Anno, St0) ->
 					   put_reg(V, Reg)
 				   end, [], Hvs),
 			 stk=[]}, 0, Vdb),
-    {B,_Aft,St} = cg_list(Les, 0, Vdb, Bef,
+    {B0,_Aft,St} = cg_list(Les, 0, Vdb, Bef,
 			  St3#cg{bfail=0,
 				 ultimate_failure=UltimateMatchFail,
 				 is_top_block=true}),
+    B = fix_bs_match_strings(B0),
     {Name,Arity} = NameArity,
     Asm = [{label,Fi},line(Anno),{func_info,AtomMod,{atom,Name},Arity},
 	   {label,Fl}|B++[{label,UltimateMatchFail},if_end]],
     {Asm,Fl,St}.
 
+fix_bs_match_strings([{test,bs_match_string,F,[Ctx,BinList]}|Is])
+  when is_list(BinList) ->
+    I = {test,bs_match_string,F,[Ctx,list_to_bitstring(BinList)]},
+    [I|fix_bs_match_strings(Is)];
+fix_bs_match_strings([I|Is]) ->
+    [I|fix_bs_match_strings(Is)];
+fix_bs_match_strings([]) -> [].
+
 %% cg(Lkexpr, Vdb, StackReg, State) -> {[Ainstr],StackReg,State}.
 %%  Generate code for a kexpr.
 %%  Split function into two steps for clarity, not efficiency.
@@ -370,6 +379,7 @@ bsm_rename_ctx(#l{ke={test,_,_}}=L, _, _, _) -> L;
 bsm_rename_ctx(#l{ke={bif,_,_,_}}=L, _, _, _) -> L;
 bsm_rename_ctx(#l{ke={gc_bif,_,_,_}}=L, _, _, _) -> L;
 bsm_rename_ctx(#l{ke={set,_,_}}=L, _, _, _) -> L;
+bsm_rename_ctx(#l{ke={call,_,_,_}}=L, _, _, _) -> L;
 bsm_rename_ctx(#l{ke={block,_}}=L, Old, _, false) ->
     %% This block is not inside a protected. The match context variable cannot
     %% possibly be live inside the block.
@@ -713,7 +723,22 @@ select_bin_seg(#l{ke={val_clause,{bin_int,Ctx,Sz,U,Fs,Val,Es},B},i=I,vdb=Vdb},
 				       I, Vdb, Bef, Ctx, St0),
     {Bis,Aft,St2} = match_cg(B, Fail, Int, St1),
     CtxReg = fetch_var(Ctx, Bef),
-    {[{bs_restore2,CtxReg,{Ctx,Ivar}}|Mis] ++ Bis,Aft,St2}.
+    Is = case Mis ++ Bis of
+	     [{test,bs_match_string,F,[OtherCtx,Bin1]},
+	      {bs_save2,OtherCtx,_},
+	      {bs_restore2,OtherCtx,_},
+	      {test,bs_match_string,F,[OtherCtx,Bin2]}|Is0] ->
+		 %% We used to do this optimization later, but it
+		 %% turns out that in huge functions with many
+		 %% bs_match_string instructions, it's a big win
+		 %% to do the combination now. To avoid copying the
+		 %% binary data again and again, we'll combine bitstrings
+		 %% in a list and convert all of it to a bitstring later.
+		 [{test,bs_match_string,F,[OtherCtx,[Bin1,Bin2]]}|Is0];
+	     Is0 ->
+		 Is0
+	 end,
+    {[{bs_restore2,CtxReg,{Ctx,Ivar}}|Is],Aft,St2}.
 
 select_extract_int([{var,Tl}], Val, {integer,Sz}, U, Fs, Vf,
 		   I, Vdb, Bef, Ctx, St) ->
@@ -1385,22 +1410,32 @@ catch_cg(C, {var,R}, Le, Vdb, Bef, St0) ->
 %%
 %%  put_list for constructing a cons is an atomic instruction
 %%  which can safely resuse one of the source registers as target.
-%%  Also binaries can reuse a source register as target.
 
 set_cg([{var,R}], {cons,Es}, Le, Vdb, Bef, St) ->
-    [S1,S2] = map(fun ({var,V}) -> fetch_var(V, Bef);
-		      (Other) -> Other
-		  end, Es),
+    [S1,S2] = cg_reg_args(Es, Bef),
     Int0 = clear_dead(Bef, Le#l.i, Vdb),
     Int1 = Int0#sr{reg=put_reg(R, Int0#sr.reg)},
     Ret = fetch_reg(R, Int1#sr.reg),
     {[{put_list,S1,S2,Ret}], Int1, St};
 set_cg([{var,R}], {binary,Segs}, Le, Vdb, Bef,
        #cg{in_catch=InCatch, bfail=Bfail}=St) ->
+    %% At run-time, binaries are constructed in three stages:
+    %% 1) First the size of the binary is calculated.
+    %% 2) Then the binary is allocated.
+    %% 3) Then each field in the binary is constructed.
+    %% For simplicity, we use the target register to also hold the
+    %% size of the binary. Therefore the target register must *not*
+    %% be one of the source registers.
+
+    %% First allocate the target register.
     Int0 = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
     Target = fetch_reg(R, Int0#sr.reg),
-    Fail = {f,Bfail},
+
+    %% Also allocate a scratch register for size calculations.
     Temp = find_scratch_reg(Int0#sr.reg),
+
+    %% First generate the code that constructs each field.
+    Fail = {f,Bfail},
     PutCode = cg_bin_put(Segs, Fail, Bef),
     {Sis,Int1} =
 	case InCatch of
@@ -1409,6 +1444,8 @@ set_cg([{var,R}], {binary,Segs}, Le, Vdb, Bef,
 	end,
     MaxRegs = max_reg(Bef#sr.reg),
     Aft = clear_dead(Int1, Le#l.i, Vdb),
+
+    %% Now generate the complete code for constructing the binary.
     Code = cg_binary(PutCode, Target, Temp, Fail, MaxRegs, Le#l.a),
     {Sis++Code,Aft,St};
 set_cg([{var,R}], Con, Le, Vdb, Bef, St) ->
@@ -1418,10 +1455,8 @@ set_cg([{var,R}], Con, Le, Vdb, Bef, St) ->
     Ais = case Con of
 	      {tuple,Es} ->
 		  [{put_tuple,length(Es),Ret}] ++ cg_build_args(Es, Bef);
-	      {var,V} ->	  % Normally removed by kernel optimizer.
-		  [{move,fetch_var(V, Int),Ret}];
 	      Other ->
-		  [{move,Other,Ret}]
+		  [{move,cg_reg_arg(Other, Int),Ret}]
 	  end,
     {Ais,clear_dead(Int, Le#l.i, Vdb),St}.
 
@@ -1575,8 +1610,7 @@ cg_gen_binsize([], _, _, _, _, Acc) -> Acc.
 %% cg_bin_opt(Code0) -> Code
 %%  Optimize the size calculations for binary construction.
 
-cg_bin_opt([{move,Size,D},{bs_append,Fail,D,Extra,Regs0,U,Bin,Flags,D}|Is]) ->
-    Regs = cg_bo_newregs(Regs0, D),
+cg_bin_opt([{move,Size,D},{bs_append,Fail,D,Extra,Regs,U,Bin,Flags,D}|Is]) ->
     cg_bin_opt([{bs_append,Fail,Size,Extra,Regs,U,Bin,Flags,D}|Is]);
 cg_bin_opt([{move,Size,D},{bs_private_append,Fail,D,U,Bin,Flags,D}|Is]) ->
     cg_bin_opt([{bs_private_append,Fail,Size,U,Bin,Flags,D}|Is]);
@@ -1584,9 +1618,8 @@ cg_bin_opt([{move,{integer,0},D},{bs_add,_,[D,{integer,_}=S,1],Dst}|Is]) ->
     cg_bin_opt([{move,S,Dst}|Is]);
 cg_bin_opt([{move,{integer,0},D},{bs_add,Fail,[D,S,U],Dst}|Is]) ->
     cg_bin_opt([{bs_add,Fail,[{integer,0},S,U],Dst}|Is]);
-cg_bin_opt([{move,{integer,Bytes},D},{Op,Fail,D,Extra,Regs0,Flags,D}|Is])
+cg_bin_opt([{move,{integer,Bytes},D},{Op,Fail,D,Extra,Regs,Flags,D}|Is])
   when Op =:= bs_init2; Op =:= bs_init_bits ->
-    Regs = cg_bo_newregs(Regs0, D),
     cg_bin_opt([{Op,Fail,Bytes,Extra,Regs,Flags,D}|Is]);
 cg_bin_opt([{move,Src1,Dst},{bs_add,Fail,[Dst,Src2,U],Dst}|Is]) ->
     cg_bin_opt([{bs_add,Fail,[Src1,Src2,U],Dst}|Is]);
@@ -1594,20 +1627,9 @@ cg_bin_opt([I|Is]) ->
     [I|cg_bin_opt(Is)];
 cg_bin_opt([]) -> [].
 
-cg_bo_newregs(R, {x,X}) when R-1 =:= X -> R-1;
-cg_bo_newregs(R, _) -> R.
-
-%% Common for new and old binary code generation.
-
 cg_bin_put({bin_seg,[],S0,U,T,Fs,[E0,Next]}, Fail, Bef) ->
-    S1 = case S0 of
-	     {var,Sv} -> fetch_var(Sv, Bef);
-	     _ -> S0
-	 end,
-    E1 = case E0 of
-	     {var,V} -> fetch_var(V, Bef);
-	     Other ->   Other
-	 end,
+    S1 = cg_reg_arg(S0, Bef),
+    E1 = cg_reg_arg(E0, Bef),
     {Format,Op} = case T of
 		      integer -> {plain,bs_put_integer};
 		      utf8 ->    {utf,bs_put_utf8};
@@ -1625,9 +1647,7 @@ cg_bin_put({bin_seg,[],S0,U,T,Fs,[E0,Next]}, Fail, Bef) ->
 cg_bin_put({bin_end,[]}, _, _) -> [].
 
 cg_build_args(As, Bef) ->
-    map(fun ({var,V}) -> {put,fetch_var(V, Bef)};
-	    (Other) -> {put,Other}
-	end, As).
+    [{put,cg_reg_arg(A, Bef)} || A <- As].
 
 %% return_cg([Val], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
 %% break_cg([Val], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
@@ -1906,27 +1926,13 @@ fetch_var(V, Sr) ->
 	error -> fetch_stack(V, Sr#sr.stk)
     end.
 
-% find_var(V, Sr) ->
-%     case find_reg(V, Sr#sr.reg) of
-% 	{ok,R} -> {ok,R};
-% 	error ->
-% 	    case find_stack(V, Sr#sr.stk) of
-% 		{ok,S} -> {ok,S};
-% 		error -> error
-% 	    end
-%     end.
-
 load_vars(Vs, Regs) ->
     foldl(fun ({var,V}, Rs) -> put_reg(V, Rs) end, Regs, Vs).
 
 %% put_reg(Val, Regs) -> Regs.
-%% free_reg(Val, Regs) -> Regs.
 %% find_reg(Val, Regs) -> ok{r{R}} | error.
 %% fetch_reg(Val, Regs) -> r{R}.
 %%  Functions to interface the registers.
-%%  put_reg puts a value into a free register,
-%%  load_reg loads a value into a fixed register
-%%  free_reg frees a register containing a specific value.
 
 % put_regs(Vs, Rs) -> foldl(fun put_reg/2, Rs, Vs).
 
@@ -1937,10 +1943,6 @@ put_reg_1(V, [{reserved,I,V}|Rs], I) -> [{I,V}|Rs];
 put_reg_1(V, [R|Rs], I) -> [R|put_reg_1(V, Rs, I+1)];
 put_reg_1(V, [], I) -> [{I,V}].
 
-% free_reg(V, [{I,V}|Rs]) -> [free|Rs];
-% free_reg(V, [R|Rs]) -> [R|free_reg(V, Rs)];
-% free_reg(V, []) -> [].
-
 fetch_reg(V, [{I,V}|_]) -> {x,I};
 fetch_reg(V, [_|SRs]) -> fetch_reg(V, SRs).
 
@@ -1957,9 +1959,6 @@ find_scratch_reg([free|_], I) -> {x,I};
 find_scratch_reg([_|Rs], I) -> find_scratch_reg(Rs, I+1);
 find_scratch_reg([], I) -> {x,I}.
 
-%%copy_reg(Val, R, Regs) -> load_reg(Val, R, Regs).
-%%move_reg(Val, R, Regs) -> load_reg(Val, R, free_reg(Val, Regs)).
-
 replace_reg_contents(Old, New, [{I,Old}|Rs]) -> [{I,New}|Rs];
 replace_reg_contents(Old, New, [R|Rs]) -> [R|replace_reg_contents(Old, New, Rs)].
 
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index 242196c593..01042cc56f 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -823,6 +823,13 @@ bitstr({bin_element,_,E0,Size0,[Type,{unit,Unit}|Flags]}, St0) ->
 	{_,_} ->
 	    throw(bad_binary)
     end,
+    case Size1 of
+	#c_var{} -> ok;
+	#c_literal{val=Sz} when is_integer(Sz), Sz >= 0 -> ok;
+	#c_literal{val=undefined} -> ok;
+	#c_literal{val=all} -> ok;
+	_ -> throw(bad_binary)
+    end,
     {#c_bitstr{val=E1,size=Size1,
 	       unit=#c_literal{val=Unit},
 	       type=#c_literal{val=Type},
diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl
index c4e7b45aac..8ef71e1346 100644
--- a/lib/compiler/src/v3_kernel.erl
+++ b/lib/compiler/src/v3_kernel.erl
@@ -81,7 +81,7 @@
 -export([module/2,format_error/1]).
 
 -import(lists, [map/2,foldl/3,foldr/3,mapfoldl/3,splitwith/2,member/2,
-		keymember/3,keyfind/3]).
+		keymember/3,keyfind/3,partition/2]).
 -import(ordsets, [add_element/2,del_element/2,union/2,union/1,subtract/2]).
 -import(cerl, [c_tuple/1]).
 
@@ -278,11 +278,12 @@ expr(#c_binary{anno=A,segments=Cv}, Sub, St0) ->
 	    {#k_binary{anno=A,segs=Kv},Ep,St1}
     catch
 	throw:bad_element_size ->
+	    St1 = add_warning(get_line(A), bad_segment_size, A, St0),
 	    Erl = #c_literal{val=erlang},
 	    Name = #c_literal{val=error},
 	    Args = [#c_literal{val=badarg}],
 	    Error = #c_call{anno=A,module=Erl,name=Name,args=Args},
-	    expr(Error, Sub, St0)
+	    expr(Error, Sub, St1)
     end;
 expr(#c_fun{anno=A,vars=Cvs,body=Cb}, Sub0, #kern{ff=OldFF,func=Func}=St0) ->
     FA = case OldFF of
@@ -1080,9 +1081,44 @@ select_bin_con(Cs0) ->
 		       end, Cs0),
     select_bin_con_1(Cs1).
 
+
 select_bin_con_1(Cs) ->
     try
-	select_bin_int(Cs)
+	%% The usual way to match literals is to first extract the
+	%% value to a register, and then compare the register to the
+	%% literal value. Extracting the value is good if we need
+	%% compare it more than once.
+	%%
+	%% But we would like to combine the extracting and the
+	%% comparing into a single instruction if we know that
+	%% a binary segment must contain specific integer value
+	%% or the matching will fail, like in this example:
+	%%
+	%% <<42:8,...>> ->
+	%% <<42:8,...>> ->
+	%% .
+	%% .
+	%% .
+	%% <<42:8,...>> ->
+	%% <<>> ->
+	%%
+	%% The first segment must either contain the integer 42
+	%% or the binary must end for the match to succeed.
+	%%
+	%% The way we do is to replace the generic #k_bin_seg{}
+	%% record with a #k_bin_int{} record if all clauses will
+	%% select the same literal integer (except for one or more
+	%% clauses that will end the binary).
+
+	{BinSegs0,BinEnd} =
+	    partition(fun (C) ->
+			      clause_con(C) =:= k_bin_seg
+		      end, Cs),
+	BinSegs = select_bin_int(BinSegs0),
+	case BinEnd of
+	    [] -> BinSegs;
+	    [_|_] -> BinSegs ++ [{k_bin_end,BinEnd}]
+	end
     catch
 	throw:not_possible ->
 	    select_bin_con_2(Cs)
@@ -1096,7 +1132,7 @@ select_bin_con_2([]) -> [].
 
 %% select_bin_int([Clause]) -> {k_bin_int,[Clause]}
 %%  If the first pattern in each clause selects the same integer,
-%%  rewrite all clauses to use #k_bin_int{} (which will later to
+%%  rewrite all clauses to use #k_bin_int{} (which will later be
 %%  translated to a bs_match_string/4 instruction).
 %%
 %%  If it is not possible to do this rewrite, a 'not_possible'
@@ -1345,7 +1381,7 @@ clause_arg(#iclause{pats=[Arg|_]}) -> Arg.
 
 clause_con(C) -> arg_con(clause_arg(C)).
 
-clause_val(C) -> arg_val(clause_arg(C)).
+clause_val(C) -> arg_val(clause_arg(C), C).
 
 is_var_clause(C) -> clause_con(C) =:= k_var.
 
@@ -1376,7 +1412,7 @@ arg_con(Arg) ->
 	#k_var{} -> k_var
     end.
 
-arg_val(Arg) ->
+arg_val(Arg, C) ->
     case arg_arg(Arg) of
 	#k_literal{val=Lit} -> Lit;
 	#k_int{val=I} -> I;
@@ -1384,7 +1420,13 @@ arg_val(Arg) ->
 	#k_atom{val=A} -> A;
 	#k_tuple{es=Es} -> length(Es);
 	#k_bin_seg{size=S,unit=U,type=T,flags=Fs} ->
-	    {set_kanno(S, []),U,T,Fs}
+	    case S of
+		#k_var{name=V} ->
+		    #iclause{isub=Isub} = C,
+		    {#k_var{name=get_vsub(V, Isub)},U,T,Fs};
+		_ ->
+		    {set_kanno(S, []),U,T,Fs}
+	    end
     end.
 
 %% ubody_used_vars(Expr, State) -> [UsedVar]
@@ -1827,7 +1869,9 @@ format_error({nomatch_shadow,Line}) ->
 format_error(nomatch_shadow) ->
     "this clause cannot match because a previous clause always matches";
 format_error(bad_call) ->
-    "invalid module and/or function name; this call will always fail".
+    "invalid module and/or function name; this call will always fail";
+format_error(bad_segment_size) ->
+    "binary construction will fail because of a type mismatch".
 
 add_warning(none, Term, Anno, #kern{ws=Ws}=St) ->
     File = get_file(Anno),
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index e13ad4ae90..3b065ec3b9 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -10,7 +10,7 @@ MODULES= \
 	apply_SUITE \
 	beam_validator_SUITE \
 	beam_disasm_SUITE \
-	beam_expect_SUITE \
+	beam_except_SUITE \
 	bs_bincomp_SUITE \
 	bs_bit_binaries_SUITE \
 	bs_construct_SUITE \
@@ -39,7 +39,7 @@ MODULES= \
 NO_OPT= \
 	andor \
 	apply \
-	beam_expect \
+	beam_except \
 	bs_construct \
         bs_match \
 	bs_utf \
@@ -154,12 +154,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) compiler.spec compiler.cover \
-		$(EMAKEFILE) $(ERL_FILES) $(CORE_FILES) $(RELSYSDIR)
+		$(EMAKEFILE) $(ERL_FILES) $(CORE_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) \
-		$(INLINE_ERL_FILES) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+		$(INLINE_ERL_FILES) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/compiler/test/andor_SUITE.erl b/lib/compiler/test/andor_SUITE.erl
index f7388f1614..fe69aeeb43 100644
--- a/lib/compiler/test/andor_SUITE.erl
+++ b/lib/compiler/test/andor_SUITE.erl
@@ -29,11 +29,12 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [t_case, t_and_or, t_andalso, t_orelse, inside, overlap,
-     combined, in_case, before_and_inside_if].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [t_case,t_and_or,t_andalso,t_orelse,inside,overlap,
+       combined,in_case,before_and_inside_if]}].
 
 init_per_suite(Config) ->
     Config.
diff --git a/lib/compiler/test/beam_expect_SUITE.erl b/lib/compiler/test/beam_except_SUITE.erl
index 6f216eac4f..6b55224a42 100644
--- a/lib/compiler/test/beam_expect_SUITE.erl
+++ b/lib/compiler/test/beam_except_SUITE.erl
@@ -16,7 +16,7 @@
 %%
 %% %CopyrightEnd%
 %%
--module(beam_expect_SUITE).
+-module(beam_except_SUITE).
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
diff --git a/lib/compiler/test/beam_validator_SUITE.erl b/lib/compiler/test/beam_validator_SUITE.erl
index 902867bc19..c84c83795a 100644
--- a/lib/compiler/test/beam_validator_SUITE.erl
+++ b/lib/compiler/test/beam_validator_SUITE.erl
@@ -47,17 +47,18 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [beam_files, compiler_bug, stupid_but_valid, xrange,
-     yrange, stack, call_last, merge_undefined, uninit,
-     unsafe_catch, dead_code, mult_labels,
-     overwrite_catchtag, overwrite_trytag, accessing_tags,
-     bad_catch_try, cons_guard, freg_range, freg_uninit,
-     freg_state, bin_match, bin_aligned, bad_dsetel,
-     state_after_fault_in_catch, no_exception_in_catch,
-     undef_label, illegal_instruction, failing_gc_guard_bif].
+    [beam_files,{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [compiler_bug,stupid_but_valid,xrange,
+       yrange,stack,call_last,merge_undefined,uninit,
+       unsafe_catch,dead_code,mult_labels,
+       overwrite_catchtag,overwrite_trytag,accessing_tags,
+       bad_catch_try,cons_guard,freg_range,freg_uninit,
+       freg_state,bin_match,bin_aligned,bad_dsetel,
+       state_after_fault_in_catch,no_exception_in_catch,
+       undef_label,illegal_instruction,failing_gc_guard_bif]}].
 
 init_per_suite(Config) ->
     Config.
diff --git a/lib/compiler/test/bs_bit_binaries_SUITE.erl b/lib/compiler/test/bs_bit_binaries_SUITE.erl
index 30276f1259..897b4769f1 100644
--- a/lib/compiler/test/bs_bit_binaries_SUITE.erl
+++ b/lib/compiler/test/bs_bit_binaries_SUITE.erl
@@ -34,13 +34,15 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [misc, horrid_match, test_bitstr, test_bit_size,
-     asymmetric_tests, big_asymmetric_tests,
-     binary_to_and_from_list, big_binary_to_and_from_list,
-     send_and_receive, send_and_receive_alot].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [misc,horrid_match,test_bitstr,test_bit_size,
+       asymmetric_tests,big_asymmetric_tests,
+       binary_to_and_from_list,big_binary_to_and_from_list,
+       send_and_receive,send_and_receive_alot]}].
+      
 
 init_per_suite(Config) ->
     Config.
diff --git a/lib/compiler/test/bs_construct_SUITE.erl b/lib/compiler/test/bs_construct_SUITE.erl
index 31c7890f26..4ea5235bb6 100644
--- a/lib/compiler/test/bs_construct_SUITE.erl
+++ b/lib/compiler/test/bs_construct_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -36,12 +36,14 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [two, test1, fail, float_bin, in_guard, in_catch,
-     nasty_literals, side_effect, opt, otp_7556, float_arith,
-     otp_8054].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [two,test1,fail,float_bin,in_guard,in_catch,
+       nasty_literals,side_effect,opt,otp_7556,float_arith,
+       otp_8054]}].
+
 
 init_per_suite(Config) ->
     Config.
@@ -360,6 +362,11 @@ in_catch(Config) when is_list(Config) ->
     ?line <<255>> = small(255, <<1,2,3,4,5,6,7,8,9>>),
     ?line <<1,2>> = small(<<7,8,9,10>>, 258),
     ?line <<>> = small(<<1,2,3,4,5>>, <<7,8,9,10>>),
+
+    <<15,240,0,42>> = small2(255, 42),
+    <<7:20>> = small2(<<1,2,3>>, 7),
+    <<300:12>> = small2(300, <<1,2,3>>),
+    <<>> = small2(<<1>>, <<2>>),
     ok.
 
 small(A, B) ->
@@ -381,6 +388,25 @@ small(A, B) ->
     end,
     <<ResA/binary,ResB/binary>>.
 
+small2(A, B) ->
+    case begin
+	     case catch <<A:12>> of
+		 {'EXIT',_} -> <<>>;
+		 ResA0 -> ResA0
+	     end
+	 end of
+	ResA -> ok
+    end,
+    case begin
+	     case catch <<B:20>> of
+		 {'EXIT',_} -> <<>>;
+		 ResB0 -> ResB0
+	     end
+	 end of
+	ResB -> ok
+    end,
+    <<ResA/binary-unit:1,ResB/binary-unit:1>>.
+
 nasty_literals(Config) when is_list(Config) ->
     case erlang:system_info(endian) of
 	big ->
@@ -468,6 +494,10 @@ opt(Config) when is_list(Config) ->
     ?line {'EXIT',_} = (catch <<<<23,56,0,2>>:64/float>>),
     ?line {'EXIT',_} = (catch <<<<23,56,0,2:7>>/binary>>),
 
+    %% Test constant propagation - there should be a warning.
+    BadSz = 2.5,
+    {'EXIT',_} = (catch <<<<N,56,0,2>>:BadSz/binary>>),
+
     case id(false) of
 	true -> ?line opt_dont_call_me();
 	false -> ok
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index 01b7568122..d63d2235d7 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -33,7 +33,7 @@
 	 matching_meets_construction/1,simon/1,matching_and_andalso/1,
 	 otp_7188/1,otp_7233/1,otp_7240/1,otp_7498/1,
 	 match_string/1,zero_width/1,bad_size/1,haystack/1,
-	 cover_beam_bool/1]).
+	 cover_beam_bool/1,matched_out_size/1,follow_fail_branch/1]).
 
 -export([coverage_id/1,coverage_external_ignore/2]).
 
@@ -44,19 +44,21 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [fun_shadow, int_float, otp_5269, null_fields, wiger,
-     bin_tail, save_restore, shadowed_size_var,
-     partitioned_bs_match, function_clause, unit,
-     shared_sub_bins, bin_and_float, dec_subidentifiers,
-     skip_optional_tag, wfbm, degenerated_match, bs_sum,
-     coverage, multiple_uses, zero_label, followed_by_catch,
-     matching_meets_construction, simon,
-     matching_and_andalso, otp_7188, otp_7233, otp_7240,
-     otp_7498, match_string, zero_width, bad_size, haystack,
-     cover_beam_bool].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [fun_shadow,int_float,otp_5269,null_fields,wiger,
+       bin_tail,save_restore,shadowed_size_var,
+       partitioned_bs_match,function_clause,unit,
+       shared_sub_bins,bin_and_float,dec_subidentifiers,
+       skip_optional_tag,wfbm,degenerated_match,bs_sum,
+       coverage,multiple_uses,zero_label,followed_by_catch,
+       matching_meets_construction,simon,
+       matching_and_andalso,otp_7188,otp_7233,otp_7240,
+       otp_7498,match_string,zero_width,bad_size,haystack,
+       cover_beam_bool,matched_out_size,follow_fail_branch]}].
+
 
 init_per_suite(Config) ->
     Config.
@@ -800,12 +802,29 @@ matching_and_andalso(Config) when is_list(Config) ->
     ?line {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, -8)),
     ?line {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, blurf)),
     ?line {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, 19)),
+
+    {"abc",<<"xyz">>} = matching_and_andalso_2("abc", <<"-xyz">>),
+    {"abc",<<"">>} = matching_and_andalso_2("abc", <<($a-1)>>),
+    {"abc",<<"">>} = matching_and_andalso_2("abc", <<($z+1)>>),
+    {"abc",<<"">>} = matching_and_andalso_2("abc", <<($A-1)>>),
+    {"abc",<<"">>} = matching_and_andalso_2("abc", <<($Z+1)>>),
+    error = matching_and_andalso_2([], <<>>),
+    error = matching_and_andalso_2([], <<$A>>),
+    error = matching_and_andalso_2([], <<$Z>>),
+    error = matching_and_andalso_2([], <<$a>>),
+    error = matching_and_andalso_2([], <<$z>>),
     ok.
 
 matching_and_andalso_1(<<Bitmap/binary>>, K)
   when is_integer(K) andalso size(Bitmap) >= K andalso 0 < K ->
     ok.
 
+matching_and_andalso_2(Datetime, <<H,T/binary>>)
+  when not ((H >= $a) andalso (H =< $z)) andalso
+       not ((H >= $A) andalso (H =< $Z)) ->
+    {Datetime,T};
+matching_and_andalso_2(_, _) -> error.
+
 %% Thanks to Tomas Stejskal.
 otp_7188(Config) when is_list(Config) ->
     MP3 = <<84,65,71,68,117,154,105,232,107,121,0,0,0,0,0,0,0,0,0,0,
@@ -1062,6 +1081,59 @@ do_cover_beam_bool(Bin, X) when X > 0 ->
 do_cover_beam_bool(<<_,Bin/binary>>, X) ->
     do_cover_beam_bool(Bin, X+1).
 
+matched_out_size(Config) when is_list(Config) ->
+    {253,16#DEADBEEF} = mos_int(<<8,253,16#DEADBEEF:32>>),
+    {6,16#BEEFDEAD} = mos_int(<<3,6:3,16#BEEFDEAD:32>>),
+    {53,16#CAFEDEADBEEFCAFE} = mos_int(<<16,53:16,16#CAFEDEADBEEFCAFE:64>>),
+    {23,16#CAFEDEADBEEFCAFE} = mos_int(<<5,23:5,16#CAFEDEADBEEFCAFE:64>>),
+
+    {<<1,2,3>>,4} = mos_bin(<<3,1,2,3,4,3>>),
+    {<<1,2,3,7>>,19,42} = mos_bin(<<4,1,2,3,7,19,4,42>>),
+    <<1,2,3,7>> = mos_bin(<<4,1,2,3,7,"abcdefghij">>),
+
+    ok.
+
+mos_int(<<L,I:L,X:32>>) ->
+    {I,X};
+mos_int(<<L,I:L,X:64>>) ->
+    {I,X}.
+
+mos_bin(<<L,Bin:L/binary,X:8,L>>) ->
+    L = byte_size(Bin),
+    {Bin,X};
+mos_bin(<<L,Bin:L/binary,X:8,L,Y:8>>) ->
+    L = byte_size(Bin),
+    {Bin,X,Y};
+mos_bin(<<L,Bin:L/binary,"abcdefghij">>) ->
+    L = byte_size(Bin),
+    Bin.
+
+follow_fail_branch(_) ->
+    42 = ffb_1(<<0,1>>, <<0>>),
+    8 = ffb_1(<<0,1>>, [a]),
+    42 = ffb_2(<<0,1>>, <<0>>, 17),
+    8 = ffb_2(<<0,1>>, [a], 0),
+    ok.
+
+ffb_1(<<_,T/bitstring>>, List) ->
+    case List of
+	<<_>> ->
+	    42;
+	[_|_] ->
+	    %% The fail branch of the bs_start_match2 instruction
+	    %% pointing to here would be ignored, making the compiler
+	    %% incorrectly assume that the delayed sub-binary
+	    %% optimization was safe.
+	    bit_size(T)
+    end.
+
+ffb_2(<<_,T/bitstring>>, List, A) ->
+    case List of
+	<<_>> when A =:= 17 -> 42;
+	[_|_] -> bit_size(T)
+    end.
+
+
 check(F, R) ->
     R = F().
 
diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl
index fed7bec7d4..bec97b0199 100644
--- a/lib/compiler/test/compilation_SUITE.erl
+++ b/lib/compiler/test/compilation_SUITE.erl
@@ -28,26 +28,29 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [self_compile_old_inliner, self_compile, compiler_1,
-     compiler_3, compiler_5, beam_compiler_1,
-     beam_compiler_2, beam_compiler_3, beam_compiler_4,
-     beam_compiler_5, beam_compiler_6, beam_compiler_7,
-     beam_compiler_8, beam_compiler_9, beam_compiler_10,
-     beam_compiler_11, beam_compiler_12,
-     nested_tuples_in_case_expr, otp_2330, guards,
-     {group, vsn}, otp_2380, otp_2141, otp_2173, otp_4790,
-     const_list_256, bin_syntax_1, bin_syntax_2,
-     bin_syntax_3, bin_syntax_4, bin_syntax_5, bin_syntax_6,
-     live_var, convopts, bad_functional_value,
-     catch_in_catch, redundant_case, long_string, otp_5076,
-     complex_guard, otp_5092, otp_5151, otp_5235, otp_5244,
-     trycatch_4, opt_crash, otp_5404, otp_5436, otp_5481,
-     otp_5553, otp_5632, otp_5714, otp_5872, otp_6121,
-     otp_6121a, otp_6121b, otp_7202, otp_7345, on_load,
-     string_table,otp_8949_a,otp_8949_a,split_cases].
+    [self_compile_old_inliner,self_compile,
+     {group,p}].
 
 groups() -> 
-    [{vsn, [], [vsn_1, vsn_2, vsn_3]}].
+    [{vsn,[parallel],[vsn_1,vsn_2,vsn_3]},
+     {p,test_lib:parallel(),
+      [compiler_1,
+       compiler_3,compiler_5,beam_compiler_1,
+       beam_compiler_2,beam_compiler_3,beam_compiler_4,
+       beam_compiler_5,beam_compiler_6,beam_compiler_7,
+       beam_compiler_8,beam_compiler_9,beam_compiler_10,
+       beam_compiler_11,beam_compiler_12,
+       nested_tuples_in_case_expr,otp_2330,guards,
+       {group,vsn},otp_2380,otp_2141,otp_2173,otp_4790,
+       const_list_256,bin_syntax_1,bin_syntax_2,
+       bin_syntax_3,bin_syntax_4,bin_syntax_5,bin_syntax_6,
+       live_var,convopts,bad_functional_value,
+       catch_in_catch,redundant_case,long_string,otp_5076,
+       complex_guard,otp_5092,otp_5151,otp_5235,otp_5244,
+       trycatch_4,opt_crash,otp_5404,otp_5436,otp_5481,
+       otp_5553,otp_5632,otp_5714,otp_5872,otp_6121,
+       otp_6121a,otp_6121b,otp_7202,otp_7345,on_load,
+       string_table,otp_8949_a,otp_8949_a,split_cases]}].
 
 init_per_suite(Config) ->
     Config.
@@ -623,7 +626,7 @@ string_table(Config) when is_list(Config) ->
     ?line File = filename:join(DataDir, "string_table.erl"),
     ?line {ok,string_table,Beam,[]} = compile:file(File, [return, binary]),
     ?line {ok,{string_table,[StringTableChunk]}} = beam_lib:chunks(Beam, ["StrT"]),
-    ?line {"StrT", <<"stringabletringtable">>} = StringTableChunk,
+    ?line {"StrT", <<"stringtable">>} = StringTableChunk,
     ok.
 
 otp_8949_a(Config) when is_list(Config) ->
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 512fa0e4ac..2cd75944f4 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -25,7 +25,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 app_test/1,
-	 file_1/1, module_mismatch/1, big_file/1, outdir/1, 
+	 file_1/1, forms_2/1, module_mismatch/1, big_file/1, outdir/1,
 	 binary/1, makedep/1, cond_and_ifdef/1, listings/1, listings_big/1,
 	 other_output/1, package_forms/1, encrypted_abstr/1,
 	 bad_record_use1/1, bad_record_use2/1, strict_record/1,
@@ -42,7 +42,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [app_test, file_1, module_mismatch, big_file, outdir,
+    [app_test, file_1, forms_2, module_mismatch, big_file, outdir,
      binary, makedep, cond_and_ifdef, listings, listings_big,
      other_output, package_forms, encrypted_abstr,
      {group, bad_record_use}, strict_record,
@@ -76,6 +76,9 @@ app_test(Config) when is_list(Config) ->
 
 file_1(Config) when is_list(Config) ->
     ?line Dog = test_server:timetrap(test_server:minutes(5)),
+
+    process_flag(trap_exit, true),
+
     ?line {Simple, Target} = files(Config, "file_1"),
     ?line {ok, Cwd} = file:get_cwd(),
     ?line ok = file:set_cwd(filename:dirname(Target)),
@@ -102,9 +105,37 @@ file_1(Config) when is_list(Config) ->
     %% Cleanup.
     ?line ok = file:delete(Target),
     ?line ok = file:del_dir(filename:dirname(Target)),
+
+    %% There should not be any messages in the messages.
+    receive
+	Any ->
+	    ?t:fail({unexpected,Any})
+    after 10 ->
+	    ok
+    end,
+
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
+forms_2(Config) when is_list(Config) ->
+    Src = "/foo/bar",
+    AbsSrc = filename:absname(Src),
+    {ok,simple,Binary} = compile:forms([{attribute,1,module,simple}],
+				       [binary,{source,Src}]),
+    code:load_binary(simple, Src, Binary),
+    Info = simple:module_info(compile),
+
+    %% Test that the proper source is returned.
+    AbsSrc = proplists:get_value(source, Info),
+
+    %% Ensure that the options are not polluted with 'source'.
+    [] = proplists:get_value(options, Info),
+
+    %% Cleanup.
+    true = code:delete(simple),
+    false = code:purge(simple),
+    ok.
+
 module_mismatch(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir, Config),
     ?line File = filename:join(DataDir, "wrong_module_name.erl"),
@@ -211,6 +242,12 @@ makedep(Config) when is_list(Config) ->
       [makedep,{makedep_output,Target}|IncludeOptions]),
     ?line {ok,Mf6} = file:read_file(Target),
     ?line BasicMf2 = makedep_canonicalize_result(Mf6, DataDir),
+    %% Rule with creating phony target.
+    ?line PhonyMfName = SimpleRootname ++ "-phony.mk",
+    ?line {ok,PhonyMf} = file:read_file(PhonyMfName),
+    ?line {ok,_,Mf7} = compile:file(Simple,
+      [binary,makedep,makedep_phony|IncludeOptions]),
+    ?line PhonyMf = makedep_canonicalize_result(Mf7, DataDir),
 
     ?line ok = file:delete(Target),
     ?line ok = file:del_dir(filename:dirname(Target)),
diff --git a/lib/compiler/test/compile_SUITE_data/simple-phony.mk b/lib/compiler/test/compile_SUITE_data/simple-phony.mk
new file mode 100644
index 0000000000..c84bcedd2a
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/simple-phony.mk
@@ -0,0 +1,3 @@
+simple.beam: $(srcdir)/simple.erl $(srcdir)/include/simple.hrl
+
+$(srcdir)/include/simple.hrl:
diff --git a/lib/compiler/test/core_SUITE.erl b/lib/compiler/test/core_SUITE.erl
index 06185bfc34..a40dc32d59 100644
--- a/lib/compiler/test/core_SUITE.erl
+++ b/lib/compiler/test/core_SUITE.erl
@@ -43,11 +43,13 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [dehydrated_itracer,nested_tries,seq_in_guard,make_effect_seq,
-     eval_is_boolean,unsafe_case,nomatch_shadow,reversed_annos].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [dehydrated_itracer,nested_tries,seq_in_guard,make_effect_seq,
+       eval_is_boolean,unsafe_case,nomatch_shadow,reversed_annos]}].
+
 
 init_per_suite(Config) ->
     Config.
diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index 54bd52947e..2adc71c237 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -31,11 +31,13 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [t_element, setelement, t_length, append, t_apply, bifs,
-     eq, nested_call_in_case, guard_try_catch, coverage].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [t_element,setelement,t_length,append,t_apply,bifs,
+       eq,nested_call_in_case,guard_try_catch,coverage]}].
+
 
 init_per_suite(Config) ->
     Config.
diff --git a/lib/compiler/test/error_SUITE.erl b/lib/compiler/test/error_SUITE.erl
index eb5e50818e..859c4571ea 100644
--- a/lib/compiler/test/error_SUITE.erl
+++ b/lib/compiler/test/error_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -22,16 +22,21 @@
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
-	 head_mismatch_line/1,warnings_as_errors/1, bif_clashes/1]).
+	 head_mismatch_line/1,warnings_as_errors/1, bif_clashes/1,
+	 transforms/1]).
+
+%% Used by transforms/1 test case.
+-export([parse_transform/2]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [head_mismatch_line, warnings_as_errors, bif_clashes].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [head_mismatch_line,warnings_as_errors,bif_clashes,transforms]}].
 
 init_per_suite(Config) ->
     Config.
@@ -216,6 +221,24 @@ warnings_as_errors(Config) when is_list(Config) ->
 
     ok.
 
+transforms(Config) ->
+    Ts1 = [{undef_parse_transform,
+	    <<"
+              -compile({parse_transform,non_existing}).
+             ">>,
+	    [return],
+	    {error,[{none,compile,{undef_parse_transform,non_existing}}],[]}}],
+    [] = run(Config, Ts1),
+    Ts2 = <<"
+              -compile({parse_transform,",?MODULE_STRING,"}).
+             ">>,
+    {error,[{none,compile,{parse_transform,?MODULE,{too_bad,_}}}],[]} =
+	run_test(Ts2, test_filename(Config), [], dont_write_beam),
+    ok.
+
+parse_transform(_, _) ->
+    error(too_bad).
+
 
 run(Config, Tests) ->
     ?line File = test_filename(Config),
@@ -260,12 +283,14 @@ filter(X) ->
 %% Compiles a test module and returns the list of errors and warnings.
 
 test_filename(Conf) ->
-    Filename = "errors_test.erl",
+    Filename = ["errors_test_",test_lib:uniq(),".erl"],
     DataDir = ?config(priv_dir, Conf),
     filename:join(DataDir, Filename).
 
 run_test(Test0, File, Warnings, WriteBeam) ->
-    ?line Test = ["-module(errors_test). ", Test0],
+    ModName = filename:rootname(filename:basename(File), ".erl"),
+    Mod = list_to_atom(ModName),
+    Test = ["-module(",ModName,"). ",Test0],
     ?line Opts = case WriteBeam of
 		     dont_write_beam ->
 			 [binary,return_errors|Warnings];
@@ -279,17 +304,17 @@ run_test(Test0, File, Warnings, WriteBeam) ->
 
     %% Test result of compilation.
     ?line Res = case compile:file(File, Opts) of
-		    {ok,errors_test,_,[{_File,Ws}]} ->
+		    {ok,Mod,_,[{_File,Ws}]} ->
 			%io:format("compile:file(~s,~p) ->~n~p~n",
 			%	  [File,Opts,Ws]),
 			{warning,Ws};
-		    {ok,errors_test,_,[]} ->
+		    {ok,Mod,_,[]} ->
 			%io:format("compile:file(~s,~p) ->~n~p~n",
 			%	  [File,Opts,Ws]),
 			[];
-		    {ok,errors_test,[{_File,Ws}]} ->
+		    {ok,Mod,[{_File,Ws}]} ->
 			{warning,Ws};
-		    {ok,errors_test,[]} ->
+		    {ok,Mod,[]} ->
 			[];
 		    {error,[{XFile,Es}],Ws} = _ZZ when is_list(XFile) ->
 			%io:format("compile:file(~s,~p) ->~n~p~n",
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index 40711783ed..66c0b9a295 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -39,17 +39,18 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [misc, const_cond, basic_not, complex_not, nested_nots,
-     semicolon, complex_semicolon, comma, or_guard,
-     more_or_guards, complex_or_guards, and_guard, xor_guard,
-     more_xor_guards, build_in_guard, old_guard_tests, gbif,
-     t_is_boolean, is_function_2, tricky, rel_ops,
-     literal_type_tests, basic_andalso_orelse, traverse_dcd,
-     check_qlc_hrl, andalso_semi, t_tuple_size, binary_part,
-     bad_constants].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [misc,const_cond,basic_not,complex_not,nested_nots,
+       semicolon,complex_semicolon,comma,or_guard,
+       more_or_guards,complex_or_guards,and_guard,xor_guard,
+       more_xor_guards,build_in_guard,old_guard_tests,gbif,
+       t_is_boolean,is_function_2,tricky,rel_ops,
+       literal_type_tests,basic_andalso_orelse,traverse_dcd,
+       check_qlc_hrl,andalso_semi,t_tuple_size,binary_part,
+       bad_constants]}].
 
 init_per_suite(Config) ->
     Config.
diff --git a/lib/compiler/test/guard_SUITE_data/guard_SUITE_tuple_size.S b/lib/compiler/test/guard_SUITE_data/guard_SUITE_tuple_size.S
index c0bf04ed8f..cffb792920 100644
--- a/lib/compiler/test/guard_SUITE_data/guard_SUITE_tuple_size.S
+++ b/lib/compiler/test/guard_SUITE_data/guard_SUITE_tuple_size.S
@@ -19,10 +19,10 @@
     {get_tuple_element,{x,0},1,{x,2}}.
     {get_tuple_element,{x,0},2,{x,3}}.
     {get_tuple_element,{x,0},3,{x,4}}.
-    {gc_bif,'+',{f,0},5,[{x,1},{x,2}],{x,0}}.
-    {gc_bif,'+',{f,0},5,[{x,0},{x,3}],{x,0}}.
-    {gc_bif,'+',{f,0},5,[{x,0},{x,4}],{x,0}}.
-    {gc_bif,'+',{f,0},5,[{x,0},{x,5}],{x,0}}.
+    {gc_bif,'+',{f,0},6,[{x,1},{x,2}],{x,0}}.
+    {gc_bif,'+',{f,0},6,[{x,0},{x,3}],{x,0}}.
+    {gc_bif,'+',{f,0},6,[{x,0},{x,4}],{x,0}}.
+    {gc_bif,'+',{f,0},6,[{x,0},{x,5}],{x,0}}.
     return.
   {label,3}.
     {badmatch,{x,0}}.
diff --git a/lib/compiler/test/inline_SUITE.erl b/lib/compiler/test/inline_SUITE.erl
index 2e17d3fde6..e2eb6a0dec 100644
--- a/lib/compiler/test/inline_SUITE.erl
+++ b/lib/compiler/test/inline_SUITE.erl
@@ -32,17 +32,22 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [attribute, bsdecode, bsdes, barnes2, decode1, smith,
-     itracer, pseudoknot, comma_splitter, lists, really_inlined, otp_7223,
-     coverage].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [attribute,bsdecode,bsdes,barnes2,decode1,smith,
+       itracer,pseudoknot,comma_splitter,lists,really_inlined,otp_7223,
+       coverage]}].
 
 init_per_suite(Config) ->
-    Config.
+    Pa = "-pa " ++ filename:dirname(code:which(?MODULE)),
+    {ok,Node} = start_node(compiler, Pa),
+    [{testing_node,Node}|Config].
 
-end_per_suite(_Config) ->
+end_per_suite(Config) ->
+    Node = ?config(testing_node, Config),
+    ?t:stop_node(Node),
     ok.
 
 init_per_group(_GroupName, Config) ->
@@ -81,6 +86,7 @@ attribute(Config) when is_list(Config) ->
 ?comp(comma_splitter).
 
 try_inline(Mod, Config) ->
+    Node = ?config(testing_node, Config),
     ?line Src = filename:join(?config(data_dir, Config), atom_to_list(Mod)),
     ?line Out = ?config(priv_dir,Config),
 
@@ -89,8 +95,6 @@ try_inline(Mod, Config) ->
     ?line {ok,Mod} = compile:file(Src, [{outdir,Out},report,bin_opt_info,clint]),
 
     ?line Dog = test_server:timetrap(test_server:minutes(10)),
-    ?line Pa = "-pa " ++ filename:dirname(code:which(?MODULE)),
-    ?line {ok,Node} = start_node(compiler, Pa),
     ?line NormalResult = rpc:call(Node, ?MODULE, load_and_call, [Out,Mod]),
     ?line test_server:timetrap_cancel(Dog),
 
@@ -125,7 +129,6 @@ try_inline(Mod, Config) ->
     %% Delete Beam file.
     ?line ok = file:delete(filename:join(Out, atom_to_list(Mod)++code:objfile_extension())),
 
-    ?line ?t:stop_node(Node),
     ok.
 
 compare(Same, Same) -> ok;
@@ -293,9 +296,9 @@ otp_7223_2({a}) ->
     1.
 
 coverage(Config) when is_list(Config) ->
-    ?line Src = filename:join(?config(data_dir, Config), bsdecode),
-    ?line Out = ?config(priv_dir,Config),
-    ?line {ok,Mod} = compile:file(Src, [{outdir,Out},report,{inline,0},clint]),
-    ?line {ok,Mod} = compile:file(Src, [{outdir,Out},report,{inline,20},verbose,clint]),
-    ?line ok = file:delete(filename:join(Out, "bsdecode"++code:objfile_extension())),
+    Mod = bsdecode,
+    Src = filename:join(?config(data_dir, Config), Mod),
+    {ok,Mod,_} = compile:file(Src, [binary,report,{inline,0},clint]),
+    {ok,Mod,_} = compile:file(Src, [binary,report,{inline,20},
+				    verbose,clint]),
     ok.
diff --git a/lib/compiler/test/match_SUITE.erl b/lib/compiler/test/match_SUITE.erl
index 9406d7de8f..de44926d81 100644
--- a/lib/compiler/test/match_SUITE.erl
+++ b/lib/compiler/test/match_SUITE.erl
@@ -30,11 +30,13 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [pmatch, mixed, aliases, match_in_call, untuplify,
-     shortcut_boolean, letify_guard, selectify, underscore, coverage].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [pmatch,mixed,aliases,match_in_call,untuplify,
+       shortcut_boolean,letify_guard,selectify,underscore,coverage]}].
+
 
 init_per_suite(Config) ->
     Config.
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index 5e13a93c52..44c7161530 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -57,11 +57,12 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 -spec all() -> misc_SUITE_test_cases().
 all() -> 
     test_lib:recompile(?MODULE),
-    [tobias, empty_string, md5, silly_coverage,
-     confused_literals, integer_encoding, override_bif].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,[],%%test_lib:parallel(),
+      [tobias,empty_string,md5,silly_coverage,
+       confused_literals,integer_encoding,override_bif]}].
 
 init_per_suite(Config) ->
     Config.
@@ -182,6 +183,14 @@ silly_coverage(Config) when is_list(Config) ->
     CodegenInput = {?MODULE,[{foo,0}],[],[{function,foo,0,[a|b],a,b,[]}]},
     ?line expect_error(fun() -> v3_codegen:module(CodegenInput, []) end),
 
+    %% beam_a
+    BeamAInput = {?MODULE,[{foo,0}],[],
+		  [{function,foo,0,2,
+		    [{label,1},
+		     {func_info,{atom,?MODULE},{atom,foo},0},
+		     {label,2}|non_proper_list]}],99},
+    expect_error(fun() -> beam_a:module(BeamAInput, []) end),
+
     %% beam_block
     BlockInput = {?MODULE,[{foo,0}],[],
 		  [{function,foo,0,2,
@@ -190,6 +199,15 @@ silly_coverage(Config) when is_list(Config) ->
 		     {label,2}|non_proper_list]}],99},
     ?line expect_error(fun() -> beam_block:module(BlockInput, []) end),
 
+    %% beam_type
+    TypeInput = {?MODULE,[{foo,0}],[],
+		   [{function,foo,0,2,
+		     [{label,1},
+		      {line,loc},
+		      {func_info,{atom,?MODULE},{atom,foo},0},
+		      {label,2}|non_proper_list]}],99},
+    expect_error(fun() -> beam_type:module(TypeInput, []) end),
+
     %% beam_except
     ExceptInput = {?MODULE,[{foo,0}],[],
 		   [{function,foo,0,2,
@@ -254,6 +272,13 @@ silly_coverage(Config) when is_list(Config) ->
 		       {block,[a|b]}]}],0},
     ?line expect_error(fun() -> beam_receive:module(ReceiveInput, []) end),
 
+    BeamZInput = {?MODULE,[{foo,0}],[],
+		  [{function,foo,0,2,
+		    [{label,1},
+		     {func_info,{atom,?MODULE},{atom,foo},0},
+		     {label,2}|non_proper_list]}],99},
+    expect_error(fun() -> beam_z:module(BeamZInput, []) end),
+
     ok.
 
 expect_error(Fun) ->
diff --git a/lib/compiler/test/receive_SUITE.erl b/lib/compiler/test/receive_SUITE.erl
index 2a67615e5e..82c823b789 100644
--- a/lib/compiler/test/receive_SUITE.erl
+++ b/lib/compiler/test/receive_SUITE.erl
@@ -40,10 +40,12 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [recv, coverage, otp_7980, ref_opt, export].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [recv,coverage,otp_7980,ref_opt,export]}].
+
 
 init_per_suite(Config) ->
     Config.
diff --git a/lib/compiler/test/receive_SUITE_data/ref_opt/no_4.erl b/lib/compiler/test/receive_SUITE_data/ref_opt/no_4.erl
new file mode 100644
index 0000000000..3ce222176b
--- /dev/null
+++ b/lib/compiler/test/receive_SUITE_data/ref_opt/no_4.erl
@@ -0,0 +1,12 @@
+-module(no_4).
+-compile(export_all).
+
+?MODULE() ->
+    ok.
+
+f(X) ->
+    {Pid,Ref} = spawn_monitor(fun() -> ok end),
+    r(Pid, Ref).
+
+r(_, _) ->
+    ok.
diff --git a/lib/compiler/test/receive_SUITE_data/ref_opt/yes_10.erl b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_10.erl
new file mode 100644
index 0000000000..7ce6e6103c
--- /dev/null
+++ b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_10.erl
@@ -0,0 +1,13 @@
+-module(yes_10).
+-compile(export_all).
+
+?MODULE() ->
+    ok.
+
+f() ->
+    Ref = make_ref(),
+    receive
+	%% Artifical example to cover more code in beam_receive.
+	{X,Y} when Ref =/= X, Ref =:= Y ->
+	    ok
+    end.
diff --git a/lib/compiler/test/receive_SUITE_data/ref_opt/yes_11.erl b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_11.erl
new file mode 100644
index 0000000000..62f439fc42
--- /dev/null
+++ b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_11.erl
@@ -0,0 +1,21 @@
+-module(yes_11).
+-compile(export_all).
+
+?MODULE() ->
+    ok.
+
+%% Artifical example to cover more code in beam_receive.
+do_call(Process, Request) ->
+    Mref = erlang:monitor(process, Process),
+    Process ! Request,
+    receive
+	{X,Y,Z} when Mref =/= X, Z =:= 42, Mref =:= Y ->
+	    error;
+	{X,Y,_} when Mref =/= X, Mref =:= Y ->
+	    error;
+	{Mref, Reply} ->
+	    erlang:demonitor(Mref, [flush]),
+	    {ok, Reply};
+	{'DOWN', Mref, _, _, _} ->
+	    error
+    end.
diff --git a/lib/compiler/test/receive_SUITE_data/ref_opt/yes_12.erl b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_12.erl
new file mode 100644
index 0000000000..efcfed6059
--- /dev/null
+++ b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_12.erl
@@ -0,0 +1,12 @@
+-module(yes_12).
+-compile(export_all).
+
+?MODULE() ->
+    ok.
+
+f() ->
+    {_,Ref} = spawn_monitor(fun() -> ok end),
+    receive
+	{'DOWN',Ref,_,_,Reason} ->
+	    Reason
+    end.
diff --git a/lib/compiler/test/receive_SUITE_data/ref_opt/yes_13.erl b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_13.erl
new file mode 100644
index 0000000000..9e93d12ed6
--- /dev/null
+++ b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_13.erl
@@ -0,0 +1,12 @@
+-module(yes_13).
+-compile(export_all).
+
+?MODULE() ->
+    ok.
+
+f() ->
+    {Pid,Ref} = spawn_monitor(fun() -> ok end),
+    receive
+	{'DOWN',Ref,process,Pid,Reason} ->
+	    Reason
+    end.
diff --git a/lib/compiler/test/record_SUITE.erl b/lib/compiler/test/record_SUITE.erl
index 363422ec7e..96f3712be9 100644
--- a/lib/compiler/test/record_SUITE.erl
+++ b/lib/compiler/test/record_SUITE.erl
@@ -42,12 +42,14 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [errors, record_test_2, record_test_3,
-     record_access_in_guards, guard_opt, eval_once, foobar,
-     missing_test_heap, nested_access, coverage].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [errors,record_test_2,record_test_3,
+       record_access_in_guards,guard_opt,eval_once,foobar,
+       missing_test_heap,nested_access,coverage]}].
+
 
 init_per_suite(Config) ->
     Config.
diff --git a/lib/compiler/test/test_lib.erl b/lib/compiler/test/test_lib.erl
index 2295592a38..996c369705 100644
--- a/lib/compiler/test/test_lib.erl
+++ b/lib/compiler/test/test_lib.erl
@@ -20,7 +20,8 @@
 
 -include("test_server.hrl").
 -compile({no_auto_import,[binary_part/2]}).
--export([recompile/1,opt_opts/1,get_data_dir/1,smoke_disasm/1,p_run/2,binary_part/2]).
+-export([recompile/1,parallel/0,uniq/0,opt_opts/1,get_data_dir/1,
+	 smoke_disasm/1,p_run/2,binary_part/2]).
 
 recompile(Mod) when is_atom(Mod) ->
     case whereis(cover_server) of
@@ -43,6 +44,18 @@ smoke_disasm(File) when is_list(File) ->
     Res = beam_disasm:file(File),
     {beam_file,_Mod} = {element(1, Res),element(2, Res)}.
 
+parallel() ->
+    case ?t:is_cover() orelse erlang:system_info(schedulers) =:= 1 of
+	true -> [];
+	false -> [parallel]
+    end.
+
+uniq() ->
+    U0 = erlang:ref_to_list(make_ref()),
+    U1 = re:replace(U0, "^#Ref", ""),
+    U = re:replace(U1, "[^[A-Za-z0-9_]+", "_", [global]),
+    re:replace(U, "_*$", "", [{return,list}]).
+
 %% Retrieve the "interesting" compiler options (options for optimization
 %% and compatibility) for the given module.
 
diff --git a/lib/compiler/test/trycatch_SUITE.erl b/lib/compiler/test/trycatch_SUITE.erl
index 29119c0f5d..4530d08c77 100644
--- a/lib/compiler/test/trycatch_SUITE.erl
+++ b/lib/compiler/test/trycatch_SUITE.erl
@@ -32,13 +32,15 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [basic, lean_throw, try_of, try_after, catch_oops,
-     after_oops, eclectic, rethrow, nested_of, nested_catch,
-     nested_after, nested_horrid, last_call_optimization,
-     bool, plain_catch_coverage, andalso_orelse, get_in_try].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [basic,lean_throw,try_of,try_after,catch_oops,
+       after_oops,eclectic,rethrow,nested_of,nested_catch,
+       nested_after,nested_horrid,last_call_optimization,
+       bool,plain_catch_coverage,andalso_orelse,get_in_try]}].
+
 
 init_per_suite(Config) ->
     Config.
diff --git a/lib/compiler/test/warnings_SUITE.erl b/lib/compiler/test/warnings_SUITE.erl
index f6a572abfa..9ce0df5ec4 100644
--- a/lib/compiler/test/warnings_SUITE.erl
+++ b/lib/compiler/test/warnings_SUITE.erl
@@ -55,12 +55,13 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [pattern, pattern2, pattern3, pattern4, guard,
-     bad_arith, bool_cases, bad_apply, files, effect,
-     bin_opt_info, bin_construction].
+    [{group,p}].
 
 groups() -> 
-    [].
+    [{p,test_lib:parallel(),
+      [pattern,pattern2,pattern3,pattern4,guard,
+       bad_arith,bool_cases,bad_apply,files,effect,
+       bin_opt_info,bin_construction]}].
 
 init_per_suite(Config) ->
     Config.
@@ -556,9 +557,10 @@ run(Config, Tests) ->
 %% Compiles a test module and returns the list of errors and warnings.
 
 run_test(Conf, Test0, Warnings) ->
-    Filename = 'warnings_test.erl',
+    Mod = "warnings_"++test_lib:uniq(),
+    Filename = Mod ++ ".erl",
     ?line DataDir = ?privdir,
-    ?line Test = ["-module(warnings_test). ", Test0],
+    Test = ["-module(", Mod, "). ", Test0],
     ?line File = filename:join(DataDir, Filename),
     ?line Opts = [binary,export_all,return|Warnings],
     ?line ok = file:write_file(File, Test),
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index c9c28cf9a2..b77c82309f 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 4.8.1
+COMPILER_VSN = 4.8.2
diff --git a/lib/cosEvent/doc/src/Makefile b/lib/cosEvent/doc/src/Makefile
index 6a9b4201d7..1b867852e4 100644
--- a/lib/cosEvent/doc/src/Makefile
+++ b/lib/cosEvent/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -137,13 +137,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile
index f8e751f218..7787fad786 100644
--- a/lib/cosEvent/src/Makefile
+++ b/lib/cosEvent/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -197,14 +197,14 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) ../info $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) ../info "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 
 release_docs_spec:
diff --git a/lib/cosEvent/test/Makefile b/lib/cosEvent/test/Makefile
index c3f07c156f..c5afcdb7e4 100644
--- a/lib/cosEvent/test/Makefile
+++ b/lib/cosEvent/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -141,11 +141,11 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/$(IDLOUTDIR)
+		$(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
 	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-		$(RELSYSDIR)/$(IDLOUTDIR)
+		"$(RELSYSDIR)/$(IDLOUTDIR)"
 
diff --git a/lib/cosEventDomain/doc/src/Makefile b/lib/cosEventDomain/doc/src/Makefile
index cd159c623c..f820ee5dc0 100644
--- a/lib/cosEventDomain/doc/src/Makefile
+++ b/lib/cosEventDomain/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2011. All Rights Reserved.
+# Copyright Ericsson AB 2001-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -131,13 +131,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile
index 409cac47f1..213d433c72 100644
--- a/lib/cosEventDomain/src/Makefile
+++ b/lib/cosEventDomain/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2011. All Rights Reserved.
+# Copyright Ericsson AB 2001-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -166,14 +166,14 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) ../info $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) ../info "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 
 release_docs_spec:
diff --git a/lib/cosEventDomain/test/Makefile b/lib/cosEventDomain/test/Makefile
index 160c8565e8..5b59cca401 100644
--- a/lib/cosEventDomain/test/Makefile
+++ b/lib/cosEventDomain/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2011. All Rights Reserved.
+# Copyright Ericsson AB 2001-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -98,8 +98,8 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
+		$(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
 
diff --git a/lib/cosFileTransfer/doc/src/Makefile b/lib/cosFileTransfer/doc/src/Makefile
index d9c68987e4..d1c6616f94 100644
--- a/lib/cosFileTransfer/doc/src/Makefile
+++ b/lib/cosFileTransfer/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -134,13 +134,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile
index 1d51304f6b..d552349ede 100644
--- a/lib/cosFileTransfer/src/Makefile
+++ b/lib/cosFileTransfer/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -176,12 +176,12 @@ $(TARGET_FILES): IDL-GENERATED
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
diff --git a/lib/cosFileTransfer/test/Makefile b/lib/cosFileTransfer/test/Makefile
index b46fb35356..35f6cc1ac2 100644
--- a/lib/cosFileTransfer/test/Makefile
+++ b/lib/cosFileTransfer/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -126,8 +126,8 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
+		$(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
diff --git a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
index 79a234bd28..18a591a7af 100644
--- a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
+++ b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
@@ -292,13 +292,8 @@ fts_ftp_file_api(Config) ->
 fts_ftp_file_ssl_api(doc) -> ["CosFileTransfer FTP FileTransferSession API tests.", ""];
 fts_ftp_file_ssl_api(suite) -> [];
 fts_ftp_file_ssl_api(Config) ->
-    case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    ?line {ok, Node} = create_node("ftp_file_api_ssl", {4005, 1}, ssl),
-	    file_helper(Config, 'FTP', ?TEST_DIR, Node, 4005, "ftp_file_api_ssl", ssl)
-    end.
+    ?line {ok, Node} = create_node("ftp_file_api_ssl", {4005, 1}, ssl),
+    file_helper(Config, 'FTP', ?TEST_DIR, Node, 4005, "ftp_file_api_ssl", ssl).
 
 fts_native_file_api(doc) -> ["CosFileTransfer NATIVE FileTransferSession API tests.", ""];
 fts_native_file_api(suite) -> [];
@@ -311,15 +306,10 @@ fts_native_file_api(Config) ->
 fts_native_file_ssl_api(doc) -> ["CosFileTransfer NATIVE FileTransferSession API tests.", ""];
 fts_native_file_ssl_api(suite) -> [];
 fts_native_file_ssl_api(Config) ->
-    case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    ?line {ok, Node} = create_node("native_file_ssl_api", {4007, 1}, ssl),
-	    {ok, Pwd} = file:get_cwd(),
-	    file_helper(Config,{'NATIVE', 'cosFileTransferNATIVE_file'},filename:split(Pwd),
-			Node, 4007, "native_file_ssl_api", ssl)
-    end.   
+    ?line {ok, Node} = create_node("native_file_ssl_api", {4007, 1}, ssl),
+    {ok, Pwd} = file:get_cwd(),
+    file_helper(Config,{'NATIVE', 'cosFileTransferNATIVE_file'},filename:split(Pwd),
+	Node, 4007, "native_file_ssl_api", ssl).
 				 
 
 
@@ -817,23 +807,13 @@ create_node(Name, Port, Retries, Type, Args, Options) ->
     end.
 
 starter(Host, Name, Args) ->
-    case os:type() of
-        vxworks ->
-            test_server:start_node(Name, slave, [{args,Args}]);
-        _ ->
-            slave:start(Host, Name, Args)
-    end.
+    slave:start(Host, Name, Args).
 
 slave_sup() ->
     process_flag(trap_exit, true),
     receive
         {'EXIT', _, _} -> 
-            case os:type() of
-                vxworks ->
-                    erlang:halt();
-                _  ->
-                    ignore
-            end
+	    ignore
     end.
 
 
@@ -850,12 +830,7 @@ destroy_node(Node, Type) ->
 
 stopper(Node, Type) ->
     catch stop_orber_remote(Node, Type),
-    case os:type() of
-        vxworks ->
-            test_server:stop_node(Node);
-        _ ->
-            slave:stop(Node)
-    end.
+    slave:stop(Node).
 -endif.
   
 %%------------------------------------------------------------
diff --git a/lib/cosNotification/doc/src/Makefile b/lib/cosNotification/doc/src/Makefile
index 5caee09ec5..800d633909 100644
--- a/lib/cosNotification/doc/src/Makefile
+++ b/lib/cosNotification/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -159,13 +159,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile
index 92225c6cfd..decf598bbf 100644
--- a/lib/cosNotification/src/Makefile
+++ b/lib/cosNotification/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -367,12 +367,12 @@ $(GEN_YECC_ERL_FILES) $(GEN_YECC_HRL_FILES): cosNotification_Grammar.yrl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILES) $(YECC_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
diff --git a/lib/cosNotification/test/Makefile b/lib/cosNotification/test/Makefile
index f509370430..8c18ae7956 100644
--- a/lib/cosNotification/test/Makefile
+++ b/lib/cosNotification/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -128,6 +128,7 @@ ERL_COMPILE_FLAGS +=  \
 	$(ERL_IDL_FLAGS) \
 	-pa $(ERL_TOP)/lib/orber/include \
 	-pa $(ERL_TOP)/internal_tools/test_server/ebin \
+	-pa $(ERL_TOP)/lib/cosEvent/ebin \
 	-pa $(ERL_TOP)/lib/cosNotification/ebin \
 	-pa $(ERL_TOP)/lib/cosNotification/test/idl_output \
 	-pa $(ERL_TOP)/lib/cosTime/ebin \
@@ -182,11 +183,11 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/$(IDLOUTDIR)
+		$(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
 	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-		$(RELSYSDIR)/$(IDLOUTDIR)
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
+		"$(RELSYSDIR)/$(IDLOUTDIR)"
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
 
diff --git a/lib/cosProperty/doc/src/Makefile b/lib/cosProperty/doc/src/Makefile
index 50f2e06f6c..1624479808 100644
--- a/lib/cosProperty/doc/src/Makefile
+++ b/lib/cosProperty/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -136,13 +136,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile
index 8060421b4e..54d1b6021c 100644
--- a/lib/cosProperty/src/Makefile
+++ b/lib/cosProperty/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -176,12 +176,12 @@ $(TARGET_FILES): IDL-GENERATED
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
diff --git a/lib/cosProperty/test/Makefile b/lib/cosProperty/test/Makefile
index f6e0d0dbba..ba634c77cf 100644
--- a/lib/cosProperty/test/Makefile
+++ b/lib/cosProperty/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -120,11 +120,11 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
-#	$(INSTALL_DIR) $(RELSYSDIR)/$(IDLOUTDIR)
+		$(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
+#	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
 #	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-#		$(RELSYSDIR)/$(IDLOUTDIR)
+#		"$(RELSYSDIR)/$(IDLOUTDIR)"
 
diff --git a/lib/cosTime/doc/src/Makefile b/lib/cosTime/doc/src/Makefile
index 4e97b07cf4..2ed55a3bfa 100644
--- a/lib/cosTime/doc/src/Makefile
+++ b/lib/cosTime/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -130,13 +130,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile
index 18c25ca8f1..e8536a3f0a 100644
--- a/lib/cosTime/src/Makefile
+++ b/lib/cosTime/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -195,12 +195,12 @@ $(TARGET_FILES): IDL-GENERATED
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
diff --git a/lib/cosTime/test/Makefile b/lib/cosTime/test/Makefile
index a07b27eecb..89d5a4a38e 100644
--- a/lib/cosTime/test/Makefile
+++ b/lib/cosTime/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -126,11 +126,11 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
-#	$(INSTALL_DIR) $(RELSYSDIR)/$(IDLOUTDIR)
+		$(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
+#	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
 #	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-#		$(RELSYSDIR)/$(IDLOUTDIR)
+#		"$(RELSYSDIR)/$(IDLOUTDIR)"
 
diff --git a/lib/cosTransactions/doc/src/Makefile b/lib/cosTransactions/doc/src/Makefile
index 4341ec04a3..7247c0dec7 100644
--- a/lib/cosTransactions/doc/src/Makefile
+++ b/lib/cosTransactions/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -134,13 +134,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/cosTransactions/examples/Makefile b/lib/cosTransactions/examples/Makefile
index 24cd12202a..348f506e2e 100644
--- a/lib/cosTransactions/examples/Makefile
+++ b/lib/cosTransactions/examples/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2009. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -149,9 +149,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(ERL_FILES) $(JAVA_FILES) $(IDL_FILES) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(INETRC_EXAMPLE) $(RELSYSDIR)/examples
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(ERL_FILES) $(JAVA_FILES) $(IDL_FILES) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(INETRC_EXAMPLE) "$(RELSYSDIR)/examples"
 	@tar cf - java_output | (cd $(RELSYSDIR); tar xf -)
 
 release_docs_spec:
diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile
index 3c799ca0ca..1d935c4d1d 100644
--- a/lib/cosTransactions/src/Makefile
+++ b/lib/cosTransactions/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -170,11 +170,11 @@ $(TARGET_FILES): IDL-GENERATED
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILE) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
diff --git a/lib/cosTransactions/test/Makefile b/lib/cosTransactions/test/Makefile
index 0bc8c007da..53ff93ba16 100644
--- a/lib/cosTransactions/test/Makefile
+++ b/lib/cosTransactions/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -142,11 +142,11 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/$(IDLOUTDIR)
+		$(COVER_FILE) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
 	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-		$(RELSYSDIR)/$(IDLOUTDIR)
+		"$(RELSYSDIR)/$(IDLOUTDIR)"
 
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 285537643e..e19d6617f3 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -59,8 +59,6 @@ TYPE_FLAGS = $(CFLAGS)
 endif
 endif
 
-ALL_CFLAGS = $(TYPE_FLAGS) $(INCLUDES)
-
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -69,13 +67,16 @@ RELSYSDIR = $(RELEASE_PATH)/lib/crypto-$(VSN)
 # ----------------------------------------------------
 # Misc Macros
 # ----------------------------------------------------
-OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o
+CRYPTO_OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o
+CALLBACK_OBJS = $(OBJDIR)/crypto_callback$(TYPEMARKER).o
 NIF_MAKEFILE = $(PRIVDIR)/Makefile
 
 ifeq ($(findstring win32,$(TARGET)), win32)
 NIF_LIB = $(LIBDIR)/crypto$(TYPEMARKER).dll
+CALLBACK_LIB = $(LIBDIR)/crypto_callback$(TYPEMARKER).dll
 else
 NIF_LIB = $(LIBDIR)/crypto$(TYPEMARKER).so
+CALLBACK_LIB = $(LIBDIR)/crypto_callback$(TYPEMARKER).so
 endif
 
 ifeq ($(HOST_OS),)
@@ -85,44 +86,70 @@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
 
 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
 SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
-CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
+CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
+EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
 else
 SSL_DED_LD_RUNTIME_LIBRARY_PATH=
 CRYPTO_LINK_LIB=$(SSL_LIBDIR)/lib$(SSL_CRYPTO_LIBNAME).a 
+EXTRA_FLAGS =
+CRYPTO_OBJS := $(CRYPTO_OBJS) $(CALLBACK_OBJS)
+CALLBACK_OBJS =
+CALLBACK_LIB =
 endif
 
+ALL_CFLAGS = $(TYPE_FLAGS) $(EXTRA_FLAGS) $(INCLUDES)
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
 
 _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
-debug opt valgrind: $(NIF_LIB)
+debug opt valgrind: $(NIF_LIB) $(CALLBACK_LIB)
 
 $(OBJDIR)/%$(TYPEMARKER).o: %.c
 	$(INSTALL_DIR) $(OBJDIR)
 	$(CC) -c -o $@ $(ALL_CFLAGS) $<
 
-$(LIBDIR)/crypto$(TYPEMARKER).so: $(OBJS)
-	$(INSTALL_DIR) $(LIBDIR) 
+$(LIBDIR)/crypto$(TYPEMARKER).so: $(CRYPTO_OBJS)
+	$(INSTALL_DIR) $(LIBDIR)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(CRYPTO_LINK_LIB)
 
-$(LIBDIR)/crypto$(TYPEMARKER).dll: $(OBJS)
+$(LIBDIR)/crypto$(TYPEMARKER).dll: $(CRYPTO_OBJS)
+	$(INSTALL_DIR) $(LIBDIR)
+	$(LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(CRYPTO_OBJS) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
+
+ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
+$(LIBDIR)/crypto_callback$(TYPEMARKER).so: $(CALLBACK_OBJS)
+	$(INSTALL_DIR) $(LIBDIR)
+	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+$(LIBDIR)/crypto_callback$(TYPEMARKER).dll: $(CALLBACK_OBJS)
 	$(INSTALL_DIR) $(LIBDIR)
-	$(LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
+	$(LD) $(LDFLAGS) -o $@ $(CALLBACK_OBJS)
+endif
+
 
 clean:
 ifeq ($(findstring win32,$(TARGET)), win32)
 	rm -f $(LIBDIR)/crypto.dll
 	rm -f $(LIBDIR)/crypto.debug.dll
+	rm -f $(LIBDIR)/crypto_callback.dll
+	rm -f $(LIBDIR)/crypto_callback.debug.dll
 else
 	rm -f $(LIBDIR)/crypto.so
 	rm -f $(LIBDIR)/crypto.debug.so
 	rm -f $(LIBDIR)/crypto.valgrind.so
+	rm -f $(LIBDIR)/crypto_callback.so
+	rm -f $(LIBDIR)/crypto_callback.debug.so
+	rm -f $(LIBDIR)/crypto_callback.valgrind.so
 endif
 	rm -f $(OBJDIR)/crypto.o
 	rm -f $(OBJDIR)/crypto.debug.o
 	rm -f $(OBJDIR)/crypto.valgrind.o
+	rm -f $(OBJDIR)/crypto_callback.o
+	rm -f $(OBJDIR)/crypto_callback.debug.o
+	rm -f $(OBJDIR)/crypto_callback.valgrind.o
 	rm -f core *~
 
 docs:
@@ -133,11 +160,15 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
-	$(INSTALL_DATA) $(NIF_MAKEFILE) $(RELSYSDIR)/priv/obj
-	$(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj
-	$(INSTALL_PROGRAM) $(NIF_LIB) $(RELSYSDIR)/priv/lib
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+	$(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj"
+	$(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj"
+	$(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib"
+ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
+	$(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj"
+	$(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"
+endif
 
 release_docs_spec:
 
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 4dc62421d2..72c9e5b8e8 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -1,7 +1,7 @@
 /* 
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2010-2011. All Rights Reserved.
+ * Copyright Ericsson AB 2010-2012. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -53,6 +53,12 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 
+#include "crypto_callback.h"
+
+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_SHA224) && defined(NID_sha224)\
+         && !defined(OPENSSL_NO_SHA256) /* disabled like this in my sha.h (?) */
+# define HAVE_SHA224
+#endif
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_SHA256) && defined(NID_sha256)
 # define HAVE_SHA256
 #endif
@@ -63,6 +69,9 @@
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_SHA512) && defined(NID_sha512)
 # define HAVE_SHA512
 #endif
+#if OPENSSL_VERSION_NUMBER >= 0x0090705FL
+# define HAVE_DES_ede3_cfb_encrypt
+#endif
 
 #ifdef VALGRIND
     #  include <valgrind/memcheck.h>
@@ -121,7 +130,6 @@
 
 /* NIF interface declarations */
 static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info);
-static int reload(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info);
 static int upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info);
 static void unload(ErlNifEnv* env, void* priv_data);
 
@@ -135,10 +143,18 @@ static ERL_NIF_TERM sha(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM sha224_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM sha224_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM sha224_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM sha224_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha256_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha256_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha256_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha256_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM sha384_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM sha384_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM sha384_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM sha384_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha512_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha512_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha512_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -149,6 +165,10 @@ static ERL_NIF_TERM md4_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
 static ERL_NIF_TERM md4_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM md5_mac_n(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha_mac_n(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM sha224_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM sha256_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM sha384_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM sha512_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM hmac_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM hmac_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM hmac_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -156,7 +176,7 @@ static ERL_NIF_TERM des_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
 static ERL_NIF_TERM des_cfb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM des_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM des_ede3_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM des_ede3_cfb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM des_ede3_cfb_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_ctr_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -188,25 +208,35 @@ static ERL_NIF_TERM bf_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
 static ERL_NIF_TERM blowfish_ofb64_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 
 
-/* openssl callbacks */
-#ifdef OPENSSL_THREADS
-static void locking_function(int mode, int n, const char *file, int line);
-static unsigned long id_function(void);
-static struct CRYPTO_dynlock_value* dyn_create_function(const char *file,
-							int line);
-static void dyn_lock_function(int mode, struct CRYPTO_dynlock_value* ptr,
-			      const char *file, int line);
-static void dyn_destroy_function(struct CRYPTO_dynlock_value *ptr,
-				 const char *file, int line);
-#endif /* OPENSSL_THREADS */
 
 /* helpers */
+static void init_digest_types(ErlNifEnv* env);
 static void hmac_md5(unsigned char *key, int klen,
 		     unsigned char *dbuf, int dlen, 
 		     unsigned char *hmacbuf);
 static void hmac_sha1(unsigned char *key, int klen,
 		      unsigned char *dbuf, int dlen, 
 		      unsigned char *hmacbuf);
+#ifdef HAVE_SHA224
+static void hmac_sha224(unsigned char *key, int klen,
+			unsigned char *dbuf, int dlen,
+			unsigned char *hmacbuf);
+#endif
+#ifdef HAVE_SHA256
+static void hmac_sha256(unsigned char *key, int klen,
+			unsigned char *dbuf, int dlen,
+			unsigned char *hmacbuf);
+#endif
+#ifdef HAVE_SHA384
+static void hmac_sha384(unsigned char *key, int klen,
+			unsigned char *dbuf, int dlen,
+			unsigned char *hmacbuf);
+#endif
+#ifdef HAVE_SHA512
+static void hmac_sha512(unsigned char *key, int klen,
+			unsigned char *dbuf, int dlen,
+			unsigned char *hmacbuf);
+#endif
 
 static int library_refc = 0; /* number of users of this dynamic library */
 
@@ -220,10 +250,18 @@ static ErlNifFunc nif_funcs[] = {
     {"sha_init", 0, sha_init},
     {"sha_update", 2, sha_update},
     {"sha_final", 1, sha_final},
+    {"sha224_nif", 1, sha224_nif},
+    {"sha224_init_nif", 0, sha224_init_nif},
+    {"sha224_update_nif", 2, sha224_update_nif},
+    {"sha224_final_nif", 1, sha224_final_nif},
     {"sha256_nif", 1, sha256_nif},
     {"sha256_init_nif", 0, sha256_init_nif},
     {"sha256_update_nif", 2, sha256_update_nif},
     {"sha256_final_nif", 1, sha256_final_nif},
+    {"sha384_nif", 1, sha384_nif},
+    {"sha384_init_nif", 0, sha384_init_nif},
+    {"sha384_update_nif", 2, sha384_update_nif},
+    {"sha384_final_nif", 1, sha384_final_nif},
     {"sha512_nif", 1, sha512_nif},
     {"sha512_init_nif", 0, sha512_init_nif},
     {"sha512_update_nif", 2, sha512_update_nif},
@@ -234,6 +272,10 @@ static ErlNifFunc nif_funcs[] = {
     {"md4_final", 1, md4_final},
     {"md5_mac_n", 3, md5_mac_n},
     {"sha_mac_n", 3, sha_mac_n},
+    {"sha224_mac_nif", 3, sha224_mac_nif},
+    {"sha256_mac_nif", 3, sha256_mac_nif},
+    {"sha384_mac_nif", 3, sha384_mac_nif},
+    {"sha512_mac_nif", 3, sha512_mac_nif},
     {"hmac_init", 2, hmac_init},
     {"hmac_update", 2, hmac_update},
     {"hmac_final", 1, hmac_final},
@@ -242,7 +284,7 @@ static ErlNifFunc nif_funcs[] = {
     {"des_cfb_crypt", 4, des_cfb_crypt},
     {"des_ecb_crypt", 3, des_ecb_crypt},
     {"des_ede3_cbc_crypt", 6, des_ede3_cbc_crypt},
-    {"des_ede3_cfb_crypt", 6, des_ede3_cfb_crypt},
+    {"des_ede3_cfb_crypt_nif", 6, des_ede3_cfb_crypt_nif},
     {"aes_cfb_128_crypt", 4, aes_cfb_128_crypt},
     {"aes_ctr_encrypt", 3, aes_ctr_encrypt},
     {"aes_ctr_decrypt", 3, aes_ctr_encrypt},
@@ -276,7 +318,7 @@ static ErlNifFunc nif_funcs[] = {
     {"blowfish_ofb64_encrypt", 3, blowfish_ofb64_encrypt}
 };
 
-ERL_NIF_INIT(crypto,nif_funcs,load,reload,upgrade,unload)
+ERL_NIF_INIT(crypto,nif_funcs,load,NULL,upgrade,unload)
 
 
 #define MD5_CTX_LEN     (sizeof(MD5_CTX))
@@ -287,19 +329,21 @@ ERL_NIF_INIT(crypto,nif_funcs,load,reload,upgrade,unload)
 #define SHA_CTX_LEN     (sizeof(SHA_CTX))
 #define SHA_LEN         20
 #define SHA_LEN_96      12
+#define SHA224_LEN	(224/8)
 #define SHA256_LEN	(256/8)
 #define SHA384_LEN	(384/8)
 #define SHA512_LEN	(512/8)
 #define HMAC_INT_LEN    64
+#define HMAC_INT2_LEN   128
 
 #define HMAC_IPAD       0x36
 #define HMAC_OPAD       0x5c
 
 
-static ErlNifRWLock** lock_vec = NULL; /* Static locks used by openssl */
 static ERL_NIF_TERM atom_true;
 static ERL_NIF_TERM atom_false;
 static ERL_NIF_TERM atom_sha;
+static ERL_NIF_TERM atom_sha224;
 static ERL_NIF_TERM atom_sha256;
 static ERL_NIF_TERM atom_sha384;
 static ERL_NIF_TERM atom_sha512;
@@ -320,60 +364,67 @@ static ERL_NIF_TERM atom_check_failed;
 static ERL_NIF_TERM atom_unknown;
 static ERL_NIF_TERM atom_none;
 static ERL_NIF_TERM atom_notsup;
+static ERL_NIF_TERM atom_digest;
 
+/*
+#define PRINTF_ERR0(FMT) enif_fprintf(stderr, FMT "\n")
+#define PRINTF_ERR1(FMT, A1) enif_fprintf(stderr, FMT "\n", A1)
+*/
+#define PRINTF_ERR0(FMT)
+#define PRINTF_ERR1(FMT,A1)
 
-static int is_ok_load_info(ErlNifEnv* env, ERL_NIF_TERM load_info)
+#ifdef HAVE_DYNAMIC_CRYPTO_LIB
+static int change_basename(char* buf, int bufsz, const char* newfile)
 {
-    int i;
-    return enif_get_int(env,load_info,&i) && i == 101;
-}
-static void* crypto_alloc(size_t size)
-{   
-    return enif_alloc(size);
+    char* p = strrchr(buf, '/');
+    p = (p == NULL) ? buf : p + 1;
+    
+    if ((p - buf) + strlen(newfile) >= bufsz) {
+	PRINTF_ERR0("CRYPTO: lib name too long");
+	return 0;
+    }
+    strcpy(p, newfile);
+    return 1;
 }
-static void* crypto_realloc(void* ptr, size_t size)
+
+static void error_handler(void* null, const char* errstr)
 {
-    return enif_realloc(ptr, size);
-}   
-static void crypto_free(void* ptr)
-{   
-    enif_free(ptr); 
+    PRINTF_ERR1("CRYPTO LOADING ERROR: '%s'", errstr);
 }
+#endif /* HAVE_DYNAMIC_CRYPTO_LIB */
 
-static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
+static int init(ErlNifEnv* env, ERL_NIF_TERM load_info)
 {
     ErlNifSysInfo sys_info;
-    CRYPTO_set_mem_functions(crypto_alloc, crypto_realloc, crypto_free);
-
-    if (!is_ok_load_info(env, load_info)) {
-	return -1;
+    get_crypto_callbacks_t* funcp;
+    struct crypto_callbacks* ccb;
+    int nlocks = 0;
+    int tpl_arity;
+    const ERL_NIF_TERM* tpl_array;
+    int vernum;
+    char lib_buf[1000];
+
+    /* load_info: {201, "/full/path/of/this/library"} */
+    if (!enif_get_tuple(env, load_info, &tpl_arity, &tpl_array)
+	|| tpl_arity != 2
+	|| !enif_get_int(env, tpl_array[0], &vernum)
+	|| vernum != 201
+	|| enif_get_string(env, tpl_array[1], lib_buf, sizeof(lib_buf), ERL_NIF_LATIN1) <= 0) {
+
+	PRINTF_ERR1("CRYPTO: Invalid load_info '%T'", load_info);
+	return 0;
     }
-
-#ifdef OPENSSL_THREADS
-    enif_system_info(&sys_info, sizeof(sys_info));
-
-    if (sys_info.scheduler_threads > 1) {
-	int i;
-	lock_vec = enif_alloc(CRYPTO_num_locks()*sizeof(*lock_vec));
-	if (lock_vec==NULL) return -1;
-	memset(lock_vec,0,CRYPTO_num_locks()*sizeof(*lock_vec));
-
-	for (i=CRYPTO_num_locks()-1; i>=0; --i) {
-	    lock_vec[i] = enif_rwlock_create("crypto_stat");
-	    if (lock_vec[i]==NULL) return -1;
-	}
-	CRYPTO_set_locking_callback(locking_function);
-	CRYPTO_set_id_callback(id_function);
-	CRYPTO_set_dynlock_create_callback(dyn_create_function);
-	CRYPTO_set_dynlock_lock_callback(dyn_lock_function);
-	CRYPTO_set_dynlock_destroy_callback(dyn_destroy_function);
+    if (library_refc > 0) {
+	/* Repeated loading of this library (module upgrade).
+	 * Atoms and callbacks are already set, we are done.
+	 */
+	return 1;
     }
-    /* else no need for locks */
-#endif /* OPENSSL_THREADS */
 
     atom_true = enif_make_atom(env,"true");
     atom_false = enif_make_atom(env,"false");
     atom_sha = enif_make_atom(env,"sha");
+    atom_sha224 = enif_make_atom(env,"sha224");
     atom_sha256 = enif_make_atom(env,"sha256");
     atom_sha384 = enif_make_atom(env,"sha384");
     atom_sha512 = enif_make_atom(env,"sha512");
@@ -393,38 +444,79 @@ static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
     atom_unknown = enif_make_atom(env,"unknown");
     atom_none = enif_make_atom(env,"none");
     atom_notsup = enif_make_atom(env,"notsup");
+    atom_digest = enif_make_atom(env,"digest");
 
-    *priv_data = NULL;
-    library_refc++;
-    return 0;
-}
+    init_digest_types(env);
 
-static int reload(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
-{   
-    if (*priv_data != NULL) {
-	return -1; /* Don't know how to do that */
+#ifdef HAVE_DYNAMIC_CRYPTO_LIB
+    {
+	void* handle;
+	if (!change_basename(lib_buf, sizeof(lib_buf), "crypto_callback")) {
+	    return 0;
+	}
+	if (!(handle = enif_dlopen(lib_buf, &error_handler, NULL))) {
+	    return 0;
+	}
+	if (!(funcp = (get_crypto_callbacks_t*) enif_dlsym(handle, "get_crypto_callbacks",
+							   &error_handler, NULL))) {
+	    return 0;
+	}
     }
-    if (library_refc == 0) {
-	/* No support for real library upgrade. The tricky thing is to know
-	   when to (re)set the callbacks for allocation and locking. */
-	return -2;
+#else /* !HAVE_DYNAMIC_CRYPTO_LIB */
+    funcp = &get_crypto_callbacks;
+#endif
+    
+#ifdef OPENSSL_THREADS
+    enif_system_info(&sys_info, sizeof(sys_info));
+    if (sys_info.scheduler_threads > 1) {
+	nlocks = CRYPTO_num_locks(); 
     }
-    if (!is_ok_load_info(env, load_info)) {
+    /* else no need for locks */
+#endif
+    
+    ccb = (*funcp)(nlocks);
+    
+    if (!ccb || ccb->sizeof_me != sizeof(*ccb)) {
+	PRINTF_ERR0("Invalid 'crypto_callbacks'");
+	return 0;
+    }
+    
+    CRYPTO_set_mem_functions(ccb->crypto_alloc, ccb->crypto_realloc, ccb->crypto_free);
+    
+#ifdef OPENSSL_THREADS
+    if (nlocks > 0) {
+	CRYPTO_set_locking_callback(ccb->locking_function);
+	CRYPTO_set_id_callback(ccb->id_function);
+	CRYPTO_set_dynlock_create_callback(ccb->dyn_create_function);
+	CRYPTO_set_dynlock_lock_callback(ccb->dyn_lock_function);
+	CRYPTO_set_dynlock_destroy_callback(ccb->dyn_destroy_function);
+    }
+#endif /* OPENSSL_THREADS */
+    return 1;
+}
+
+static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
+{
+    if (!init(env, load_info)) {
 	return -1;
     }
-    return 0;    
+
+    *priv_data = NULL;
+    library_refc++;
+    return 0;
 }
 
 static int upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data,
 		   ERL_NIF_TERM load_info)
 {
-    int i;
     if (*old_priv_data != NULL) {
 	return -1; /* Don't know how to do that */
     }
-    i = reload(env,priv_data,load_info);
-    if (i != 0) {
-	return i;
+    if (*priv_data != NULL) {
+	return -1; /* Don't know how to do that */
+    }
+    if (!init(env, load_info)) {
+	return -1;
     }
     library_refc++;
     return 0;
@@ -432,20 +524,7 @@ static int upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data,
 
 static void unload(ErlNifEnv* env, void* priv_data)
 {
-    if (--library_refc <= 0) {
-	CRYPTO_cleanup_all_ex_data();
-
-	if (lock_vec != NULL) {
-	    int i;
-	    for (i=CRYPTO_num_locks()-1; i>=0; --i) {
-		if (lock_vec[i] != NULL) {
-		    enif_rwlock_destroy(lock_vec[i]);
-		}
-	    }
-	    enif_free(lock_vec);
-	}
-    }
-    /*else NIF library still used by other (new) module code */
+    --library_refc;
 }
 
 static ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
@@ -457,12 +536,21 @@ static ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]
     const char* ver = SSLeay_version(SSLEAY_VERSION);
     unsigned ver_sz = strlen(ver);
     ERL_NIF_TERM name_term, ver_term;
+    int ver_num = OPENSSL_VERSION_NUMBER;
+    /* R16:
+     * Ignore library version number from SSLeay() and instead show header
+     * version. Otherwise user might try to call a function that is implemented
+     * by a newer library but not supported by the headers used at compile time.
+     * Example: DES_ede3_cfb_encrypt in 0.9.7i but not in 0.9.7d.
+     *
+     * Version string is still from library though.
+     */
 
     memcpy(enif_make_new_binary(env, name_sz, &name_term), libname, name_sz);    
     memcpy(enif_make_new_binary(env, ver_sz, &ver_term), ver, ver_sz);
 
     return enif_make_list1(env, enif_make_tuple3(env, name_term,
-						 enif_make_int(env, SSLeay()),
+						 enif_make_int(env, ver_num),						 
 						 ver_term));
 }
 
@@ -557,6 +645,67 @@ static ERL_NIF_TERM sha_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
     return ret;
 }
 
+static ERL_NIF_TERM sha224_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Data) */
+#ifdef HAVE_SHA224
+    ErlNifBinary ibin;
+    ERL_NIF_TERM ret;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &ibin)) {
+	return enif_make_badarg(env);
+    }
+    SHA224((unsigned char *) ibin.data, ibin.size,
+	 enif_make_new_binary(env,SHA224_LEN, &ret));
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+static ERL_NIF_TERM sha224_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* () */
+#ifdef HAVE_SHA224
+    ERL_NIF_TERM ret;
+    SHA224_Init((SHA256_CTX *) enif_make_new_binary(env, sizeof(SHA256_CTX), &ret));
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+static ERL_NIF_TERM sha224_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context, Data) */
+#ifdef HAVE_SHA224
+    SHA256_CTX* new_ctx;
+    ErlNifBinary ctx_bin, data_bin;
+    ERL_NIF_TERM ret;
+    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != sizeof(SHA256_CTX)
+	|| !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
+	return enif_make_badarg(env);
+    }
+    new_ctx = (SHA256_CTX*) enif_make_new_binary(env,sizeof(SHA256_CTX), &ret);
+    memcpy(new_ctx, ctx_bin.data, sizeof(SHA256_CTX));
+    SHA224_Update(new_ctx, data_bin.data, data_bin.size);
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+static ERL_NIF_TERM sha224_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context) */
+#ifdef HAVE_SHA224
+    ErlNifBinary ctx_bin;
+    SHA256_CTX ctx_clone;
+    ERL_NIF_TERM ret;
+    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != sizeof(SHA256_CTX)) {
+	return enif_make_badarg(env);
+    }
+    memcpy(&ctx_clone, ctx_bin.data, sizeof(SHA256_CTX)); /* writable */
+    SHA224_Final(enif_make_new_binary(env, SHA224_LEN, &ret), &ctx_clone);
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+
 static ERL_NIF_TERM sha256_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Data) */
 #ifdef HAVE_SHA256
@@ -618,6 +767,67 @@ static ERL_NIF_TERM sha256_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER
 #endif
 }
 
+static ERL_NIF_TERM sha384_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Data) */
+#ifdef HAVE_SHA384
+    ErlNifBinary ibin;
+    ERL_NIF_TERM ret;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &ibin)) {
+	return enif_make_badarg(env);
+    }
+    SHA384((unsigned char *) ibin.data, ibin.size,
+	 enif_make_new_binary(env,SHA384_LEN, &ret));
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+static ERL_NIF_TERM sha384_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* () */
+#ifdef HAVE_SHA384
+    ERL_NIF_TERM ret;
+    SHA384_Init((SHA512_CTX *) enif_make_new_binary(env, sizeof(SHA512_CTX), &ret));
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+static ERL_NIF_TERM sha384_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context, Data) */
+#ifdef HAVE_SHA384
+    SHA512_CTX* new_ctx;
+    ErlNifBinary ctx_bin, data_bin;
+    ERL_NIF_TERM ret;
+    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != sizeof(SHA512_CTX)
+	|| !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
+	return enif_make_badarg(env);
+    }
+    new_ctx = (SHA512_CTX*) enif_make_new_binary(env,sizeof(SHA512_CTX), &ret);
+    memcpy(new_ctx, ctx_bin.data, sizeof(SHA512_CTX));
+    SHA384_Update(new_ctx, data_bin.data, data_bin.size);
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+static ERL_NIF_TERM sha384_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context) */
+#ifdef HAVE_SHA384
+    ErlNifBinary ctx_bin;
+    SHA512_CTX ctx_clone;
+    ERL_NIF_TERM ret;
+    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != sizeof(SHA512_CTX)) {
+	return enif_make_badarg(env);
+    }
+    memcpy(&ctx_clone, ctx_bin.data, sizeof(SHA512_CTX)); /* writable */
+    SHA384_Final(enif_make_new_binary(env, SHA384_LEN, &ret), &ctx_clone);
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+
 static ERL_NIF_TERM sha512_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Data) */
 #ifdef HAVE_SHA512
@@ -760,6 +970,95 @@ static ERL_NIF_TERM sha_mac_n(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
     return ret;
 }
 
+static ERL_NIF_TERM sha224_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, Data, MacSize) */
+#ifdef HAVE_SHA224
+    unsigned char hmacbuf[SHA224_DIGEST_LENGTH];
+    ErlNifBinary key, data;
+    unsigned mac_sz;
+    ERL_NIF_TERM ret;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
+	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)
+	|| !enif_get_uint(env,argv[2],&mac_sz) || mac_sz > SHA224_DIGEST_LENGTH) {
+	return enif_make_badarg(env);
+    }
+    hmac_sha224(key.data, key.size, data.data, data.size, hmacbuf);
+    memcpy(enif_make_new_binary(env, mac_sz, &ret),
+	   hmacbuf, mac_sz);
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM sha256_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, Data, MacSize) */
+#ifdef HAVE_SHA256
+    unsigned char hmacbuf[SHA256_DIGEST_LENGTH];
+    ErlNifBinary key, data;
+    unsigned mac_sz;
+    ERL_NIF_TERM ret;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
+	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)
+	|| !enif_get_uint(env,argv[2],&mac_sz) || mac_sz > SHA256_DIGEST_LENGTH) {
+	return enif_make_badarg(env);
+    }
+    hmac_sha256(key.data, key.size, data.data, data.size, hmacbuf);
+    memcpy(enif_make_new_binary(env, mac_sz, &ret),
+	   hmacbuf, mac_sz);
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+
+static ERL_NIF_TERM sha384_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, Data, MacSize) */
+#ifdef HAVE_SHA384
+    unsigned char hmacbuf[SHA384_DIGEST_LENGTH];
+    ErlNifBinary key, data;
+    unsigned mac_sz;
+    ERL_NIF_TERM ret;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
+	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)
+	|| !enif_get_uint(env,argv[2],&mac_sz) || mac_sz > SHA384_DIGEST_LENGTH) {
+	return enif_make_badarg(env);
+    }
+    hmac_sha384(key.data, key.size, data.data, data.size, hmacbuf);
+    memcpy(enif_make_new_binary(env, mac_sz, &ret),
+	   hmacbuf, mac_sz);
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+
+
+static ERL_NIF_TERM sha512_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, Data, MacSize) */
+#ifdef HAVE_SHA512
+    unsigned char hmacbuf[SHA512_DIGEST_LENGTH];
+    ErlNifBinary key, data;
+    unsigned mac_sz;
+    ERL_NIF_TERM ret;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
+	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)
+	|| !enif_get_uint(env,argv[2],&mac_sz) || mac_sz > SHA512_DIGEST_LENGTH) {
+	return enif_make_badarg(env);
+    }
+    hmac_sha512(key.data, key.size, data.data, data.size, hmacbuf);
+    memcpy(enif_make_new_binary(env, mac_sz, &ret),
+	   hmacbuf, mac_sz);
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+
 static ERL_NIF_TERM hmac_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Type, Key) */
     ErlNifBinary key;
@@ -768,6 +1067,18 @@ static ERL_NIF_TERM hmac_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
     const EVP_MD *md;
     
     if (argv[0] == atom_sha) md = EVP_sha1();
+#ifdef HAVE_SHA224
+    else if (argv[0] == atom_sha224) md = EVP_sha224();
+#endif
+#ifdef HAVE_SHA256
+    else if (argv[0] == atom_sha256) md = EVP_sha256();
+#endif
+#ifdef HAVE_SHA384
+    else if (argv[0] == atom_sha384) md = EVP_sha384();
+#endif
+#ifdef HAVE_SHA512
+    else if (argv[0] == atom_sha512) md = EVP_sha512();
+#endif
     else if (argv[0] == atom_md5) md = EVP_md5();
     else if (argv[0] == atom_ripemd160) md = EVP_ripemd160();
     else goto badarg;
@@ -919,8 +1230,9 @@ static ERL_NIF_TERM des_ede3_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_T
     return ret;
 }
 
-static ERL_NIF_TERM des_ede3_cfb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+static ERL_NIF_TERM des_ede3_cfb_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Key1, Key2, Key3, IVec, Text/Cipher, IsEncrypt) */
+#ifdef HAVE_DES_ede3_cfb_encrypt
     ErlNifBinary key1, key2, key3, ivec, text;
     DES_key_schedule schedule1, schedule2, schedule3;
     DES_cblock ivec_clone; /* writable copy */
@@ -942,6 +1254,9 @@ static ERL_NIF_TERM des_ede3_cfb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_T
 			 8, text.size, &schedule1, &schedule2, &schedule3,
 			 &ivec_clone, (argv[5] == atom_true));
     return ret;
+#else
+    return atom_notsup;
+#endif
 }
 
 static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
@@ -954,8 +1269,7 @@ static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TE
 
     if (!enif_inspect_iolist_as_binary(env, argv[0], &key) || key.size != 16
 	|| !enif_inspect_binary(env, argv[1], &ivec) || ivec.size != 16
-	|| !enif_inspect_iolist_as_binary(env, argv[2], &text)
-	|| text.size % 16 != 0) {
+	|| !enif_inspect_iolist_as_binary(env, argv[2], &text)) {
 	return enif_make_badarg(env);
     }
 
@@ -1208,14 +1522,43 @@ static int inspect_mpint(ErlNifEnv* env, ERL_NIF_TERM term, ErlNifBinary* bin)
 }
 
 static ERL_NIF_TERM dss_verify(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (DigestType,Data,Signature,Key=[P, Q, G, Y]) */
+{/* (DigestType|none, Data|{digest,Digest}, Signature,Key=[P, Q, G, Y]) */
     ErlNifBinary data_bin, sign_bin;
     BIGNUM *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL, *dsa_y = NULL;
     unsigned char hmacbuf[SHA_DIGEST_LENGTH];
+    unsigned char* digest;
     ERL_NIF_TERM head, tail;
+    const ERL_NIF_TERM* tpl_terms;
+    int tpl_arity;
     DSA *dsa;
     int i;
 
+    if (argv[0] == atom_sha) {
+	if (enif_get_tuple(env, argv[1], &tpl_arity, &tpl_terms)) {
+	    if (tpl_arity != 2 || tpl_terms[0] != atom_digest
+		|| !enif_inspect_binary(env, tpl_terms[1], &data_bin)
+		|| data_bin.size != SHA_DIGEST_LENGTH) {
+
+		return enif_make_badarg(env);
+	    }
+	    digest = data_bin.data;
+	}
+	else {
+	    if (!inspect_mpint(env, argv[1], &data_bin)) {
+		return enif_make_badarg(env);
+	    }
+	    SHA1(data_bin.data+4, data_bin.size-4, hmacbuf);
+	    digest = hmacbuf;
+	}
+    }
+    else if (argv[0] == atom_none && enif_inspect_binary(env, argv[1], &data_bin)
+	     && data_bin.size == SHA_DIGEST_LENGTH) {
+	digest = data_bin.data;
+    }
+    else {
+	return enif_make_badarg(env);
+    }
+
     if (!inspect_mpint(env, argv[2], &sign_bin)
 	|| !enif_get_list_cell(env, argv[3], &head, &tail)
 	|| !get_bn_from_mpint(env, head, &dsa_p)
@@ -1226,23 +1569,13 @@ static ERL_NIF_TERM dss_verify(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
 	|| !enif_get_list_cell(env, tail, &head, &tail)
 	|| !get_bn_from_mpint(env, head, &dsa_y)
 	|| !enif_is_empty_list(env,tail)) {
-    badarg:
+
 	if (dsa_p) BN_free(dsa_p);
 	if (dsa_q) BN_free(dsa_q);
 	if (dsa_g) BN_free(dsa_g);
 	if (dsa_y) BN_free(dsa_y);
 	return enif_make_badarg(env);
     }
-    if (argv[0] == atom_sha && inspect_mpint(env, argv[1], &data_bin)) {
-	SHA1(data_bin.data+4, data_bin.size-4, hmacbuf);
-    }
-    else if (argv[0] == atom_none && enif_inspect_binary(env, argv[1], &data_bin)
-	     && data_bin.size == SHA_DIGEST_LENGTH) {
-	memcpy(hmacbuf, data_bin.data, SHA_DIGEST_LENGTH);
-    }
-    else {
-	goto badarg;
-    }
 
     dsa = DSA_new();
     dsa->p = dsa_p;
@@ -1250,23 +1583,134 @@ static ERL_NIF_TERM dss_verify(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
     dsa->g = dsa_g;
     dsa->priv_key = NULL;
     dsa->pub_key = dsa_y;
-    i =  DSA_verify(0, hmacbuf, SHA_DIGEST_LENGTH,
+    i =  DSA_verify(0, digest, SHA_DIGEST_LENGTH,
 		    sign_bin.data+4, sign_bin.size-4, dsa);
     DSA_free(dsa);
     return(i > 0) ? atom_true : atom_false;
 }
 
+
+static void md5_digest(unsigned char* in, unsigned int in_len, unsigned char* out)
+{
+    MD5(in, in_len, out);
+}
+static void sha1_digest(unsigned char* in, unsigned int in_len, unsigned char* out)
+{
+    SHA1(in, in_len, out);
+}
+#ifdef HAVE_SHA224
+static void sha224_digest(unsigned char* in, unsigned int in_len, unsigned char* out)
+{
+    SHA224(in, in_len, out);
+}
+#endif
+#ifdef HAVE_SHA256
+static void sha256_digest(unsigned char* in, unsigned int in_len, unsigned char* out)
+{
+    SHA256(in, in_len, out);
+}
+#endif
+#ifdef HAVE_SHA384
+static void sha384_digest(unsigned char* in, unsigned int in_len, unsigned char* out)
+{
+    SHA384(in, in_len, out);
+}
+#endif
+#ifdef HAVE_SHA512
+static void sha512_digest(unsigned char* in, unsigned int in_len, unsigned char* out)
+{
+    SHA512(in, in_len, out);
+}
+#endif
+
+struct digest_type_t {
+    const char* type_str;
+    unsigned len; /* 0 if notsup */
+    int NID_type;
+    void (*funcp)(unsigned char* in, unsigned int in_len, unsigned char* out);
+    ERL_NIF_TERM type_atom;
+};
+
+struct digest_type_t digest_types[] =
+{
+    {"md5", MD5_DIGEST_LENGTH, NID_md5, md5_digest},
+    {"sha", SHA_DIGEST_LENGTH, NID_sha1, sha1_digest},
+    {"sha224",
+#ifdef HAVE_SHA224
+     SHA224_LEN, NID_sha224, sha224_digest
+#else
+      0
+#endif
+    },
+    {"sha256",
+#ifdef HAVE_SHA256
+     SHA256_LEN, NID_sha256, sha256_digest
+#else
+      0
+#endif
+    },
+    {"sha384",
+#ifdef HAVE_SHA384
+     SHA384_LEN, NID_sha384, sha384_digest
+#else
+     0
+#endif
+    },
+    {"sha512",
+#ifdef HAVE_SHA512
+     SHA512_LEN, NID_sha512, sha512_digest
+#else
+     0
+#endif
+    },
+    {NULL}
+};
+
+static void init_digest_types(ErlNifEnv* env)
+{
+    struct digest_type_t* p = digest_types;
+
+    for (p = digest_types; p->type_str; p++) {
+	p->type_atom = enif_make_atom(env, p->type_str);
+    }
+
+}
+
+static struct digest_type_t* get_digest_type(ERL_NIF_TERM type)
+{
+    struct digest_type_t* p = NULL;
+    for (p = digest_types; p->type_str; p++) {
+	if (type == p->type_atom) {
+	    return p;
+	}
+    }
+    return NULL;
+}
+
 static ERL_NIF_TERM rsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Data, Signature, Key=[E,N]) */
+{/* (Type, Data|{digest,Digest}, Signature, Key=[E,N]) */
     ErlNifBinary data_bin, sign_bin;
     unsigned char hmacbuf[SHA512_LEN];
     ERL_NIF_TERM head, tail, ret;
     int i;
-    RSA* rsa = RSA_new();
+    RSA* rsa;
     const ERL_NIF_TERM type = argv[0];
+    const ERL_NIF_TERM* tpl_terms;
+    int tpl_arity;
+    struct digest_type_t* digp = NULL;
+    unsigned char* digest = NULL;
+
+    digp = get_digest_type(type);
+    if (!digp) {
+	return enif_make_badarg(env);
+    }
+    if (!digp->len) {
+	return atom_notsup;
+    }
+
+    rsa = RSA_new();
 
-    if (!inspect_mpint(env, argv[1], &data_bin)
-	|| !inspect_mpint(env, argv[2], &sign_bin)
+    if (!inspect_mpint(env, argv[2], &sign_bin)
 	|| !enif_get_list_cell(env, argv[3], &head, &tail)
 	|| !get_bn_from_mpint(env, head, &rsa->e)
 	|| !enif_get_list_cell(env, tail, &head, &tail)
@@ -1274,59 +1718,38 @@ static ERL_NIF_TERM rsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 	|| !enif_is_empty_list(env, tail)) {
 	
 	ret = enif_make_badarg(env);
+	goto done;
     }
-    else {
-	if (type == atom_sha) {
-	    SHA1(data_bin.data+4, data_bin.size-4, hmacbuf);
-	    i = RSA_verify(NID_sha1, hmacbuf, SHA_DIGEST_LENGTH,
-			   sign_bin.data+4, sign_bin.size-4, rsa);
-	}
-	else if (type == atom_sha256) {
-	  #ifdef HAVE_SHA256
-	    SHA256(data_bin.data+4, data_bin.size-4, hmacbuf);
-	    i = RSA_verify(NID_sha256, hmacbuf, SHA256_LEN,
-			   sign_bin.data+4, sign_bin.size-4, rsa);
-	  #else
-	    ret = atom_notsup;
-	    goto done;
-	  #endif 
-	}
-	else if (type == atom_sha384) {
-	  #ifdef HAVE_SHA384
-	    SHA384(data_bin.data+4, data_bin.size-4, hmacbuf);
-	    i = RSA_verify(NID_sha384, hmacbuf, SHA384_LEN,
-			   sign_bin.data+4, sign_bin.size-4, rsa);
-	  #else
-	    ret = atom_notsup;
-	    goto done;
-	  #endif 
-	}
-	else if (type == atom_sha512) {
-	  #ifdef HAVE_SHA512
-	    SHA512(data_bin.data+4, data_bin.size-4, hmacbuf);
-	    i = RSA_verify(NID_sha512, hmacbuf, SHA512_LEN,
-			   sign_bin.data+4, sign_bin.size-4, rsa);
-	  #else
-	    ret = atom_notsup;
-	    goto done;	    
-	  #endif
-	}
-	else if (type == atom_md5) {
-	    MD5(data_bin.data+4, data_bin.size-4, hmacbuf);
-	    i = RSA_verify(NID_md5, hmacbuf, MD5_DIGEST_LENGTH,
-			   sign_bin.data+4, sign_bin.size-4, rsa);
-	}
-	else {
+    if (enif_get_tuple(env, argv[1], &tpl_arity, &tpl_terms)) {
+	if (tpl_arity != 2 || tpl_terms[0] != atom_digest
+	    || !enif_inspect_binary(env, tpl_terms[1], &data_bin)
+	    || data_bin.size != digp->len) {
+
 	    ret = enif_make_badarg(env);
 	    goto done;
 	}
-	ret = (i==1 ? atom_true : atom_false);
-    }    
+	digest = data_bin.data;
+    }
+    else if (inspect_mpint(env, argv[1], &data_bin)) {
+	digest = hmacbuf;
+	digp->funcp(data_bin.data+4, data_bin.size-4, digest);
+    }
+    else {
+	ret = enif_make_badarg(env);
+	goto done;
+    }
+
+    i = RSA_verify(digp->NID_type, digest, digp->len,
+		   sign_bin.data+4, sign_bin.size-4, rsa);
+
+    ret = (i==1 ? atom_true : atom_false);
+
 done:
     RSA_free(rsa);
     return ret;
 }
 
+
 static ERL_NIF_TERM aes_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Key, IVec, Data, IsEncrypt) */
     ErlNifBinary key_bin, ivec_bin, data_bin;
@@ -1456,48 +1879,88 @@ static ERL_NIF_TERM rc2_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
     return ret;
 }
 
-static ERL_NIF_TERM rsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type,Data,Key=[E,N,D]) */
-    ErlNifBinary data_bin, ret_bin;
+static int get_rsa_private_key(ErlNifEnv* env, ERL_NIF_TERM key, RSA *rsa)
+{
+    /* key=[E,N,D]|[E,N,D,P1,P2,E1,E2,C] */
     ERL_NIF_TERM head, tail;
-    unsigned char hmacbuf[SHA_DIGEST_LENGTH];
-    unsigned rsa_s_len;
-    RSA *rsa = RSA_new();
-    int i, is_sha;
-
-    if (argv[0] == atom_sha) is_sha = 1;
-    else if (argv[0] == atom_md5) is_sha = 0;
-    else goto badarg;
 
-    if (!inspect_mpint(env,argv[1],&data_bin)
-	|| !enif_get_list_cell(env, argv[2], &head, &tail)
+    if (!enif_get_list_cell(env, key, &head, &tail)
 	|| !get_bn_from_mpint(env, head, &rsa->e)
 	|| !enif_get_list_cell(env, tail, &head, &tail)
 	|| !get_bn_from_mpint(env, head, &rsa->n)
 	|| !enif_get_list_cell(env, tail, &head, &tail)
 	|| !get_bn_from_mpint(env, head, &rsa->d)
-	|| !enif_is_empty_list(env,tail)) {
-    badarg:
-	RSA_free(rsa);
+	|| (!enif_is_empty_list(env, tail) &&
+	    (!enif_get_list_cell(env, tail, &head, &tail)
+	     || !get_bn_from_mpint(env, head, &rsa->p)
+	     || !enif_get_list_cell(env, tail, &head, &tail)
+	     || !get_bn_from_mpint(env, head, &rsa->q)
+	     || !enif_get_list_cell(env, tail, &head, &tail)
+	     || !get_bn_from_mpint(env, head, &rsa->dmp1)
+	     || !enif_get_list_cell(env, tail, &head, &tail)
+	     || !get_bn_from_mpint(env, head, &rsa->dmq1)
+	     || !enif_get_list_cell(env, tail, &head, &tail)
+	     || !get_bn_from_mpint(env, head, &rsa->iqmp)
+	     || !enif_is_empty_list(env, tail)))) {
+	return 0;
+    }
+    return 1;
+}
+
+static ERL_NIF_TERM rsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type, Data|{digest,Digest}, Key=[E,N,D]|[E,N,D,P1,P2,E1,E2,C]) */
+    ErlNifBinary data_bin, ret_bin;
+    unsigned char hmacbuf[SHA512_LEN];
+    unsigned rsa_s_len;
+    RSA* rsa;
+    int i;
+    const ERL_NIF_TERM* tpl_terms;
+    int tpl_arity;
+    struct digest_type_t *digp;
+    unsigned char* digest;
+
+    digp = get_digest_type(argv[0]);
+    if (!digp) {
 	return enif_make_badarg(env);
     }
-    enif_alloc_binary(RSA_size(rsa), &ret_bin);
-    if (is_sha) {
-	SHA1(data_bin.data+4, data_bin.size-4, hmacbuf);
-	ERL_VALGRIND_ASSERT_MEM_DEFINED(hmacbuf, SHA_DIGEST_LENGTH);
-	i =  RSA_sign(NID_sha1, hmacbuf, SHA_DIGEST_LENGTH,
-		      ret_bin.data, &rsa_s_len, rsa);
+    if (!digp->len) {
+	return atom_notsup;
+    }
+
+    if (enif_get_tuple(env, argv[1], &tpl_arity, &tpl_terms)) {
+	if (tpl_arity != 2 || tpl_terms[0] != atom_digest
+	    || !enif_inspect_binary(env, tpl_terms[1], &data_bin)
+	    || data_bin.size != digp->len) {
+
+	    return enif_make_badarg(env);
+	}
+	digest = data_bin.data;
     }
     else {
-	MD5(data_bin.data+4, data_bin.size-4, hmacbuf);
-	ERL_VALGRIND_ASSERT_MEM_DEFINED(hmacbuf, MD5_DIGEST_LENGTH);
-	i = RSA_sign(NID_md5, hmacbuf,MD5_DIGEST_LENGTH,
-		     ret_bin.data, &rsa_s_len, rsa);     
+	if (!inspect_mpint(env,argv[1],&data_bin)) {
+	    return enif_make_badarg(env);
+	}
+	digest = hmacbuf;
+	digp->funcp(data_bin.data+4, data_bin.size-4, digest);
+    }
+
+    rsa = RSA_new();
+    if (!get_rsa_private_key(env, argv[2], rsa)) {
+	RSA_free(rsa);
+	return enif_make_badarg(env);
     }
+
+
+    enif_alloc_binary(RSA_size(rsa), &ret_bin);
+
+    ERL_VALGRIND_ASSERT_MEM_DEFINED(digest, digp->len);
+    i =  RSA_sign(digp->NID_type, digest, digp->len,
+		  ret_bin.data, &rsa_s_len, rsa);
+
     RSA_free(rsa);
     if (i) {
 	ERL_VALGRIND_MAKE_MEM_DEFINED(ret_bin.data, rsa_s_len);
-	if (rsa_s_len != data_bin.size) {
+	if (rsa_s_len != ret_bin.size) {
 	    enif_realloc_binary(&ret_bin, rsa_s_len);
 	    ERL_VALGRIND_ASSERT_MEM_DEFINED(ret_bin.data, rsa_s_len);
 	}
@@ -1509,15 +1972,49 @@ static ERL_NIF_TERM rsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
     }
 }
 
+
 static ERL_NIF_TERM dss_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (DigesType, Data, Key=[P,Q,G,PrivKey]) */
+{/* (DigesType|none, Data|{digest,Digest}, Key=[P,Q,G,PrivKey]) */
     ErlNifBinary data_bin, ret_bin;
     ERL_NIF_TERM head, tail;
     unsigned char hmacbuf[SHA_DIGEST_LENGTH];
     unsigned int dsa_s_len;
-    DSA* dsa = DSA_new();
+    const ERL_NIF_TERM* tpl_terms;
+    int tpl_arity;
+    unsigned char* digest = NULL;
+    DSA* dsa;
     int i;
 
+    if (argv[0] == atom_sha) {
+	if (enif_get_tuple(env, argv[1], &tpl_arity, &tpl_terms)) {
+	    if (tpl_arity != 2 || tpl_terms[0] != atom_digest
+		|| !enif_inspect_binary(env, tpl_terms[1], &data_bin)
+		|| data_bin.size != SHA_DIGEST_LENGTH) {
+
+		return enif_make_badarg(env);
+	    }
+	    digest = data_bin.data;
+	}
+	else {
+	    if (!inspect_mpint(env,argv[1],&data_bin)) {
+		return enif_make_badarg(env);
+	    }
+	    SHA1(data_bin.data+4, data_bin.size-4, hmacbuf);
+	    digest = hmacbuf;
+	}
+    }
+    else if (argv[0] == atom_none
+	     && enif_inspect_binary(env,argv[1],&data_bin)
+	     && data_bin.size == SHA_DIGEST_LENGTH) {
+
+	digest = data_bin.data;
+    }
+    else {
+	return enif_make_badarg(env);
+    }
+
+    dsa = DSA_new();
+
     dsa->pub_key  = NULL;
     if (!enif_get_list_cell(env, argv[2], &head, &tail)
 	|| !get_bn_from_mpint(env, head, &dsa->p)
@@ -1528,23 +2025,12 @@ static ERL_NIF_TERM dss_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
 	|| !enif_get_list_cell(env, tail, &head, &tail)
 	|| !get_bn_from_mpint(env, head, &dsa->priv_key)
 	|| !enif_is_empty_list(env,tail)) {
-	goto badarg;	
-    }
-    if (argv[0] == atom_sha && inspect_mpint(env, argv[1], &data_bin)) {
-	SHA1(data_bin.data+4, data_bin.size-4, hmacbuf);
-    }
-    else if (argv[0] == atom_none && enif_inspect_binary(env,argv[1],&data_bin) 
-	     && data_bin.size == SHA_DIGEST_LENGTH) {
-	memcpy(hmacbuf, data_bin.data, SHA_DIGEST_LENGTH);
-    }
-    else {
-    badarg:
 	DSA_free(dsa);
 	return enif_make_badarg(env);
     }
 
     enif_alloc_binary(DSA_size(dsa), &ret_bin);
-    i =  DSA_sign(NID_sha1, hmacbuf, SHA_DIGEST_LENGTH,
+    i =  DSA_sign(NID_sha1, digest, SHA_DIGEST_LENGTH,
 		  ret_bin.data, &dsa_s_len, dsa);
     DSA_free(dsa);
     if (i) {
@@ -1558,6 +2044,7 @@ static ERL_NIF_TERM dss_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
     }
 }
 
+
 static int rsa_pad(ERL_NIF_TERM term, int* padding)
 {
     if (term == atom_rsa_pkcs1_padding) {
@@ -1623,20 +2110,13 @@ static ERL_NIF_TERM rsa_public_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TER
 }
 
 static ERL_NIF_TERM rsa_private_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data, PublKey=[E,N,D], Padding, IsEncrypt) */
+{/* (Data, Key=[E,N,D]|[E,N,D,P1,P2,E1,E2,C], Padding, IsEncrypt) */
     ErlNifBinary data_bin, ret_bin;
-    ERL_NIF_TERM head, tail;
     int padding, i;
     RSA* rsa = RSA_new();
 
     if (!enif_inspect_binary(env, argv[0], &data_bin)
-	|| !enif_get_list_cell(env, argv[1], &head, &tail)
-	|| !get_bn_from_mpint(env, head, &rsa->e)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_mpint(env, head, &rsa->n)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_mpint(env, head, &rsa->d)
-	|| !enif_is_empty_list(env,tail)
+	|| !get_rsa_private_key(env, argv[1], rsa)
 	|| !rsa_pad(argv[2], &padding)) {
 
 	RSA_free(rsa);
@@ -1893,59 +2373,6 @@ static ERL_NIF_TERM blowfish_ofb64_encrypt(ErlNifEnv* env, int argc, const ERL_N
 
 
 
-#ifdef OPENSSL_THREADS /* vvvvvvvvvvvvvvv OPENSSL_THREADS vvvvvvvvvvvvvvvv */
-
-static INLINE void locking(int mode, ErlNifRWLock* lock)
-{
-    switch (mode) {
-    case CRYPTO_LOCK|CRYPTO_READ:
-	enif_rwlock_rlock(lock);
-	break;
-    case CRYPTO_LOCK|CRYPTO_WRITE:
-	enif_rwlock_rwlock(lock);
-	break;
-    case CRYPTO_UNLOCK|CRYPTO_READ:
-	enif_rwlock_runlock(lock);
-	break;
-    case CRYPTO_UNLOCK|CRYPTO_WRITE:
-	enif_rwlock_rwunlock(lock);
-	break;
-    default:
-	ASSERT(!"Invalid lock mode");
-    }
-}
-
-/* Callback from openssl for static locking
- */
-static void locking_function(int mode, int n, const char *file, int line)
-{
-    ASSERT(n>=0 && n<CRYPTO_num_locks());
-
-    locking(mode, lock_vec[n]);
-}
-
-/* Callback from openssl for thread id
- */
-static unsigned long id_function(void)
-{
-    return(unsigned long) enif_thread_self();
-}
-
-/* Callbacks for dynamic locking, not used by current openssl version (0.9.8)
- */
-static struct CRYPTO_dynlock_value* dyn_create_function(const char *file, int line) {
-    return(struct CRYPTO_dynlock_value*) enif_rwlock_create("crypto_dyn");
-}
-static void dyn_lock_function(int mode, struct CRYPTO_dynlock_value* ptr,const char *file, int line)
-{
-    locking(mode, (ErlNifRWLock*)ptr);
-}
-static void dyn_destroy_function(struct CRYPTO_dynlock_value *ptr, const char *file, int line)
-{
-    enif_rwlock_destroy((ErlNifRWLock*)ptr);
-}
-
-#endif /* ^^^^^^^^^^^^^^^^^^^^^^ OPENSSL_THREADS ^^^^^^^^^^^^^^^^^^^^^^ */
 
 /* HMAC */
 
@@ -2026,3 +2453,166 @@ static void hmac_sha1(unsigned char *key, int klen,
     SHA1_Final((unsigned char *) hmacbuf, &ctx);
 }
 
+#ifdef HAVE_SHA224
+static void hmac_sha224(unsigned char *key, int klen,
+			unsigned char *dbuf, int dlen,
+			unsigned char *hmacbuf)
+{
+    SHA256_CTX ctx;
+    char ipad[HMAC_INT_LEN];
+    char opad[HMAC_INT_LEN];
+    unsigned char nkey[SHA224_DIGEST_LENGTH];
+    int i;
+
+    /* Change key if longer than 64 bytes */
+    if (klen > HMAC_INT_LEN) {
+	SHA224(key, klen, nkey);
+	key = nkey;
+	klen = SHA224_DIGEST_LENGTH;
+    }
+
+    memset(ipad, '\0', sizeof(ipad));
+    memset(opad, '\0', sizeof(opad));
+    memcpy(ipad, key, klen);
+    memcpy(opad, key, klen);
+
+    for (i = 0; i < HMAC_INT_LEN; i++) {
+	ipad[i] ^= HMAC_IPAD;
+	opad[i] ^= HMAC_OPAD;
+    }
+
+    /* inner SHA */
+    SHA224_Init(&ctx);
+    SHA224_Update(&ctx, ipad, HMAC_INT_LEN);
+    SHA224_Update(&ctx, dbuf, dlen);
+    SHA224_Final((unsigned char *) hmacbuf, &ctx);
+    /* outer SHA */
+    SHA224_Init(&ctx);
+    SHA224_Update(&ctx, opad, HMAC_INT_LEN);
+    SHA224_Update(&ctx, hmacbuf, SHA224_DIGEST_LENGTH);
+    SHA224_Final((unsigned char *) hmacbuf, &ctx);
+}
+#endif
+
+#ifdef HAVE_SHA256
+static void hmac_sha256(unsigned char *key, int klen,
+			unsigned char *dbuf, int dlen,
+			unsigned char *hmacbuf)
+{
+    SHA256_CTX ctx;
+    char ipad[HMAC_INT_LEN];
+    char opad[HMAC_INT_LEN];
+    unsigned char nkey[SHA256_DIGEST_LENGTH];
+    int i;
+
+    /* Change key if longer than 64 bytes */
+    if (klen > HMAC_INT_LEN) {
+	SHA256(key, klen, nkey);
+	key = nkey;
+	klen = SHA256_DIGEST_LENGTH;
+    }
+
+    memset(ipad, '\0', sizeof(ipad));
+    memset(opad, '\0', sizeof(opad));
+    memcpy(ipad, key, klen);
+    memcpy(opad, key, klen);
+
+    for (i = 0; i < HMAC_INT_LEN; i++) {
+	ipad[i] ^= HMAC_IPAD;
+	opad[i] ^= HMAC_OPAD;
+    }
+
+    /* inner SHA */
+    SHA256_Init(&ctx);
+    SHA256_Update(&ctx, ipad, HMAC_INT_LEN);
+    SHA256_Update(&ctx, dbuf, dlen);
+    SHA256_Final((unsigned char *) hmacbuf, &ctx);
+    /* outer SHA */
+    SHA256_Init(&ctx);
+    SHA256_Update(&ctx, opad, HMAC_INT_LEN);
+    SHA256_Update(&ctx, hmacbuf, SHA256_DIGEST_LENGTH);
+    SHA256_Final((unsigned char *) hmacbuf, &ctx);
+}
+#endif
+
+#ifdef HAVE_SHA384
+static void hmac_sha384(unsigned char *key, int klen,
+			unsigned char *dbuf, int dlen,
+			unsigned char *hmacbuf)
+{
+    SHA512_CTX ctx;
+    char ipad[HMAC_INT2_LEN];
+    char opad[HMAC_INT2_LEN];
+    unsigned char nkey[SHA384_DIGEST_LENGTH];
+    int i;
+
+    /* Change key if longer than 64 bytes */
+    if (klen > HMAC_INT2_LEN) {
+	SHA384(key, klen, nkey);
+	key = nkey;
+	klen = SHA384_DIGEST_LENGTH;
+    }
+
+    memset(ipad, '\0', sizeof(ipad));
+    memset(opad, '\0', sizeof(opad));
+    memcpy(ipad, key, klen);
+    memcpy(opad, key, klen);
+
+    for (i = 0; i < HMAC_INT2_LEN; i++) {
+	ipad[i] ^= HMAC_IPAD;
+	opad[i] ^= HMAC_OPAD;
+    }
+
+    /* inner SHA */
+    SHA384_Init(&ctx);
+    SHA384_Update(&ctx, ipad, HMAC_INT2_LEN);
+    SHA384_Update(&ctx, dbuf, dlen);
+    SHA384_Final((unsigned char *) hmacbuf, &ctx);
+    /* outer SHA */
+    SHA384_Init(&ctx);
+    SHA384_Update(&ctx, opad, HMAC_INT2_LEN);
+    SHA384_Update(&ctx, hmacbuf, SHA384_DIGEST_LENGTH);
+    SHA384_Final((unsigned char *) hmacbuf, &ctx);
+}
+#endif
+
+#ifdef HAVE_SHA512
+static void hmac_sha512(unsigned char *key, int klen,
+			unsigned char *dbuf, int dlen,
+			unsigned char *hmacbuf)
+{
+    SHA512_CTX ctx;
+    char ipad[HMAC_INT2_LEN];
+    char opad[HMAC_INT2_LEN];
+    unsigned char nkey[SHA512_DIGEST_LENGTH];
+    int i;
+
+    /* Change key if longer than 64 bytes */
+    if (klen > HMAC_INT2_LEN) {
+	SHA512(key, klen, nkey);
+	key = nkey;
+	klen = SHA512_DIGEST_LENGTH;
+    }
+
+    memset(ipad, '\0', sizeof(ipad));
+    memset(opad, '\0', sizeof(opad));
+    memcpy(ipad, key, klen);
+    memcpy(opad, key, klen);
+
+    for (i = 0; i < HMAC_INT2_LEN; i++) {
+	ipad[i] ^= HMAC_IPAD;
+	opad[i] ^= HMAC_OPAD;
+    }
+
+    /* inner SHA */
+    SHA512_Init(&ctx);
+    SHA512_Update(&ctx, ipad, HMAC_INT2_LEN);
+    SHA512_Update(&ctx, dbuf, dlen);
+    SHA512_Final((unsigned char *) hmacbuf, &ctx);
+    /* outer SHA */
+    SHA512_Init(&ctx);
+    SHA512_Update(&ctx, opad, HMAC_INT2_LEN);
+    SHA512_Update(&ctx, hmacbuf, SHA512_DIGEST_LENGTH);
+    SHA512_Final((unsigned char *) hmacbuf, &ctx);
+}
+#endif
diff --git a/lib/crypto/c_src/crypto_callback.c b/lib/crypto/c_src/crypto_callback.c
new file mode 100644
index 0000000000..81106b4cc2
--- /dev/null
+++ b/lib/crypto/c_src/crypto_callback.c
@@ -0,0 +1,165 @@
+/* 
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2012. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+#include <string.h>
+#include <openssl/opensslconf.h>
+
+#include "erl_nif.h"
+#include "crypto_callback.h"
+
+#ifdef DEBUG
+    #  define ASSERT(e) \
+    ((void) ((e) ? 1 : (fprintf(stderr,"Assert '%s' failed at %s:%d\n",\
+				#e, __FILE__, __LINE__), abort(), 0)))
+#else
+    #  define ASSERT(e) ((void) 1)
+#endif
+
+#ifdef __GNUC__
+    #  define INLINE __inline__
+#elif defined(__WIN32__)
+    #  define INLINE __forceinline
+#else
+    #  define INLINE
+#endif
+
+#ifdef __WIN32__
+#  define DLLEXPORT __declspec(dllexport)
+#else
+#  define DLLEXPORT
+#endif
+
+/* to be dlsym'ed */
+DLLEXPORT struct crypto_callbacks* get_crypto_callbacks(int nlocks);
+
+
+static ErlNifRWLock** lock_vec = NULL; /* Static locks used by openssl */
+
+static void* crypto_alloc(size_t size)
+{
+    return enif_alloc(size);
+}
+static void* crypto_realloc(void* ptr, size_t size)
+{
+    return enif_realloc(ptr, size);
+}
+static void crypto_free(void* ptr)
+{
+    enif_free(ptr);
+}
+
+
+#ifdef OPENSSL_THREADS /* vvvvvvvvvvvvvvv OPENSSL_THREADS vvvvvvvvvvvvvvvv */
+
+#include <openssl/crypto.h>
+
+static INLINE void locking(int mode, ErlNifRWLock* lock)
+{
+    switch (mode) {
+    case CRYPTO_LOCK|CRYPTO_READ:
+	enif_rwlock_rlock(lock);
+	break;
+    case CRYPTO_LOCK|CRYPTO_WRITE:
+	enif_rwlock_rwlock(lock);
+	break;
+    case CRYPTO_UNLOCK|CRYPTO_READ:
+	enif_rwlock_runlock(lock);
+	break;
+    case CRYPTO_UNLOCK|CRYPTO_WRITE:
+	enif_rwlock_rwunlock(lock);
+	break;
+    default:
+	ASSERT(!"Invalid lock mode");
+    }
+}
+
+static void locking_function(int mode, int n, const char *file, int line)
+{
+    ASSERT(n>=0 && n<CRYPTO_num_locks());
+
+    locking(mode, lock_vec[n]);
+}
+
+static unsigned long id_function(void)
+{
+    return (unsigned long) enif_thread_self();
+}
+
+/* Dynamic locking, not used by current openssl version (0.9.8)
+ */
+static struct CRYPTO_dynlock_value* dyn_create_function(const char *file, int line)
+{
+    return (struct CRYPTO_dynlock_value*) enif_rwlock_create("crypto_dyn");
+}
+static void dyn_lock_function(int mode, struct CRYPTO_dynlock_value* ptr,const char *file, int line)
+{
+    locking(mode, (ErlNifRWLock*)ptr);
+}
+static void dyn_destroy_function(struct CRYPTO_dynlock_value *ptr, const char *file, int line)
+{
+    enif_rwlock_destroy((ErlNifRWLock*)ptr);
+}
+
+#endif /* ^^^^^^^^^^^^^^^^^^^^^^ OPENSSL_THREADS ^^^^^^^^^^^^^^^^^^^^^^ */
+
+DLLEXPORT struct crypto_callbacks* get_crypto_callbacks(int nlocks)
+{
+    static int is_initialized = 0;
+    static struct crypto_callbacks the_struct = {
+	sizeof(struct crypto_callbacks),
+
+	&crypto_alloc,
+	&crypto_realloc,
+	&crypto_free,
+        
+#ifdef OPENSSL_THREADS
+	&locking_function,
+	&id_function,
+	&dyn_create_function,
+	&dyn_lock_function,
+	&dyn_destroy_function
+#endif /* OPENSSL_THREADS */
+    };
+
+    if (!is_initialized) {
+#ifdef OPENSSL_THREADS
+	if (nlocks > 0) {
+	    int i;
+	    lock_vec = enif_alloc(nlocks*sizeof(*lock_vec));
+	    if (lock_vec==NULL) return NULL;
+	    memset(lock_vec, 0, nlocks*sizeof(*lock_vec));
+	    
+	    for (i=nlocks-1; i>=0; --i) {
+		lock_vec[i] = enif_rwlock_create("crypto_stat");
+		if (lock_vec[i]==NULL) return NULL;
+	    }
+	}
+#endif
+	is_initialized = 1;
+    }
+    return &the_struct;
+}
+
+#ifdef HAVE_DYNAMIC_CRYPTO_LIB
+/* This is not really a NIF library, but we use ERL_NIF_INIT in order to
+ * get access to the erl_nif API (on Windows).
+ */
+ERL_NIF_INIT(dummy, (ErlNifFunc*)NULL , NULL, NULL, NULL, NULL)
+#endif
+
diff --git a/lib/crypto/c_src/crypto_callback.h b/lib/crypto/c_src/crypto_callback.h
new file mode 100644
index 0000000000..23ecba3e5d
--- /dev/null
+++ b/lib/crypto/c_src/crypto_callback.h
@@ -0,0 +1,46 @@
+/* 
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2012. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+struct crypto_callbacks
+{
+    size_t sizeof_me;
+
+    void* (*crypto_alloc)(size_t size);
+    void* (*crypto_realloc)(void* ptr, size_t size);
+    void (*crypto_free)(void* ptr);
+
+    /* openssl callbacks */
+  #ifdef OPENSSL_THREADS
+    void (*locking_function)(int mode, int n, const char *file, int line);
+    unsigned long (*id_function)(void);
+    struct CRYPTO_dynlock_value* (*dyn_create_function)(const char *file,
+							int line);
+    void (*dyn_lock_function)(int mode, struct CRYPTO_dynlock_value* ptr,
+			      const char *file, int line);
+    void (*dyn_destroy_function)(struct CRYPTO_dynlock_value *ptr,
+				 const char *file, int line);
+  #endif /* OPENSSL_THREADS */
+};
+
+typedef struct crypto_callbacks* get_crypto_callbacks_t(int nlocks);
+
+#ifndef HAVE_DYNAMIC_CRYPTO_LIB
+struct crypto_callbacks* get_crypto_callbacks(int nlocks);
+#endif
+
diff --git a/lib/crypto/doc/src/Makefile b/lib/crypto/doc/src/Makefile
index 03aaba939b..00ae70fb4a 100644
--- a/lib/crypto/doc/src/Makefile
+++ b/lib/crypto/doc/src/Makefile
@@ -100,16 +100,16 @@ clean clean_docs clean_tex:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6DIR)/* $(RELEASE_PATH)/man/man6
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6DIR)/* "$(RELEASE_PATH)/man/man6"
 
 
 release_spec:
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 8cb893cd1c..3e533158c8 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2011</year>
+      <year>1999</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -115,6 +115,12 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
 > <input>info_lib().</input>
 [{&lt;&lt;"OpenSSL"&gt;&gt;,9469983,&lt;&lt;"OpenSSL 0.9.8a 11 Oct 2005"&gt;&gt;}]
         </pre>
+	<note><p>
+	  From OTP R16 the <em>numeric version</em> represents the version of the OpenSSL
+	  <em>header files</em> (<c>openssl/opensslv.h</c>) used when crypto was compiled.
+	  The text variant represents the OpenSSL library used at runtime.
+	  In earlier OTP versions both numeric and text was taken from the library.
+	</p></note>
       </desc>
     </func>
     <func>
@@ -256,6 +262,61 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       </desc>
     </func>
     <func>
+      <name>hash(Type, Data) -> Digest</name>
+      <fsummary></fsummary>
+      <type>
+	<v>Type = md4 | md5 | sha | sha224 | sha256 | sha384 | sha512</v>
+	<v>Data = iodata()</v>
+	<v>Digest = binary()</v>
+      </type>
+      <desc>
+        <p>Computes a message digest of type <c>Type</c> from <c>Data</c>.</p>
+	<p>May throw exception <c>notsup</c> in case the chosen <c>Type</c>
+	is not supported by the underlying OpenSSL implementation.</p>
+      </desc>
+    </func>
+    <func>
+      <name>hash_init(Type) -> Context</name>
+      <fsummary></fsummary>
+      <type>
+	<v>Type = md4 | md5 | sha | sha224 | sha256 | sha384 | sha512</v>
+      </type>
+      <desc>
+        <p>Initializes the context for streaming hash operations. <c>Type</c> determines
+        which digest to use. The returned context should be used as argument
+	to <seealso marker="#hash_update/2">hash_update</seealso>.</p>
+	<p>May throw exception <c>notsup</c> in case the chosen <c>Type</c>
+	is not supported by the underlying OpenSSL implementation.</p>
+      </desc>
+    </func>
+    <func>
+      <name>hash_update(Context, Data) -> NewContext</name>
+      <fsummary></fsummary>
+      <type>
+	<v>Data = iodata()</v>
+      </type>
+      <desc>
+        <p>Updates the digest represented by <c>Context</c> using the given <c>Data</c>. <c>Context</c>
+        must have been generated using <seealso marker="#hash_init/1">hash_init</seealso>
+	or a previous call to this function. <c>Data</c> can be any length. <c>NewContext</c>
+        must be passed into the next call to <c>hash_update</c>
+	or <seealso marker="#hash_final/1">hash_final</seealso>.</p>
+      </desc>
+    </func>
+    <func>
+      <name>hash_final(Context) -> Digest</name>
+      <fsummary></fsummary>
+      <type>
+	<v>Digest = binary()</v>
+      </type>
+      <desc>
+        <p>Finalizes the hash operation referenced by <c>Context</c> returned
+	from a previous call to <seealso marker="#hash_update/2">hash_update</seealso>.
+	The size of <c>Digest</c> is determined by the type of hash
+	function used to generate it.</p>
+      </desc>
+    </func>
+    <func>
       <name>md5_mac(Key, Data) -> Mac</name>
       <fsummary>Compute an <c>MD5 MAC</c>message authentification code</fsummary>
       <type>
@@ -497,6 +558,8 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
           keys, and <c>IVec</c> is an arbitrary initializing
           vector. The lengths of each of <c>Key1</c>, <c>Key2</c>,
           <c>Key3</c> and <c>IVec</c> must be 64 bits (8 bytes).</p>
+	<p>May throw exception <c>notsup</c> for old OpenSSL
+	  versions (0.9.7) that does not support this encryption mode.</p>
       </desc>
     </func>
     <func>
@@ -514,6 +577,8 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
           and <c>IVec</c> must have the same values as those used when
           encrypting.  The lengths of <c>Key1</c>, <c>Key2</c>,
           <c>Key3</c>, and <c>IVec</c> must be 64 bits (8 bytes).</p>
+	<p>May throw exception <c>notsup</c> for old OpenSSL
+	  versions (0.9.7) that does not support this encryption mode.</p>
       </desc>
     </func>
 
@@ -643,16 +708,14 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
 
     <func>
       <name>aes_cfb_128_encrypt(Key, IVec, Text) -> Cipher</name>
-      <name>aes_cbc_128_encrypt(Key, IVec, Text) -> Cipher</name>
-      <fsummary>Encrypt <c>Text</c>according to AES in Cipher Feedback  mode or Cipher Block Chaining mode</fsummary>
+      <fsummary>Encrypt <c>Text</c>according to AES in Cipher Feedback mode</fsummary>
       <type>
         <v>Key = Text = iolist() | binary()</v>
         <v>IVec = Cipher = binary()</v>
       </type>
       <desc>
         <p>Encrypts <c>Text</c> according to AES in Cipher Feedback 
-          mode (CFB) or Cipher Block Chaining mode (CBC). <c>Text</c>
-          must be a multiple of 128 bits (16 bytes). <c>Key</c> is the
+          mode (CFB). <c>Key</c> is the
           AES key, and <c>IVec</c> is an arbitrary initializing vector.
           The lengths of <c>Key</c> and <c>IVec</c> must be 128 bits
           (16 bytes).</p>
@@ -660,15 +723,45 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
     </func>
     <func>
       <name>aes_cfb_128_decrypt(Key, IVec, Cipher) -> Text</name>
+      <fsummary>Decrypt <c>Cipher</c>according to AES in Cipher Feedback mode</fsummary>
+      <type>
+        <v>Key = Cipher = iolist() | binary()</v>
+        <v>IVec = Text = binary()</v>
+      </type>
+      <desc>
+        <p>Decrypts <c>Cipher</c> according to AES in Cipher Feedback Mode (CFB).
+          <c>Key</c> is the AES key, and <c>IVec</c> is an arbitrary
+          initializing vector. <c>Key</c> and <c>IVec</c> must have
+          the same values as those used when encrypting. The lengths of
+          <c>Key</c> and <c>IVec</c> must be 128 bits (16 bytes).</p>
+      </desc>
+    </func>
+    <func>
+      <name>aes_cbc_128_encrypt(Key, IVec, Text) -> Cipher</name>
+      <fsummary>Encrypt <c>Text</c>according to AES in Cipher Block Chaining mode</fsummary>
+      <type>
+        <v>Key = Text = iolist() | binary()</v>
+        <v>IVec = Cipher = binary()</v>
+      </type>
+      <desc>
+          <p>Encrypts <c>Text</c> according to AES in Cipher Block Chaining
+          mode (CBC). <c>Text</c>
+          must be a multiple of 128 bits (16 bytes). <c>Key</c> is the
+          AES key, and <c>IVec</c> is an arbitrary initializing vector.
+          The lengths of <c>Key</c> and <c>IVec</c> must be 128 bits
+          (16 bytes).</p>
+      </desc>
+    </func>
+    <func>
       <name>aes_cbc_128_decrypt(Key, IVec, Cipher) -> Text</name>
-      <fsummary>Decrypt <c>Cipher</c>according to AES in Cipher Feedback  mode or Cipher Block Chaining mode</fsummary>
+      <fsummary>Decrypt <c>Cipher</c>according to AES in Cipher Block Chaining mode</fsummary>
       <type>
         <v>Key = Cipher = iolist() | binary()</v>
         <v>IVec = Text = binary()</v>
       </type>
       <desc>
-        <p>Decrypts <c>Cipher</c> according to Cipher Feedback Mode (CFB)
-          or Cipher Block Chaining mode (CBC).
+          <p>Decrypts <c>Cipher</c> according to AES in Cipher Block
+          Chaining mode (CBC).
           <c>Key</c> is the AES key, and <c>IVec</c> is an arbitrary
           initializing vector. <c>Key</c> and <c>IVec</c> must have
           the same values as those used when encrypting. <c>Cipher</c>
@@ -865,46 +958,56 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
     </func>
 
     <func>
-      <name>rsa_sign(Data, Key) -> Signature</name>
-      <name>rsa_sign(DigestType, Data, Key) -> Signature</name> 
+      <name>rsa_sign(DataOrDigest, Key) -> Signature</name>
+      <name>rsa_sign(DigestType, DataOrDigest, Key) -> Signature</name>
       <fsummary>Sign the data using rsa with the given key.</fsummary>
       <type>
+        <v>DataOrDigest = Data | {digest,Digest}</v>
         <v>Data = Mpint</v>
-        <v>Key = [E, N, D]</v>
+	<v>Digest = binary()</v>
+        <v>Key = [E, N, D] | [E, N, D, P1, P2, E1, E2, C]</v>
         <v>E, N, D = Mpint</v>
         <d>Where <c>E</c> is the public exponent, <c>N</c> is public modulus and 
 	  <c>D</c> is the private exponent.</d>
-	<v>DigestType = md5 | sha</v>
+	<v>P1, P2, E1, E2, C = Mpint</v>
+	<d>The longer key format contains redundant information that will make
+	   the calculation faster. <c>P1,P2</c> are first and second prime factors.
+           <c>E1,E2</c> are first and second exponents. <c>C</c> is the CRT coefficient.
+           Terminology is taken from RFC 3447.</d>
+	<v>DigestType = md5 | sha | sha224 | sha256 | sha384 | sha512</v>
 	<d>The default <c>DigestType</c> is sha.</d>
         <v>Mpint = binary()</v>
         <v>Signature = binary()</v>
       </type>
       <desc>
-        <p>Calculates a <c>DigestType</c> digest of the <c>Data</c>
-	  and creates a RSA signature with the private key <c>Key</c>
-	  of the digest.</p>
+        <p>Creates a RSA signature with the private key <c>Key</c>
+	  of a digest. The digest is either calculated as a
+	  <c>DigestType</c> digest of <c>Data</c> or a precalculated
+	  binary <c>Digest</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>rsa_verify(Data, Signature, Key) -> Verified</name>
-      <name>rsa_verify(DigestType, Data, Signature, Key) -> Verified </name> 
+      <name>rsa_verify(DataOrDigest, Signature, Key) -> Verified</name>
+      <name>rsa_verify(DigestType, DataOrDigest, Signature, Key) -> Verified </name>
       <fsummary>Verify the digest and signature using rsa with given public key.</fsummary>
       <type>
         <v>Verified = boolean()</v>
+	<v>DataOrDigest = Data | {digest|Digest}</v>
         <v>Data, Signature = Mpint</v>
+	<v>Digest = binary()</v>
         <v>Key = [E, N]</v>
         <v>E, N = Mpint</v>
         <d>Where <c>E</c> is the public exponent and <c>N</c> is public modulus.</d>
-	<v>DigestType = md5 | sha | sha256 | sha384 | sha512</v>
-	<d> The default <c>DigestType</c> is sha.</d>
+	<v>DigestType = md5 | sha | sha224 | sha256 | sha384 | sha512</v>
+	<d>The default <c>DigestType</c> is sha.</d>
         <v>Mpint = binary()</v>
       </type>
       <desc>
-        <p>Calculates a <c>DigestType</c> digest of the <c>Data</c>
-          and verifies that the digest matches the RSA signature using the
+	<p>Verifies that a digest matches the RSA signature using the
           signer's public key <c>Key</c>.
-	</p>
+	  The digest is either calculated as a <c>DigestType</c>
+	  digest of <c>Data</c> or a precalculated binary <c>Digest</c>.</p>
 	<p>May throw exception <c>notsup</c> in case the chosen <c>DigestType</c>
 	is not supported by the underlying OpenSSL implementation.</p>
       </desc>
@@ -943,10 +1046,15 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       <fsummary>Decrypts ChipherText using the private Key.</fsummary>
       <type>
 	<v>ChipherText = binary()</v>
-	<v>PrivateKey = [E, N, D]</v>
+	<v>PrivateKey = [E, N, D] | [E, N, D, P1, P2, E1, E2, C]</v>
 	<v>E, N, D = Mpint</v>
 	<d>Where <c>E</c> is the public exponent, <c>N</c> is public modulus  and 
 	  <c>D</c> is the private exponent.</d>
+	<v>P1, P2, E1, E2, C = Mpint</v>
+	<d>The longer key format contains redundant information that will make
+	   the calculation faster. <c>P1,P2</c> are first and second prime factors.
+           <c>E1,E2</c> are first and second exponents. <c>C</c> is the CRT coefficient.
+           Terminology is taken from RFC 3447.</d>
 	<v>Padding = rsa_pkcs1_padding | rsa_pkcs1_oaep_padding | rsa_no_padding</v>
         <v>PlainText = binary()</v>
       </type>
@@ -965,10 +1073,15 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       <fsummary>Encrypts Msg using the private Key.</fsummary>
       <type>
 	<v>PlainText = binary()</v>
-	<v>PrivateKey = [E, N, D]</v>
-	<v>E, N, D = Mpint</v>	
+	<v>PrivateKey = [E, N, D] | [E, N, D, P1, P2, E1, E2, C]</v>
+	<v>E, N, D = Mpint</v>
 	<d>Where <c>E</c> is the public exponent, <c>N</c> is public modulus and 
 	  <c>D</c> is the private exponent.</d>
+	<v>P1, P2, E1, E2, C = Mpint</v>
+	<d>The longer key format contains redundant information that will make
+	   the calculation faster. <c>P1,P2</c> are first and second prime factors.
+           <c>E1,E2</c> are first and second exponents. <c>C</c> is the CRT coefficient.
+           Terminology is taken from RFC 3447.</d>
 	<v>Padding = rsa_pkcs1_padding | rsa_no_padding</v>
         <v>ChipherText = binary()</v>
       </type>
@@ -1007,45 +1120,52 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
     </func>
       
     <func>
-      <name>dss_sign(Data, Key) -> Signature</name>
-      <name>dss_sign(DigestType, Data, Key) -> Signature</name>
+      <name>dss_sign(DataOrDigest, Key) -> Signature</name>
+      <name>dss_sign(DigestType, DataOrDigest, Key) -> Signature</name>
       <fsummary>Sign the data using dsa with given private key.</fsummary>
       <type>
-        <v>DigestType = sha | none (default is sha)</v>
-        <v>Data = Mpint | ShaDigest</v>
+        <v>DigestType = sha</v>
+        <v>DataOrDigest = Mpint | {digest,Digest}</v>
         <v>Key = [P, Q, G, X]</v>
         <v>P, Q, G, X = Mpint</v>
 	<d> Where <c>P</c>, <c>Q</c> and <c>G</c> are the dss
 	  parameters and <c>X</c> is the private key.</d>
-        <v>ShaDigest = binary() with length 20 bytes</v>
+        <v>Digest = binary() with length 20 bytes</v>
         <v>Signature = binary()</v>
       </type>
       <desc>
-        <p>Creates a DSS signature with the private key <c>Key</c> of a digest.
-        If <c>DigestType</c> is 'sha', the digest is calculated as SHA1 of <c>Data</c>.
-        If <c>DigestType</c> is 'none', <c>Data</c> is the precalculated SHA1 digest.</p>
+        <p>Creates a DSS signature with the private key <c>Key</c> of
+	a digest. The digest is either calculated as a SHA1
+	  digest of <c>Data</c> or a precalculated binary <c>Digest</c>.</p>
+	<p>A deprecated feature is having <c>DigestType = 'none'</c>
+	in which case <c>DataOrDigest</c> is a precalculated SHA1
+	digest.</p>
       </desc>
     </func>
 
     <func>
-      <name>dss_verify(Data, Signature, Key) -> Verified</name>
-      <name>dss_verify(DigestType, Data, Signature, Key) -> Verified</name>
+      <name>dss_verify(DataOrDigest, Signature, Key) -> Verified</name>
+      <name>dss_verify(DigestType, DataOrDigest, Signature, Key) -> Verified</name>
       <fsummary>Verify the data and signature using dsa with given public key.</fsummary>
       <type>
         <v>Verified = boolean()</v>
-        <v>DigestType = sha | none</v>
+        <v>DigestType = sha</v>
+	<v>DataOrDigest = Mpint | {digest,Digest}</v>
         <v>Data = Mpint | ShaDigest</v>
         <v>Signature = Mpint</v>
         <v>Key = [P, Q, G, Y]</v>
         <v>P, Q, G, Y = Mpint</v>
 	<d> Where <c>P</c>, <c>Q</c> and <c>G</c> are the dss
 	  parameters and <c>Y</c> is the public key.</d>
-        <v>ShaDigest = binary() with length 20 bytes</v>
+        <v>Digest = binary() with length 20 bytes</v>
       </type>
       <desc>
-        <p>Verifies that a digest matches the DSS signature using the public key <c>Key</c>.
-        If <c>DigestType</c> is 'sha', the digest is calculated as SHA1 of <c>Data</c>.
-        If <c>DigestType</c> is 'none', <c>Data</c> is the precalculated SHA1 digest.</p>
+        <p>Verifies that a digest matches the DSS signature using the
+	public key <c>Key</c>. The digest is either calculated as a SHA1
+	digest of <c>Data</c> or is a precalculated binary <c>Digest</c>.</p>
+	<p>A deprecated feature is having <c>DigestType = 'none'</c>
+	in which case <c>DataOrDigest</c> is a precalculated SHA1
+	digest binary.</p>
       </desc>
     </func>
 
diff --git a/lib/crypto/doc/src/crypto_app.xml b/lib/crypto/doc/src/crypto_app.xml
index 1c01e3f099..6573a56f4c 100644
--- a/lib/crypto/doc/src/crypto_app.xml
+++ b/lib/crypto/doc/src/crypto_app.xml
@@ -62,7 +62,7 @@
   <section>
     <title>OpenSSL libraries</title>
     <p>The current implementation of the Erlang Crypto application is
-      based on the <em>OpenSSL</em> package version 0.9.7 or higher.
+      based on the <em>OpenSSL</em> package version 0.9.8 or higher.
       There are source and binary releases on the web.
       </p>
     <p>Source releases of OpenSSL can be downloaded from the <url href="http://www.openssl.org">OpenSSL</url> project home page,
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 3a44550ae2..4178ca2b08 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2011</year>
+      <year>1999</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,6 +30,53 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Remove unnecessary dependency to libssl from crypto NIF
+	    library. This dependency was introduced by accident in
+	    R14B04.</p>
+          <p>
+	    Own Id: OTP-10064</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add crypto and public_key support for the hash functions
+	    SHA224, SHA256, SHA384 and SHA512 and also hmac and
+	    rsa_sign/verify support using these hash functions.
+	    Thanks to Andreas Schultz for making a prototype.</p>
+          <p>
+	    Own Id: OTP-9908</p>
+        </item>
+        <item>
+          <p>
+	    Optimize RSA private key handling in <c>crypto</c> and
+	    <c>public_key</c>.</p>
+          <p>
+	    Own Id: OTP-10065</p>
+        </item>
+        <item>
+          <p>
+	    Make <c>crypto:aes_cfb_128_encrypt</c> and
+	    <c>crypto:aes_cfb_128_decrypt</c> handle data and cipher
+	    with arbitrary length. (Thanks to Stefan Zegenhagen)</p>
+          <p>
+	    Own Id: OTP-10136</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 2.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
index 0e886ce8bf..910e89363c 100644
--- a/lib/crypto/src/Makefile
+++ b/lib/crypto/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2010. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -83,11 +83,11 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
-		$(APPUP_TARGET) $(RELSYSDIR)/ebin
+		$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index d7aac27825..461558a79e 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -22,12 +22,19 @@
 -module(crypto).
 
 -export([start/0, stop/0, info/0, info_lib/0, version/0]).
+-export([hash/2, hash_init/1, hash_update/2, hash_final/1]).
 -export([md4/1, md4_init/0, md4_update/2, md4_final/1]).
 -export([md5/1, md5_init/0, md5_update/2, md5_final/1]).
 -export([sha/1, sha_init/0, sha_update/2, sha_final/1]).
+-export([sha224/1, sha224_init/0, sha224_update/2, sha224_final/1]).
 -export([sha256/1, sha256_init/0, sha256_update/2, sha256_final/1]).
+-export([sha384/1, sha384_init/0, sha384_update/2, sha384_final/1]).
 -export([sha512/1, sha512_init/0, sha512_update/2, sha512_final/1]).
 -export([md5_mac/2, md5_mac_96/2, sha_mac/2, sha_mac/3, sha_mac_96/2]).
+-export([sha224_mac/2, sha224_mac/3]).
+-export([sha256_mac/2, sha256_mac/3]).
+-export([sha384_mac/2, sha384_mac/3]).
+-export([sha512_mac/2, sha512_mac/3]).
 -export([hmac_init/2, hmac_update/2, hmac_final/1, hmac_final_n/2]).
 -export([des_cbc_encrypt/3, des_cbc_decrypt/3, des_cbc_ivec/1]).
 -export([des_ecb_encrypt/2, des_ecb_decrypt/2]).
@@ -64,16 +71,18 @@
 -define(FUNC_LIST, [md4, md4_init, md4_update, md4_final,
 		    md5, md5_init, md5_update, md5_final,
 		    sha, sha_init, sha_update, sha_final,
- 		    sha256, sha256_init, sha256_update, sha256_final,
- 		    sha512, sha512_init, sha512_update, sha512_final,
+		    sha224, sha224_init, sha224_update, sha224_final,
+		    sha256, sha256_init, sha256_update, sha256_final,
+		    sha384, sha384_init, sha384_update, sha384_final,
+		    sha512, sha512_init, sha512_update, sha512_final,
 		    md5_mac,  md5_mac_96,
 		    sha_mac,  sha_mac_96,
-                    sha_mac_init, sha_mac_update, sha_mac_final,
+		    sha224_mac, sha256_mac, sha384_mac, sha512_mac,
 		    des_cbc_encrypt, des_cbc_decrypt,
 		    des_cfb_encrypt, des_cfb_decrypt,
 		    des_ecb_encrypt, des_ecb_decrypt,
-		    des_ede3_cbc_encrypt, des_ede3_cbc_decrypt,
-		    des_ede3_cfb_encrypt, des_ede3_cfb_decrypt,
+		    des3_cbc_encrypt, des3_cbc_decrypt,
+		    des3_cfb_encrypt, des3_cfb_decrypt,
 		    aes_cfb_128_encrypt, aes_cfb_128_decrypt,
 		    rand_bytes,
 		    strong_rand_bytes,
@@ -93,17 +102,25 @@
 		    aes_cbc_256_encrypt, aes_cbc_256_decrypt,
 		    aes_ctr_encrypt, aes_ctr_decrypt,
                     aes_ctr_stream_init, aes_ctr_stream_encrypt, aes_ctr_stream_decrypt,
+		    aes_cbc_ivec, blowfish_cbc_encrypt, blowfish_cbc_decrypt,
+		    blowfish_cfb64_encrypt, blowfish_cfb64_decrypt,
+		    blowfish_ecb_encrypt, blowfish_ecb_decrypt, blowfish_ofb64_encrypt,
+		    des_cbc_ivec, des_cfb_ivec, erlint, mpint,
+		    hash, hash_init, hash_update, hash_final,
+		    hmac_init, hmac_update, hmac_final, hmac_final_n, info,
+		    rc2_cbc_encrypt, rc2_cbc_decrypt,
 		    info_lib]).
 
--type rsa_digest_type() :: 'md5' | 'sha' | 'sha256' | 'sha384' | 'sha512'.
+-type rsa_digest_type() :: 'md5' | 'sha' | 'sha224' | 'sha256' | 'sha384' | 'sha512'.
 -type dss_digest_type() :: 'none' | 'sha'.
+-type data_or_digest() :: binary() | {digest, binary()}.
 -type crypto_integer() :: binary() | integer().
 
 -define(nif_stub,nif_stub_error(?LINE)).
 
 -on_load(on_load/0).
 
--define(CRYPTO_NIF_VSN,101).
+-define(CRYPTO_NIF_VSN,201).
 
 on_load() ->
     LibBaseName = "crypto",
@@ -129,7 +146,7 @@ on_load() ->
 		      end
 	      end,
     Lib = filename:join([PrivDir, "lib", LibName]),
-    Status = case erlang:load_nif(Lib, ?CRYPTO_NIF_VSN) of
+    Status = case erlang:load_nif(Lib, {?CRYPTO_NIF_VSN,Lib}) of
 		 ok -> ok;
 		 {error, {load_failed, _}}=Error1 ->
 		     ArchLibDir = 
@@ -141,7 +158,7 @@ on_load() ->
 			 [] -> Error1;
 			 _ ->
 			     ArchLib = filename:join([ArchLibDir, LibName]),
-			     erlang:load_nif(ArchLib, ?CRYPTO_NIF_VSN)
+			     erlang:load_nif(ArchLib, {?CRYPTO_NIF_VSN,ArchLib})
 		     end;
 		 Error1 -> Error1
 	     end,
@@ -171,7 +188,7 @@ info_lib() -> ?nif_stub.
 %% (no version): Driver implementation
 %% 2.0         : NIF implementation, requires OTP R14
 version() -> ?CRYPTO_VSN.
-     
+
 %% Below Key and Data are binaries or IO-lists. IVec is a binary.
 %% Output is always a binary. Context is a binary.
 
@@ -179,6 +196,45 @@ version() -> ?CRYPTO_VSN.
 %%  MESSAGE DIGESTS
 %%
 
+-spec hash(_, iodata()) -> binary().
+hash(md5, Data)    -> md5(Data);
+hash(md4, Data)    -> md4(Data);
+hash(sha, Data)    -> sha(Data);
+hash(sha224, Data) -> sha224(Data);
+hash(sha256, Data) -> sha256(Data);
+hash(sha384, Data) -> sha384(Data);
+hash(sha512, Data) -> sha512(Data).
+
+-spec hash_init('md5'|'md4'|'sha'|'sha224'|'sha256'|'sha384'|'sha512') -> any().
+
+hash_init(md5) -> {md5, md5_init()};
+hash_init(md4) -> {md4, md4_init()};
+hash_init(sha) -> {sha, sha_init()};
+hash_init(sha224) -> {sha224, sha224_init()};
+hash_init(sha256) -> {sha256, sha256_init()};
+hash_init(sha384) -> {sha384, sha384_init()};
+hash_init(sha512) -> {sha512, sha512_init()}.
+
+-spec hash_update(_, iodata()) -> any().
+
+hash_update({md5,Context}, Data) -> {md5, md5_update(Context,Data)};
+hash_update({md4,Context}, Data) -> {md4, md4_update(Context,Data)};
+hash_update({sha,Context}, Data) -> {sha, sha_update(Context,Data)};
+hash_update({sha224,Context}, Data) -> {sha224, sha224_update(Context,Data)};
+hash_update({sha256,Context}, Data) -> {sha256, sha256_update(Context,Data)};
+hash_update({sha384,Context}, Data) -> {sha384, sha384_update(Context,Data)};
+hash_update({sha512,Context}, Data) -> {sha512, sha512_update(Context,Data)}.
+
+-spec hash_final(_) -> binary().
+
+hash_final({md5,Context}) -> md5_final(Context);
+hash_final({md4,Context}) -> md4_final(Context);
+hash_final({sha,Context}) -> sha_final(Context);
+hash_final({sha224,Context}) -> sha224_final(Context);
+hash_final({sha256,Context}) -> sha256_final(Context);
+hash_final({sha384,Context}) -> sha384_final(Context);
+hash_final({sha512,Context}) -> sha512_final(Context).
+
 %%
 %%  MD5
 %%
@@ -220,6 +276,40 @@ sha_update(_Context, _Data) -> ?nif_stub.
 sha_final(_Context) -> ?nif_stub.
 
 %
+%% SHA224
+%%
+-spec sha224(iodata()) -> binary().
+-spec sha224_init() -> binary().
+-spec sha224_update(binary(), iodata()) -> binary().
+-spec sha224_final(binary()) -> binary().
+
+sha224(Data) ->
+    case sha224_nif(Data) of
+	notsup -> erlang:error(notsup);
+	Bin -> Bin
+    end.
+sha224_init() ->
+    case sha224_init_nif() of
+	notsup -> erlang:error(notsup);
+	Bin -> Bin
+    end.
+sha224_update(Context, Data) ->
+    case sha224_update_nif(Context, Data) of
+	notsup -> erlang:error(notsup);
+	Bin -> Bin
+    end.
+sha224_final(Context) ->
+    case sha224_final_nif(Context) of
+	notsup -> erlang:error(notsup);
+	Bin -> Bin
+    end.
+
+sha224_nif(_Data) -> ?nif_stub.
+sha224_init_nif() -> ?nif_stub.
+sha224_update_nif(_Context, _Data) -> ?nif_stub.
+sha224_final_nif(_Context) -> ?nif_stub.
+
+%
 %% SHA256
 %%
 -spec sha256(iodata()) -> binary().
@@ -254,6 +344,40 @@ sha256_update_nif(_Context, _Data) -> ?nif_stub.
 sha256_final_nif(_Context) -> ?nif_stub.
 
 %
+%% SHA384
+%%
+-spec sha384(iodata()) -> binary().
+-spec sha384_init() -> binary().
+-spec sha384_update(binary(), iodata()) -> binary().
+-spec sha384_final(binary()) -> binary().
+
+sha384(Data) ->
+    case sha384_nif(Data) of
+	notsup -> erlang:error(notsup);
+	Bin -> Bin
+    end.
+sha384_init() ->
+    case sha384_init_nif() of
+	notsup -> erlang:error(notsup);
+	Bin -> Bin
+    end.
+sha384_update(Context, Data) ->
+    case sha384_update_nif(Context, Data) of
+	notsup -> erlang:error(notsup);
+	Bin -> Bin
+    end.
+sha384_final(Context) ->
+    case sha384_final_nif(Context) of
+	notsup -> erlang:error(notsup);
+	Bin -> Bin
+    end.
+
+sha384_nif(_Data) -> ?nif_stub.
+sha384_init_nif() -> ?nif_stub.
+sha384_update_nif(_Context, _Data) -> ?nif_stub.
+sha384_final_nif(_Context) -> ?nif_stub.
+
+%
 %% SHA512
 %%
 -spec sha512(iodata()) -> binary().
@@ -336,6 +460,70 @@ sha_mac_96(Key, Data) ->
 sha_mac_n(_Key,_Data,_MacSz) -> ?nif_stub.
 
 %%
+%%  SHA224_MAC
+%%
+-spec sha224_mac(iodata(), iodata()) -> binary().
+
+sha224_mac(Key, Data) ->
+    sha224_mac(Key, Data, 224 div 8).
+
+sha224_mac(Key, Data, Size) ->
+   case sha224_mac_nif(Key, Data, Size) of
+       notsup -> erlang:error(notsup);
+       Bin -> Bin
+   end.
+
+sha224_mac_nif(_Key,_Data,_MacSz) -> ?nif_stub.
+
+%%
+%%  SHA256_MAC
+%%
+-spec sha256_mac(iodata(), iodata()) -> binary().
+
+sha256_mac(Key, Data) ->
+    sha256_mac(Key, Data, 256 div 8).
+
+sha256_mac(Key, Data, Size) ->
+   case sha256_mac_nif(Key, Data, Size) of
+       notsup -> erlang:error(notsup);
+       Bin -> Bin
+   end.
+
+sha256_mac_nif(_Key,_Data,_MacSz) -> ?nif_stub.
+
+%%
+%%  SHA384_MAC
+%%
+-spec sha384_mac(iodata(), iodata()) -> binary().
+
+sha384_mac(Key, Data) ->
+    sha384_mac(Key, Data, 384 div 8).
+
+sha384_mac(Key, Data, Size) ->
+   case sha384_mac_nif(Key, Data, Size) of
+       notsup -> erlang:error(notsup);
+       Bin -> Bin
+   end.
+
+sha384_mac_nif(_Key,_Data,_MacSz) -> ?nif_stub.
+
+%%
+%%  SHA512_MAC
+%%
+-spec sha512_mac(iodata(), iodata()) -> binary().
+
+sha512_mac(Key, Data) ->
+    sha512_mac(Key, Data, 512 div 8).
+
+sha512_mac(Key, Data, MacSz) ->
+   case sha512_mac_nif(Key, Data, MacSz) of
+       notsup -> erlang:error(notsup);
+       Bin -> Bin
+   end.
+
+sha512_mac_nif(_Key,_Data,_MacSz) -> ?nif_stub.
+
+%%
 %% CRYPTO FUNCTIONS
 %%
 
@@ -415,12 +603,12 @@ des_ecb_crypt(_Key, _Data, _IsEncrypt) -> ?nif_stub.
 			     binary().
 
 des3_cbc_encrypt(Key1, Key2, Key3, IVec, Data) ->
-    des_ede3_cbc_encrypt(Key1, Key2, Key3, IVec, Data).
+    des_ede3_cbc_crypt(Key1, Key2, Key3, IVec, Data, true).
 des_ede3_cbc_encrypt(Key1, Key2, Key3, IVec, Data) ->
     des_ede3_cbc_crypt(Key1, Key2, Key3, IVec, Data, true).
 
 des3_cbc_decrypt(Key1, Key2, Key3, IVec, Data) ->
-    des_ede3_cbc_decrypt(Key1, Key2, Key3, IVec, Data).
+    des_ede3_cbc_crypt(Key1, Key2, Key3, IVec, Data, false).
 des_ede3_cbc_decrypt(Key1, Key2, Key3, IVec, Data) ->
     des_ede3_cbc_crypt(Key1, Key2, Key3, IVec, Data, false).
 
@@ -435,16 +623,18 @@ des_ede3_cbc_crypt(_Key1, _Key2, _Key3, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
 			     binary().
 
 des3_cfb_encrypt(Key1, Key2, Key3, IVec, Data) ->
-    des_ede3_cfb_encrypt(Key1, Key2, Key3, IVec, Data).
-des_ede3_cfb_encrypt(Key1, Key2, Key3, IVec, Data) ->
     des_ede3_cfb_crypt(Key1, Key2, Key3, IVec, Data, true).
 
 des3_cfb_decrypt(Key1, Key2, Key3, IVec, Data) ->
-    des_ede3_cfb_decrypt(Key1, Key2, Key3, IVec, Data).
-des_ede3_cfb_decrypt(Key1, Key2, Key3, IVec, Data) ->
     des_ede3_cfb_crypt(Key1, Key2, Key3, IVec, Data, false).
 
-des_ede3_cfb_crypt(_Key1, _Key2, _Key3, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
+des_ede3_cfb_crypt(Key1, Key2, Key3, IVec, Data, IsEncrypt) ->
+    case des_ede3_cfb_crypt_nif(Key1,Key2,Key3,IVec,Data,IsEncrypt) of
+	notsup -> erlang:error(notsup);
+	Bin -> Bin
+    end.
+
+des_ede3_cfb_crypt_nif(_Key1, _Key2, _Key3, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
 
 %%
 %% Blowfish
@@ -576,10 +766,10 @@ mod_exp_nif(_Base,_Exp,_Mod) -> ?nif_stub.
 %%
 %% DSS, RSA - verify
 %%
--spec dss_verify(binary(), binary(), [binary()]) -> boolean().
--spec dss_verify(dss_digest_type(), binary(), binary(), [binary()]) -> boolean().
--spec rsa_verify(binary(), binary(), [binary()]) -> boolean().
--spec rsa_verify(rsa_digest_type(), binary(), binary(), [binary()]) ->
+-spec dss_verify(data_or_digest(), binary(), [binary()]) -> boolean().
+-spec dss_verify(dss_digest_type(), data_or_digest(), binary(), [binary()]) -> boolean().
+-spec rsa_verify(data_or_digest(), binary(), [binary()]) -> boolean().
+-spec rsa_verify(rsa_digest_type(), data_or_digest(), binary(), [binary()]) ->
 			boolean().
 
 %% Key = [P,Q,G,Y]   P,Q,G=DSSParams  Y=PublicKey
@@ -590,8 +780,8 @@ dss_verify(_Type,_Data,_Signature,_Key) -> ?nif_stub.
 % Key = [E,N]  E=PublicExponent N=PublicModulus
 rsa_verify(Data,Signature,Key) ->
     rsa_verify_nif(sha, Data,Signature,Key).
-rsa_verify(Type, Data, Signature, Key) ->
-    case rsa_verify_nif(Type, Data, Signature, Key) of
+rsa_verify(Type, DataOrDigest, Signature, Key) ->
+    case rsa_verify_nif(Type, DataOrDigest, Signature, Key) of
     	notsup -> erlang:error(notsup);
 	Bool -> Bool
     end.
@@ -603,27 +793,27 @@ rsa_verify_nif(_Type, _Data, _Signature, _Key) -> ?nif_stub.
 %% DSS, RSA - sign
 %%
 %% Key = [P,Q,G,X]   P,Q,G=DSSParams  X=PrivateKey
--spec dss_sign(binary(), [binary()]) -> binary().
--spec dss_sign(dss_digest_type(), binary(), [binary()]) -> binary().
--spec rsa_sign(binary(), [binary()]) -> binary().
--spec rsa_sign(rsa_digest_type(), binary(), [binary()]) -> binary().
-
-dss_sign(Data,Key) ->
-    dss_sign(sha,Data,Key).
-dss_sign(Type, Data, Key) ->
-    case dss_sign_nif(Type,Data,Key) of
-	error -> erlang:error(badkey, [Data, Key]);
+-spec dss_sign(data_or_digest(), [binary()]) -> binary().
+-spec dss_sign(dss_digest_type(), data_or_digest(), [binary()]) -> binary().
+-spec rsa_sign(data_or_digest(), [binary()]) -> binary().
+-spec rsa_sign(rsa_digest_type(), data_or_digest(), [binary()]) -> binary().
+
+dss_sign(DataOrDigest,Key) ->
+    dss_sign(sha,DataOrDigest,Key).
+dss_sign(Type, DataOrDigest, Key) ->
+    case dss_sign_nif(Type,DataOrDigest,Key) of
+	error -> erlang:error(badkey, [DataOrDigest, Key]);
 	Sign -> Sign
     end.
 
 dss_sign_nif(_Type,_Data,_Key) -> ?nif_stub.
 
 %% Key = [E,N,D]  E=PublicExponent N=PublicModulus  D=PrivateExponent
-rsa_sign(Data,Key) ->
-    rsa_sign(sha, Data, Key).
-rsa_sign(Type, Data, Key) ->
-    case rsa_sign_nif(Type,Data,Key) of
-	error -> erlang:error(badkey, [Type,Data,Key]);
+rsa_sign(DataOrDigest,Key) ->
+    rsa_sign(sha, DataOrDigest, Key).
+rsa_sign(Type, DataOrDigest, Key) ->
+    case rsa_sign_nif(Type,DataOrDigest,Key) of
+	error -> erlang:error(badkey, [Type,DataOrDigest,Key]);
 	Sign -> Sign
     end.
 
diff --git a/lib/crypto/test/Makefile b/lib/crypto/test/Makefile
index 3150bd472d..ec8136b455 100644
--- a/lib/crypto/test/Makefile
+++ b/lib/crypto/test/Makefile
@@ -75,9 +75,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec:
 
 release_tests_spec: $(TEST_TARGET)
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) crypto.spec crypto.cover $(RELTEST_FILES) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) crypto.spec crypto.cover $(RELTEST_FILES) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
 
 release_docs_spec:
 
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 627c966dfb..8965ab6b94 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -33,9 +33,12 @@
 	 sha_update/1,
          hmac_update_sha/1,
          hmac_update_sha_n/1,
+         hmac_update_sha256/1,
+         hmac_update_sha512/1,
          hmac_update_md5/1,
          hmac_update_md5_io/1,
          hmac_update_md5_n/1,
+	 hmac_rfc4231/1,
 	 sha256/1,
 	 sha256_update/1,
 	 sha512/1,
@@ -61,7 +64,9 @@
 	 rsa_verify_test/1,
 	 dsa_verify_test/1,
 	 rsa_sign_test/1,
+	 rsa_sign_hash_test/1,
 	 dsa_sign_test/1,	 
+	 dsa_sign_hash_test/1,
 	 rsa_encrypt_decrypt/1,
 	 dh/1,
 	 exor_test/1,
@@ -82,13 +87,17 @@ groups() ->
      {rest, [],
       [md5, md5_update, md4, md4_update, md5_mac,
        md5_mac_io, sha, sha_update,
-       hmac_update_sha, hmac_update_sha_n, hmac_update_md5_n,
-       hmac_update_md5_io, hmac_update_md5,
+       sha256, sha256_update, sha512, sha512_update,
+       hmac_update_sha, hmac_update_sha_n, hmac_update_sha256, hmac_update_sha512,
+       hmac_update_md5_n, hmac_update_md5_io, hmac_update_md5,
+       hmac_rfc4231,
        des_cbc, aes_cfb, aes_cbc,
+       des_cfb, des_cfb_iter, des3_cbc, des3_cfb, rc2_cbc,
        aes_cbc_iter, aes_ctr, aes_ctr_stream, des_cbc_iter, des_ecb,
        rand_uniform_test, strong_rand_test,
        rsa_verify_test, dsa_verify_test, rsa_sign_test,
-       dsa_sign_test, rsa_encrypt_decrypt, dh, exor_test,
+       rsa_sign_hash_test, dsa_sign_test, dsa_sign_hash_test,
+       rsa_encrypt_decrypt, dh, exor_test,
        rc4_test, rc4_stream_test, mod_exp_test, blowfish_cfb64,
        smp]}].
 
@@ -185,7 +194,16 @@ info(Config) when is_list(Config) ->
 	    {skip,"Missing crypto application"};
 	{_,_} ->
 	    ?line crypto:start(),
-	    ?line crypto:info(),
+	    ?line Info = crypto:info(),
+	    ?line Exports = lists:usort([F || {F,_} <- crypto:module_info(exports)]),
+	    ?line [] = Info -- Exports,
+	    ?line NotInInfo = Exports -- Info,
+	    io:format("NotInInfo = ~p\n", [NotInInfo]),
+	    BlackList = lists:sort([des_ede3_cbc_decrypt, des_ede3_cbc_encrypt,
+				    dh_check, dh_generate_parameters,
+				    module_info, start, stop, version]),
+	    ?line BlackList = NotInInfo,
+
 	    ?line InfoLib = crypto:info_lib(),
 	    ?line [_|_] = InfoLib,
 	    F = fun([{Name,VerN,VerS}|T],Me) ->
@@ -335,6 +353,51 @@ hmac_update_sha(Config) when is_list(Config) ->
     ?line Mac = crypto:hmac_final(Ctx3),
     ?line Exp = crypto:sha_mac(Key, lists:flatten([Data, Data2])), 
     ?line m(Exp, Mac).
+
+hmac_update_sha256(doc) ->
+    ["Generate an SHA256 HMAC using hmac_init, hmac_update, and hmac_final. "
+     "Expected values for examples are generated using crypto:sha256_mac." ];
+hmac_update_sha256(suite) ->
+    [];
+hmac_update_sha256(Config) when is_list(Config) ->
+    if_098(fun() -> hmac_update_sha256_do() end).
+
+
+hmac_update_sha256_do() ->
+    ?line Key = hexstr2bin("00010203101112132021222330313233"
+                           "04050607141516172425262734353637"
+                           "08090a0b18191a1b28292a2b38393a3b"
+                           "0c0d0e0f1c1d1e1f2c2d2e2f3c3d3e3f"),
+    ?line Data = "Sampl",
+    ?line Data2 = "e #1",
+    ?line Ctx = crypto:hmac_init(sha256, Key),
+    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
+    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
+    ?line Mac = crypto:hmac_final(Ctx3),
+    ?line Exp = crypto:sha256_mac(Key, lists:flatten([Data, Data2])),
+    ?line m(Exp, Mac).
+
+hmac_update_sha512(doc) ->
+    ["Generate an SHA512 HMAC using hmac_init, hmac_update, and hmac_final. "
+     "Expected values for examples are generated using crypto:sha512_mac." ];
+hmac_update_sha512(suite) ->
+    [];
+hmac_update_sha512(Config) when is_list(Config) ->
+    if_098(fun() -> hmac_update_sha512_do() end).
+
+hmac_update_sha512_do() ->
+    ?line Key = hexstr2bin("00010203101112132021222330313233"
+                           "04050607141516172425262734353637"
+                           "08090a0b18191a1b28292a2b38393a3b"
+                           "0c0d0e0f1c1d1e1f2c2d2e2f3c3d3e3f"),
+    ?line Data = "Sampl",
+    ?line Data2 = "e #1",
+    ?line Ctx = crypto:hmac_init(sha512, Key),
+    ?line Ctx2 = crypto:hmac_update(Ctx, Data),
+    ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
+    ?line Mac = crypto:hmac_final(Ctx3),
+    ?line Exp = crypto:sha512_mac(Key, lists:flatten([Data, Data2])),
+    ?line m(Exp, Mac).
     
 hmac_update_md5(doc) ->
     ["Generate an MD5 HMAC using hmac_init, hmac_update, and hmac_final. "
@@ -354,7 +417,275 @@ hmac_update_md5(Config) when is_list(Config) ->
     ?line Mac2 = crypto:hmac_final(CtxD),
     ?line Exp2 = crypto:md5_mac(Key2, lists:flatten([Long1, Long2, Long3])), 
     ?line m(Exp2, Mac2).
+
+hmac_rfc4231(doc) ->
+    ["Generate an HMAC using crypto:shaXXX_mac and hmac_init, hmac_update, and hmac_final. "
+     "Testvectors are take from RFC4231." ];
+hmac_rfc4231(suite) ->
+    [];
+hmac_rfc4231(Config) when is_list(Config) ->
+    if_098(fun() -> hmac_rfc4231_do() end).
+
+hmac_rfc4231_do() ->
+    %% Test Case 1
+    Case1Key = binary:copy(<<16#0b>>, 20),
+    Case1Data = <<"Hi There">>,
+    Case1Exp224 = hexstr2bin("896fb1128abbdf196832107cd49df33f"
+			     "47b4b1169912ba4f53684b22"),
+    Case1Exp256 = hexstr2bin("b0344c61d8db38535ca8afceaf0bf12b"
+			     "881dc200c9833da726e9376c2e32cff7"),
+    Case1Exp384 = hexstr2bin("afd03944d84895626b0825f4ab46907f"
+			     "15f9dadbe4101ec682aa034c7cebc59c"
+			     "faea9ea9076ede7f4af152e8b2fa9cb6"),
+    Case1Exp512 = hexstr2bin("87aa7cdea5ef619d4ff0b4241a1d6cb0"
+			     "2379f4e2ce4ec2787ad0b30545e17cde"
+			     "daa833b7d6b8a702038b274eaea3f4e4"
+			     "be9d914eeb61f1702e696c203a126854"),
+
+    ?line Case1Ctx224 = crypto:hmac_init(sha224, Case1Key),
+    ?line Case1Ctx224_2 = crypto:hmac_update(Case1Ctx224, Case1Data),
+    ?line Case1Mac224_1 = crypto:hmac_final(Case1Ctx224_2),
+    ?line Case1Mac224_2 = crypto:sha224_mac(Case1Key, Case1Data),
+    ?line m(Case1Exp224, Case1Mac224_1),
+    ?line m(Case1Exp224, Case1Mac224_2),
+
+    ?line Case1Ctx256 = crypto:hmac_init(sha256, Case1Key),
+    ?line Case1Ctx256_2 = crypto:hmac_update(Case1Ctx256, Case1Data),
+    ?line Case1Mac256_1 = crypto:hmac_final(Case1Ctx256_2),
+    ?line Case1Mac256_2 = crypto:sha256_mac(Case1Key, Case1Data),
+    ?line m(Case1Exp256, Case1Mac256_1),
+    ?line m(Case1Exp256, Case1Mac256_2),
+
+    ?line Case1Ctx384 = crypto:hmac_init(sha384, Case1Key),
+    ?line Case1Ctx384_2 = crypto:hmac_update(Case1Ctx384, Case1Data),
+    ?line Case1Mac384_1 = crypto:hmac_final(Case1Ctx384_2),
+    ?line Case1Mac384_2 = crypto:sha384_mac(Case1Key, Case1Data),
+    ?line m(Case1Exp384, Case1Mac384_1),
+    ?line m(Case1Exp384, Case1Mac384_2),
+
+    ?line Case1Ctx512 = crypto:hmac_init(sha512, Case1Key),
+    ?line Case1Ctx512_2 = crypto:hmac_update(Case1Ctx512, Case1Data),
+    ?line Case1Mac512_1 = crypto:hmac_final(Case1Ctx512_2),
+    ?line Case1Mac512_2 = crypto:sha512_mac(Case1Key, Case1Data),
+    ?line m(Case1Exp512, Case1Mac512_1),
+    ?line m(Case1Exp512, Case1Mac512_2),
+
+    %% Test Case 2
+    Case2Key = <<"Jefe">>,
+    Case2Data = <<"what do ya want for nothing?">>,
+    Case2Exp224 = hexstr2bin("a30e01098bc6dbbf45690f3a7e9e6d0f"
+			     "8bbea2a39e6148008fd05e44"),
+    Case2Exp256 = hexstr2bin("5bdcc146bf60754e6a042426089575c7"
+			     "5a003f089d2739839dec58b964ec3843"),
+    Case2Exp384 = hexstr2bin("af45d2e376484031617f78d2b58a6b1b"
+			     "9c7ef464f5a01b47e42ec3736322445e"
+			     "8e2240ca5e69e2c78b3239ecfab21649"),
+    Case2Exp512 = hexstr2bin("164b7a7bfcf819e2e395fbe73b56e0a3"
+			     "87bd64222e831fd610270cd7ea250554"
+			     "9758bf75c05a994a6d034f65f8f0e6fd"
+			     "caeab1a34d4a6b4b636e070a38bce737"),
+
+    ?line Case2Ctx224 = crypto:hmac_init(sha224, Case2Key),
+    ?line Case2Ctx224_2 = crypto:hmac_update(Case2Ctx224, Case2Data),
+    ?line Case2Mac224_1 = crypto:hmac_final(Case2Ctx224_2),
+    ?line Case2Mac224_2 = crypto:sha224_mac(Case2Key, Case2Data),
+    ?line m(Case2Exp224, Case2Mac224_1),
+    ?line m(Case2Exp224, Case2Mac224_2),
+
+    ?line Case2Ctx256 = crypto:hmac_init(sha256, Case2Key),
+    ?line Case2Ctx256_2 = crypto:hmac_update(Case2Ctx256, Case2Data),
+    ?line Case2Mac256_1 = crypto:hmac_final(Case2Ctx256_2),
+    ?line Case2Mac256_2 = crypto:sha256_mac(Case2Key, Case2Data),
+    ?line m(Case2Exp256, Case2Mac256_1),
+    ?line m(Case2Exp256, Case2Mac256_2),
+
+    ?line Case2Ctx384 = crypto:hmac_init(sha384, Case2Key),
+    ?line Case2Ctx384_2 = crypto:hmac_update(Case2Ctx384, Case2Data),
+    ?line Case2Mac384_1 = crypto:hmac_final(Case2Ctx384_2),
+    ?line Case2Mac384_2 = crypto:sha384_mac(Case2Key, Case2Data),
+    ?line m(Case2Exp384, Case2Mac384_1),
+    ?line m(Case2Exp384, Case2Mac384_2),
+
+    ?line Case2Ctx512 = crypto:hmac_init(sha512, Case2Key),
+    ?line Case2Ctx512_2 = crypto:hmac_update(Case2Ctx512, Case2Data),
+    ?line Case2Mac512_1 = crypto:hmac_final(Case2Ctx512_2),
+    ?line Case2Mac512_2 = crypto:sha512_mac(Case2Key, Case2Data),
+    ?line m(Case2Exp512, Case2Mac512_1),
+    ?line m(Case2Exp512, Case2Mac512_2),
+
+    %% Test Case 3
+    Case3Key = binary:copy(<<16#aa>>, 20),
+    Case3Data = binary:copy(<<16#dd>>, 50),
+    Case3Exp224 = hexstr2bin("7fb3cb3588c6c1f6ffa9694d7d6ad264"
+			     "9365b0c1f65d69d1ec8333ea"),
+    Case3Exp256 = hexstr2bin("773ea91e36800e46854db8ebd09181a7"
+			     "2959098b3ef8c122d9635514ced565fe"),
+    Case3Exp384 = hexstr2bin("88062608d3e6ad8a0aa2ace014c8a86f"
+			     "0aa635d947ac9febe83ef4e55966144b"
+			     "2a5ab39dc13814b94e3ab6e101a34f27"),
+    Case3Exp512 = hexstr2bin("fa73b0089d56a284efb0f0756c890be9"
+			     "b1b5dbdd8ee81a3655f83e33b2279d39"
+			     "bf3e848279a722c806b485a47e67c807"
+			     "b946a337bee8942674278859e13292fb"),
+
+    ?line Case3Ctx224 = crypto:hmac_init(sha224, Case3Key),
+    ?line Case3Ctx224_2 = crypto:hmac_update(Case3Ctx224, Case3Data),
+    ?line Case3Mac224_1 = crypto:hmac_final(Case3Ctx224_2),
+    ?line Case3Mac224_2 = crypto:sha224_mac(Case3Key, Case3Data),
+    ?line m(Case3Exp224, Case3Mac224_1),
+    ?line m(Case3Exp224, Case3Mac224_2),
+
+    ?line Case3Ctx256 = crypto:hmac_init(sha256, Case3Key),
+    ?line Case3Ctx256_2 = crypto:hmac_update(Case3Ctx256, Case3Data),
+    ?line Case3Mac256_1 = crypto:hmac_final(Case3Ctx256_2),
+    ?line Case3Mac256_2 = crypto:sha256_mac(Case3Key, Case3Data),
+    ?line m(Case3Exp256, Case3Mac256_1),
+    ?line m(Case3Exp256, Case3Mac256_2),
+
+    ?line Case3Ctx384 = crypto:hmac_init(sha384, Case3Key),
+    ?line Case3Ctx384_2 = crypto:hmac_update(Case3Ctx384, Case3Data),
+    ?line Case3Mac384_1 = crypto:hmac_final(Case3Ctx384_2),
+    ?line Case3Mac384_2 = crypto:sha384_mac(Case3Key, Case3Data),
+    ?line m(Case3Exp384, Case3Mac384_1),
+    ?line m(Case3Exp384, Case3Mac384_2),
+
+    ?line Case3Ctx512 = crypto:hmac_init(sha512, Case3Key),
+    ?line Case3Ctx512_2 = crypto:hmac_update(Case3Ctx512, Case3Data),
+    ?line Case3Mac512_1 = crypto:hmac_final(Case3Ctx512_2),
+    ?line Case3Mac512_2 = crypto:sha512_mac(Case3Key, Case3Data),
+    ?line m(Case3Exp512, Case3Mac512_1),
+    ?line m(Case3Exp512, Case3Mac512_2),
+
+    %% Test Case 4
+    Case4Key = list_to_binary(lists:seq(1, 16#19)),
+    Case4Data = binary:copy(<<16#cd>>, 50),
+    Case4Exp224 = hexstr2bin("6c11506874013cac6a2abc1bb382627c"
+			     "ec6a90d86efc012de7afec5a"),
+    Case4Exp256 = hexstr2bin("82558a389a443c0ea4cc819899f2083a"
+			     "85f0faa3e578f8077a2e3ff46729665b"),
+    Case4Exp384 = hexstr2bin("3e8a69b7783c25851933ab6290af6ca7"
+			     "7a9981480850009cc5577c6e1f573b4e"
+			     "6801dd23c4a7d679ccf8a386c674cffb"),
+    Case4Exp512 = hexstr2bin("b0ba465637458c6990e5a8c5f61d4af7"
+			     "e576d97ff94b872de76f8050361ee3db"
+			     "a91ca5c11aa25eb4d679275cc5788063"
+			     "a5f19741120c4f2de2adebeb10a298dd"),
+
+    ?line Case4Ctx224 = crypto:hmac_init(sha224, Case4Key),
+    ?line Case4Ctx224_2 = crypto:hmac_update(Case4Ctx224, Case4Data),
+    ?line Case4Mac224_1 = crypto:hmac_final(Case4Ctx224_2),
+    ?line Case4Mac224_2 = crypto:sha224_mac(Case4Key, Case4Data),
+    ?line m(Case4Exp224, Case4Mac224_1),
+    ?line m(Case4Exp224, Case4Mac224_2),
+
+    ?line Case4Ctx256 = crypto:hmac_init(sha256, Case4Key),
+    ?line Case4Ctx256_2 = crypto:hmac_update(Case4Ctx256, Case4Data),
+    ?line Case4Mac256_1 = crypto:hmac_final(Case4Ctx256_2),
+    ?line Case4Mac256_2 = crypto:sha256_mac(Case4Key, Case4Data),
+    ?line m(Case4Exp256, Case4Mac256_1),
+    ?line m(Case4Exp256, Case4Mac256_2),
+
+    ?line Case4Ctx384 = crypto:hmac_init(sha384, Case4Key),
+    ?line Case4Ctx384_2 = crypto:hmac_update(Case4Ctx384, Case4Data),
+    ?line Case4Mac384_1 = crypto:hmac_final(Case4Ctx384_2),
+    ?line Case4Mac384_2 = crypto:sha384_mac(Case4Key, Case4Data),
+    ?line m(Case4Exp384, Case4Mac384_1),
+    ?line m(Case4Exp384, Case4Mac384_2),
+
+    ?line Case4Ctx512 = crypto:hmac_init(sha512, Case4Key),
+    ?line Case4Ctx512_2 = crypto:hmac_update(Case4Ctx512, Case4Data),
+    ?line Case4Mac512_1 = crypto:hmac_final(Case4Ctx512_2),
+    ?line Case4Mac512_2 = crypto:sha512_mac(Case4Key, Case4Data),
+    ?line m(Case4Exp512, Case4Mac512_1),
+    ?line m(Case4Exp512, Case4Mac512_2),
+
+    %% Test Case 6
+    Case6Key = binary:copy(<<16#aa>>, 131),
+    Case6Data = <<"Test Using Larger Than Block-Size Key - Hash Key First">>,
+    Case6Exp224 = hexstr2bin("95e9a0db962095adaebe9b2d6f0dbce2"
+			     "d499f112f2d2b7273fa6870e"),
+    Case6Exp256 = hexstr2bin("60e431591ee0b67f0d8a26aacbf5b77f"
+			     "8e0bc6213728c5140546040f0ee37f54"),
+    Case6Exp384 = hexstr2bin("4ece084485813e9088d2c63a041bc5b4"
+			     "4f9ef1012a2b588f3cd11f05033ac4c6"
+			     "0c2ef6ab4030fe8296248df163f44952"),
+    Case6Exp512 = hexstr2bin("80b24263c7c1a3ebb71493c1dd7be8b4"
+			     "9b46d1f41b4aeec1121b013783f8f352"
+			     "6b56d037e05f2598bd0fd2215d6a1e52"
+			     "95e64f73f63f0aec8b915a985d786598"),
+
+    ?line Case6Ctx224 = crypto:hmac_init(sha224, Case6Key),
+    ?line Case6Ctx224_2 = crypto:hmac_update(Case6Ctx224, Case6Data),
+    ?line Case6Mac224_1 = crypto:hmac_final(Case6Ctx224_2),
+    ?line Case6Mac224_2 = crypto:sha224_mac(Case6Key, Case6Data),
+    ?line m(Case6Exp224, Case6Mac224_1),
+    ?line m(Case6Exp224, Case6Mac224_2),
+
+    ?line Case6Ctx256 = crypto:hmac_init(sha256, Case6Key),
+    ?line Case6Ctx256_2 = crypto:hmac_update(Case6Ctx256, Case6Data),
+    ?line Case6Mac256_1 = crypto:hmac_final(Case6Ctx256_2),
+    ?line Case6Mac256_2 = crypto:sha256_mac(Case6Key, Case6Data),
+    ?line m(Case6Exp256, Case6Mac256_1),
+    ?line m(Case6Exp256, Case6Mac256_2),
+
+    ?line Case6Ctx384 = crypto:hmac_init(sha384, Case6Key),
+    ?line Case6Ctx384_2 = crypto:hmac_update(Case6Ctx384, Case6Data),
+    ?line Case6Mac384_1 = crypto:hmac_final(Case6Ctx384_2),
+    ?line Case6Mac384_2 = crypto:sha384_mac(Case6Key, Case6Data),
+    ?line m(Case6Exp384, Case6Mac384_1),
+    ?line m(Case6Exp384, Case6Mac384_2),
+
+    ?line Case6Ctx512 = crypto:hmac_init(sha512, Case6Key),
+    ?line Case6Ctx512_2 = crypto:hmac_update(Case6Ctx512, Case6Data),
+    ?line Case6Mac512_1 = crypto:hmac_final(Case6Ctx512_2),
+    ?line Case6Mac512_2 = crypto:sha512_mac(Case6Key, Case6Data),
+    ?line m(Case6Exp512, Case6Mac512_1),
+    ?line m(Case6Exp512, Case6Mac512_2),
     
+    %% Test Case 7
+    Case7Key = binary:copy(<<16#aa>>, 131),
+    Case7Data = <<"This is a test using a larger than block-size key and a larger t",
+		  "han block-size data. The key needs to be hashed before being use",
+		  "d by the HMAC algorithm.">>,
+    Case7Exp224 = hexstr2bin("3a854166ac5d9f023f54d517d0b39dbd"
+			     "946770db9c2b95c9f6f565d1"),
+    Case7Exp256 = hexstr2bin("9b09ffa71b942fcb27635fbcd5b0e944"
+			     "bfdc63644f0713938a7f51535c3a35e2"),
+    Case7Exp384 = hexstr2bin("6617178e941f020d351e2f254e8fd32c"
+			     "602420feb0b8fb9adccebb82461e99c5"
+			     "a678cc31e799176d3860e6110c46523e"),
+    Case7Exp512 = hexstr2bin("e37b6a775dc87dbaa4dfa9f96e5e3ffd"
+			     "debd71f8867289865df5a32d20cdc944"
+			     "b6022cac3c4982b10d5eeb55c3e4de15"
+			     "134676fb6de0446065c97440fa8c6a58"),
+
+    ?line Case7Ctx224 = crypto:hmac_init(sha224, Case7Key),
+    ?line Case7Ctx224_2 = crypto:hmac_update(Case7Ctx224, Case7Data),
+    ?line Case7Mac224_1 = crypto:hmac_final(Case7Ctx224_2),
+    ?line Case7Mac224_2 = crypto:sha224_mac(Case7Key, Case7Data),
+    ?line m(Case7Exp224, Case7Mac224_1),
+    ?line m(Case7Exp224, Case7Mac224_2),
+
+    ?line Case7Ctx256 = crypto:hmac_init(sha256, Case7Key),
+    ?line Case7Ctx256_2 = crypto:hmac_update(Case7Ctx256, Case7Data),
+    ?line Case7Mac256_1 = crypto:hmac_final(Case7Ctx256_2),
+    ?line Case7Mac256_2 = crypto:sha256_mac(Case7Key, Case7Data),
+    ?line m(Case7Exp256, Case7Mac256_1),
+    ?line m(Case7Exp256, Case7Mac256_2),
+
+    ?line Case7Ctx384 = crypto:hmac_init(sha384, Case7Key),
+    ?line Case7Ctx384_2 = crypto:hmac_update(Case7Ctx384, Case7Data),
+    ?line Case7Mac384_1 = crypto:hmac_final(Case7Ctx384_2),
+    ?line Case7Mac384_2 = crypto:sha384_mac(Case7Key, Case7Data),
+    ?line m(Case7Exp384, Case7Mac384_1),
+    ?line m(Case7Exp384, Case7Mac384_2),
+
+    ?line Case7Ctx512 = crypto:hmac_init(sha512, Case7Key),
+    ?line Case7Ctx512_2 = crypto:hmac_update(Case7Ctx512, Case7Data),
+    ?line Case7Mac512_1 = crypto:hmac_final(Case7Ctx512_2),
+    ?line Case7Mac512_2 = crypto:sha512_mac(Case7Key, Case7Data),
+    ?line m(Case7Exp512, Case7Mac512_1),
+    ?line m(Case7Exp512, Case7Mac512_2).
 
 hmac_update_md5_io(doc) ->
     ["Generate an MD5 HMAC using hmac_init, hmac_update, and hmac_final. "
@@ -412,6 +743,9 @@ sha256(doc) ->
 sha256(suite) ->
     [];
 sha256(Config) when is_list(Config) ->
+    if_098(fun() -> sha256_do() end).
+
+sha256_do() ->
     ?line m(crypto:sha256("abc"),
 	    hexstr2bin("BA7816BF8F01CFEA4141"
 		       "40DE5DAE2223B00361A396177A9CB410FF61F20015AD")),
@@ -428,6 +762,9 @@ sha256_update(doc) ->
 sha256_update(suite) ->
     [];
 sha256_update(Config) when is_list(Config) ->
+    if_098(fun() -> sha256_update_do() end).
+
+sha256_update_do() ->
     ?line Ctx = crypto:sha256_init(),
     ?line Ctx1 = crypto:sha256_update(Ctx, "abcdbcdecdefdefgefghfghighi"),
     ?line Ctx2 = crypto:sha256_update(Ctx1, "jhijkijkljklmklmnlmnomnopnopq"),
@@ -444,6 +781,9 @@ sha512(doc) ->
 sha512(suite) ->
     [];
 sha512(Config) when is_list(Config) ->
+    if_098(fun() -> sha512_do() end).
+
+sha512_do() ->
     ?line m(crypto:sha512("abc"),
 	    hexstr2bin("DDAF35A193617ABACC417349AE20413112E6FA4E89A97EA2"
 		       "0A9EEEE64B55D39A2192992A274FC1A836BA3C23A3FEEBBD"
@@ -462,6 +802,9 @@ sha512_update(doc) ->
 sha512_update(suite) ->
     [];
 sha512_update(Config) when is_list(Config) ->
+    if_098(fun() -> sha512_update_do() end).
+
+sha512_update_do() ->
     ?line Ctx = crypto:sha512_init(),
     ?line Ctx1 = crypto:sha512_update(Ctx, "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"),
     ?line Ctx2 = crypto:sha512_update(Ctx1, "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"),
@@ -662,6 +1005,12 @@ des3_cfb(doc) ->
 des3_cfb(suite) ->
     [];
 des3_cfb(Config) when is_list(Config) ->
+    case openssl_version() of
+	V when V < 16#90705F -> {skipped,"OpenSSL version too old"};
+	_ -> des3_cfb_do()
+    end.
+
+des3_cfb_do() ->
     ?line Key1 = hexstr2bin("0123456789abcdef"),
     ?line Key2 = hexstr2bin("fedcba9876543210"),
     ?line Key3 = hexstr2bin("0f2d4b6987a5c3e1"),
@@ -717,10 +1066,19 @@ aes_cfb(Config) when is_list(Config) ->
     ?line Key =  hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),
     ?line IVec = hexstr2bin("000102030405060708090a0b0c0d0e0f"),
     ?line Plain = hexstr2bin("6bc1bee22e409f96e93d7e117393172a"),
-    ?line Cipher = crypto:aes_cfb_128_encrypt(Key, IVec, Plain),
-    ?line m(Cipher, hexstr2bin("3b3fd92eb72dad20333449f8e83cfb4a")),
-    ?line m(Plain, 
-	    crypto:aes_cfb_128_decrypt(Key, IVec, Cipher)).
+    ?line Cipher = hexstr2bin("3b3fd92eb72dad20333449f8e83cfb4a"),
+
+    %% Try all prefixes of plain and cipher.
+    aes_cfb_do(byte_size(Plain), Plain, Cipher, Key, IVec).
+
+aes_cfb_do(N, Plain, Cipher, Key, IVec) when N >= 0 ->
+    <<P:N/binary, _/binary>> = Plain,
+    <<C:N/binary, _/binary>> = Cipher,
+    ?line C = crypto:aes_cfb_128_encrypt(Key, IVec, P),
+    ?line P = crypto:aes_cfb_128_decrypt(Key, IVec, C),
+    aes_cfb_do(N-1, Plain, Cipher, Key, IVec);
+aes_cfb_do(_, _, _, _, _) -> ok.
+
 
 %%
 %%
@@ -1207,6 +1565,33 @@ rsa_sign_test(Config) when is_list(Config) ->
   
     ok.
     
+rsa_sign_hash_test(doc) ->
+    "rsa_sign_hash testing";
+rsa_sign_hash_test(suite) ->
+    [];
+rsa_sign_hash_test(Config) when is_list(Config) ->
+    PubEx  = 65537,
+    PrivEx = 7531712708607620783801185371644749935066152052780368689827275932079815492940396744378735701395659435842364793962992309884847527234216715366607660219930945,
+    Mod = 7919488123861148172698919999061127847747888703039837999377650217570191053151807772962118671509138346758471459464133273114654252861270845708312601272799123,
+    Msg = <<"7896345786348756234 Hejsan Svejsan, erlang crypto debugger"
+	   "09812312908312378623487263487623412039812 huagasd">>,
+
+    PrivKey = [crypto:mpint(PubEx), crypto:mpint(Mod), crypto:mpint(PrivEx)],
+    PubKey  = [crypto:mpint(PubEx), crypto:mpint(Mod)],
+    MD5 = crypto:md5(sized_binary(Msg)),
+    SHA = crypto:sha(sized_binary(Msg)),
+    ?line Sig1 = crypto:rsa_sign(sha, {digest,SHA}, PrivKey),
+    ?line m(crypto:rsa_verify(sha, {digest,SHA}, sized_binary(Sig1),PubKey), true),
+
+    ?line Sig2 = crypto:rsa_sign(md5, {digest,MD5}, PrivKey),
+    ?line m(crypto:rsa_verify(md5, {digest,MD5}, sized_binary(Sig2),PubKey), true),
+
+    ?line m(Sig1 =:= Sig2, false),
+    ?line m(crypto:rsa_verify(md5, {digest,MD5}, sized_binary(Sig1),PubKey), false),
+    ?line m(crypto:rsa_verify(sha, {digest,SHA}, sized_binary(Sig2),PubKey), false),
+
+    ok.
+
 dsa_sign_test(doc) ->
     "dsa_sign testing";
 dsa_sign_test(suite) ->
@@ -1237,6 +1622,37 @@ dsa_sign_test(Config) when is_list(Config) ->
     
     ok.
 
+dsa_sign_hash_test(doc) ->
+    "dsa_sign_hash testing";
+dsa_sign_hash_test(suite) ->
+    [];
+dsa_sign_hash_test(Config) when is_list(Config) ->
+    Msg = <<"7896345786348756234 Hejsan Svejsan, erlang crypto debugger"
+	   "09812312908312378623487263487623412039812 huagasd">>,
+    SHA = crypto:sha(sized_binary(Msg)),
+
+    PubKey = _Y = 25854665488880835237281628794585130313500176551981812527054397586638455298000483144002221850980183404910190346416063318160497344811383498859129095184158800144312512447497510551471331451396405348497845813002058423110442376886564659959543650802132345311573634832461635601376738282831340827591903548964194832978,
+    PrivKey = _X = 441502407453038284293378221372000880210588566361,
+    ParamP = 109799869232806890760655301608454668257695818999841877165019612946154359052535682480084145133201304812979481136659521529774182959764860329095546511521488413513097576425638476458000255392402120367876345280670101492199681798674053929238558140260669578407351853803102625390950534052428162468100618240968893110797,
+    ParamQ = 1349199015905534965792122312016505075413456283393,
+    ParamG = 18320614775012672475365915366944922415598782131828709277168615511695849821411624805195787607930033958243224786899641459701930253094446221381818858674389863050420226114787005820357372837321561754462061849169568607689530279303056075793886577588606958623645901271866346406773590024901668622321064384483571751669,
+
+    Params = [crypto:mpint(ParamP), crypto:mpint(ParamQ), crypto:mpint(ParamG)],
+    ?line Sig1 = crypto:dss_sign(sha, {digest,SHA}, Params ++ [crypto:mpint(PrivKey)]),
+
+    ?line m(crypto:dss_verify(none, SHA, sized_binary(Sig1),
+			      Params ++ [crypto:mpint(PubKey)]), true),
+
+    ?line m(crypto:dss_verify(sized_binary(one_bit_wrong(Msg)), sized_binary(Sig1),
+			      Params ++ [crypto:mpint(PubKey)]), false),
+
+    ?line m(crypto:dss_verify(sized_binary(Msg), sized_binary(one_bit_wrong(Sig1)),
+			      Params ++ [crypto:mpint(PubKey)]), false),
+
+    %%?line Bad = crypto:dss_sign(sized_binary(Msg), [Params, crypto:mpint(PubKey)]),
+
+    ok.
+
 
 rsa_encrypt_decrypt(doc) ->
     ["Test rsa_public_encrypt and rsa_private_decrypt functions."];
@@ -1421,7 +1837,9 @@ worker_loop(N, Config) ->
     Funcs = { md5, md5_update, md5_mac, md5_mac_io, sha, sha_update, des_cbc,
 	      aes_cfb, aes_cbc, des_cbc_iter, rand_uniform_test, strong_rand_test,
 	      rsa_verify_test, exor_test, rc4_test, rc4_stream_test, mod_exp_test,
-              hmac_update_md5, hmac_update_sha, aes_ctr_stream },
+              hmac_update_md5, hmac_update_sha, hmac_update_sha256, hmac_update_sha512,
+	      hmac_rfc4231,
+	      aes_ctr_stream },
 
     F = element(random:uniform(size(Funcs)),Funcs),
     %%io:format("worker ~p calling ~p\n",[self(),F]),
@@ -1548,3 +1966,18 @@ my_dss_sign(Data,Key) ->
     ?line S3 = crypto:dss_sign(none, crypto:sha(Raw), Key),
     [S1,S2,S3].
 
+openssl_version() ->
+    case crypto:info_lib() of
+	[{<<"OpenSSL">>,LibVer,_}] when is_integer(LibVer) ->
+	    LibVer;
+	_ ->
+	    undefined
+    end.
+
+if_098(Fun) ->
+    case openssl_version() of
+	V when V < 16#908000 ->
+	    {skipped,"OpenSSL version too old"};
+	_ ->
+	    Fun()
+    end.
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 7e82e47d38..ccfb1fd66e 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 2.1
+CRYPTO_VSN = 2.2
diff --git a/lib/debugger/doc/src/Makefile b/lib/debugger/doc/src/Makefile
index 1c0bbaf9d2..ba62e41f6b 100644
--- a/lib/debugger/doc/src/Makefile
+++ b/lib/debugger/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -110,12 +110,12 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	(/bin/cp -rf  $(HTMLDIR) $(RELSYSDIR)/doc)
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	(/bin/cp -rf  $(HTMLDIR) "$(RELSYSDIR)/doc")
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 593bf715bf..66638a59f6 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/debugger/priv/Makefile b/lib/debugger/priv/Makefile
index 1036a5666b..cc19aceaf6 100644
--- a/lib/debugger/priv/Makefile
+++ b/lib/debugger/priv/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -54,8 +54,8 @@ clean:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(TOOLBAR_FILES) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(TOOLBAR_FILES) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
index be9a2d13cb..e8b350c0c7 100644
--- a/lib/debugger/src/Makefile
+++ b/lib/debugger/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -129,9 +129,9 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
diff --git a/lib/debugger/test/Makefile b/lib/debugger/test/Makefile
index 3dfbed31ff..5aa290c61b 100644
--- a/lib/debugger/test/Makefile
+++ b/lib/debugger/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1998-2011. All Rights Reserved.
+# Copyright Ericsson AB 1998-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -98,10 +98,10 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) debugger.spec debugger.cover $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) debugger.spec debugger.cover "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/debugger/test/bs_construct_SUITE.erl b/lib/debugger/test/bs_construct_SUITE.erl
index cf943677be..e0bda7eac8 100644
--- a/lib/debugger/test/bs_construct_SUITE.erl
+++ b/lib/debugger/test/bs_construct_SUITE.erl
@@ -477,7 +477,6 @@ mem_leak(0, _) -> ok;
 mem_leak(N, B) ->
     ?line big_bin(B, <<23>>),
     ?line {'EXIT',{badarg,_}} = (catch big_bin(B, bad)),
-    maybe_gc(),
     mem_leak(N-1, B).
 
 big_bin(B1, B2) ->
@@ -490,13 +489,6 @@ big_bin(B1, B2) ->
 make_bin(0, Acc) -> Acc;
 make_bin(N, Acc) -> make_bin(N-1, <<Acc/binary,Acc/binary>>).
 
-maybe_gc() ->
-    case erlang:system_info(heap_type) of
-	shared -> erlang:garbage_collect();
-	hybrid -> erlang:garbage_collect();
-	private -> ok
-    end.
-
 -define(COF(Int0),
 	?line (fun(Int) ->
 		       true = <<Int:32/float>> =:= <<(float(Int)):32/float>>,
diff --git a/lib/debugger/test/erl_eval_SUITE.erl b/lib/debugger/test/erl_eval_SUITE.erl
index a92251e1af..c675f704b4 100644
--- a/lib/debugger/test/erl_eval_SUITE.erl
+++ b/lib/debugger/test/erl_eval_SUITE.erl
@@ -216,13 +216,13 @@ guard_4(doc) ->
 guard_4(suite) ->
     [];
 guard_4(Config) when is_list(Config) ->
-    ?line check(fun() -> if {erlang,'+'}(3,a) -> true ; true -> false end end,
-                "if {erlang,'+'}(3,a) -> true ; true -> false end.",
-                false),
-    ?line check(fun() -> if {erlang,is_integer}(3) -> true ; true -> false end
-                end,
-                "if {erlang,is_integer}(3) -> true ; true -> false end.",
-                true),
+    check(fun() -> if erlang:'+'(3,a) -> true ; true -> false end end,
+	  "if erlang:'+'(3,a) -> true ; true -> false end.",
+	  false),
+    check(fun() -> if erlang:is_integer(3) -> true ; true -> false end
+	  end,
+	  "if erlang:is_integer(3) -> true ; true -> false end.",
+	  true),
     ?line check(fun() -> [X || X <- [1,2,3], erlang:is_integer(X)] end,
                 "[X || X <- [1,2,3], erlang:is_integer(X)].",
                 [1,2,3]),
@@ -230,11 +230,11 @@ guard_4(Config) when is_list(Config) ->
                 end,
                 "if is_atom(is_integer(a)) -> true ; true -> false end.",
                 true),
-    ?line check(fun() -> if {erlang,is_atom}({erlang,is_integer}(a)) -> true;
-                            true -> false end end,
-                "if {erlang,is_atom}({erlang,is_integer}(a)) -> true; "
-                "true -> false end.",
-                true),
+    check(fun() -> if erlang:is_atom(erlang:is_integer(a)) -> true;
+		      true -> false end end,
+	  "if erlang:is_atom(erlang:is_integer(a)) -> true; "
+	  "true -> false end.",
+	  true),
     ?line check(fun() -> if is_atom(3+a) -> true ; true -> false end end,
                 "if is_atom(3+a) -> true ; true -> false end.",
                 false),
@@ -1060,11 +1060,6 @@ do_funs(LFH, EFH) ->
                 concat(["begin F1 = fun(F,N) -> apply(", M,
                         ",count_down,[F, N]) end, F1(F1,1000) end."]),
 		0, ['F1'], LFH, EFH),
-    ?line check(fun() -> F1 = fun(F,N) -> {?MODULE,count_down}(F,N)
-                              end, F1(F1, 1000) end,
-                concat(["begin F1 = fun(F,N) -> {", M,
-                        ",count_down}(F, N) end, F1(F1,1000) end."]),
-		0, ['F1'], LFH, EFH),
     ?line check(fun() -> F = fun(F,N) when N > 0 -> apply(F,[F,N-1]);
                                 (_F,0) -> ok end,
                          F(F, 1000)
@@ -1096,11 +1091,6 @@ do_funs(LFH, EFH) ->
                          true = {2,3} == F(2) end,
                 "begin F = fun(X) -> A = 1+X, {X,A} end,
                        true = {2,3} == F(2) end.", true, ['F'], LFH, EFH),
-    ?line check(fun() -> F = fun(X) -> {erlang,'+'}(X,2) end,
-                         true = 3 == F(1) end,
-                "begin F = fun(X) -> {erlang,'+'}(X,2) end,"
-                "      true = 3 == F(1) end.", true, ['F'],
-               LFH, EFH),
     ?line check(fun() -> F = fun(X) -> byte_size(X) end,
                          ?MODULE:do_apply(F,<<"hej">>) end,
                 concat(["begin F = fun(X) -> size(X) end,",
diff --git a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
index c9ac6931e2..0d7883f067 100644
--- a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
+++ b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
@@ -76,12 +76,6 @@ apply_test(Fun) ->
     [a,b,d] = ?MODULE:Func(same([a,b,c,d]), same([c])),
     [d,e] = apply(Mod, Func, [same([d,e,f]), same([f])]),
     [3] = apply(?MODULE, Func, [same([3,4]),same([4])]),
-
-    %% This is obsolete, but it should work anyway.
-    HomeMadeFun = {?MODULE,my_subtract},
-    [a] = HomeMadeFun(same([a,x,c]), same([x,c])),
-    [x] = apply(HomeMadeFun, [[x,y],[y,z]]),
-
     ok.
 
 number(X) -> {number,X}.
diff --git a/lib/dialyzer/doc/src/Makefile b/lib/dialyzer/doc/src/Makefile
index 45b0ffa5ff..a827281cc5 100644
--- a/lib/dialyzer/doc/src/Makefile
+++ b/lib/dialyzer/doc/src/Makefile
@@ -100,13 +100,13 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 934cdba437..f485e4d03b 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2011</year>
+      <year>2006</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,82 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
+<section><title>Dialyzer 2.5.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fix a crash in race condition detection</p> <p>Remove
+	    old untested experimental extension</p> <p>Respect
+	    {plt_check,false} option when using dialyzer:run/1</p>
+	    <p>Fix handling of tuple set remote types appearing in
+	    tuple sets</p>
+          <p>
+	    Own Id: OTP-10464</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Dialyzer 2.5.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Correct handling of type names in contracts. Fix
+	    crash related to contract checking. Do not rewrite
+	    unchanged PLT. </p>
+          <p>
+	    Own Id: OTP-10083</p>
+        </item>
+        <item>
+          <p>
+	    Stop a forgotten server process</p>
+          <p>
+	    Dialyzer forgot to stop a server process before finishing
+	    its analysis. This is a concurrency error detected by
+	    Concuerror. Changes to fix warnings identified by running
+	    dialyzer -Wunmatched_returns. Thanks to Kostis Sagonas.</p>
+          <p>
+	    Own Id: OTP-10231</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Bug fixes and improvements of
+	    <c>dialyzer_typesig</c>. </p>
+          <p>
+	    Own Id: OTP-10082</p>
+        </item>
+        <item>
+          <p>
+	    Add parallel dialyzer support</p>
+          <p>
+	    Own Id: OTP-10103</p>
+        </item>
+        <item>
+	    <p> An alternative implementation of the solver in
+	    <c>dialyzer_typesig</c> has been introduced. It is faster
+	    than the original implementation. </p>
+          <p>
+	    Own Id: OTP-10110</p>
+        </item>
+        <item>
+	    <p> Bugs in <c>erl_types:t_inf()</c> (HiPE) and in
+	    <c>dialyzer_dataflow</c> (Dialyzer) have been fixed. </p>
+          <p>
+	    Own Id: OTP-10191</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Dialyzer 2.5.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
index 04f3b844c4..63cc1c98f1 100644
--- a/lib/dialyzer/src/Makefile
+++ b/lib/dialyzer/src/Makefile
@@ -63,7 +63,10 @@ MODULES =  \
 	dialyzer_plt \
 	dialyzer_races \
 	dialyzer_succ_typings \
+	dialyzer_timing \
 	dialyzer_typesig \
+	dialyzer_coordinator \
+	dialyzer_worker \
 	dialyzer_utils
 
 HRL_FILES= dialyzer.hrl dialyzer_gui_wx.hrl
@@ -152,10 +155,10 @@ $(EBIN)/dialyzer_utils.beam: dialyzer.hrl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
-		$(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
+		"$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
diff --git a/lib/dialyzer/src/dialyzer.erl b/lib/dialyzer/src/dialyzer.erl
index 3e3c12405f..63c51e219a 100644
--- a/lib/dialyzer/src/dialyzer.erl
+++ b/lib/dialyzer/src/dialyzer.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -162,14 +162,17 @@ run(Opts) ->
     {error, Msg} ->
       throw({dialyzer_error, Msg});
     OptsRecord ->
-      case cl_check_init(OptsRecord) of
-	{ok, ?RET_NOTHING_SUSPICIOUS} ->
-	  case dialyzer_cl:start(OptsRecord) of
-	    {?RET_DISCREPANCIES, Warnings} -> Warnings;
-	    {?RET_NOTHING_SUSPICIOUS, []}  -> []
-	  end;
-	{error, ErrorMsg1} ->
-	  throw({dialyzer_error, ErrorMsg1})
+      case OptsRecord#options.check_plt of
+        true ->
+          case cl_check_init(OptsRecord) of
+            {ok, ?RET_NOTHING_SUSPICIOUS} -> ok;
+            {error, ErrorMsg1} -> throw({dialyzer_error, ErrorMsg1})
+          end;
+        false -> ok
+      end,
+      case dialyzer_cl:start(OptsRecord) of
+        {?RET_DISCREPANCIES, Warnings} -> Warnings;
+        {?RET_NOTHING_SUSPICIOUS, []}  -> []
       end
   catch
     throw:{dialyzer_error, ErrorMsg} ->
@@ -380,8 +383,6 @@ message_to_string({pattern_match_cov, [Pat, Type]}) ->
 message_to_string({unmatched_return, [Type]}) ->
   io_lib:format("Expression produces a value of type ~s,"
 		" but this value is unmatched\n", [Type]);
-message_to_string({unused_fun, []}) ->
-  io_lib:format("Function will never be called\n", []);
 message_to_string({unused_fun, [F, A]}) ->
   io_lib:format("Function ~w/~w will never be called\n", [F, A]);
 %%----- Warnings for specs and contracts -------------------
diff --git a/lib/dialyzer/src/dialyzer.hrl b/lib/dialyzer/src/dialyzer.hrl
index 5e089d1773..105a174e31 100644
--- a/lib/dialyzer/src/dialyzer.hrl
+++ b/lib/dialyzer/src/dialyzer.hrl
@@ -2,7 +2,7 @@
 %%%
 %%% %CopyrightBegin%
 %%%
-%%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %%%
 %%% The contents of this file are subject to the Erlang Public License,
 %%% Version 1.1, (the "License"); you may not use this file except in
@@ -110,6 +110,8 @@
 -type label()	      :: non_neg_integer().
 -type rep_mode()      :: 'quiet' | 'normal' | 'verbose'.
 -type start_from()    :: 'byte_code' | 'src_code'.
+-type mfa_or_funlbl() :: label() | mfa().
+-type solver()        :: 'v1' | 'v2'.
 
 %%--------------------------------------------------------------------
 %% Record declarations used by various files
@@ -126,11 +128,15 @@
 		   use_contracts  = true           :: boolean(),
 		   race_detection = false	   :: boolean(),
 		   behaviours_chk = false          :: boolean(),
-		   callgraph_file = ""             :: file:filename()}).
+		   timing         = false          :: boolean() | 'debug',
+		   timing_server             :: dialyzer_timing:timing_server(),
+		   callgraph_file = ""             :: file:filename(),
+                   solvers                         :: [solver()]}).
 
 -record(options, {files           = []		   :: [file:filename()],
 		  files_rec       = []		   :: [file:filename()],
 		  analysis_type   = succ_typings   :: anal_type1(),
+		  timing          = false          :: boolean() | 'debug',
 		  defines         = []		   :: [dial_define()],
 		  from            = byte_code	   :: start_from(),
 		  get_warnings    = maybe          :: boolean() | 'maybe',
@@ -145,10 +151,20 @@
 		  output_format   = formatted      :: format(),
 		  filename_opt	  = basename       :: fopt(),
 		  callgraph_file  = ""             :: file:filename(),
-		  check_plt       = true           :: boolean()}).
+		  check_plt       = true           :: boolean(),
+                  solvers         = []             :: [solver()]}).
 
 -record(contract, {contracts	  = []		   :: [contract_pair()],
 		   args		  = []		   :: [erl_types:erl_type()],
 		   forms	  = []		   :: [{_, _}]}).
 
 %%--------------------------------------------------------------------
+
+-define(timing(Server, Msg, Var, Expr),
+	begin
+	    dialyzer_timing:start_stamp(Server, Msg),
+	    Var = Expr,
+	    dialyzer_timing:end_stamp(Server),
+	    Var
+	end).
+-define(timing(Server, Msg, Expr),?timing(Server, Msg, _T, Expr)).
diff --git a/lib/dialyzer/src/dialyzer_analysis_callgraph.erl b/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
index 2c4622155a..86618a4915 100644
--- a/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
+++ b/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
@@ -30,6 +30,15 @@
 
 -export([start/3]).
 
+-export([compile_init_result/0,
+	 add_to_result/4,
+	 start_compilation/2,
+	 continue_compilation/2]).
+
+-export_type([compile_init_data/0,
+	      one_file_result/0,
+	      compile_result/0]).
+
 -include("dialyzer.hrl").
 
 -record(analysis_state,
@@ -43,7 +52,9 @@
 	  parent                        :: pid(),
 	  plt                           :: dialyzer_plt:plt(),
 	  start_from     = byte_code    :: start_from(),
-	  use_contracts  = true         :: boolean()
+	  use_contracts  = true         :: boolean(),
+	  timing_server                 :: dialyzer_timing:timing_server(),
+          solvers                       :: [solver()]
 	 }).
 
 -record(server_state, {parent :: pid(), legal_warnings :: [dial_warn_tag()]}).
@@ -55,12 +66,15 @@
 -spec start(pid(), [dial_warn_tag()], #analysis{}) -> 'ok'.
 
 start(Parent, LegalWarnings, Analysis) ->
+  TimingServer = dialyzer_timing:init(Analysis#analysis.timing),
   RacesOn = ordsets:is_element(?WARN_RACE_CONDITION, LegalWarnings),
-  Analysis0 = Analysis#analysis{race_detection = RacesOn},
+  Analysis0 =
+    Analysis#analysis{race_detection = RacesOn, timing_server = TimingServer},
   Analysis1 = expand_files(Analysis0),
   Analysis2 = run_analysis(Analysis1),
   State = #server_state{parent = Parent, legal_warnings = LegalWarnings},
-  loop(State, Analysis2, none).
+  loop(State, Analysis2, none),
+  dialyzer_timing:stop(TimingServer).
 
 run_analysis(Analysis) ->
   Self = self(),
@@ -122,7 +136,9 @@ analysis_start(Parent, Analysis) ->
 			  plt = Plt,
 			  parent = Parent,
 			  start_from = Analysis#analysis.start_from,
-			  use_contracts = Analysis#analysis.use_contracts
+			  use_contracts = Analysis#analysis.use_contracts,
+			  timing_server = Analysis#analysis.timing_server,
+                          solvers = Analysis#analysis.solvers
 			 },
   Files = ordsets:from_list(Analysis#analysis.files),
   {Callgraph, NoWarn, TmpCServer0} = compile_and_store(Files, State),
@@ -146,7 +162,8 @@ analysis_start(Parent, Analysis) ->
         dialyzer_codeserver:insert_temp_exported_types(MergedExpTypes,
                                                        TmpCServer1),
       TmpCServer3 = dialyzer_utils:process_record_remote_types(TmpCServer2),
-      dialyzer_contracts:process_contract_remote_types(TmpCServer3)
+      ?timing(State#analysis_state.timing_server, "remote",
+	      dialyzer_contracts:process_contract_remote_types(TmpCServer3))
     catch
       throw:{error, _ErrorMsg} = Error -> exit(Error)
     end,
@@ -167,6 +184,7 @@ analysis_start(Parent, Analysis) ->
       false -> Callgraph
     end,
   State3 = analyze_callgraph(NewCallgraph, State2#analysis_state{plt = Plt1}),
+  dialyzer_callgraph:dispose_race_server(NewCallgraph),
   rcv_and_send_ext_types(Parent),
   NonExports = sets:subtract(sets:from_list(AllNodes), Exports),
   NonExportsList = sets:to_list(NonExports),
@@ -174,72 +192,67 @@ analysis_start(Parent, Analysis) ->
   send_codeserver_plt(Parent, CServer, State3#analysis_state.plt),
   send_analysis_done(Parent, Plt2, State3#analysis_state.doc_plt).
 
-analyze_callgraph(Callgraph, State) ->
-  Codeserver = State#analysis_state.codeserver,
-  Parent = State#analysis_state.parent,
-  DocPlt = State#analysis_state.doc_plt,
+analyze_callgraph(Callgraph, #analysis_state{codeserver = Codeserver,
+					     doc_plt = DocPlt,
+					     timing_server = TimingServer,
+					     parent = Parent,
+                                             solvers = Solvers} = State) ->
   Plt = dialyzer_plt:insert_callbacks(State#analysis_state.plt, Codeserver),
-  Callgraph1 = dialyzer_callgraph:finalize(Callgraph),
   {NewPlt, NewDocPlt} =
     case State#analysis_state.analysis_type of
       plt_build ->
-	{dialyzer_succ_typings:analyze_callgraph(Callgraph1, Plt,
-						 Codeserver, Parent),
-	 DocPlt};
+	NewPlt0 =
+	  dialyzer_succ_typings:analyze_callgraph(Callgraph, Plt, Codeserver,
+						  TimingServer, Solvers, Parent),
+	{NewPlt0, DocPlt};
       succ_typings ->
 	NoWarn = State#analysis_state.no_warn_unused,
 	{Warnings, NewPlt0, NewDocPlt0} =
-	  dialyzer_succ_typings:get_warnings(Callgraph1, Plt, DocPlt,
-					     Codeserver, NoWarn, Parent),
+	  dialyzer_succ_typings:get_warnings(Callgraph, Plt, DocPlt, Codeserver,
+					     NoWarn, TimingServer, Solvers, Parent),
 	send_warnings(State#analysis_state.parent, Warnings),
 	{NewPlt0, NewDocPlt0}
     end,
-  dialyzer_callgraph:delete(Callgraph1),
+  dialyzer_callgraph:delete(Callgraph),
   State#analysis_state{plt = NewPlt, doc_plt = NewDocPlt}.
 
 %%--------------------------------------------------------------------
 %% Build the callgraph and fill the codeserver.
 %%--------------------------------------------------------------------
 
+-record(compile_init,{
+	  callgraph                 :: dialyzer_callgraph:callgraph(),
+	  codeserver                :: dialyzer_codeserver:codeserver(),
+	  defines       = []        :: [dial_define()],
+	  include_dirs  = []        :: [file:filename()],
+	  start_from    = byte_code :: start_from(),
+	  use_contracts = true      :: boolean()
+	 }).
+
+make_compile_init(#analysis_state{codeserver = Codeserver,
+				  defines = Defs,
+				  include_dirs = Dirs,
+				  use_contracts = UseContracts,
+				  start_from = StartFrom}, Callgraph) ->
+  #compile_init{callgraph = Callgraph,
+		codeserver = Codeserver,
+		defines = [{d, Macro, Val} || {Macro, Val} <- Defs],
+		include_dirs = [{i, D} || D <- Dirs],
+		use_contracts = UseContracts,
+		start_from = StartFrom}.
+
 compile_and_store(Files, #analysis_state{codeserver = CServer,
-					 defines = Defs,
-					 include_dirs = Dirs,
-					 parent = Parent,
-					 use_contracts = UseContracts,
-					 start_from = StartFrom
-					} = State) ->
+					 timing_server = Timing,
+					 parent = Parent} = State) ->
   send_log(Parent, "Reading files and computing callgraph... "),
   {T1, _} = statistics(runtime),
-  Includes = [{i, D} || D <- Dirs],
-  Defines = [{d, Macro, Val} || {Macro, Val} <- Defs],
   Callgraph = dialyzer_callgraph:new(),
-  Fun = case StartFrom of
-	  src_code ->
-	    fun(File, {TmpCG, TmpCServer, TmpFailed, TmpNoWarn, TmpMods}) ->
-		case compile_src(File, Includes, Defines, TmpCG,
-				 TmpCServer, UseContracts) of
-		  {error, Reason} ->
-		    {TmpCG, TmpCServer, [{File, Reason}|TmpFailed], TmpNoWarn,
-                     TmpMods};
-		  {ok, NewCG, NoWarn, NewCServer, Mod} ->
-		    {NewCG, NewCServer, TmpFailed, NoWarn++TmpNoWarn,
-                     [Mod|TmpMods]}
-		end
-	    end;
-	  byte_code ->
-	    fun(File, {TmpCG, TmpCServer, TmpFailed, TmpNoWarn, TmpMods}) ->
-		case compile_byte(File, TmpCG, TmpCServer, UseContracts) of
-		  {error, Reason} ->
-		    {TmpCG, TmpCServer, [{File, Reason}|TmpFailed], TmpNoWarn,
-                     TmpMods};
-		  {ok, NewCG, NoWarn, NewCServer, Mod} ->
-		    {NewCG, NewCServer, TmpFailed, NoWarn++TmpNoWarn,
-                     [Mod|TmpMods]}
-		end
-	    end
-	end,
-  {NewCallgraph1, NewCServer, Failed, NoWarn, Modules} =
-    lists:foldl(Fun, {Callgraph, CServer, [], [], []}, Files),
+  CompileInit = make_compile_init(State, Callgraph),
+  {{Failed, NoWarn, Modules}, NextLabel} =
+    ?timing(Timing, "compile", _C1,
+	    dialyzer_coordinator:parallel_job(compile, Files,
+					      CompileInit, Timing)),
+  CServer2 = dialyzer_codeserver:set_next_core_label(NextLabel, CServer),
   case Failed =:= [] of
     true ->
       NewFiles = lists:zip(lists:reverse(Modules), Files),
@@ -255,11 +268,56 @@ compile_and_store(Files, #analysis_state{codeserver = CServer,
   {T2, _} = statistics(runtime),
   Msg1 = io_lib:format("done in ~.2f secs\nRemoving edges... ", [(T2-T1)/1000]),
   send_log(Parent, Msg1),
-  NewCallgraph2 = cleanup_callgraph(State, NewCServer, NewCallgraph1, Modules),
+  Callgraph =
+    ?timing(Timing, "clean", _C2,
+	    cleanup_callgraph(State, CServer2, Callgraph, Modules)),
   {T3, _} = statistics(runtime),
   Msg2 = io_lib:format("done in ~.2f secs\n", [(T3-T2)/1000]),
   send_log(Parent, Msg2),
-  {NewCallgraph2, sets:from_list(NoWarn), NewCServer}.
+  {Callgraph, sets:from_list(NoWarn), CServer2}.
+
+-type compile_init_data() :: #compile_init{}.
+-type error_reason()      :: string().
+-type compile_result()    :: {[{file:filename(), error_reason()}], [mfa()],
+			      [module()]}. %%opaque
+-type one_file_result()   :: {error, error_reason()} |
+			     {ok, [dialyzer_callgraph:callgraph_edge()],
+			      [mfa_or_funlbl()], [mfa()], module()}. %%opaque
+-type compile_mid_data()  :: {module(), cerl:cerl(), [mfa()],
+			      dialyzer_callgraph:callgraph(),
+			      dialyzer_codeserver:codeserver()}.
+
+-spec compile_init_result() -> compile_result().
+
+compile_init_result() -> {[], [], []}.
+
+-spec add_to_result(file:filename(), one_file_result(), compile_result(),
+		    compile_init_data()) -> compile_result().
+
+add_to_result(File, NewData, {Failed, NoWarn, Mods}, InitData) ->
+  case NewData of
+    {error, Reason} ->
+      {[{File, Reason}|Failed], NoWarn, Mods};
+    {ok, V, E, NewNoWarn, Mod} ->
+      Callgraph = InitData#compile_init.callgraph,
+      dialyzer_callgraph:add_edges(E, V, Callgraph),
+      {Failed, NewNoWarn ++ NoWarn, [Mod|Mods]}
+  end.
+
+-spec start_compilation(file:filename(), compile_init_data()) ->
+	{error, error_reason()} |{ok, integer(), compile_mid_data()}.
+
+start_compilation(File,
+		  #compile_init{callgraph = Callgraph, codeserver = Codeserver,
+				defines = Defines, include_dirs = IncludeD,
+				use_contracts = UseContracts,
+				start_from = StartFrom}) ->
+  case StartFrom of
+    src_code ->
+      compile_src(File, IncludeD, Defines, Callgraph, Codeserver, UseContracts);
+    byte_code ->
+      compile_byte(File, Callgraph, Codeserver, UseContracts)
+  end.
 
 cleanup_callgraph(#analysis_state{plt = InitPlt, parent = Parent,
 				  codeserver = CodeServer
@@ -268,13 +326,6 @@ cleanup_callgraph(#analysis_state{plt = InitPlt, parent = Parent,
   ModuleDeps = dialyzer_callgraph:module_deps(Callgraph),
   send_mod_deps(Parent, ModuleDeps),
   {Callgraph1, ExtCalls} = dialyzer_callgraph:remove_external(Callgraph),
-  RelevantAPICalls =
-    dialyzer_behaviours:get_behaviour_apis([gen_server]),
-  BehaviourAPICalls = [Call || {_From, To} = Call <- ExtCalls,
-			       lists:member(To, RelevantAPICalls)],
-  Callgraph2 =
-    dialyzer_callgraph:put_behaviour_api_calls(BehaviourAPICalls,
-					       Callgraph1),
   ExtCalls1 = [Call || Call = {_From, To} <- ExtCalls,
 		       not dialyzer_plt:contains_mfa(InitPlt, To)],
   {BadCalls1, RealExtCalls} =
@@ -297,7 +348,7 @@ cleanup_callgraph(#analysis_state{plt = InitPlt, parent = Parent,
      true ->
       send_ext_calls(Parent, lists:usort([To || {_From, To} <- RealExtCalls]))
   end,
-  Callgraph2.
+  Callgraph1.
 
 compile_src(File, Includes, Defines, Callgraph, CServer, UseContracts) ->
   DefaultIncludes = default_includes(filename:dirname(File)),
@@ -348,14 +399,18 @@ compile_common(File, AbstrCode, CompOpts, Callgraph, CServer, UseContracts) ->
 
 store_core(Mod, Core, NoWarn, Callgraph, CServer) ->
   Exp = get_exports_from_core(Core),
-  OldExpTypes = dialyzer_codeserver:get_temp_exported_types(CServer),
-  NewExpTypes = get_exported_types_from_core(Core),
-  MergedExpTypes = sets:union(NewExpTypes, OldExpTypes),
-  CServer1 = dialyzer_codeserver:insert_exports(Exp, CServer),
-  CServer2 = dialyzer_codeserver:insert_temp_exported_types(MergedExpTypes,
-                                                            CServer1),
-  {LabeledCore, CServer3} = label_core(Core, CServer2),
-  store_code_and_build_callgraph(Mod, LabeledCore, Callgraph, CServer3, NoWarn).
+  ExpTypes = get_exported_types_from_core(Core),
+  CServer = dialyzer_codeserver:insert_exports(Exp, CServer),
+  CServer = dialyzer_codeserver:insert_temp_exported_types(ExpTypes, CServer),
+  CoreTree = cerl:from_records(Core),
+  {ok, cerl_trees:size(CoreTree), {Mod, CoreTree, NoWarn, Callgraph, CServer}}.
+
+-spec continue_compilation(integer(), compile_mid_data()) -> one_file_result().
+
+continue_compilation(NextLabel, {Mod, CoreTree, NoWarn, Callgraph, CServer}) ->
+  {LabeledTree, _NewNextLabel} = cerl_trees:label(CoreTree, NextLabel),
+  LabeledCore = cerl:to_records(LabeledTree),
+  store_code_and_build_callgraph(Mod, LabeledCore, Callgraph, NoWarn, CServer).
 
 abs_get_nowarn(Abs, M) ->
   Opts = lists:flatten([C || {attribute, _, compile, C} <- Abs]),
@@ -388,18 +443,11 @@ get_exports_from_core(Core) ->
   M = cerl:atom_val(cerl:module_name(Tree)),
   [{M, F, A} || {F, A} <- Exports2].
 
-label_core(Core, CServer) ->
-  NextLabel = dialyzer_codeserver:get_next_core_label(CServer),
+store_code_and_build_callgraph(Mod, Core, Callgraph, NoWarn, CServer) ->
   CoreTree = cerl:from_records(Core),
-  {LabeledTree, NewNextLabel} = cerl_trees:label(CoreTree, NextLabel),
-  {cerl:to_records(LabeledTree),
-   dialyzer_codeserver:set_next_core_label(NewNextLabel, CServer)}.
-
-store_code_and_build_callgraph(Mod, Core, Callgraph, CServer, NoWarn) ->
-  CoreTree = cerl:from_records(Core),
-  NewCallgraph = dialyzer_callgraph:scan_core_tree(CoreTree, Callgraph),
-  CServer2 = dialyzer_codeserver:insert(Mod, CoreTree, CServer),
-  {ok, NewCallgraph, NoWarn, CServer2, Mod}.
+  {Vertices, Edges} = dialyzer_callgraph:scan_core_tree(CoreTree, Callgraph),
+  CServer = dialyzer_codeserver:insert(Mod, CoreTree, CServer),
+  {ok, Vertices, Edges, NoWarn, Mod}.
 
 %%--------------------------------------------------------------------
 %% Utilities
@@ -465,9 +513,10 @@ rcv_and_send_ext_types(Parent) ->
   Self ! {Self, done},
   case rcv_ext_types(Self, []) of
     [] -> ok;
-    ExtTypes -> Parent ! {Self, ext_types, ExtTypes}
-  end,
-  ok.
+    ExtTypes ->
+      Parent ! {Self, ext_types, ExtTypes},
+      ok
+  end.
 
 rcv_ext_types(Self, ExtTypes) ->
   receive
diff --git a/lib/dialyzer/src/dialyzer_behaviours.erl b/lib/dialyzer/src/dialyzer_behaviours.erl
index 127e906135..36aef2a37f 100644
--- a/lib/dialyzer/src/dialyzer_behaviours.erl
+++ b/lib/dialyzer/src/dialyzer_behaviours.erl
@@ -30,11 +30,9 @@
 
 -module(dialyzer_behaviours).
 
--export([check_callbacks/4, get_behaviour_apis/1,
-	 translate_behaviour_api_call/5, translatable_behaviours/1,
-	 translate_callgraph/3]).
+-export([check_callbacks/5]).
 
--export_type([behaviour/0, behaviour_api_dict/0]).
+-export_type([behaviour/0]).
 
 %%--------------------------------------------------------------------
 
@@ -47,15 +45,16 @@
 -record(state, {plt        :: dialyzer_plt:plt(),
 		codeserver :: dialyzer_codeserver:codeserver(),
 		filename   :: file:filename(),
-		behlines   :: [{behaviour(), non_neg_integer()}]}).
+		behlines   :: [{behaviour(), non_neg_integer()}],
+		records    :: dict()}).
 
 %%--------------------------------------------------------------------
 
--spec check_callbacks(module(), [{cerl:cerl(), cerl:cerl()}],
+-spec check_callbacks(module(), [{cerl:cerl(), cerl:cerl()}], dict(),
 		      dialyzer_plt:plt(),
 		      dialyzer_codeserver:codeserver()) -> [dial_warning()].
 
-check_callbacks(Module, Attrs, Plt, Codeserver) ->
+check_callbacks(Module, Attrs, Records, Plt, Codeserver) ->
   {Behaviours, BehLines} = get_behaviours(Attrs),
   case Behaviours of
     [] -> [];
@@ -64,7 +63,7 @@ check_callbacks(Module, Attrs, Plt, Codeserver) ->
       {_Var,Code} = dialyzer_codeserver:lookup_mfa_code(MFA, Codeserver),
       File = get_file(cerl:get_ann(Code)),
       State = #state{plt = Plt, filename = File, behlines = BehLines,
-		     codeserver = Codeserver},
+		     codeserver = Codeserver, records = Records},
       Warnings = get_warnings(Module, Behaviours, State),
       [add_tag_file_line(Module, W, State) || W <- Warnings]
   end.
@@ -92,24 +91,21 @@ get_warnings(Module, [Behaviour|Rest], State, Acc) ->
 
 check_behaviour(Module, Behaviour, #state{plt = Plt} = State, Acc) ->
   case dialyzer_plt:lookup_callbacks(Plt, Behaviour) of
-    [] -> [{callback_info_missing, [Behaviour]}|Acc];
-    Callbacks -> check_all_callbacks(Module, Behaviour, Callbacks, State, Acc)
+    none -> [{callback_info_missing, [Behaviour]}|Acc];
+    {value, Callbacks} ->
+      check_all_callbacks(Module, Behaviour, Callbacks, State, Acc)
   end.
 
 check_all_callbacks(_Module, _Behaviour, [], _State, Acc) ->
   Acc;
 check_all_callbacks(Module, Behaviour, [Cb|Rest],
-		    #state{plt = Plt, codeserver = Codeserver} = State, Acc) ->
+		    #state{plt = Plt, codeserver = Codeserver,
+			   records = Records} = State, Acc) ->
   {{Behaviour, Function, Arity},
    {{_BehFile, _BehLine}, Callback}} = Cb,
   CbMFA = {Module, Function, Arity},
   CbReturnType = dialyzer_contracts:get_contract_return(Callback),
   CbArgTypes = dialyzer_contracts:get_contract_args(Callback),
-  Records =
-    case dict:find(Module, dialyzer_codeserver:get_records(Codeserver)) of
-      {ok, V} -> V;
-      error -> dict:new()
-    end,
   Acc0 = Acc,
   Acc1 = 
     case dialyzer_plt:lookup(Plt, CbMFA) of
@@ -226,103 +222,3 @@ get_line([]) -> -1.
 
 get_file([{file, File}|_]) -> File;
 get_file([_|Tail]) -> get_file(Tail).
-
-%%-----------------------------------------------------------------------------
-
--spec translatable_behaviours(cerl:c_module()) -> behaviour_api_dict().
-
-translatable_behaviours(Tree) ->
-  Attrs = cerl:module_attrs(Tree),
-  {Behaviours, _BehLines} = get_behaviours(Attrs),
-  [{B, Calls} || B <- Behaviours, (Calls = behaviour_api_calls(B)) =/= []].
-
--spec get_behaviour_apis([behaviour()]) -> [mfa()].
-
-get_behaviour_apis(Behaviours) ->
-  get_behaviour_apis(Behaviours, []).
-
--spec translate_behaviour_api_call(dialyzer_callgraph:mfa_or_funlbl(),
-				   [erl_types:erl_type()],
-				   [dialyzer_races:core_vars()],
-				   module(),
-				   behaviour_api_dict()) ->
-				      {dialyzer_callgraph:mfa_or_funlbl(),
-				       [erl_types:erl_type()],
-				       [dialyzer_races:core_vars()]}
-					| 'plain_call'.
-
-translate_behaviour_api_call(_Fun, _ArgTypes, _Args, _Module, []) ->
-  plain_call;
-translate_behaviour_api_call({Module, Fun, Arity}, ArgTypes, Args,
-			     CallbackModule, BehApiInfo) ->
-  case lists:keyfind(Module, 1, BehApiInfo) of
-    false -> plain_call;
-    {Module, Calls} ->
-      case lists:keyfind({Fun, Arity}, 1, Calls) of
-	false -> plain_call;
-	{{Fun, Arity}, {CFun, CArity, COrder}} ->
-	  {{CallbackModule, CFun, CArity},
-	   [nth_or_0(N, ArgTypes, erl_types:t_any()) || N <-COrder],
-	   [nth_or_0(N, Args, bypassed) || N <-COrder]}
-      end
-  end;
-translate_behaviour_api_call(_Fun, _ArgTypes, _Args, _Module, _BehApiInfo) ->
-  plain_call.
-
--spec translate_callgraph(behaviour_api_dict(), atom(),
-			  dialyzer_callgraph:callgraph()) ->
-			     dialyzer_callgraph:callgraph().
-
-translate_callgraph([{Behaviour,_}|Behaviours], Module, Callgraph) ->
-  UsedCalls = [Call || {_From, {M, _F, _A}} = Call <-
-			 dialyzer_callgraph:get_behaviour_api_calls(Callgraph),
-		       M =:= Behaviour],
-  Calls = [{{Behaviour, API, Arity}, Callback} ||
-	    {{API, Arity}, Callback} <- behaviour_api_calls(Behaviour)],
-  DirectCalls = [{From, {Module, Fun, Arity}} ||
-		  {From, To} <- UsedCalls,{API, {Fun, Arity, _Ord}} <- Calls,
-		  To =:= API],
-  NewCallgraph = dialyzer_callgraph:add_edges(DirectCalls, Callgraph),
-  translate_callgraph(Behaviours, Module, NewCallgraph);
-translate_callgraph([], _Module, Callgraph) ->
-  Callgraph.
-
-get_behaviour_apis([], Acc) ->
-  Acc;
-get_behaviour_apis([Behaviour | Rest], Acc) ->
-  MFAs = [{Behaviour, Fun, Arity} ||
-	   {{Fun, Arity}, _} <- behaviour_api_calls(Behaviour)],
-  get_behaviour_apis(Rest, MFAs ++ Acc).
-
-%------------------------------------------------------------------------------
-
-nth_or_0(0, _List, Zero) ->
-  Zero;
-nth_or_0(N, List, _Zero) ->
-  lists:nth(N, List).
-
-%------------------------------------------------------------------------------
-
--type behaviour_api_dict()::[{behaviour(), behaviour_api_info()}].
--type behaviour_api_info()::[{original_fun(), replacement_fun()}].
--type original_fun()::{atom(), arity()}.
--type replacement_fun()::{atom(), arity(), arg_list()}.
--type arg_list()::[byte()].
-
--spec behaviour_api_calls(behaviour()) -> behaviour_api_info().
-
-behaviour_api_calls(gen_server) ->
-  [{{start_link, 3}, {init, 1, [2]}},
-   {{start_link, 4}, {init, 1, [3]}},
-   {{start, 3}, {init, 1, [2]}},
-   {{start, 4}, {init, 1, [3]}},
-   {{call, 2}, {handle_call, 3, [2, 0, 0]}},
-   {{call, 3}, {handle_call, 3, [2, 0, 0]}},
-   {{multi_call, 2}, {handle_call, 3, [2, 0, 0]}},
-   {{multi_call, 3}, {handle_call, 3, [3, 0, 0]}},
-   {{multi_call, 4}, {handle_call, 3, [3, 0, 0]}},
-   {{cast, 2}, {handle_cast, 2, [2, 0]}},
-   {{abcast, 2}, {handle_cast, 2, [2, 0]}},
-   {{abcast, 3}, {handle_cast, 2, [3, 0]}}];
-behaviour_api_calls(_Other) ->
-  [].
diff --git a/lib/dialyzer/src/dialyzer_callgraph.erl b/lib/dialyzer/src/dialyzer_callgraph.erl
index effd619bde..64e0ee88af 100644
--- a/lib/dialyzer/src/dialyzer_callgraph.erl
+++ b/lib/dialyzer/src/dialyzer_callgraph.erl
@@ -28,6 +28,7 @@
 -module(dialyzer_callgraph).
 
 -export([add_edges/2,
+	 add_edges/3,
 	 all_nodes/1,
 	 delete/1,
 	 finalize/1,
@@ -43,12 +44,15 @@
 	 %% module_postorder/1,
 	 module_postorder_from_funs/2,
 	 new/0,
+	 get_depends_on/2,
+	 get_required_by/2,
 	 in_neighbours/2,
 	 renew_race_info/4,
+	 renew_race_code/2,
+	 renew_race_public_tables/2,
 	 reset_from_funs/2,
 	 scan_core_tree/2,
 	 strip_module_deps/2,
-	 take_scc/1,
 	 remove_external/1,
 	 to_dot/2,
 	 to_ps/3]).
@@ -57,15 +61,14 @@
          get_race_code/1, get_race_detection/1, race_code_new/1,
          put_digraph/2, put_race_code/2, put_race_detection/2,
          put_named_tables/2, put_public_tables/2, put_behaviour_api_calls/2,
-	 get_behaviour_api_calls/1]).
+	 get_behaviour_api_calls/1, dispose_race_server/1, duplicate/1]).
 
--export_type([callgraph/0, mfa_or_funlbl/0]).
+-export_type([callgraph/0, mfa_or_funlbl/0, callgraph_edge/0]).
 
 -include("dialyzer.hrl").
 
 %%----------------------------------------------------------------------
 
--type mfa_or_funlbl() :: label() | mfa().
 -type scc()	      :: [mfa_or_funlbl()].
 -type mfa_calls()     :: [{mfa_or_funlbl(), mfa_or_funlbl()}].
 
@@ -78,9 +81,6 @@
 %% digraph	-  A digraph representing the callgraph. 
 %%		   Nodes are represented as MFAs or labels.
 %% esc		-  A set of all escaping functions as reported by dialyzer_dep.
-%% postorder	-  A list of strongly connected components of the callgraph
-%%		   sorted in a topological bottom-up order.
-%%		   This is produced by calling finalize/1.
 %% name_map	-  A mapping from label to MFA.
 %% rev_name_map	-  A reverse mapping of the name_map.
 %% rec_var_map	-  A dict mapping from letrec bound labels to function names.
@@ -91,29 +91,42 @@
 %%-----------------------------------------------------------------------------
 
 -record(callgraph, {digraph        = digraph:new() :: digraph(),
-                    esc	           = sets:new()    :: set(),
-                    name_map	   = dict:new()    :: dict(),
-                    rev_name_map   = dict:new()    :: dict(),
-                    postorder      = []	           :: [scc()],
-                    rec_var_map    = dict:new()    :: dict(),
-                    self_rec	   = sets:new()    :: set(),
-                    calls          = dict:new()    :: dict(),
-                    race_code      = dict:new()    :: dict(),
-                    public_tables  = []            :: [label()],
-                    named_tables   = []            :: [string()],
+		    active_digraph                 :: active_digraph(),
+                    esc	                           :: ets:tid(),
+                    name_map	                   :: ets:tid(),
+                    rev_name_map                   :: ets:tid(),
+                    rec_var_map                    :: ets:tid(),
+                    self_rec	                   :: ets:tid(),
+                    calls                          :: ets:tid(),
                     race_detection = false         :: boolean(),
-		    beh_api_calls  = []            :: [{mfa(), mfa()}]}).
+		    race_data_server = new_race_data_server() :: pid()}).
+
+-record(race_data_state, {race_code     = dict:new() :: dict(),
+			  public_tables = []         :: [label()],
+			  named_tables  = []         :: [string()],
+			  beh_api_calls = []         :: [{mfa(), mfa()}]}).
 
 %% Exported Types
 
 -type callgraph() :: #callgraph{}.
 
+-type active_digraph() :: {'d', digraph()} | {'e', ets:tid(), ets:tid()}.
+
 %%----------------------------------------------------------------------
 
 -spec new() -> callgraph().
 
 new() ->
-  #callgraph{}.
+  [ETSEsc, ETSNameMap, ETSRevNameMap, ETSRecVarMap, ETSSelfRec, ETSCalls] =
+    [ets:new(N,[public, {read_concurrency, true}]) ||
+      N <- [callgraph_esc, callgraph_name_map, callgraph_rev_name_map,
+	    callgraph_rec_var_map, callgraph_self_rec, callgraph_calls]],
+  #callgraph{esc            = ETSEsc,
+	     name_map       = ETSNameMap,
+	     rev_name_map   = ETSRevNameMap,
+	     rec_var_map    = ETSRecVarMap,
+	     self_rec       = ETSSelfRec,
+	     calls          = ETSCalls}.
 
 -spec delete(callgraph()) -> 'true'.
 
@@ -129,32 +142,32 @@ all_nodes(#callgraph{digraph = DG}) ->
 
 lookup_rec_var(Label, #callgraph{rec_var_map = RecVarMap}) 
   when is_integer(Label) ->
-  dict:find(Label, RecVarMap).
+  ets_lookup_dict(Label, RecVarMap).
 
 -spec lookup_call_site(label(), callgraph()) -> 'error' | {'ok', [_]}. % XXX: refine
 
 lookup_call_site(Label, #callgraph{calls = Calls})
   when is_integer(Label) ->
-  dict:find(Label, Calls).
+  ets_lookup_dict(Label, Calls).
 
 -spec lookup_name(label(), callgraph()) -> 'error' | {'ok', mfa()}.
 
 lookup_name(Label, #callgraph{name_map = NameMap})
   when is_integer(Label) ->
-  dict:find(Label, NameMap).
+  ets_lookup_dict(Label, NameMap).
 
 -spec lookup_label(mfa_or_funlbl(), callgraph()) -> 'error' | {'ok', integer()}.
 
 lookup_label({_,_,_} = MFA, #callgraph{rev_name_map = RevNameMap}) ->
-  dict:find(MFA, RevNameMap);
+  ets_lookup_dict(MFA, RevNameMap);
 lookup_label(Label, #callgraph{}) when is_integer(Label) ->
   {ok, Label}.
 
 -spec in_neighbours(mfa_or_funlbl(), callgraph()) -> 'none' | [mfa_or_funlbl(),...].
 
-in_neighbours(Label, #callgraph{digraph = Digraph, name_map = NameMap})
+in_neighbours(Label, #callgraph{digraph = Digraph} = CG)
   when is_integer(Label) ->
-  Name = case dict:find(Label, NameMap) of
+  Name = case lookup_name(Label, CG) of
 	   {ok, Val} -> Val;
 	   error -> Label
 	 end,
@@ -165,34 +178,27 @@ in_neighbours({_, _, _} = MFA, #callgraph{digraph = Digraph}) ->
 -spec is_self_rec(mfa_or_funlbl(), callgraph()) -> boolean().
 
 is_self_rec(MfaOrLabel, #callgraph{self_rec = SelfRecs}) ->
-  sets:is_element(MfaOrLabel, SelfRecs).
+  ets_lookup_set(MfaOrLabel, SelfRecs).
 
 -spec is_escaping(label(), callgraph()) -> boolean().
 
 is_escaping(Label, #callgraph{esc = Esc}) when is_integer(Label) ->
-  sets:is_element(Label, Esc).  
+  ets_lookup_set(Label, Esc).
 
 -type callgraph_edge() :: {mfa_or_funlbl(),mfa_or_funlbl()}.
--spec add_edges([callgraph_edge()], callgraph()) -> callgraph().
+-spec add_edges([callgraph_edge()], callgraph()) -> ok.
 
-add_edges([], CG) ->
-  CG;
-add_edges(Edges, #callgraph{digraph = Digraph} = CG) ->
-  CG#callgraph{digraph = digraph_add_edges(Edges, Digraph)}.
+add_edges([], _CG) ->
+  ok;
+add_edges(Edges, #callgraph{digraph = Digraph}) ->
+  digraph_add_edges(Edges, Digraph).
 
--spec add_edges([callgraph_edge()], [mfa_or_funlbl()], callgraph()) -> callgraph().
+-spec add_edges([callgraph_edge()], [mfa_or_funlbl()], callgraph()) -> ok.
 
 add_edges(Edges, MFAs, #callgraph{digraph = DG} = CG) ->
-  DG = digraph_confirm_vertices(MFAs, DG),
+  digraph_confirm_vertices(MFAs, DG),
   add_edges(Edges, CG).
 
--spec take_scc(callgraph()) -> 'none' | {'ok', scc(), callgraph()}.
-
-take_scc(#callgraph{postorder = [SCC|SCCs]} = CG) ->
-  {ok, SCC, CG#callgraph{postorder = SCCs}};
-take_scc(#callgraph{postorder = []}) ->
-  none.
-
 -spec remove_external(callgraph()) -> {callgraph(), [tuple()]}.
 
 remove_external(#callgraph{digraph = DG} = CG) ->
@@ -221,13 +227,25 @@ find_non_local_calls([{Label1, Label2}|Left], Set) when is_integer(Label1),
 find_non_local_calls([], Set) ->
   sets:to_list(Set).
 
--spec renew_race_info(callgraph(), dict(), [label()], [string()]) ->
-        callgraph().
+-spec get_depends_on(scc() | module(), callgraph()) -> [scc()].
+
+get_depends_on(SCC, #callgraph{active_digraph = {'e', Out, _In}}) ->
+  case ets_lookup_dict(SCC, Out) of
+    {ok, Value} -> Value;
+    error -> []
+  end;
+get_depends_on(SCC, #callgraph{active_digraph = {'d', DG}}) ->
+  digraph:out_neighbours(DG, SCC).
+
+-spec get_required_by(scc() | module(), callgraph()) -> [scc()].
 
-renew_race_info(CG, RaceCode, PublicTables, NamedTables) ->
-  CG#callgraph{race_code = RaceCode,
-               public_tables = PublicTables,
-               named_tables = NamedTables}.
+get_required_by(SCC, #callgraph{active_digraph = {'e', _Out, In}}) ->
+  case ets_lookup_dict(SCC, In) of
+    {ok, Value} -> Value;
+    error -> []
+  end;
+get_required_by(SCC, #callgraph{active_digraph = {'d', DG}}) ->
+  digraph:in_neighbours(DG, SCC).
 
 %%----------------------------------------------------------------------
 %% Handling of modules & SCCs
@@ -238,32 +256,37 @@ renew_race_info(CG, RaceCode, PublicTables, NamedTables) ->
 modules(#callgraph{digraph = DG}) ->
   ordsets:from_list([M || {M,_F,_A} <- digraph_vertices(DG)]).
 
--spec module_postorder(callgraph()) -> [[module()]].
+-spec module_postorder(callgraph()) -> {[module()], {'d', digraph()}}.
 
 module_postorder(#callgraph{digraph = DG}) ->
-  {MDG, _Nodes} = get_module_digraph_and_nodes(DG),
-  MDG1 = digraph_utils:condensation(MDG),
-  PostOrder = digraph_utils:postorder(MDG1),
-  PostOrder1 = sort_sccs_internally(PostOrder, MDG),
-  digraph:delete(MDG1),
-  digraph_delete(MDG),
-  PostOrder1.
+  Edges = lists:foldl(fun edge_fold/2, sets:new(), digraph_edges(DG)),
+  Nodes = sets:from_list([M || {M,_F,_A} <- digraph_vertices(DG)]),
+  MDG = digraph:new([acyclic]),
+  digraph_confirm_vertices(sets:to_list(Nodes), MDG),
+  Foreach = fun({M1,M2}) -> digraph:add_edge(MDG, M1, M2) end,
+  lists:foreach(Foreach, sets:to_list(Edges)),
+  {digraph_utils:topsort(MDG), {'d', MDG}}.
+
+edge_fold({{M1,_,_},{M2,_,_}}, Set) ->
+  case M1 =/= M2 of
+    true  -> sets:add_element({M1,M2},Set);
+    false -> Set
+  end;
+edge_fold(_, Set) -> Set.
 
-get_module_digraph_and_nodes(DG) ->
-  Edges = digraph_edges(DG),
-  Nodes = ordsets:from_list([M || {M,_F,_A} <- digraph_vertices(DG)]),
-  MDG = digraph:new(),
-  MDG = digraph_confirm_vertices(Nodes, MDG),
-  MDG = create_module_digraph(Edges, MDG),
-  {MDG, Nodes}.
 
 %% The module deps of a module are modules that depend on the module
 -spec module_deps(callgraph()) -> dict().
 
 module_deps(#callgraph{digraph = DG}) ->
-  {MDG, Nodes} = get_module_digraph_and_nodes(DG),
+  Edges = lists:foldl(fun edge_fold/2, sets:new(), digraph_edges(DG)),
+  Nodes = sets:from_list([M || {M,_F,_A} <- digraph_vertices(DG)]),
+  MDG = digraph:new(),
+  digraph_confirm_vertices(sets:to_list(Nodes), MDG),
+  Foreach = fun({M1,M2}) -> digraph:add_edge(MDG, M1, M2) end,
+  lists:foreach(Foreach, sets:to_list(Edges)),
   Deps = [{N, ordsets:from_list(digraph:in_neighbours(MDG, N))}
-	  || N <- Nodes],
+	  || N <- sets:to_list(Nodes)],
   digraph_delete(MDG),
   dict:from_list(Deps).
 
@@ -276,52 +299,42 @@ strip_module_deps(ModDeps, StripSet) ->
   FilterFun2 = fun(_Key, ValSet) -> ValSet =/= [] end,
   dict:filter(FilterFun2, ModDeps1).
 
-sort_sccs_internally(PO, MDG) ->
-  sort_sccs_internally(PO, MDG, []).
-
-sort_sccs_internally([SCC|SCCs], MDG, Acc) ->
-  case SCC of
-    [_, _, _ | _] ->    % length(SCC) >= 3
-      TmpDG = digraph_utils:subgraph(MDG, SCC),
-      NewSCC = digraph_utils:postorder(TmpDG),
-      digraph_delete(TmpDG),
-      sort_sccs_internally(SCCs, MDG, [NewSCC|Acc]);
-    _ ->
-      sort_sccs_internally(SCCs, MDG, [SCC|Acc])
-  end;
-sort_sccs_internally([], _MDG, Acc) ->
-  lists:reverse(Acc).
-
-create_module_digraph([{{M, _, _}, {M, _, _}}|Left], MDG) ->
-  create_module_digraph(Left, MDG);
-create_module_digraph([{{M1, _, _}, {M2, _, _}}|Left], MDG) ->
-  create_module_digraph(Left, digraph_add_edge(M1, M2, MDG));
-create_module_digraph([{_, _}|Left], MDG) ->
-  create_module_digraph(Left, MDG);
-create_module_digraph([], MDG) ->
-  MDG.
-
--spec finalize(callgraph()) -> callgraph().
+-spec finalize(callgraph()) -> {[scc()], callgraph()}.
 
 finalize(#callgraph{digraph = DG} = CG) ->
-  CG#callgraph{postorder = digraph_finalize(DG)}.
+  {ActiveDG, Postorder} = condensation(DG),
+  {Postorder, CG#callgraph{active_digraph = ActiveDG}}.
 
--spec reset_from_funs([mfa_or_funlbl()], callgraph()) -> callgraph().
+-spec reset_from_funs([mfa_or_funlbl()], callgraph()) -> {[scc()], callgraph()}.
 
-reset_from_funs(Funs, #callgraph{digraph = DG} = CG) ->
+reset_from_funs(Funs, #callgraph{digraph = DG, active_digraph = ADG} = CG) ->
+  active_digraph_delete(ADG),
   SubGraph = digraph_reaching_subgraph(Funs, DG),
-  Postorder = digraph_finalize(SubGraph),
+  {NewActiveDG, Postorder} = condensation(SubGraph),
   digraph_delete(SubGraph),
-  CG#callgraph{postorder = Postorder}.
+  {Postorder, CG#callgraph{active_digraph = NewActiveDG}}.
 
--spec module_postorder_from_funs([mfa_or_funlbl()], callgraph()) -> [[module()]].
+-spec module_postorder_from_funs([mfa_or_funlbl()], callgraph()) ->
+        {[module()], callgraph()}.
 
-module_postorder_from_funs(Funs, #callgraph{digraph = DG} = CG) ->
+module_postorder_from_funs(Funs, #callgraph{digraph = DG,
+					    active_digraph = ADG} = CG) ->
+  active_digraph_delete(ADG),
   SubGraph = digraph_reaching_subgraph(Funs, DG),
-  PO = module_postorder(CG#callgraph{digraph = SubGraph}),
+  {PO, Active} = module_postorder(CG#callgraph{digraph = SubGraph}),
   digraph_delete(SubGraph),
-  PO.
-  
+  {PO, CG#callgraph{active_digraph = Active}}.
+
+ets_lookup_dict(Key, Table) ->
+  try ets:lookup_element(Table, Key, 2) of
+      Val -> {ok, Val}
+  catch
+    _:_ -> error
+  end.
+
+ets_lookup_set(Key, Table) ->
+  ets:lookup(Table, Key) =/= [].
+
 %%----------------------------------------------------------------------
 %% Core code
 %%----------------------------------------------------------------------
@@ -330,36 +343,37 @@ module_postorder_from_funs(Funs, #callgraph{digraph = DG} = CG) ->
 %% The set of labels in the tree must be disjoint from the set of
 %% labels already occuring in the callgraph.
 
--spec scan_core_tree(cerl:c_module(), callgraph()) -> callgraph().
+-spec scan_core_tree(cerl:c_module(), callgraph()) ->
+        {[mfa_or_funlbl()], [callgraph_edge()]}.
 
-scan_core_tree(Tree, #callgraph{calls = OldCalls,
-				esc = OldEsc,
-				name_map = OldNameMap,
-				rec_var_map = OldRecVarMap, 
-				rev_name_map = OldRevNameMap,
-				self_rec = OldSelfRec} = CG) ->
+scan_core_tree(Tree, #callgraph{calls = ETSCalls,
+				esc = ETSEsc,
+				name_map = ETSNameMap,
+				rec_var_map = ETSRecVarMap,
+				rev_name_map = ETSRevNameMap,
+				self_rec = ETSSelfRec}) ->
   %% Build name map and recursion variable maps.
-  {NewNameMap, NewRevNameMap, NewRecVarMap} = 
-    build_maps(Tree, OldRecVarMap, OldNameMap, OldRevNameMap),
-  
+  build_maps(Tree, ETSRecVarMap, ETSNameMap, ETSRevNameMap),
+
   %% First find the module-local dependencies.
   {Deps0, EscapingFuns, Calls} = dialyzer_dep:analyze(Tree),
-  NewCalls = dict:merge(fun(_Key, Val, Val) -> Val end, OldCalls, Calls),
-  NewEsc = sets:union(sets:from_list(EscapingFuns), OldEsc),
+  true = ets:insert(ETSCalls, dict:to_list(Calls)),
+  true = ets:insert(ETSEsc, [{E} || E <- EscapingFuns]),
+
   LabelEdges = get_edges_from_deps(Deps0),
   
   %% Find the self recursive functions. Named functions get both the
   %% key and their name for convenience.
   SelfRecs0 = lists:foldl(fun({Key, Key}, Acc) -> 
-			      case dict:find(Key, NewNameMap) of
+			      case ets_lookup_dict(Key, ETSNameMap) of
 				error      -> [Key|Acc];
 				{ok, Name} -> [Key, Name|Acc]
 			      end;
 			     (_, Acc) -> Acc
 			  end, [], LabelEdges),
-  SelfRecs = sets:union(sets:from_list(SelfRecs0), OldSelfRec),
+  true = ets:insert(ETSSelfRec, [{S} || S <- SelfRecs0]),
   
-  NamedEdges1 = name_edges(LabelEdges, NewNameMap),
+  NamedEdges1 = name_edges(LabelEdges, ETSNameMap),
   
   %% We need to scan for inter-module calls since these are not tracked
   %% by dialyzer_dep. Note that the caller is always recorded as the
@@ -378,27 +392,25 @@ scan_core_tree(Tree, #callgraph{calls = OldCalls,
   NewNamedEdges1 =
     [E || {From, To} = E <- NamedEdges1, From =/= top, To =/= top],
   NamedEdges3 = NewNamedEdges1 ++ NewNamedEdges2,
-  CG1 = add_edges(NamedEdges3, Names3, CG),
-  CG1#callgraph{calls = NewCalls,
-                esc = NewEsc,
-                name_map = NewNameMap,
-                rec_var_map = NewRecVarMap, 
-                rev_name_map = NewRevNameMap,
-                self_rec = SelfRecs}.
-
-build_maps(Tree, RecVarMap, NameMap, RevNameMap) ->
+  {Names3, NamedEdges3}.
+
+build_maps(Tree, ETSRecVarMap, ETSNameMap, ETSRevNameMap) ->
   %% We only care about the named (top level) functions. The anonymous
   %% functions will be analysed together with their parents. 
   Defs = cerl:module_defs(Tree),
   Mod = cerl:atom_val(cerl:module_name(Tree)),
-  lists:foldl(fun({Var, Function}, {AccNameMap, AccRevNameMap, AccRecVarMap}) ->
-		  FunName = cerl:fname_id(Var),
-		  Arity = cerl:fname_arity(Var),
-		  MFA = {Mod, FunName, Arity},
-		  {dict:store(get_label(Function), MFA, AccNameMap),
-		   dict:store(MFA, get_label(Function), AccRevNameMap),
-		   dict:store(get_label(Var), MFA, AccRecVarMap)}
-	      end, {NameMap, RevNameMap, RecVarMap}, Defs).
+  Fun =
+    fun({Var, Function}) ->
+	FunName = cerl:fname_id(Var),
+	Arity = cerl:fname_arity(Var),
+	MFA = {Mod, FunName, Arity},
+	FunLabel = get_label(Function),
+	VarLabel = get_label(Var),
+	true = ets:insert(ETSNameMap, {FunLabel, MFA}),
+	true = ets:insert(ETSRevNameMap, {MFA, FunLabel}),
+	true = ets:insert(ETSRecVarMap, {VarLabel, MFA})
+    end,
+  lists:foreach(Fun, Defs).
 
 get_edges_from_deps(Deps) ->
   %% Convert the dependencies as produced by dialyzer_dep to a list of
@@ -411,22 +423,22 @@ get_edges_from_deps(Deps) ->
 		    end, [], Deps),
   lists:flatten(Edges).
 
-name_edges(Edges, NameMap) ->
+name_edges(Edges, ETSNameMap) ->
   %% If a label is present in the name map it is renamed. Otherwise
   %% keep the label as the identity.
   MapFun = fun(X) ->
-	       case dict:find(X, NameMap) of
+	       case ets_lookup_dict(X, ETSNameMap) of
 		 error -> X;
 		 {ok, MFA} -> MFA
 	       end
 	   end,
-  name_edges(Edges, MapFun, NameMap, []).
+  name_edges(Edges, MapFun, []).
 
-name_edges([{From, To}|Left], MapFun, NameMap, Acc) ->
+name_edges([{From, To}|Left], MapFun, Acc) ->
   NewFrom = MapFun(From),
   NewTo = MapFun(To),
-  name_edges(Left, MapFun, NameMap, [{NewFrom, NewTo}|Acc]);
-name_edges([], _MapFun, _NameMap, Acc) ->
+  name_edges(Left, MapFun, [{NewFrom, NewTo}|Acc]);
+name_edges([], _MapFun, Acc) ->
   Acc.
 
 scan_core_funs(Tree) ->
@@ -478,9 +490,10 @@ get_label(T) ->
 %%----------------------------------------------------------------------
 
 digraph_add_edges([{From, To}|Left], DG) ->
-  digraph_add_edges(Left, digraph_add_edge(From, To, DG));
-digraph_add_edges([], DG) ->
-  DG.
+  digraph_add_edge(From, To, DG),
+  digraph_add_edges(Left, DG);
+digraph_add_edges([], _DG) ->
+  ok.
 
 digraph_add_edge(From, To, DG) ->
   case digraph:vertex(DG, From) of
@@ -492,13 +505,13 @@ digraph_add_edge(From, To, DG) ->
     {To, _} -> ok
   end,
   digraph:add_edge(DG, {From, To}, From, To, []),
-  DG.
+  ok.
 
 digraph_confirm_vertices([MFA|Left], DG) ->
   digraph:add_vertex(DG, MFA, confirmed),
   digraph_confirm_vertices(Left, DG);
-digraph_confirm_vertices([], DG) ->
-  DG.
+digraph_confirm_vertices([], _DG) ->
+  ok.
   
 digraph_remove_external(DG) ->
   Vertices = digraph:vertices(DG),
@@ -522,6 +535,12 @@ remove_unconfirmed([], DG, Unconfirmed) ->
 digraph_delete(DG) ->
   digraph:delete(DG).
 
+active_digraph_delete({'d', DG}) ->
+  digraph:delete(DG);
+active_digraph_delete({'e', Out, In}) ->
+  ets:delete(Out),
+  ets:delete(In).
+
 digraph_edges(DG) ->
   digraph:edges(DG).
 
@@ -534,75 +553,6 @@ digraph_in_neighbours(V, DG) ->
     List -> List
   end.
 
-%% Pick all the independent nodes (leaves) from one module. Then try
-%% to stay within the module until no more independent nodes can be
-%% chosen. Then pick a new module and so on.
-%%
-%% Note that an SCC that ranges over more than one module is
-%% considered to belong to all modules to make sure that we do not
-%% lose any nodes.
-
-digraph_postorder(Digraph) ->
-  %% Remove all self-edges for SCCs.
-  Edges = [digraph:edge(Digraph, E) || E <- digraph:edges(Digraph)],
-  SelfEdges = [E || {E, V, V, _} <- Edges],
-  true = digraph:del_edges(Digraph, SelfEdges),
-  %% Determine the first module outside of the loop.
-  Leaves = digraph_leaves(Digraph),
-  case Leaves =:= [] of
-    true -> [];
-    false ->
-      {Module, Taken} = take_sccs_from_fresh_module(Leaves),
-      true = digraph:del_vertices(Digraph, Taken),
-      digraph_postorder(Digraph, Module, [Taken])
-  end.
-
-digraph_postorder(Digraph, LastModule, Acc) ->
-  Leaves = digraph_leaves(Digraph),
-  case Leaves =:= [] of
-    true -> lists:append(lists:reverse(Acc));
-    false ->
-      case [SCC || SCC <- Leaves, scc_belongs_to_module(SCC, LastModule)] of
-	[] ->
-	  {NewModule, NewTaken} = take_sccs_from_fresh_module(Leaves),
-	  true = digraph:del_vertices(Digraph, NewTaken),
-	  digraph_postorder(Digraph, NewModule, [NewTaken|Acc]);
-	NewTaken ->
-	  true = digraph:del_vertices(Digraph, NewTaken),
-	  digraph_postorder(Digraph, LastModule, [NewTaken|Acc])
-      end
-  end.
-
-digraph_leaves(Digraph) ->
-  [V || V <- digraph:vertices(Digraph), digraph:out_degree(Digraph, V) =:= 0].
-
-take_sccs_from_fresh_module(Leaves) ->
-  NewModule = find_module(hd(Leaves)),
-  {NewModule, 
-   [SCC || SCC <- Leaves, scc_belongs_to_module(SCC, NewModule)]}.
-
--spec scc_belongs_to_module(scc(), module()) -> boolean().
-
-scc_belongs_to_module([Label|Left], Module) when is_integer(Label) ->
-  scc_belongs_to_module(Left, Module);
-scc_belongs_to_module([{M, _, _}|Left], Module) ->
-  if M =:= Module -> true;
-     true -> scc_belongs_to_module(Left, Module)
-  end;
-scc_belongs_to_module([], _Module) ->
-  false.
-      
--spec find_module(scc()) -> module().
-
-find_module([{M, _, _}|_]) -> M;
-find_module([Label|Left]) when is_integer(Label) -> find_module(Left).
-
-digraph_finalize(DG) ->
-  DG1 = digraph_utils:condensation(DG),
-  Postorder = digraph_postorder(DG1),
-  digraph:delete(DG1),
-  Postorder.
-
 digraph_reaching_subgraph(Funs, DG) ->  
   Vertices = digraph_utils:reaching(Funs, DG),
   digraph_utils:subgraph(DG, Vertices).
@@ -611,20 +561,71 @@ digraph_reaching_subgraph(Funs, DG) ->
 %% Races
 %%----------------------------------------------------------------------
 
+-spec renew_race_info(callgraph(), dict(), [label()], [string()]) ->
+        callgraph().
+
+renew_race_info(#callgraph{race_data_server = RaceDataServer} = CG,
+		RaceCode, PublicTables, NamedTables) ->
+  ok = race_data_server_cast(
+	 {renew_race_info, {RaceCode, PublicTables, NamedTables}},
+	 RaceDataServer),
+  CG.
+
+renew_race_info({RaceCode, PublicTables, NamedTables},
+		#race_data_state{} = State) ->
+  State#race_data_state{race_code = RaceCode,
+			public_tables = PublicTables,
+			named_tables = NamedTables}.
+
+-spec renew_race_code(dialyzer_races:races(), callgraph()) -> callgraph().
+
+renew_race_code(Races, #callgraph{race_data_server = RaceDataServer} = CG) ->
+  Fun = dialyzer_races:get_curr_fun(Races),
+  FunArgs = dialyzer_races:get_curr_fun_args(Races),
+  Code = lists:reverse(dialyzer_races:get_race_list(Races)),
+  ok = race_data_server_cast(
+	 {renew_race_code, {Fun, FunArgs, Code}},
+	 RaceDataServer),
+  CG.
+
+renew_race_code_handler({Fun, FunArgs, Code},
+		      #race_data_state{race_code = RaceCode} = State) ->
+  State#race_data_state{race_code = dict:store(Fun, [FunArgs, Code], RaceCode)}.
+
+-spec renew_race_public_tables(label(), callgraph()) -> callgraph().
+
+renew_race_public_tables(VarLabel,
+			 #callgraph{race_data_server = RaceDataServer} = CG) ->
+  ok =
+    race_data_server_cast({renew_race_public_tables, VarLabel}, RaceDataServer),
+  CG.
+
+renew_race_public_tables_handler(VarLabel,
+				 #race_data_state{public_tables = PT}
+				 = State) ->
+  State#race_data_state{public_tables = ordsets:add_element(VarLabel, PT)}.
+
 -spec cleanup(callgraph()) -> callgraph().
 
-cleanup(#callgraph{digraph = Digraph,                                          
-                   name_map = NameMap,                                         
-                   rev_name_map = RevNameMap,                                  
-                   public_tables = PublicTables,                               
-                   named_tables = NamedTables,                                 
-                   race_code = RaceCode}) ->                                   
+cleanup(#callgraph{digraph = Digraph,
+                   name_map = NameMap,
+                   rev_name_map = RevNameMap,
+		   race_data_server = RaceDataServer}) ->
   #callgraph{digraph = Digraph,
-             name_map = NameMap,                                          
-             rev_name_map = RevNameMap,                                   
-             public_tables = PublicTables,                                
-             named_tables = NamedTables,                                  
-             race_code = RaceCode}.
+	     name_map = NameMap,
+             rev_name_map = RevNameMap,
+	     race_data_server = race_data_server_call(dup, RaceDataServer)}.
+
+-spec duplicate(callgraph()) -> callgraph().
+
+duplicate(#callgraph{race_data_server = RaceDataServer} = Callgraph) ->
+  Callgraph#callgraph{
+    race_data_server = race_data_server_call(dup, RaceDataServer)}.
+
+-spec dispose_race_server(callgraph()) -> ok.
+
+dispose_race_server(#callgraph{race_data_server = RaceDataServer}) ->
+  race_data_server_cast(stop, RaceDataServer).
 
 -spec get_digraph(callgraph()) -> digraph().
 
@@ -633,28 +634,34 @@ get_digraph(#callgraph{digraph = Digraph}) ->
 
 -spec get_named_tables(callgraph()) -> [string()].
 
-get_named_tables(#callgraph{named_tables = NamedTables}) ->
-  NamedTables.
+get_named_tables(#callgraph{race_data_server = RaceDataServer}) ->
+  race_data_server_call(get_named_tables, RaceDataServer).
 
 -spec get_public_tables(callgraph()) -> [label()].
 
-get_public_tables(#callgraph{public_tables = PT}) ->
-  PT.
+get_public_tables(#callgraph{race_data_server = RaceDataServer}) ->
+  race_data_server_call(get_public_tables, RaceDataServer).
 
 -spec get_race_code(callgraph()) -> dict().
 
-get_race_code(#callgraph{race_code = RaceCode}) ->
-  RaceCode.
+get_race_code(#callgraph{race_data_server = RaceDataServer}) ->
+  race_data_server_call(get_race_code, RaceDataServer).
 
 -spec get_race_detection(callgraph()) -> boolean().
 
 get_race_detection(#callgraph{race_detection = RD}) ->
   RD.
 
+-spec get_behaviour_api_calls(callgraph()) -> [{mfa(), mfa()}].
+
+get_behaviour_api_calls(#callgraph{race_data_server = RaceDataServer}) ->
+  race_data_server_call(get_behaviour_api_calls, RaceDataServer).
+
 -spec race_code_new(callgraph()) -> callgraph().
 
-race_code_new(Callgraph) ->
-  Callgraph#callgraph{race_code = dict:new()}.
+race_code_new(#callgraph{race_data_server = RaceDataServer} = CG) ->
+  ok = race_data_server_cast(race_code_new, RaceDataServer),
+  CG.
 
 -spec put_digraph(digraph(), callgraph()) -> callgraph().
 
@@ -663,8 +670,9 @@ put_digraph(Digraph, Callgraph) ->
 
 -spec put_race_code(dict(), callgraph()) -> callgraph().
 
-put_race_code(RaceCode, Callgraph) ->
-  Callgraph#callgraph{race_code = RaceCode}.
+put_race_code(RaceCode, #callgraph{race_data_server = RaceDataServer} = CG) ->
+  ok = race_data_server_cast({put_race_code, RaceCode}, RaceDataServer),
+  CG.
 
 -spec put_race_detection(boolean(), callgraph()) -> callgraph().
 
@@ -673,13 +681,79 @@ put_race_detection(RaceDetection, Callgraph) ->
 
 -spec put_named_tables([string()], callgraph()) -> callgraph().
 
-put_named_tables(NamedTables, Callgraph) ->
-  Callgraph#callgraph{named_tables = NamedTables}.
+put_named_tables(NamedTables,
+		 #callgraph{race_data_server = RaceDataServer} = CG) ->
+  ok = race_data_server_cast({put_named_tables, NamedTables}, RaceDataServer),
+  CG.
 
 -spec put_public_tables([label()], callgraph()) -> callgraph().
 
-put_public_tables(PublicTables, Callgraph) ->
-  Callgraph#callgraph{public_tables = PublicTables}.
+put_public_tables(PublicTables,
+		 #callgraph{race_data_server = RaceDataServer} = CG) ->
+  ok = race_data_server_cast({put_public_tables, PublicTables}, RaceDataServer),
+  CG.
+
+-spec put_behaviour_api_calls([{mfa(), mfa()}], callgraph()) -> callgraph().
+
+put_behaviour_api_calls(Calls,
+		 #callgraph{race_data_server = RaceDataServer} = CG) ->
+  ok = race_data_server_cast({put_behaviour_api_calls, Calls}, RaceDataServer),
+  CG.
+
+
+new_race_data_server() ->
+  spawn_link(fun() -> race_data_server_loop(#race_data_state{}) end).
+
+race_data_server_loop(State) ->
+  receive
+    {call, From, Ref, Query} ->
+      Reply = race_data_server_handle_call(Query, State),
+      From ! {Ref, Reply},
+      race_data_server_loop(State);
+    {cast, stop} ->
+      ok;
+    {cast, Message} ->
+      NewState = race_data_server_handle_cast(Message, State),
+      race_data_server_loop(NewState)
+  end.
+
+race_data_server_call(Query, Server) ->
+  Ref = make_ref(),
+  Server ! {call, self(), Ref, Query},
+  receive
+    {Ref, Reply} -> Reply
+  end.
+
+race_data_server_cast(Message, Server) ->
+  Server ! {cast, Message},
+  ok.
+
+race_data_server_handle_cast(race_code_new, State) ->
+  State#race_data_state{race_code = dict:new()};
+race_data_server_handle_cast({Tag, Data}, State) ->
+  case Tag of
+    renew_race_info -> renew_race_info(Data, State);
+    renew_race_code -> renew_race_code_handler(Data, State);
+    renew_race_public_tables -> renew_race_public_tables_handler(Data, State);
+    put_race_code -> State#race_data_state{race_code = Data};
+    put_public_tables -> State#race_data_state{public_tables = Data};
+    put_named_tables -> State#race_data_state{named_tables = Data};
+    put_behaviour_api_calls -> State#race_data_state{beh_api_calls = Data}
+  end.
+
+race_data_server_handle_call(Query,
+			     #race_data_state{race_code = RaceCode,
+					      public_tables = PublicTables,
+					      named_tables = NamedTables,
+					      beh_api_calls = BehApiCalls}
+			     = State) ->
+  case Query of
+    dup -> spawn_link(fun() -> race_data_server_loop(State) end);
+    get_race_code -> RaceCode;
+    get_public_tables -> PublicTables;
+    get_named_tables -> NamedTables;
+    get_behaviour_api_calls -> BehApiCalls
+  end.
 
 %%=============================================================================
 %% Utilities for 'dot'
@@ -695,7 +769,7 @@ to_dot(#callgraph{digraph = DG, esc = Esc} = CG, File) ->
 	    end
 	end,
   Escaping = [{Fun(L), {color, red}} 
-	      || L <- sets:to_list(Esc), L =/= external],
+	      || L <- [E || {E} <- ets:tab2list(Esc)], L =/= external],
   Vertices = digraph_edges(DG),
   hipe_dot:translate_list(Vertices, File, "CG", Escaping).
 
@@ -708,14 +782,41 @@ to_ps(#callgraph{} = CG, File, Args) ->
   _ = os:cmd(Command),
   ok.
 
-%-------------------------------------------------------------------------------
-
--spec put_behaviour_api_calls([{mfa(), mfa()}], callgraph()) -> callgraph().
-
-put_behaviour_api_calls(Calls, Callgraph) ->
-  Callgraph#callgraph{beh_api_calls = Calls}.
-
--spec get_behaviour_api_calls(callgraph()) -> [{mfa(), mfa()}].
-
-get_behaviour_api_calls(Callgraph) ->
-  Callgraph#callgraph.beh_api_calls.
+condensation(G) ->
+  SCs = digraph_utils:strong_components(G),
+  V2I = ets:new(condensation_v2i, []),
+  I2C = ets:new(condensation_i2c, []),
+  I2I = ets:new(condensation_i2i, [bag]),
+  CFun =
+    fun(SC, N) ->
+	lists:foreach(fun(V) -> true = ets:insert(V2I, {V,N}) end, SC),
+	true = ets:insert(I2C, {N, SC}),
+	N + 1
+    end,
+  lists:foldl(CFun, 1, SCs),
+  Fun1 =
+    fun({V1, V2}) ->
+        I1 = ets:lookup_element(V2I, V1, 2),
+        I2 = ets:lookup_element(V2I, V2, 2),
+	case I1 =:= I2 of
+	  true  -> true;
+	  false -> ets:insert(I2I, {I1, I2})
+	end
+    end,
+  lists:foreach(Fun1, digraph:edges(G)),
+  Fun3 =
+    fun({I1, I2}, {Out, In}) ->
+        SC1 = ets:lookup_element(I2C, I1, 2),
+        SC2 = ets:lookup_element(I2C, I2, 2),
+        {dict:append(SC1, SC2, Out), dict:append(SC2, SC1, In)}
+    end,
+  {OutDict, InDict} = ets:foldl(Fun3, {dict:new(), dict:new()}, I2I),
+  [OutETS, InETS] =
+    [ets:new(Name,[{read_concurrency, true}]) ||
+      Name <- [callgraph_deps_out, callgraph_deps_in]],
+  ets:insert(OutETS, dict:to_list(OutDict)),
+  ets:insert(InETS, dict:to_list(InDict)),
+  ets:delete(V2I),
+  ets:delete(I2C),
+  ets:delete(I2I),
+  {{'e', OutETS, InETS}, SCs}.
diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl
index 04a0db890f..6732d96b98 100644
--- a/lib/dialyzer/src/dialyzer_cl.erl
+++ b/lib/dialyzer/src/dialyzer_cl.erl
@@ -2,7 +2,7 @@
 %%-------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -188,6 +188,7 @@ plt_common(#options{init_plts = [InitPlt]} = Opts, RemoveFiles, AddFiles) ->
     ok ->
       case Opts#options.output_plt of
 	none -> ok;
+	InitPlt -> ok;
 	OutPlt ->
 	  {ok, Binary} = file:read_file(InitPlt),
 	  ok = file:write_file(OutPlt, Binary)
@@ -393,10 +394,12 @@ do_analysis(Files, Options, Plt, PltInfo) ->
 			   defines = Options#options.defines,
 			   include_dirs = Options#options.include_dirs,
 			   files = Files,
-			   start_from = Options#options.from, 
+			   start_from = Options#options.from,
+			   timing = Options#options.timing,
 			   plt = Plt,
 			   use_contracts = Options#options.use_contracts,
-			   callgraph_file = Options#options.callgraph_file},
+			   callgraph_file = Options#options.callgraph_file,
+                           solvers = Options#options.solvers},
   State3 = start_analysis(State2, InitAnalysis),
   {T1, _} = statistics(wall_clock),
   Return = cl_loop(State3),
diff --git a/lib/dialyzer/src/dialyzer_cl_parse.erl b/lib/dialyzer/src/dialyzer_cl_parse.erl
index ff8fc39a5e..2ea3d3af5a 100644
--- a/lib/dialyzer/src/dialyzer_cl_parse.erl
+++ b/lib/dialyzer/src/dialyzer_cl_parse.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -164,6 +164,13 @@ cl(["--src"|T]) ->
 cl(["--no_spec"|T]) ->
   put(dialyzer_options_use_contracts, false),
   cl(T);
+cl(["--statistics"|T]) ->
+  put(dialyzer_timing, true),
+  cl(T);
+cl(["--resources"|T]) ->
+  put(dialyzer_options_report_mode, quiet),
+  put(dialyzer_timing, debug),
+  cl(T);
 cl(["-v"|_]) ->
   io:format("Dialyzer version "++?VSN++"\n"),
   erlang:halt(?RET_NOTHING_SUSPICIOUS);
@@ -191,6 +198,9 @@ cl(["--gui"|T]) ->
 cl(["--wx"|T]) ->
   put(dialyzer_options_mode, {gui, wx}),
   cl(T);
+cl(["--solver",Solver|T]) -> % not documented
+  append_var(dialyzer_solvers, [list_to_atom(Solver)]),
+  cl(T);
 cl([H|_] = L) ->
   case filelib:is_file(H) orelse filelib:is_dir(H) of
     true ->
@@ -250,6 +260,8 @@ init() ->
   put(dialyzer_output_format,     formatted),
   put(dialyzer_filename_opt,      basename),
   put(dialyzer_options_check_plt, DefaultOpts#options.check_plt),
+  put(dialyzer_timing,            DefaultOpts#options.timing),
+  put(dialyzer_solvers,           DefaultOpts#options.solvers),
   ok.
 
 append_defines([Def, Val]) ->
@@ -290,6 +302,7 @@ cl_options() ->
    {filename_opt, get(dialyzer_filename_opt)},
    {analysis_type, get(dialyzer_options_analysis_type)},
    {get_warnings, get(dialyzer_options_get_warnings)},
+   {timing, get(dialyzer_timing)},
    {callgraph_file, get(dialyzer_callgraph_file)}
    |common_options()].
 
@@ -302,7 +315,8 @@ common_options() ->
    {report_mode, get(dialyzer_options_report_mode)},
    {use_spec, get(dialyzer_options_use_contracts)},
    {warnings, get(dialyzer_warnings)},
-   {check_plt, get(dialyzer_options_check_plt)}].
+   {check_plt, get(dialyzer_options_check_plt)},
+   {solvers, get(dialyzer_solvers)}].
 
 %%-----------------------------------------------------------------------
 
@@ -351,7 +365,7 @@ help_message() ->
                 [--apps applications] [-o outfile]
 		[--build_plt] [--add_to_plt] [--remove_from_plt]
 		[--check_plt] [--no_check_plt] [--plt_info] [--get_warnings]
-                [--no_native] [--fullpath]
+                [--no_native] [--fullpath] [--statistics]
 Options:
   files_or_dirs (for backwards compatibility also as: -c files_or_dirs)
       Use Dialyzer from the command line to detect defects in the
@@ -418,6 +432,9 @@ Options:
       Make Dialyzer a bit more quiet.
   --verbose
       Make Dialyzer a bit more verbose.
+  --statistics
+      Prints information about the progress of execution (analysis phases,
+      time spent in each and size of the relative input).
   --build_plt
       The analysis starts from an empty plt and creates a new one from the
       files specified with -c and -r. Only works for beam files.
diff --git a/lib/dialyzer/src/dialyzer_codeserver.erl b/lib/dialyzer/src/dialyzer_codeserver.erl
index f1e87affbd..9989118671 100644
--- a/lib/dialyzer/src/dialyzer_codeserver.erl
+++ b/lib/dialyzer/src/dialyzer_codeserver.erl
@@ -52,9 +52,7 @@
 	 new/0,
 	 set_next_core_label/2,
 	 set_temp_records/2,
-	 store_records/3,
 	 store_temp_records/3,
-	 store_contracts/3,
 	 store_temp_contracts/4]).
 
 -export_type([codeserver/0]).
@@ -63,85 +61,159 @@
 
 %%--------------------------------------------------------------------
 
--record(codeserver, {table_pid		              :: pid(),
-                     exported_types      = sets:new() :: set(), % set(mfa())
-                     temp_exported_types = sets:new() :: set(), % set(mfa())
-		     exports             = sets:new() :: set(), % set(mfa())
-		     next_core_label     = 0          :: label(),
-		     records             = dict:new() :: dict(),
-		     temp_records        = dict:new() :: dict(),
-		     contracts           = dict:new() :: dict(),
-		     callbacks           = dict:new() :: dict(),
-		     temp_contracts      = dict:new() :: dict(),
-		     temp_callbacks      = dict:new() :: dict()
+-type dict_ets() :: ets:tid().
+-type  set_ets() :: ets:tid().
+
+-record(codeserver, {next_core_label = 0 :: label(),
+		     code		 :: dict_ets(),
+                     exported_types      :: set_ets(), % set(mfa())
+		     records             :: dict_ets(),
+		     contracts           :: dict_ets(),
+		     callbacks           :: dict_ets(),
+		     exports             :: 'clean' | set_ets(), % set(mfa())
+                     temp_exported_types :: 'clean' | set_ets(), % set(mfa())
+		     temp_records        :: 'clean' | dict_ets(),
+		     temp_contracts      :: 'clean' | dict_ets(),
+		     temp_callbacks      :: 'clean' | dict_ets()
 		    }).
 
 -opaque codeserver() :: #codeserver{}.
 
 %%--------------------------------------------------------------------
 
+ets_dict_find(Key, Table) ->
+  try ets:lookup_element(Table, Key, 2) of
+      Val -> {ok, Val}
+  catch
+    _:_ -> error
+  end.
+
+ets_dict_store(Key, Element, Table) ->
+  true = ets:insert(Table, {Key, Element}),
+  Table.
+
+ets_dict_store_dict(Dict, Table) ->
+  true = ets:insert(Table, dict:to_list(Dict)).
+
+ets_dict_to_dict(Table) ->
+  Fold = fun({Key,Value}, Dict) -> dict:store(Key, Value, Dict) end,
+  ets:foldl(Fold, dict:new(), Table).
+
+ets_set_is_element(Key, Table) ->
+  case ets:lookup(Table, Key) of
+      [] -> false;
+      _ -> true
+  end.
+
+ets_set_insert_set(Set, Table) ->
+  ets_set_insert_list(sets:to_list(Set), Table).
+
+ets_set_insert_list(List, Table) ->
+  true = ets:insert(Table, [{E} || E <- List]).
+
+ets_set_to_set(Table) ->
+  Fold = fun({E}, Set) -> sets:add_element(E, Set) end,
+  ets:foldl(Fold, sets:new(), Table).
+
+ets_read_concurrent_table(Name) ->
+  ets:new(Name,[{read_concurrency, true}]).
+
+%%--------------------------------------------------------------------
+
 -spec new() -> codeserver().
 
 new() ->
-  #codeserver{table_pid = table__new()}.
+  CodeOptions = [compressed, public, {read_concurrency, true}],
+  Code = ets:new(dialyzer_codeserver_code, CodeOptions),
+  TempOptions = [public, {write_concurrency, true}],
+  [Exports, TempExportedTypes, TempRecords, TempContracts, TempCallbacks] =
+    [ets:new(Name, TempOptions) ||
+      Name <-
+	[dialyzer_codeserver_exports, dialyzer_codeserver_temp_exported_types,
+	 dialyzer_codeserver_temp_records, dialyzer_codeserver_temp_contracts,
+	 dialyzer_codeserver_temp_callbacks]],
+  #codeserver{code                = Code,
+	      exports             = Exports,
+	      temp_exported_types = TempExportedTypes,
+	      temp_records        = TempRecords,
+	      temp_contracts      = TempContracts,
+	      temp_callbacks      = TempCallbacks}.
 
 -spec delete(codeserver()) -> 'ok'.
 
-delete(#codeserver{table_pid = TablePid}) ->
-  table__delete(TablePid).
+delete(#codeserver{code = Code, exported_types = ExportedTypes,
+		   records = Records, contracts = Contracts,
+		   callbacks = Callbacks}) ->
+  lists:foreach(fun ets:delete/1,
+		[Code, ExportedTypes, Records, Contracts, Callbacks]).
 
 -spec insert(atom(), cerl:c_module(), codeserver()) -> codeserver().
 
 insert(Mod, ModCode, CS) ->
-  NewTablePid = table__insert(CS#codeserver.table_pid, Mod, ModCode),
-  CS#codeserver{table_pid = NewTablePid}.
+  Name = cerl:module_name(ModCode),
+  Exports = cerl:module_exports(ModCode),
+  Attrs = cerl:module_attrs(ModCode),
+  Defs = cerl:module_defs(ModCode),
+  As = cerl:get_ann(ModCode),
+  Funs =
+    [{{Mod, cerl:fname_id(Var), cerl:fname_arity(Var)},
+      Val} || Val = {Var, _Fun} <- Defs],
+  Keys = [Key || {Key, _Value} <- Funs],
+  ModEntry = {Mod, {Name, Exports, Attrs, Keys, As}},
+  true = ets:insert(CS#codeserver.code, [ModEntry|Funs]),
+  CS.
+
+-spec get_temp_exported_types(codeserver()) -> set().
+
+get_temp_exported_types(#codeserver{temp_exported_types = TempExpTypes}) ->
+  ets_set_to_set(TempExpTypes).
 
 -spec insert_temp_exported_types(set(), codeserver()) -> codeserver().
 
 insert_temp_exported_types(Set, CS) ->
-  CS#codeserver{temp_exported_types = Set}.
+  TempExportedTypes = CS#codeserver.temp_exported_types,
+  true = ets_set_insert_set(Set, TempExportedTypes),
+  CS.
 
 -spec insert_exports([mfa()], codeserver()) -> codeserver().
 
 insert_exports(List, #codeserver{exports = Exports} = CS) ->
-  Set = sets:from_list(List),
-  NewExports = sets:union(Exports, Set),
-  CS#codeserver{exports = NewExports}.
+  true = ets_set_insert_list(List, Exports),
+  CS.
 
 -spec is_exported(mfa(), codeserver()) -> boolean().
 
 is_exported(MFA, #codeserver{exports = Exports}) ->
-  sets:is_element(MFA, Exports).
+  ets_set_is_element(MFA, Exports).
 
 -spec get_exported_types(codeserver()) -> set(). % set(mfa())
 
 get_exported_types(#codeserver{exported_types = ExpTypes}) ->
-  ExpTypes.
-
--spec get_temp_exported_types(codeserver()) -> set().
-
-get_temp_exported_types(#codeserver{temp_exported_types = TempExpTypes}) ->
-  TempExpTypes.
+  ets_set_to_set(ExpTypes).
 
 -spec get_exports(codeserver()) -> set().  % set(mfa())
 
 get_exports(#codeserver{exports = Exports}) ->
-  Exports.
+  ets_set_to_set(Exports).
 
 -spec finalize_exported_types(set(), codeserver()) -> codeserver().
 
 finalize_exported_types(Set, CS) ->
-  CS#codeserver{exported_types = Set, temp_exported_types = sets:new()}.
+  ExportedTypes = ets_read_concurrent_table(dialyzer_codeserver_exported_types),
+  true = ets_set_insert_set(Set, ExportedTypes),
+  TempExpTypes = CS#codeserver.temp_exported_types,
+  true = ets:delete(TempExpTypes),
+  CS#codeserver{exported_types = ExportedTypes, temp_exported_types = clean}.
 
 -spec lookup_mod_code(atom(), codeserver()) -> cerl:c_module().
 
 lookup_mod_code(Mod, CS) when is_atom(Mod) ->
-  table__lookup(CS#codeserver.table_pid, Mod).
+  table__lookup(CS#codeserver.code, Mod).
 
 -spec lookup_mfa_code(mfa(), codeserver()) -> {cerl:c_var(), cerl:c_fun()}.
 
 lookup_mfa_code({_M, _F, _A} = MFA, CS) ->
-  table__lookup(CS#codeserver.table_pid, MFA).
+  table__lookup(CS#codeserver.code, MFA).
 
 -spec get_next_core_label(codeserver()) -> label().
 
@@ -153,20 +225,10 @@ get_next_core_label(#codeserver{next_core_label = NCL}) ->
 set_next_core_label(NCL, CS) ->
   CS#codeserver{next_core_label = NCL}.
 
--spec store_records(atom(), dict(), codeserver()) -> codeserver().
-
-store_records(Mod, Dict, #codeserver{records = RecDict} = CS)
-  when is_atom(Mod) ->
-  case dict:size(Dict) =:= 0 of
-    true -> CS;
-    false -> CS#codeserver{records = dict:store(Mod, Dict, RecDict)}
-  end.
-
 -spec lookup_mod_records(atom(), codeserver()) -> dict().
 
-lookup_mod_records(Mod, #codeserver{records = RecDict})
-  when is_atom(Mod) ->
-  case dict:find(Mod, RecDict) of
+lookup_mod_records(Mod, #codeserver{records = RecDict}) when is_atom(Mod) ->
+  case ets_dict_find(Mod, RecDict) of
     error -> dict:new();
     {ok, Dict} -> Dict
   end.
@@ -174,7 +236,7 @@ lookup_mod_records(Mod, #codeserver{records = RecDict})
 -spec get_records(codeserver()) -> dict().
 
 get_records(#codeserver{records = RecDict}) ->
-  RecDict.
+  ets_dict_to_dict(RecDict).
 
 -spec store_temp_records(atom(), dict(), codeserver()) -> codeserver().
 
@@ -182,59 +244,58 @@ store_temp_records(Mod, Dict, #codeserver{temp_records = TempRecDict} = CS)
   when is_atom(Mod) ->
   case dict:size(Dict) =:= 0 of
     true -> CS;
-    false -> CS#codeserver{temp_records = dict:store(Mod, Dict, TempRecDict)}
+    false -> CS#codeserver{temp_records = ets_dict_store(Mod, Dict, TempRecDict)}
   end.
 
 -spec get_temp_records(codeserver()) -> dict().
 
 get_temp_records(#codeserver{temp_records = TempRecDict}) ->
-  TempRecDict.
+  ets_dict_to_dict(TempRecDict).
 
 -spec set_temp_records(dict(), codeserver()) -> codeserver().
 
 set_temp_records(Dict, CS) ->
-  CS#codeserver{temp_records = Dict}.
+  true = ets:delete(CS#codeserver.temp_records),
+  TempRecords = ets:new(dialyzer_codeserver_temp_records,[]),
+  true = ets_dict_store_dict(Dict, TempRecords),
+  CS#codeserver{temp_records = TempRecords}.
 
 -spec finalize_records(dict(), codeserver()) -> codeserver().
 
 finalize_records(Dict, CS) ->
-  CS#codeserver{records = Dict, temp_records = dict:new()}.
-
--spec store_contracts(atom(), dict(), codeserver()) -> codeserver().
-
-store_contracts(Mod, Dict, #codeserver{contracts = C} = CS) when is_atom(Mod) ->
-  case dict:size(Dict) =:= 0 of
-    true -> CS;
-    false -> CS#codeserver{contracts = dict:store(Mod, Dict, C)}
-  end.
+  true = ets:delete(CS#codeserver.temp_records),
+  Records = ets_read_concurrent_table(dialyzer_codeserver_records),
+  true = ets_dict_store_dict(Dict, Records),
+  CS#codeserver{records = Records, temp_records = clean}.
 
 -spec lookup_mod_contracts(atom(), codeserver()) -> dict().
 
 lookup_mod_contracts(Mod, #codeserver{contracts = ContDict})
   when is_atom(Mod) ->
-  case dict:find(Mod, ContDict) of
+  case ets_dict_find(Mod, ContDict) of
     error -> dict:new();
-    {ok, Dict} -> Dict
+    {ok, Keys} ->
+      dict:from_list([get_contract_pair(Key, ContDict)|| Key <- Keys])
   end.
 
+get_contract_pair(Key, ContDict) ->
+  {Key, ets:lookup_element(ContDict, Key, 2)}.
+
 -spec lookup_mfa_contract(mfa(), codeserver()) ->
          'error' | {'ok', dialyzer_contracts:file_contract()}.
 
-lookup_mfa_contract({M,_F,_A} = MFA, #codeserver{contracts = ContDict}) ->
-  case dict:find(M, ContDict) of
-    error -> error;
-    {ok, Dict} -> dict:find(MFA, Dict)
-  end.
+lookup_mfa_contract(MFA, #codeserver{contracts = ContDict}) ->
+  ets_dict_find(MFA, ContDict).
 
 -spec get_contracts(codeserver()) -> dict().
 
 get_contracts(#codeserver{contracts = ContDict}) ->
-  ContDict.
+  ets_dict_to_dict(ContDict).
 
--spec get_callbacks(codeserver()) -> dict().
+-spec get_callbacks(codeserver()) -> list().
 
 get_callbacks(#codeserver{callbacks = CallbDict}) ->
-  CallbDict.
+  ets:tab2list(CallbDict).
 
 -spec store_temp_contracts(atom(), dict(), dict(), codeserver()) ->
 	 codeserver().
@@ -246,91 +307,44 @@ store_temp_contracts(Mod, SpecDict, CallbackDict,
   CS1 =
     case dict:size(SpecDict) =:= 0 of
       true -> CS;
-      false -> CS#codeserver{temp_contracts = dict:store(Mod, SpecDict, Cn)}
+      false ->
+	CS#codeserver{temp_contracts = ets_dict_store(Mod, SpecDict, Cn)}
     end,
   case dict:size(CallbackDict) =:= 0 of
     true -> CS1;
-    false -> CS1#codeserver{temp_callbacks = dict:store(Mod, CallbackDict, Cb)}
+    false ->
+      CS1#codeserver{temp_callbacks = ets_dict_store(Mod, CallbackDict, Cb)}
   end.
 
 -spec get_temp_contracts(codeserver()) -> {dict(), dict()}.
 
 get_temp_contracts(#codeserver{temp_contracts = TempContDict,
 			       temp_callbacks = TempCallDict}) ->
-  {TempContDict, TempCallDict}.
+  {ets_dict_to_dict(TempContDict), ets_dict_to_dict(TempCallDict)}.
 
 -spec finalize_contracts(dict(), dict(), codeserver()) -> codeserver().
 
-finalize_contracts(CnDict, CbDict, CS)  ->
-  CS#codeserver{contracts = CnDict,
-		callbacks = CbDict,
-		temp_contracts = dict:new(),
-		temp_callbacks = dict:new()
-	       }.
-
-table__new() ->
-  spawn_link(fun() -> table__loop(none, dict:new()) end).
-
-table__delete(TablePid) ->
-  TablePid ! stop,
-  ok.
-
-table__lookup(TablePid, Key) ->
-  TablePid ! {self(), lookup, Key},
-  receive
-    {TablePid, Key, Ans} -> Ans
-  end.
-
-table__insert(TablePid, Key, Val) ->
-  TablePid ! {insert, [{Key, term_to_binary(Val, [compressed])}]},
-  TablePid.
-
-table__loop(Cached, Map) ->
-  receive
-    stop -> ok;
-    {Pid, lookup, {M, F, A} = MFA} ->
-      {NewCached, Ans} =
-	case Cached of
-	  {M, Tree} ->
-	    Val = find_fun(F, A, Tree),
-	    {Cached, Val};
-	  _ ->
-	    Tree = fetch_and_expand(M, Map),
-	    Val = find_fun(F, A, Tree),
-	    {{M, Tree}, Val}
-	end,
-      Pid ! {self(), MFA, Ans},
-      table__loop(NewCached, Map);
-    {Pid, lookup, Mod} when is_atom(Mod) ->
-      Ans = case Cached of
-	      {Mod, Tree} -> Tree;
-	      _ -> fetch_and_expand(Mod, Map)
-	    end,
-      Pid ! {self(), Mod, Ans},
-      table__loop({Mod, Ans}, Map);
-    {insert, List} ->
-      NewMap = lists:foldl(fun({Key, Val}, AccMap) ->
-			       dict:store(Key, Val, AccMap)
-			   end, Map, List),
-      table__loop(Cached, NewMap)
-  end.
-
-fetch_and_expand(Mod, Map) ->
-  try
-    Bin = dict:fetch(Mod, Map),
-    binary_to_term(Bin)
-  catch
-    _:_ ->
-      S = atom_to_list(Mod),
-      Msg = "found no module named '" ++ S ++ "' in the analyzed files",
-      exit({error, Msg})
-  end.
-
-find_fun(F, A, Tree) ->
-  Pred =
-    fun({Var, _Fun}) ->
-	(cerl:fname_id(Var) =/= F) orelse
-	  (cerl:fname_arity(Var) =/= A)
-    end,
-  [Val|_] = lists:dropwhile(Pred, cerl:module_defs(Tree)),
-  Val.
+finalize_contracts(SpecDict, CallbackDict, CS)  ->
+  Contracts = ets_read_concurrent_table(dialyzer_codeserver_contracts),
+  Callbacks = ets_read_concurrent_table(dialyzer_codeserver_callbacks),
+  Contracts = dict:fold(fun decompose_spec_dict/3, Contracts, SpecDict),
+  Callbacks = dict:fold(fun decompose_cb_dict/3, Callbacks, CallbackDict),
+  CS#codeserver{contracts = Contracts, callbacks = Callbacks,
+		temp_contracts = clean, temp_callbacks = clean}.
+
+decompose_spec_dict(Mod, Dict, Table) ->
+  Keys = dict:fetch_keys(Dict),
+  true = ets:insert(Table, dict:to_list(Dict)),
+  true = ets:insert(Table, {Mod, Keys}),
+  Table.
+
+decompose_cb_dict(_Mod, Dict, Table) ->
+  true = ets:insert(Table, dict:to_list(Dict)),
+  Table.
+
+table__lookup(TablePid, M) when is_atom(M) ->
+  {Name, Exports, Attrs, Keys, As} = ets:lookup_element(TablePid, M, 2),
+  Defs = [table__lookup(TablePid, Key) || Key <- Keys],
+  cerl:ann_c_module(As, Name, Exports, Attrs, Defs);
+table__lookup(TablePid, MFA) ->
+  ets:lookup_element(TablePid, MFA, 2).
diff --git a/lib/dialyzer/src/dialyzer_contracts.erl b/lib/dialyzer/src/dialyzer_contracts.erl
index 2b78b736ab..0b932d5a1f 100644
--- a/lib/dialyzer/src/dialyzer_contracts.erl
+++ b/lib/dialyzer/src/dialyzer_contracts.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -344,7 +344,7 @@ insert_constraints([{subtype, Type1, Type2}|Left], Dict) ->
     false ->
       %% A lot of things should change to add supertypes
       throw({error, io_lib:format("First argument of is_subtype constraint "
-				  "must be a type variable\n", [])})
+				  "must be a type variable: ~p\n", [Type1])})
   end;
 insert_constraints([], Dict) -> Dict.
 
@@ -385,9 +385,8 @@ contract_from_form([{type, _L1, bounded_fun,
 		   RecDict, FileLine, TypeAcc, FormAcc) ->
   TypeFun =
     fun(ExpTypes, AllRecords) ->
-	Constr1 = [constraint_from_form(C, RecDict, ExpTypes, AllRecords)
-                   || C <- Constr],
-	VarDict = insert_constraints(Constr1, dict:new()),
+	{Constr1, VarDict} =
+	  process_constraints(Constr, RecDict, ExpTypes, AllRecords),
 	Type = erl_types:t_from_form(Form, RecDict, VarDict),
 	NewType = erl_types:t_solve_remote(Type, ExpTypes, AllRecords),
 	{NewType, Constr1}
@@ -398,18 +397,66 @@ contract_from_form([{type, _L1, bounded_fun,
 contract_from_form([], _RecDict, _FileLine, TypeAcc, FormAcc) ->
   {lists:reverse(TypeAcc), lists:reverse(FormAcc)}.
 
-constraint_from_form({type, _, constraint, [{atom, _, is_subtype},
-					    [Type1, Type2]]}, RecDict,
-                     ExpTypes, AllRecords) ->
-  T1 = erl_types:t_from_form(Type1, RecDict),
-  T2 = erl_types:t_from_form(Type2, RecDict),
-  T3 = erl_types:t_solve_remote(T1, ExpTypes, AllRecords),
-  T4 = erl_types:t_solve_remote(T2, ExpTypes, AllRecords),
-  {subtype, T3, T4};
-constraint_from_form({type, _, constraint, [{atom,_,Name}, List]}, _RecDict,
-                     _ExpTypes, _AllRecords) ->
-  N = length(List),
-  throw({error, io_lib:format("Unsupported type guard ~w/~w\n", [Name, N])}).
+process_constraints(Constrs, RecDict, ExpTypes, AllRecords) ->
+  Init = initialize_constraints(Constrs, RecDict, ExpTypes, AllRecords),
+  constraints_fixpoint(Init, RecDict, ExpTypes, AllRecords).
+
+initialize_constraints(Constrs, RecDict, ExpTypes, AllRecords) ->
+  initialize_constraints(Constrs, RecDict, ExpTypes, AllRecords, []).
+
+initialize_constraints([], _RecDict, _ExpTypes, _AllRecords, Acc) ->
+  Acc;
+initialize_constraints([Constr|Rest], RecDict, ExpTypes, AllRecords, Acc) ->
+  case Constr of
+    {type, _, constraint, [{atom, _, is_subtype}, [Type1, Type2]]} ->
+      T1 = final_form(Type1, RecDict, ExpTypes, AllRecords, dict:new()),
+      Entry = {T1, Type2},
+      initialize_constraints(Rest, RecDict, ExpTypes, AllRecords, [Entry|Acc]);
+    {type, _, constraint, [{atom,_,Name}, List]} ->
+      N = length(List),
+      throw({error,
+	     io_lib:format("Unsupported type guard ~w/~w\n", [Name, N])})
+  end.
+
+constraints_fixpoint(Constrs, RecDict, ExpTypes, AllRecords) ->
+  VarDict =
+    constraints_to_dict(Constrs, RecDict, ExpTypes, AllRecords, dict:new()),
+  constraints_fixpoint(VarDict, Constrs, RecDict, ExpTypes, AllRecords).
+
+constraints_fixpoint(OldVarDict, Constrs, RecDict, ExpTypes, AllRecords) ->
+  NewVarDict =
+    constraints_to_dict(Constrs, RecDict, ExpTypes, AllRecords, OldVarDict),
+  case NewVarDict of
+    OldVarDict ->
+      DictFold =
+	fun(Key, Value, Acc) ->
+	    [{subtype, erl_types:t_var(Key), Value}|Acc]
+	end,
+      FinalConstrs = dict:fold(DictFold, [], NewVarDict),
+      {FinalConstrs, NewVarDict};
+    _Other ->
+      constraints_fixpoint(NewVarDict, Constrs, RecDict, ExpTypes, AllRecords)
+  end.
+
+-define(TYPE_LIMIT, 4).
+
+final_form(Form, RecDict, ExpTypes, AllRecords, VarDict) ->
+  T1 = erl_types:t_from_form(Form, RecDict, VarDict),
+  T2 = erl_types:t_solve_remote(T1, ExpTypes, AllRecords),
+  erl_types:t_limit(T2, ?TYPE_LIMIT).
+
+constraints_to_dict(Constrs, RecDict, ExpTypes, AllRecords, VarDict) ->
+  Subtypes =
+    constraints_to_subs(Constrs, RecDict, ExpTypes, AllRecords, VarDict, []),
+  insert_constraints(Subtypes, dict:new()).
+
+constraints_to_subs([], _RecDict, _ExpTypes, _AllRecords, _VarDict, Acc) ->
+  Acc;
+constraints_to_subs([C|Rest], RecDict, ExpTypes, AllRecords, VarDict, Acc) ->
+  {T1, Form2} = C,
+  T2 = final_form(Form2, RecDict, ExpTypes, AllRecords, VarDict),
+  NewAcc = [{subtype, T1, T2}|Acc],
+  constraints_to_subs(Rest, RecDict, ExpTypes, AllRecords, VarDict, NewAcc).
 
 %% Gets the most general domain of a list of domains of all
 %% the overloaded contracts
diff --git a/lib/dialyzer/src/dialyzer_coordinator.erl b/lib/dialyzer/src/dialyzer_coordinator.erl
new file mode 100644
index 0000000000..c3b7ce29af
--- /dev/null
+++ b/lib/dialyzer/src/dialyzer_coordinator.erl
@@ -0,0 +1,251 @@
+%% -*- erlang-indent-level: 2 -*-
+%%-----------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File        : dialyzer_coordinator.erl
+%%% Authors     : Stavros Aronis <[email protected]>
+%%%-------------------------------------------------------------------
+
+-module(dialyzer_coordinator).
+
+%%% Export for dialyzer main process
+-export([parallel_job/4]).
+
+%%% Exports for all possible workers
+-export([wait_activation/0, job_done/3]).
+
+%%% Exports for the typesig and dataflow analysis workers
+-export([sccs_to_pids/2, request_activation/1]).
+
+%%% Exports for the compilation workers
+-export([get_next_label/2]).
+
+-export_type([coordinator/0, mode/0, init_data/0, result/0]).
+
+%%--------------------------------------------------------------------
+
+-type collector()  :: pid().
+-type regulator()  :: pid().
+-type scc_to_pid() :: ets:tid() | 'unused'.
+
+-type coordinator() :: {collector(), regulator(), scc_to_pid()}. %%opaque
+-type timing() :: dialyzer_timing:timing_server().
+
+-type scc()     :: [mfa_or_funlbl()].
+-type mode()    :: 'typesig' | 'dataflow' | 'compile' | 'warnings'.
+
+-type compile_jobs()  :: [file:filename()].
+-type typesig_jobs()  :: [scc()].
+-type dataflow_jobs() :: [module()].
+-type warnings_jobs() :: [module()].
+
+-type compile_init_data()  :: dialyzer_analysis_callgraph:compile_init_data().
+-type typesig_init_data()  :: dialyzer_succ_typings:typesig_init_data().
+-type dataflow_init_data() :: dialyzer_succ_typings:dataflow_init_data().
+-type warnings_init_data() :: dialyzer_succ_typings:warnings_init_data().
+
+-type compile_result()  :: dialyzer_analysis_callgraph:compile_result().
+-type typesig_result()  :: [mfa_or_funlbl()].
+-type dataflow_result() :: [mfa_or_funlbl()].
+-type warnings_result() :: [dial_warning()].
+
+-type init_data() :: compile_init_data() | typesig_init_data() |
+		     dataflow_init_data() | warnings_init_data().
+
+-type result() :: compile_result() | typesig_result() |
+		  dataflow_result() | warnings_result().
+
+-type job() :: scc() | module() | file:filename().
+-type job_result() :: dialyzer_analysis_callgraph:one_file_result() |
+		      typesig_result() | dataflow_result() | warnings_result().
+
+-record(state, {mode           :: mode(),
+		active     = 0 :: integer(),
+		result         :: result(),
+		next_label = 0 :: integer(),
+		init_data      :: init_data(),
+		regulator      :: regulator(),
+		scc_to_pid     :: scc_to_pid()
+	       }).
+
+-include("dialyzer.hrl").
+
+%%--------------------------------------------------------------------
+
+-spec parallel_job('compile', compile_jobs(), compile_init_data(), timing()) ->
+		      {compile_result(), integer()};
+		  ('typesig', typesig_jobs(), typesig_init_data(), timing()) ->
+		      typesig_result();
+		  ('dataflow', dataflow_jobs(), dataflow_init_data(),
+		   timing()) -> dataflow_result();
+		  ('warnings', warnings_jobs(), warnings_init_data(),
+		   timing()) -> warnings_result().
+
+parallel_job(Mode, Jobs, InitData, Timing) ->
+  State = spawn_jobs(Mode, Jobs, InitData, Timing),
+  collect_result(State).
+
+spawn_jobs(Mode, Jobs, InitData, Timing) ->
+  Collector = self(),
+  Regulator = spawn_regulator(),
+  TypesigOrDataflow = (Mode =:= 'typesig') orelse (Mode =:= 'dataflow'),
+  SCCtoPID =
+    case TypesigOrDataflow of
+      true  -> ets:new(scc_to_pid, [{read_concurrency, true}]);
+      false -> unused
+    end,
+  Coordinator = {Collector, Regulator, SCCtoPID},
+  Fold =
+    fun(Job, Count) ->
+	Pid = dialyzer_worker:launch(Mode, Job, InitData, Coordinator),
+	case TypesigOrDataflow of
+	  true  -> true = ets:insert(SCCtoPID, {Job, Pid}), ok;
+	  false -> request_activation(Regulator, Pid)
+	end,
+	Count + 1
+    end,
+  JobCount = lists:foldl(Fold, 0, Jobs),
+  Unit =
+    case Mode of
+      'typesig'  -> "SCCs";
+      _          -> "modules"
+    end,
+  dialyzer_timing:send_size_info(Timing, JobCount, Unit),
+  InitResult =
+    case Mode of
+      'compile' -> dialyzer_analysis_callgraph:compile_init_result();
+      _ -> []
+    end,
+  #state{mode = Mode, active = JobCount, result = InitResult, next_label = 0,
+	 init_data = InitData, regulator = Regulator, scc_to_pid = SCCtoPID}.
+
+collect_result(#state{mode = Mode, active = Active, result = Result,
+		      next_label = NextLabel, init_data = InitData,
+		      regulator = Regulator, scc_to_pid = SCCtoPID} = State) ->
+  receive
+    {next_label_request, Estimation, Pid} ->
+      Pid ! {next_label_reply, NextLabel},
+      collect_result(State#state{next_label = NextLabel + Estimation});
+    {done, Job, Data} ->
+      NewResult = update_result(Mode, InitData, Job, Data, Result),
+      case Active of
+	1 ->
+	  kill_regulator(Regulator),
+	  case Mode of
+	    'compile' ->
+	      {NewResult, NextLabel};
+	    X when X =:= 'typesig'; X =:= 'dataflow' ->
+	      ets:delete(SCCtoPID),
+	      NewResult;
+	    'warnings' ->
+	      NewResult
+	  end;
+	N ->
+	  collect_result(State#state{result = NewResult, active = N - 1})
+      end
+  end.
+
+update_result(Mode, InitData, Job, Data, Result) ->
+  case Mode of
+    'compile' ->
+      dialyzer_analysis_callgraph:add_to_result(Job, Data, Result,
+						InitData);
+    X when X =:= 'typesig'; X =:= 'dataflow' ->
+      dialyzer_succ_typings:lookup_names(Data, InitData) ++ Result;
+    'warnings' ->
+      Data ++ Result
+  end.
+
+-spec sccs_to_pids([scc() | module()], coordinator()) ->
+        {[dialyzer_worker:worker()], [scc() | module()]}.
+
+sccs_to_pids(SCCs, {_Collector, _Regulator, SCCtoPID}) ->
+  Fold =
+    fun(SCC, {Pids, Unknown}) ->
+	try ets:lookup_element(SCCtoPID, SCC, 2) of
+	    Result -> {[Result|Pids], Unknown}
+	catch
+	  _:_ -> {Pids, [SCC|Unknown]}
+	end
+    end,
+  lists:foldl(Fold, {[], []}, SCCs).
+
+-spec job_done(job(), job_result(), coordinator()) -> ok.
+
+job_done(Job, Result, {Collector, Regulator, _SCCtoPID}) ->
+  Regulator ! done,
+  Collector ! {done, Job, Result},
+  ok.
+
+-spec get_next_label(integer(), coordinator()) -> integer().
+
+get_next_label(EstimatedSize, {Collector, _Regulator, _SCCtoPID}) ->
+  Collector ! {next_label_request, EstimatedSize, self()},
+  receive
+    {next_label_reply, NextLabel} -> NextLabel
+  end.
+
+-spec wait_activation() -> ok.
+
+wait_activation() ->
+  receive activate -> ok end.
+
+activate_pid(Pid) ->
+  Pid ! activate.
+
+-spec request_activation(coordinator()) -> ok.
+
+request_activation({_Collector, Regulator, _SCCtoPID}) ->
+  Regulator ! {req, self()},
+  wait_activation().
+
+request_activation(Regulator, Pid) ->
+  Regulator ! {req, Pid},
+  ok.
+
+spawn_regulator() ->
+  InitTickets = dialyzer_utils:parallelism(),
+  spawn_link(fun() -> regulator_loop(InitTickets, queue:new()) end).
+
+regulator_loop(Tickets, Queue) ->
+  receive
+    {req, Pid} ->
+      case Tickets of
+	0 ->
+	  regulator_loop(0, queue:in(Pid, Queue));
+	N ->
+	  activate_pid(Pid),
+	  regulator_loop(N-1, Queue)
+      end;
+    done ->
+      {Waiting, NewQueue} = queue:out(Queue),
+      NewTickets =
+	case Waiting of
+	  empty -> Tickets + 1;
+	  {value, Pid} ->
+	    activate_pid(Pid),
+	    Tickets
+	end,
+      regulator_loop(NewTickets, NewQueue);
+    stop -> ok
+  end.
+
+kill_regulator(Regulator) ->
+  Regulator ! stop.
diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index bd375b04fa..6956850f1a 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -32,13 +32,11 @@
 
 %% Data structure interfaces.
 -export([state__add_warning/2, state__cleanup/1,
+	 state__duplicate/1, dispose_state/1,
          state__get_callgraph/1, state__get_races/1,
          state__get_records/1, state__put_callgraph/2,
          state__put_races/2, state__records_only/1]).
 
-%% Debug and test interfaces.
--export([get_top_level_signatures/2, pp/1]).
-
 -export_type([state/0]).
 
 -include("dialyzer.hrl").
@@ -67,7 +65,7 @@
 
 %%-define(DEBUG, true).
 %%-define(DEBUG_PP, true).
-%%-define(DOT, true).
+%%-define(DEBUG_TIME, true).
 
 -ifdef(DEBUG).
 -import(erl_types, [t_to_string/1]).
@@ -93,9 +91,8 @@
 		warning_mode = false :: boolean(),
 		warnings = []        :: [dial_warning()],
 		work                 :: {[_], [_], set()},
-		module               :: module(),
-		behaviour_api_dict = [] ::
-		  dialyzer_behaviours:behaviour_api_dict()}).
+		module               :: module()
+               }).
 
 -record(map, {dict = dict:new()   :: dict(),
               subst = dict:new()  :: dict(),
@@ -111,7 +108,7 @@
 
 -spec get_warnings(cerl:c_module(), dialyzer_plt:plt(),
                    dialyzer_callgraph:callgraph(), dict(), set()) ->
-	{[dial_warning()], dict(), dict(), [label()], [string()]}.
+	{[dial_warning()], dict()}.
 
 get_warnings(Tree, Plt, Callgraph, Records, NoWarnUnused) ->
   State1 = analyze_module(Tree, Plt, Callgraph, Records, true),
@@ -119,145 +116,14 @@ get_warnings(Tree, Plt, Callgraph, Records, NoWarnUnused) ->
   State3 =
     state__renew_warnings(state__get_warnings(State2, NoWarnUnused), State2),
   State4 = state__get_race_warnings(State3),
-  Callgraph1 = State2#state.callgraph,
-  {State4#state.warnings, state__all_fun_types(State4),
-   dialyzer_callgraph:get_race_code(Callgraph1),
-   dialyzer_callgraph:get_public_tables(Callgraph1),
-   dialyzer_callgraph:get_named_tables(Callgraph1)}.
+  {State4#state.warnings, state__all_fun_types(State4)}.
 
 -spec get_fun_types(cerl:c_module(), dialyzer_plt:plt(),
-                    dialyzer_callgraph:callgraph(), dict()) ->
-	{dict(), dict(), [label()], [string()]}.
+                    dialyzer_callgraph:callgraph(), dict()) -> dict().
 
 get_fun_types(Tree, Plt, Callgraph, Records) ->
   State = analyze_module(Tree, Plt, Callgraph, Records, false),
-  Callgraph1 = State#state.callgraph,
-  {state__all_fun_types(State),
-   dialyzer_callgraph:get_race_code(Callgraph1),
-   dialyzer_callgraph:get_public_tables(Callgraph1),
-   dialyzer_callgraph:get_named_tables(Callgraph1)}.
-
-%%--------------------------------------------------------------------
-
--spec pp(file:filename()) -> 'ok'.
-
-pp(File) ->
-  {ok, Code} = dialyzer_utils:get_core_from_src(File, [no_copt]),
-  Plt = get_def_plt(),
-  AnnTree = annotate_module(Code, Plt),
-  io:put_chars(cerl_prettypr:format(AnnTree, [{hook, cerl_typean:pp_hook()}])),
-  io:nl().
-
-%%--------------------------------------------------------------------
-%% This is used in the testsuite.
-
--spec get_top_level_signatures(cerl:c_module(), dict()) ->
-        [{{atom(), arity()}, erl_types:erl_type()}].
-
-get_top_level_signatures(Code, Records) ->
-  {Tree, _} = cerl_trees:label(cerl:from_records(Code)),
-  Callgraph0 = dialyzer_callgraph:new(),
-  Callgraph1 = dialyzer_callgraph:scan_core_tree(Tree, Callgraph0),
-  {Callgraph2, _} = dialyzer_callgraph:remove_external(Callgraph1),
-  Callgraph = dialyzer_callgraph:finalize(Callgraph2),
-  to_dot(Callgraph),
-  Plt = get_def_plt(),
-  FunTypes = get_fun_types(Tree, Plt, Callgraph, Records),
-  FunTypes1 = lists:foldl(fun({V, F}, Acc) ->
-			      Label = get_label(F),
-			      case dict:find(Label, Acc) of
-				error ->
-				  Arity = cerl:fname_arity(V),
-				  Type = t_fun(lists:duplicate(Arity,
-							       t_none()),
-					       t_none()),
-				  dict:store(Label, Type, Acc);
-				{ok, _} -> Acc
-			      end
-			  end, FunTypes, cerl:module_defs(Tree)),
-  dialyzer_callgraph:delete(Callgraph),
-  Sigs = [{{cerl:fname_id(V), cerl:fname_arity(V)},
-	   dict:fetch(get_label(F), FunTypes1)}
-	  || {V, F} <- cerl:module_defs(Tree)],
-  ordsets:from_list(Sigs).
-
-get_def_plt() ->
-  try
-    dialyzer_plt:from_file(dialyzer_plt:get_default_plt())
-  catch
-    throw:{dialyzer_error, _} -> dialyzer_plt:new()
-  end.
-
-%%% ===========================================================================
-%%%
-%%%  Annotate all top level funs.
-%%%
-%%% ===========================================================================
-
-annotate_module(Code, Plt) ->
-  {Tree, _} = cerl_trees:label(cerl:from_records(Code)),
-  Callgraph0 = dialyzer_callgraph:new(),
-  Callgraph1 = dialyzer_callgraph:scan_core_tree(Tree, Callgraph0),
-  {Callgraph2, _} = dialyzer_callgraph:remove_external(Callgraph1),
-  Callgraph = dialyzer_callgraph:finalize(Callgraph2),
-  State = analyze_module(Tree, Plt, Callgraph),
-  Res = annotate(Tree, State),
-  dialyzer_callgraph:delete(Callgraph),
-  Res.
-
-annotate(Tree, State) ->
-  case cerl:subtrees(Tree) of
-    [] -> set_type(Tree, State);
-    List ->
-      NewSubTrees = [[annotate(Subtree, State) || Subtree <- Group]
-		     || Group <- List],
-      NewTree = cerl:update_tree(Tree, NewSubTrees),
-      set_type(NewTree, State)
-  end.
-
-set_type(Tree, State) ->
-  case cerl:type(Tree) of
-    'fun' ->
-      Type = state__fun_type(Tree, State),
-      case t_is_any(Type) of
-	true ->
-	  cerl:set_ann(Tree, delete_ann(typesig, cerl:get_ann(Tree)));
-	false ->
-	  cerl:set_ann(Tree, append_ann(typesig, Type, cerl:get_ann(Tree)))
-      end;
-    apply ->
-      case state__find_apply_return(Tree, State) of
-	unknown -> Tree;
-	ReturnType ->
-	  case t_is_any(ReturnType) of
-	    true ->
-	      cerl:set_ann(Tree, delete_ann(type, cerl:get_ann(Tree)));
-	    false ->
-	      cerl:set_ann(Tree, append_ann(type, ReturnType,
-					    cerl:get_ann(Tree)))
-	  end
-      end;
-    _ ->
-      Tree
-  end.
-
-append_ann(Tag, Val, [X | Xs]) ->
-  if tuple_size(X) >= 1, element(1, X) =:= Tag ->
-      append_ann(Tag, Val, Xs);
-     true ->
-      [X | append_ann(Tag, Val, Xs)]
-  end;
-append_ann(Tag, Val, []) ->
-  [{Tag, Val}].
-
-delete_ann(Tag, [X | Xs]) ->
-  if tuple_size(X) >= 1, element(1, X) =:= Tag ->
-      delete_ann(Tag, Xs);
-     true ->
-      [X | delete_ann(Tag, Xs)]
-  end;
-delete_ann(_, []) ->
-  [].
+  state__all_fun_types(State).
 
 %%% ===========================================================================
 %%%
@@ -265,56 +131,23 @@ delete_ann(_, []) ->
 %%%
 %%% ===========================================================================
 
-analyze_module(Tree, Plt, Callgraph) ->
-  analyze_module(Tree, Plt, Callgraph, dict:new(), false).
-
 analyze_module(Tree, Plt, Callgraph, Records, GetWarnings) ->
   debug_pp(Tree, false),
   Module = cerl:atom_val(cerl:module_name(Tree)),
-  RaceDetection = dialyzer_callgraph:get_race_detection(Callgraph),
-  RaceCode = dialyzer_callgraph:get_race_code(Callgraph),
-  BehaviourTranslations =
-    case RaceDetection of
-      true -> dialyzer_behaviours:translatable_behaviours(Tree);
-      false -> []
-    end,
   TopFun = cerl:ann_c_fun([{label, top}], [], Tree),
-  State = state__new(dialyzer_callgraph:race_code_new(Callgraph),
-		     TopFun, Plt, Module, Records, BehaviourTranslations),
+  State = state__new(Callgraph, TopFun, Plt, Module, Records),
   State1 = state__race_analysis(not GetWarnings, State),
   State2 = analyze_loop(State1),
   case GetWarnings of
     true ->
       State3 = state__set_warning_mode(State2),
       State4 = analyze_loop(State3),
-      State5 = state__restore_race_code(RaceCode, State4),
-
-      %% EXPERIMENTAL: Turn all behaviour API calls into calls to the
-      %%               respective callback module's functions.
-
-      case BehaviourTranslations of
-	[] -> dialyzer_races:race(State5);
-	Behaviours ->
-          Callgraph2 = State5#state.callgraph,
-          Digraph = dialyzer_callgraph:get_digraph(Callgraph2),
-	  TranslatedCallgraph =
-	    dialyzer_behaviours:translate_callgraph(Behaviours, Module,
-						    Callgraph2),
-          St =
-            dialyzer_races:race(State5#state{callgraph = TranslatedCallgraph}),
-          Callgraph3 = dialyzer_callgraph:put_digraph(Digraph,
-                                                      St#state.callgraph),
-          St#state{callgraph = Callgraph3}
-      end;
+      dialyzer_races:race(State4);
     false ->
-      Callgraph1 = State2#state.callgraph,
-      RaceCode1 = dialyzer_callgraph:get_race_code(Callgraph1),
-      state__restore_race_code(
-        dict:merge(fun (_K, V1, _V2) -> V1 end,
-                   RaceCode, RaceCode1), State2)
+      State2
   end.
 
-analyze_loop(#state{callgraph = Callgraph, races = Races} = State) ->
+analyze_loop(State) ->
   case state__get_work(State) of
     none -> State;
     {Fun, NewState1} ->
@@ -340,10 +173,9 @@ analyze_loop(#state{callgraph = Callgraph, races = Races} = State) ->
 	      Map1 = enter_type_lists(Vars, ArgTypes, Map),
 	      Body = cerl:fun_body(Fun),
               FunLabel = get_label(Fun),
-              RaceDetection = dialyzer_callgraph:get_race_detection(Callgraph),
-              RaceAnalysis = dialyzer_races:get_race_analysis(Races),
+	      IsRaceAnalysisEnabled = is_race_analysis_enabled(State),
               NewState3 =
-                case RaceDetection andalso RaceAnalysis of
+                case IsRaceAnalysisEnabled of
                   true ->
                     NewState2 = state__renew_curr_fun(
                       state__lookup_name(FunLabel, NewState1), FunLabel,
@@ -357,17 +189,8 @@ analyze_loop(#state{callgraph = Callgraph, races = Races} = State) ->
 		     [state__lookup_name(get_label(Fun), State),
 		      t_to_string(t_fun(ArgTypes, BodyType))]),
               NewState5 =
-                case RaceDetection andalso RaceAnalysis of
-                  true ->
-		    Races1 = NewState4#state.races,
-                    Code = lists:reverse(dialyzer_races:get_race_list(Races1)),
-                    Callgraph1 =
-                      renew_code(dialyzer_races:get_curr_fun(Races1),
-                                 dialyzer_races:get_curr_fun_args(Races1),
-                                 Code,
-                                 state__warning_mode(NewState4),
-                                 NewState4#state.callgraph),
-                    NewState4#state{callgraph = Callgraph1};
+                case IsRaceAnalysisEnabled of
+                  true -> renew_race_code(NewState4);
                   false -> NewState4
                 end,
               NewState6 =
@@ -582,9 +405,7 @@ handle_apply_or_call([{local, external}|Left], Args, ArgTypes, Map, Tree, State,
 		       ArgTypes, t_any());
 handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
 		     Args, ArgTypes, Map, Tree,
-                     #state{callgraph = Callgraph, races = Races,
-			    opaques = Opaques} = State,
-                     AccArgTypes, AccRet) ->
+                     #state{opaques = Opaques} = State, AccArgTypes, AccRet) ->
   Any = t_any(),
   AnyArgs = [Any || _ <- Args],
   GenSig = {AnyArgs, fun(_) -> t_any() end},
@@ -680,27 +501,13 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
   ?debug("ContrRet: ~s\n", [erl_types:t_to_string(CRange(TmpArgTypes))]),
   ?debug("SigRet: ~s\n", [erl_types:t_to_string(SigRange)]),
   State1 =
-    case dialyzer_callgraph:get_race_detection(Callgraph) andalso
-         dialyzer_races:get_race_analysis(Races) of
+    case is_race_analysis_enabled(State) of
       true ->
         Ann = cerl:get_ann(Tree),
         File = get_file(Ann),
         Line = abs(get_line(Ann)),
-
-	%% EXPERIMENTAL: Turn a behaviour's API call into a call to the
-	%%               respective callback module's function.
-
-	Module = State#state.module,
-	BehApiDict = State#state.behaviour_api_dict,
-	{RealFun, RealArgTypes, RealArgs} =
-	  case dialyzer_behaviours:translate_behaviour_api_call(Fun, ArgTypes,
-								Args, Module,
-								BehApiDict) of
-	    plain_call    -> {Fun, ArgTypes, Args};
-	    BehaviourAPI  -> BehaviourAPI
-	  end,
-        dialyzer_races:store_race_call(RealFun, RealArgTypes, RealArgs,
-				       {File, Line}, State);
+        dialyzer_races:store_race_call(Fun, ArgTypes, Args,
+                                       {File, Line}, State);
       false -> State
     end,
   FailedConj = any_none([RetWithoutLocal|NewArgTypes]),
@@ -1047,20 +854,17 @@ handle_call(Tree, Map, State) ->
 
 %%----------------------------------------
 
-handle_case(Tree, Map, #state{callgraph = Callgraph} = State) ->
+handle_case(Tree, Map, State) ->
   Arg = cerl:case_arg(Tree),
   Clauses = filter_match_fail(cerl:case_clauses(Tree)),
   {State1, Map1, ArgType} = SMA = traverse(Arg, Map, State),
   case t_is_none_or_unit(ArgType) of
     true -> SMA;
     false ->
-      Races = State1#state.races,
       State2 =
-        case dialyzer_callgraph:get_race_detection(Callgraph) andalso
-             dialyzer_races:get_race_analysis(Races) of
+        case is_race_analysis_enabled(State) of
           true ->
-	    RaceList = dialyzer_races:get_race_list(Races),
-            RaceListSize = dialyzer_races:get_race_list_size(Races),
+	    {RaceList, RaceListSize} = get_race_list_and_size(State1),
             state__renew_race_list([beg_case|RaceList],
                                    RaceListSize + 1, State1);
           false -> State1
@@ -1094,9 +898,8 @@ handle_cons(Tree, Map, State) ->
 
 %%----------------------------------------
 
-handle_let(Tree, Map, #state{callgraph = Callgraph, races = Races} = State) ->
-  RaceAnalysis = dialyzer_races:get_race_analysis(Races),
-  RaceDetection = dialyzer_callgraph:get_race_detection(Callgraph),
+handle_let(Tree, Map, State) ->
+  IsRaceAnalysisEnabled = is_race_analysis_enabled(State),
   Arg = cerl:let_arg(Tree),
   Vars = cerl:let_vars(Tree),
   {Map0, State0} =
@@ -1104,10 +907,9 @@ handle_let(Tree, Map, #state{callgraph = Callgraph, races = Races} = State) ->
       true ->
 	[Var] = Vars,
 	{enter_subst(Var, Arg, Map),
-         case RaceDetection andalso RaceAnalysis of
+         case IsRaceAnalysisEnabled of
            true ->
-             RaceList = dialyzer_races:get_race_list(Races),
-             RaceListSize = dialyzer_races:get_race_list_size(Races),
+	    {RaceList, RaceListSize} = get_race_list_and_size(State),
              state__renew_race_list(
                [dialyzer_races:let_tag_new(Var, Arg)|RaceList],
                RaceListSize + 1, State);
@@ -1117,9 +919,8 @@ handle_let(Tree, Map, #state{callgraph = Callgraph, races = Races} = State) ->
     end,
   Body = cerl:let_body(Tree),
   {State1, Map1, ArgTypes} = SMA = traverse(Arg, Map0, State0),
-  Callgraph1 = State1#state.callgraph,
-  Callgraph2 =
-    case RaceDetection andalso RaceAnalysis andalso cerl:is_c_call(Arg) of
+  State2 =
+    case IsRaceAnalysisEnabled andalso cerl:is_c_call(Arg) of
       true ->
         Mod = cerl:call_module(Arg),
         Name = cerl:call_name(Arg),
@@ -1127,16 +928,11 @@ handle_let(Tree, Map, #state{callgraph = Callgraph, races = Races} = State) ->
              cerl:concrete(Mod) =:= ets andalso
              cerl:is_literal(Name) andalso
              cerl:concrete(Name) =:= new of
-          true ->
-            NewTable = dialyzer_races:get_new_table(State1#state.races),
-            renew_public_tables(Vars, NewTable,
-                                state__warning_mode(State1),
-                                Callgraph1);
-          false -> Callgraph1
+          true -> renew_race_public_tables(Vars, State1);
+          false -> State1
         end;
-      false -> Callgraph1
+      false -> State1
     end,
-  State2 = State1#state{callgraph = Callgraph2},
   case t_is_none_or_unit(ArgTypes) of
     true -> SMA;
     false ->
@@ -1167,16 +963,13 @@ handle_module(Tree, Map, State) ->
 
 %%----------------------------------------
 
-handle_receive(Tree, Map,
-               #state{callgraph = Callgraph, races = Races} = State) ->
+handle_receive(Tree, Map, State) ->
   Clauses = filter_match_fail(cerl:receive_clauses(Tree)),
   Timeout = cerl:receive_timeout(Tree),
   State1 =
-    case dialyzer_callgraph:get_race_detection(Callgraph) andalso
-         dialyzer_races:get_race_analysis(Races) of
+    case is_race_analysis_enabled(State) of
       true ->
-	RaceList = dialyzer_races:get_race_list(Races),
-        RaceListSize = dialyzer_races:get_race_list_size(Races),
+	{RaceList, RaceListSize} = get_race_list_and_size(State),
         state__renew_race_list([beg_case|RaceList],
                                RaceListSize + 1, State);
       false -> State
@@ -1299,16 +1092,13 @@ handle_tuple(Tree, Map, State) ->
 %%----------------------------------------
 %% Clauses
 %%
-handle_clauses([C|Left], Arg, ArgType, OrigArgType,
-               #state{callgraph = Callgraph, races = Races} = State,
-               CaseTypes, MapIn, Acc, ClauseAcc) ->
-  RaceDetection = dialyzer_callgraph:get_race_detection(Callgraph),
-  RaceAnalysis = dialyzer_races:get_race_analysis(Races),
+handle_clauses([C|Left], Arg, ArgType, OrigArgType, State, CaseTypes, MapIn,
+	       Acc, ClauseAcc) ->
+  IsRaceAnalysisEnabled = is_race_analysis_enabled(State),
   State1 =
-    case RaceDetection andalso RaceAnalysis of
+    case IsRaceAnalysisEnabled of
       true ->
-	RaceList = dialyzer_races:get_race_list(Races),
-        RaceListSize = dialyzer_races:get_race_list_size(Races),
+	{RaceList, RaceListSize} = get_race_list_and_size(State),
         state__renew_race_list(
           [dialyzer_races:beg_clause_new(Arg, cerl:clause_pats(C),
                                          cerl:clause_guard(C))|
@@ -1319,11 +1109,9 @@ handle_clauses([C|Left], Arg, ArgType, OrigArgType,
   {State2, ClauseMap, BodyType, NewArgType} =
     do_clause(C, Arg, ArgType, OrigArgType, MapIn, State1),
   {NewClauseAcc, State3} =
-    case RaceDetection andalso RaceAnalysis of
+    case IsRaceAnalysisEnabled of
       true ->
-        Races1 = State2#state.races,
-        RaceList1 = dialyzer_races:get_race_list(Races1),
-        RaceListSize1 = dialyzer_races:get_race_list_size(Races1),
+	{RaceList1, RaceListSize1} = get_race_list_and_size(State2),
         EndClause = dialyzer_races:end_clause_new(Arg, cerl:clause_pats(C),
                                                   cerl:clause_guard(C)),
         {[EndClause|ClauseAcc],
@@ -1338,30 +1126,25 @@ handle_clauses([C|Left], Arg, ArgType, OrigArgType,
     end,
   handle_clauses(Left, Arg, NewArgType, OrigArgType, State3,
                  NewCaseTypes, MapIn, NewAcc, NewClauseAcc);
-handle_clauses([], _Arg, _ArgType, _OrigArgType,
-	       #state{callgraph = Callgraph, races = Races} = State,
-               CaseTypes, _MapIn, Acc, ClauseAcc) ->
+handle_clauses([], _Arg, _ArgType, _OrigArgType, State, CaseTypes, _MapIn, Acc,
+	       ClauseAcc) ->
   State1 =
-    case dialyzer_callgraph:get_race_detection(Callgraph) andalso
-         dialyzer_races:get_race_analysis(Races) of
+    case is_race_analysis_enabled(State) of
       true ->
+	{RaceList, RaceListSize} = get_race_list_and_size(State),
         state__renew_race_list(
-          [dialyzer_races:end_case_new(ClauseAcc)|
-           dialyzer_races:get_race_list(Races)],
-          dialyzer_races:get_race_list_size(Races) + 1, State);
+          [dialyzer_races:end_case_new(ClauseAcc)|RaceList],
+	  RaceListSize + 1, State);
       false -> State
     end,
   {lists:reverse(Acc), State1, t_sup(CaseTypes)}.
 
-do_clause(C, Arg, ArgType0, OrigArgType, Map,
-          #state{callgraph = Callgraph, races = Races} = State) ->
+do_clause(C, Arg, ArgType0, OrigArgType, Map, State) ->
   Pats = cerl:clause_pats(C),
   Guard = cerl:clause_guard(C),
   Body = cerl:clause_body(C),
-  RaceDetection = dialyzer_callgraph:get_race_detection(Callgraph),
-  RaceAnalysis = dialyzer_races:get_race_analysis(Races),
   State1 =
-    case RaceDetection andalso RaceAnalysis of
+    case is_race_analysis_enabled(State) of
       true ->
         state__renew_fun_args(Pats, State);
       false -> State
@@ -2648,14 +2431,18 @@ join_maps(Maps, MapOut) ->
   Keys = ordsets:from_list(dict:fetch_keys(Dict) ++ dict:fetch_keys(Subst)),
   join_maps(Keys, Maps, MapOut).
 
-join_maps([Key|Left], Maps, MapOut) ->
+join_maps(Keys, Maps, MapOut) ->
+  KTs = join_maps_collect(Keys, Maps, MapOut),
+  lists:foldl(fun({K, T}, M) -> enter_type(K, T, M) end, MapOut, KTs).
+
+join_maps_collect([Key|Left], Maps, MapOut) ->
   Type = join_maps_one_key(Maps, Key, t_none()),
   case t_is_equal(lookup_type(Key, MapOut), Type) of
-    true ->  join_maps(Left, Maps, MapOut);
-    false -> join_maps(Left, Maps, enter_type(Key, Type, MapOut))
+    true ->  join_maps_collect(Left, Maps, MapOut);
+    false -> [{Key, Type} | join_maps_collect(Left, Maps, MapOut)]
   end;
-join_maps([], _Maps, MapOut) ->
-  MapOut.
+join_maps_collect([], _Maps, _MapOut) ->
+  [].
 
 join_maps_one_key([Map|Left], Key, AccType) ->
   case t_is_any(AccType) of
@@ -2887,7 +2674,7 @@ determine_mode(Type, Opaques) ->
 %%%
 %%% ===========================================================================
 
-state__new(Callgraph, Tree, Plt, Module, Records, BehaviourTranslations) ->
+state__new(Callgraph, Tree, Plt, Module, Records) ->
   Opaques = erl_types:module_builtin_opaques(Module) ++
     erl_types:t_opaque_from_records(Records),
   TreeMap = build_tree_map(Tree),
@@ -2901,7 +2688,7 @@ state__new(Callgraph, Tree, Plt, Module, Records, BehaviourTranslations) ->
   #state{callgraph = Callgraph, envs = Env, fun_tab = FunTab, opaques = Opaques,
 	 plt = Plt, races = dialyzer_races:new(), records = Records,
 	 warning_mode = false, warnings = [], work = Work, tree_map = TreeMap,
-	 module = Module, behaviour_api_dict = BehaviourTranslations}.
+	 module = Module}.
 
 state__warning_mode(#state{warning_mode = WM}) ->
   WM.
@@ -2914,10 +2701,6 @@ state__set_warning_mode(#state{tree_map = TreeMap, fun_tab = FunTab,
 	      fun_tab = FunTab, warning_mode = true,
               races = dialyzer_races:put_race_analysis(true, Races)}.
 
-state__restore_race_code(RaceCode, #state{callgraph = Callgraph} = State) ->
-  State#state{callgraph = dialyzer_callgraph:put_race_code(RaceCode,
-                                                           Callgraph)}.
-
 state__race_analysis(Analysis, #state{races = Races} = State) ->
   State#state{races = dialyzer_races:put_race_analysis(Analysis, Races)}.
 
@@ -2986,7 +2769,7 @@ state__get_warnings(#state{tree_map = TreeMap, fun_tab = FunTab,
 	  true ->
 	    {Warn, Msg} =
 	      case dialyzer_callgraph:lookup_name(FunLbl, Callgraph) of
-		error -> {true, {unused_fun, []}};
+		error -> {false, {}};
 		{ok, {_M, F, A} = MFA} ->
 		  {not sets:is_element(MFA, NoWarnUnused),
 		   {unused_fun, [F, A]}}
@@ -3260,21 +3043,6 @@ state__fun_info(Fun, #state{callgraph = CG, fun_tab = FunTab, plt = PLT}) ->
   ?debug("LocalRet: ~s\n", [t_to_string(LocalRet)]),
   {Fun, Sig, Contract, LocalRet}.
 
-state__find_apply_return(Tree, #state{callgraph = Callgraph} = State) ->
-  Apply = get_label(Tree),
-  case dialyzer_callgraph:lookup_call_site(Apply, Callgraph) of
-    error ->
-      unknown;
-    {ok, List} ->
-      case lists:member(external, List) of
-	true -> t_any();
-	false ->
-	  FunTypes = [state__fun_type(F, State) || F <- List],
-	  Returns = [t_fun_range(F) || F <- FunTypes],
-	  t_sup(Returns)
-      end
-  end.
-
 forward_args(Fun, ArgTypes, #state{work = Work, fun_tab = FunTab} = State) ->
   {OldArgTypes, OldOut, Fixpoint} =
     case dict:find(Fun, FunTab) of
@@ -3305,6 +3073,16 @@ state__cleanup(#state{callgraph = Callgraph,
          races = dialyzer_races:cleanup(Races),
          records = Records}.
 
+-spec state__duplicate(state()) -> state().
+
+state__duplicate(#state{callgraph = Callgraph} = State) ->
+  State#state{callgraph = dialyzer_callgraph:duplicate(Callgraph)}.
+
+-spec dispose_state(state()) -> ok.
+
+dispose_state(#state{callgraph = Callgraph}) ->
+  dialyzer_callgraph:dispose_race_server(Callgraph).
+
 -spec state__get_callgraph(state()) -> dialyzer_callgraph:callgraph().
 
 state__get_callgraph(#state{callgraph = Callgraph}) ->
@@ -3342,26 +3120,36 @@ state__records_only(#state{records = Records}) ->
 %%%
 %%% ===========================================================================
 
-renew_code(Fun, FunArgs, Code, WarningMode, Callgraph) ->
+is_race_analysis_enabled(#state{races = Races, callgraph = Callgraph}) ->
+  RaceDetection = dialyzer_callgraph:get_race_detection(Callgraph),
+  RaceAnalysis = dialyzer_races:get_race_analysis(Races),
+  RaceDetection andalso RaceAnalysis.
+
+get_race_list_and_size(#state{races = Races}) ->
+  dialyzer_races:get_race_list_and_size(Races).
+
+renew_race_code(#state{races = Races, callgraph = Callgraph,
+		       warning_mode = WarningMode} = State) ->
   case WarningMode of
-    true -> Callgraph;
+    true -> State;
     false ->
-      RaceCode = dialyzer_callgraph:get_race_code(Callgraph),
-      dialyzer_callgraph:put_race_code(
-        dict:store(Fun, [FunArgs, Code], RaceCode), Callgraph)
+      NewCallgraph = dialyzer_callgraph:renew_race_code(Races, Callgraph),
+      State#state{callgraph = NewCallgraph}
   end.
 
-renew_public_tables([Var], Table, WarningMode, Callgraph) ->
+renew_race_public_tables([Var], #state{races = Races, callgraph = Callgraph,
+				      warning_mode = WarningMode} = State) ->
   case WarningMode of
-    true -> Callgraph;
+    true -> State;
     false ->
+      Table = dialyzer_races:get_new_table(Races),
       case Table of
-        no_t -> Callgraph;
-        _Other ->
-          VarLabel = get_label(Var),
-          PTables = dialyzer_callgraph:get_public_tables(Callgraph),
-          dialyzer_callgraph:put_public_tables(
-            lists:usort([VarLabel|PTables]), Callgraph)
+	no_t -> State;
+	_Other ->
+	  VarLabel = get_label(Var),
+	  NewCallgraph =
+	    dialyzer_callgraph:renew_race_public_tables(VarLabel, Callgraph),
+	  State#state{callgraph = NewCallgraph}
       end
   end.
 
@@ -3688,17 +3476,3 @@ strip_annotations(Tree) ->
 debug_pp(_Tree, _UseHook) ->
   ok.
 -endif.
-
-%%----------------------------------------------------------------------------
-
--spec to_dot(dialyzer_callgraph:callgraph()) -> 'ok'.
-
--ifdef(DOT).
-to_dot(CG) ->
-  dialyzer_callgraph:to_dot(CG).
--else.
-to_dot(_CG) ->
-  ok.
--endif.
-
-%%----------------------------------------------------------------------------
diff --git a/lib/dialyzer/src/dialyzer_gui_wx.erl b/lib/dialyzer/src/dialyzer_gui_wx.erl
index b26aa695bd..c6f7c56227 100644
--- a/lib/dialyzer/src/dialyzer_gui_wx.erl
+++ b/lib/dialyzer/src/dialyzer_gui_wx.erl
@@ -192,48 +192,50 @@ create_window(Wx, #options{init_plts = InitPltFiles} = DialyzerOptions) ->
   RunButtons = wxBoxSizer:new(?wxHORIZONTAL),
   Buttons = wxFlexGridSizer:new(3),
   
-  wxSizer:add(ChooseButtons, DeleteButton, ?BorderOpt),
-  wxSizer:add(ChooseButtons, DeleteAllButton, ?BorderOpt),
-  wxSizer:add(ChooseItem, Lab1, Center),
-  wxSizer:add(ChooseItem, ChosenBox, Opts),
-  wxSizer:add(ChooseItem, ChooseButtons, ?BorderOpt),
-  wxSizer:add(FileTypeItem, OptionsLabel),
-  wxSizer:add(FileTypeItem, FileType, [{border, 5}, {flag, ?wxALL}]),
-  wxSizer:add(LogItem, LogLabel, Center),
-  wxSizer:add(LogItem, LogBox, Opts3),
-  wxSizer:add(LogItem, ClearLogButton, ?BorderOpt),
-  wxSizer:add(FileItem, FileLabel),
-  wxSizer:add(FileItem, FilePicker),
-  wxSizer:add(DirItem, DirLabel),
-  wxSizer:add(DirItem, DirPicker),
-  wxSizer:add(AddDirButtons, AddDirButton, ?BorderOpt),
-  wxSizer:add(AddDirButtons, AddRecButton, ?BorderOpt),
-  wxSizer:add(FileDirItem, FileItem),
-  wxSizer:add(FileDirItem, AddButton, ?BorderOpt),
-  wxSizer:add(FileDirItem, DirItem, ?BorderOpt),
-  wxSizer:add(FileDirItem, AddDirButtons, ?BorderOpt),
-  wxSizer:add(WarnButtons, ExplainWarnButton, ?BorderOpt),
-  wxSizer:add(WarnButtons, ClearWarningsButton, ?BorderOpt),
-  wxSizer:add(RunButtons, RunButton, ?BorderOpt),
-  wxSizer:add(RunButtons, StopButton, ?BorderOpt),
-  wxSizer:add(Buttons, WarnButtons),
-  wxSizer:add(Buttons, wxStaticText:new(Frame, ?LABEL7, ""), [{flag, ?wxEXPAND}]),
-  wxSizer:add(Buttons, RunButtons),
-  wxFlexGridSizer:addGrowableCol(Buttons, 1),
-  wxSizer:add(WarningsItem, WarningsLabel, Center),
-  wxSizer:add(WarningsItem, WarningsBox, Opts3),
-  wxSizer:add(WarningsItem, Buttons, [{flag, ?wxEXPAND bor ?wxALL},?Border]),
- 
-  wxSizer:add(Left, ChooseItem, Opts),
-  wxSizer:add(Left, FileDirItem, [{proportion, 1}, {border, 60}, {flag, ?wxTOP}]),
-  wxSizer:add(RightUp, FileTypeItem, ?BorderOpt),
-  wxSizer:add(RightUp, LogItem, Opts3),
-  wxSizer:add(Right, RightUp, Opts3),
-  wxSizer:add(Right, WarningsItem, Opts3),
-  wxSizer:add(Top, Left, Opts),
-  wxSizer:add(Top, Right, Opts3),
-
-  wxSizer:add(All, Top, Opts),
+  _ = wxSizer:add(ChooseButtons, DeleteButton, ?BorderOpt),
+  _ = wxSizer:add(ChooseButtons, DeleteAllButton, ?BorderOpt),
+  _ = wxSizer:add(ChooseItem, Lab1, Center),
+  _ = wxSizer:add(ChooseItem, ChosenBox, Opts),
+  _ = wxSizer:add(ChooseItem, ChooseButtons, ?BorderOpt),
+  _ = wxSizer:add(FileTypeItem, OptionsLabel),
+  _ = wxSizer:add(FileTypeItem, FileType, [{border, 5}, {flag, ?wxALL}]),
+  _ = wxSizer:add(LogItem, LogLabel, Center),
+  _ = wxSizer:add(LogItem, LogBox, Opts3),
+  _ = wxSizer:add(LogItem, ClearLogButton, ?BorderOpt),
+  _ = wxSizer:add(FileItem, FileLabel),
+  _ = wxSizer:add(FileItem, FilePicker),
+  _ = wxSizer:add(DirItem, DirLabel),
+  _ = wxSizer:add(DirItem, DirPicker),
+  _ = wxSizer:add(AddDirButtons, AddDirButton, ?BorderOpt),
+  _ = wxSizer:add(AddDirButtons, AddRecButton, ?BorderOpt),
+  _ = wxSizer:add(FileDirItem, FileItem),
+  _ = wxSizer:add(FileDirItem, AddButton, ?BorderOpt),
+  _ = wxSizer:add(FileDirItem, DirItem, ?BorderOpt),
+  _ = wxSizer:add(FileDirItem, AddDirButtons, ?BorderOpt),
+  _ = wxSizer:add(WarnButtons, ExplainWarnButton, ?BorderOpt),
+  _ = wxSizer:add(WarnButtons, ClearWarningsButton, ?BorderOpt),
+  _ = wxSizer:add(RunButtons, RunButton, ?BorderOpt),
+  _ = wxSizer:add(RunButtons, StopButton, ?BorderOpt),
+  _ = wxSizer:add(Buttons, WarnButtons),
+  _ = wxSizer:add(Buttons, wxStaticText:new(Frame, ?LABEL7, ""),
+		  [{flag, ?wxEXPAND}]),
+  _ = wxSizer:add(Buttons, RunButtons),
+  _ = wxFlexGridSizer:addGrowableCol(Buttons, 1),
+  _ = wxSizer:add(WarningsItem, WarningsLabel, Center),
+  _ = wxSizer:add(WarningsItem, WarningsBox, Opts3),
+  _ = wxSizer:add(WarningsItem, Buttons,
+		  [{flag, ?wxEXPAND bor ?wxALL}, ?Border]),
+  _ = wxSizer:add(Left, ChooseItem, Opts),
+  _ = wxSizer:add(Left, FileDirItem,
+		  [{proportion, 1}, {border, 60}, {flag, ?wxTOP}]),
+  _ = wxSizer:add(RightUp, FileTypeItem, ?BorderOpt),
+  _ = wxSizer:add(RightUp, LogItem, Opts3),
+  _ = wxSizer:add(Right, RightUp, Opts3),
+  _ = wxSizer:add(Right, WarningsItem, Opts3),
+  _ = wxSizer:add(Top, Left, Opts),
+  _ = wxSizer:add(Top, Right, Opts3),
+
+  _ = wxSizer:add(All, Top, Opts),
   wxWindow:setSizer(Frame, All),
   wxWindow:setSizeHints(Frame, {1150,600}),
   wxWindow:show(Frame),
@@ -294,91 +296,67 @@ create_window(Wx, #options{init_plts = InitPltFiles} = DialyzerOptions) ->
 
 createFileMenu() ->
   FileMenu = wxMenu:new(),
-  wxMenu:append(FileMenu, wxMenuItem:new([{id,   ?menuID_FILE_SAVE_WARNINGS},
-					  {text, "Save &Warnings"}])),
-  wxMenu:append(FileMenu, wxMenuItem:new([{id,   ?menuID_FILE_SAVE_LOG},
-					  {text, "Save &Log"}])),
-  wxMenu:append(FileMenu, wxMenuItem:new([{id,   ?menuID_FILE_QUIT},
-					  {text, "E&xit\tAlt-X"}])),
+  _ = wxMenu:append(FileMenu, wxMenuItem:new([{id, ?menuID_FILE_SAVE_WARNINGS},
+					      {text, "Save &Warnings"}])),
+  _ = wxMenu:append(FileMenu, wxMenuItem:new([{id,   ?menuID_FILE_SAVE_LOG},
+					      {text, "Save &Log"}])),
+  _ = wxMenu:append(FileMenu, wxMenuItem:new([{id,   ?menuID_FILE_QUIT},
+					      {text, "E&xit\tAlt-X"}])),
   FileMenu.
 
 createWarningsMenu() ->
   WarningsMenu = wxMenu:new(),
-  wxMenu:appendCheckItem(WarningsMenu, 
-			 ?menuID_WARN_MATCH_FAILURES,
-			 "Match failures"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_MATCH_FAILURES, true),
-  wxMenu:appendCheckItem(WarningsMenu, 
-			 ?menuID_WARN_FAIL_FUN_CALLS,
-			 "Failing function calls"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_FAIL_FUN_CALLS, true),
-  wxMenu:appendCheckItem(WarningsMenu, 
-			 ?menuID_WARN_BAD_FUN,
-			 "Bad fun applications"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_BAD_FUN, true),
-  wxMenu:appendCheckItem(WarningsMenu,
-			 ?menuID_WARN_OPAQUE,
-			 "Opaqueness violations"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_OPAQUE, true),
-  wxMenu:appendCheckItem(WarningsMenu,
-			 ?menuID_WARN_LIST_CONSTR,
-			 "Improper list constructions"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_LIST_CONSTR, true),
-  wxMenu:appendCheckItem(WarningsMenu, 
-			 ?menuID_WARN_UNUSED_FUN,
-			 "Unused functions"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_UNUSED_FUN, true),
-  wxMenu:appendCheckItem(WarningsMenu, 
-			 ?menuID_WARN_ERROR_HANDLING_FUN,
-			 "Error handling functions"),
-  wxMenu:appendCheckItem(WarningsMenu, 
-			 ?menuID_WARN_NO_RETURN_FUN,
-			 "Functions of no return"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_NO_RETURN_FUN, true),
-  wxMenu:appendCheckItem(WarningsMenu,
-			 ?menuID_WARN_UNEXPORTED_FUN,
-			 "Call to unexported function"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_UNEXPORTED_FUN, true),
-  wxMenu:appendCheckItem(WarningsMenu,
-			 ?menuID_WARN_RACE_CONDITIONS,
-			 "Possible race conditions"),
-  wxMenu:appendCheckItem(WarningsMenu,
-			 ?menuID_WARN_WRONG_CONTRACTS,
-			 "Wrong contracts"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_WRONG_CONTRACTS, true),
-  wxMenu:appendCheckItem(WarningsMenu,
-			 ?menuID_WARN_CONTRACT_SYNTAX,
-			 "Wrong contract syntax"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_CONTRACT_SYNTAX, true),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_MATCH_FAILURES, "Match failures"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_FAIL_FUN_CALLS,
+		 "Failing function calls"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_BAD_FUN, "Bad fun applications"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_OPAQUE, "Opaqueness violations"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_LIST_CONSTR,
+		 "Improper list constructions"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_UNUSED_FUN, "Unused functions"),
+  _ = wxMenu:appendCheckItem(WarningsMenu, ?menuID_WARN_ERROR_HANDLING_FUN,
+			     "Error handling functions"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_NO_RETURN_FUN,
+		 "Functions of no return"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_UNEXPORTED_FUN,
+		 "Call to unexported function"),
+  _ = wxMenu:appendCheckItem(WarningsMenu, ?menuID_WARN_RACE_CONDITIONS,
+			     "Possible race conditions"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_WRONG_CONTRACTS, "Wrong contracts"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_CONTRACT_SYNTAX,
+		 "Wrong contract syntax"),
   WarningsMenu.
 
+addCheckedItem(Menu, ItemId, Str) ->
+  _ = wxMenu:appendCheckItem(Menu, ItemId, Str), 
+  wxMenu:check(Menu, ItemId, true).
+
 createPltMenu() ->
   PltMenu = wxMenu:new(),
-  wxMenu:appendCheckItem(PltMenu, 
-			 ?menuID_PLT_INIT_EMPTY,
-			 "Init with empty PLT"),
-  wxMenu:append(PltMenu, wxMenuItem:new([{id,   ?menuID_PLT_SHOW_CONTENTS},
-					 {text, "Show contents"}])),
-  wxMenu:append(PltMenu, wxMenuItem:new([{id,   ?menuID_PLT_SEARCH_CONTENTS},
-					 {text, "Search contents"}])),
+  _ = wxMenu:appendCheckItem(PltMenu, ?menuID_PLT_INIT_EMPTY,
+			     "Init with empty PLT"),
+  _ = wxMenu:append(PltMenu, wxMenuItem:new([{id, ?menuID_PLT_SHOW_CONTENTS},
+					     {text, "Show contents"}])),
+  _ = wxMenu:append(PltMenu, wxMenuItem:new([{id, ?menuID_PLT_SEARCH_CONTENTS},
+					     {text, "Search contents"}])),
   PltMenu.
 
 createOptionsMenu() ->
   OptsMenu  = wxMenu:new(),
-  wxMenu:append(OptsMenu, wxMenuItem:new([{id,   ?menuID_OPTIONS_MACRO},
-					  {text, "Manage Macro Definitions"}])),
-  wxMenu:append(OptsMenu, wxMenuItem:new([{id,   ?menuID_OPTIONS_INCLUDE_DIR},
-					  {text, "Manage Include Directories"}])),
+  _ = wxMenu:append(OptsMenu, wxMenuItem:new([{id, ?menuID_OPTIONS_MACRO},
+					      {text, "Manage Macro Definitions"}])),
+  _ = wxMenu:append(OptsMenu, wxMenuItem:new([{id, ?menuID_OPTIONS_INCLUDE_DIR},
+					      {text, "Manage Include Directories"}])),
   OptsMenu.
 
 createHelpMenu() ->
   HelpMenu = wxMenu:new(),
-  wxMenu:append(HelpMenu, wxMenuItem:new([{id,   ?menuID_HELP_MANUAL},
-					  {text, "Manual"}])),
-  wxMenu:append(HelpMenu, wxMenuItem:new([{id,   ?menuID_HELP_WARNING_OPTIONS},
-					  {text, "Warning Options"}])),
-  wxMenu:append(HelpMenu, wxMenuItem:new([{id,   ?menuID_HELP_ABOUT},
-					  {text, "About"}])),
+  _ = wxMenu:append(HelpMenu, wxMenuItem:new([{id, ?menuID_HELP_MANUAL},
+					      {text, "Manual"}])),
+  _ = wxMenu:append(HelpMenu, wxMenuItem:new([{id, ?menuID_HELP_WARNING_OPTIONS},
+					      {text, "Warning Options"}])),
+  _ = wxMenu:append(HelpMenu, wxMenuItem:new([{id, ?menuID_HELP_ABOUT},
+					      {text, "About"}])),
   HelpMenu.
 
 %% ----------------------------------------------------------------
@@ -583,20 +561,20 @@ search_doc_plt(#gui_state{gui = Wx} = State) ->
   ArLayout = wxBoxSizer:new(?wxVERTICAL),
   Buttons = wxBoxSizer:new(?wxHORIZONTAL),
 
-  wxSizer:add(ModLayout, ModLabel, ?BorderOpt),
-  wxSizer:add(ModLayout,ModText, ?BorderOpt),
-  wxSizer:add(FunLayout, FunLabel, ?BorderOpt),
-  wxSizer:add(FunLayout,FunText, ?BorderOpt),
-  wxSizer:add(ArLayout, ArLabel, ?BorderOpt),
-  wxSizer:add(ArLayout,ArText, ?BorderOpt),
-  wxSizer:add(Buttons, SearchButton, ?BorderOpt),
-  wxSizer:add(Buttons,Cancel, ?BorderOpt),
-
-  wxSizer:add(Top, ModLayout),
-  wxSizer:add(Top, FunLayout),
-  wxSizer:add(Top, ArLayout),
-  wxSizer:add(Layout, Top,[{flag, ?wxALIGN_CENTER}]),
-  wxSizer:add(Layout, Buttons,[{flag, ?wxALIGN_CENTER bor ?wxBOTTOM}]),
+  _ = wxSizer:add(ModLayout, ModLabel, ?BorderOpt),
+  _ = wxSizer:add(ModLayout, ModText, ?BorderOpt),
+  _ = wxSizer:add(FunLayout, FunLabel, ?BorderOpt),
+  _ = wxSizer:add(FunLayout,FunText, ?BorderOpt),
+  _ = wxSizer:add(ArLayout, ArLabel, ?BorderOpt),
+  _ = wxSizer:add(ArLayout,ArText, ?BorderOpt),
+  _ = wxSizer:add(Buttons, SearchButton, ?BorderOpt),
+  _ = wxSizer:add(Buttons,Cancel, ?BorderOpt),
+
+  _ = wxSizer:add(Top, ModLayout),
+  _ = wxSizer:add(Top, FunLayout),
+  _ = wxSizer:add(Top, ArLayout),
+  _ = wxSizer:add(Layout, Top,[{flag, ?wxALIGN_CENTER}]),
+  _ = wxSizer:add(Layout, Buttons,[{flag, ?wxALIGN_CENTER bor ?wxBOTTOM}]),
   wxFrame:connect(Dialog, close_window),
   wxWindow:setSizer(Dialog, Layout),
   wxFrame:show(Dialog),
@@ -654,14 +632,15 @@ error_sms(State, Message) ->
   output_sms(State, ?DIALYZER_ERROR_TITLE, Message, error).
 
 output_sms(#gui_state{frame = Frame}, Title, Message, Type) ->
-  case Type of
-    error ->
-      MessageWin = wxMessageDialog:new(Frame,Message,[{caption, Title},{style, ?wxOK bor ?wxICON_ERROR}]);
-    info ->
-       MessageWin = wxMessageDialog:new(Frame,Message,[{caption, Title},{style, ?wxOK bor ?wxICON_INFORMATION}])
-  end,
+  Style = case Type of
+	    error -> ?wxOK bor ?wxICON_ERROR;
+	    info  -> ?wxOK bor ?wxICON_INFORMATION
+	  end,
+  Options = [{caption, Title}, {style, Style}],
+  MessageWin = wxMessageDialog:new(Frame, Message, Options),
   wxWindow:setSizeHints(MessageWin, {350,100}),
-  wxDialog:showModal(MessageWin).
+  wxDialog:showModal(MessageWin),
+  ok.
 
 free_editor(#gui_state{gui = Wx, frame = Frame}, Title, Contents0) ->
   Contents = lists:flatten(Contents0),
@@ -685,8 +664,9 @@ free_editor(#gui_state{gui = Wx, frame = Frame}, Title, Contents0) ->
   wxButton:connect(Ok, command_button_clicked),
   Layout = wxBoxSizer:new(?wxVERTICAL),
   
-  wxSizer:add(Layout, Editor, ?BorderOpt),
-  wxSizer:add(Layout, Ok, [{flag, ?wxALIGN_CENTER bor ?wxBOTTOM bor ?wxALL}, ?Border]),
+  _ = wxSizer:add(Layout, Editor, ?BorderOpt),
+  Flag = ?wxALIGN_CENTER bor ?wxBOTTOM bor ?wxALL,
+  _ = wxSizer:add(Layout, Ok, [{flag, Flag}, ?Border]),
   wxWindow:setSizer(Win, Layout),
   wxWindow:show(Win),
   show_info_loop(Frame, Win).
@@ -696,7 +676,7 @@ show_info_loop(Frame, Win) ->
     #wx{id = ?Message_Ok, event = #wxCommand{type = command_button_clicked}} ->
       wxWindow:destroy(Win);
     #wx{id = ?Message, event = #wxClose{type = close_window}} ->
-       wxWindow:destroy(Win);
+      wxWindow:destroy(Win);
     #wx{event = #wxClose{type = close_window}} ->
       wxWindow:destroy(Frame)
   end.
@@ -921,13 +901,14 @@ save_file(#gui_state{frame = Frame, warnings_box = WBox, log = Log} = State, Typ
 				     {message, Message},
 				     {style,?wxFD_SAVE bor ?wxFD_OVERWRITE_PROMPT}]),
       case wxFileDialog:showModal(FileDialog) of
-	?wxID_OK -> Path = wxFileDialog:getPath(FileDialog),
-		    case wxTextCtrl:saveFile(Box,[{file,Path}]) of
-		      true -> ok;
-		      false -> error_sms(State,"Could not write to file:\n" ++ Path)
-		    end;
+	?wxID_OK ->
+	  Path = wxFileDialog:getPath(FileDialog),
+	  case wxTextCtrl:saveFile(Box,[{file,Path}]) of
+	    true -> ok;
+	    false -> error_sms(State, "Could not write to file:\n" ++ Path)
+	  end;
 	?wxID_CANCEL -> wxWindow:destroy(FileDialog);
-	_ -> error_sms(State,"Could not write to file:\n")
+	_ -> error_sms(State, "Could not write to file:\n")
       end
   end.
 					
@@ -961,16 +942,16 @@ include_dialog(#gui_state{gui = Wx, frame = Frame, options = Options}) ->
   Buttons = wxBoxSizer:new(?wxHORIZONTAL),
   Buttons1 = wxBoxSizer:new(?wxHORIZONTAL),
 
-  wxSizer:add(Layout, DirLabel, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
-  wxSizer:add(Layout, DirPicker, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
-  wxSizer:add(Layout,AddButton, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
-  wxSizer:add(Layout,Box, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
-  wxSizer:add(Buttons, DeleteButton, ?BorderOpt),
-  wxSizer:add(Buttons, DeleteAllButton, ?BorderOpt),
-  wxSizer:add(Layout,Buttons, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
-  wxSizer:add(Buttons1, Ok, ?BorderOpt),
-  wxSizer:add(Buttons1,Cancel, ?BorderOpt),
-  wxSizer:add(Layout,Buttons1,[{flag, ?wxALIGN_RIGHT bor ?wxBOTTOM}]),
+  _ = wxSizer:add(Layout, DirLabel, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
+  _ = wxSizer:add(Layout, DirPicker, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
+  _ = wxSizer:add(Layout,AddButton, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
+  _ = wxSizer:add(Layout,Box, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
+  _ = wxSizer:add(Buttons, DeleteButton, ?BorderOpt),
+  _ = wxSizer:add(Buttons, DeleteAllButton, ?BorderOpt),
+  _ = wxSizer:add(Layout,Buttons, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
+  _ = wxSizer:add(Buttons1, Ok, ?BorderOpt),
+  _ = wxSizer:add(Buttons1,Cancel, ?BorderOpt),
+  _ = wxSizer:add(Layout,Buttons1,[{flag, ?wxALIGN_RIGHT bor ?wxBOTTOM}]),
 
   wxFrame:connect(Dialog, close_window),
   wxWindow:setSizer(Dialog, Layout),
@@ -1058,21 +1039,21 @@ macro_dialog(#gui_state{gui = Wx, frame = Frame, options = Options}) ->
   Buttons = wxBoxSizer:new(?wxHORIZONTAL),
   Buttons1 = wxBoxSizer:new(?wxHORIZONTAL),
 
-  wxSizer:add(MacroItem, MacroLabel, ?BorderOpt),
-  wxSizer:add(MacroItem, MacroText, ?BorderOpt),
-  wxSizer:add(TermItem, TermLabel, ?BorderOpt),
-  wxSizer:add(TermItem, TermText, ?BorderOpt),
-  wxSizer:add(Item, MacroItem),
-  wxSizer:add(Item, TermItem),
-  wxSizer:add(Layout, Item, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
-  wxSizer:add(Layout, AddButton, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
-  wxSizer:add(Layout, Box, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
-  wxSizer:add(Buttons, DeleteButton, ?BorderOpt),
-  wxSizer:add(Buttons, DeleteAllButton, ?BorderOpt),
-  wxSizer:add(Layout, Buttons, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
-  wxSizer:add(Buttons1, Ok, ?BorderOpt),
-  wxSizer:add(Buttons1, Cancel, ?BorderOpt),
-  wxSizer:add(Layout, Buttons1, [{flag, ?wxALIGN_RIGHT bor ?wxBOTTOM}]),
+  _ = wxSizer:add(MacroItem, MacroLabel, ?BorderOpt),
+  _ = wxSizer:add(MacroItem, MacroText, ?BorderOpt),
+  _ = wxSizer:add(TermItem, TermLabel, ?BorderOpt),
+  _ = wxSizer:add(TermItem, TermText, ?BorderOpt),
+  _ = wxSizer:add(Item, MacroItem),
+  _ = wxSizer:add(Item, TermItem),
+  _ = wxSizer:add(Layout, Item, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
+  _ = wxSizer:add(Layout, AddButton, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
+  _ = wxSizer:add(Layout, Box, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
+  _ = wxSizer:add(Buttons, DeleteButton, ?BorderOpt),
+  _ = wxSizer:add(Buttons, DeleteAllButton, ?BorderOpt),
+  _ = wxSizer:add(Layout, Buttons, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
+  _ = wxSizer:add(Buttons1, Ok, ?BorderOpt),
+  _ = wxSizer:add(Buttons1, Cancel, ?BorderOpt),
+  _ = wxSizer:add(Layout, Buttons1, [{flag, ?wxALIGN_RIGHT bor ?wxBOTTOM}]),
 
   wxFrame:connect(Dialog, close_window),
   wxWindow:setSizer(Dialog, Layout),
@@ -1216,13 +1197,14 @@ show_explanation(#gui_state{gui = Wx} = State, Explanation) ->
       wxButton:connect(Ok, command_button_clicked),
       Layout = wxBoxSizer:new(?wxVERTICAL),
       Buttons = wxBoxSizer:new(?wxHORIZONTAL),
-      wxSizer:add(Buttons, ExplButton, ?BorderOpt),
-      wxSizer:add(Buttons, Ok, ?BorderOpt),
-      wxSizer:add(Layout, Editor,[{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
-      wxSizer:add(Layout, Buttons,[{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
+      _ = wxSizer:add(Buttons, ExplButton, ?BorderOpt),
+      _ = wxSizer:add(Buttons, Ok, ?BorderOpt),
+      _ = wxSizer:add(Layout, Editor, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
+      _ = wxSizer:add(Layout, Buttons,[{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
       wxWindow:setSizer(Win, Layout),
       wxWindow:show(Win),
-      show_explanation_loop(State#gui_state{explanation_box = Editor}, Win, Explanation)
+      NewState = State#gui_state{explanation_box = Editor},
+      show_explanation_loop(NewState, Win, Explanation)
   end.
   
 show_explanation_loop(#gui_state{frame = Frame, expl_pid = ExplPid} = State, Win, Explanation) ->
diff --git a/lib/dialyzer/src/dialyzer_options.erl b/lib/dialyzer/src/dialyzer_options.erl
index 866650a0b2..06672e595f 100644
--- a/lib/dialyzer/src/dialyzer_options.erl
+++ b/lib/dialyzer/src/dialyzer_options.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -194,6 +194,11 @@ build_options([{OptionName, Value} = Term|Rest], Options) ->
     callgraph_file ->
       assert_filename(Value),
       build_options(Rest, Options#options{callgraph_file = Value});
+    timing ->
+      build_options(Rest, Options#options{timing = Value});
+    solvers ->
+      assert_solvers(Value),
+      build_options(Rest, Options#options{solvers = Value});
     _ ->
       bad_option("Unknown dialyzer command line option", Term)
   end;
@@ -255,6 +260,15 @@ is_plt_mode(plt_remove)   -> true;
 is_plt_mode(plt_check)    -> true;
 is_plt_mode(succ_typings) -> false.
 
+assert_solvers([]) ->
+  ok;
+assert_solvers([v1|Terms]) ->
+  assert_solvers(Terms);
+assert_solvers([v2|Terms]) ->
+  assert_solvers(Terms);
+assert_solvers([Term|_]) ->
+  bad_option("Illegal value for solver", Term).
+
 -spec build_warnings([atom()], [dial_warning()]) -> [dial_warning()].
 
 build_warnings([Opt|Opts], Warnings) ->
diff --git a/lib/dialyzer/src/dialyzer_plt.erl b/lib/dialyzer/src/dialyzer_plt.erl
index 06eaadad9c..5f64099210 100644
--- a/lib/dialyzer/src/dialyzer_plt.erl
+++ b/lib/dialyzer/src/dialyzer_plt.erl
@@ -55,7 +55,10 @@
 	 plt_and_info_from_file/1,
 	 get_specs/1,
 	 get_specs/4,
-	 to_file/4]).
+	 to_file/4,
+	 get_mini_plt/1,
+	 restore_full_plt/2
+	]).
 
 %% Debug utilities
 -export([pp_non_returning/0, pp_mod/1]).
@@ -82,7 +85,13 @@
 	      contracts      = table_new() :: dict(),
 	      callbacks      = table_new() :: dict(),
               exported_types = sets:new()  :: set()}).
--opaque plt() :: #plt{}.
+
+-record(mini_plt, {info      :: ets:tid(),
+		   contracts :: ets:tid(),
+		   callbacks :: ets:tid()
+		  }).
+
+-opaque plt() :: #plt{} | #mini_plt{}.
 
 -include("dialyzer.hrl").
 
@@ -132,51 +141,48 @@ delete_list(#plt{info = Info, types = Types,
 
 -spec insert_contract_list(plt(), dialyzer_contracts:plt_contracts()) -> plt().
 
-insert_contract_list(#plt{contracts = Contracts} = PLT, List) ->
-  PLT#plt{contracts = table_insert_list(Contracts, List)}.
+insert_contract_list(#mini_plt{contracts = Contracts} = PLT, List) ->
+  true = ets:insert(Contracts, List),
+  PLT.
 
 -spec insert_callbacks(plt(), dialyzer_codeserver:codeserver()) -> plt().
 
 insert_callbacks(#plt{callbacks = Callbacks} = Plt, Codeserver) ->
-  FunPreferNew = fun(_Key, _Val1, Val2) -> Val2 end,
-  FunDictMerger =
-    fun(_Key, Value, AccIn) -> dict:merge(FunPreferNew, Value, AccIn) end,
-  MergedCallbacks = dict:fold(FunDictMerger, dict:new(),
-			      dialyzer_codeserver:get_callbacks(Codeserver)),
-  List = dict:to_list(MergedCallbacks),
+  List = dialyzer_codeserver:get_callbacks(Codeserver),
   Plt#plt{callbacks = table_insert_list(Callbacks, List)}.
 
 -spec lookup_contract(plt(), mfa_patt()) -> 'none' | {'value', #contract{}}.
 
-lookup_contract(#plt{contracts = Contracts},
+lookup_contract(#mini_plt{contracts = ETSContracts},
 		{M, F, _} = MFA) when is_atom(M), is_atom(F) ->
-  table_lookup(Contracts, MFA).
+  ets_table_lookup(ETSContracts, MFA).
 
 -spec lookup_callbacks(plt(), module()) ->
-	 [{mfa(), {{Filename::string(), Line::pos_integer()}, #contract{}}}].
+	 'none' | {'value', [{mfa(), {{Filename::string(),
+				       Line::pos_integer()},
+				      #contract{}}}]}.
 
-lookup_callbacks(#plt{callbacks = Callbacks}, Mod) when is_atom(Mod) ->
-  FunModFilter =
-    fun({M, _F, _A}, _Val) -> M =:= Mod;
-       (       _Key, _Val) -> false
-    end,
-  ModCallbacks = dict:filter(FunModFilter, Callbacks),
-  dict:to_list(ModCallbacks).
+lookup_callbacks(#mini_plt{callbacks = ETSCallbacks}, Mod) when is_atom(Mod) ->
+  ets_table_lookup(ETSCallbacks, Mod).
 
 -type ret_args_types() :: {erl_types:erl_type(), [erl_types:erl_type()]}.
 
 -spec insert_list(plt(), [{mfa() | integer(), ret_args_types()}]) -> plt().
 
-insert_list(#plt{info = Info} = PLT, List) ->
-  PLT#plt{info = table_insert_list(Info, List)}.
+insert_list(#mini_plt{info = Info} = PLT, List) ->
+  true = ets:insert(Info, List),
+  PLT.
 
 -spec lookup(plt(), integer() | mfa_patt()) ->
         'none' | {'value', ret_args_types()}.
 
-lookup(#plt{info = Info}, {M, F, _} = MFA) when is_atom(M), is_atom(F) ->
-  table_lookup(Info, MFA);
-lookup(#plt{info = Info}, Label) when is_integer(Label) ->
-  table_lookup(Info, Label).
+lookup(Plt, {M, F, _} = MFA) when is_atom(M), is_atom(F) ->
+  lookup_1(Plt, MFA);
+lookup(Plt, Label) when is_integer(Label) ->
+  lookup_1(Plt, Label).
+
+lookup_1(#mini_plt{info = Info}, MFAorLabel) ->
+  ets_table_lookup(Info, MFAorLabel).
 
 -spec insert_types(plt(), dict()) -> plt().
 
@@ -503,6 +509,34 @@ init_md5_list_1([], DiffList, Acc) ->
 init_md5_list_1(Md5List, [], Acc) ->
   {ok, lists:reverse(Acc, Md5List)}.
 
+-spec get_mini_plt(plt()) -> plt().
+
+get_mini_plt(#plt{info = Info, contracts = Contracts, callbacks = Callbacks}) ->
+  [ETSInfo, ETSContracts, ETSCallbacks] =
+    [ets:new(Name, [public]) || Name <- [plt_info, plt_contracts, plt_callbacks]],
+  CallbackList = dict:to_list(Callbacks),
+  CallbacksByModule =
+    [{M, [Cb || {{M1,_,_},_} = Cb <- CallbackList, M1 =:= M]} ||
+      M <- lists:usort([M || {{M,_,_},_} <- CallbackList])],
+  [true, true] =
+    [ets:insert(ETS, dict:to_list(Data)) ||
+      {ETS, Data} <- [{ETSInfo, Info}, {ETSContracts, Contracts}]],
+  true = ets:insert(ETSCallbacks, CallbacksByModule),
+  #mini_plt{info = ETSInfo, contracts = ETSContracts, callbacks = ETSCallbacks};
+get_mini_plt(undefined) ->
+  undefined.
+
+-spec restore_full_plt(plt(), plt()) -> plt().
+
+restore_full_plt(#mini_plt{info = ETSInfo, contracts = ETSContracts}, Plt) ->
+  Info = dict:from_list(ets:tab2list(ETSInfo)),
+  Contracts = dict:from_list(ets:tab2list(ETSContracts)),
+  ets:delete(ETSContracts),
+  ets:delete(ETSInfo),
+  Plt#plt{info = Info, contracts = Contracts};
+restore_full_plt(undefined, undefined) ->
+  undefined.
+
 %%---------------------------------------------------------------------------
 %% Edoc
 
@@ -595,6 +629,13 @@ table_lookup(Plt, Obj) ->
     {ok, Val} -> {value, Val}
   end.
 
+ets_table_lookup(Plt, Obj) ->
+  try ets:lookup_element(Plt, Obj, 2) of
+      Val -> {value, Val}
+  catch
+    _:_ -> none
+  end.
+
 table_lookup_module(Plt, Mod) ->
   List = dict:fold(fun(Key, Val, Acc) ->
 		       case Key of
diff --git a/lib/dialyzer/src/dialyzer_races.erl b/lib/dialyzer/src/dialyzer_races.erl
index cc635b0eef..2aa8343bce 100644
--- a/lib/dialyzer/src/dialyzer_races.erl
+++ b/lib/dialyzer/src/dialyzer_races.erl
@@ -36,6 +36,7 @@
 -export([beg_clause_new/3, cleanup/1, end_case_new/1, end_clause_new/3,
          get_curr_fun/1, get_curr_fun_args/1, get_new_table/1,
          get_race_analysis/1, get_race_list/1, get_race_list_size/1,
+	 get_race_list_and_size/1,
          let_tag_new/2, new/0, put_curr_fun/3, put_fun_args/2,
          put_race_analysis/2, put_race_list/3]).
 
@@ -346,6 +347,7 @@ fixup_race_list(RaceWarnTag, WarnVarArgs, State) ->
   DepList2 =
     fixup_race_list_helper(NewParents, Calls, CurrFun, WarnVarArgs,
                            RaceWarnTag, NewState),
+  dialyzer_dataflow:dispose_state(CleanState),
   lists:usort(cleanup_dep_calls(DepList1 ++ DepList2)).
 
 fixup_race_list_helper(Parents, Calls, CurrFun, WarnVarArgs, RaceWarnTag,
@@ -380,13 +382,15 @@ fixup_race_forward_pullout(CurrFun, CurrFunLabel, Calls, Code, RaceList,
                            InitFun, WarnVarArgs, RaceWarnTag, RaceVarMap,
                            FunDefVars, FunCallVars, FunArgTypes, NestingLevel,
                            State) ->
+  TState = dialyzer_dataflow:state__duplicate(State),
   {DepList, NewCurrFun, NewCurrFunLabel, NewCalls,
    NewCode, NewRaceList, NewRaceVarMap, NewFunDefVars,
    NewFunCallVars, NewFunArgTypes, NewNestingLevel} =
     fixup_race_forward(CurrFun, CurrFunLabel, Calls, Code, RaceList,
                        InitFun, WarnVarArgs, RaceWarnTag, RaceVarMap,
                        FunDefVars, FunCallVars, FunArgTypes, NestingLevel,
-                       cleanup_race_code(State)),
+                       cleanup_race_code(TState)),
+  dialyzer_dataflow:dispose_state(TState),
   case NewCode of
     [] -> DepList;
     [#fun_call{caller = NewCurrFun, callee = Call, arg_types = FunTypes,
@@ -1754,7 +1758,10 @@ compare_var_list(Var, VarList, RaceVarMap) ->
 
 ets_list_args(MaybeList) ->
   case is_list(MaybeList) of
-    true -> [ets_tuple_args(T) || T <- MaybeList];
+    true ->
+      try [ets_tuple_args(T) || T <- MaybeList]
+      catch _:_ -> [?no_label]
+      end;
     false -> [ets_tuple_args(MaybeList)]
  end.
 
@@ -2434,6 +2441,12 @@ get_race_list(#races{race_list = RaceList}) ->
 get_race_list_size(#races{race_list_size = RaceListSize}) ->
   RaceListSize.
 
+-spec get_race_list_and_size(races()) -> {code(), non_neg_integer()}.
+
+get_race_list_and_size(#races{race_list = RaceList,
+			      race_list_size = RaceListSize}) ->
+  {RaceList, RaceListSize}.
+
 -spec let_tag_new(var_to_map1(), var_to_map1()) -> #let_tag{}.
 
 let_tag_new(Var, Arg) ->
diff --git a/lib/dialyzer/src/dialyzer_succ_typings.erl b/lib/dialyzer/src/dialyzer_succ_typings.erl
index 5982603b7b..84379642bf 100644
--- a/lib/dialyzer/src/dialyzer_succ_typings.erl
+++ b/lib/dialyzer/src/dialyzer_succ_typings.erl
@@ -28,15 +28,22 @@
 -module(dialyzer_succ_typings).
 
 -export([analyze_callgraph/3, 
-	 analyze_callgraph/4,
-	 get_warnings/6]).
+	 analyze_callgraph/6,
+	 get_warnings/8
+	]).
 
-%% These are only intended as debug functions.
--export([doit/1,
-	 get_top_level_signatures/3]).
+-export([
+	 find_succ_types_for_scc/2,
+	 refine_one_module/2,
+	 find_required_by/2,
+	 find_depends_on/2,
+	 collect_warnings/2,
+	 lookup_names/2
+	]).
+
+-export_type([typesig_init_data/0, dataflow_init_data/0, warnings_init_data/0]).
 
 %%-define(DEBUG, true).
-%%-define(DEBUG_PP, true).
 
 -ifdef(DEBUG).
 -define(debug(X__, Y__), io:format(X__, Y__)).
@@ -54,11 +61,21 @@
 %% State record -- local to this module
 
 -type parent() :: 'none' | pid().
+-type typesig_init_data() :: term().
+-type dataflow_init_data() :: term().
+-type warnings_init_data() :: term().
+
+-type fixpoint_init_data() :: typesig_init_data() | dataflow_init_data().
+
+-type scc()             :: [mfa_or_funlbl()] | [module()].
+
 
 -record(st, {callgraph      :: dialyzer_callgraph:callgraph(),
 	     codeserver     :: dialyzer_codeserver:codeserver(),
 	     no_warn_unused :: set(),
 	     parent = none  :: parent(),
+	     timing_server  :: dialyzer_timing:timing_server(),
+             solvers        :: [solver()],
 	     plt            :: dialyzer_plt:plt()}).
 
 %%--------------------------------------------------------------------
@@ -68,60 +85,90 @@
 	 dialyzer_plt:plt().
 
 analyze_callgraph(Callgraph, Plt, Codeserver) ->
-  analyze_callgraph(Callgraph, Plt, Codeserver, none).
+  analyze_callgraph(Callgraph, Plt, Codeserver, none, [], none).
 
 -spec analyze_callgraph(dialyzer_callgraph:callgraph(), dialyzer_plt:plt(),
-			dialyzer_codeserver:codeserver(), parent()) ->
+			dialyzer_codeserver:codeserver(),
+			dialyzer_timing:timing_server(),
+                        [solver()], parent()) ->
          dialyzer_plt:plt().
 
-analyze_callgraph(Callgraph, Plt, Codeserver, Parent) ->
-  State = #st{callgraph = Callgraph, plt = Plt, 
-	      codeserver = Codeserver, parent = Parent},
-  NewState = get_refined_success_typings(State),
-  NewState#st.plt.
+analyze_callgraph(Callgraph, Plt, Codeserver, TimingServer, Solvers, Parent) ->
+  NewState =
+    init_state_and_get_success_typings(Callgraph, Plt, Codeserver,
+				       TimingServer, Solvers, Parent),
+  dialyzer_plt:restore_full_plt(NewState#st.plt, Plt).
 
 %%--------------------------------------------------------------------
 
-get_refined_success_typings(State) ->
-  case find_succ_typings(State) of
+init_state_and_get_success_typings(Callgraph, Plt, Codeserver,
+				   TimingServer, Solvers, Parent) ->
+  {SCCs, Callgraph1} =
+    ?timing(TimingServer, "order", dialyzer_callgraph:finalize(Callgraph)),
+  State = #st{callgraph = Callgraph1, plt = dialyzer_plt:get_mini_plt(Plt),
+	      codeserver = Codeserver, parent = Parent,
+	      timing_server = TimingServer, solvers = Solvers},
+  get_refined_success_typings(SCCs, State).
+
+get_refined_success_typings(SCCs, #st{callgraph = Callgraph,
+				      timing_server = TimingServer} = State) ->
+  case find_succ_typings(SCCs, State) of
     {fixpoint, State1} -> State1;
     {not_fixpoint, NotFixpoint1, State1} ->
-      Callgraph = State1#st.callgraph,
-      NotFixpoint2 = [lookup_name(F, Callgraph) || F <- NotFixpoint1],
-      ModulePostorder = 
-	dialyzer_callgraph:module_postorder_from_funs(NotFixpoint2, Callgraph),
-      case refine_succ_typings(ModulePostorder, State1) of
+      {ModulePostorder, ModCallgraph} =
+	?timing(
+	   TimingServer, "order", _C1,
+	   dialyzer_callgraph:module_postorder_from_funs(NotFixpoint1,
+							 Callgraph)),
+      ModState = State1#st{callgraph = ModCallgraph},
+      case refine_succ_typings(ModulePostorder, ModState) of
 	{fixpoint, State2} ->
 	  State2;
-	{not_fixpoint, NotFixpoint3, State2} ->
-	  Callgraph1 = State2#st.callgraph,
+	{not_fixpoint, NotFixpoint2, State2} ->
 	  %% Need to reset the callgraph.
-	  NotFixpoint4 = [lookup_name(F, Callgraph1) || F <- NotFixpoint3],
-	  Callgraph2 = dialyzer_callgraph:reset_from_funs(NotFixpoint4, 
-							  Callgraph1),
-	  get_refined_success_typings(State2#st{callgraph = Callgraph2})
+	  {NewSCCs, Callgraph2} =
+	    ?timing(TimingServer, "order", _C2,
+		    dialyzer_callgraph:reset_from_funs(NotFixpoint2,
+						       ModCallgraph)),
+	  NewState = State2#st{callgraph = Callgraph2},
+	  get_refined_success_typings(NewSCCs, NewState)
       end
   end.
 
 -type doc_plt() :: 'undefined' | dialyzer_plt:plt().
 -spec get_warnings(dialyzer_callgraph:callgraph(), dialyzer_plt:plt(),
 		   doc_plt(), dialyzer_codeserver:codeserver(), set(),
-		   pid()) ->
+		   dialyzer_timing:timing_server(), [solver()], pid()) ->
 	 {[dial_warning()], dialyzer_plt:plt(), doc_plt()}.
 
-get_warnings(Callgraph, Plt, DocPlt, Codeserver, NoWarnUnused, Parent) ->
-  InitState = #st{callgraph = Callgraph, codeserver = Codeserver,
-		  no_warn_unused = NoWarnUnused, parent = Parent, plt = Plt},
-  NewState = get_refined_success_typings(InitState),
+get_warnings(Callgraph, Plt, DocPlt, Codeserver,
+	     NoWarnUnused, TimingServer, Solvers, Parent) ->
+  InitState =
+    init_state_and_get_success_typings(Callgraph, Plt, Codeserver,
+				       TimingServer, Solvers, Parent),
+  NewState = InitState#st{no_warn_unused = NoWarnUnused},
   Mods = dialyzer_callgraph:modules(NewState#st.callgraph),
-  CWarns = dialyzer_contracts:get_invalid_contract_warnings(Mods, Codeserver,
-							    NewState#st.plt),
-  get_warnings_from_modules(Mods, NewState, DocPlt, CWarns).
-
-get_warnings_from_modules([M|Ms], State, DocPlt, Acc) when is_atom(M) ->
-  send_log(State#st.parent, io_lib:format("Getting warnings for ~w\n", [M])),
+  MiniPlt = NewState#st.plt,
+  CWarns =
+    dialyzer_contracts:get_invalid_contract_warnings(Mods, Codeserver, MiniPlt),
+  MiniDocPlt = dialyzer_plt:get_mini_plt(DocPlt),
+  ModWarns =
+    ?timing(TimingServer, "warning",
+	    get_warnings_from_modules(Mods, NewState, MiniDocPlt)),
+  {postprocess_warnings(CWarns ++ ModWarns, Codeserver),
+   dialyzer_plt:restore_full_plt(MiniPlt, Plt),
+   dialyzer_plt:restore_full_plt(MiniDocPlt, DocPlt)}.
+
+get_warnings_from_modules(Mods, State, DocPlt) ->
   #st{callgraph = Callgraph, codeserver = Codeserver,
-      no_warn_unused = NoWarnUnused, plt = Plt} = State,
+      no_warn_unused = NoWarnUnused, plt = Plt,
+      timing_server = TimingServer} = State,
+  Init = {Codeserver, Callgraph, NoWarnUnused, Plt, DocPlt},
+  dialyzer_coordinator:parallel_job(warnings, Mods, Init, TimingServer).
+
+-spec collect_warnings(module(), warnings_init_data()) -> [dial_warning()].
+
+collect_warnings(M, {Codeserver, Callgraph, NoWarnUnused, Plt, DocPlt}) ->
   ModCode = dialyzer_codeserver:lookup_mod_code(M, Codeserver),
   Records = dialyzer_codeserver:lookup_mod_records(M, Codeserver),
   Contracts = dialyzer_codeserver:lookup_mod_contracts(M, Codeserver),
@@ -129,28 +176,27 @@ get_warnings_from_modules([M|Ms], State, DocPlt, Acc) when is_atom(M) ->
   %% Check if there are contracts for functions that do not exist
   Warnings1 = 
     dialyzer_contracts:contracts_without_fun(Contracts, AllFuns, Callgraph),
-  {RawWarnings2, FunTypes, RaceCode, PublicTables, NamedTables} =
-    dialyzer_dataflow:get_warnings(ModCode, Plt, Callgraph, Records, NoWarnUnused),
-  {NewAcc, Warnings2} = postprocess_dataflow_warns(RawWarnings2, State, Acc),
+  {Warnings2, FunTypes} =
+    dialyzer_dataflow:get_warnings(ModCode, Plt, Callgraph,
+				   Records, NoWarnUnused),
   Attrs = cerl:module_attrs(ModCode),
-  Warnings3 = dialyzer_behaviours:check_callbacks(M, Attrs, Plt, Codeserver),
-  NewDocPlt = insert_into_doc_plt(FunTypes, Callgraph, DocPlt),
-  NewCallgraph =
-    dialyzer_callgraph:renew_race_info(Callgraph, RaceCode, PublicTables,
-                                       NamedTables),
-  State1 = st__renew_state_calls(NewCallgraph, State),
-  get_warnings_from_modules(Ms, State1, NewDocPlt,
-			    [Warnings1, Warnings2, Warnings3|NewAcc]);
-get_warnings_from_modules([], #st{plt = Plt}, DocPlt, Acc) ->
-  {lists:flatten(Acc), Plt, DocPlt}.
-
-postprocess_dataflow_warns(RawWarnings, State, WarnAcc) ->
-  postprocess_dataflow_warns(RawWarnings, State, WarnAcc, []).
-
-postprocess_dataflow_warns([], _State, WAcc, Acc) ->
-  {WAcc, lists:reverse(Acc)};
+  Warnings3 =
+    dialyzer_behaviours:check_callbacks(M, Attrs, Records, Plt, Codeserver),
+  DocPlt = insert_into_doc_plt(FunTypes, Callgraph, DocPlt),
+  lists:flatten([Warnings1, Warnings2, Warnings3]).
+
+postprocess_warnings(RawWarnings, Codeserver) ->
+  Pred =
+    fun({?WARN_CONTRACT_RANGE, _, _}) -> true;
+       (_) -> false
+    end,
+  {CRWarns, NonCRWarns} = lists:partition(Pred, RawWarnings),
+  postprocess_dataflow_warns(CRWarns, Codeserver, NonCRWarns, []).
+
+postprocess_dataflow_warns([], _Callgraph, WAcc, Acc) ->
+  lists:reverse(Acc, WAcc);
 postprocess_dataflow_warns([{?WARN_CONTRACT_RANGE, {CallF, CallL}, Msg}|Rest],
-			   #st{codeserver = Codeserver} = State, WAcc, Acc) ->
+			   Codeserver, WAcc, Acc) ->
   {contract_range, [Contract, M, F, A, ArgStrings, CRet]} = Msg,
   case dialyzer_codeserver:lookup_mfa_contract({M,F,A}, Codeserver) of
     {ok, {{ContrF, _ContrL} = FileLine, _C}} ->
@@ -163,87 +209,66 @@ postprocess_dataflow_warns([{?WARN_CONTRACT_RANGE, {CallF, CallL}, Msg}|Rest],
 	       (_) -> true
 	    end,
 	  FilterWAcc = lists:filter(Filter, WAcc),
-	  postprocess_dataflow_warns(Rest, State, FilterWAcc, [W|Acc]);
+	  postprocess_dataflow_warns(Rest, Codeserver, FilterWAcc, [W|Acc]);
 	false ->
-	  postprocess_dataflow_warns(Rest, State, WAcc, Acc)
+	  postprocess_dataflow_warns(Rest, Codeserver, WAcc, Acc)
       end;
     error ->
       %% The contract is not in a module that is currently under analysis.
       %% We display the warning in the file/line of the call.
       NewMsg = {contract_range, [Contract, M, F, ArgStrings, CallL, CRet]},
       W = {?WARN_CONTRACT_RANGE, {CallF, CallL}, NewMsg},
-      postprocess_dataflow_warns(Rest, State, WAcc, [W|Acc])
-  end;
-postprocess_dataflow_warns([W|Rest], State, Wacc, Acc) ->
-  postprocess_dataflow_warns(Rest, State, Wacc, [W|Acc]).
+      postprocess_dataflow_warns(Rest, Codeserver, WAcc, [W|Acc])
+  end.
   
-refine_succ_typings(ModulePostorder, State) ->
-  ?debug("Module postorder: ~p\n", [ModulePostorder]),
-  refine_succ_typings(ModulePostorder, State, []).
-
-refine_succ_typings([SCC|SCCs], State, Fixpoint) ->
-  Msg = io_lib:format("Dataflow of one SCC: ~w\n", [SCC]),
-  send_log(State#st.parent, Msg),
-  ?debug("~s\n", [Msg]),
-  {NewState, FixpointFromScc} =
-    case SCC of
-      [M] -> refine_one_module(M, State);
-      [_|_] -> refine_one_scc(SCC, State)
-    end,
-  NewFixpoint = ordsets:union(Fixpoint, FixpointFromScc),
-  refine_succ_typings(SCCs, NewState, NewFixpoint);
-refine_succ_typings([], State, Fixpoint) ->
-  case Fixpoint =:= [] of
+refine_succ_typings(Modules, #st{codeserver = Codeserver,
+                                 callgraph = Callgraph,
+                                 plt = Plt,
+				 timing_server = Timing,
+                                 solvers = Solvers} = State) ->
+  ?debug("Module postorder: ~p\n", [Modules]),
+  Init = {Codeserver, Callgraph, Plt, Solvers},
+  NotFixpoint =
+    ?timing(Timing, "refine",
+	    dialyzer_coordinator:parallel_job(dataflow, Modules, Init, Timing)),
+  ?debug("==================== Dataflow done ====================\n\n", []),
+  case NotFixpoint =:= [] of
     true -> {fixpoint, State};
-    false -> {not_fixpoint, Fixpoint, State}
+    false -> {not_fixpoint, NotFixpoint, State}
   end.
 
--spec refine_one_module(module(), #st{}) -> {#st{}, [label()]}. % ordset
+-spec find_depends_on(scc() | module(), fixpoint_init_data()) -> [scc()].
 
-refine_one_module(M, State) ->
-  #st{callgraph = Callgraph, codeserver = CodeServer, plt = PLT} = State,
+find_depends_on(SCC, {_Codeserver, Callgraph, _Plt, _Solvers}) ->
+  dialyzer_callgraph:get_depends_on(SCC, Callgraph).
+
+-spec find_required_by(scc() | module(), fixpoint_init_data()) -> [scc()].
+
+find_required_by(SCC, {_Codeserver, Callgraph, _Plt, _Solvers}) ->
+  dialyzer_callgraph:get_required_by(SCC, Callgraph).
+
+-spec lookup_names([label()], fixpoint_init_data()) -> [mfa_or_funlbl()].
+
+lookup_names(Labels, {_Codeserver, Callgraph, _Plt, _Solvers}) ->
+  [lookup_name(F, Callgraph) || F <- Labels].
+
+-spec refine_one_module(module(), dataflow_init_data()) -> [label()]. % ordset
+
+refine_one_module(M, {CodeServer, Callgraph, Plt, _Solvers}) ->
   ModCode = dialyzer_codeserver:lookup_mod_code(M, CodeServer),
   AllFuns = collect_fun_info([ModCode]),
-  FunTypes = get_fun_types_from_plt(AllFuns, Callgraph, PLT),
   Records = dialyzer_codeserver:lookup_mod_records(M, CodeServer),
-  {NewFunTypes, RaceCode, PublicTables, NamedTables} =
-    dialyzer_dataflow:get_fun_types(ModCode, PLT, Callgraph, Records),
-  NewCallgraph =
-    dialyzer_callgraph:renew_race_info(Callgraph, RaceCode, PublicTables,
-                                       NamedTables),
+  FunTypes = get_fun_types_from_plt(AllFuns, Callgraph, Plt),
+  NewFunTypes =
+    dialyzer_dataflow:get_fun_types(ModCode, Plt, Callgraph, Records),
   case reached_fixpoint(FunTypes, NewFunTypes) of
-    true ->
-      State1 = st__renew_state_calls(NewCallgraph, State),
-      {State1, ordsets:new()};
+    true -> [];
     {false, NotFixpoint} ->
       ?debug("Not fixpoint\n", []),
-      NewState = insert_into_plt(dict:from_list(NotFixpoint), State),
-      NewState1 = st__renew_state_calls(NewCallgraph, NewState),
-      {NewState1, ordsets:from_list([FunLbl || {FunLbl,_Type} <- NotFixpoint])}
+      Plt = insert_into_plt(dict:from_list(NotFixpoint), Callgraph, Plt),
+      [FunLbl || {FunLbl,_Type} <- NotFixpoint]
   end.
 
-st__renew_state_calls(Callgraph, State) ->
-  State#st{callgraph = Callgraph}.
-
-refine_one_scc(SCC, State) ->
-  refine_one_scc(SCC, State, []).
-
-refine_one_scc(SCC, State, AccFixpoint) ->
-  {NewState, FixpointFromScc} = refine_mods_in_scc(SCC, State, []),
-  case FixpointFromScc =:= [] of
-    true -> {NewState, AccFixpoint};
-    false ->
-      NewAccFixpoint = ordsets:union(AccFixpoint, FixpointFromScc),
-      refine_one_scc(SCC, NewState, NewAccFixpoint)
-  end.
-
-refine_mods_in_scc([Mod|Mods], State, Fixpoint) ->
-  {NewState, FixpointFromModule} = refine_one_module(Mod, State),
-  NewFixpoint = ordsets:union(FixpointFromModule, Fixpoint),
-  refine_mods_in_scc(Mods, NewState, NewFixpoint);
-refine_mods_in_scc([], State, Fixpoint) ->
-  {State, Fixpoint}.
-
 reached_fixpoint(OldTypes, NewTypes) ->
   reached_fixpoint(OldTypes, NewTypes, false).
 
@@ -299,31 +324,22 @@ compare_types_1([], [], _Strict, NotFixpoint) ->
     false -> {false, NotFixpoint}
   end.
 
-find_succ_typings(State) ->
-  find_succ_typings(State, []).
-
-find_succ_typings(#st{callgraph = Callgraph, parent = Parent} = State,
-		  NotFixpoint) ->
-  case dialyzer_callgraph:take_scc(Callgraph) of
-    {ok, SCC, NewCallgraph} ->
-      Msg = io_lib:format("Typesig analysis for SCC: ~w\n", [format_scc(SCC)]),
-      ?debug("~s", [Msg]),
-      send_log(Parent, Msg),
-      {NewState, NewNotFixpoint1} =
-	analyze_scc(SCC, State#st{callgraph = NewCallgraph}),
-      NewNotFixpoint2 = ordsets:union(NewNotFixpoint1, NotFixpoint),
-      find_succ_typings(NewState, NewNotFixpoint2);
-    none ->
-      ?debug("==================== Typesig done ====================\n\n", []),
-      case NotFixpoint =:= [] of
-	true -> {fixpoint, State};
-	false -> {not_fixpoint, NotFixpoint, State}
-      end
+find_succ_typings(SCCs, #st{codeserver = Codeserver, callgraph = Callgraph,
+			    plt = Plt, timing_server = Timing,
+                            solvers = Solvers} = State) ->
+  Init = {Codeserver, Callgraph, Plt, Solvers},
+  NotFixpoint =
+    ?timing(Timing, "typesig",
+	    dialyzer_coordinator:parallel_job(typesig, SCCs, Init, Timing)),
+  ?debug("==================== Typesig done ====================\n\n", []),
+  case NotFixpoint =:= [] of
+    true -> {fixpoint, State};
+    false -> {not_fixpoint, NotFixpoint, State}
   end.
 
-analyze_scc(SCC, #st{codeserver = Codeserver,
-		     callgraph = Callgraph,
-		     plt = Plt} = State) ->
+-spec find_succ_types_for_scc(scc(), typesig_init_data()) -> [mfa_or_funlbl()].
+
+find_succ_types_for_scc(SCC, {Codeserver, Callgraph, Plt, Solvers}) ->
   SCC_Info = [{MFA, 
 	       dialyzer_codeserver:lookup_mfa_code(MFA, Codeserver),
 	       dialyzer_codeserver:lookup_mod_records(M, Codeserver)}
@@ -332,26 +348,18 @@ analyze_scc(SCC, #st{codeserver = Codeserver,
 		|| {_, _, _} = MFA <- SCC],
   Contracts2 = [{MFA, Contract} || {MFA, {ok, Contract}} <- Contracts1],
   Contracts3 = orddict:from_list(Contracts2),
-  NextLabel = dialyzer_codeserver:get_next_core_label(Codeserver),
-  {SuccTypes, PltContracts, NotFixpoint} = 
-    find_succ_types_for_scc(SCC_Info, Contracts3, NextLabel, Callgraph, Plt),
-  State1 = insert_into_plt(SuccTypes, State),
-  ContrPlt = dialyzer_plt:insert_contract_list(State1#st.plt, PltContracts),
-  {State1#st{plt = ContrPlt}, NotFixpoint}.
-
-find_succ_types_for_scc(SCC_Info, Contracts, NextLabel, Callgraph, Plt) ->
-  %% Assume that the PLT contains the current propagated types
+  Label = dialyzer_codeserver:get_next_core_label(Codeserver),
   AllFuns = collect_fun_info([Fun || {_MFA, {_Var, Fun}, _Rec} <- SCC_Info]),
   PropTypes = get_fun_types_from_plt(AllFuns, Callgraph, Plt),
-  FunTypes = dialyzer_typesig:analyze_scc(SCC_Info, NextLabel, 
-					  Callgraph, Plt, PropTypes),
+  %% Assume that the PLT contains the current propagated types
+  FunTypes = dialyzer_typesig:analyze_scc(SCC_Info, Label, Callgraph,
+                                          Plt, PropTypes, Solvers),
   AllFunSet = sets:from_list([X || {X, _} <- AllFuns]),
-  FilteredFunTypes = dict:filter(fun(X, _) ->
-				      sets:is_element(X, AllFunSet) 
-				  end, FunTypes),
+  FilteredFunTypes =
+    dict:filter(fun(X, _) -> sets:is_element(X, AllFunSet) end, FunTypes),
   %% Check contracts
-  PltContracts = dialyzer_contracts:check_contracts(Contracts, Callgraph, 
-						    FilteredFunTypes),
+  PltContracts =
+    dialyzer_contracts:check_contracts(Contracts3, Callgraph, FilteredFunTypes),
   ContractFixpoint =
     lists:all(fun({MFA, _C}) ->
 		  %% Check the non-deleted PLT
@@ -360,14 +368,14 @@ find_succ_types_for_scc(SCC_Info, Contracts, NextLabel, Callgraph, Plt) ->
 		    {value, _} -> true
 		  end
 	      end, PltContracts),
+  Plt = insert_into_plt(FilteredFunTypes, Callgraph, Plt),
+  Plt = dialyzer_plt:insert_contract_list(Plt, PltContracts),
   case (ContractFixpoint andalso 
 	reached_fixpoint_strict(PropTypes, FilteredFunTypes)) of
-    true ->
-      {FilteredFunTypes, PltContracts, []};
+    true -> [];
     false ->
       ?debug("Not fixpoint for: ~w\n", [AllFuns]),
-      {FilteredFunTypes, PltContracts,
-       ordsets:from_list([Fun || {Fun, _Arity} <- AllFuns])}
+      [Fun || {Fun, _Arity} <- AllFuns]
   end.
 
 get_fun_types_from_plt(FunList, Callgraph, Plt) ->
@@ -407,10 +415,10 @@ insert_into_doc_plt(FunTypes, Callgraph, DocPlt) ->
   SuccTypes = format_succ_types(FunTypes, Callgraph),
   dialyzer_plt:insert_list(DocPlt, SuccTypes).
 
-insert_into_plt(SuccTypes0, #st{callgraph = Callgraph, plt = Plt} = State) ->
+insert_into_plt(SuccTypes0, Callgraph, Plt) ->
   SuccTypes = format_succ_types(SuccTypes0, Callgraph),
   debug_pp_succ_typings(SuccTypes),
-  State#st{plt = dialyzer_plt:insert_list(Plt, SuccTypes)}.
+  dialyzer_plt:insert_list(Plt, SuccTypes).
 
 format_succ_types(SuccTypes, Callgraph) ->
   format_succ_types(dict:to_list(SuccTypes), Callgraph, []).
@@ -445,131 +453,3 @@ lookup_name(F, CG) ->
     error -> F;
     {ok, Name} -> Name
   end.
-
-send_log(none, _Msg) ->
-  ok;
-send_log(Parent, Msg) ->
-  Parent ! {self(), log, lists:flatten(Msg)},
-  ok.
-
-format_scc(SCC) ->
-  [MFA || {_M, _F, _A} = MFA <- SCC].
-
-%% ============================================================================
-%%
-%%  Debug interface.
-%%
-%% ============================================================================
-
--spec doit(atom() | file:filename()) -> 'ok'.
-
-doit(Module) ->
-  {ok, AbstrCode} = dialyzer_utils:get_abstract_code_from_src(Module),
-  {ok, Code} = dialyzer_utils:get_core_from_abstract_code(AbstrCode),
-  {ok, Records} = dialyzer_utils:get_record_and_type_info(AbstrCode),
-  %% contract typing info in dictionary format
-  {ok, Contracts, _Callbacks} =
-    dialyzer_utils:get_spec_info(cerl:concrete(cerl:module_name(Code)),
-                                 AbstrCode, Records),
-  Sigs0 = get_top_level_signatures(Code, Records, Contracts),
-  M = if is_atom(Module) ->  
-	  list_to_atom(filename:basename(atom_to_list(Module)));
-	 is_list(Module) -> 
-	  list_to_atom(filename:basename(Module))
-      end,
-  Sigs1 = [{{M, F, A}, Type} || {{F, A}, Type} <- Sigs0],
-  Sigs = ordsets:from_list(Sigs1),
-  io:format("==================== Final result ====================\n\n", []),
-  pp_signatures(Sigs, Records),
-  ok.
-
--spec get_top_level_signatures(cerl:c_module(), dict(), dict()) ->
-	 [{{atom(), arity()}, erl_types:erl_type()}].
-
-get_top_level_signatures(Code, Records, Contracts) ->
-  Tree = cerl:from_records(Code),
-  {LabeledTree, NextLabel} = cerl_trees:label(Tree),
-  Plt = get_def_plt(),
-  ModuleName = cerl:atom_val(cerl:module_name(LabeledTree)),
-  Plt1 = dialyzer_plt:delete_module(Plt, ModuleName),
-  Plt2 = analyze_module(LabeledTree, NextLabel, Plt1, Records, Contracts),
-  M = cerl:concrete(cerl:module_name(Tree)),
-  Functions = [{M, cerl:fname_id(V), cerl:fname_arity(V)} 
-	       || {V, _F} <- cerl:module_defs(LabeledTree)],
-  %% First contracts check
-  AllContracts = dict:fetch_keys(Contracts),
-  ErrorContracts = AllContracts -- Functions,  
-  lists:foreach(fun(C) -> 
-		    io:format("Contract for non-existing function: ~w\n",[C])
-		end, ErrorContracts),
-  Types = [{MFA, dialyzer_plt:lookup(Plt2, MFA)} || MFA <- Functions],
-  Sigs = [{{F, A}, erl_types:t_fun(ArgT, RetT)} 
-	  || {{_M, F, A}, {value, {RetT, ArgT}}} <- Types],
-  ordsets:from_list(Sigs).
-
-get_def_plt() ->
-  try 
-    dialyzer_plt:from_file(dialyzer_plt:get_default_plt())
-  catch
-    error:no_such_file -> dialyzer_plt:new();
-    throw:{dialyzer_error, _} -> dialyzer_plt:new()
-  end.
-
-pp_signatures([{{_, module_info, 0}, _}|Left], Records) -> 
-  pp_signatures(Left, Records);
-pp_signatures([{{_, module_info, 1}, _}|Left], Records) -> 
-  pp_signatures(Left, Records);
-pp_signatures([{{M, F, _A}, Type}|Left], Records) ->
-  TypeString =
-    case cerl:is_literal(Type) of
-%% Commented out so that dialyzer does not complain
-%%      false -> 
-%%        "fun(" ++ String = erl_types:t_to_string(Type, Records),
-%%        string:substr(String, 1, length(String)-1);
-      true ->
-	io_lib:format("~w", [cerl:concrete(Type)])
-    end,
-  io:format("~w:~w~s\n", [M, F, TypeString]),
-  pp_signatures(Left, Records);
-pp_signatures([], _Records) ->
-  ok.
-
--ifdef(DEBUG_PP).
-debug_pp(Tree, _Map) -> 
-  Tree1 = strip_annotations(Tree),
-  io:put_chars(cerl_prettypr:format(Tree1)),
-  io:nl().  
-
-strip_annotations(Tree) ->
-  cerl_trees:map(fun(T) ->
-		     case cerl:is_literal(T) orelse cerl:is_c_values(T) of
-		       true -> cerl:set_ann(T, []);
-		       false ->
-			 Label = cerl_trees:get_label(T),
-			 cerl:set_ann(T, [{'label', Label}])
-		     end
-		 end, Tree).
--else.
-debug_pp(_Tree, _Map) ->
-  ok.
--endif. % DEBUG_PP
-
-%%
-%% Analysis of a single module
-%%
-analyze_module(LabeledTree, NextLbl, Plt, Records, Contracts) ->
-  debug_pp(LabeledTree, dict:new()),
-  CallGraph1 = dialyzer_callgraph:new(),
-  CallGraph2 = dialyzer_callgraph:scan_core_tree(LabeledTree, CallGraph1),
-  {CallGraph3, _Ext} = dialyzer_callgraph:remove_external(CallGraph2),
-  CallGraph4 = dialyzer_callgraph:finalize(CallGraph3),
-  CodeServer1 = dialyzer_codeserver:new(),
-  Mod = cerl:concrete(cerl:module_name(LabeledTree)),
-  CodeServer2 = dialyzer_codeserver:insert(Mod, LabeledTree, CodeServer1),
-  CodeServer3 = dialyzer_codeserver:set_next_core_label(NextLbl, CodeServer2),
-  CodeServer4 = dialyzer_codeserver:store_records(Mod, Records, CodeServer3),
-  CodeServer5 = dialyzer_codeserver:store_contracts(Mod, Contracts, CodeServer4),
-  Res = analyze_callgraph(CallGraph4, Plt, CodeServer5),
-  dialyzer_callgraph:delete(CallGraph4),
-  dialyzer_codeserver:delete(CodeServer5),
-  Res.
diff --git a/lib/dialyzer/src/dialyzer_timing.erl b/lib/dialyzer/src/dialyzer_timing.erl
new file mode 100644
index 0000000000..b1a4bdc07c
--- /dev/null
+++ b/lib/dialyzer/src/dialyzer_timing.erl
@@ -0,0 +1,133 @@
+%% -*- erlang-indent-level: 2 -*-
+%%-------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File    : dialyzer_timing.erl
+%%% Authors : Stavros Aronis <[email protected]>
+%%% Description : Timing reports for Dialyzer
+%%%-------------------------------------------------------------------
+
+-module(dialyzer_timing).
+
+-export([init/1, start_stamp/2, send_size_info/3, end_stamp/1, stop/1]).
+
+-export_type([timing_server/0]).
+
+-type timing_server() :: pid() | 'none'.
+
+-spec init(boolean() | 'debug') -> timing_server().
+
+init(Active) ->
+  case Active of
+    true ->
+      io:format("\n"),
+      spawn_link(fun() -> loop(now(), 0, "") end);
+    debug ->
+      io:format("\n"),
+      spawn_link(fun() -> debug_loop("") end);
+    false -> none
+  end.
+
+loop(LastNow, Size, Unit) ->
+  receive
+    {stamp, Msg, Now} ->
+      io:format("    ~-10s (+~4.2fs):", [Msg, diff(Now, LastNow)]),
+      loop(Now, 0, "");
+    {stamp, Now} ->
+      SizeStr =
+	case Size of
+	  0 -> "";
+	  _ ->
+	    Data = io_lib:format("~p ~s",[Size, Unit]),
+	    io_lib:format(" (~12s)",[Data])
+	end,
+      io:format("~7.2fs~s\n", [diff(Now, LastNow), SizeStr]),
+      loop(Now, 0, "");
+    {size, NewSize, NewUnit} ->
+      loop(LastNow, NewSize, NewUnit);
+    {Pid, stop, Now} ->
+      io:format("    ~-9s (+~5.2fs)\n", ["",diff(Now, LastNow)]),
+      Pid ! ok;
+    {Pid, stop} ->
+      Pid ! ok
+  end.
+
+debug_loop(Phase) ->
+  receive
+    Message ->
+      {Runtime,_} = statistics(wall_clock),
+      Procs = erlang:system_info(process_count),
+      ProcMem = erlang:memory(total),
+      Status = io_lib:format("~12w ~6w ~20w", [Runtime, Procs, ProcMem]),
+      case Message of
+	{stamp, Msg, _Now} ->
+	  io:format("~s ~s_start\n", [Status, Msg]),
+	  debug_loop(Msg);
+	{stamp, _Now} ->
+	  io:format("~s ~s_stop\n", [Status, Phase]),
+	  debug_loop("");
+	{Pid, stop, _Now} ->
+	  Pid ! ok;
+	{Pid, stop} ->
+	  Pid ! ok;
+	_ ->
+	  debug_loop(Phase)
+      end
+  after
+    50 ->
+      {Runtime,_} = statistics(wall_clock),
+      Procs = erlang:system_info(process_count),
+      ProcMem = erlang:memory(total),
+      Status = io_lib:format("~12w ~6w ~20w", [Runtime, Procs, ProcMem]),
+      io:format("~s\n", [Status]),
+      debug_loop(Phase)
+  end.
+
+
+-spec start_stamp(timing_server(), string()) -> ok.
+
+start_stamp(none, _) -> ok;
+start_stamp(Pid, Msg) ->
+  Pid ! {stamp, Msg, now()},
+  ok.
+
+-spec end_stamp(timing_server()) -> ok.
+
+end_stamp(none) -> ok;
+end_stamp(Pid) ->
+  Pid ! {stamp, now()},
+  ok.
+
+-spec send_size_info(timing_server(), integer(), string()) -> ok.
+
+send_size_info(none, _, _) -> ok;
+send_size_info(Pid, Size, Unit) ->
+  Pid ! {size, Size, Unit},
+  ok.
+
+-spec stop(timing_server()) -> ok.
+
+stop(none) -> ok;
+stop(Pid) ->
+  Pid ! {self(), stop, now()},
+  receive ok -> ok end.
+
+diff(T2, T1) ->
+  timer:now_diff(T2,T1) / 1000000.
diff --git a/lib/dialyzer/src/dialyzer_typesig.erl b/lib/dialyzer/src/dialyzer_typesig.erl
index d0d27740f3..0df003a035 100644
--- a/lib/dialyzer/src/dialyzer_typesig.erl
+++ b/lib/dialyzer/src/dialyzer_typesig.erl
@@ -28,7 +28,7 @@
 
 -module(dialyzer_typesig).
 
--export([analyze_scc/5]).
+-export([analyze_scc/6]).
 -export([get_safe_underapprox/2]).
 
 -import(erl_types,
@@ -78,6 +78,8 @@
 -record(constraint_list, {type :: 'conj' | 'disj',
 			  list :: [constr()],
 			  deps :: [dep()],
+                          masks :: [{dep(),[non_neg_integer()]}] |
+                                   {'d',dict()},
 			  id   :: {'list', dep()}}).
 
 -type constraint_list() :: #constraint_list{}.
@@ -91,23 +93,26 @@
 -type typesig_scc()    :: [{mfa(), {cerl:c_var(), cerl:c_fun()}, dict()}].
 -type typesig_funmap() :: [{type_var(), type_var()}]. %% Orddict
 
--record(state, {callgraph                :: dialyzer_callgraph:callgraph(),
-		cs          = []         :: [constr()],
-		cmap        = dict:new() :: dict(),
-		fun_map     = []         :: typesig_funmap(),
-		fun_arities = dict:new() :: dict(),
-		in_match    = false      :: boolean(),
-		in_guard    = false      :: boolean(),
-		module                   :: module(),
-		name_map    = dict:new() :: dict(),
-		next_label               :: label(),
-		self_recs                :: [label()],
-		plt                      :: dialyzer_plt:plt(),
-		prop_types  = dict:new() :: dict(),
-		records     = dict:new() :: dict(),
-		opaques     = []         :: [erl_types:erl_type()],
-		scc         = []         :: [type_var()],
-		mfas        = []         :: [dialyzer_callgraph:mfa_or_funlbl()]
+-type dict_or_ets() :: {'d', dict()} | {'e', ets:tid()}.
+
+-record(state, {callgraph                    :: dialyzer_callgraph:callgraph(),
+		cs          = []                :: [constr()],
+		cmap        = {'d', dict:new()} :: dict_or_ets(),
+		fun_map     = []                :: typesig_funmap(),
+		fun_arities = dict:new()        :: dict(),
+		in_match    = false             :: boolean(),
+		in_guard    = false             :: boolean(),
+		module                          :: module(),
+		name_map    = dict:new()        :: dict(),
+		next_label  = 0                 :: label(),
+		self_rec                        :: erl_types:erl_type(),
+		plt                             :: dialyzer_plt:plt(),
+		prop_types  = {'d', dict:new()} :: dict_or_ets(),
+		records     = dict:new()        :: dict(),
+		opaques     = []                :: [erl_types:erl_type()],
+		scc         = []                :: [type_var()],
+		mfas                            :: [tuple()],
+                solvers     = []                :: [solver()]
 	       }).
 
 %%-----------------------------------------------------------------------------
@@ -119,8 +124,10 @@
 %%-define(DEBUG_CONSTRAINTS, true).
 -ifdef(DEBUG).
 -define(DEBUG_NAME_MAP, true).
+-define(DEBUG_LOOP_DETECTION, true).
 -endif.
 %%-define(DEBUG_NAME_MAP, true).
+%%-define(DEBUG_LOOP_DETECTION, true).
 
 -ifdef(DEBUG).
 -define(debug(__String, __Args), io:format(__String, __Args)).
@@ -139,7 +146,7 @@
 %%-----------------------------------------------------------------------------
 %% Analysis of strongly connected components.
 %%
-%% analyze_scc(SCC, NextLabel, CallGraph, PLT, PropTypes) -> FunTypes
+%% analyze_scc(SCC, NextLabel, CallGraph, PLT, PropTypes, Solvers) -> FunTypes
 %%
 %% SCC       - [{MFA, Def, Records}]
 %%             where Def = {Var, Fun} as in the Core Erlang module definitions.
@@ -152,15 +159,17 @@
 %%             about functions that can be called by this SCC.
 %% PropTypes - A dictionary.
 %% FunTypes  - A dictionary.
+%% Solvers   - User specified solvers.
 %%-----------------------------------------------------------------------------
 
 -spec analyze_scc(typesig_scc(), label(),
 		  dialyzer_callgraph:callgraph(),
-		  dialyzer_plt:plt(), dict()) -> dict().
+		  dialyzer_plt:plt(), dict(), [solver()]) -> dict().
 
-analyze_scc(SCC, NextLabel, CallGraph, Plt, PropTypes) ->
+analyze_scc(SCC, NextLabel, CallGraph, Plt, PropTypes, Solvers0) ->
+  Solvers = solvers(Solvers0),
   assert_format_of_scc(SCC),
-  State1 = new_state(SCC, NextLabel, CallGraph, Plt, PropTypes),
+  State1 = new_state(SCC, NextLabel, CallGraph, Plt, PropTypes, Solvers),
   DefSet = add_def_list([Var || {_MFA, {Var, _Fun}, _Rec} <- SCC], sets:new()),
   State2 = traverse_scc(SCC, DefSet, State1),
   State3 = state__finalize(State2),
@@ -174,6 +183,9 @@ assert_format_of_scc([{_MFA, {_Var, _Fun}, _Records}|Left]) ->
 assert_format_of_scc([]) ->
   ok.
 
+solvers([]) -> [v2];
+solvers(Solvers) -> Solvers.
+
 %% ============================================================================
 %%
 %%  Gets the constraints by traversing the code.
@@ -1661,18 +1673,23 @@ get_bif_test_constr(Dst, Arg, Type, State) ->
 solve([Fun], State) ->
   ?debug("============ Analyzing Fun: ~w ===========\n",
 	 [debug_lookup_name(Fun)]),
-  solve_fun(Fun, dict:new(), State);
+  solve_fun(Fun, map_new(), State);
 solve([_|_] = SCC, State) ->
   ?debug("============ Analyzing SCC: ~w ===========\n",
 	 [[debug_lookup_name(F) || F <- SCC]]),
-  solve_scc(SCC, dict:new(), State, false).
+  {Parallel, NewState} =
+    case parallel_split(SCC) of
+      false -> {false, State};
+      SplitSCC -> {SplitSCC, minimize_state(State)}
+    end,
+  solve_scc(SCC, Parallel, map_new(), NewState, false).
 
 solve_fun(Fun, FunMap, State) ->
   Cs = state__get_cs(Fun, State),
   Deps = get_deps(Cs),
   Ref = mk_constraint_ref(Fun, Deps),
   %% Note that functions are always considered to succeed.
-  {ok, _MapDict, NewMap} = solve_ref_or_list(Ref, FunMap, dict:new(), State),
+  NewMap = solve(Fun, Ref, FunMap, State),
   NewType = lookup_type(Fun, NewMap),
   NewFunMap1 = case state__get_rec_var(Fun, State) of
 		 error -> FunMap;
@@ -1680,21 +1697,23 @@ solve_fun(Fun, FunMap, State) ->
 	       end,
   enter_type(Fun, NewType, NewFunMap1).
 
-solve_scc(SCC, Map, State, TryingUnit) ->
-  State1 = state__mark_as_non_self_rec(SCC, State),
+solve_scc(SCC, Parallel, Map, State, TryingUnit) ->
   Vars0 = [{Fun, state__get_rec_var(Fun, State)} || Fun <- SCC],
   Vars = [Var || {_, {ok, Var}} <- Vars0],
   Funs = [Fun || {Fun, {ok, _}} <- Vars0],
   Types = unsafe_lookup_type_list(Funs, Map),
   RecTypes = [t_limit(Type, ?TYPE_LIMIT) || Type <- Types],
   CleanMap = lists:foldl(fun(Fun, AccFunMap) ->
-			     dict:erase(t_var_name(Fun), AccFunMap)
+			     erase_type(t_var_name(Fun), AccFunMap)
 			 end, Map, SCC),
   Map1 = enter_type_lists(Vars, RecTypes, CleanMap),
   ?debug("Checking SCC: ~w\n", [[debug_lookup_name(F) || F <- SCC]]),
-  SolveFun = fun(X, Y) -> scc_fold_fun(X, Y, State1) end,
-  Map2 = lists:foldl(SolveFun, Map1, SCC),
   FunSet = ordsets:from_list([t_var_name(F) || F <- SCC]),
+  Map2 =
+    case Parallel of
+      false -> solve_whole_scc(SCC, Map1, State);
+      SplitSCC -> solve_whole_scc_parallel(SplitSCC, Map1, State)
+    end,
   case maps_are_equal(Map2, Map, FunSet) of
     true ->
       ?debug("SCC ~w reached fixpoint\n", [SCC]),
@@ -1708,20 +1727,134 @@ solve_scc(SCC, Map, State, TryingUnit) ->
 	       true -> t_fun(t_fun_args(T), t_unit())
 	     end || T <- NewTypes],
 	  Map3 = enter_type_lists(Funs, UnitTypes, Map2),
-	  solve_scc(SCC, Map3, State, true);
+	  solve_scc(SCC, Parallel, Map3, State, true);
 	false ->
+	  case Parallel of
+	    false -> true;
+	    _ -> dispose_state(State)
+	  end,
 	  Map2
       end;
     false ->
       ?debug("SCC ~w did not reach fixpoint\n", [SCC]),
-      solve_scc(SCC, Map2, State, TryingUnit)
+      solve_scc(SCC, Parallel, Map2, State, TryingUnit)
+  end.
+
+solve_whole_scc(SCC, Map, State) ->
+  SolveFun = fun(X, Y) -> scc_fold_fun(X, Y, State) end,
+  lists:foldl(SolveFun, Map, SCC).
+
+%%------------------------------------------------------------------------------
+
+-define(worth_it, 42).
+
+parallel_split(SCC) ->
+  Length = length(SCC),
+  case Length > 2*?worth_it of
+    false -> false;
+    true ->
+      case min(dialyzer_utils:parallelism(), 8) of
+	1 -> false;
+	CPUs ->
+	  FullShare = Length div CPUs + 1,
+	  Unit = max(FullShare, ?worth_it),
+	  split(SCC, Unit, [])
+      end
+  end.
+
+minimize_state(#state{
+		  cmap        = {d, CMap},
+		  fun_map     = FunMap,
+		  fun_arities = FunArities,
+		  self_rec    = SelfRec,
+		  prop_types  = {d, PropTypes},
+		  opaques     = Opaques,
+                  solvers     = Solvers
+		 }) ->
+  ETSCMap = ets:new(cmap,[{read_concurrency, true}]),
+  ETSPropTypes = ets:new(prop_types,[{read_concurrency, true}]),
+  true = ets:insert(ETSCMap, dict:to_list(CMap)),
+  true = ets:insert(ETSPropTypes, dict:to_list(PropTypes)),
+  #state
+    {cmap        = {e, ETSCMap},
+     fun_map     = FunMap,
+     fun_arities = FunArities,
+     self_rec    = SelfRec,
+     prop_types  = {e, ETSPropTypes},
+     opaques     = Opaques,
+     solvers     = Solvers
+    }.
+
+dispose_state(#state{cmap = {e, ETSCMap},
+		     prop_types = {e, ETSPropTypes}}) ->
+  true = ets:delete(ETSCMap),
+  true = ets:delete(ETSPropTypes).
+
+solve_whole_scc_parallel(SplitSCC, Map, State) ->
+  Workers = spawn_workers(SplitSCC, Map, State),
+  wait_results(Workers, Map, fold_res_fun(State)).
+
+spawn_workers(SplitSCC, Map, State) ->
+  Spawner = solve_scc_spawner(self(), Map, State),
+  lists:foreach(Spawner, SplitSCC),
+  length(SplitSCC).
+
+wait_results(0, Map, _FoldResFun) ->
+  Map;
+wait_results(Pending, Map, FoldResFun) ->
+  Res = receive_scc_result(),
+  NewMap = lists:foldl(FoldResFun, Map, Res),
+  wait_results(Pending-1, NewMap, FoldResFun).
+
+solve_scc_spawner(Parent, Map, State) ->
+  fun(SCCPart) ->
+      spawn_link(fun() -> solve_scc_worker(Parent, SCCPart, Map, State) end)
+  end.
+
+split([], _Unit, Acc) ->
+  Acc;
+split(List, Unit, Acc) ->
+  {Taken, Rest} =
+    try
+      lists:split(Unit, List)
+    catch
+      _:_ -> {List, []}
+    end,
+  split(Rest, Unit, [Taken|Acc]).
+
+solve_scc_worker(Parent, SCCPart, Map, State) ->
+  SolveFun = fun(X, Y) -> scc_fold_fun(X, Y, State) end,
+  FinalMap = lists:foldl(SolveFun, Map, SCCPart),
+  Res =
+    [{F, t_limit(unsafe_lookup_type(F, FinalMap), ?TYPE_LIMIT)} ||
+      F <- SCCPart],
+  send_scc_result(Parent, Res).
+
+fold_res_fun(State) ->
+  fun({F, Type}, Map) ->
+      case state__get_rec_var(F, State) of
+	{ok, R} ->
+	  enter_type(R, Type, enter_type(F, Type, Map));
+	error ->
+	  enter_type(F, Type, Map)
+      end
   end.
 
+receive_scc_result() ->
+    receive
+      {scc_fun, Res} -> Res
+    end.
+
+send_scc_result(Parent, Res) ->
+  Parent ! {scc_fun, Res}.
+
+%%------------------------------------------------------------------------------
+
 scc_fold_fun(F, FunMap, State) ->
   Deps = get_deps(state__get_cs(F, State)),
   Cs = mk_constraint_ref(F, Deps),
   %% Note that functions are always considered to succeed.
-  {ok, _NewMapDict, Map} = solve_ref_or_list(Cs, FunMap, dict:new(), State),
+  Map = solve(F, Cs, FunMap, State),
   NewType0 = unsafe_lookup_type(F, Map),
   NewType = t_limit(NewType0, ?TYPE_LIMIT),
   NewFunMap = case state__get_rec_var(F, State) of
@@ -1734,15 +1867,440 @@ scc_fold_fun(F, FunMap, State) ->
 						  format_type(NewType)]),
   NewFunMap.
 
+solve(Fun, Cs, FunMap, State) ->
+  Solvers = State#state.solvers,
+  R = [solver(S, solve_fun(S, Fun, Cs, FunMap, State)) || S <- Solvers],
+  check_solutions(R, Fun, no_solver, no_map).
+
+solver(Solver, SolveFun) ->
+  ?debug("Start solver ~w\n", [Solver]),
+  try timer:tc(SolveFun) of
+    {Time, {ok, Map}} ->
+      ?debug("End solver ~w (~w microsecs)\n", [Solver, Time]),
+      {Solver, Map, Time};
+    {_, _R} ->
+      ?debug("Solver ~w returned unexpected result:\n  ~P\n",
+             [Solver, _R, 60]),
+      throw(error)
+  catch E:R ->
+      io:format("Solver ~w failed: ~w:~p\n ~p\n",
+                [Solver, E, R, erlang:get_stacktrace()]),
+      throw(error)
+  end.
+
+solve_fun(v1, _Fun, Cs, FunMap, State) ->
+  fun() ->
+      {ok, _MapDict, NewMap} = solve_ref_or_list(Cs, FunMap, dict:new(), State),
+      {ok, NewMap}
+  end;
+solve_fun(v2, Fun, _Cs, FunMap, State) ->
+  fun() -> v2_solve_ref(Fun, FunMap, State) end.
+
+check_solutions([], _Fun, _S, Map) ->
+  Map;
+check_solutions([{S1,Map1,_Time1}|Maps], Fun, S, Map) ->
+  ?debug("Solver ~w needed ~w microsecs\n", [S1, _Time1]),
+  case Map =:= no_map orelse sane_maps(Map, Map1, [Fun], S, S1) of
+    true ->
+      check_solutions(Maps, Fun, S1, Map1);
+    false ->
+      ?debug("Constraint solvers do not agree on ~w\n", [Fun]),
+      pp_map(atom_to_list(S), Map),
+      pp_map(atom_to_list(S1), Map1),
+      io:format("A bug was found. Please report it, and use the option "
+                "`--solver v1' until the bug has been fixed.\n"),
+      throw(error)
+  end.
+
+sane_maps(Map1, Map2, Keys, _S1, _S2) ->
+  lists:all(fun(Key) ->
+                V1 = unsafe_lookup_type(Key, Map1),
+                V2 = unsafe_lookup_type(Key, Map2),
+                case t_is_equal(V1, V2) of
+                  true -> true;
+                  false ->
+                    ?debug("Constraint solvers do not agree on ~w\n", [Key]),
+                    ?debug("~w: ~s\n",
+                           [_S1, format_type(unsafe_lookup_type(Key, Map1))]),
+                    ?debug("~w: ~s\n",
+                           [_S2, format_type(unsafe_lookup_type(Key, Map2))]),
+                    false
+                end
+            end, Keys).
+
+%% Solver v2
+
+-record(v2_state, {constr_data = dict:new() :: dict(),
+                   state :: #state{}}).
+
+v2_solve_ref(Fun, Map, State) ->
+  V2State = #v2_state{state = State},
+  {ok, NewMap, _, _} = v2_solve_reference(Fun, Map, V2State),
+  {ok, NewMap}.
+
+v2_solve(#constraint{}=C, Map, V2State) ->
+  State = V2State#v2_state.state,
+  case solve_one_c(C, Map, State#state.opaques) of
+    error ->
+      report_failed_constraint(C, Map),
+      {error, V2State};
+    {ok, {NewMap, U}} ->
+      {ok, NewMap, V2State, U}
+  end;
+v2_solve(#constraint_list{type = disj}=C, Map, V2State) ->
+  v2_solve_disjunct(C, Map, V2State);
+v2_solve(#constraint_list{type = conj}=C, Map, V2State) ->
+  v2_solve_conjunct(C, Map, V2State);
+v2_solve(#constraint_ref{id = Id}, Map, V2State) ->
+  v2_solve_reference(Id, Map, V2State).
+
+v2_solve_reference(Id, Map, V2State0) ->
+  ?debug("Checking ref to fun: ~w\n", [debug_lookup_name(Id)]),
+  pp_map("Map", Map),
+  pp_constr_data("solve_ref", V2State0),
+  Map1 = restore_local_map(V2State0, Id, Map),
+  State = V2State0#v2_state.state,
+  Cs = state__get_cs(Id, State),
+  Res =
+    case state__is_self_rec(Id, State) of
+      true -> v2_solve_self_recursive(Cs, Map1, Id, t_none(), V2State0);
+      false -> v2_solve(Cs, Map1, V2State0)
+    end,
+  {FunType, V2State} =
+    case Res of
+      {error, V2State1} ->
+        ?debug("Error solving for function ~p\n", [debug_lookup_name(Id)]),
+        Arity = state__fun_arity(Id, State),
+        FunType0 =
+          case state__prop_domain(t_var_name(Id), State) of
+            error -> t_fun(Arity, t_none());
+            {ok, Dom} -> t_fun(Dom, t_none())
+          end,
+        {FunType0, V2State1};
+      {ok, NewMap, V2State1, U} ->
+        ?debug("Done solving fun: ~p\n", [debug_lookup_name(Id)]),
+        FunType0 = lookup_type(Id, NewMap),
+        V2State2 = save_local_map(V2State1, Id, U, NewMap),
+        {FunType0, V2State2}
+    end,
+  ?debug("ref Id=~w Assigned ~s\n", [Id, format_type(FunType)]),
+  {NewMap1, U1} = enter_var_type(Id, FunType, Map),
+  {NewMap2, U2} =
+    case state__get_rec_var(Id, State) of
+      {ok, Var} -> enter_var_type(Var, FunType, NewMap1);
+      error -> {NewMap1, []}
+    end,
+  {ok, NewMap2, V2State, lists:umerge(U1, U2)}.
+
+v2_solve_self_recursive(Cs, Map, Id, RecType0, V2State0) ->
+  ?debug("Solving self recursive ~w\n", [debug_lookup_name(Id)]),
+  State = V2State0#v2_state.state,
+  {ok, RecVar} = state__get_rec_var(Id, State),
+  ?debug("OldRecType ~s\n", [format_type(RecType0)]),
+  RecType = t_limit(RecType0, ?TYPE_LIMIT),
+  {Map1, U0} = enter_var_type(RecVar, RecType, Map),
+  V2State1 = save_updated_vars1(V2State0, Cs, U0), % Probably not necessary
+  case v2_solve(Cs, Map1, V2State1) of
+    {error, _V2State}=Error ->
+      case t_is_none(RecType0) of
+	true ->
+	  %% Try again and assume that this is a non-terminating function.
+	  Arity = state__fun_arity(Id, State),
+	  NewRecType = t_fun(lists:duplicate(Arity, t_any()), t_unit()),
+	  v2_solve_self_recursive(Cs, Map, Id, NewRecType, V2State0);
+	false ->
+	  Error
+      end;
+    {ok, NewMap, V2State, U} ->
+      pp_map("recursive finished", NewMap),
+      NewRecType = unsafe_lookup_type(Id, NewMap),
+      case t_is_equal(NewRecType, RecType0) of
+	true ->
+          {NewMap2, U1} = enter_var_type(RecVar, NewRecType, NewMap),
+	  {ok, NewMap2, V2State, lists:umerge(U, U1)};
+	false ->
+	  v2_solve_self_recursive(Cs, Map, Id, NewRecType, V2State0)
+      end
+  end.
+
+enter_var_type(Var, Type, Map0) ->
+  {Map, Vs} = enter_type2(Var, Type, Map0),
+  {Map, [t_var_name(V) || V <- Vs]}.
+
+v2_solve_disjunct(Disj, Map, V2State0) ->
+  #constraint_list{type = disj, id = _Id, list = Cs, masks = Masks} = Disj,
+  ?debug("disjunct Id=~w~n", [_Id]),
+  pp_map("Map", Map),
+  pp_constr_data("disjunct", V2State0),
+  case get_flags(V2State0, Disj) of
+    {V2State1, failed_list} -> {error, V2State1}; % cannot happen
+    {V2State1, Flags} when Flags =/= [] ->
+      {ok, V2State, Eval, UL, MapL0, Uneval, Failed} =
+        v2_solve_disj(Flags, Cs, 1, Map, V2State1, [], [], [], [], false),
+      ?debug("disj ending _Id=~w Eval=~w, |Uneval|=~w |UL|=~w~n",
+             [_Id, Eval, length(Uneval), length(UL)]),
+      if Eval =:= [], Uneval =:= [] ->
+           {error, failed_list(Disj, V2State0)};
+         true ->
+           {Is0, UnIds} = lists:unzip(Uneval),
+           MapL = [restore_local_map(V2State, Id, Map) ||
+                    Id <- UnIds] ++ MapL0,
+           %% If some branch has just failed every variable of the
+           %% non-failed branches need to be checked, not just the
+           %% updated ones.
+           U0 = case Failed of
+                  false -> lists:umerge(UL);
+                  true -> constrained_keys(MapL)
+                end,
+           if U0 =:= [] -> {ok, Map, V2State, []};
+              true ->
+                NotFailed = lists:umerge(Is0, Eval),
+                U1 = [V || V <- U0,
+                           var_occurs_everywhere(V, Masks, NotFailed)],
+                NewMap = join_maps(U1, MapL, Map),
+                pp_map("NewMap", NewMap),
+                U = updated_vars_only(U1, Map, NewMap),
+                ?debug("disjunct finished _Id=~w\n", [_Id]),
+                {ok, NewMap, V2State, U}
+           end
+      end
+  end.
+
+var_occurs_everywhere(V, Masks, NotFailed) ->
+  ordsets:is_subset(NotFailed, get_mask(V, Masks)).
+
+v2_solve_disj([I|Is], [C|Cs], I, Map0, V2State0, UL, MapL, Eval, Uneval,
+              Failed0) ->
+  Id = C#constraint_list.id,
+  Map1 = restore_local_map(V2State0, Id, Map0),
+  case v2_solve(C, Map1, V2State0) of
+    {error, V2State} ->
+      ?debug("disj error I=~w~n", [I]),
+      Failed = Failed0 orelse not is_failed_list(C, V2State0),
+      v2_solve_disj(Is, Cs, I+1, Map0, V2State, UL, MapL, Eval, Uneval, Failed);
+    {ok, Map, V2State1, U} ->
+      ?debug("disj I=~w U=~w~n", [I, U]),
+      V2State = save_local_map(V2State1, Id, U, Map),
+      pp_map("DMap", Map),
+      v2_solve_disj(Is, Cs, I+1, Map0, V2State, [U|UL], [Map|MapL],
+                    [I|Eval], Uneval, Failed0)
+  end;
+v2_solve_disj([], [], _I, _Map, V2State, UL, MapL, Eval, Uneval, Failed) ->
+  {ok, V2State, lists:reverse(Eval), UL, MapL, lists:reverse(Uneval), Failed};
+v2_solve_disj(Is, [C|Cs], I, Map, V2State, UL, MapL, Eval, Uneval0, Failed) ->
+  Uneval = [{I,C#constraint_list.id} ||
+             not is_failed_list(C, V2State)] ++ Uneval0,
+  v2_solve_disj(Is, Cs, I+1, Map, V2State, UL, MapL, Eval, Uneval, Failed).
+
+save_local_map(#v2_state{constr_data = ConData}=V2State, Id, U, Map) ->
+  Part0 = [{V,dict:fetch(V, Map)} || V <- U],
+  Part1 =
+    case dict:find(Id, ConData) of
+      error -> []; % cannot happen
+      {ok, {Part2,[]}} -> Part2
+    end,
+  ?debug("save local map Id=~w:\n", [Id]),
+  Part = lists:ukeymerge(1, lists:keysort(1, Part0), Part1),
+  pp_map("New Part", dict:from_list(Part0)),
+  pp_map("Old Part", dict:from_list(Part1)),
+  pp_map(" => Part", dict:from_list(Part)),
+  V2State#v2_state{constr_data = dict:store(Id, {Part,[]}, ConData)}.
+
+restore_local_map(#v2_state{constr_data = ConData}, Id, Map0) ->
+  case dict:find(Id, ConData) of
+    error -> Map0;
+    {ok, failed} -> Map0;
+    {ok, {[],_}} -> Map0;
+    {ok, {Part0,U}} ->
+      Part = [{K,V} || {K,V} <- Part0, not lists:member(K, U)],
+      ?debug("restore local map Id=~w U=~w\n", [Id, U]),
+      pp_map("Part", dict:from_list(Part)),
+      pp_map("Map0", Map0),
+      Map = lists:foldl(fun({K,V}, D) -> dict:store(K, V, D)end, Map0, Part),
+      pp_map("Map", Map),
+      Map
+  end.
+
+v2_solve_conjunct(Conj, Map, V2State0) ->
+  #constraint_list{type = conj, list = Cs} = Conj,
+  ?debug("conjunct Id=~w~n", [Conj#constraint_list.id]),
+  IsFlat = case Cs of [#constraint{}|_] -> true; _ -> false end,
+  case get_flags(V2State0, Conj) of
+    {V2State, failed_list} -> {error, V2State};
+    {V2State, Flags} ->
+      v2_solve_conj(Flags, Cs, 1, Map, Conj, IsFlat, V2State, [], [], [],
+                    Map, Flags)
+  end.
+
+%% LastMap and LastFlags are used for loop detection.
+v2_solve_conj([I|Is], [Cs|Tail], I, Map0, Conj, IsFlat, V2State0,
+              UL, NewFs0, VarsUp, LastMap, LastFlags) ->
+  ?debug("conj Id=~w I=~w~n", [Conj#constraint_list.id, I]),
+  true = IsFlat =:= is_record(Cs, constraint),
+  pp_constr_data("conj", V2State0),
+  case v2_solve(Cs, Map0, V2State0) of
+    {error, V2State1} -> {error, failed_list(Conj, V2State1)};
+    {ok, Map, V2State1, []} ->
+      v2_solve_conj(Is, Tail, I+1, Map, Conj, IsFlat, V2State1,
+                    UL, NewFs0, VarsUp, LastMap, LastFlags);
+    {ok, Map, V2State1, U} when IsFlat -> % optimization
+      %% It is ensured by enumerate_constraints() that every
+      %% #constraint{} has a conjunct as parent, and that such a
+      %% parent has nothing but #constraint{}:s as children, a fact
+      %% which is used here to simplify the flag calculation.
+      Mask = lists:umerge([get_mask(V, Conj#constraint_list.masks) || V <- U]),
+      {Is1, NewF} = add_mask_to_flags(Is, Mask, I, []),
+      NewFs = [NewF|NewFs0],
+      v2_solve_conj(Is1, Tail, I+1, Map, Conj, IsFlat, V2State1,
+                    [U|UL], NewFs, VarsUp, LastMap, LastFlags);
+    {ok, Map, V2State1, U} ->
+      #constraint_list{masks = Masks, list = AllCs} = Conj,
+      M = lists:keydelete(I, 1, vars_per_child(U, Masks)),
+      {V2State2, NewF0} = save_updated_vars_list(AllCs, M, V2State1),
+      {NewF, F} = lists:splitwith(fun(J) -> J < I end, NewF0),
+      Is1 = lists:umerge(Is, F),
+      NewFs = [NewF|NewFs0],
+      v2_solve_conj(Is1, Tail, I+1, Map, Conj, IsFlat, V2State2,
+                    [U|UL], NewFs, VarsUp, LastMap, LastFlags)
+  end;
+v2_solve_conj([], _Cs, _I, Map, Conj, IsFlat, V2State, UL, NewFs, VarsUp,
+             LastMap, LastFlags) ->
+  U = lists:umerge(UL),
+  case lists:umerge(NewFs) of
+    [] ->
+      ?debug("conjunct finished Id=~w\n", [Conj#constraint_list.id]),
+      {ok, Map, V2State, lists:umerge([U|VarsUp])};
+    NewFlags when NewFlags =:= LastFlags, Map =:= LastMap ->
+      %% A loop was detected! The cause is some bug, possibly in erl_types.
+      %% The evaluation continues, but the results can be wrong.
+      report_detected_loop(Conj),
+      {ok, Map, V2State, lists:umerge([U|VarsUp])};
+    NewFlags ->
+      #constraint_list{type = conj, list = Cs} = Conj,
+      v2_solve_conj(NewFlags, Cs, 1, Map, Conj, IsFlat, V2State,
+                    [], [], [U|VarsUp], Map, NewFlags)
+  end;
+v2_solve_conj(Is, [_|Tail], I, Map, Conj, IsFlat, V2State, UL, NewFs, VarsUp,
+             LastMap, LastFlags) ->
+  v2_solve_conj(Is, Tail, I+1, Map, Conj, IsFlat, V2State, UL, NewFs, VarsUp,
+               LastMap, LastFlags).
+
+-ifdef(DEBUG_LOOP_DETECTION).
+report_detected_loop(Conj) ->
+  io:format("A loop was detected in ~w\n", [Conj#constraint_list.id]).
+-else.
+report_detected_loop(_) ->
+  ok.
+-endif.
+
+add_mask_to_flags(Flags, [Im|M], I, L) when I > Im ->
+  add_mask_to_flags(Flags, M, I, [Im|L]);
+add_mask_to_flags(Flags, [_|M], _I, L) ->
+  {lists:umerge(Flags, M), lists:reverse(L)}.
+
+get_mask(V, {d, Masks}) ->
+  case dict:find(V, Masks) of
+    error -> [];
+    {ok, M} -> M
+  end;
+get_mask(V, Masks) ->
+  case lists:keyfind(V, 1, Masks) of
+    false -> [];
+    {V, M} -> M
+  end.
+
+get_flags(#v2_state{constr_data = ConData}=V2State0, C) ->
+  #constraint_list{id = Id, list = Cs, masks = Masks} = C,
+  case dict:find(Id, ConData) of
+    error ->
+      ?debug("get_flags Id=~w Flags=all ~w\n", [Id, length(Cs)]),
+      V2State = V2State0#v2_state{constr_data = dict:store(Id, {[],[]}, ConData)},
+      {V2State, lists:seq(1, length(Cs))};
+    {ok, failed} ->
+      {V2State0, failed_list};
+    {ok, {Part,U}} when U =/= [] ->
+      ?debug("get_flags Id=~w U=~w\n", [Id, U]),
+      V2State = V2State0#v2_state{constr_data = dict:store(Id, {Part,[]}, ConData)},
+      save_updated_vars_list(Cs, vars_per_child(U, Masks), V2State)
+  end.
+
+vars_per_child(U, Masks) ->
+  family([{I, V} || V <- lists:usort(U), I <- get_mask(V, Masks)]).
+
+save_updated_vars_list(Cs, IU, V2State) ->
+  save_updated_vars_list1(Cs, IU, V2State, 1, []).
+
+save_updated_vars_list1([C|Cs], [{I,U}|IU], V2State0, I, Is) ->
+  V2State = save_updated_vars(C, U, V2State0),
+  save_updated_vars_list1(Cs, IU, V2State, I+1, [I|Is]);
+save_updated_vars_list1([], [], V2State, _I, Is) ->
+  {V2State, lists:reverse(Is)};
+save_updated_vars_list1([_|Cs], IU, V2State, I, Is) ->
+  save_updated_vars_list1(Cs, IU, V2State, I+1, Is).
+
+save_updated_vars(#constraint{}, _, V2State) ->
+  V2State;
+save_updated_vars(#constraint_list{}=C, U, V2State0) ->
+  save_updated_vars1(V2State0, C, U);
+save_updated_vars(#constraint_ref{id = Id}, U, V2State) ->
+  Cs = state__get_cs(Id, V2State#v2_state.state),
+  save_updated_vars(Cs, U, V2State).
+
+save_updated_vars1(V2State, C, U) ->
+  #v2_state{constr_data = ConData} = V2State,
+  #constraint_list{id = Id} = C,
+  case dict:find(Id, ConData) of
+    error -> V2State; % error means everything is flagged
+    {ok, failed} -> V2State;
+    {ok, {Part,U0}} ->
+      %% Duplicates are not so common; let masks/2 remove them.
+      U1 = U ++ U0,
+      V2State#v2_state{constr_data = dict:store(Id, {Part,U1}, ConData)}
+  end.
+
+-ifdef(DEBUG).
+pp_constr_data(_Tag, #v2_state{constr_data = D}) ->
+  io:format("Constr data at ~p\n", [_Tag]),
+  _ = [begin
+         case _PartU of
+           {_Part, _U} ->
+             io:format("Id: ~w Vars: ~w\n", [_Id, _U]),
+             [pp_map("Part", dict:from_list(_Part)) || _Part =/= []];
+           failed ->
+             io:format("Id: ~w failed list\n", [_Id])
+         end
+       end ||
+        {_Id, _PartU} <- lists:keysort(1, dict:to_list(D))],
+  ok.
+
+-else.
+pp_constr_data(_Tag, _V2State) ->
+  ok.
+-endif.
+
+failed_list(#constraint_list{id = Id}, #v2_state{constr_data = D}=V2State) ->
+  ?debug("error list ~w~n", [Id]),
+  V2State#v2_state{constr_data = dict:store(Id, failed, D)}.
+
+is_failed_list(#constraint_list{id = Id}, #v2_state{constr_data = D}) ->
+  dict:find(Id, D) =:= {ok, failed}.
+
+%% Solver v1
+
 solve_ref_or_list(#constraint_ref{id = Id, deps = Deps},
 		  Map, MapDict, State) ->
   {OldLocalMap, Check} =
     case dict:find(Id, MapDict) of
-      error -> {dict:new(), false};
+      error -> {map_new(), false};
       {ok, M} -> {M, true}
     end,
   ?debug("Checking ref to fun: ~w\n", [debug_lookup_name(Id)]),
+  %% Note: mk_constraint_ref() has already removed Id from Deps. The
+  %% reason for doing it there is that it makes it easy for
+  %% calculate_masks() to make the corresponding adjustment for
+  %% version v2.
   CheckDeps = ordsets:del_element(t_var_name(Id), Deps),
+  true = CheckDeps =:= Deps,
   case Check andalso maps_are_equal(OldLocalMap, Map, CheckDeps) of
     true ->
       ?debug("Equal\n", []),
@@ -1771,6 +2329,7 @@ solve_ref_or_list(#constraint_ref{id = Id, deps = Deps},
 	    FunType0 = lookup_type(Id, NewMap),
 	    {NewMapDict0, FunType0}
 	end,
+      ?debug("  Id=~w Assigned ~s\n", [Id, format_type(FunType)]),
       NewMap1 = enter_type(Id, FunType, Map),
       NewMap2 =
 	case state__get_rec_var(Id, State) of
@@ -1783,17 +2342,21 @@ solve_ref_or_list(#constraint_list{type=Type, list = Cs, deps = Deps, id = Id},
 		  Map, MapDict, State) ->
   {OldLocalMap, Check} =
     case dict:find(Id, MapDict) of
-      error -> {dict:new(), false};
+      error -> {map_new(), false};
       {ok, M} -> {M, true}
     end,
   ?debug("Checking ref to list: ~w\n", [Id]),
-  case Check andalso maps_are_equal(OldLocalMap, Map, Deps) of
+  if
+    OldLocalMap =:= error -> {error, MapDict};
     true ->
-      ?debug("~w equal ~w\n", [Type, Id]),
-      {ok, MapDict, Map};
-    false ->
-      ?debug("~w not equal: ~w. Solving\n", [Type, Id]),
-      solve_clist(Cs, Type, Id, Deps, MapDict, Map, State)
+      case Check andalso maps_are_equal(OldLocalMap, Map, Deps) of
+        true ->
+          ?debug("~w equal ~w\n", [Type, Id]),
+          {ok, MapDict, Map};
+        false ->
+          ?debug("~w not equal: ~w. Solving\n", [Type, Id]),
+          solve_clist(Cs, Type, Id, Deps, MapDict, Map, State)
+      end
   end.
 
 solve_self_recursive(Cs, Map, MapDict, Id, RecType0, State) ->
@@ -1801,8 +2364,8 @@ solve_self_recursive(Cs, Map, MapDict, Id, RecType0, State) ->
   {ok, RecVar} = state__get_rec_var(Id, State),
   ?debug("OldRecType ~s\n", [format_type(RecType0)]),
   RecType = t_limit(RecType0, ?TYPE_LIMIT),
-  Map1 = enter_type(RecVar, RecType, dict:erase(t_var_name(Id), Map)),
-  ?debug("\tMap in: ~p\n",[[{X, format_type(Y)}||{X, Y}<-dict:to_list(Map1)]]),
+  Map1 = enter_type(RecVar, RecType, erase_type(t_var_name(Id), Map)),
+  pp_map("Map1", Map1),
   case solve_ref_or_list(Cs, Map1, MapDict, State) of
     {error, _} = Error ->
       case t_is_none(RecType0) of
@@ -1815,8 +2378,7 @@ solve_self_recursive(Cs, Map, MapDict, Id, RecType0, State) ->
 	  Error
       end;
     {ok, NewMapDict, NewMap} ->
-      ?debug("\tMap: ~p\n",
-	     [[{X, format_type(Y)} || {X, Y} <- dict:to_list(NewMap)]]),
+      pp_map("NewMap", NewMap),
       NewRecType = unsafe_lookup_type(Id, NewMap),
       case t_is_equal(NewRecType, RecType0) of
 	true ->
@@ -1828,7 +2390,8 @@ solve_self_recursive(Cs, Map, MapDict, Id, RecType0, State) ->
 
 solve_clist(Cs, conj, Id, Deps, MapDict, Map, State) ->
   case solve_cs(Cs, Map, MapDict, State) of
-    {error, _} = Error -> Error;
+    {error, NewMapDict} ->
+      {error, dict:store(Id, error, NewMapDict)};
     {ok, NewMapDict, NewMap} = Ret ->
       case Cs of
 	[_] ->
@@ -1850,7 +2413,7 @@ solve_clist(Cs, disj, Id, _Deps, MapDict, Map, State) ->
 	end,
   {Maps, NewMapDict} = lists:mapfoldl(Fun, MapDict, Cs),
   case [X || {ok, X} <- Maps] of
-    [] -> {error, NewMapDict};
+    [] -> {error, dict:store(Id, error, NewMapDict)};
     MapList ->
       NewMap = join_maps(MapList),
       {ok, dict:store(Id, NewMap, NewMapDict), NewMap}
@@ -1869,14 +2432,9 @@ solve_cs([#constraint_list{} = C|Tail], Map, MapDict, State) ->
 solve_cs([#constraint{} = C|Tail], Map, MapDict, State) ->
   case solve_one_c(C, Map, State#state.opaques) of
     error ->
-      ?debug("+++++++++++\nFailed: ~s :: ~s ~w ~s :: ~s\n+++++++++++\n",
-	     [format_type(C#constraint.lhs),
-	      format_type(lookup_type(C#constraint.lhs, Map)),
-	      C#constraint.op,
-	      format_type(C#constraint.rhs),
-	      format_type(lookup_type(C#constraint.rhs, Map))]),
+      report_failed_constraint(C, Map),
       {error, MapDict};
-    {ok, NewMap} ->
+    {ok, {NewMap, _U}} ->
       solve_cs(Tail, NewMap, MapDict, State)
   end;
 solve_cs([], Map, MapDict, _State) ->
@@ -1897,7 +2455,11 @@ solve_one_c(#constraint{lhs = Lhs, rhs = Rhs, op = Op}, Map, Opaques) ->
 	eq ->
 	  case solve_subtype(Lhs, Inf, Map, Opaques) of
 	    error -> error;
-	    {ok, Map1} -> solve_subtype(Rhs, Inf, Map1, Opaques)
+	    {ok, {Map1, U1}} ->
+              case solve_subtype(Rhs, Inf, Map1, Opaques) of
+                error -> error;
+                {ok, {Map2, U2}} -> {ok, {Map2, lists:umerge(U1, U2)}}
+              end
 	  end
       end
   end.
@@ -1920,18 +2482,34 @@ solve_subtype(Type, Inf, Map, Opaques) ->
       end.
   %% end.
 
+report_failed_constraint(_C, _Map) ->
+  ?debug("+++++++++++\nFailed: ~s :: ~s ~w ~s :: ~s\n+++++++++++\n",
+         [format_type(_C#constraint.lhs),
+          format_type(lookup_type(_C#constraint.lhs, _Map)),
+          _C#constraint.op,
+          format_type(_C#constraint.rhs),
+          format_type(lookup_type(_C#constraint.rhs, _Map))]).
+
 %% ============================================================================
 %%
 %%  Maps and types.
 %%
 %% ============================================================================
 
+map_new() ->
+  dict:new().
+
+join_maps([Map]) ->
+  Map;
 join_maps(Maps) ->
-  Keys = lists:foldl(fun(TmpMap, AccKeys) ->
-			 [Key || Key <- AccKeys, dict:is_key(Key, TmpMap)]
-		     end,
-		     dict:fetch_keys(hd(Maps)), tl(Maps)),
-  join_maps(Keys, Maps, dict:new()).
+  Keys = constrained_keys(Maps),
+  join_maps(Keys, Maps, map_new()).
+
+constrained_keys(Maps) ->
+  lists:foldl(fun(TmpMap, AccKeys) ->
+                  [Key || Key <- AccKeys, dict:is_key(Key, TmpMap)]
+              end,
+              dict:fetch_keys(hd(Maps)), tl(Maps)).
 
 join_maps([Key|Left], Maps = [Map|MapsLeft], AccMap) ->
   NewType = join_one_key(Key, MapsLeft, lookup_type(Key, Map)),
@@ -1994,13 +2572,13 @@ enter_type(Key, Val, Map) when is_integer(Key) ->
   ?debug("Entering ~s :: ~s\n", [format_type(t_var(Key)), format_type(Val)]),
   case t_is_any(Val) of
     true ->
-      dict:erase(Key, Map);
+      erase_type(Key, Map);
     false ->
       LimitedVal = t_limit(Val, ?INTERNAL_TYPE_LIMIT),
       case dict:find(Key, Map) of
 	{ok, LimitedVal} -> Map;
-	{ok, _} -> dict:store(Key, LimitedVal, Map);
-	error -> dict:store(Key, LimitedVal, Map)
+	{ok, _} -> map_store(Key, LimitedVal, Map);
+	error -> map_store(Key, LimitedVal, Map)
       end
   end;
 enter_type(Key, Val, Map) ->
@@ -2008,13 +2586,13 @@ enter_type(Key, Val, Map) ->
   KeyName = t_var_name(Key),
   case t_is_any(Val) of
     true ->
-      dict:erase(KeyName, Map);
+      erase_type(KeyName, Map);
     false ->
       LimitedVal = t_limit(Val, ?INTERNAL_TYPE_LIMIT),
       case dict:find(KeyName, Map) of
 	{ok, LimitedVal} -> Map;
-	{ok, _} -> dict:store(KeyName, LimitedVal, Map);
-	error -> dict:store(KeyName, LimitedVal, Map)
+	{ok, _} -> map_store(KeyName, LimitedVal, Map);
+	error -> map_store(KeyName, LimitedVal, Map)
       end
   end.
 
@@ -2024,11 +2602,25 @@ enter_type_lists([Key|KeyTail], [Val|ValTail], Map) ->
 enter_type_lists([], [], Map) ->
   Map.
 
-enter_type_list([{Key, Val}|Tail], Map) ->
+enter_type_list(KeyVals, Map) ->
+  enter_type_list(KeyVals, Map, []).
+
+enter_type_list([{Key, Val}|Tail], Map, U0) ->
+  {Map1,U1} = enter_type2(Key, Val, Map),
+  enter_type_list(Tail, Map1, U1++U0);
+enter_type_list([], Map, U) ->
+  {Map, ordsets:from_list(U)}.
+
+enter_type2(Key, Val, Map) ->
   Map1 = enter_type(Key, Val, Map),
-  enter_type_list(Tail, Map1);
-enter_type_list([], Map) ->
-  Map.
+  {Map1, [Key || not is_same(Key, Map, Map1)]}.
+
+map_store(Key, Val, Map) ->
+  ?debug("Storing ~w :: ~s\n", [Key, format_type(Val)]),
+  dict:store(Key, Val, Map).
+
+erase_type(Key, Map) ->
+  dict:erase(Key, Map).
 
 lookup_type_list(List, Map) ->
   [lookup_type(X, Map) || X <- List].
@@ -2079,22 +2671,41 @@ mk_var_no_lit(Var) ->
 mk_var_no_lit_list(List) ->
   [mk_var_no_lit(X) || X <- List].
 
+updated_vars_only(U, OldMap, NewMap) ->
+  [V || V <- U, not is_same(V, OldMap, NewMap)].
+
+is_same(Key, Map1, Map2) ->
+  t_is_equal(lookup_type(Key, Map1), lookup_type(Key, Map2)).
+
+pp_map(_S, _Map) ->
+  ?debug("\t~s: ~p\n",
+            [_S, [{X, lists:flatten(format_type(Y))} ||
+                  {X, Y} <- lists:keysort(1, dict:to_list(_Map))]]).
+
 %% ============================================================================
 %%
 %%  The State.
 %%
 %% ============================================================================
 
-new_state(SCC0, NextLabel, CallGraph, Plt, PropTypes) ->
+new_state(SCC0, NextLabel, CallGraph, Plt, PropTypes, Solvers) ->
   List = [{MFA, Var} || {MFA, {Var, _Fun}, _Rec} <- SCC0],
   NameMap = dict:from_list(List),
   MFAs = [MFA || {MFA, _Var} <- List],
   SCC = [mk_var(Fun) || {_MFA, {_Var, Fun}, _Rec} <- SCC0],
-  SelfRecs = [F || F <- SCC,
-		   dialyzer_callgraph:is_self_rec(t_var_name(F), CallGraph)],
+  SelfRec =
+    case SCC of
+      [OneF] ->
+	Label = t_var_name(OneF),
+	case dialyzer_callgraph:is_self_rec(Label, CallGraph) of
+	  true -> OneF;
+	  false -> false
+	end;
+      _Many -> false
+    end,
   #state{callgraph = CallGraph, name_map = NameMap, next_label = NextLabel,
-	 prop_types = PropTypes, plt = Plt, scc = ordsets:from_list(SCC),
-	 mfas = MFAs, self_recs = ordsets:from_list(SelfRecs)}.
+	 prop_types = {d, PropTypes}, plt = Plt, scc = ordsets:from_list(SCC),
+	 mfas = MFAs, self_rec = SelfRec, solvers = Solvers}.
 
 state__set_rec_dict(State, RecDict) ->
   State#state{records = RecDict}.
@@ -2193,14 +2804,21 @@ state__plt(#state{plt = PLT}) ->
 state__new_constraint_context(State) ->
   State#state{cs = []}.
 
-state__prop_domain(FunLabel, #state{prop_types = PropTypes}) ->
+state__prop_domain(FunLabel, #state{prop_types = {e, ETSPropTypes}}) ->
+  try ets:lookup_element(ETSPropTypes, FunLabel, 2) of
+      {_Range_Fun, Dom} -> {ok, Dom};
+      FunType -> {ok, t_fun_args(FunType)}
+  catch
+    _:_ -> error
+  end;
+state__prop_domain(FunLabel, #state{prop_types = {d, PropTypes}}) ->
  case dict:find(FunLabel, PropTypes) of
     error -> error;
     {ok, {_Range_Fun, Dom}} -> {ok, Dom};
     {ok, FunType} -> {ok, t_fun_args(FunType)}
   end.
 
-state__add_prop_constrs(Tree, #state{prop_types = PropTypes} = State) ->
+state__add_prop_constrs(Tree, #state{prop_types = {d, PropTypes}} = State) ->
   Label = cerl_trees:get_label(Tree),
   case dict:find(Label, PropTypes) of
     error -> State;
@@ -2263,21 +2881,17 @@ state__mk_vars(N, #state{next_label = NL} = State) ->
   Vars = [t_var(X) || X <- lists:seq(NL, NewLabel-1)],
   {State#state{next_label = NewLabel}, Vars}.
 
-state__store_constrs(Id, Cs, #state{cmap = Dict} = State) ->
+state__store_constrs(Id, Cs, #state{cmap = {d, Dict}} = State) ->
   NewDict = dict:store(Id, Cs, Dict),
-  State#state{cmap = NewDict}.
+  State#state{cmap = {d, NewDict}}.
 
-state__get_cs(Var, #state{cmap = Dict}) ->
+state__get_cs(Var, #state{cmap = {e, ETSDict}}) ->
+  ets:lookup_element(ETSDict, Var, 2);
+state__get_cs(Var, #state{cmap = {d, Dict}}) ->
   dict:fetch(Var, Dict).
 
-%% The functions here will not be treated as self recursive.
-%% These functions will need to be handled as such manually.
-state__mark_as_non_self_rec(SCC, #state{self_recs = SelfRecs} = State) ->
-  %% TODO: Check if the result is always empty and just set it to [] if so.
-  State#state{self_recs = ordsets:subtract(SelfRecs, ordsets:from_list(SCC))}.
-
-state__is_self_rec(Fun, #state{self_recs = SelfRecs}) ->
-  ordsets:is_element(Fun, SelfRecs).
+state__is_self_rec(Fun, #state{self_rec = SelfRec}) ->
+  Fun =:= SelfRec.
 
 state__store_funs(Vars0, Funs0, #state{fun_map = Map} = State) ->
   debug_make_name_map(Vars0, Funs0),
@@ -2314,7 +2928,7 @@ mk_constraint(Lhs, Op, Rhs) ->
       case Deps =:= [] of
 	true ->
 	  %% This constraint is constant. Solve it immediately.
-	  case solve_one_c(C, dict:new(), []) of
+	  case solve_one_c(C, map_new(), []) of
 	    error -> throw(error);
 	    _ ->
 	      %% This is always true, keep it anyway for logistic reasons
@@ -2337,8 +2951,9 @@ constraint_opnd_is_any(Type) -> t_is_any(Type).
 
 -ifdef(DEBUG).
 
--spec mk_fun_var(fun((_) -> erl_types:erl_type()), [erl_types:erl_type()],
-		    integer()) -> #fun_var{}.
+-spec mk_fun_var(integer(),
+                 fun((_) -> erl_types:erl_type()),
+                 [erl_types:erl_type()]) -> #fun_var{}.
 
 mk_fun_var(Line, Fun, Types) ->
   Deps = [t_var_name(Var) || Var <- t_collect_vars(t_product(Types))],
@@ -2386,7 +3001,9 @@ mk_constraints([], _Op, []) ->
   [].
 
 mk_constraint_ref(Id, Deps) ->
-  #constraint_ref{id = Id, deps = Deps}.
+  %% See also solve_ref_or_list(), #constraint_ref{}.
+  Ds = ordsets:del_element(t_var_name(Id), Deps),
+  #constraint_ref{id = Id, deps = Ds}.
 
 mk_constraint_list(Type, List) ->
   List1 = ordsets:from_list(lift_lists(Type, List)),
@@ -2523,19 +3140,21 @@ enumerate_constraints([#constraint_ref{id = Id} = C|Tail], N, Acc, State) ->
 enumerate_constraints([#constraint_list{type = conj, list = List} = C|Tail],
 		      N, Acc, State) ->
   %% Separate the flat constraints from the deep ones to make a
-  %% separate fixpoint interation over the flat ones for speed.
-  {Flat, Deep} = lists:splitwith(fun(#constraint{}) -> true;
+  %% separate fixpoint iteration over the flat ones for speed.
+  {Flat, Deep} = lists:partition(fun(#constraint{}) -> true;
 				    (#constraint_list{}) -> false;
 				    (#constraint_ref{}) -> false
 				 end, List),
   {NewFlat, N1, State1} = enumerate_constraints(Flat, N, [], State),
   {NewDeep, N2, State2} = enumerate_constraints(Deep, N1, [], State1),
   {NewList, N3} =
-    case shorter_than_two(NewFlat) orelse (NewDeep =:= []) of
-      true -> {NewFlat ++ NewDeep, N2};
-      false ->
-	{NewCLists, TmpN} = group_constraints_in_components(NewFlat, N2),
-	{NewCLists ++ NewDeep, TmpN}
+    if
+      NewFlat =:= [] -> {NewDeep, N2};
+      NewDeep =:= [] -> {NewFlat, N2};
+      true ->
+        TmpCList = mk_conj_constraint_list(NewFlat),
+        {[TmpCList#constraint_list{id = {list, N2}}| NewDeep],
+         N2 + 1}
     end,
   NewAcc = [C#constraint_list{list = NewList, id = {list, N3}}|Acc],
   enumerate_constraints(Tail, N3+1, NewAcc, State2);
@@ -2549,42 +3168,6 @@ enumerate_constraints([#constraint{} = C|Tail], N, Acc, State) ->
 enumerate_constraints([], N, Acc, State) ->
   {lists:reverse(Acc), N, State}.
 
-shorter_than_two([]) -> true;
-shorter_than_two([_]) -> true;
-shorter_than_two([_|_]) -> false.
-
-group_constraints_in_components(Cs, N) ->
-  DepList = [Deps || #constraint{deps = Deps} <- Cs],
-  case find_dep_components(DepList, []) of
-    [_] -> {Cs, N};
-    [_|_] = Components ->
-      ConstrComp = [[C || #constraint{deps = D} = C <- Cs,
-			  ordsets:is_subset(D, Comp)]
-		    || Comp <- Components],
-      lists:mapfoldl(fun(CComp, TmpN) ->
-			 TmpCList = mk_conj_constraint_list(CComp),
-			 {TmpCList#constraint_list{id = {list, TmpN}},
-			  TmpN + 1}
-		     end, N, ConstrComp)
-  end.
-
-find_dep_components([Set|Left], AccComponents) ->
-  {Component, Ungrouped} = find_dep_components(Left, Set, []),
-  case Component =:= Set of
-    true -> find_dep_components(Ungrouped, [Component|AccComponents]);
-    false -> find_dep_components([Component|Ungrouped], AccComponents)
-  end;
-find_dep_components([], AccComponents) ->
-  AccComponents.
-
-find_dep_components([Set|Left], AccSet, Ungrouped) ->
-  case ordsets:intersection(Set, AccSet) of
-    [] -> find_dep_components(Left, AccSet, [Set|Ungrouped]);
-    [_|_] -> find_dep_components(Left, ordsets:union(Set, AccSet), Ungrouped)
-  end;
-find_dep_components([], AccSet, Ungrouped) ->
-  {AccSet, Ungrouped}.
-
 %% Put the fun ref constraints last in any conjunction since we need
 %% to separate the environment from the interior of the function.
 order_fun_constraints(State) ->
@@ -2615,7 +3198,9 @@ order_fun_constraints([#constraint_list{list = List, type = Type} = C|Tail],
 		  end,
 	lists:mapfoldl(FoldFun, State, List)
     end,
-  NewAcc = [update_constraint_list(C, NewList)|Acc],
+  C1 = update_constraint_list(C, NewList),
+  Masks = calculate_masks(NewList, 1, []),
+  NewAcc = [update_masks(C1, Masks)|Acc],
   order_fun_constraints(Tail, Funs, NewAcc, NewState);
 order_fun_constraints([#constraint{} = C|Tail], Funs, Acc, State) ->
   order_fun_constraints(Tail, Funs, [C|Acc], State);
@@ -2623,6 +3208,22 @@ order_fun_constraints([], Funs, Acc, State) ->
   NewState = order_fun_constraints(Funs, State),
   {lists:reverse(Acc)++Funs, NewState}.
 
+update_masks(C, Masks) ->
+  C#constraint_list{masks = Masks}.
+
+-define(VARS_LIMIT, 50).
+
+calculate_masks([C|Cs], I, L0) ->
+  calculate_masks(Cs, I+1, [{V, I} || V <- get_deps(C)] ++ L0);
+calculate_masks([], _I, L) ->
+  M = family(L),
+  case length(M) > ?VARS_LIMIT of
+    true ->
+      {d, dict:from_list(M)};
+    false ->
+      M
+  end.
+
 %% ============================================================================
 %%
 %%  Utilities.
@@ -2700,6 +3301,9 @@ lookup_record(Records, Tag, Arity) ->
       error
   end.
 
+family(L) ->
+    sofs:to_external(sofs:rel2fam(sofs:relation(L))).
+
 %% ============================================================================
 %%
 %%  Pretty printer and debug facilities.
@@ -2714,13 +3318,24 @@ lookup_record(Records, Tag, Arity) ->
 
 -ifdef(DEBUG).
 format_type(#fun_var{deps = Deps, origin = Origin}) ->
-  io_lib:format("Fun@L~p(~s)",
-		[Origin, lists:flatten([format_type(t_var(X))||X<-Deps])]);
+  L = [format_type(t_var(X)) || X <- Deps],
+  io_lib:format("Fun@L~p(~s)", [Origin, join_chars(L, ",")]);
 format_type(Type) ->
   case cerl:is_literal(Type) of
     true -> io_lib:format("~w", [cerl:concrete(Type)]);
     false -> erl_types:t_to_string(Type)
   end.
+
+join_chars([], _Sep) ->
+  [];
+join_chars([H|T], Sep) ->
+  [H|[[Sep,X] || X <- T]].
+
+debug_lookup_name(Var) ->
+  case dict:find(t_var_name(Var), get(dialyzer_typesig_map)) of
+    error -> Var;
+    {ok, Name} -> Name
+  end.
 -endif.
 
 -ifdef(DEBUG_NAME_MAP).
@@ -2739,12 +3354,6 @@ debug_make_name_map([Var|VarLeft], [Fun|FunLeft], Map) ->
 debug_make_name_map([], [], Map) ->
   Map.
 
-debug_lookup_name(Var) ->
-  case dict:find(t_var_name(Var), get(dialyzer_typesig_map)) of
-    error -> Var;
-    {ok, Name} -> Name
-  end.
-
 -else.
 debug_make_name_map(_Vars, _Funs) ->
   ok.
@@ -2755,51 +3364,55 @@ pp_constrs_scc(SCC, State) ->
   [pp_constrs(Fun, state__get_cs(Fun, State), State) || Fun <- SCC].
 
 pp_constrs(Fun, Cs, State) ->
-  io:format("Constraints for fun: ~w\n", [debug_lookup_name(Fun)]),
+  io:format("Constraints for fun: ~w", [debug_lookup_name(Fun)]),
   MaxDepth = pp_constraints(Cs, State),
   io:format("Depth: ~w\n", [MaxDepth]).
 
 pp_constraints(Cs, State) ->
-  Res = pp_constraints([Cs], none, 0, 0, State),
+  Res = pp_constraints([Cs], 0, 0, State),
   io:nl(),
   Res.
 
-pp_constraints([List|Tail], Separator, Level, MaxDepth,
-	       State) when is_list(List) ->
-  pp_constraints(List++Tail, Separator, Level, MaxDepth, State);
-pp_constraints([#constraint_ref{id = Id}|Left], Separator,
-	       Level, MaxDepth, State) ->
+pp_constraints([List|Tail], Level, MaxDepth, State) when is_list(List) ->
+  pp_constraints(List++Tail, Level, MaxDepth, State);
+pp_constraints([#constraint_ref{id = Id}|Left], Level, MaxDepth, State) ->
   Cs = state__get_cs(Id, State),
+  pp_indent(Level),
   io:format("%Ref ~w%", [t_var_name(Id)]),
-  pp_constraints([Cs|Left], Separator, Level, MaxDepth, State);
-pp_constraints([#constraint{lhs = Lhs, op = Op, rhs = Rhs}], _Separator,
-	       Level, MaxDepth, _State) ->
-  io:format("~s ~w ~s", [format_type(Lhs), Op, format_type(Rhs)]),
+  pp_constraints([Cs|Left], Level, MaxDepth, State);
+pp_constraints([#constraint{}=C], Level, MaxDepth, _State) ->
+  pp_op(C, Level),
   erlang:max(Level, MaxDepth);
-pp_constraints([#constraint{lhs = Lhs, op = Op, rhs = Rhs}|Tail], Separator,
-	       Level, MaxDepth, State) ->
-  io:format("~s ~w ~s ~s ", [format_type(Lhs), Op, format_type(Rhs),Separator]),
-  pp_constraints(Tail, Separator, Level, MaxDepth, State);
+pp_constraints([#constraint{}=C|Tail], Level, MaxDepth, State) ->
+  pp_op(C, Level),
+  pp_constraints(Tail, Level, MaxDepth, State);
 pp_constraints([#constraint_list{type = Type, list = List, id = Id}],
-	       _Separator, Level, MaxDepth, State) ->
-  io:format("%List ~w(", [Id]),
-  NewSeparator = case Type of
-		   conj -> "*";
-		   disj -> "+"
-		 end,
-  NewMaxDepth = pp_constraints(List, NewSeparator, Level + 1, MaxDepth, State),
+	       Level, MaxDepth, State) ->
+  pp_indent(Level),
+  case Type of
+    conj -> io:format("Conj ~w (", [Id]);
+    disj -> io:format("Disj ~w (", [Id])
+  end,
+  NewMaxDepth = pp_constraints(List, Level + 1, MaxDepth, State),
   io:format(")", []),
   NewMaxDepth;
 pp_constraints([#constraint_list{type = Type, list = List, id = Id}|Tail],
-	       Separator, Level, MaxDepth, State) ->
-  io:format("List ~w(", [Id]),
-  NewSeparator = case Type of
-		   conj -> "*";
-		   disj -> "+"
-		 end,
-  NewMaxDepth = pp_constraints(List, NewSeparator, Level+1, MaxDepth, State),
-  io:format(") ~s\n~s ", [Separator, Separator]),
-  pp_constraints(Tail, Separator, Level, NewMaxDepth, State).
+	       Level, MaxDepth, State) ->
+  pp_indent(Level),
+  case Type of
+    conj -> io:format("Conj ~w (", [Id]);
+    disj -> io:format("Disj ~w (", [Id])
+  end,
+  NewMaxDepth = pp_constraints(List, Level+1, MaxDepth, State),
+  io:format(")", []),
+  pp_constraints(Tail, Level, NewMaxDepth, State).
+
+pp_op(#constraint{lhs = Lhs, op = Op, rhs = Rhs}, Level) ->
+  pp_indent(Level),
+  io:format("~s ~w ~s", [format_type(Lhs), Op, format_type(Rhs)]).
+
+pp_indent(Level) ->
+  io:format("\n~*s", [Level*2, ""]).
 -else.
 pp_constrs_scc(_SCC, _State) ->
   ok.
diff --git a/lib/dialyzer/src/dialyzer_utils.erl b/lib/dialyzer/src/dialyzer_utils.erl
index 2a248fb028..8046b48838 100644
--- a/lib/dialyzer/src/dialyzer_utils.erl
+++ b/lib/dialyzer/src/dialyzer_utils.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -43,7 +43,8 @@
 	 pp_hook/0,
 	 process_record_remote_types/1,
          sets_filter/2,
-	 src_compiler_opts/0
+	 src_compiler_opts/0,
+	 parallelism/0
 	]).
 
 -include("dialyzer.hrl").
@@ -536,3 +537,12 @@ pp_unit(Unit, Ctxt, Cont) ->
 pp_atom(Atom) ->
   String = atom_to_list(cerl:atom_val(Atom)),
   prettypr:text(String).
+
+%%------------------------------------------------------------------------------
+
+-spec parallelism() -> integer().
+
+parallelism() ->
+  CPUs = erlang:system_info(logical_processors_available),
+  Schedulers = erlang:system_info(schedulers),
+  min(CPUs, Schedulers).
diff --git a/lib/dialyzer/src/dialyzer_worker.erl b/lib/dialyzer/src/dialyzer_worker.erl
new file mode 100644
index 0000000000..1338997899
--- /dev/null
+++ b/lib/dialyzer/src/dialyzer_worker.erl
@@ -0,0 +1,189 @@
+%% -*- erlang-indent-level: 2 -*-
+%%-----------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(dialyzer_worker).
+
+-export([launch/4, sequential/4]).
+
+-export_type([worker/0]).
+
+-type worker() :: pid(). %%opaque
+
+-type mode()        :: dialyzer_coordinator:mode().
+-type coordinator() :: dialyzer_coordinator:coordinator().
+-type init_data()   :: dialyzer_coordinator:init_data().
+-type result()      :: dialyzer_coordinator:result().
+
+-record(state, {
+	  mode             :: mode(),
+	  job              :: mfa_or_funlbl() | file:filename(),
+	  coordinator      :: coordinator(),
+	  init_data        :: init_data(),
+	  depends_on  = [] :: list()
+	 }).
+
+-include("dialyzer.hrl").
+
+%% -define(DEBUG, true).
+
+-ifdef(DEBUG).
+-define(debug(X__, Y__), io:format(X__, Y__)).
+-else.
+-define(debug(X__, Y__), ok).
+-endif.
+
+%%--------------------------------------------------------------------
+
+-spec launch(mode(), [mfa_or_funlbl()], init_data(), coordinator()) -> worker().
+
+launch(Mode, Job, InitData, Coordinator) ->
+  State = #state{mode        = Mode,
+		 job         = Job,
+		 init_data   = InitData,
+		 coordinator = Coordinator},
+  InitState =
+    case Mode of
+      X when X =:= 'typesig'; X =:= 'dataflow' -> initializing;
+      X when X =:= 'compile'; X =:= 'warnings' -> running
+    end,
+  spawn_link(fun() -> loop(InitState, State) end).
+
+%%--------------------------------------------------------------------
+
+loop(updating, State) ->
+  ?debug("Update: ~p\n",[State#state.job]),
+  NextStatus =
+    case waits_more_success_typings(State) of
+      true -> waiting;
+      false -> running
+    end,
+  loop(NextStatus, State);
+loop(initializing, #state{job = SCC, init_data = InitData} = State) ->
+  DependsOn = dialyzer_succ_typings:find_depends_on(SCC, InitData),
+  ?debug("Deps ~p: ~p\n",[State#state.job, DependsOn]),
+  loop(updating, State#state{depends_on = DependsOn});
+loop(waiting, State) ->
+  ?debug("Wait: ~p\n",[State#state.job]),
+  NewState = wait_for_success_typings(State),
+  loop(updating, NewState);
+loop(running, #state{mode = 'compile'} = State) ->
+  dialyzer_coordinator:wait_activation(),
+  ?debug("Compile: ~s\n",[State#state.job]),
+  Result =
+    case start_compilation(State) of
+      {ok, EstimatedSize, Data} ->
+	Label = ask_coordinator_for_label(EstimatedSize, State),
+	continue_compilation(Label, Data);
+      {error, _Reason} = Error ->
+	Error
+    end,
+  report_to_coordinator(Result, State);
+loop(running, #state{mode = 'warnings'} = State) ->
+  dialyzer_coordinator:wait_activation(),
+  ?debug("Warning: ~s\n",[State#state.job]),
+  Result = collect_warnings(State),
+  report_to_coordinator(Result, State);
+loop(running, #state{mode = Mode} = State) when
+    Mode =:= 'typesig'; Mode =:= 'dataflow' ->
+  request_activation(State),
+  ?debug("Run: ~p\n",[State#state.job]),
+  NotFixpoint = do_work(State),
+  ok = broadcast_done(State),
+  report_to_coordinator(NotFixpoint, State).
+
+waits_more_success_typings(#state{depends_on = Depends}) ->
+  Depends =/= [].
+
+broadcast_done(#state{job = SCC, init_data = InitData,
+		      coordinator = Coordinator}) ->
+  RequiredBy = dialyzer_succ_typings:find_required_by(SCC, InitData),
+  {Callers, Unknown} =
+    dialyzer_coordinator:sccs_to_pids(RequiredBy, Coordinator),
+  send_done(Callers, SCC),
+  continue_broadcast_done(Unknown, SCC, Coordinator).
+
+send_done(Callers, SCC) ->
+  ?debug("Sending ~p: ~p\n",[SCC, Callers]),
+  SendSTFun = fun(PID) -> PID ! {done, SCC} end,
+  lists:foreach(SendSTFun, Callers).
+
+continue_broadcast_done([], _SCC, _Coordinator) -> ok;
+continue_broadcast_done(Rest, SCC, Coordinator) ->
+  %% This time limit should be greater than the time required
+  %% by the coordinator to spawn all processes.
+  timer:sleep(500),
+  {Callers, Unknown} = dialyzer_coordinator:sccs_to_pids(Rest, Coordinator),
+  send_done(Callers, SCC),
+  continue_broadcast_done(Unknown, SCC, Coordinator).
+
+wait_for_success_typings(#state{depends_on = DependsOn} = State) ->
+  receive
+    {done, SCC} ->
+      ?debug("GOT ~p: ~p\n",[State#state.job, SCC]),
+      State#state{depends_on = DependsOn -- [SCC]}
+  after
+    5000 ->
+      ?debug("Still Waiting ~p: ~p\n",[State#state.job, DependsOn]),
+      State
+  end.
+
+request_activation(#state{coordinator = Coordinator}) ->
+  dialyzer_coordinator:request_activation(Coordinator).
+
+do_work(#state{mode = Mode, job = Job, init_data = InitData}) ->
+  case Mode of
+    typesig -> dialyzer_succ_typings:find_succ_types_for_scc(Job, InitData);
+    dataflow -> dialyzer_succ_typings:refine_one_module(Job, InitData)
+  end.
+
+report_to_coordinator(Result, #state{job = Job, coordinator = Coordinator}) ->
+  ?debug("Done: ~p\n",[Job]),
+  dialyzer_coordinator:job_done(Job, Result, Coordinator).
+
+start_compilation(#state{job = Job, init_data = InitData}) ->
+  dialyzer_analysis_callgraph:start_compilation(Job, InitData).
+
+ask_coordinator_for_label(EstimatedSize, #state{coordinator = Coordinator}) ->
+  dialyzer_coordinator:get_next_label(EstimatedSize, Coordinator).
+
+continue_compilation(Label, Data) ->
+  dialyzer_analysis_callgraph:continue_compilation(Label, Data).
+
+collect_warnings(#state{job = Job, init_data = InitData}) ->
+  dialyzer_succ_typings:collect_warnings(Job, InitData).
+
+%%------------------------------------------------------------------------------
+
+-type extra() :: label() | 'unused'.
+
+-spec sequential(mode(), [mfa_or_funlbl()], init_data(), extra()) -> result().
+
+sequential('compile', Job, InitData, Extra) ->
+  case dialyzer_analysis_callgraph:start_compilation(Job, InitData) of
+    {ok, EstimatedSize, Data} ->
+      {EstimatedSize, continue_compilation(Extra, Data)};
+    {error, _Reason} = Error -> {0, Error}
+  end;
+sequential('typesig', Job, InitData, _Extra) ->
+  dialyzer_succ_typings:find_succ_types_for_scc(Job, InitData);
+sequential('dataflow', Job, InitData, _Extra) ->
+  dialyzer_succ_typings:refine_one_module(Job, InitData);
+sequential('warnings', Job, InitData, _Extra) ->
+  dialyzer_succ_typings:collect_warnings(Job, InitData).
diff --git a/lib/dialyzer/test/Makefile b/lib/dialyzer/test/Makefile
index 6a1abce943..9f8a3f1194 100644
--- a/lib/dialyzer/test/Makefile
+++ b/lib/dialyzer/test/Makefile
@@ -25,10 +25,10 @@ RELSYSDIR = $(RELEASE_PATH)/dialyzer_test
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_tests_spec:
-	$(INSTALL_DIR) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	$(INSTALL_DATA) $(AUXILIARY_FILES) $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
-	cd $(RELSYSDIR);\
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(AUXILIARY_FILES) "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
+	cd "$(RELSYSDIR)";\
 	erlc dialyzer_common.erl file_utils.erl;\
 	erl -noshell -run dialyzer_common create_all_suites -s erlang halt
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/queue b/lib/dialyzer/test/opaque_SUITE_data/results/queue
index 59ce33f098..c3f04ea64d 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/queue
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/queue
@@ -5,6 +5,7 @@ queue_use.erl:27: The attempt to match a term of type queue() against the patter
 queue_use.erl:33: Attempt to test for equality between a term of type {[42,...],[]} and a term of opaque type queue()
 queue_use.erl:36: The attempt to match a term of type queue() against the pattern {F, _R} breaks the opaqueness of the term
 queue_use.erl:40: The call queue:out({[42,...],[]}) does not have an opaque term of type queue() as 1st argument
+queue_use.erl:48: The call queue_use:add_unique(42,#db{p::[],q::queue()}) contains an opaque term as 2nd argument when terms of different types are expected in these positions
 queue_use.erl:51: The call queue_use:is_in_queue(E::42,DB::#db{p::[],q::queue()}) contains an opaque term as 2nd argument when terms of different types are expected in these positions
 queue_use.erl:56: The attempt to match a term of type #db{p::[],q::queue()} against the pattern {'db', _, {L1, L2}} breaks the opaqueness of queue()
 queue_use.erl:62: The call queue_use:tuple_queue({42,'gazonk'}) does not have a term of type {_,queue()} (with opaque subterms) as 1st argument
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/asn1 b/lib/dialyzer/test/r9c_SUITE_data/results/asn1
index 292275dd6e..c11105b76d 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/asn1
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/asn1
@@ -68,7 +68,6 @@ asn1rt_check.erl:100: The variable _ can never match since previous clauses comp
 asn1rt_check.erl:85: The variable _ can never match since previous clauses completely covered the type [any()]
 asn1rt_driver_handler.erl:32: The pattern 'already_done' can never match the type {'error',_}
 asn1rt_per.erl:1065: The pattern {'BMPString', {'octets', Ol}} can never match the type {_,[{'bits',1 | 2 | 4 | 8 | 16 | 32,_}]}
-asn1rt_per.erl:1066: Function will never be called
 asn1rt_per.erl:1231: The call erlang:'not'('implemented') will never return since it differs in the 1st argument from the success typing arguments: (boolean())
 asn1rt_per.erl:1233: The call erlang:'not'('implemented') will never return since it differs in the 1st argument from the success typing arguments: (boolean())
 asn1rt_per.erl:1235: The call erlang:'not'('implemented') will never return since it differs in the 1st argument from the success typing arguments: (boolean())
@@ -76,7 +75,6 @@ asn1rt_per.erl:1237: The call erlang:'not'('implemented') will never return sinc
 asn1rt_per.erl:989: The pattern <_C, 'true', _Val> can never match the type <_,'false',_>
 asn1rt_per_bin.erl:1361: The pattern <_, 'true', _> can never match the type <_,'false',_>
 asn1rt_per_bin.erl:1436: The pattern {'BMPString', {'octets', Ol}} can never match the type {'BMPString' | 'IA5String' | 'NumericString' | 'PrintableString' | 'UniversalString' | 'VisibleString',[{'bits',1 | 2 | 4 | 8 | 16 | 32,_}]}
-asn1rt_per_bin.erl:1437: Function will never be called
 asn1rt_per_bin.erl:161: The call asn1rt_per_bin:getbit({0,maybe_improper_list()}) will never return since it differs in the 1st argument from the success typing arguments: (<<_:8,_:_*8>> | {non_neg_integer(),<<_:1,_:_*1>>})
 asn1rt_per_bin.erl:1812: The pattern {Name, Val} can never match since previous clauses completely covered the type any()
 asn1rt_per_bin.erl:2106: Cons will produce an improper list since its 2nd argument is binary()
@@ -94,7 +92,6 @@ asn1rt_per_bin.erl:487: The variable _ can never match since previous clauses co
 asn1rt_per_bin.erl:498: The variable _ can never match since previous clauses completely covered the type integer()
 asn1rt_per_bin_rt2ct.erl:152: The call asn1rt_per_bin_rt2ct:getbit({0,maybe_improper_list()}) will never return since it differs in the 1st argument from the success typing arguments: (<<_:8,_:_*8>> | {non_neg_integer(),<<_:1,_:_*1>>})
 asn1rt_per_bin_rt2ct.erl:1533: The pattern {'BMPString', {'octets', Ol}} can never match the type {_,[[any(),...]]}
-asn1rt_per_bin_rt2ct.erl:1534: Function will never be called
 asn1rt_per_bin_rt2ct.erl:1875: The pattern {Name, Val} can never match since previous clauses completely covered the type any()
 asn1rt_per_bin_rt2ct.erl:443: The variable _ can never match since previous clauses completely covered the type integer()
 asn1rt_per_bin_rt2ct.erl:464: The variable _ can never match since previous clauses completely covered the type integer()
@@ -103,4 +100,3 @@ asn1rt_per_bin_rt2ct.erl:484: The variable _ can never match since previous clau
 asn1rt_per_bin_rt2ct.erl:495: The variable _ can never match since previous clauses completely covered the type integer()
 asn1rt_per_v1.erl:1209: The pattern <_, 'true', _> can never match the type <_,'false',_>
 asn1rt_per_v1.erl:1290: The pattern {'BMPString', {'octets', Ol}} can never match the type {'BMPString' | 'IA5String' | 'NumericString' | 'PrintableString' | 'UniversalString' | 'VisibleString',[{'bits',1 | 2 | 4 | 8 | 16 | 32,_}]}
-asn1rt_per_v1.erl:1291: Function will never be called
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/inets b/lib/dialyzer/test/r9c_SUITE_data/results/inets
index 773525eb7f..d789d8d246 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/inets
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/inets
@@ -31,11 +31,11 @@ httpd_sup.erl:92: The variable Else can never match since previous clauses compl
 mod_auth.erl:559: The pattern {'error', Reason} can never match the type {_,integer(),maybe_improper_list(),_}
 mod_auth_dets.erl:120: The call lists:foreach(fun((_) -> 'true' | {'error','no_such_group' | 'no_such_group_member'}),{'ok',[any()]}) will never return since it differs in the 2nd argument from the success typing arguments: (fun((_) -> any()),[any()])
 mod_auth_plain.erl:100: The variable _ can never match since previous clauses completely covered the type {'ok',[any()]}
-mod_auth_plain.erl:159: The variable _ can never match since previous clauses completely covered the type [any()]
-mod_auth_plain.erl:83: The variable O can never match since previous clauses completely covered the type [any()]
+mod_auth_plain.erl:159: The variable _ can never match since previous clauses completely covered the type [[any()]]
+mod_auth_plain.erl:83: The variable O can never match since previous clauses completely covered the type [[any()]]
 mod_cgi.erl:372: The pattern {'http_response', NewAccResponse} can never match the type 'ok'
 mod_dir.erl:101: The call lists:flatten(nonempty_improper_list(atom() | [any()] | char(),atom())) will never return since it differs in the 1st argument from the success typing arguments: ([any()])
-mod_dir.erl:72: The pattern {'error', Reason} can never match the type {'ok',[[[any()] | char()],...]}
+mod_dir.erl:72: The pattern {'error', Reason} can never match the type {'ok',[[[any()] | non_neg_integer()],...]}
 mod_get.erl:135: The pattern <{'enfile', _}, _Info, Path> can never match the type <atom(),#mod{},atom() | binary() | [atom() | [any()] | char()]>
 mod_head.erl:80: The pattern <{'enfile', _}, _Info, Path> can never match the type <atom(),#mod{},atom() | binary() | [atom() | [any()] | char()]>
 mod_htaccess.erl:460: The pattern {'error', BadData} can never match the type {'ok',_}
@@ -47,9 +47,9 @@ mod_include.erl:692: The pattern <{'read', Reason}, Info, Path> can never match
 mod_include.erl:706: The pattern <{'enfile', _}, _Info, Path> can never match the type <atom(),#mod{},atom() | binary() | [atom() | [any()] | char()]>
 mod_include.erl:716: Function read_error/3 will never be called
 mod_include.erl:719: Function read_error/4 will never be called
-mod_security_server.erl:386: The variable O can never match since previous clauses completely covered the type [any()]
-mod_security_server.erl:433: The variable Other can never match since previous clauses completely covered the type [any()]
-mod_security_server.erl:585: The variable _ can never match since previous clauses completely covered the type [any()]
-mod_security_server.erl:608: The variable _ can never match since previous clauses completely covered the type [any()]
-mod_security_server.erl:641: The variable _ can never match since previous clauses completely covered the type [any()]
+mod_security_server.erl:386: The variable O can never match since previous clauses completely covered the type [tuple()]
+mod_security_server.erl:433: The variable Other can never match since previous clauses completely covered the type [tuple()]
+mod_security_server.erl:585: The variable _ can never match since previous clauses completely covered the type [tuple()]
+mod_security_server.erl:608: The variable _ can never match since previous clauses completely covered the type [tuple()]
+mod_security_server.erl:641: The variable _ can never match since previous clauses completely covered the type [tuple()]
 uri.erl:146: The pattern {'error', Error} can never match since previous clauses completely covered the type {_,{[],[]}}
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/mnesia b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
index b397d37523..17f2bd2ea8 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
@@ -1,7 +1,6 @@
 
 mnesia.erl:1319: Guard test size(Spec::[{_,_,_},...]) can never succeed
 mnesia.erl:1498: The call mnesia:bad_info_reply(Tab::atom(),Item::'type') will never return since it differs in the 2nd argument from the success typing arguments: (atom(),'memory' | 'size')
-mnesia.erl:331: Function mod2abs/1 has no local return
 mnesia_backup.erl:49: Callback info about the mnesia_backup behaviour is not available
 mnesia_bup.erl:111: The created fun has no local return
 mnesia_bup.erl:574: Function fallback_receiver/2 has no local return
diff --git a/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args10 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args10
new file mode 100644
index 0000000000..c3c9b12bdd
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args10
@@ -0,0 +1,2 @@
+
+ets_insert_args10.erl:9: The call ets:insert(T::'foo',[{'counter',number()},...]) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(T::'foo','counter') call in ets_insert_args10.erl on line 8
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args10.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args10.erl
new file mode 100644
index 0000000000..c897a34af0
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args10.erl
@@ -0,0 +1,19 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account the argument types of the calls.
+
+-module(ets_insert_args10).
+-export([start/0]).
+
+start() ->
+  F = fun(T) -> [{_, N}] = ets:lookup(T, counter),
+               ets:insert(T, [{counter, N+1}])
+      end,
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  A = {counter, 0},
+  B = [],
+  ets:insert(foo, [A|B]),
+  io:format("Inserted ~w\n", [{counter, 0}]),
+  F(foo),
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, counter),
+  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes b/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes
new file mode 100644
index 0000000000..4850f3ff0c
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes
@@ -0,0 +1,31 @@
+
+contracts_with_subtypes.erl:106: The call contracts_with_subtypes:rec_arg({'a','b'}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,{'a',A} | {'b',B}), is_subtype(A,'a' | {'b',B}), is_subtype(B,'b' | {'a',A})
+contracts_with_subtypes.erl:107: The call contracts_with_subtypes:rec_arg({'b','a'}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,{'a',A} | {'b',B}), is_subtype(A,'a' | {'b',B}), is_subtype(B,'b' | {'a',A})
+contracts_with_subtypes.erl:108: The call contracts_with_subtypes:rec_arg({'a',{'b','a'}}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,{'a',A} | {'b',B}), is_subtype(A,'a' | {'b',B}), is_subtype(B,'b' | {'a',A})
+contracts_with_subtypes.erl:109: The call contracts_with_subtypes:rec_arg({'b',{'a','b'}}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,{'a',A} | {'b',B}), is_subtype(A,'a' | {'b',B}), is_subtype(B,'b' | {'a',A})
+contracts_with_subtypes.erl:110: The call contracts_with_subtypes:rec_arg({'a',{'b',{'a','b'}}}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,{'a',A} | {'b',B}), is_subtype(A,'a' | {'b',B}), is_subtype(B,'b' | {'a',A})
+contracts_with_subtypes.erl:111: The call contracts_with_subtypes:rec_arg({'b',{'a',{'b','a'}}}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,{'a',A} | {'b',B}), is_subtype(A,'a' | {'b',B}), is_subtype(B,'b' | {'a',A})
+contracts_with_subtypes.erl:142: The pattern 1 can never match the type binary() | string()
+contracts_with_subtypes.erl:145: The pattern 'alpha' can never match the type {'ok',_} | {'ok',_,binary() | string()}
+contracts_with_subtypes.erl:147: The pattern 42 can never match the type {'ok',_} | {'ok',_,binary() | string()}
+contracts_with_subtypes.erl:163: The pattern 'alpha' can never match the type {'ok',X}
+contracts_with_subtypes.erl:165: The pattern 42 can never match the type {'ok',X}
+contracts_with_subtypes.erl:183: The pattern 'alpha' can never match the type {'ok',X}
+contracts_with_subtypes.erl:185: The pattern 42 can never match the type {'ok',X}
+contracts_with_subtypes.erl:202: The pattern 1 can never match the type binary() | string()
+contracts_with_subtypes.erl:205: The pattern {'ok', _} can never match the type {'ok',X,binary() | string()}
+contracts_with_subtypes.erl:206: The pattern 'alpha' can never match the type {'ok',X,binary() | string()}
+contracts_with_subtypes.erl:207: The pattern {'ok', 42} can never match the type {'ok',X,binary() | string()}
+contracts_with_subtypes.erl:208: The pattern 42 can never match the type {'ok',X,binary() | string()}
+contracts_with_subtypes.erl:234: Function flat_ets_new_t/0 has no local return
+contracts_with_subtypes.erl:235: The call contracts_with_subtypes:flat_ets_new(12,[]) breaks the contract (Name,Options) -> atom() when is_subtype(Name,atom()), is_subtype(Options,[Option]), is_subtype(Option,'set' | 'ordered_set' | 'bag' | 'duplicate_bag' | 'public' | 'protected' | 'private' | 'named_table' | {'keypos',integer()} | {'heir',pid(),term()} | {'heir','none'} | {'write_concurrency',boolean()} | {'read_concurrency',boolean()} | 'compressed')
+contracts_with_subtypes.erl:23: Invalid type specification for function contracts_with_subtypes:extract2/0. The success typing is () -> 'something'
+contracts_with_subtypes.erl:261: Function factored_ets_new_t/0 has no local return
+contracts_with_subtypes.erl:262: The call contracts_with_subtypes:factored_ets_new(12,[]) breaks the contract (Name,Options) -> atom() when is_subtype(Name,atom()), is_subtype(Options,[Option]), is_subtype(Option,Type | Access | 'named_table' | {'keypos',Pos} | {'heir',Pid::pid(),HeirData} | {'heir','none'} | Tweaks), is_subtype(Type,type()), is_subtype(Access,access()), is_subtype(Tweaks,{'write_concurrency',boolean()} | {'read_concurrency',boolean()} | 'compressed'), is_subtype(Pos,pos_integer()), is_subtype(HeirData,term())
+contracts_with_subtypes.erl:77: The call contracts_with_subtypes:foo1(5) breaks the contract (Arg1) -> Res when is_subtype(Arg1,atom()), is_subtype(Res,atom())
+contracts_with_subtypes.erl:78: The call contracts_with_subtypes:foo2(5) breaks the contract (Arg1) -> Res when is_subtype(Arg1,Arg2), is_subtype(Arg2,atom()), is_subtype(Res,atom())
+contracts_with_subtypes.erl:79: The call contracts_with_subtypes:foo3(5) breaks the contract (Arg1) -> Res when is_subtype(Arg2,atom()), is_subtype(Arg1,Arg2), is_subtype(Res,atom())
+contracts_with_subtypes.erl:7: Invalid type specification for function contracts_with_subtypes:extract/0. The success typing is () -> 'something'
+contracts_with_subtypes.erl:80: The call contracts_with_subtypes:foo4(5) breaks the contract (Type) -> Type when is_subtype(Type,atom())
+contracts_with_subtypes.erl:81: The call contracts_with_subtypes:foo5(5) breaks the contract (Type::atom()) -> Type::atom()
+contracts_with_subtypes.erl:82: The call contracts_with_subtypes:foo6(5) breaks the contract (Type) -> Type when is_subtype(Type,atom())
diff --git a/lib/dialyzer/test/small_SUITE_data/results/fun_ref_match b/lib/dialyzer/test/small_SUITE_data/results/fun_ref_match
index 60b34530b4..e69de29bb2 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/fun_ref_match
+++ b/lib/dialyzer/test/small_SUITE_data/results/fun_ref_match
@@ -1,2 +0,0 @@
-
-fun_ref_match.erl:14: Function will never be called
diff --git a/lib/dialyzer/test/small_SUITE_data/results/port_info_test b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
index 9ee863f9eb..863a3d61df 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/port_info_test
+++ b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
@@ -3,4 +3,5 @@ port_info_test.erl:10: The pattern {'connected', 42} can never match the type 'u
 port_info_test.erl:14: The pattern {'registered_name', "42"} can never match the type 'undefined' | {'registered_name',atom()}
 port_info_test.erl:19: The pattern {'output', 42} can never match the type 'undefined' | {'connected',pid()}
 port_info_test.erl:24: Guard test 'links' =:= Atom::'connected' can never succeed
-port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | {'connected' | 'id' | 'input' | 'links' | 'name' | 'output' | 'registered_name',atom() | pid() | [pid() | char()] | integer()}
+port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | {'connected' | 'id' | 'input' | 'links' | 'name' | 'os_pid' | 'output' | 'registered_name',atom() | pid() | [pid() | char()] | integer()}
+port_info_test.erl:32: The pattern {'os_pid', "42"} can never match the type 'undefined' | {'os_pid','undefined' | non_neg_integer()}
diff --git a/lib/dialyzer/test/small_SUITE_data/src/collapse_lists/a.erl b/lib/dialyzer/test/small_SUITE_data/src/collapse_lists/a.erl
new file mode 100644
index 0000000000..7efe870b0d
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/collapse_lists/a.erl
@@ -0,0 +1,9 @@
+-module(a).
+-export([g/1]).
+
+-export_type([a/0, t/0]).
+-type a() :: integer().
+-type t() :: a() | maybe_improper_list(t(), t()).
+
+-spec g(t()) -> t().
+g(X) -> X.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/collapse_lists/b.erl b/lib/dialyzer/test/small_SUITE_data/src/collapse_lists/b.erl
new file mode 100644
index 0000000000..b08bc5e66c
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/collapse_lists/b.erl
@@ -0,0 +1,5 @@
+-module(b).
+-export([f/1]).
+
+-spec f(a:t()) -> a:t().
+f(X) -> a:g(X).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/contracts_with_subtypes.erl b/lib/dialyzer/test/small_SUITE_data/src/contracts_with_subtypes.erl
new file mode 100644
index 0000000000..d72138d509
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/contracts_with_subtypes.erl
@@ -0,0 +1,267 @@
+-module(contracts_with_subtypes).
+
+-compile(export_all).
+
+%===============================================================================
+
+-spec extract() -> 'ok'.
+
+extract() ->
+   case dz_extract() of
+       {ok, Val} -> Val;
+       error -> exit(boom)
+   end.
+
+-spec dz_extract() -> RetValue when
+     FileList :: something,
+     RetValue :: {ok, FileList} | error.
+
+dz_extract() -> get(foo).
+
+%-------------------------------------------------------------------------------
+
+-spec extract2() -> 'ok'.
+
+extract2() ->
+   case dz_extract2() of
+       {ok, Val} -> Val;
+       error -> exit(boom)
+   end.
+
+-spec dz_extract2() -> RetValue when
+     RetValue :: {ok, FileList} | error,
+     FileList :: something.
+
+dz_extract2() -> get(foo).
+
+%===============================================================================
+
+-spec foo1(Arg1) -> Res when
+      Arg1 :: atom(),
+      Res  :: atom().
+
+foo1(X) -> X.
+
+-spec foo2(Arg1) -> Res when
+      Arg1 :: Arg2,
+      Arg2 :: atom(),
+      Res  :: atom().
+
+foo2(X) -> X.
+
+-spec foo3(Arg1) -> Res when
+      Arg2 :: atom(),
+      Arg1 :: Arg2,
+      Res  :: atom().
+
+foo3(X) -> X.
+
+-spec foo4(Type) -> Type when is_subtype(Type, atom()).
+
+foo4(X) -> X.
+
+-spec foo5(Type :: atom()) -> Type :: atom().
+
+foo5(X) -> X.
+
+-spec foo6(Type) -> Type when Type :: atom().
+
+foo6(X) -> X.
+
+-spec foo7(Type) -> Type.
+
+foo7(X) -> X.
+
+%-------------------------------------------------------------------------------
+
+bar(1) -> foo1(5);
+bar(2) -> foo2(5);
+bar(3) -> foo3(5);
+bar(4) -> foo4(5);
+bar(5) -> foo5(5);
+bar(6) -> foo6(5);
+bar(7) -> foo7(5).
+
+wrong_foo6() ->
+    b = foo6(a).
+
+%===============================================================================
+
+-spec rec_arg(Arg) -> ok when
+      Arg :: {a, A} | {b, B},
+      A   :: a | {b, B},
+      B   :: b | {a, A}.
+
+rec_arg(X) -> get(X).
+
+c(aa) -> rec_arg({a, a});
+c(bb) -> rec_arg({b, b});
+c(abb) -> rec_arg({a, {b, b}});
+c(baa) -> rec_arg({b, {a, a}});
+c(abaa) -> rec_arg({a, {b, {a, a}}});
+c(babb) -> rec_arg({b, {a, {b, b}}});
+c(ababb) -> rec_arg({a, {b, {a, {b, b}}}});
+c(babaa) -> rec_arg({b, {a, {b, {a, a}}}}).
+
+w(ab) -> rec_arg({a, b});
+w(ba) -> rec_arg({b, a});
+w(aba) -> rec_arg({a, {b, a}});
+w(bab) -> rec_arg({b, {a, b}});
+w(abab) -> rec_arg({a, {b, {a, b}}});
+w(baba) -> rec_arg({b, {a, {b, a}}});
+w(ababa) -> rec_arg({a, {b, {a, {b, a}}}});
+w(babab) -> rec_arg({b, {a, {b, {a, b}}}}).
+
+%===============================================================================
+
+-type dublo(X) :: {X, X}.
+
+-type weird(X,Y) :: {X, Y, X, X}.
+
+-spec forfun(dublo(Var)) -> ok when Var :: atom().
+
+forfun(_) -> ok.
+
+-spec forfun2(weird(Var, Var)) -> ok when Var :: atom().
+
+forfun2(_) -> ok.
+
+%===============================================================================
+
+-spec shallow(X) -> {ok, X} | {ok, X, file:filename()} | err1 | err2.
+
+shallow(X) -> get(X).
+
+st(X) when is_atom(X) ->
+    case shallow(X) of
+	err1 -> ok;
+	err2 -> ok;
+	{ok, X} -> ok;
+	{ok, X, Res} ->
+	    case Res of
+		1      -> bad;
+		_Other -> ok
+	    end;
+	alpha -> bad;
+	{ok, 42} -> bad;
+	42 -> bad
+    end.
+
+%-------------------------------------------------------------------------------
+
+-spec deep(X) -> Ret when
+      Ret :: {ok, X} | Err,
+      Err :: err1 | err2.
+
+deep(X) -> get(X).
+
+dt(X) when is_atom(X) ->
+    case deep(X) of
+	err1 -> ok;
+	err2 -> ok;
+	{ok, X} -> ok;
+	alpha -> bad;
+	{ok, 42} -> bad;
+	42 -> bad
+    end.
+
+%-------------------------------------------------------------------------------
+
+-type local_errors() :: err1 | err2.
+
+-spec deep2(X) -> Ret when
+      Ret :: {ok, X} | Err,
+      Err :: local_errors().
+
+deep2(X) -> get(X).
+
+dt2(X) when is_atom(X) ->
+    case deep2(X) of
+	err1 -> ok;
+	err2 -> ok;
+	{ok, X} -> ok;
+	alpha -> bad;
+	{ok, 42} -> bad;
+	42 -> bad
+    end.
+
+%-------------------------------------------------------------------------------
+
+-spec deep3(X) -> Ret when
+      Ret :: {ok, X, file:filename()} | Err,
+      Err :: local_errors().
+
+deep3(X) -> get(X).
+
+dt3(X) when is_atom(X) ->
+    case deep3(X) of
+	err1 -> ok;
+	err2 -> ok;
+	{ok, X, Res} ->
+	    case Res of
+		1      -> bad;
+		_Other -> ok
+	    end;
+	{ok, X} -> bad;
+	alpha -> bad;
+	{ok, 42} -> bad;
+	42 -> bad
+    end.
+
+%===============================================================================
+
+-spec flat_ets_new(Name, Options) -> atom() when
+      Name :: atom(),
+      Options :: [Option],
+      Option :: set
+              | ordered_set
+              | bag
+              | duplicate_bag
+              | public
+              | protected
+              | private
+              | named_table
+              | {keypos, integer()}
+              | {heir, pid(), term()}
+              | {heir, none}
+              | {write_concurrency, boolean()}
+              | {read_concurrency, boolean()}
+              | compressed.
+
+flat_ets_new(Name, Options) ->
+    get({Name, Options}).
+
+flat_ets_new_t() ->
+    flat_ets_new(12,[]),
+    flat_ets_new({a,b},[]),
+    flat_ets_new(name,[foo]),
+    flat_ets_new(name,{bag}),
+    flat_ets_new(name,bag),
+    ok.
+
+-type access()     :: public | protected | private.
+-type type()       :: set | ordered_set | bag | duplicate_bag.
+
+-spec factored_ets_new(Name, Options) -> atom() when
+      Name :: atom(),
+      Options :: [Option],
+      Option :: Type | Access | named_table | {keypos,Pos}
+              | {heir, Pid :: pid(), HeirData} | {heir, none} | Tweaks,
+      Type :: type(),
+      Access :: access(),
+      Tweaks :: {write_concurrency, boolean()}
+              | {read_concurrency, boolean()}
+              | compressed,
+      Pos :: pos_integer(),
+      HeirData :: term().
+
+factored_ets_new(Name, Options) ->
+    get({Name, Options}).
+
+factored_ets_new_t() ->
+    factored_ets_new(12,[]),
+    factored_ets_new({a,b},[]),
+    factored_ets_new(name,[foo]),
+    factored_ets_new(name,{bag}),
+    factored_ets_new(name,bag),
+    ok.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/deep_lc.erl b/lib/dialyzer/test/small_SUITE_data/src/deep_lc.erl
new file mode 100644
index 0000000000..d9ca0817d9
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/deep_lc.erl
@@ -0,0 +1,14 @@
+-module(deep_lc).
+
+-export([t/0]).
+
+%% This is compile/test/lc_SUITE:deeply_nested/1
+%%
+%% Used to be _very_ slow. Unknown how slow, but more than 15 hours.
+
+t() ->
+    [[X1,X2,X3,X4,X5,X6,X7(),X8,X9,X10,X11,X12,X13,X14,X15,X16,X17,X18(),X19,X20] ||
+        X1 <- [99],X2 <- [98],X3 <- [97],X4 <- [96],X5 <- [42],X6 <- [17],
+	X7 <- [fun() -> X5*X5 end],X8 <- [12],X9 <- [11],X10 <- [10],
+        X11 <- [9],X12 <- [8],X13 <- [7],X14 <- [6],X15 <- [5],
+	X16 <- [4],X17 <- [3],X18 <- [fun() -> X16+X17 end],X19 <- [2],X20 <- [1]].
diff --git a/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl b/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
index 2ee9a3a6e2..07f22256c9 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
@@ -3,7 +3,7 @@
 %% and the quality of the warnings that Dialyzer spits out
 %%
 -module(port_info_test).
--export([t1/1, t2/1, t3/1, t4/1, t5/2, buggy/1]).
+-export([t1/1, t2/1, t3/1, t4/1, t5/2, t6/1, buggy/1]).
 
 %% The following errors are correctly caught, but the messages are a bit weird
 t1(X) when is_port(X) ->
@@ -28,6 +28,10 @@ t5(X, Atom) when is_port(X) ->
   {gazonk, _} = erlang:port_info(X, Atom);
 t5(_, _) -> ok.
 
+t6(X) when is_port(X) ->
+  {os_pid, "42"} = erlang:port_info(X, os_pid);
+t6(_) -> ok.
+
 %% The type system is not strong enough to catch the following errors
 buggy(X) when is_atom(X) ->
   {links, X} = erlang:port_info(foo, X).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/remote_tuple_set.erl b/lib/dialyzer/test/small_SUITE_data/src/remote_tuple_set.erl
new file mode 100644
index 0000000000..6c440ed04c
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/remote_tuple_set.erl
@@ -0,0 +1,8 @@
+-module(remote_tuple_set).
+
+-export([parse_cidr/0]).
+
+-spec parse_cidr() -> {inet:address_family(),1,2} | {error}.
+
+parse_cidr() ->
+    {inet,1,2}.
diff --git a/lib/dialyzer/test/user_SUITE_data/results/wsp_pdu b/lib/dialyzer/test/user_SUITE_data/results/wsp_pdu
index a47b1f1f2c..d1f8f4caf2 100644
--- a/lib/dialyzer/test/user_SUITE_data/results/wsp_pdu
+++ b/lib/dialyzer/test/user_SUITE_data/results/wsp_pdu
@@ -6,7 +6,7 @@ wsp_pdu.erl:2403: The call wsp_pdu:d_date(Data1::binary()) will never return sin
 wsp_pdu.erl:2406: Guard test is_integer(Sec::{[byte()] | byte() | {'long',binary()} | {'short',binary()},binary()}) can never succeed
 wsp_pdu.erl:2408: The pattern {'short', Data2} can never match the type {[byte()] | byte() | {'long',binary()} | {'short',binary()},binary()}
 wsp_pdu.erl:2755: Function parse_push_flag/1 has no local return
-wsp_pdu.erl:2756: The call erlang:integer_to_list(Value::[any()]) will never return since it differs in the 1st argument from the success typing arguments: (integer())
+wsp_pdu.erl:2756: The call erlang:integer_to_list(Value::[any()]) breaks the contract (Integer) -> string() when is_subtype(Integer,integer())
 wsp_pdu.erl:2875: The call wsp_pdu:d_text_string(Data::byte()) will never return since it differs in the 1st argument from the success typing arguments: (binary())
 wsp_pdu.erl:2976: The call wsp_pdu:d_q_value(QData::byte()) will never return since it differs in the 1st argument from the success typing arguments: (<<_:8,_:_*8>>)
 wsp_pdu.erl:3336: The call wsp_pdu:encode_typed_field(Ver::any(),'Q-value',ParamValue::any()) will never return since it differs in the 2nd argument from the success typing arguments: (any(),'Constrained-encoding' | 'Date-value' | 'No-value' | 'Short-integer' | 'Text-string' | 'Text-value' | 'Well-known-charset',any())
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index edafcc4afb..f344fe0604 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 2.5.1
+DIALYZER_VSN = 2.5.3
diff --git a/lib/diameter/.gitignore b/lib/diameter/.gitignore
index 5afcbedc23..8b13789179 100644
--- a/lib/diameter/.gitignore
+++ b/lib/diameter/.gitignore
@@ -1,58 +1 @@
 
-# Match at any level.
-*~
-autom4te.cache
-
-# Compiler derivatives
-#
-# Do not use too creative wildcards.
-# Those might ignore files that should not be ignored.
-
-i686-pc-linux-gnu
-x86_64-unknown-linux-gnu
-i386-apple-darwin[0-9]*.[0-9]*.[0-9]*
-sparc-sun-solaris[0-9]*.[0-9]*
-i386-pc-solaris[0-9]*.[0-9]*
-i386-unknown-freebsd[0-9]*.[0-9]*
-tile-tilera-linux-gnu
-powerpc-unknown-linux-gnu
-
-# Mac OS X
-a.out.dSYM/
-
-# Anchored from $DIAMETER_TOP
-/config.log
-/config.status
-
-/Makefile
-/configure
-
-
-# General patterns for applications in lib.
-#
-# Assume that all test/Emakefiles are generated.
-#
-# Any application with a checked-in test/Emakefile should
-# use a negative pattern in its own .gitignore.
-
-#
-# Files generated by configure.
-#
-
-/configure
-/config.log
-/config.status
-
-
-#
-# Generated documentation. (ie. not doc/src)
-#
-
-/doc/[^s]*
-
-
-#
-# Files generated when building/running tests
-#
-
-/test/*.log
diff --git a/lib/inviso/Makefile b/lib/diameter/Makefile
index be19199151..9961d627cf 100644
--- a/lib/inviso/Makefile
+++ b/lib/diameter/Makefile
@@ -1,37 +1,32 @@
-# ``The contents of this file are subject to the Erlang Public License,
+# 
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2010-2012. All Rights Reserved.
+#
+# The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
 # compliance with the License. You should have received a copy of the
 # Erlang Public License along with this software. If not, it can be
-# retrieved via the world wide web at http://www.erlang.org/.
-# 
+# retrieved online at http://www.erlang.org/.
+#
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 # the License for the specific language governing rights and limitations
 # under the License.
-# 
-# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-# AB. All Rights Reserved.''
-# 
-#     $Id$
 #
+# %CopyrightEnd%
+
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-#
-# Macros
-#
-
-SUB_DIRECTORIES = src doc/src
-
 include vsn.mk
-VSN = $(RUNTIME_TOOLS_VSN)
+include subdirs.mk
 
+SUB_DIRECTORIES = $(SUB_DIRS) doc/src
 SPECIAL_TARGETS = 
 
-#
-# Default Subdir Targets
-#
 include $(ERL_TOP)/make/otp_subdir.mk
 
+info: 
+	@echo "APP_VSN = $(APP_VSN)"
 
+.PHONY: info
diff --git a/lib/diameter/Makefile.in b/lib/diameter/Makefile.in
deleted file mode 100644
index cf38c26045..0000000000
--- a/lib/diameter/Makefile.in
+++ /dev/null
@@ -1,88 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2010-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-else
-include $(DIAMETER_TOP)/make/target.mk
-include $(DIAMETER_TOP)/make/$(TARGET)/rules.mk
-endif
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include vsn.mk
-VSN=$(DIAMETER_VSN)
-
-DIAMETER_TOP = @DIAMETER_TOP@
-
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-include subdirs.mk
-
-SUB_DIRECTORIES = $(SUB_DIRS) doc/src
-
-SPECIAL_TARGETS = 
-
-ifneq ($(ERL_TOP),)
-ifneq ($(PREFIX),)
-CONFIGURE_OPTS += --prefix=$(PREFIX)
-endif
-endif
-
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/otp_subdir.mk
-else
-include $(DIAMETER_TOP)/make/subdir.mk
-endif
-
-.PHONY: reconf conf info version dialyzer
-
-reconf: 
-	autoconf
-
-conf: do_configure
-
-do_configure: configure
-	./configure $(CONFIGURE_OPTS)
-
-configure: configure.in
-	autoconf
-
-info: 
-	@echo "APP_VSN:      $(APP_VSN)"
-	@echo "DIAMETER_VSN: $(DIAMETER_VSN)"
-
-version:
-	@echo "$(VSN)"
-
-
-dialyzer: 
-	(cd ./ebin; \
-         dialyzer --build_plt \
-                  --output_plt ../priv/diameter.plt \
-                  -r ../../diameter/ebin \
-                  --verbose)
diff --git a/lib/diameter/aclocal.m4 b/lib/diameter/aclocal.m4
deleted file mode 100644
index 2abb47dba2..0000000000
--- a/lib/diameter/aclocal.m4
+++ /dev/null
@@ -1,65 +0,0 @@
-dnl
-dnl %CopyrightBegin%
-dnl
-dnl Copyright Ericsson AB 1998-2011. All Rights Reserved.
-dnl
-dnl The contents of this file are subject to the Erlang Public License,
-dnl Version 1.1, (the "License"); you may not use this file except in
-dnl compliance with the License. You should have received a copy of the
-dnl Erlang Public License along with this software. If not, it can be
-dnl retrieved online at http://www.erlang.org/.
-dnl
-dnl Software distributed under the License is distributed on an "AS IS"
-dnl basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-dnl the License for the specific language governing rights and limitations
-dnl under the License.
-dnl
-dnl %CopyrightEnd%
-dnl
-
-dnl
-dnl aclocal.m4
-dnl
-dnl Local macros used in configure.in. The Local Macros which
-dnl could/should be part of autoconf are prefixed LM_, macros specific
-dnl to the Erlang system are prefixed ERL_.
-dnl
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_PROG_INSTALL_DIR
-dnl
-dnl Figure out how to create directories with parents.
-dnl (In my opinion INSTALL_DIR is a bad name, MKSUBDIRS or something is better)
-dnl
-dnl We prefer 'install -d', but use 'mkdir -p' if it exists.
-dnl If none of these methods works, we give up.
-dnl
-
-
-AC_DEFUN(LM_PROG_INSTALL_DIR,
-[AC_CACHE_CHECK(how to create a directory including parents,
-ac_cv_prog_mkdir_p,
-[
-temp_name_base=config.$$
-temp_name=$temp_name_base/x/y/z
-$INSTALL -d $temp_name >/dev/null 2>&1
-ac_cv_prog_mkdir_p=none
-if test -d $temp_name; then
-        ac_cv_prog_mkdir_p="$INSTALL -d"
-else
-        mkdir -p $temp_name >/dev/null 2>&1
-        if test -d $temp_name; then
-                ac_cv_prog_mkdir_p="mkdir -p"
-        fi
-fi
-rm -fr $temp_name_base           
-])
-
-case "${ac_cv_prog_mkdir_p}" in
-  none) AC_MSG_ERROR(don't know how create directories with parents) ;;
-  *)    INSTALL_DIR="$ac_cv_prog_mkdir_p" AC_SUBST(INSTALL_DIR)     ;;
-esac
-])
-
-
diff --git a/lib/diameter/autoconf/config.guess b/lib/diameter/autoconf/config.guess
deleted file mode 100755
index 38a833903b..0000000000
--- a/lib/diameter/autoconf/config.guess
+++ /dev/null
@@ -1,1519 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2007-05-17'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <[email protected]>.
-# Please send patches to <[email protected]>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <[email protected]>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# ([email protected] 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# [email protected] (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
-	    x86) 
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    EM64T | authenticamd)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    tile:Linux:*:*)
-	echo tile-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    xtensa:Linux:*:*)
-    	echo xtensa-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <[email protected]>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <[email protected]>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From [email protected].
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From [email protected].
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From [email protected].
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <[email protected]> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/lib/diameter/autoconf/config.sub b/lib/diameter/autoconf/config.sub
deleted file mode 100755
index f43233b104..0000000000
--- a/lib/diameter/autoconf/config.sub
+++ /dev/null
@@ -1,1630 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2007-04-29'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <[email protected]>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <[email protected]>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	tile*)
-		basic_machine=tile-tilera
-		os=-linux-gnu
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-        mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/lib/diameter/autoconf/configure.vxworks b/lib/diameter/autoconf/configure.vxworks
deleted file mode 100755
index 33aa497680..0000000000
--- a/lib/diameter/autoconf/configure.vxworks
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/sh
-# 
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-# 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# %CopyrightEnd%
-# 
-# Author:
-#         Patrik Winroth 
-#
-
-
-# vxworks_ppc860 vxworks_ppc603 vxworks_ppc603_longcall vxworks_cpu32 vxworks_sparc 
-# vxworks_ppc750 vxworks_simso
-
-case $# in
-1) host=$1 ;;
-*) echo "usage: configure.vxworks host-configuration"; exit 1 ;;
-esac
-
-case $1 in
-vxworks_cpu32) ;;
-vxworks_ppc750) ;;
-vxworks_ppc860) ;;
-vxworks_ppc603) ;;
-vxworks_ppc603_nolongcall) ;;
-vxworks_sparc) ;;
-vxworks_simso) ;;
-vxworks_simlinux) ;;
-vxworks_ppc32) ;;
-*) echo "usage: configure.vxworks TARGET";
-   echo "where TARGET is one of vxworks_cpu32, vxworks_ppc750, vxworks_ppc860, vxworks_ppc603, vxworks_ppc603_nolongcall, vxworks_sparc, vxworks_simso, vxworks_simlinux, vxworks_ppc32"; exit 1;;
-esac
-
-if [ "x$ERL_TOP" = x ]; then
-    echo "You need to set ERL_TOP!"
-    exit 1
-fi
-
-
-target=$host
-
-# Find out the HOST and WIND_BASE environment
-HOST_TYPE=${HOST_TYPE:=sun4-solaris2}
-case $1 in
-vxworks_ppc750) VXTOP=Tornado2.2 ;;
-vxworks_simso)  VXTOP=WindRiver ;;
-vxworks_simlinux)  VXTOP=WindRiver ;;
-vxworks_ppc32)  VXTOP=WindRiver ;;
-*)              VXTOP=wind ;;
-esac
-
-WIND_BASE=${WIND_BASE:=`ypmatch tornado passwd | awk -F: '{print $6}'`/$VXTOP}
-
-# These are created by autoconf.
-MKDIRS="${ERL_TOP}/lib/os_mon/priv/bin/$target
-        ${ERL_TOP}/lib/os_mon/priv/obj/$target
-        ${ERL_TOP}/lib/orber/priv/obj/$target
-        ${ERL_TOP}/lib/orber/priv/bin/$target
-        ${ERL_TOP}/lib/ic/priv/lib/$target
-        ${ERL_TOP}/lib/ic/priv/obj/$target
-        ${ERL_TOP}/lib/asn1/priv/lib/$target
-        ${ERL_TOP}/lib/asn1/priv/obj/$target
-        ${ERL_TOP}/lib/erl_interface/obj/$target
-        ${ERL_TOP}/lib/erl_interface/obj.debug/$target
-        ${ERL_TOP}/lib/erl_interface/bin/$target
-        ${ERL_TOP}/lib/runtime_tools/priv/lib/$target
-        ${ERL_TOP}/lib/runtime_tools/priv/obj/$target
-	${ERL_TOP}/erts/obj/$target
-	${ERL_TOP}/erts/obj.debug/$target
-	${ERL_TOP}/bin/$target"
-
-for dir in $MKDIRS; do
-  test ! -d "$dir" && mkdir -p "$dir"
-done
-
-#
-# Create Makefiles for vxWorks.
-#
-my_root=${ERL_TOP}/erts/emulator
-emu_test=$my_root/test
-beam=$my_root/beam
-erts_lib_src=${ERL_TOP}/erts/lib_src
-erts_incl=${ERL_TOP}/erts/include
-erts_incl_intrnl=${ERL_TOP}/erts/include/internal
-etcdir=${ERL_TOP}/erts/etc/common
-erlint_dir=${ERL_TOP}/lib/erl_interface/src
-epmd_dir=${ERL_TOP}/erts/epmd/src
-os_mon_dir=${ERL_TOP}/lib/os_mon/c_src
-orber_dir=${ERL_TOP}/lib/orber/c_src
-ic_dir=${ERL_TOP}/lib/ic/c_src
-asn1_dir=${ERL_TOP}/lib/asn1/c_src
-internal_tools_dir=${ERL_TOP}
-libdir=${ERL_TOP}/lib
-tsdir=$libdir/test_server/src
-zlibdir=${ERL_TOP}/erts/emulator/zlib
-runtime_tools_dir=${ERL_TOP}/lib/runtime_tools/c_src
-tools_dir=${ERL_TOP}/lib/tools/c_src
-
-CONFIG_FILES="${ERL_TOP}/erts/emulator/$host/Makefile
-	    $erts_lib_src/$host/Makefile
-	    $erts_incl/$host/erl_int_sizes_config.h
-	    $erts_incl_intrnl/$host/ethread.mk
-	    $erts_incl_intrnl/$host/ethread_header_config.h
-	    $etcdir/$host/Makefile
-	    $erlint_dir/$host/Makefile
-	    $erlint_dir/$host/eidefs.mk
-	    $epmd_dir/$host/Makefile
-	    $internal_tools_dir/make/$host/otp.mk
-	    $os_mon_dir/$host/Makefile
-	    $zlibdir/$host/Makefile
-	    $ic_dir/$host/Makefile
-	    $asn1_dir/$host/Makefile
-	    $runtime_tools_dir/$host/Makefile
-	    $tools_dir/$host/Makefile
-	    $orber_dir/$host/Makefile"
-
-for file in $CONFIG_FILES; do
-    new_name=`echo $file|sed "s%/$host/%/$target/%"`
-    dir=`echo $new_name|sed 's%/[^/][^/]*$%%'`
-    if test "$dir" != "$new_name" && test "$dir" != .; then
-	test ! -d "$dir" && mkdir "$dir"
-    fi
-
-    sole_name=`echo $file|sed "s%.*$target/%%"`
-    in_file=`echo $dir|sed "s%/[^/][^/]*$%/$sole_name.in%"`
-    echo "creating $new_name"
-    sed -f vxworks/sed.$target -f vxworks/sed.general \
-	-e "s,@HOST_TYPE@,$HOST_TYPE,g" \
-	-e "s,@WIND_BASE@,$WIND_BASE,g" \
-	-e "s,@TARGET@,$target,g" \
-	$in_file > $new_name
-done
-
-
diff --git a/lib/diameter/autoconf/install-sh b/lib/diameter/autoconf/install-sh
deleted file mode 100755
index a5897de6ea..0000000000
--- a/lib/diameter/autoconf/install-sh
+++ /dev/null
@@ -1,519 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2006-12-25.00
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/lib/diameter/autoconf/vxworks/sed.general b/lib/diameter/autoconf/vxworks/sed.general
deleted file mode 100644
index 77b306aa0a..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.general
+++ /dev/null
@@ -1,125 +0,0 @@
-# 
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-# 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# %CopyrightEnd%
-# 
-# Author: Patrik Winroth
-#
-# This sed program file is intended to be used when creating Makefiles
-# for vxworks from the generic Makefile.in that is found in a number
-# of directories (see configure.vxworks).
-#
-# This is the general part that is common for all architectures.
-#
-
-# Size of data types.
-s|^#undef SIZEOF_CHAR|#define SIZEOF_CHAR 1|
-s|^#undef SIZEOF_SHORT|#define SIZEOF_SHORT 2|
-s|^#undef SIZEOF_INT|#define SIZEOF_INT 4|
-s|^#undef SIZEOF_LONG_LONG|#define SIZEOF_LONG_LONG 8|
-s|^#undef SIZEOF_LONG$|#define SIZEOF_LONG 4|
-
-# General stuff.
-s|@erts_rootdir@|/clearcase/otp/erts|
-
-s|@LIBOBJS@|$(OBJDIR)/elib_malloc.o|
-s|@DLOAD_LIB@||
-s|@LDFLAGS@||
-# FIXME: A bit strange to clear out remaining DED_*
-s|@DED_LDFLAGS@||
-s|@DED_CFLAGS@||
-s|@STATIC_CFLAGS@||
-s|@GCCLIB@|libgcc.a|
-s|@DEFS@||
-s|@DEXPORT@||
-s|@DCFLAGS@||
-s|@THR_DEFS@||
-s|@THR_LIBS@||
-s|@THR_LIB_NAME@||
-s|@THR_X_LIBS@||
-s|@ETHR_X_LIBS@||
-s|@ETHR_LIBS@||
-s|@ETHR_LIB_NAME@||
-s|@ETHR_DEFS@||
-s|@ETHR_THR_LIB_BASE@||
-s|@EMU_THR_DEFS@||
-s|@EMU_THR_LIBS@||
-s|@EMU_THR_LIB_NAME@|ethread|
-s|@ERTS_ENABLE_KERNEL_POLL@|no|
-s|@cc_root@|/clearcase/otp/|
-# Define VxWorks even though cross-compiling. 
-s|@HCFLAGS@|-DVXWORKS|
-s|@HCLIBS@||
-s|@ENABLE_ALLOC_TYPE_VARS@||
-s|@TERMCAP_LIB@||
-s|@ERTS_BUILD_SMP_EMU@|no|
-s|@ERTS_BUILD_HYBRID_EMU@|no|
-s|@HAVE_VALGRIND@|no|
-s|@EXEEXT@||
-s|@WITH_SCTP@||
-
-# HiPE
-s|@HIPE_ENABLED@||
-s|@PERFCTR_PATH@||
-s|@USE_PERFCTR@||
-
-# m4
-s|@OPSYS@|noopsys|
-
-# Conditional inclusion of applications
-s|@HIPE_APP@||
-s|@SSL_APP@|ssl|
-s|@CRYPTO_APP@|crypto|
-s|@SSH_APP@|ssh|
-
-# The target tools prefix, prepended to all cc,ld,as etc commands
-s|@TTPREFIX@|GCC_EXEC_PREFIX=@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/host/@HOST_TYPE@/bin/|
-
-# Install programs etc
-s|@PERL@|perl|
-s|@INSTALL@|/usr/ucb/install -c|
-s|@INSTALL_PROGRAM@|${INSTALL}|
-s|@INSTALL_SCRIPT@|${INSTALL}|
-s|@INSTALL_DATA@|${INSTALL} -m 644|
-s|@INSTALL_DIR@|$(INSTALL) -d|
-s|@RM@|/bin/rm|
-s|@MKDIR@|/bin/mkdir|
-s|@ERLANG_OSTYPE@|vxworks|
-s|@vxworks_reclaim@|reclaim.h|
-s|@os_mon_programs@||
-s|@erlexec@|erl.exec|
-s|@EMU_LIBOBJS@||
-
-# General CFLAGS
-s|@GENERAL_CFLAGS@|-DHAVE_LOCALTIME_R -DHAVE_GMTIME_R -DENABLE_ELIB_MALLOC -DELIB_HEAP_USER -DELIB_SORTED_BLOCKS -DWORDS_BIGENDIAN -DELIB_DONT_INITIALIZE -DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 -DSIZEOF_VOID_P=4 -DERTS_USE_PORT_TASKS=1|g
-s|@WFLAGS@||
-
-# Thread flags for eidefs.mk (erl_interface)
-s|@EI_THREADS@|false|
-
-# Make java code compile although we don't test it on VxWorks (no license)
-s|@JAVAC@|javac|
-
-# What is this anyway?
-# Disable it and see what breaks.
-#s|@ded_soname@||
-
-# Only variable substituted directly
-s|$(LDFLAGS)|-r -d|
-s|@LIBRT@||
-# XXX What is EFFLAGS? Not used in the emulator Makefile.in anyway.
-s|$(EFLAGS)|-DENABLE_ELIB_MALLOC -DELIB_HEAP_USER -DELIB_SORTED_BLOCKS|
-
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_cpu32 b/lib/diameter/autoconf/vxworks/sed.vxworks_cpu32
deleted file mode 100644
index 5a1590e786..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_cpu32
+++ /dev/null
@@ -1,45 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Patrik Winroth
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_cpu32|
-s|@system_type@|vxworks_cpu32|
-s|@CC@|@TTPREFIX@cc68k|
-s|@HCC@|gcc|
-s|@LD@|@TTPREFIX@ld68k|
-s|@LIBS@||
-s|@DED_LD@|@TTPREFIX@ld68k|
-s|@DED_CFLAGS@|@CFLAGS@|
-s|@DEBUG_FLAGS@|-g|
-s|@GCCLIB_PATH@|@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/m68k-wrs-vxworks/cygnus-2.7.2-960126/m68000/msoft-float/libgcc.a|
-s|@RANLIB@|@TTPREFIX@ranlib68k|
-s|@AR@|@TTPREFIX@ar68k|
-s|@STRIP@|@TTPREFIX@strip68k|
-s|@SYMPREFIX@|_|
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/m68k-wrs-vxworks/cygnus-2.7.2-960126/m68000/msoft-float -lgcc|
-
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=CPU32 -mnobitfield -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -fno-builtin -nostdinc -fvolatile -msoft-float|
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=CPU32 -mnobitfield -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -fno-builtin -nostdinc -fvolatile -msoft-float|
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc32 b/lib/diameter/autoconf/vxworks/sed.vxworks_ppc32
deleted file mode 100644
index 9104b24ed3..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc32
+++ /dev/null
@@ -1,52 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2006-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Peter Andersson
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_ppc32|
-s|@system_type@|vxworks_ppc32|
-s|@ARCH@|ppc32|
-s|@CC@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ccppc -mlongcall|
-s|@HCC@|gcc|
-s|@LD@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ldppc|
-s|@STRIP@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/workbench-2.3/@HOST_TYPE@/bin/stripppc|
-s|@SYMPREFIX@||
-s|@LIBS@||
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/vxworks-6.3/target/lib/ppc/PPC32/common -lgcc|
-s|@DED_LD@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ldppc|
-s|@DED_CFLAGS@|@CFLAGS@|
-s|@DEBUG_CFLAGS@|@CFLAGS@|
-# generate dwarf debug code on PPC ..
-s|@DEBUG_FLAGS@|-gdwarf|
-# remove -g option
-s|TYPE_FLAGS = -g |TYPE_FLAGS = |
-s|@GCCLIB_PATH@|@WIND_BASE@/vxworks-6.3/target/lib/ppc/PPC32/common/libgcc.a|
-s|@RANLIB@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ranlibppc|
-s|@AR@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/arppc|
-# -Dasm(X)= is for beam
-
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -DWANT_NONBLOCKING -DHAVE_SENS -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/vxworks-6.3/target/h -I@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc/powerpc-wrs-vxworks/3.4.4/include -I@WIND_BASE@/vxworks-6.3/target/h/wrn/coreip -mstrict-align -fvolatile -fno-builtin |
-
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -DWANT_NONBLOCKING -DHAVE_SENS -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/vxworks-6.3/target/h/wrn/coreip -I@WIND_BASE@/vxworks-6.3/target/h  -mstrict-align -fvolatile -fno-builtin |
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc603 b/lib/diameter/autoconf/vxworks/sed.vxworks_ppc603
deleted file mode 100644
index e1dd7c5afd..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc603
+++ /dev/null
@@ -1,51 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Patrik Winroth
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_ppc603|
-s|@system_type@|vxworks_ppc603|
-s|@ARCH@|ppc603|
-s|@CC@|@TTPREFIX@ccppc -mlongcall|
-s|@HCC@|gcc|
-s|@LD@|@TTPREFIX@ldppc|
-s|@STRIP@|@TTPREFIX@stripppc|
-s|@SYMPREFIX@||
-s|@LIBS@||
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126 -lgcc|
-s|@DED_LD@|@TTPREFIX@ldppc|
-s|@DED_CFLAGS@|@CFLAGS@|
-s|@DEBUG_CFLAGS@|@CFLAGS@|
-# generate dwarf debug code on PPC ..
-s|@DEBUG_FLAGS@|-gdwarf|
-# remove -g option
-s|TYPE_FLAGS = -g |TYPE_FLAGS = |
-s|@GCCLIB_PATH@|@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126/libgcc.a|
-s|@RANLIB@|@TTPREFIX@ranlibppc|
-s|@AR@|@TTPREFIX@arppc|
-# -Dasm(X)= is for beam
-
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC603 -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -mstrict-align -fvolatile -fno-builtin -fno-for-scope -D_GNU_TOOL|
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC603 -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -mstrict-align -fvolatile -fno-builtin -fno-for-scope -D_GNU_TOOL|
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc603_nolongcall b/lib/diameter/autoconf/vxworks/sed.vxworks_ppc603_nolongcall
deleted file mode 100644
index 5d7673d323..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc603_nolongcall
+++ /dev/null
@@ -1,51 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Patrik Winroth
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_ppc603|
-s|@system_type@|vxworks_ppc603|
-s|@ARCH@|ppc603|
-s|@CC@|@TTPREFIX@ccppc|
-s|@HCC@|gcc|
-s|@LD@|@TTPREFIX@ldppc|
-s|@STRIP@|@TTPREFIX@stripppc|
-s|@SYMPREFIX@||
-s|@LIBS@||
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126 -lgcc|
-s|@DED_LD@|@TTPREFIX@ldppc|
-s|@DED_CFLAGS@|@CFLAGS@|
-# generate dwarf debug code on PPC ..
-s|@DEBUG_FLAGS@|-gdwarf|
-# remove -g option
-s|TYPE_FLAGS = -g |TYPE_FLAGS = |
-s|@GCCLIB_PATH@|@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126/libgcc.a|
-s|@RANLIB@|@TTPREFIX@ranlibppc|
-s|@AR@|@TTPREFIX@arppc|
-# -Dasm(X)= is for beam
-
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC603 -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -mstrict-align -fvolatile -fno-builtin -fno-for-scope -D_GNU_TOOL|
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC603 -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -mstrict-align -fvolatile -fno-builtin -fno-for-scope -D_GNU_TOOL|
-
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc860 b/lib/diameter/autoconf/vxworks/sed.vxworks_ppc860
deleted file mode 100644
index 7a3c32df5b..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_ppc860
+++ /dev/null
@@ -1,50 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Patrik Winroth
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_ppc860|
-s|@system_type@|vxworks_ppc860|
-s|@ARCH@|ppc860|
-s|@CC@|@TTPREFIX@ccppc -mlongcall|
-s|@HCC@|gcc|
-s|@LD@|@TTPREFIX@ldppc|
-s|@STRIP@|@TTPREFIX@stripppc|
-s|@SYMPREFIX@||
-s|@LIBS@||
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126/soft-float -lgcc|
-s|@DED_LD@|@TTPREFIX@ldppc|
-s|@DED_CFLAGS@|@CFLAGS@|
-s|@DEBUG_CFLAGS@|@CFLAGS@|
-# generate dwarf debug code on PPC ..
-s|@DEBUG_FLAGS@|-gdwarf|
-# remove -g option (go for dwarf)
-s|TYPE_FLAGS = -g |TYPE_FLAGS = |
-s|@GCCLIB_PATH@|@WIND_BASE@/host/@HOST_TYPE@/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126/soft-float/libgcc.a|
-s|@RANLIB@|@TTPREFIX@ranlibppc|
-s|@AR@|@TTPREFIX@arppc|
-
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC860 -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -mcpu=860 -fvolatile -fno-builtin -fno-for-scope -msoft-float -D_GNU_TOOL -nostdinc|
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=PPC860 -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DVXWORKS -I@WIND_BASE@/target/h -mcpu=powerpc -fvolatile -fno-builtin -fno-for-scope -msoft-float -D_GNU_TOOL -nostdinc|
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_simlinux b/lib/diameter/autoconf/vxworks/sed.vxworks_simlinux
deleted file mode 100644
index 56eae6507c..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_simlinux
+++ /dev/null
@@ -1,59 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2008-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Peter Andersson
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_simlinux|
-s|@system_type@|vxworks_simlinux|
-s|@ARCH@|simlinux|
-
-s|@CC@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ccpentium|
-
-s|@HCC@|gcc|
-
-s|@LD@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ldpentium|
-
-#s|@STRIP@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/strip|
-s|@STRIP@||
-
-s|@SYMPREFIX@||
-s|@LIBS@||
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/vxworks-6.3/target/lib/simlinux/SIMLINUX/common -lgcc|
-
-s|@DED_LD@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ldpentium|
-
-s|@DED_CFLAGS@|@CFLAGS@|
-s|@DEBUG_CFLAGS@|@CFLAGS@|
-# remove -g option
-s|TYPE_FLAGS = -g |TYPE_FLAGS = |
-s|@GCCLIB_PATH@|@WIND_BASE@/vxworks-6.3/target/lib/simlinux/SIMLINUX/common/libgcc.a|
-
-s|@RANLIB@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ranlibpentium|
-
-s|@AR@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/arpentium|
-
-# -Dasm(X)= is for beam
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -DWANT_NONBLOCKING -DHAVE_SENS -DHAVE_MEMMOVE -DVXWORKS -DDEBUG -I@WIND_BASE@/vxworks-6.3/target/h -I@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc/i586-wrs-vxworks/3.4.4/include -I@WIND_BASE@/vxworks-6.3/target/h/wrn/coreip -fvolatile -fno-builtin |
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -DWANT_NONBLOCKING -DHAVE_SENS -DHAVE_MEMMOVE -DVXWORKS -DDEBUG -I@WIND_BASE@/vxworks-6.3/target/h -I@WIND_BASE@/vxworks-6.3/target/h/wrn/coreip -mstrict-align -fvolatile -fno-builtin |
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_simso b/lib/diameter/autoconf/vxworks/sed.vxworks_simso
deleted file mode 100644
index 6b845d31de..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_simso
+++ /dev/null
@@ -1,64 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2005-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-# 
-# Author: Peter Andersson
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-#
-#
-s|@host@|vxworks_simso|
-s|@system_type@|vxworks_simso|
-s|@ARCH@|simso|
-
-# Tornado2.2: s|@CC@|@TTPREFIX@ccsimso|
-s|@CC@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ccsparc|
-
-s|@HCC@|gcc|
-
-# Tornado2.2: s|@LD@|@TTPREFIX@ldsimso|
-s|@LD@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ldsparc|
-
-# Tornado2.2: s|@STRIP@|@TTPREFIX@stripsimso|
-s|@STRIP@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/stripsparc|
-
-s|@SYMPREFIX@||
-s|@LIBS@||
-s|@GCCLIBFLAGS@|-L@WIND_BASE@/vxworks-6.3/target/lib/simso/SIMSPARCSOLARIS/common -lgcc|
-
-# Tornado2.2: s|@DED_LD@|@TTPREFIX@ldsimso|
-s|@DED_LD@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ldsparc|
-
-s|@DED_CFLAGS@|@CFLAGS@|
-s|@DEBUG_CFLAGS@|@CFLAGS@|
-# remove -g option
-s|TYPE_FLAGS = -g |TYPE_FLAGS = |
-s|@GCCLIB_PATH@|@WIND_BASE@/vxworks-6.3/target/lib/simso/SIMSPARCSOLARIS/common/libgcc.a|
-
-# Tornado2.2: s|@RANLIB@|@TTPREFIX@ranlibsimso|
-s|@RANLIB@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/ranlibsparc|
-
-# Tornado2.2: s|@AR@|arsimso|
-s|@AR@|GCC_EXEC_PREFIX=@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc-lib/ @WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/bin/arsparc|
-
-# -Dasm(X)= is for beam
-s|@LIB_CFLAGS@|@CFLAGS@|
-
-s|@CFLAGS@|@GENERAL_CFLAGS@ -DCPU=SIMSPARCSOLARIS -DTOOL_FAMILY=gnu -DTOOL=gnu -DWANT_NONBLOCKING -DHAVE_SENS -DHAVE_MEMMOVE -DVXWORKS -DDEBUG -I@WIND_BASE@/vxworks-6.3/target/h -I@WIND_BASE@/gnu/3.4.4-vxworks-6.3/@HOST_TYPE@/lib/gcc/sparc-wrs-vxworks/3.4.4/include -I@WIND_BASE@/vxworks-6.3/target/h/wrn/coreip -fvolatile -fno-builtin |
-#s|@LIB_CFLAGS@|@GENERAL_CFLAGS@ -DCPU=SIMSPARCSOLARIS -DTOOL_FAMILY=gnu -DTOOL=gnu -DWANT_NONBLOCKING -DHAVE_SENS -DHAVE_MEMMOVE -DVXWORKS -DDEBUG -I@WIND_BASE@/vxworks-6.3/target/h -I@WIND_BASE@/vxworks-6.3/target/h/wrn/coreip -mstrict-align -fvolatile -fno-builtin |
diff --git a/lib/diameter/autoconf/vxworks/sed.vxworks_sparc b/lib/diameter/autoconf/vxworks/sed.vxworks_sparc
deleted file mode 100644
index 6f637d8746..0000000000
--- a/lib/diameter/autoconf/vxworks/sed.vxworks_sparc
+++ /dev/null
@@ -1,38 +0,0 @@
-# 
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-# 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# %CopyrightEnd%
-# 
-# Author: Patrik Winroth
-#
-# This sed program file is intended to be used when creating Makefiles for vxworks
-# from the generic Makefile.in that is found in a number of directories (see configure.vxworks)
-#
-
-# ccsparc -O2 doesn't work when compiling "rundir"/gc.c - signal 11 is generated when trying
-# therefore it is compiled with -O1 instead, which works - get a new ccsparc !
-s/\$(COMPILE\.emu) -o \$@ -c gc\.c/$(CC) @CFLAGS@ @DEFS@ -O1 $(BEAM_MODE) -I$(SYSDIR) -I$(EMUDIR) -I. $(CPPFLAGS) -c -o $@ -c gc.c/
-s/@host@/vxworks_sparc/
-s/@system_type@/vxworks_sparc/
-s/@CC@/\/home\/gandalf\/bsproj\/tools\/vw-gnu\/solaris.sparc\/bin\/ccsparc/
-s/@HCC@/gcc/
-s/@LD@/\/home\/gandalf\/bsproj\/tools\/vw-gnu\/solaris.sparc\/bin\/ldsparc/
-s/@DEBUG_FLAGS@/-g/
-s/@GCCLIB_PATH@/\/home\/gandalf\/bsproj\/tools\/vw-gnu\/solaris.sparc\/lib\/gcc-lib\/sparc-wrs-vxworks\/cygnus-2.2.3.1\/libgcc.a/
-s/@RANLIB@/ranlibsparc/
-s/@AR@/arsparc/
-s/@CFLAGS@/-I\/home\/gandalf\/bsproj\/BS.2\/UOS\/vw\/5.2\/h -DWANT_NONBLOCKING -DHAVE_MEMMOVE -DCPU=SPARC -DVXWORKS -fno-builtin -nostdinc/
-
diff --git a/lib/diameter/configure.in b/lib/diameter/configure.in
deleted file mode 100644
index 8acfb28fed..0000000000
--- a/lib/diameter/configure.in
+++ /dev/null
@@ -1,137 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-dnl %CopyrightBegin%
-dnl
-dnl Copyright Ericsson AB 1998-2011. All Rights Reserved.
-dnl
-dnl The contents of this file are subject to the Erlang Public License,
-dnl Version 1.1, (the "License"); you may not use this file except in
-dnl compliance with the License. You should have received a copy of the
-dnl Erlang Public License along with this software. If not, it can be
-dnl retrieved online at http://www.erlang.org/.
-dnl
-dnl Software distributed under the License is distributed on an "AS IS"
-dnl basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-dnl the License for the specific language governing rights and limitations
-dnl under the License.
-dnl
-dnl %CopyrightEnd%
-
-if test "x$no_recursion" != "xyes" -a "x$OVERRIDE_CONFIG_CACHE" = "x"; then
-    # We do not want to use a common cache!
-    cache_file=/dev/null
-fi
-
-AC_INIT(vsn.mk)
-
-dnl <STANDALONE DIAMETER>
-dnl This is needed for diameters own environment to rock,
-dnl but since we are now integrated into OTP, we skip it.
-dnl In order to build stand-alone we need atleast 2.63...
-dnl AC_PREREQ(2.63)
-dnl </STANDALONE DIAMETER>
-
-dnl LM_PRECIOUS_VARS
-
-
-dnl The OTP source tree is the default "top", 
-dnl but we can also define our own top: DIAMETER_TOP
-
-if test -n "$ERL_TOP" || test -d $ERL_TOP ; then
-  erl_top=${ERL_TOP}
-  AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
-  DIAMETER_TOP=${ERL_TOP}/lib/diameter
-else
-  AC_ARG_VAR(DIAMETER_TOP, [Diameter top source directory])
-  if test -n "$DIAMETER_TOP" || test -d $DIAMETER_TOP ; then
-    AC_CONFIG_AUX_DIRS(autoconf)
-  fi
-
-  dnl <STANDALONE DIAMETER>
-  dnl AC_ERLANG_SUBST_ROOT_DIR
-  dnl AC_ERLANG_SUBST_LIB_DIR
-  dnl AC_ERLANG_CHECK_LIB([erl_docgen],
-  dnl            [echo "erl_docgen version \"$ERLANG_LIB_VER_erl_docgen\""
-  dnl             echo "is installed in \"$ERLANG_LIB_DIR_erl_docgen\""], 
-  dnl            [AC_MSG_ERROR([erl_docgen was not found!])])
-  dnl AC_ERLANG_CHECK_LIB([test_server],
-  dnl            [echo "test_server version \"$ERLANG_LIB_VER_test_server\""
-  dnl             echo "is installed in \"$ERLANG_LIB_DIR_test_server\""], 
-  dnl            [AC_MSG_ERROR([test_server was not found!])])
-  dnl </STANDALONE DIAMETER>
-
-fi
-
-AC_SUBST(DIAMETER_TOP)
-export DIAMETER_TOP
-
-if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
-  AC_CANONICAL_HOST
-fi
-
-TARGET=$host
-AC_SUBST(TARGET)
-
-if test "x$erl_top" = "x"; then
-  dnl STANDALONE DIAMETER
-  AC_CHECK_PROGS(XSLTPROC, xsltproc)
-  if test -z "$XSLTPROC"; then
-    echo "xsltproc" >> doc/CONF_INFO
-    AC_MSG_WARN([No 'xsltproc' command found: the documentation can not be built])
-  fi
-
-  AC_CHECK_PROGS(FOP, fop)
-  if test -z "$FOP"; then
-    AC_MSG_ERROR([No 'fop' command found: the documentation can not be built])
-  fi
-fi
-
-dnl
-dnl We can live with Solaris /usr/ucb/install
-dnl
-case $host in
-  *-*-solaris*|free_source)
-    if test -x /usr/ucb/install; then
-      INSTALL="/usr/ucb/install -c"
-    fi
-    ;;
-  *)
-    ;;
-esac
-AC_PROG_INSTALL
-LM_PROG_INSTALL_DIR
-
-case $host_os in
-        darwin*)
-                dnl Need to preserve modification time on archives;
-                dnl otherwise, ranlib has to be run on archives
-                dnl again after installation.
-                INSTALL_DATA="$INSTALL_DATA -p";;
-        *)
-                ;;
-esac
-
-dnl
-dnl Fix for Tilera install permissions
-dnl
-
-case $build in
-        *tile*)
-                INSTALL_PROGRAM="$INSTALL_PROGRAM -m755"
-                INSTALL_SCRIPT="$INSTALL_SCRIPT -m755"
-                ;;
-        *)
-                ;;
-esac
-
-
-dnl <STANDALONE DIAMETER>
-dnl AC_ERLANG_NEED_ERL([$PATH])
-dnl AC_ERLANG_NEED_ERLC([$PATH])
-dnl </STANDALONE DIAMETER>
-
-AC_OUTPUT(
-	Makefile:Makefile.in
-	make/$host/rules.mk:make/rules.mk.in
-	)
-
diff --git a/lib/diameter/doc/.gitignore b/lib/diameter/doc/.gitignore
new file mode 100644
index 0000000000..b634bdd7ba
--- /dev/null
+++ b/lib/diameter/doc/.gitignore
@@ -0,0 +1,4 @@
+
+/html/
+/man*/
+/pdf/
diff --git a/lib/diameter/doc/src/.gitignore b/lib/diameter/doc/src/.gitignore
index feeb378fd8..5776e1cc76 100644
--- a/lib/diameter/doc/src/.gitignore
+++ b/lib/diameter/doc/src/.gitignore
@@ -1,2 +1,3 @@
 
 /depend.mk
+/seehere.ent
diff --git a/lib/diameter/doc/src/Makefile b/lib/diameter/doc/src/Makefile
index bc3e649e6b..8ad38ba0d5 100644
--- a/lib/diameter/doc/src/Makefile
+++ b/lib/diameter/doc/src/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2011. All Rights Reserved.
+# Copyright Ericsson AB 2010-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -16,13 +16,8 @@
 #
 # %CopyrightEnd%
 
-ifneq ($(ERL_TOP),)
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
-else
-include $(DIAMETER_TOP)/make/target.mk
-include $(DIAMETER_TOP)/make/$(TARGET)/rules.mk
-endif
 
 include ../../vsn.mk
 
@@ -39,7 +34,8 @@ XML_REF_FILES = $(XML_REF1_FILES) $(XML_REF3_FILES) $(XML_REF4_FILES)
 
 XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) \
             $(XML_REF_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES) 
+            $(XML_PART_FILES) $(XML_CHAPTER_FILES) \
+            seealso.ent
 
 INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html)
 
@@ -98,7 +94,7 @@ html: gifs $(HTML_REF_MAN_FILE)
 
 clean clean_docs: clean_pdf clean_html clean_man
 	rm -f errs core *~
-	rm -f depend.mk
+	rm -f depend.mk seehere.ent
 
 clean_pdf:
 	rm -f $(PDFDIR)/*
@@ -155,30 +151,29 @@ info:
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
-ifneq ($(ERL_TOP),)
+
 include $(ERL_TOP)/make/otp_release_targets.mk
-else
-include $(DIAMETER_TOP)/make/release_targets.mk
-endif
 
 release_docs_spec: $(LOCAL)docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man4
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(HTMLDIR)/*.* $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DATA) $(MAN1_FILES) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN4_FILES) $(RELEASE_PATH)/man/man4
-	[ -z "$(LOCAL)" ] || cp -r $(HTMLDIR)/js $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man4"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(HTMLDIR)/*.* "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(MAN1_FILES) "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN4_FILES) "$(RELEASE_PATH)/man/man4"
+	[ -z "$(LOCAL)" ] || cp -r $(HTMLDIR)/js "$(RELSYSDIR)/doc/html"
 	echo $(LOCAL)
 
 release_spec:
 
-depend.mk: depend.sed $(XML_REF_FILES) $(XML_CHAPTER_FILES) Makefile
+depend.mk: depend.sed Makefile seealso.ent \
+           $(XML_REF_FILES) $(XML_CHAPTER_FILES)
+	sed -f seehere.sed seealso.ent > seehere.ent
 	(for f in $(XML_REF_FILES) $(XML_CHAPTER_FILES); do \
 	     sed -f $< $$f | sed "s@%FILE%@`basename $$f .xml`@g"; \
 	 done) \
diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 93e2603c10..b7669b760b 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
+<!DOCTYPE erlref SYSTEM "erlref.dtd" [
+  <!ENTITY make_ref
+  '<seealso marker="erts:erlang#make_ref-0">erlang:make_ref/0</seealso>'>
+  <!ENTITY transport_module
+  '<seealso marker="diameter_transport">transport module</seealso>'>
+  <!ENTITY dictionary
+  '<seealso marker="diameter_dict">dictionary</seealso>'>
+  <!ENTITY % also SYSTEM "seealso.ent" >
+  <!ENTITY % here SYSTEM "seehere.ent" >
+  %also;
+  %here;
+]>
 
 <erlref>
 <header>
 
 <copyright>
-<year>2011</year>
+<year>2011</year><year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -43,35 +54,30 @@ under the License.
 
 <description>
 <p>
-This module provides the interface with which a user
-creates a service that sends and receives messages using the
-Diameter protocol as defined in RFC 3588.</p>
+This module provides the interface with which a user can
+implement a Diameter node that sends and receives messages using the
+Diameter protocol as defined in &the_rfc;.</p>
 
 <p>
 Basic usage consists of creating a representation of a
-locally implemented Diameter peer and its capabilities with <seealso
-marker="#start_service">start_service/2</seealso>, adding transport
-capability using <seealso
-marker="#add_transport">add_transport/2</seealso> and sending Diameter
-requests and receiving Diameter answers with <seealso
-marker="#call">call/4</seealso>.
+locally implemented Diameter node and its capabilities with
+&start_service;, adding transport capability using
+&add_transport; and sending Diameter
+requests and receiving Diameter answers with &call;.
 Incoming Diameter requests are communicated as callbacks to a
-<seealso
-marker="diameter_app">diameter_app(3)</seealso> callback modules as
+&man_app; callback modules as
 specified in the service configuration.</p>
 
 <p>
-Beware the difference between <em>diameter application</em> and
-<em>Diameter application</em>.
+Beware the difference between <em>diameter</em> (not capitalised) and
+<em>Diameter</em> (capitalised).
 The former refers to the Erlang application named diameter whose main
-api is defined here, the latter to an application of the Diameter
-protocol in the sense of RFC 3588.
-More generally, capitalized Diameter refers to the RFC
-and diameter to this implementation.</p>
+api is defined here, the latter to Diameter protocol in the sense of
+&the_rfc;.</p>
 
 <p>
-The diameter application must be started before calling functions in
-this module.</p>
+The diameter application must be started before calling most functions
+in this module.</p>
 
 </description>
 
@@ -84,13 +90,15 @@ this module.</p>
 
 <tag><c>Address()</c></tag>
 <tag><c>DiameterIdentity()</c></tag>
+<tag><c>Grouped()</c></tag>
+<tag><c>OctetString()</c></tag>
 <tag><c>Time()</c></tag>
 <tag><c>Unsigned32()</c></tag>
 <tag><c>UTF8String()</c></tag>
 <item>
 <p>
-Types corresponding to RFC 3588 AVP Data Formats.
-Defined in <seealso marker="diameter_dict">diameter_dict(4)</seealso>.</p>
+Types corresponding to &the_rfc; AVP Data Formats.
+Defined in &dict_data_types;.</p>
 
 <marker id="application_alias"/>
 </item>
@@ -99,10 +107,9 @@ Defined in <seealso marker="diameter_dict">diameter_dict(4)</seealso>.</p>
 <item>
 <p>
 A name identifying a Diameter application in
-service configuration passed to <seealso
-marker="#start_service">start_service/2</seealso> and passed to
-<seealso marker="#call">call/4</seealso> when sending requests
-belonging to the application.</p>
+service configuration.
+Passed to &call; when sending requests
+defined by the application.</p>
 
 <marker id="application_module"/>
 </item>
@@ -111,28 +118,22 @@ belonging to the application.</p>
                              | [Mod | ExtraArgs]
                              | #diameter_callback{}</c></tag>
 <item>
-<code>
+<pre>
 Mod = atom()
 ExtraArgs = list()
-</code>
+</pre>
 
 <p>
-A module implementing the callback interface defined in <seealso
-marker="diameter_app">diameter_app(3)</seealso>, along with any
+A module implementing the callback interface defined in &man_app;,
+along with any
 extra arguments to be appended to those documented for the interface.
-Any extra arguments are appended to the documented list of arguments for
-each function.
-Note that additional arguments specific to an outgoing request be
-specified to <seealso marker="#call">call/4</seealso>, in which case
-the call-specific arguments are appended to any specified with the
-callback module.</p>
+Note that extra arguments specific to an outgoing request can be
+specified to &call;, in which case
+those are are appended to any module-specific extra arguments.</p>
 
 <p>
 Specifying a <c>#diameter_callback{}</c> record allows individual
-functions to be configured in place of the usual <seealso
-marker="diameter_app">diameter_app(3)</seealso> callbacks, with
-default implementations provided by module <c>diameter_callback</c>
-unless otherwise specified.
+functions to be configured in place of the usual &man_app; callbacks.
 See that module for details.</p>
 
 <marker id="application_opt"/>
@@ -142,18 +143,18 @@ See that module for details.</p>
 <item>
 
 <p>
-Options defining a Diameter application as configured in an
-<c>application</c> option passed to
-<seealso marker="#start_service">start_service/2</seealso>.</p>
+Options defining a Diameter application.
+Has one the following types.</p>
 
 <taglist>
 
-<tag><c>{alias, application_alias()}</c></tag>
+<tag><c>{alias, &application_alias;}</c></tag>
 <item>
 <p>
 An unique identifier for the application in the scope of the
 service.
-Optional, defaults to the value of the <c>dictionary</c> option.</p>
+Defaults to the value of the <c>dictionary</c> option if
+unspecified.</p>
 </item>
 
 <tag><c>{dictionary, atom()}</c></tag>
@@ -162,47 +163,43 @@ Optional, defaults to the value of the <c>dictionary</c> option.</p>
 The name of an encode/decode module for the Diameter
 messages defined by the application.
 These modules are generated from a specification file whose format is
-documented in <seealso
-marker="diameter_dict">diameter_dict(4)</seealso>.</p>
+documented in &man_dict;.</p>
 </item>
 
-<tag><c>{module, application_module()}</c></tag>
+<tag><c>{module, &application_module;}</c></tag>
 <item>
 <p>
-A callback module with which messages of the Diameter application are
+The callback module with which messages of the Diameter application are
 handled.
-See <seealso marker="diameter_app">diameter_app(3)</seealso> for
-information on the required interface and semantics.</p>
+See &man_app; for the required interface and semantics.</p>
 </item>
 
 <tag><c>{state, term()}</c></tag>
 <item>
 <p>
 The initial callback state.
-Defaults to the value of the <c>alias</c> option if unspecified.
-The prevailing state is passed to certain
-<seealso marker="diameter_app">diameter_app(3)</seealso>
-callbacks, which can then return a new state.</p>
+The prevailing state is passed to some
+&man_app;
+callbacks, which can then return a new state.
+Defaults to the value of the <c>alias</c> option if unspecified.</p>
 </item>
 
 <tag><c>{call_mutates_state, true|false}</c></tag>
 <item>
 <p>
-Specifies whether or not the <seealso
-marker="diameter_app#pick_peer">pick_peer/4</seealso>
-application callback (following from a call to
-<seealso marker="#call">call/4</seealso>)
-can modifiy state,
+Specifies whether or not the &app_pick_peer;
+application callback can modify the application state,
 Defaults to <c>false</c> if unspecified.</p>
 
+<note>
 <p>
-Note that <seealso
-marker="diameter_app#pick_peer">pick_peer</seealso> callbacks are
-serialized when these are allowed to modify state, which is a
+&app_pick_peer; callbacks
+are serialized when these are allowed to modify state, which is a
 potential performance bottleneck.
 A simple Diameter client may suffer no ill effects from using mutable
-state but a server or agent that responds to incoming request but
-sending its own requests should probably avoid it.</p>
+state but a server or agent that responds to incoming request should
+probably avoid it.</p>
+</note>
 </item>
 
 <tag><c>{answer_errors, callback|report|discard}</c></tag>
@@ -210,18 +207,16 @@ sending its own requests should probably avoid it.</p>
 <p>
 Determines the manner in which incoming answer messages containing
 decode errors are handled.
-If <c>callback</c> then errors result in a <seealso
-marker="diameter_app#handle_answer">handle_answer/4</seealso>
-callback in the same fashion as for <seealso
-marker="diameter_app#handle_request">handle_request/3</seealso>, in the
-<c>errors</c> field of the <c>diameter_packet</c> record passed into
-the callback.
+If <c>callback</c> then errors result in a &app_handle_answer;
+callback in the same fashion as for &app_handle_request;, with
+errors communicated in the <c>errors</c> field of the
+<c>#diameter_packet{}</c> record passed to the callback.
 If <c>report</c> then an answer containing errors is discarded
 without a callback and a warning report is written to the log.
 If <c>discard</c> then an answer containing errors is silently
 discarded without a callback.
 In both the <c>report</c> and <c>discard</c> cases the return value
-for the <seealso marker="#call">call/4</seealso> invocation in
+for the &call; invocation in
 question is as if a callback had taken place and returned
 <c>{error, failure}</c>.</p>
 
@@ -238,8 +233,9 @@ Defaults to <c>report</c> if unspecified.</p>
 <item>
 
 <p>
-Options available to <seealso marker="#call">call/4</seealso> when
-sending an outgoing Diameter request.</p>
+Options available to &call; when
+sending an outgoing Diameter request.
+Has one of the following types.</p>
 
 <taglist>
 
@@ -248,23 +244,23 @@ sending an outgoing Diameter request.</p>
 <p>
 Extra arguments to append to callbacks to the callback
 module in question.
-These are appended to any extra arguments configured with the callback
+These are appended to any extra arguments configured on the callback
 itself.
 Multiple options append to the argument list.</p>
 </item>
 
-<tag><c>{filter, peer_filter()}</c></tag>
+<tag><c>{filter, &peer_filter;}</c></tag>
 <item>
 <p>
 A filter to apply to the list of available peers before passing them to
-the <seealso marker="diameter_app#pick_peer">pick_peer/4</seealso>
+the &app_pick_peer;
 callback for the application in question.
 Multiple options are equivalent a single <c>all</c> filter on the
 corresponding list of filters.
 Defaults to <c>none</c>.</p>
 </item>
 
-<tag><c>{timeout, Unsigned32()}</c></tag>
+<tag><c>{timeout, &dict_Unsigned32;}</c></tag>
 <item>
 <p>
 The number of milliseconds after which the request should
@@ -275,21 +271,17 @@ Defaults to 5000.</p>
 <tag><c>detach</c></tag>
 <item>
 <p>
-Causes <seealso marker="#call">call/4</seealso> to return <c>ok</c> as
+Causes &call; to return <c>ok</c> as
 soon as the request in
 question has been encoded instead of waiting for and returning
-the result from a subsequent
-<seealso marker="diameter_app#handle_answer">handle_answer/4</seealso>
-or <seealso
-marker="diameter_app#handle_error">handle_error/4</seealso>
-callback.</p>
+the result from a subsequent &app_handle_answer; or
+&app_handle_error; callback.</p>
 </item>
 
 </taglist>
 
 <p>
-An invalid option will cause <seealso marker="#call">call/4</seealso>
-to fail.</p>
+An invalid option will cause &call; to fail.</p>
 
 <marker id="capability"/>
 </item>
@@ -298,121 +290,54 @@ to fail.</p>
 <item>
 
 <p>
-AVP values used in outgoing CER/CEA messages during capabilities exchange.
-Can be configured both on a service and a transport, the latter taking
-precedence over the former.</p>
+AVP values sent in outgoing CER or CEA messages during capabilities
+exchange.
+Can be configured both on a service and a transport, values specified
+on the latter taking precedence over any specified on the former.
+Has one of the following types.</p>
 
 <taglist>
 
-<tag><c>{'Origin-Host', DiameterIdentity()}</c></tag>
-<item>
-<p>
-Value of the Origin-Host AVP in outgoing messages.</p>
-</item>
-
-<tag><c>{'Origin-Realm', DiameterIdentity()}</c></tag>
-<item>
-<p>
-Value of the Origin-Realm AVP in outgoing messages.</p>
-</item>
-
-<tag><c>{'Host-IP-Address', [Address()]}</c></tag>
-<item>
-<p>
-Values of Host-IP-Address AVPs.
-Optional.</p>
-
-<p>
-The list of addresses is available to the start function of a
-transport module, which either uses them as is or returns a new list
-(typically as configured as <c>transport_config()</c> on the
-transport module in question) in order for the correct list of
-addresses to be sent in capabilities exchange messages.</p>
-</item>
-
-<tag><c>{'Vendor-Id', Unsigned32()}</c></tag>
-<item>
-<p>
-Value of the Vendor-Id AVP sent in an outgoing capabilities
-exchange message.</p>
-</item>
-
-<tag><c>{'Product-Name', UTF8String()}</c></tag>
+<tag><c>{'Origin-Host', &dict_DiameterIdentity;}</c></tag>
+<tag><c>{'Origin-Realm', &dict_DiameterIdentity;}</c></tag>
+<tag><c>{'Host-IP-Address', [&dict_Address;]}</c></tag>
 <item>
 <p>
-Value of the Product-Name AVP sent in an outgoing capabilities
-exchange message.</p>
+An address list is available to the start function of a
+&transport_module;, which
+can return a new list for use in the subsequent CER or CEA.
+Host-IP-Address need not be specified if the transport start function
+returns an address list.</p>
 </item>
 
-<tag><c>{'Origin-State-Id', Unsigned32()}</c></tag>
+<tag><c>{'Vendor-Id', &dict_Unsigned32;}</c></tag>
+<tag><c>{'Product-Name', &dict_UTF8String;}</c></tag>
+<tag><c>{'Origin-State-Id', &dict_Unsigned32;}</c></tag>
 <item>
 <p>
-Value of Origin-State-Id to be included in outgoing messages sent by
-diameter itself.
-In particular, the AVP will be included in CER/CEA and DWR/DWA messages.
-Optional.</p>
-
-<p>
+Origin-State-Id is optional but will be included in outgoing messages
+sent by diameter itself: CER/CEA, DWR/DWA and DPR/DPA.
 Setting a value of <c>0</c> (zero) is equivalent to not setting a
-value as documented in RFC 3588.
-The function <seealso
-marker="#origin_state_id">origin_state_id/0</seealso>
-can be used as to retrieve a value that is set when the diameter
+value as documented in &the_rfc;.
+The function &origin_state_id;
+can be used as to retrieve a value that is computed when the diameter
 application is started.</p>
 </item>
 
-<tag><c>{'Supported-Vendor-Id', [Unsigned32()]}</c></tag>
-<item>
-<p>
-Values of Supported-Vendor-Id AVPs sent in an outgoing
-capabilities exchange message.
-Optional, defaults to the empty list.</p>
-</item>
-
-<tag><c>{'Auth-Application-Id', [Unsigned32()]}</c></tag>
-<item>
-<p>
-Values of Auth-Application-Id AVPs sent in an outgoing
-capabilities exchange message.
-Optional, defaults to the empty list.</p>
-</item>
-
-<tag><c>{'Inband-Security-Id', [Unsigned32()]}</c></tag>
+<tag><c>{'Supported-Vendor-Id', [&dict_Unsigned32;]}</c></tag>
+<tag><c>{'Auth-Application-Id', [&dict_Unsigned32;]}</c></tag>
+<tag><c>{'Inband-Security-Id', [&dict_Unsigned32;]}</c></tag>
 <item>
 <p>
-Values of Inband-Security-Id AVPs sent in an outgoing
-capabilities exchange message.
-Optional, defaults to the empty list, which is equivalent to a
-list containing only 0 (= NO_INBAND_SECURITY).</p>
-
-<p>
+Inband-Security-Id defaults to the empty list, which is equivalent to a
+list containing only 0 (= NO_INBAND_SECURITY).
 If 1 (= TLS) is specified then TLS is selected if the CER/CEA received
 from the peer offers it.</p>
 </item>
 
-<tag><c>{'Acct-Application-Id', [Unsigned32()]}</c></tag>
-<item>
-<p>
-Values of Acct-Application-Id AVPs sent in an outgoing
-capabilities exchange message.
-Optional, defaults to the empty list.</p>
-</item>
-
-<tag><c>{'Vendor-Specific-Application-Id', [Grouped()]}</c></tag>
-<item>
-<p>
-Values of Vendor-Specific-Application-Id AVPs sent in
-an outgoing capabilities exchange message.
-Optional, defaults to the empty list.</p>
-</item>
-
-<tag><c>{'Firmware-Revision', Unsigned32()}</c></tag>
-<item>
-<p>
-Value of the Firmware-Revision AVP sent in an outgoing capabilities
-exchange message.
-Optional.</p>
-</item>
+<tag><c>{'Acct-Application-Id', [&dict_Unsigned32;]}</c></tag>
+<tag><c>{'Vendor-Specific-Application-Id', [&dict_Grouped;]}</c></tag>
+<tag><c>{'Firmware-Revision', &dict_Unsigned32;}</c></tag>
 
 </taglist>
 
@@ -429,7 +354,7 @@ It is an error to specify duplicate tuples.</p>
 An expression that can be evaluated as a function in the following
 sense.</p>
 
-<code>
+<pre>
 eval([{M,F,A} | T]) ->
     apply(M, F, T ++ A);
 eval([[F|A] | T]) ->
@@ -438,17 +363,22 @@ eval([F|A]) ->
     apply(F, A);
 eval(F) ->
     eval([F]).
-</code>
+</pre>
 
 <p>
-Applying an evaluable() <c>E</c> to an argument list <c>A</c>
+Applying an <c>&evaluable;</c>
+<c>E</c> to an argument list <c>A</c>
 is meant in the sense of <c>eval([E|A])</c>.</p>
 
+<warning>
 <p>
-Beware of using local funs (that is, fun expressions not of the
-form <c>fun Module:Name/Arity</c>) in situations in which the fun is
-not short-lived and code is to be upgraded at runtime since any
-processes retaining such a fun will have a reference to old code.</p>
+Beware of using fun expressions of the form <c>fun Name/Arity</c> in
+situations in which the fun is not short-lived
+and code is to be upgraded at runtime since any processes retaining
+such a fun will have a reference to old code.
+In particular, such a value is typically inappropriate in
+configuration passed to &start_service; or &add_transport;.</p>
+</warning>
 
 <marker id="peer_filter"/>
 </item>
@@ -456,10 +386,8 @@ processes retaining such a fun will have a reference to old code.</p>
 <tag><c>peer_filter() = term()</c></tag>
 <item>
 <p>
-A filter passed to <seealso marker="#call">call/4</seealso>
-in order to select candidate peers for a 
-<seealso marker="diameter_app#pick_peer">pick_peer/4</seealso>
-callback.
+A filter passed to &call; in order to select candidate peers for a
+&app_pick_peer; callback.
 Has one of the following types.</p>
 
 <taglist>
@@ -490,63 +418,73 @@ or any peer if the request does not contain
 a <c>Destination-Realm</c> AVP.</p>
 </item>
 
-<tag><c>{host, any|DiameterIdentity()}</c></tag>
+<tag><c>{host, any|&dict_DiameterIdentity;}</c></tag>
 <item>
 <p>
 Matches only those peers whose <c>Origin-Host</c> has the
 specified value, or all peers if the atom <c>any</c>.</p>
 </item>
 
-<tag><c>{realm, any|DiameterIdentity()</c></tag>
+<tag><c>{realm, any|&dict_DiameterIdentity;</c></tag>
 <item>
 <p>
 Matches only those peers whose <c>Origin-Realm</c> has the
-value, or all peers if the atom <c>any</c>.</p>
+specified value, or all peers if the atom <c>any</c>.</p>
 </item>
 
-<tag><c>{eval, evaluable()}</c></tag>
+<tag><c>{eval, &evaluable;}</c></tag>
 <item>
 <p>
-Matches only those peers for which the specified evaluable() returns
+Matches only those peers for which the specified
+<c>&evaluable;</c> returns
 <c>true</c> on the connection's <c>diameter_caps</c> record.
 Any other return value or exception is equivalent to <c>false</c>.</p>
 </item>
 
-<tag><c>{neg, peer_filter()}</c></tag>
+<tag><c>{neg, &peer_filter;}</c></tag>
 <item>
 <p>
 Matches only those peers not matched by the specified filter.</p>
 </item>
 
-<tag><c>{all, [peer_filter()]}</c></tag>
+<tag><c>{all, [&peer_filter;]}</c></tag>
 <item>
 <p>
-Matches only those peers matched by each filter of the specified list.</p>
+Matches only those peers matched by each filter in the specified list.</p>
 </item>
 
-<tag><c>{any, [peer_filter()]}</c></tag>
+<tag><c>{any, [&peer_filter;]}</c></tag>
 <item>
 <p>
-Matches only those peers matched by at least one filter of the
+Matches only those peers matched by at least one filter in the
 specified list.</p>
 </item>
 
 </taglist>
 
 <p>
-Note that the <c>host</c> and <c>realm</c> filters examine the
-outgoing request as passed to <seealso marker="#call">call/4</seealso>,
-assuming that this is a record- or list-valued message() as documented
-in <seealso marker="diameter_app">diameter_app(3)</seealso>, and that
-the message contains at most one of each AVP.
-If this is not the case then the <c>{host|realm, DiameterIdentity()}</c>
+An invalid filter is equivalent to <c>{any,[]}</c>, a filter
+that matches no peer.</p>
+
+<note>
+<p>
+The <c>host</c> and <c>realm</c> filters examine the
+outgoing request as passed to &call;,
+assuming that this is a record- or list-valued <c>&codec_message;</c>,
+and that the message contains at most one of each AVP.
+If this is not the case then the <c>{host|realm, &dict_DiameterIdentity;}</c>
 filters must be used to achieve the desired result.
-Note also that an empty host/realm (which should not be typical)
-is equivalent to an unspecified one for the purposes of filtering.</p>
+An empty <c>&dict_DiameterIdentity;</c>
+(which should not be typical)
+matches all hosts/realms for the purposes of filtering.</p>
+</note>
 
+<warning>
 <p>
-An invalid filter is equivalent to <c>{any, []}</c>, a filter
-that matches no peer.</p>
+A <c>host</c> filter is not typically desirable when setting
+Destination-Host since it will remove peer agents from the
+candidates list.</p>
+</warning>
 
 <marker id="service_event"/>
 </item>
@@ -554,41 +492,52 @@ that matches no peer.</p>
 <tag><c>service_event() = #diameter_event{}</c></tag>
 <item>
 <p>
-Event message sent to processes that have subscribed using <seealso
-marker="#subscribe">subscribe/1</seealso>.</p>
+An event message sent to processes that have subscribed to these using
+&subscribe;.</p>
 
 <p>
-The <c>info</c> field of the event record can be one of the
-following.</p>
+The <c>info</c> field of the event record can have one of the
+following types.</p>
 
 <taglist>
 
+<tag><c>start</c></tag>
+<tag><c>stop</c></tag>
+
+<item>
+<p>
+The service is being started or stopped.
+No event precedes a <c>start</c> event.
+No event follows a <c>stop</c> event and this event
+implies the termination of all transport processes.</p>
+</item>
+
 <tag><c>{up, Ref, Peer, Config, Pkt}</c></tag>
 <tag><c>{up, Ref, Peer, Config}</c></tag>
 <tag><c>{down, Ref, Peer, Config}</c></tag>
 <item>
-<code>
-Ref    = transport_ref()
-Peer   = diameter_app:peer()
-Config = {connect|listen, [transport_opt()]}
+<pre>
+Ref    = &transport_ref;
+Peer   = &app_peer;
+Config = {connect|listen, [&transport_opt;]}
 Pkt    = #diameter_packet{}
-</code>
+</pre>
 
 <p>
 The RFC 3539 watchdog state machine has
-transitioned into (<c>up</c>) or out of (<c>down</c>) the open
+transitioned into (<c>up</c>) or out of (<c>down</c>) the OKAY
 state.
-If a <c>diameter_packet</c> record is present in an <c>up</c> tuple
-then there has been an exchange of capabilities exchange messages and
-the record contains the received CER or CEA, otherwise the
-connection has reestablished without the loss or transport
+If a <c>#diameter_packet{}</c> record is present in an <c>up</c> event
+then there has been a capabilties exchange on a newly established
+transport connection and the record contains the received CER or CEA.
+Otherwise a connection has reestablished without the loss or
 connectivity.</p>
 
 <p>
-Note that a single up/down event for a given peer corresponds to
-as many <seealso marker="diameter_app#peer_up">peer_up/peer_down</seealso>
-callbacks as there are Diameter applications shared by the peer,
-as determined during capablilities exchange.
+Note that a single <c>up</c>/<c>down</c> event for a given peer
+corresponds to one &app_peer_up;/&app_peer_down;
+callback for each of the Diameter applications negotiated during
+capablilities exchange.
 That is, the event communicates connectivity with the
 peer as a whole while the callbacks communicate connectivity with
 respect to individual Diameter applications.</p>
@@ -596,102 +545,128 @@ respect to individual Diameter applications.</p>
 
 <tag><c>{reconnect, Ref, Opts}</c></tag>
 <item>
-<code>
-Ref  = transport_ref()
-Opts = [transport_opt()]
-</code>
+<pre>
+Ref  = &transport_ref;
+Opts = [&transport_opt;]
+</pre>
 
 <p>
 A connecting transport is attempting to establish/reestablish a
-transport connection with a peer following <c>reconnect_timer</c> or
-<c>watchdog_timer</c> expiry.</p>
+transport connection with a peer following &reconnect_timer; or
+&watchdog_timer; expiry.</p>
 </item>
 
 <tag><c>{closed, Ref, Reason, Config}</c></tag>
 <item>
-<code>
-Ref = transport_ref()
-Config = {connect|listen, [transport_opt()]}
-</code>
+<pre>
+Ref = &transport_ref;
+Config = {connect|listen, [&transport_opt;]}
+</pre>
 
 <p>
-Capabilities exchange has failed. <c>Reason</c> can be one of
-the following.</p>
+Capabilities exchange has failed.
+<c>Reason</c> can have one of the following types.</p>
 
 <taglist>
 
 <tag><c>{'CER', Result, Caps, Pkt}</c></tag>
 <item>
-<code>
+<pre>
 Result = ResultCode | {capabilities_cb, CB, ResultCode|discard}
 Caps = #diameter_caps{}
 Pkt  = #diameter_packet{}
 ResultCode = integer()
-CB = evaluable()
-</code>
+CB = &evaluable;
+</pre>
 
 <p>
 An incoming CER has been answered with the indicated result code or
 discarded.
-The capabilities record contains pairs of values for the the local
-node and remote peer.
-The packet record contains the CER in question.
+<c>Caps</c> contains pairs of values for the the local node and remote
+peer.
+<c>Pkt</c> contains the CER in question.
 In the case of rejection by a capabilities callback, the tuple
-indicates the rejecting callback.</p>
+contains the rejecting callback.</p>
 </item>
 
 <tag><c>{'CER', Caps, {ResultCode, Pkt}}</c></tag>
 <item>
-<code>
+<pre>
 ResultCode = integer()
 Caps = #diameter_caps{}
 Pkt  = #diameter_packet{}
-</code>
+</pre>
 
 <p>
 An incoming CER contained errors and has been answered with the
 indicated result code.
-The capabilities record contains only values for the the local
-node.
-The packet record contains the CER in question.</p>
+<c>Caps</c> contains only values for the the local node.
+<c>Pkt</c> contains the CER in question.</p>
+</item>
+
+<tag><c>{'CER', timeout}</c></tag>
+<item>
+<p>
+An expected CER was not received within &capx_timeout; of
+connection establishment.</p>
 </item>
 
 <tag><c>{'CEA', Result, Caps, Pkt}</c></tag>
 <item>
-<code>
+<pre>
 Result = integer() | atom() | {capabilities_cb, CB, ResultCode|discard}
 Caps = #diameter_caps{}
 Pkt  = #diameter_packet{}
 ResultCode = integer()
-</code>
+</pre>
 
 <p>
 An incoming CEA has been rejected for the indicated reason.
 An integer-valued <c>Result</c> indicates the result code sent
 by the peer.
-The capabilities record contains pairs of values for the the local
-node and remote peer.
-The packet record contains the CEA in question.
+<c>Caps</c> contains pairs of values for the the local node and remote
+peer.
+<c>Pkt</c> contains the CEA in question.
 In the case of rejection by a capabilities callback, the tuple
-indicates the rejecting callback.</p>
+contains the rejecting callback.</p>
 </item>
 
 <tag><c>{'CEA', Caps, Pkt}</c></tag>
 <item>
-<code>
+<pre>
 Caps = #diameter_caps{}
 Pkt  = #diameter_packet{}
-</code>
+</pre>
 
 <p>
-An incoming CER contained errors and has been rejected.
-The capabilities record contains only values for the the local node.
-The packet record contains the CEA in question.</p>
+An incoming CEA contained errors and has been rejected.
+<c>Caps</c> contains only values for the the local node.
+<c>Pkt</c> contains the CEA in question.</p>
+</item>
+
+<tag><c>{'CEA', timeout}</c></tag>
+<item>
+<p>
+An expected CEA was not received within &capx_timeout;
+of connection establishment.</p>
 </item>
 
 </taglist>
 </item>
 
+<tag><c>{watchdog, Ref, PeerRef, {From, To}, Config}</c></tag>
+<item>
+<pre>
+Ref = &transport_ref;
+PeerRef = &app_peer_ref;
+From, To = initial | okay | suspect | down | reopen
+Config = {connect|listen, [transport_opt()]}
+</pre>
+
+<p>
+An RFC 3539 watchdog state machine has changed state.</p>
+</item>
+
 </taglist>
 
 <p>
@@ -704,12 +679,11 @@ info fields of forms other than the above.</p>
 <tag><c>service_name() = term()</c></tag>
 <item>
 <p>
-The name of a service as passed to <seealso
-marker="#start_service">start_service/2</seealso> and with which the
+The name of a service as passed to &start_service; and with which the
 service is identified.
 There can be at most one service with a given name on a given node.
-Note that <c>erlang:make_ref/0</c> can be used to generate a service name
-that is somewhat unique.</p>
+Note that &make_ref;
+can be used to generate a service name that is somewhat unique.</p>
 
 <marker id="service_opt"/>
 </item>
@@ -717,29 +691,80 @@ that is somewhat unique.</p>
 <tag><c>service_opt()</c></tag>
 <item>
 <p>
-Options accepted by <seealso
-marker="#start_service">start_service/2</seealso>.
-Can be any <c>capability()</c> tuple as
-well as the following.</p>
+An option passed to &start_service;.
+Can be any <c>&capability;</c> as well as the following.</p>
 
 <taglist>
 
-<tag><c>{application, [application_opt()]}</c></tag>
+<tag><c>{application, [&application_opt;]}</c></tag>
 <item>
 <p>
 Defines a Diameter application supported by the service.</p>
 
 <p>
-A service must define one application for each Diameter application it
-intends to support.
-For an outgoing Diameter request, the application is specified by
-passing the desired application's <c>application_alias()</c> to
-<seealso marker="#call">call/4</seealso>, while for an
+A service must configure one tuple for each Diameter
+application it intends to support.
+For an outgoing Diameter request, the relevant <c>&application_alias;</c> is
+passed to &call;, while for an
 incoming request the application identifier in the message
-header determines the application (and callback module), the
-application identifier being specified in the <seealso
-marker="diameter_dict">dictionary</seealso> file defining the
-application.</p>
+header determines the application, the identifier being specified in
+the application's &dictionary; file.</p>
+</item>
+
+<tag><c>{restrict_connections, false
+                             | node
+                             | nodes
+                             | [node()]
+                             | evaluable()}</c></tag>
+<item>
+<p>
+Specifies the degree to which multiple transport connections to the
+same peer are accepted by the service.</p>
+
+<p>
+If type <c>[node()]</c> then a connection is rejected if another already
+exists on any of the specified nodes.
+Values of type <c>false</c>, <c>node</c>, <c>nodes</c> or
+&evaluable; are equivalent to
+values <c>[]</c>, <c>[node()]</c>, <c>[node()|nodes()]</c> and the
+evaluated value, respectively, evaluation of each expression taking
+place whenever a new connection is to be established.
+Note that <c>false</c> allows an unlimited number of connections to be
+established with the same peer.</p>
+
+<p>
+Multiple connections are independent and governed
+by their own peer and watchdog state machines.</p>
+
+<p>
+Defaults to <c>nodes</c>.</p>
+</item>
+
+<tag><c>{sequence, {H,N} | &evaluable;}</c></tag>
+<item>
+<p>
+Specifies a constant value <c>H</c> for the topmost <c>32-N</c> bits of
+of 32-bit End-to-End and Hop-by-Hop identifiers generated
+by the service, either explicity or as a return value of a function
+to be evaluated at &start_service;.
+In particular, an identifier <c>Id</c> is mapped to a new identifier
+as follows.</p>
+<pre>
+(H bsl N) bor (Id band ((1 bsl N) - 1))
+</pre>
+<p>
+Note that &the_rfc; requires that End-to-End identifiers remain unique
+for a period of at least 4 minutes and that this and the call rate
+places a lower bound on the appropriate values of <c>N</c>:
+at a rate of <c>R</c> requests per second an <c>N</c>-bit counter
+traverses all of its values in <c>(1 bsl N) div (R*60)</c> minutes so
+the bound is <c>4*R*60 =&lt; 1 bsl N</c>.</p>
+
+<p><c>N</c> must lie in the range <c>0..32</c> and <c>H</c> must be a
+non-negative integer less than <c>1 bsl (32-N)</c>.</p>
+
+<p>
+Defaults to <c>{0,32}</c>.</p>
 </item>
 
 </taglist>
@@ -750,159 +775,312 @@ application.</p>
 <tag><c>transport_opt()</c></tag>
 <item>
 <p>
-Options accepted by <seealso
-marker="#add_transport">add_transport/2</seealso>.</p>
+An option passed to &add_transport;.
+Has one of the following types.</p>
 
 <taglist>
-<tag><c>{transport_module, atom()}</c></tag>
+<marker id="applications"/>
+<tag><c>{applications, [&application_alias;]}</c></tag>
 <item>
 <p>
-A module implementing a transport process as defined in <seealso
-marker="diameter_transport">diameter_transport(3)</seealso>.
-Defaults to <c>diameter_tcp</c> if unspecified.</p>
+The list of Diameter applications to which the transport should be
+restricted.
+Defaults to all applications configured on the service in question.
+Applications not configured on the service in question are ignored.</p>
+</item>
+
+<marker id="capabilities"/>
+<tag><c>{capabilities, [&capability;]}</c></tag>
+<item>
+<p>
+AVP's used to construct outgoing CER/CEA messages.
+Values take precedence over any specified on the service in
+question.</p>
 
 <p>
-The interface required of a transport module is documented in <seealso
-marker="diameter_transport">diameter_transport(3)</seealso>.</p>
+Specifying a capability as a transport option
+may be particularly appropriate for Inband-Security-Id, in case
+TLS is desired over TCP as implemented by &man_tcp;.</p>
 </item>
 
-<tag><c>{transport_config, term()}</c></tag>
+<marker id="capabilities_cb"/>
+<tag><c>{capabilities_cb, &evaluable;}</c></tag>
 <item>
 <p>
-A term passed as the third argument to the <seealso
-marker="diameter_transport#start">start/3</seealso> function of
-the relevant <c>transport_module</c> in order to start a transport process.
-Defaults to the empty list if unspecified.</p>
-</item>
+A callback invoked upon reception of CER/CEA during capabilities
+exchange in order to ask whether or not the connection should
+be accepted.
+Applied to the <c>&transport_ref;</c> and
+<c>#diameter_caps{}</c> record of the connection.</p>
+
+<p>
+The return value can have one of the following types.</p>
 
-<tag><c>{applications, [application_alias()]}</c></tag>
+<taglist>
+<tag><c>ok</c></tag>
 <item>
 <p>
-The list of Diameter applications to which usage of the transport
-should be restricted.
-Defaults to all applications configured on the service
-in question.</p>
+Accept the connection.</p>
 </item>
 
-<tag><c>{capabilities, [capability()]}</c></tag>
+<tag><c>integer()</c></tag>
 <item>
 <p>
-AVP's used to construct outgoing CER/CEA messages.
-Any AVP specified takes precedence over a corresponding value specified
-for the service in question.</p>
+Causes an incoming CER to be answered with the specified Result-Code.</p>
+</item>
 
+<tag><c>discard</c></tag>
+<item>
 <p>
-Specifying a capability as a transport option
-may be particularly appropriate for Inband-Security-Id in case
-TLS is desired over TCP as implemented by
-<seealso marker="diameter_tcp">diameter_tcp(3)</seealso> but
-not over SCTP as implemented by
-<seealso marker="diameter_sctp">diameter_sctp(3)</seealso>.</p>
+Causes an incoming CER to be discarded without CEA being sent.</p>
 </item>
 
-<tag><c>{capabilities_cb, evaluable()}</c></tag>
+<tag><c>unknown</c></tag>
 <item>
 <p>
-A callback invoked upon reception of CER/CEA during capabilities
-exchange in order to ask whether or not the connection should
-be accepted.
-Applied to the transport reference (as returned by <seealso
-marker="#add_transport">add_transport/2</seealso>) and
-<c>diameter_caps</c> record of the connection.
-Returning <c>ok</c> accepts the connection.
-Returning <c>integer()</c> causes an incoming
-CER to be answered with the specified Result-Code.
-Returning <c>discard</c> causes an incoming CER to
-be discarded.
-Returning <c>unknown</c> is equivalent to returning <c>3010</c>,
-DIAMETER_UNKNOWN_PEER.
-Returning anything but <c>ok</c> or a 2xxx series result
-code causes the transport connection to be broken.</p>
+Equivalent to returning <c>3010</c>, DIAMETER_UNKNOWN_PEER.</p>
+</item>
+</taglist>
 
 <p>
-Multiple <c>capabilities_cb</c> options can be specified, in which
+Returning anything but <c>ok</c> or a 2xxx series result
+code causes the transport connection to be broken.
+Multiple &capabilities_cb;
+options can be specified, in which
 case the corresponding callbacks are applied until either all return
 <c>ok</c> or one does not.</p>
 </item>
 
-<tag><c>{watchdog_timer, TwInit}</c></tag>
+<marker id="capx_timeout"/>
+<tag><c>{capx_timeout, &dict_Unsigned32;}</c></tag>
 <item>
-<code>
-TwInit = Unsigned32()
-       | {M,F,A}
-</code>
+<p>
+The number of milliseconds after which a transport process having an
+established transport connection will be terminated if the expected
+capabilities exchange message (CER or CEA) is not received from the peer.
+For a connecting transport, the timing reconnection attempts is
+governed by &watchdog_timer; or
+&reconnect_timer; expiry.
+For a listening transport, the peer determines the timing.</p>
 
 <p>
-The RFC 3539 watchdog timer.
-An integer value is interpreted as the RFC's TwInit in milliseconds,
-a jitter of &plusmn; 2 seconds being added at each rearming of the
-timer to compute the RFC's Tw.
-An MFA is expected to return the RFC's Tw directly, with jitter
-applied, allowing the jitter calculation to be performed by
-the callback.</p>
+Defaults to 10000.</p>
+</item>
+
+<marker id="disconnect_cb"/>
+<tag><c>{disconnect_cb, &evaluable;}</c></tag>
 
+<item>
 <p>
-An integer value must be at least 6000 as required by RFC 3539.
-Defaults to 30000 if unspecified.</p>
+A callback invoked prior to terminating the transport process of a
+transport connection having watchdog state <c>OKAY</c>.
+Applied to <c>Reason=transport|service|application</c> and the
+<c>&transport_ref;</c> and
+<c>&app_peer;</c>
+in question, <c>Reason</c> indicating whether the the diameter
+application is being stopped, the service in question is being stopped
+at &stop_service; or
+the transport in question is being removed at &remove_transport;,
+respectively.</p>
+
+<p>
+The return value can have one of the following types.</p>
+
+<taglist>
+<tag><c>{dpr, [option()]}</c></tag>
+<item>
+<p>
+Causes Disconnect-Peer-Request to be sent to the peer, the transport
+process being terminated following reception of
+Disconnect-Peer-Answer or timeout.
+An <c>option()</c> can be one of the following.</p>
+
+<taglist>
+<tag><c>{cause, 0|rebooting|1|busy|2|goaway}</c></tag>
+<item>
+<p>
+The Disconnect-Cause to send, <c>REBOOTING</c>, <c>BUSY</c> and
+<c>DO_NOT_WANT_TO_TALK_TO_YOU</c> respectively.
+Defaults to <c>rebooting</c> for <c>Reason=service|application</c> and
+<c>goaway</c> for <c>Reason=transport</c>.</p>
 </item>
 
+<tag><c>{timeout, &dict_Unsigned32;}</c></tag>
+<item>
+<p>
+The number of milliseconds after which the transport process is
+terminated if DPA has not been received.
+Defaults to 1000.</p>
+</item>
+</taglist>
+</item>
+
+<tag><c>dpr</c></tag>
+<item>
+<p>
+Equivalent to <c>{dpr, []}</c>.</p>
+</item>
+
+<tag><c>close</c></tag>
+<item>
+<p>
+Causes the transport process to be terminated without
+Disconnect-Peer-Request being sent to the peer.</p>
+</item>
+
+<tag><c>ignore</c></tag>
+<item>
+<p>
+Equivalent to not having configured the callback.</p>
+</item>
+</taglist>
+
+<p>
+Multiple &disconnect_cb;
+options can be specified, in which
+case the corresponding callbacks are applied until one of them returns
+a value other than <c>ignore</c>.
+All callbacks returning <c>ignore</c> is equivalent to not having
+configured them.</p>
+
+<p>
+Defaults to a single callback returning <c>dpr</c>.</p>
+</item>
+
+<marker id="reconnect_timer"/>
 <tag><c>{reconnect_timer, Tc}</c></tag>
 <item>
-<code>
-Tc = Unsigned32()
-</code>
+<pre>
+Tc = &dict_Unsigned32;
+</pre>
 
 <p>
-For a connecting transport, the RFC 3588 Tc timer, in milliseconds.
-Note that this timer determines the frequency with which the transport
+For a connecting transport, the &the_rfc; Tc timer, in milliseconds.
+Note that this timer determines the frequency with which a transport
 will attempt to establish a connection with its peer only <em>before</em>
 an initial connection is established: once there is an initial
-connection it's watchdog_timer that determines the frequency of
-reconnection attempts, as required by RFC 3539.</p>
+connection it's &watchdog_timer; that determines the
+frequency of reconnection attempts, as required by RFC 3539.</p>
 
 <p>
 For a listening transport, the timer specifies the time after which a
 previously connected peer will be forgotten: a connection after this time is
 regarded as an initial connection rather than a reestablishment,
-causing the RFC 3539 state machine to pass to state OPEN rather than
+causing the RFC 3539 state machine to pass to state OKAY rather than
 REOPEN.
-Note that these semantics are not goverened by the RFC and
-that a listening transport's reconnect_timer should be greater than its
-peers's Tc plus jitter.</p>
+Note that these semantics are not governed by the RFC and
+that a listening transport's &reconnect_timer; should be greater
+than its peer's Tw plus jitter.</p>
 
 <p>
 Defaults to 30000 for a connecting transport and 60000 for a listening
 transport.</p>
 </item>
 
+<marker id="transport_config"/>
+<tag><c>{transport_config, term()}</c></tag>
+<tag><c>{transport_config, term(), &dict_Unsigned32;}</c></tag>
+<item>
+<p>
+A term passed as the third argument to the &transport_start; function of
+the relevant &transport_module; in order to
+start a transport process.
+Defaults to the empty list if unspecified.</p>
+
+<p>
+The 3-tuple form additionally specifies an interval, in milliseconds,
+after which a started transport process should be terminated if it has
+not yet established a connection.
+For example, the following options on a connecting transport
+request a connection with one peer over SCTP or another
+(typically the same) over TCP.</p>
+
+<pre>
+{transport_module, diameter_sctp}
+{transport_config, SctpOpts, 5000}
+{transport_module, diameter_tcp}
+{transport_config, TcpOpts}
+</pre>
+
+<p>
+To listen on both SCTP and TCP, define one transport for each.</p>
+</item>
+
+<marker id="transport_module"/>
+<tag><c>{transport_module, atom()}</c></tag>
+<item>
+<p>
+A module implementing a transport process as defined in &man_transport;.
+Defaults to <c>diameter_tcp</c> if unspecified.</p>
+
+<p>
+Multiple <c>transport_module</c> and &transport_config;
+options are allowed.
+The order of these is significant in this case (and only in this case),
+a <c>transport_module</c> being paired with the first
+&transport_config;
+following it in the options list, or the default value for trailing
+modules.
+Transport starts will be attempted with each of the
+modules in order until one establishes a connection within the
+corresponding timeout (see below) or all fail.</p>
+</item>
+
+<marker id="watchdog_timer"/>
+<tag><c>{watchdog_timer, TwInit}</c></tag>
+<item>
+<pre>
+TwInit = &dict_Unsigned32;
+       | {M,F,A}
+</pre>
+
+<p>
+The RFC 3539 watchdog timer.
+An integer value is interpreted as the RFC's TwInit in milliseconds,
+a jitter of &plusmn; 2 seconds being added at each rearming of the
+timer to compute the RFC's Tw.
+An MFA is expected to return the RFC's Tw directly, with jitter
+applied, allowing the jitter calculation to be performed by
+the callback.</p>
+
+<p>
+An integer value must be at least 6000 as required by RFC 3539.
+Defaults to 30000 if unspecified.</p>
+</item>
+
 </taglist>
 
 <p>
 Unrecognized options are silently ignored but are returned unmodified
-by <seealso
-marker="#service_info">service_info/2</seealso> and can be referred to
-in predicate functions passed to <seealso
-marker="#remove_transport">remove_transport/2</seealso>.</p>
+by &service_info; and can be referred to
+in predicate functions passed to &remove_transport;.</p>
 
+<marker id="transport_ref"/>
+</item>
+
+<tag><c>transport_ref() = reference()</c></tag>
+<item>
+<p>
+An reference returned by &add_transport; that
+identifies the configuration.</p>
 </item>
 
 </taglist>
 
 </section>
 
-<marker id="add_transport"/>
 <funcs>
 
 <!-- ===================================================================== -->
 
 <func>
-<name>add_transport(SvcName, {connect|listen, Options})
+<name>add_transport(SvcName, {connect|listen, [Opt]})
         -> {ok, Ref} | {error, Reason}</name>
 <fsummary>Add transport capability to a service.</fsummary>
 <type>
-<v>SvcName = service_name()</v>
-<v>Options = [transport_opt()]</v>
-<v>Ref = ref()</v>
+<v>SvcName = &service_name;</v>
+<v>Opt = &transport_opt;</v>
+<v>Ref = &transport_ref;</v>
 <v>Reason = term()</v>
 </type>
 <desc>
@@ -910,8 +1088,8 @@ marker="#remove_transport">remove_transport/2</seealso>.</p>
 Add transport capability to a service.</p>
 
 <p>
-The service will start a transport process(es) in order to establish a
-connection with the peer, either by connecting to the peer
+The service will start transport processes as required in order to
+establish a connection with the peer, either by connecting to the peer
 (<c>connect</c>) or by  accepting incoming connection requests
 (<c>listen</c>).
 A connecting transport establishes transport connections with at most
@@ -921,84 +1099,77 @@ one peer, an listening transport potentially with many.</p>
 The diameter application takes responsibility for exchanging
 CER/CEA with the peer.
 Upon successful completion of capabilities exchange the service
-calls each relevant application module's <seealso
-marker="diameter_app#peer_up">peer_up/3</seealso> callback
+calls each relevant application module's &app_peer_up; callback
 after which the caller can exchange Diameter messages with the peer over
 the transport.
 In addition to CER/CEA, the service takes responsibility for the
-handling of DWR/DWA and required by RFC 3539 as well as for DPR/DPA.</p>
+handling of DWR/DWA and required by RFC 3539, as well as for DPR/DPA.</p>
 
 <p>
 The returned reference uniquely identifies the transport within the
 scope of the service.
 Note that the function returns before a transport connection has been
-established.
+established.</p>
+
+<note>
+<p>
 It is not an error to add a transport to a service that has not yet
 been configured: a service can be started after configuring
-transports.</p>
+its transports.</p>
+</note>
 
-<marker id="call"/>
 </desc>
 </func>
 
 <!-- ===================================================================== -->
 
 <func>
-<name>call(SvcName, App, Request, Options) -> ok | Answer | {error, Reason}</name>
+<name>call(SvcName, App, Request, [Opt]) -> Answer | ok | {error, Reason}</name>
 <fsummary>Send a Diameter request message.</fsummary>
 <type>
-<v>SvcName = service_name()</v>
-<v>App = application_alias()</v>
-<v>Request = diameter_app:message() | term()</v>
+<v>SvcName = &service_name;</v>
+<v>App = &application_alias;</v>
+<v>Request = &codec_message;</v>
 <v>Answer = term()</v>
-<v>Options = [call_opt()]</v>
+<v>Opt = &call_opt;</v>
 </type>
 <desc>
 <p>
-Send a Diameter request message and possibly return the answer or error.</p>
+Send a Diameter request message.</p>
 
 <p>
-<c>App</c> identifies the Diameter application in which the request is
+<c>App</c> specifies the Diameter application in which the request is
 defined and callbacks to the corresponding callback module
-will follow as described below and in <seealso
-marker="diameter_app">diameter_app(3)</seealso>.
-Unless the <c>detach</c> option has been specified to cause an earlier
-return, the call returns either when an answer message is received
-from the peer or an error occurs.
-In the case of an answer, the return value is as returned by a
-<seealso
-marker="diameter_app#handle_answer">handle_answer/4</seealso>
-callback.
-In the case of an error, whether or not the error is returned directly
-by diameter or from a <seealso
-marker="diameter_app#handle_error">handle_error/4</seealso>
+will follow as described below and in &man_app;.
+Unless the <c>detach</c> option is specified, the call returns either
+when an answer message is received from the peer or an error occurs.
+In the answer case, the return value is as returned by a
+&app_handle_answer; callback.
+In the error case, whether or not the error is returned directly
+by diameter or from a &app_handle_error;
 callback depends on whether or not the outgoing request is
-successfully encoded for transmission from the peer, the cases being
+successfully encoded for transmission to the peer, the cases being
 documented below.</p>
 
 <p>
 If there are no suitable peers, or if
-<seealso marker="diameter_app#pick_peer">pick_peer/4</seealso>
-rejects them by returning 'false', then <c>{error, no_connection}</c>
+&app_pick_peer;
+rejects them by returning <c>false</c>, then <c>{error,no_connection}</c>
 is returned.
-Otherwise <seealso marker="diameter_app#pick_peer">pick_peer/4</seealso>
-is followed by a
-<seealso
-marker="diameter_app#prepare_request">prepare_request/3</seealso>
-callback, the message is encoded and sent.</p>
+Otherwise &app_pick_peer; is followed by a
+&app_prepare_request; callback, the message is encoded and then sent.</p>
 
 <p>
 There are several error cases which may prevent an
 answer from being received and passed to a
-<seealso marker="diameter_app#handle_answer">handle_answer/4</seealso>
-callback:</p>
+&app_handle_answer; callback:</p>
 
 <list>
 
 <item>
 <p>
 If the initial encode of the outgoing request
-fails, then the request process fails and <c>{error, encode}</c>
+fails, then the request process fails and <c>{error,encode}</c>
 is returned.</p>
 </item>
 
@@ -1006,16 +1177,14 @@ is returned.</p>
 <p>
 If the request is successfully encoded and sent but
 the answer times out then a
-<seealso marker="diameter_app#handle_error">handle_error/4</seealso>
-callback takes place with <c>Reason = timeout</c>.</p>
+&app_handle_error; callback takes place with <c>Reason = timeout</c>.</p>
 </item>
 
 <item>
 <p>
 If the request is successfully encoded and sent but the service in
 question is stopped before an answer is received then a
-<seealso marker="diameter_app#handle_error">handle_error/4</seealso>
-callback takes place <c>Reason = cancel</c>.</p>
+&app_handle_error; callback takes place with <c>Reason = cancel</c>.</p>
 </item>
 
 <item>
@@ -1024,25 +1193,18 @@ If the transport connection with the peer goes down after the request
 has been sent but before an answer has been received then an attempt
 is made to resend the request to an alternate peer.
 If no such peer is available, or if the subsequent
-<seealso marker="diameter_app#pick_peer">pick_peer/4</seealso>
-callback rejects the candidates, then a
-<seealso marker="diameter_app#handle_error">handle_error/4</seealso>
-callback takes place with <c>Reason = failover</c>.
-If a peer is selected then a
-<seealso
-marker="diameter_app#prepare_retransmit">prepare_retransmit/3</seealso>
+&app_pick_peer; callback rejects the candidates, then a
+&app_handle_error; callback takes place with <c>Reason = failover</c>.
+If a peer is selected then a &app_prepare_retransmit;
 callback takes place, after which the semantics are the same as
-following an initial
-<seealso marker="diameter_app#prepare_request">
-prepare_request/3</seealso>
-callback.</p>
+following an initial &app_prepare_request; callback.</p>
 </item>
 
 <item>
 <p>
 If an encode error takes place during
 retransmission then the request process fails and
-<c>{error, failure}</c> is returned.</p>
+<c>{error,failure}</c> is returned.</p>
 </item>
 
 <item>
@@ -1050,7 +1212,7 @@ retransmission then the request process fails and
 If an application callback made in processing the request fails
 (pick_peer, prepare_request, prepare_retransmit,
 handle_answer or handle_error) then either
-<c>{error, encode}</c> or <c>{error, failure}</c>
+<c>{error,encode}</c> or <c>{error,failure}</c>
 is returned depending on whether or not there has been an
 attempt to send the request over the transport.</p>
 </item>
@@ -1058,18 +1220,17 @@ attempt to send the request over the transport.</p>
 </list>
 
 <p>
-Note that <c>{error, encode}</c> is the only return value which
+Note that <c>{error,encode}</c> is the only return value which
 guarantees that the request has <em>not</em> been sent over the
-transport.</p>
+transport connection.</p>
 
-<marker id="origin_state_id"/>
 </desc>
 </func>
 
 <!-- ===================================================================== -->
 
 <func>
-<name>origin_state_id() -> Unsigned32()</name>
+<name>origin_state_id() -> &dict_Unsigned32;</name>
 <fsummary>Returns a reasonable Origin-State-Id.</fsummary>
 <desc>
 <p>
@@ -1078,26 +1239,26 @@ outgoing messages.</p>
 
 <p>
 The value returned is the number of seconds since 19680120T031408Z,
-the first value that can be encoded as a Diameter Time(),
+the first value that can be encoded as a Diameter <c>&dict_Time;</c>,
 at the time the diameter application was started.</p>
 
-<marker id="remove_transport"/>
 </desc>
 </func>
 
 <!-- ===================================================================== -->
 
 <func>
-<name>remove_transport(SvcName, Pred) -> ok</name>
+<name>remove_transport(SvcName, Pred) -> ok | {error, Reason}</name>
 <fsummary>Remove previously added transports.</fsummary>
 <type>
-<v>SvcName = service_name()</v>
-<v>Pred = Fun | MFA | ref() | list() | true | false</v>
+<v>SvcName = &service_name;</v>
+<v>Pred = Fun | MFA | &transport_ref; | list() | true | false</v>
 <v></v>
-<v>Fun = fun((reference(), connect|listen, list()) -> boolean())</v>
-<v>&nbsp;&nbsp;&nbsp; | fun((reference(), list()) -> boolean())</v>
+<v>Fun = fun((&transport_ref;, connect|listen, list()) -> boolean())</v>
+<v>&nbsp;&nbsp;&nbsp; | fun((&transport_ref;, list()) -> boolean())</v>
 <v>&nbsp;&nbsp;&nbsp; | fun((list()) -> boolean())</v>
 <v>MFA = {atom(), atom(), list()}</v>
+<v>Reason = term()</v>
 </type>
 <desc>
 <p>
@@ -1107,50 +1268,329 @@ Remove previously added transports.</p>
 <c>Pred</c> determines which transports to remove.
 An arity-3-valued <c>Pred</c> removes all transports for which
 <c>Pred(Ref, Type, Opts)</c> returns <c>true</c>, where <c>Type</c> and
-<c>Opts</c> are as passed to <seealso
-marker="#add_transport">add_transport/2</seealso> and <c>Ref</c> is
-as returned by the corresponding call.
+<c>Opts</c> are as passed to &add_transport; and <c>Ref</c> is
+as returned by it.
 The remaining forms are equivalent to an arity-3 fun as follows.</p>
 
-<code>
-Pred = fun(reference(), list()):  fun(Ref, _, Opts) -> Pred(Ref, Opts) end
-Pred = fun(list()):               fun(_, _, Opts) -> Pred(Opts) end
-Pred = reference():               fun(Ref, _, _)  -> Pred == Ref end
-Pred = list():                    fun(_, _, Opts) -> [] == Pred -- Opts end
-Pred = true:                      fun(_, _, _) -> true end
-Pred = false:                     fun(_, _, _) -> false end
+<pre>
+Pred = fun(transport_ref(), list()):  fun(Ref, _, Opts) -> Pred(Ref, Opts) end
+Pred = fun(list()):                   fun(_, _, Opts) -> Pred(Opts) end
+Pred = transport_ref():               fun(Ref, _, _)  -> Pred == Ref end
+Pred = list():                        fun(_, _, Opts) -> [] == Pred -- Opts end
+Pred = true:                          fun(_, _, _) -> true end
+Pred = false:                         fun(_, _, _) -> false end
 Pred = {M,F,A}:  fun(Ref, Type, Opts) -> apply(M, F, [Ref, Type, Opts | A]) end
-</code>
+</pre>
 
 <p>
-Removing a transport causes all associated transport connections to
-be broken.
-A base application DPR message with
-Disconnect-Cause <c>DO_NOT_WANT_TO_TALK_TO_YOU</c> will be sent
-to each connected peer before disassociating the transport configuration
-from the service and terminating the transport upon reception of
-DPA or timeout.</p>
-
-<!-- TODO: document the timeout value, possibly make configurable. -->
+Removing a transport causes the corresponding transport processes to
+be terminated.
+Whether or not a DPR message is sent to a peer is
+controlled by value of &disconnect_cb;
+configured on the transport.</p>
 
-<marker id="service_info"/>
 </desc>
 </func>
 
 <!-- ===================================================================== -->
 
 <func>
-<name>service_info(SvcName, Item) -> Value</name>
-<fsummary>Return specific information about a started service.</fsummary>
+<name>service_info(SvcName, Info) -> term()</name>
+<fsummary>Return information about a started service.</fsummary>
 <type>
-<v>SvcName = service_name()</v>
-<v>Value = term()</v>
+<v>SvcName = &service_name;</v>
+<v>Info = Item | [Info]</v>
+<v>Item = atom()</v>
 </type>
 <desc>
 <p>
-Return information about a started service.</p>
+Return information about a started service.
+Requesting info for an unknown service causes <c>undefined</c> to be
+returned.
+Requesting a list of items causes a tagged list to be
+returned.</p>
+
+<p>
+<c>Item</c> can be one of the following.</p>
+
+<taglist>
+
+<tag><c>'Origin-Host'</c></tag>
+<tag><c>'Origin-Realm'</c></tag>
+<tag><c>'Vendor-Id'</c></tag>
+<tag><c>'Product-Name'</c></tag>
+<tag><c>'Origin-State-Id'</c></tag>
+<tag><c>'Host-IP-Address'</c></tag>
+<tag><c>'Supported-Vendor'</c></tag>
+<tag><c>'Auth-Application-Id'</c></tag>
+<tag><c>'Inband-Security-Id'</c></tag>
+<tag><c>'Acct-Application-Id'</c></tag>
+<tag><c>'Vendor-Specific-Application-Id'</c></tag>
+<tag><c>'Firmware-Revision'</c></tag>
+<item>
+<p>
+Return a capability value as configured with &start_service;.</p>
+</item>
+
+<tag><c>applications</c></tag>
+<item>
+<p>
+Return the list of applications as configured with &start_service;.
+</p>
+</item>
+
+<tag><c>capabilities</c></tag>
+<item>
+<p>
+Return a tagged list of all capabilities values as configured with
+&start_service;.</p>
+</item>
+
+<tag><c>transport</c></tag>
+<item>
+<p>
+Return a list containing one entry for each of the service's transport
+as configured with &add_transport;.
+Each entry is a tagged list containing both configuration and
+information about established peer connections.
+An example return value with for a client service with Origin-Host
+"client.example.com" configured with a single transport connected to
+"server.example.com" might look as follows.</p>
+
+<pre>
+[[{ref,#Ref&lt;0.0.0.93>},
+  {type,connect},
+  {options,[{transport_module,diameter_tcp},
+            {transport_config,[{ip,{127,0,0,1}},
+                               {raddr,{127,0,0,1}},
+                               {rport,3868},
+                               {reuseaddr,true}]}]},
+  {watchdog,{&lt;0.66.0>,{1346,171491,996448},okay}},
+  {peer,{&lt;0.67.0>,{1346,171491,999906}}},
+  {apps,[{0,common}]},
+  {caps,[{origin_host,{"client.example.com","server.example.com"}},
+         {origin_realm,{"example.com","example.com"}},
+         {host_ip_address,{[{127,0,0,1}],[{127,0,0,1}]}},
+         {vendor_id,{0,193}},
+         {product_name,{"Client","Server"}},
+         {origin_state_id,{[],[]}},
+         {supported_vendor_id,{[],[]}},
+         {auth_application_id,{[0],[0]}},
+         {inband_security_id,{[],[0]}},
+         {acct_application_id,{[],[]}},
+         {vendor_specific_application_id,{[],[]}},
+         {firmware_revision,{[],[]}},
+         {avp,{[],[]}}]},
+  {port,[{owner,&lt;0.69.0>},
+         {module,diameter_tcp},
+         {socket,{{127,0,0,1},48758}},
+         {peer,{{127,0,0,1},3868}},
+         {statistics,[{recv_oct,656},
+                      {recv_cnt,6},
+                      {recv_max,148},
+                      {recv_avg,109},
+                      {recv_dvi,19},
+                      {send_oct,836},
+                      {send_cnt,6},
+                      {send_max,184},
+                      {send_avg,139},
+                      {send_pend,0}]}]},
+  {statistics,[{{{0,258,0},recv},3},
+               {{{0,258,1},send},3},
+               {{{0,257,0},recv},1},
+               {{{0,257,1},send},1},
+               {{{0,258,0},recv,{'Result-Code',2001}},3},
+               {{{0,280,1},recv},2},
+               {{{0,280,0},send},2}]}]]
+</pre>
+
+<p>
+Here <c>ref</c> is a <c>&transport_ref;</c> and <c>options</c>
+the corresponding <c>&transport_opt;</c> list passed to
+&add_transport;.
+The <c>watchdog</c> entry shows the state of a connection's RFC 3539 watchdog
+state machine.
+The <c>peer</c> entry identifies the <c>&app_peer_ref;</c> for
+which there will have been &app_peer_up; callbacks for the
+Diameter applications identified by the <c>apps</c> entry,
+<c>common</c> being the <c>&application_alias;</c>.
+The <c>caps</c> entry identifies the capabilities sent by the local
+node and received from the peer during capabilities exchange.
+The <c>port</c> entry displays socket-level information about the
+transport connection.
+The <c>statistics</c> entry presents Diameter-level counters, 
+an entry like <c>{{{0,280,1},recv},2}</c> saying that the client has
+received 2 DWR messages: <c>{0,280,1} = {Application_Id, Command_Code,
+R_Flag}</c>.</p>
+
+<p>
+Note that <c>watchdog</c>, <c>peer</c>, <c>apps</c>, <c>caps</c>
+and <c>port</c> entries depend on connectivity
+with the peer and may not be present.
+Note also that the <c>statistics</c> entry presents values acuumulated
+during the lifetime of the transport configuration.</p>
+
+<p>
+A listening transport presents its information slightly differently
+since there may be multiple accepted connections for the same
+<c>&transport_ref;</c>.
+The <c>transport</c> info returned by a server with a single client
+connection might look as follows.</p>
+
+<pre>
+[[{ref,#Ref&lt;0.0.0.61>},
+  {type,listen},
+  {options,[{transport_module,diameter_tcp},
+            {transport_config,[{reuseaddr,true},
+                               {ip,{127,0,0,1}},
+                               {port,3868}]}]},
+  {accept,[[{watchdog,{&lt;0.56.0>,{1346,171481,226895},okay}},
+            {peer,{&lt;0.58.0>,{1346,171491,999511}}},
+            {apps,[{0,common}]},
+            {caps,[{origin_host,{"server.example.com","client.example.com"}},
+                   {origin_realm,{"example.com","example.com"}},
+                   {host_ip_address,{[{127,0,0,1}],[{127,0,0,1}]}},
+                   {vendor_id,{193,0}},
+                   {product_name,{"Server","Client"}},
+                   {origin_state_id,{[],[]}},
+                   {supported_vendor_id,{[],[]}},
+                   {auth_application_id,{[0],[0]}},
+                   {inband_security_id,{[],[]}},
+                   {acct_application_id,{[],[]}},
+                   {vendor_specific_application_id,{[],[]}},
+                   {firmware_revision,{[],[]}},
+                   {avp,{[],[]}}]},
+            {port,[{owner,&lt;0.62.0>},
+                   {module,diameter_tcp},
+                   {socket,{{127,0,0,1},3868}},
+                   {peer,{{127,0,0,1},48758}},
+                   {statistics,[{recv_oct,1576},
+                                {recv_cnt,16},
+                                {recv_max,184},
+                                {recv_avg,98},
+                                {recv_dvi,26},
+                                {send_oct,1396},
+                                {send_cnt,16},
+                                {send_max,148},
+                                {send_avg,87},
+                                {send_pend,0}]}]}],
+           [{watchdog,{&lt;0.72.0>,{1346,171491,998404},initial}}]]},
+  {statistics,[{{{0,280,0},recv},7},
+               {{{0,280,1},send},7},
+               {{{0,258,0},send,{'Result-Code',2001}},3},
+               {{{0,258,1},recv},3},
+               {{{0,258,0},send},3},
+               {{{0,280,1},recv},5},
+               {{{0,280,0},send},5},
+               {{{0,257,1},recv},1},
+               {{{0,257,0},send},1}]}]]
+</pre>
+
+<p>
+The information presented here is as in the <c>connect</c> case except
+that the client connections are grouped under an <c>accept</c> tuple.</p>
+
+</item>
+
+<tag><c>connections</c></tag>
+<item>
+<p>
+Return a list containing one entry for every established transport
+connection whose watchdog state machine is not in the <c>down</c>
+state.
+This is a flat view of <c>transport</c> info which lists only active
+connections and for which Diameter-level statistics are accumulated
+only for the lifetime of the transport connection.
+A return value for the server above might look as follows.</p>
+
+<pre>
+[[{ref,#Ref&lt;0.0.0.61>},
+  {type,accept},
+  {options,[{transport_module,diameter_tcp},
+            {transport_config,[{reuseaddr,true},
+                               {ip,{127,0,0,1}},
+                               {port,3868}]}]},
+  {watchdog,{&lt;0.56.0>,{1346,171481,226895},okay}},
+  {peer,{&lt;0.58.0>,{1346,171491,999511}}},
+  {apps,[{0,common}]},
+  {caps,[{origin_host,{"server.example.com","client.example.com"}},
+         {origin_realm,{"example.com","example.com"}},
+         {host_ip_address,{[{127,0,0,1}],[{127,0,0,1}]}},
+         {vendor_id,{193,0}},
+         {product_name,{"Server","Client"}},
+         {origin_state_id,{[],[]}},
+         {supported_vendor_id,{[],[]}},
+         {auth_application_id,{[0],[0]}},
+         {inband_security_id,{[],[]}},
+         {acct_application_id,{[],[]}},
+         {vendor_specific_application_id,{[],[]}},
+         {firmware_revision,{[],[]}},
+         {avp,{[],[]}}]},
+  {port,[{owner,&lt;0.62.0>},
+         {module,diameter_tcp},
+         {socket,{{127,0,0,1},3868}},
+         {peer,{{127,0,0,1},48758}},
+         {statistics,[{recv_oct,10124},
+                      {recv_cnt,132},
+                      {recv_max,184},
+                      {recv_avg,76},
+                      {recv_dvi,9},
+                      {send_oct,10016},
+                      {send_cnt,132},
+                      {send_max,148},
+                      {send_avg,75},
+                      {send_pend,0}]}]},
+  {statistics,[{{{0,280,0},recv},62},
+               {{{0,280,1},send},62},
+               {{{0,258,0},send,{'Result-Code',2001}},3},
+               {{{0,258,1},recv},3},
+               {{{0,258,0},send},3},
+               {{{0,280,1},recv},66},
+               {{{0,280,0},send},66},
+               {{{0,257,1},recv},1},
+               {{{0,257,0},send},1}]}]]
+</pre>
+
+<p>
+Note that there may be multiple entries with the same <c>ref</c>, in
+contrast to <c>transport</c> info.</p>
+</item>
+
+<tag><c>statistics</c></tag>
+<item>
+<p>
+Return a <c>{{Counter, Ref}, non_neg_integer()}</c> list of counter values.
+<c>Ref</c> can be either a <c>&transport_ref;</c>
+or a <c>&app_peer_ref;</c>.
+Entries for the latter are folded into corresponding entries for the
+former as peer connections go down.
+Entries for both are removed at &remove_transport;.
+The Diameter-level statistics returned by <c>transport</c> and
+<c>connections</c> info are based upon these entries.</p>
+</item>
+
+<tag><c>&app_peer_ref;</c></tag>
+<item>
+<p>
+Return transport configuration associated with a single peer, as
+passed to &add_transport;.
+The returned list is empty if the peer is unknown.
+Otherwise it contains the <c>ref</c>, <c>type</c> and <c>options</c>
+tuples as in <c>transport</c> and <c>connections</c> info above.
+For example:</p>
+
+<pre>
+[{ref,#Ref&lt;0.0.0.61>},
+ {type,accept},
+ {options,[{transport_module,diameter_tcp},
+           {transport_config,[{reuseaddr,true},
+                              {ip,{127,0,0,1}},
+                              {port,3868}]}]}]
+</pre>
+</item>
+
+</taglist>
 
-<marker id="services"/>
 </desc>
 </func>
 
@@ -1160,34 +1600,32 @@ Return information about a started service.</p>
 <name>services() -> [SvcName]</name>
 <fsummary>Return the list of started services.</fsummary>
 <type>
-<v>SvcName = service_name()</v>
+<v>SvcName = &service_name;</v>
 </type>
 <desc>
 <p>
 Return the list of started services.</p>
 
-<marker id="session_id"/>
 </desc>
 </func>
 
 <!-- ===================================================================== -->
 
 <func>
-<name>session_id(Ident) -> OctetString()</name>
+<name>session_id(Ident) -> &dict_OctetString;</name>
 <fsummary>Return a value for a Session-Id AVP.</fsummary>
 <type>
-<v>Ident = DiameterIdentity()</v>
+<v>Ident = &dict_DiameterIdentity;</v>
 </type>
 <desc>
 <p>
 Return a value for a Session-Id AVP.</p>
 
 <p>
-The value has the form required by section 8.8 of RFC 3588.
+The value has the form required by section 8.8 of &the_rfc;.
 Ident should be the Origin-Host of the peer from which
 the message containing the returned value will be sent.</p>
 
-<marker id="start"/>
 </desc>
 </func>
 
@@ -1201,10 +1639,9 @@ Start the diameter application.</p>
 
 <p>
 The diameter application must be started before starting a service.
-In a production system this will typically be accomplished by a boot
+In a production system this is typically accomplished by a boot
 file, not by calling <c>start/0</c> explicitly.</p>
 
-<marker id="start_service"/>
 </desc>
 </func>
 
@@ -1213,8 +1650,8 @@ file, not by calling <c>start/0</c> explicitly.</p>
 <name>start_service(SvcName, Options) -> ok | {error, Reason}</name>
 <fsummary>Start a Diameter service.</fsummary>
 <type>
-<v>SvcName = service_name()</v>
-<v>Options = [service_opt()]</v>
+<v>SvcName = &service_name;</v>
+<v>Options = [&service_opt;]</v>
 <v>Reason  = term()</v>
 </type>
 <desc>
@@ -1222,13 +1659,19 @@ file, not by calling <c>start/0</c> explicitly.</p>
 Start a diameter service.</p>
 
 <p>
-A service defines a locally-implemented Diameter peer, specifying the
-capabilities of the peer to be used during capabilities exchange and
-the Diameter applications that it supports.
-Transports are added to a service using <seealso
-marker="#add_transport">add_transport/2</seealso>.</p>
+A service defines a locally-implemented Diameter node, specifying the
+capabilities to be advertised during capabilities exchange.
+Transports are added to a service using &add_transport;.
+</p>
+
+<note>
+<p>
+A transport can both override its service's
+capabilities and restrict its supported Diameter applications so
+"service = Diameter node as identified by Origin-Host" is not
+necessarily the case.</p>
+</note>
 
-<marker id="stop_service"/>
 </desc>
 </func>
 
@@ -1243,7 +1686,6 @@ Stop the diameter application.</p>
 <p>
 </p>
 
-<marker id="stop_service"/>
 </desc>
 </func>
 
@@ -1252,14 +1694,25 @@ Stop the diameter application.</p>
 <name>stop_service(SvcName) -> ok | {error, Reason}</name>
 <fsummary>Stop a Diameter service.</fsummary>
 <type>
-<v>SvcName = service_name()</v>
+<v>SvcName = &service_name;</v>
 <v>Reason = term()</v>
 </type>
 <desc>
 <p>
 Stop a diameter service.</p>
 
-<marker id="subscribe"/>
+<p>
+Stopping a service causes all associated transport connections to be
+broken.
+A DPR message with be sent as in the case of &remove_transport;.</p>
+
+<note>
+<p>
+Stopping a service does not remove any associated transports:
+&remove_transport; must
+be called to remove transport configuration.</p>
+</note>
+
 </desc>
 </func>
 
@@ -1269,17 +1722,19 @@ Stop a diameter service.</p>
 <name>subscribe(SvcName) -> true</name>
 <fsummary>Subscribe to event messages.</fsummary>
 <type>
-<v>SvcName = service_name()</v>
+<v>SvcName = &service_name;</v>
 </type>
 <desc>
 <p>
-Subscribe to <c>service_event()</c> messages from a service.</p>
+Subscribe to <c>&service_event;</c> messages from
+a service.</p>
 
 <p>
 It is not an error to subscribe to events from a service
-that does not yet exist.</p>
+that does not yet exist.
+Doing so before adding transports is required to guarantee the
+reception of all related events.</p>
 
-<marker id="unsubscribe"/>
 </desc>
 </func>
 
@@ -1289,7 +1744,7 @@ that does not yet exist.</p>
 <name>unsubscribe(SvcName) -> true</name>
 <fsummary>Unsubscribe to event messages.</fsummary>
 <type>
-<v>SvcName = service_name()</v>
+<v>SvcName = &service_name;</v>
 </type>
 <desc>
 <p>
@@ -1306,9 +1761,7 @@ Unsubscribe to event messages from a service.</p>
 <title>SEE ALSO</title>
 
 <p>
-<seealso marker="diameter_app">diameter_app(3)</seealso>,
-<seealso marker="diameter_transport">diameter_transport(3)</seealso>,
-<seealso marker="diameter_dict">diameter_dict(4)</seealso></p>
+&man_app;, &man_transport;, &man_dict;</p>
 
 </section>
 
diff --git a/lib/diameter/doc/src/diameter_app.xml b/lib/diameter/doc/src/diameter_app.xml
index a9ae0ebbec..f4db625c71 100644
--- a/lib/diameter/doc/src/diameter_app.xml
+++ b/lib/diameter/doc/src/diameter_app.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
+<!DOCTYPE erlref SYSTEM "erlref.dtd" [
+  <!ENTITY message '<seealso marker="#message">message()</seealso>'>
+  <!ENTITY dict
+  '<seealso marker="diameter_dict#MESSAGE_RECORDS">diameter_dict(4)</seealso>'>
+  <!ENTITY % also SYSTEM "seealso.ent" >
+  <!ENTITY % here SYSTEM "seehere.ent" >
+  %also;
+  %here;
+]>
 
 <erlref>
 <header>
 
 <copyright>
-<year>2011</year>
+<year>2011</year><year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -41,15 +49,13 @@ Callback module of a Diameter application.</modulesummary>
 <description>
 
 <p>
-A diameter service as started by <seealso
-marker="diameter#start_service">diameter:start_service/2</seealso>
+A diameter service as started by &mod_start_service;
 configures one of more Diameter applications, each of whose
 configuration specifies a callback that handles messages specific to
-its application.
-The messages and AVPs of the Diameter application are defined in a
+the application.
+The messages and AVPs of the application are defined in a
 dictionary file whose format is documented in
-<seealso marker="diameter_dict">diameter_dict(4)</seealso>
-while the callback module is documented here.
+&man_dict; while the callback module is documented here.
 The callback module implements the Diameter application-specific
 functionality of a service.</p>
 
@@ -60,26 +66,24 @@ The functions themselves are of three distinct flavours:</p>
 <list>
 <item>
 <p>
-<seealso marker="#peer_up">peer_up/3</seealso> and
-<seealso marker="#peer_down">peer_down/3</seealso> signal the
+&peer_up; and &peer_down; signal the
 attainment or loss of connectivity with a Diameter peer.</p>
 </item>
 
 <item>
 <p>
-<seealso marker="#pick_peer">pick_peer/4</seealso>,
-<seealso marker="#prepare_request">prepare_request/3</seealso>,
-<seealso marker="#prepare_retransmit">prepare_retransmit/3</seealso>,
-<seealso marker="#handle_answer">handle_answer/4</seealso>
-and <seealso marker="#handle_error">handle_error/4</seealso> are (or may
-be) called as a consequence of a call to <seealso 
-marker="diameter#call">diameter:call/4</seealso> to send an outgoing
+&pick_peer;,
+&prepare_request;,
+&prepare_retransmit;,
+&handle_answer;
+and &handle_error; are (or may be) called as a consequence of a call
+to &mod_call; to send an outgoing
 Diameter request message.</p>
 </item>
 
 <item>
 <p>
-<seealso marker="#handle_request">handle_request/3</seealso>
+&handle_request;
 is called in response to an incoming Diameter request message.</p>
 </item>
 
@@ -92,10 +96,9 @@ is called in response to an incoming Diameter request message.</p>
 The arities given for the the callback functions here assume no extra
 arguments.
 All functions will also be passed any extra arguments configured with
-the callback module itself when calling <seealso
-marker="diameter#start_service">diameter:start_service/2</seealso>
+the callback module itself when calling &mod_start_service;
 and, for the call-specific callbacks, any extra arguments passed to
-<seealso marker="diameter#call">diameter:call/4</seealso>.</p>
+&mod_call;.</p>
 </note>
 
 <!-- ===================================================================== -->
@@ -106,11 +109,14 @@ and, for the call-specific callbacks, any extra arguments passed to
 
 <taglist>
 
+<marker id="capabilities"/>
+
 <tag><c>capabilities() = #diameter_caps{}</c></tag>
 <item>
 <p>
 A record containing the identities of
-the local and remote Diameter peers having an established transport
+the local Diameter node and the remote Diameter peer having an
+established transport
 connection, as well as the capabilities as
 determined by capabilities exchange.
 Each field of the record is a 2-tuple consisting of
@@ -119,78 +125,51 @@ Optional or possibly multiple values are encoded as lists of values,
 mandatory values as the bare value.</p>
 </item>
 
-<tag><c>message() = record() | list()</c></tag>
+<marker id="message"/>
+
+<tag><c>message() = &codec_message;</c></tag>
 <item>
 <p>
 The representation of a Diameter message as passed to
-<seealso marker="diameter#call">diameter:call/4</seealso>.
-The record representation is as outlined in
-<seealso
-marker="diameter_dict#MESSAGE_RECORDS">diameter_dict(4)</seealso>:
-a message as defined in a dictionary file is encoded as a record with
-one field for each component AVP.
-Equivalently, a message can also be encoded as a list whose head is
-the atom-valued message name (the record name minus any
-prefix specified in the relevant dictionary file) and whose tail is a
-list of <c>{FieldName, FieldValue}</c> pairs.</p>
-
-<p>
-A third representation allows a message to be specified as a list
-whose head is a <c>diameter_header</c> record and whose tail is a list
-of <c>diameter_avp</c> records.
-This representation is used by diameter itself when relaying requests
-as directed by the return value of a
-<seealso marker="#handle_request">handle_request/3</seealso>
-callback.
-It differs from the other other two in that it bypasses the checks for
-messages that do not agree with their definitions in the dictionary in
-question (since relays agents must handle arbitrary request): messages
-are sent exactly as specified.</p>
+&mod_call; or returned from a &handle_request; callback.</p>
 
 </item>
 
-<tag><c>packet() = #diameter_packet{}</c></tag>
+<marker id="packet"/>
+
+<tag><c>packet() = &codec_packet;</c></tag>
 <item>
 <p>
-A container for incoming and outgoing Diameters message that's passed
+A container for incoming and outgoing Diameter messages that's passed
 through encode/decode and transport.
-Fields of a packet() record should not be set in return values except
-as documented.</p>
+Fields should not be set in return values except as documented.</p>
 </item>
 
+<marker id="peer_ref"/>
+
 <tag><c>peer_ref() = term()</c></tag>
 <item>
 <p>
-A term identifying a transport connection with a Diameter peer.
-Should be treated opaquely.</p>
+A term identifying a transport connection with a Diameter peer.</p>
 </item>
 
-<tag><c>peer() = {peer_ref(), capabilities()}</c></tag>
+<marker id="peer"/>
+
+<tag><c>peer() = {&peer_ref;, &capabilities;}</c></tag>
 <item>
 <p>
 A tuple representing a Diameter peer connection.</p>
 </item>
 
-<tag><c>service_name() = term()</c></tag>
-<item>
-<p>
-The service supporting the Diameter application.
-Specified to <seealso
-marker="diameter#start_service">diameter:start_service/2</seealso>
-when starting the service.</p>
-</item>
+<marker id="state"/>
 
 <tag><c>state() = term()</c></tag>
 <item>
 <p>
 The state maintained by the application callback functions
-<seealso marker="#peer_up">peer_up/3</seealso>,
-<seealso marker="#peer_down">peer_down/3</seealso> and (optionally)
-<seealso marker="#pick_peer">pick_peer/4</seealso>.
+&peer_up;, &peer_down; and (optionally) &pick_peer;.
 The initial state is configured in the call to
-<seealso
-marker="diameter#start_service">diameter:start_service/2</seealso>
-that configures the application on a service.
+&mod_start_service; that configures the application on a service.
 Callback functions returning a state are evaluated in a common
 service-specific process while
 those not returning state are evaluated in a request-specific
@@ -211,18 +190,33 @@ process.</p>
 <name>Mod:peer_up(SvcName, Peer, State) -> NewState</name>
 <fsummary>Invoked when a transport connection has been established</fsummary>
 <type>
-<v>SvcName = service_name()</v>
-<v>Peer    = peer()</v>
-<v>State   = NewState = state()</v>
+<v>SvcName = &mod_service_name;</v>
+<v>Peer    = &peer;</v>
+<v>State   = NewState = &state;</v>
 </type>
 <desc>
 <p>
-Invoked when a transport connection has been established
-and a successful capabilities exchange has indicated that the peer
-supports the Diameter application of the application on which
-the callback module in question has been configured.</p>
+Invoked to signal the availability of a peer connection.
+In particular, capabilities exchange with the peer has indicated
+support for the application in question, the RFC 3539 watchdog state
+machine for the connection has reached state <c>OKAY</c> and Diameter
+messages can be both sent and received.</p>
+
+<note>
+<p>
+A watchdog state machine can reach state <c>OKAY</c> from state
+<c>SUSPECT</c> without a new capabilities exchange taking place.
+A new transport connection (and capabilities exchange) results in a
+new peer_ref().</p>
+</note>
+
+<note>
+<p>
+There is no requirement that a callback return before incoming
+requests are received: &handle_request; callbacks must be
+handled independently of &peer_up; and &peer_down;.</p>
+</note>
 
-<marker id="peer_down"/>
 </desc>
 </func>
 
@@ -230,78 +224,87 @@ the callback module in question has been configured.</p>
 <name>Mod:peer_down(SvcName, Peer, State) -> NewState</name>
 <fsummary>Invoked when a transport connection has been lost.</fsummary>
 <type>
-<v>SvcName = service_name()</v>
-<v>Peer    = peer()</v>
-<v>State   = NewState = state()</v>
+<v>SvcName = &mod_service_name;</v>
+<v>Peer    = &peer;</v>
+<v>State   = NewState = &state;</v>
 </type>
 <desc>
 <p>
-Invoked when a transport connection has been lost following a previous
-call to <seealso marker="#peer_up">peer_up/3</seealso>.</p>
+Invoked to signal that a peer connection is no longer available
+following a previous call to &peer_up;.
+In particular, that the RFC 3539 watchdog state machine for the
+connection has left state <c>OKAY</c> and the peer will no longer be a
+candidate in &pick_peer; callbacks.</p>
 
-<marker id="pick_peer"/>
 </desc>
 </func>
 
 <func>
-<name>Mod:pick_peer(Candidates, Reserved, SvcName, State)
-      -> {ok, Peer} | {Peer, NewState} | false</name>
+<name>Mod:pick_peer(Candidates, _Reserved, SvcName, State)
+      -> Selection | false</name>
 <fsummary>Select a target peer for an outgoing request.</fsummary>
 <type>
-<v>Candidates = [peer()]</v>
-<v>Peer = peer() | false</v>
-<v>SvcName = service_name()</v>
-<v>State = NewState = state()</v>
+<v>Candidates = [&peer;]</v>
+<v>SvcName = &mod_service_name;</v>
+<v>State = NewState = &state;</v>
+<v>Selection = {ok, Peer} | {Peer, NewState}</v>
+<v>Peer = &peer; | false</v>
 </type>
 <desc>
 <p>
-Invoked as a consequence of a call to <seealso
-marker="diameter#call">diameter:call/4</seealso> to select a destination
-peer for an outgoing request, the return value indicating the selected peer.
-A new application state can also be returned but only if the Diameter
-application in question was
-configured with the option <c>call_mutates_state</c> set to
-<c>true</c>, as documented for <seealso
-marker="diameter#start_service">diameter:start_service/2</seealso>.</p>
-
-<p>
-The candidate peers list will only include those
-which are selected by any <c>filter</c> option specified in the call to
-<seealso marker="diameter#call">diameter:call/4</seealso>, and only
-those which have indicated support for the Diameter application in
-question.
+Invoked as a consequence of a call to &mod_call; to select a destination
+peer for an outgoing request.
+The return value indicates the selected peer.</p>
+
+<p>
+The candidate list contains only those peers that have advertised
+support for the Diameter application in question during capabilities
+exchange, that have not be excluded by a <c>filter</c> option in
+the call to &mod_call;
+and whose watchdog state machine is in the <c>OKAY</c> state.
 The order of the elements is unspecified except that any
 peers whose Origin-Host and Origin-Realm matches that of the
 outgoing request (in the sense of a <c>{filter, {all, [host, realm]}}</c>
-option to <seealso marker="diameter#call">diameter:call/4</seealso>)
+option to &mod_call;)
 will be placed at the head of the list.</p>
 
 <p>
-The return values <c>false</c> and <c>{false, State}</c> are
-equivalent when callback state is mutable, as are
-<c>{ok, Peer}</c> and <c>{Peer, State}</c>.
-Returning a peer as <c>false</c> causes <c>{error, no_connection}</c>
-to be returned from <seealso marker="diameter#call">diameter:call/4</seealso>.
-Returning a peer() from an initial pick_peer/4 callback will result in a
-<seealso marker="#prepare_request">prepare_request/3</seealso> callback
-followed by either <seealso
-marker="#handle_answer">handle_answer/4</seealso>
-or <seealso marker="#handle_error">handle_error/4</seealso> depending
+A callback that returns a peer() will be followed by a
+&prepare_request;
+callback and, if the latter indicates that the request should be sent,
+by either &handle_answer;
+or &handle_error; depending
 on whether or not an answer message is received from the peer.
-If transport with the peer is lost before this then a new <seealso
-marker="#pick_peer">pick_peer/4</seealso> callback takes place to
-select an alternate peer.</p>
-
-<p>
-Note that there is no guarantee that a <seealso
-marker="#pick_peer">pick_peer/4</seealso> callback to select
-an alternate peer will be followed by any additional callbacks, only
-that the initial <seealso
-marker="#pick_peer">pick_peer/4</seealso> will be, since a
+If the transport becomes unavailable after &prepare_request; then a
+new &pick_peer; callback may take place to
+failover to an alternate peer, after which &prepare_retransmit; takes the
+place of &prepare_request; in resending the
+request.
+There is no guarantee that a &pick_peer; callback to select
+an alternate peer will be followed by any additional callbacks since a
 retransmission to an alternate peer is abandoned if an answer is
 received from a previously selected peer.</p>
 
-<marker id="prepare_request"/>
+<p>
+Returning <c>false</c> or <c>{false, NewState}</c> causes <c>{error,
+no_connection}</c> to be returned from &mod_call;.</p>
+
+<p>
+The return values <c>false</c> and <c>{false, State}</c> (that is,
+<c>NewState = State</c>) are equivalent, as are <c>{ok, Peer}</c> and
+<c>{Peer, State}</c>.</p>
+
+<note>
+<p>
+The return value <c>{Peer, NewState}</c> is only allowed if
+the Diameter application in question was configured with the
+&mod_application_opt; <c>{call_mutates_state, true}</c>.
+Otherwise, the <c>State</c> argument is always
+the intial value as configured on the application, not any subsequent
+value returned by a &peer_up;
+or &peer_down; callback.</p>
+</note>
+
 </desc>
 
 </func>
@@ -310,74 +313,81 @@ received from a previously selected peer.</p>
 <name>Mod:prepare_request(Packet, SvcName, Peer) -> Action</name>
 <fsummary>Return a request for encoding and transport.</fsummary>
 <type>
-<v>Packet = packet()</v>
-<v>SvcName = service_name()</v>
-<v>Peer = peer()</v>
-<v>Action = {send, packet() | message()} | {discard, Reason} | discard</v>
+<v>Packet = &packet;</v>
+<v>SvcName = &mod_service_name;</v>
+<v>Peer = &peer;</v>
+<v>Action = Send | Discard | {eval_packet, Action, PostF}</v>
+<v>Send = {send, &packet; | &message;}</v>
+<v>Discard = {discard, Reason} | discard</v>
+<v>PostF = &mod_evaluable;}</v>
 </type>
 <desc>
 <p>
 Invoked to return a request for encoding and transport.
-Allows the sender to access the selected peer's capabilities
-in order to set (for example) <c>Destination-Host</c> and/or
-<c>Destination-Realm</c> in the outgoing request, although the
-callback need not be limited to this usage.
+Allows the sender to use the selected peer's capabilities
+to modify the outgoing request.
 Many implementations may simply want to return <c>{send, Packet}</c></p>
 
 <p>
-A returned packet() should set the request to be encoded in its
+A returned &packet; should set the
+request to be encoded in its
 <c>msg</c> field and can set the <c>transport_data</c> field in order
-to pass information to the transport module.
-Extra arguments passed to <seealso
-marker="diameter#call">diameter:call/4</seealso> can be used to
-communicate transport data to the callback.
-A returned packet() can also set the <c>header</c> field to a
-<c>diameter_header</c> record in order to specify values that should
-be preserved in the outgoing request, although this should typically
-not be necessary and allows the callback to set header values
-inappropriately.
+to pass information to the transport process.
+Extra arguments passed to &mod_call; can be used to
+communicate transport (or any other) data to the callback.</p>
+
+<p>
+A returned &packet; can set
+the <c>header</c> field to a
+<c>#diameter_header{}</c> to specify values that should
+be preserved in the outgoing request, values otherwise being those in
+the header record contained in <c>Packet</c>.
 A returned <c>length</c>, <c>cmd_code</c> or <c>application_id</c> is
 ignored.</p>
 
 <p>
+A returned <c>PostF</c> will be evaluated on any encoded
+<c>#diameter_packet{}</c> prior to transmission, the <c>bin</c> field
+containing the encoded binary.
+The return value is ignored.</p>
+
+<p>
 Returning <c>{discard, Reason}</c> causes the request to be aborted
-and the <seealso
-marker="diameter#call">diameter:call/4</seealso> for which the
+and the &mod_call; for which the
 callback has taken place to return <c>{error, Reason}</c>.
 Returning <c>discard</c> is equivalent to returning <c>{discard,
 discarded}</c>.</p>
 
-<marker id="prepare_retransmit"/>
 </desc>
 </func>
 
 <func>
-<name>Mod:prepare_retransmit(Packet, SvcName, Peer) -> Result</name>
+<name>Mod:prepare_retransmit(Packet, SvcName, Peer) -> Action</name>
 <fsummary>Return a request for encoding and retransmission.</fsummary>
 <type>
-<v>Packet  = packet()</v>
-<v>SvcName = service_name()</v>
-<v>Peer    = peer()</v>
-<v>Result  = {send, packet() | message()} | {discard, Reason} | discard</v>
+<v>Packet  = &packet;</v>
+<v>SvcName = &mod_service_name;</v>
+<v>Peer = &peer;</v>
+<v>Action = Send | Discard | {eval_packet, Action, PostF}</v>
+<v>Send = {send, &packet; | &message;}</v>
+<v>Discard = {discard, Reason} | discard</v>
+<v>PostF = &mod_evaluable;}</v>
 </type>
 <desc>
 <p>
 Invoked to return a request for encoding and retransmission.
-Has the same role as <seealso
-marker="#prepare_request">prepare_request/3</seealso> in the case that
+Has the same role as &prepare_request; in the case that
 a peer connection is lost an an alternate peer selected but the
-argument packet() is as returned by the initial
-<c>prepare_request/3</c>.</p>
+argument &packet; is as returned
+by the initial &prepare_request;.</p>
 
 <p>
 Returning <c>{discard, Reason}</c> causes the request to be aborted
-and a <seealso
-marker="#handle_error">handle_error/4</seealso> callback to
+and a &handle_error; callback to
 take place with <c>Reason</c> as initial argument.
 Returning <c>discard</c> is equivalent to returning <c>{discard,
 discarded}</c>.</p>
 
-<marker id="handle_answer"/>
 </desc>
 </func>
 
@@ -385,51 +395,43 @@ discarded}</c>.</p>
 <name>Mod:handle_answer(Packet, Request, SvcName, Peer) -> Result</name>
 <fsummary>Receive an answer message from a peer.</fsummary>
 <type>
-<v>Packet  = packet()</v>
-<v>Request = message()</v>
-<v>SvcName = service_name()</v>
-<v>Peer    = peer()</v>
+<v>Packet  = &packet;</v>
+<v>Request = &message;</v>
+<v>SvcName = &mod_service_name;</v>
+<v>Peer    = &peer;</v>
 <v>Result  = term()</v>
 </type>
 <desc>
 <p>
 Invoked when an answer message is received from a peer.
-The return value is returned from the call to <seealso
-marker="diameter#call">diameter:call/4</seealso> for which the
-callback takes place unless the <c>detach</c> option was
-specified.</p>
+The return value is returned from &mod_call; unless the
+<c>detach</c> option was specified.</p>
 
 <p>
-The decoded answer record is in the <c>msg</c> field of the argument
-packet(),
-the undecoded binary in the <c>packet</c> field.
+The decoded answer record and undecoded binary are in the <c>msg</c>
+and <c>bin</c> fields of the argument
+&packet; respectively.
 <c>Request</c> is the outgoing request message as was returned from
-<seealso marker="#prepare_request">prepare_request/3</seealso> or
-<seealso marker="#prepare_retransmit">prepare_retransmit/3</seealso>
-before the request was passed to the transport.</p>
+&prepare_request; or &prepare_retransmit;.</p>
 
 <p>
-For any given call to <seealso
-marker="diameter#call">diameter:call/4</seealso> there is at most one
-call to the handle_answer callback of the application in question: any
+For any given call to &mod_call; there is at most one
+&handle_answer; callback: any
 duplicate answer (due to retransmission or otherwise) is discarded.
-Similarly, only one of <c>handle_answer/4</c> or <c>handle_error/4</c> is
-called for any given request.</p>
+Similarly, only one of &handle_answer; or
+&handle_error; is called.</p>
 
 <p>
 By default, an incoming answer message that cannot be successfully
-decoded causes the request process in question to fail, causing the
-relevant call to <seealso
-marker="diameter#call">diameter:call/4</seealso>
-to return <c>{error, failure} (unless the <c>detach</c> option was
-specified)</c>.
-In particular, there is no <c>handle_error/4</c> callback in this
+decoded causes the request process to fail, causing
+&mod_call;
+to return <c>{error, failure}</c> unless the <c>detach</c> option was
+specified.
+In particular, there is no &handle_error; callback in this
 case.
-Application configuration may change this behaviour as described for
-<seealso
-marker="diameter#start_service">diameter:start_service/2</seealso>.</p>
+The &mod_application_opt;
+<c>answer_errors</c> can be set to change this behaviour.</p>
 
-<marker id="handle_error"/>
 </desc>
 </func>
 
@@ -438,30 +440,26 @@ marker="diameter#start_service">diameter:start_service/2</seealso>.</p>
 <fsummary>Return an error from a outgoing request.</fsummary>
 <type>
 <v>Reason  = timeout | failover | term()</v>
-<v>Request = message()</v>
-<v>SvcName = service_name()</v>
-<v>Peer    = peer()</v>
+<v>Request = &message;</v>
+<v>SvcName = &mod_service_name;</v>
+<v>Peer    = &peer;</v>
 <v>Result  = term()</v>
 </type>
 <desc>
 <p>
-Invoked when an error occurs before an answer message is received from
-a peer in response to an outgoing request.
-The return value is returned from the call to <seealso
-marker="diameter#call">diameter:call/4</seealso> for which the
-callback takes place (unless the <c>detach</c> option was
-specified).</p>
+Invoked when an error occurs before an answer message is received
+in response to an outgoing request.
+The return value is returned from &mod_call; unless the
+<c>detach</c> option was specified.</p>
 
 <p>
 Reason <c>timeout</c> indicates that an answer message has not been
-received within the required time.
+received within the time specified with the corresponding &mod_call_opt;.
 Reason <c>failover</c> indicates
 that the transport connection to the peer to which the request has
-been sent has been lost but that not alternate node was available,
-possibly because a <seealso marker="#pick_peer">pick_peer/4</seealso>
-callback returned false.</p>
+been sent has become unavailable and that not alternate peer was
+not selected.</p>
 
-<marker id="handle_request"/>
 </desc>
 </func>
 
@@ -469,54 +467,54 @@ callback returned false.</p>
 <name>Mod:handle_request(Packet, SvcName, Peer) -> Action</name>
 <fsummary>Receive an incoming request.</fsummary>
 <type>
-<v>Packet  = packet()</v>
+<v>Packet  = &packet;</v>
 <v>SvcName = term()</v>
-<v>Peer    = peer()</v>
-<v>Action  = Reply | {relay, Opts} | discard | {eval, Action, PostF}</v>
-<v>Reply   = {reply, message()}
+<v>Peer    = &peer;</v>
+<v>Action  = Reply
+           | {relay, [Opt]}
+           | discard
+           | {eval|eval_packet, Action, PostF}</v>
+<v>Reply   = {reply, &packet; | &message;}
            | {protocol_error, 3000..3999}</v>
-<v>Opts    = diameter:call_opts()</v>
-<v>PostF   = diameter:evaluable()</v>
+<v>Opt     = &mod_call_opt;</v>
+<v>PostF   = &mod_evaluable;</v>
 </type>
 <desc>
 <p>
 Invoked when a request message is received from a peer.
 The application in which the callback takes place (that is, the
-callback module as configured with <seealso
-marker="diameter#start_service">diameter:start_service/2</seealso>)
+callback module as configured with &mod_start_service;)
 is determined by the Application Identifier in the header of the
 incoming request message, the selected module being the one
-whose corresponding <seealso
-marker="diameter_dict#MESSAGE_RECORDS">dictionary</seealso> declares
+whose corresponding dictionary declares
 itself as defining either the application in question or the Relay
 application.</p>
 
 <p>
-The argument packet() has the following signature.</p>
+The argument &packet; has the following signature.</p>
 
-<code>
+<pre>
 #diameter_packet{header = #diameter_header{},
                  avps   = [#diameter_avp{}],
                  msg    = record() | undefined,
-                 errors = ['Unsigned32'() | {'Unsigned32'(), #diameter_avp{}}],
+                 errors = [&dict_Unsigned32; | {&dict_Unsigned32;, #diameter_avp{}}],
                  bin    = binary(),
                  transport_data = term()}
-</code>
+</pre>
 
 <p>
-The <c>msg</c> field will be <c>undefined</c> only in case the request has
+The <c>msg</c> field will be <c>undefined</c> in case the request has
 been received in the relay application.
 Otherwise it contains the record representing the request as outlined
-in <seealso
-marker="diameter_dict#MESSAGE_RECORDS">diameter_dict(4)</seealso>.</p>
+in &dict;.</p>
 
 <p>
 The <c>errors</c> field specifies any Result-Code's identifying errors
 that were encountered in decoding the request.
 In this case diameter will set both Result-Code and
 Failed-AVP AVP's in a returned
-answer message() before sending it to the peer:
-the returned message() need only set any other required AVP's.
+answer &message; before sending it to the peer:
+the returned &message; need only set any other required AVP's.
 Note that the errors detected by diameter are all of the 5xxx series
 (Permanent Failures).
 The <c>errors</c> list is empty if the request has been received in
@@ -526,19 +524,24 @@ the relay application.</p>
 The <c>transport_data</c> field contains an arbitrary term passed into
 diameter from the transport module in question, or the atom
 <c>undefined</c> if the transport specified no data.
-The term is preserved in the packet() containing any answer message
-sent back to the transport process unless another value is explicitly
-specified.</p>
+The term is preserved if a &message; is returned but must be set
+explicitly in a returned &packet;.</p>
 
 <p>
 The semantics of each of the possible return values are as follows.</p>
 
 <taglist>
 
-<tag><c>{reply, message()}</c></tag>
+<tag><c>{reply, &packet; | &message;}</c></tag>
 <item>
 <p>
-Send the specified answer message to the peer.</p>
+Send the specified answer message to the peer.
+In the case of a &packet;, the
+message to be sent must be set in the
+<c>msg</c> field and the <c>header</c> field can be set to a
+<c>#diameter_header{}</c> to specify values that should be
+preserved in the outgoing answer, appropriate values otherwise
+being set by diameter.</p>
 </item>
 
 <tag><c>{protocol_error, 3000..3999}</c></tag>
@@ -547,15 +550,15 @@ Send the specified answer message to the peer.</p>
 Send an answer message to the peer containing the specified
 protocol error.
 Equivalent to</p>
-<code>
+<pre>
 {reply, ['answer-message' | Avps]
-</code>
+</pre>
 <p>
 where <c>Avps</c> sets the Origin-Host, Origin-Realm, the specified
 Result-Code and (if the request sent one) Session-Id AVP's.</p>
 
 <p>
-Note that RFC 3588 mandates that only answers with a 3xxx series
+Note that &the_rfc; mandates that only answers with a 3xxx series
 Result-Code (protocol errors) may set the E bit.
 Returning a non-3xxx value in a <c>protocol_error</c> tuple
 will cause the request process in question to fail.</p>
@@ -568,37 +571,47 @@ Relay a request to another peer in the role of a Diameter relay agent.
 If a routing loop is detected then the request is answered with
 3005 (DIAMETER_LOOP_DETECTED).
 Otherwise a Route-Record AVP (containing the sending peer's Origin-Host) is
-added to the request and <seealso marker="#pick_peer">pick_peer/4</seealso>
-and subsequent callbacks take place just as if <seealso
-marker="diameter#call">diameter:call/4</seealso> had been called
+added to the request and &pick_peer;
+and subsequent callbacks take place just as if &mod_call; had been called
 explicitly.
 The End-to-End Identifier of the incoming request is preserved in the
 header of the relayed request.</p>
 
 <p>
 The returned <c>Opts</c> should not specify <c>detach</c>.
-A subsequent <seealso marker="#handle_answer">handle_answer/4</seealso>
+A subsequent &handle_answer;
 callback for the relayed request must return its first
-argument, the <c>diameter_packet</c> record containing the answer
+argument, the <c>#diameter_packet{}</c> record containing the answer
 message.
 Note that the <c>extra</c> option can be specified to supply arguments
 that can distinguish the relay case from others if so desired.
 Any other return value (for example, from a
-<seealso marker="#handle_error">handle_error/4</seealso> callback)
+&handle_error; callback)
 causes the request to be answered with 3002 (DIAMETER_UNABLE_TO_DELIVER).</p>
 </item>
 
 <tag><c>discard</c></tag>
 <item>
 <p>
-Discard the request.</p>
+Discard the request.
+No answer message is sent to the peer.</p>
 </item>
 
 <tag><c>{eval, Action, PostF}</c></tag>
 <item>
 <p>
 Handle the request as if <c>Action</c> has been returned and then
-evaluate <c>PostF</c> in the request process.</p>
+evaluate <c>PostF</c> in the request process.
+The return value is ignored.</p>
+</item>
+
+<tag><c>{eval_packet, Action, PostF}</c></tag>
+<item>
+<p>
+Like <c>eval</c> but evaluate <c>PostF</c> on any encoded
+<c>#diameter_packet{}</c> prior to transmission, the <c>bin</c> field
+containing the encoded binary.
+The return value is ignored.</p>
 </item>
 
 </taglist>
diff --git a/lib/diameter/doc/src/diameter_codec.xml b/lib/diameter/doc/src/diameter_codec.xml
new file mode 100644
index 0000000000..4a77d5435b
--- /dev/null
+++ b/lib/diameter/doc/src/diameter_codec.xml
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="latin1" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd" [
+  <!ENTITY records
+  '<seealso marker="diameter_dict#MESSAGE_RECORDS">diameter_dict(4)</seealso>'>
+  <!ENTITY types
+  '<seealso marker="diameter_dict#DATA_TYPES">diameter_dict(4)</seealso>'>
+  <!ENTITY % also SYSTEM "seealso.ent" >
+  <!ENTITY % here SYSTEM "seehere.ent" >
+  %also;
+  %here;
+]>
+
+<erlref>
+<header>
+<copyright>
+<year>2012</year>
+<holder>Ericsson AB. All Rights Reserved.</holder>
+</copyright>
+<legalnotice>
+The contents of this file are subject to the Erlang Public License,
+Version 1.1, (the "License"); you may not use this file except in
+compliance with the License. You should have received a copy of the
+Erlang Public License along with this software. If not, it can be
+retrieved online at http://www.erlang.org/.
+
+Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+the License for the specific language governing rights and limitations
+under the License.
+
+</legalnotice>
+
+<title>diameter_codec(3)</title>
+<prepared>Anders Svensson</prepared>
+<responsible></responsible>
+<docno></docno>
+<approved></approved>
+<checked></checked>
+<date></date>
+<rev></rev>
+<file>diameter_codec.xml</file>
+</header>
+
+<module>diameter_codec</module>
+<modulesummary>Decode and encode of Diameter messages.</modulesummary>
+
+<description>
+
+<p>
+Incoming Diameter messages are decoded from binary() before being
+communicated to &man_app; callbacks.
+Similarly, outgoing Diameter messages are encoded into binary() before
+being passed to the appropriate &man_transport; module for
+transmission.
+The functions in this module implement this encode/decode.</p>
+
+<note>
+<p>
+Calls to this module are made by diameter itself as a consequence of
+configuration passed to &mod_start_service;.
+The encode/decode functions may also be useful for other purposes (eg.
+test) but the diameter user does not need to call them explicitly when
+sending and receiving messages using &mod_call; and the callback
+interface documented in &man_app;.</p>
+</note>
+
+<p>
+The &header; and &packet; records below
+are defined in diameter.hrl, which can be included as follows.</p>
+
+<pre>
+-include_lib("diameter/include/diameter.hrl").
+</pre>
+
+<p>
+Application-specific records are definied in the hrl
+files resulting from dictionary file compilation.</p>
+
+</description>
+
+<!-- ===================================================================== -->
+
+<section>
+<title>DATA TYPES</title>
+
+<p></p>
+
+<taglist>
+
+<marker id="integers"/>
+
+<tag><c>uint8()&nbsp; = 0..255</c></tag>
+<tag><c>uint24() = 0..16777215</c></tag>
+<tag><c>uint32() = 0..4294967295</c></tag>
+<item>
+<p>
+8-bit, 24-bit and 32-bit integers occurring in Diameter and AVP
+headers.</p>
+</item>
+
+<marker id="avp"/>
+
+<tag><c>avp() = #diameter_avp{}</c></tag>
+<item>
+<p>
+The application-neutral representation of an AVP.
+Primarily intended for use by relay applications that need to handle
+arbitrary Diameter applications.
+A service implementing a specific Diameter application
+(for which it configures a dictionary) can manipulate values of type
+&message; instead.</p>
+
+<p>
+Fields have the following types.</p>
+
+<taglist>
+
+<tag><c>code = uint32()</c></tag>
+<tag><c>is_mandatory = boolean()</c></tag>
+<tag><c>need_encryption = boolean()</c></tag>
+<tag><c>vendor_id = uint32() | undefined</c></tag>
+<item>
+<p>
+Values in the AVP header, corresponding to AVP Code, the M flag, P
+flags and Vendor-ID respectivelty.
+A Vendor-ID other than <c>undefined</c> implies a set V flag.</p>
+</item>
+
+<tag><c>data = iolist()</c></tag>
+<item>
+<p>
+The data bytes of the AVP.</p>
+</item>
+
+<tag><c>name = atom()</c></tag>
+<item>
+<p>
+The name of the AVP as defined in the dictionary file in question, or
+<c>undefined</c> if the AVP is unknown to the dictionary file in
+question.</p>
+</item>
+
+<tag><c>value = term()</c></tag>
+<item>
+<p>
+The decoded value of an AVP.
+Will be <c>undefined</c> on decode if the data bytes could
+not be decoded or the AVP is unknown.
+The type of a decoded value is as document in &types;.</p>
+</item>
+
+<tag><c>type = atom()</c></tag>
+<item>
+<p>
+The type of the AVP as specified in the dictionary file in question
+(or one it inherits).
+Possible types are <c>undefined</c> and the Diameter types:
+<c>OctetString</c>, <c>Integer32</c>, <c>Integer64</c>,
+<c>Unsigned32</c>, <c>Unsigned64</c>, <c>Float32</c>, <c>Float64</c>,
+<c>Grouped</c>, <c>Enumerated</c>, <c>Address</c>, <c>Time</c>,
+<c>UTF8String</c>, <c>DiameterIdentity</c>, <c>DiameterURI</c>,
+<c>IPFilterRule</c> and <c>QoSFilterRule</c>.</p>
+</item>
+
+</taglist>
+
+</item>
+
+<marker id="dictionary"/>
+
+<tag><c>dictionary() = module()</c></tag>
+<item>
+
+<p>
+The name of a generated dictionary module as generated by &man_compile;
+or &make_codec;.
+The interface provided by a dictionary module is an
+implementation detail that may change.</p>
+</item>
+
+<marker id="header"/>
+
+<tag><c>header() = #diameter_header{}</c></tag>
+<item>
+<p>
+The record representation of the Diameter header.
+Values in a &packet; returned by &decode; are as extracted from the
+incoming message.
+Values set in an &packet; passed to &encode; are preserved in the
+encoded binary(), with the exception of <c>length</c>, <c>cmd_code</c>
+and <c>application_id</c>, all of which are determined by the
+&dictionary; in question.</p>
+
+<note>
+<p>
+It is not necessary to set header fields explicitly in outgoing
+messages as diameter itself will set appropriate values.
+Setting inappropriate values can be useful for test purposes.</p>
+</note>
+
+<p>
+Fields have the following types.</p>
+
+<taglist>
+
+<tag><c>version = uint8()</c></tag>
+<tag><c>length = uint24()</c></tag>
+<tag><c>cmd_code = uint24()</c></tag>
+<tag><c>application_id = uint32()</c></tag>
+<tag><c>hop_by_hop_id = uint32()</c></tag>
+<tag><c>end_to_end_id = uint32()</c></tag>
+<item>
+<p>
+Values of the Version, Message Length, Command-Code, Application-ID,
+Hop-by-Hop Identifier and End-to-End Identifier fields of the Diameter
+header.</p>
+</item>
+
+<tag><c>is_request = boolean()</c></tag>
+<tag><c>is_proxiable = boolean()</c></tag>
+<tag><c>is_error = boolean()</c></tag>
+<tag><c>is_retransmitted = boolean()</c></tag>
+<item>
+<p>
+Values correspoding to the R(equest), P(roxiable), E(rror)
+and T(Potentially re-transmitted message) flags of the Diameter
+header.</p>
+</item>
+
+</taglist>
+
+</item>
+
+<marker id="message"/>
+
+<tag><c>message() = record() | list()</c></tag>
+<item>
+<p>
+The representation of a Diameter message as passed to
+&mod_call; or returned from a &app_handle_request; callback.
+The record representation is as outlined in &records;:
+a message as defined in a dictionary file is encoded as a record with
+one field for each component AVP.
+Equivalently, a message can also be encoded as a list whose head is
+the atom-valued message name (as specified in the relevant dictionary
+file) and whose tail is a list of <c>{AvpName, AvpValue}</c> pairs.</p>
+
+<p>
+Another list-valued representation allows a message to be specified
+as a list whose head is a &header; and whose tail is an &avp; list.
+This representation is used by diameter itself when relaying requests
+as directed by the return value of a &app_handle_request; callback.
+It differs from the other other two in that it bypasses the checks for
+messages that do not agree with their definitions in the dictionary in
+question: messages are sent exactly as specified.</p>
+
+</item>
+
+<marker id="packet"/>
+
+<tag><c>packet() = #diameter_packet{}</c></tag>
+<item>
+<p>
+A container for incoming and outgoing Diameter messages.
+Fields have the following types.</p>
+
+<taglist>
+
+<tag><c>header = &header; | undefined</c></tag>
+<item>
+<p>
+The Diameter header of the message.
+Can be (and typically should be) <c>undefined</c> for an outgoing
+message in a non-relay application, in which case diameter provides
+appropriate values.</p>
+</item>
+
+<tag><c>avps = [&avp;] | undefined</c></tag>
+<item>
+<p>
+The AVPs of the message.
+Ignored for an outgoing message if the <c>msg</c> field is set to a
+value other than <c>undefined</c>.</p>
+</item>
+
+<tag><c>msg = &message; | undefined</c></tag>
+<item>
+<p>
+The incoming/outgoing message.
+For an incoming message, a record if the message can be
+decoded in a non-relay application, <c>undefined</c> otherwise.
+For an outgoing message, setting a <c>[&header; | &avp;]</c> list is
+equivalent to setting the <c>header</c> and <c>avps</c> fields to the
+corresponding values.</p>
+
+<warning>
+<p>
+A record-valued <c>msg</c> field does <b>not</b> imply an absence of
+decode errors.
+The <c>errors</c> field should also be examined.</p>
+</warning>
+
+</item>
+
+<tag><c>bin = binary()</c></tag>
+<item>
+<p>
+The incoming message prior to encode or the outgoing message after
+encode.</p>
+</item>
+
+<tag><c>errors = [5000..5999 | {5000..5999, avp()}]</c></tag>
+<item>
+<p>
+Errors detected at decode of an incoming message, as identified by
+a corresponding 5xxx series Result-Code (Permanent Failures).
+For an incoming request, these should be used to formulate an
+appropriate answer as documented for the &app_handle_request;
+callback in &man_app;.
+For an incoming answer, the &mod_application_opt;
+<c>answer_errors</c> determines the behaviour.</p>
+</item>
+
+<tag><c>transport_data = term()</c></tag>
+<item>
+<p>
+An arbitrary term of meaning only to the transport process in
+question, as documented in &man_transport;.</p>
+</item>
+
+</taglist>
+
+</item>
+
+</taglist>
+
+</section>
+
+<!-- ===================================================================== -->
+
+<funcs>
+
+<func>
+<name>decode(Mod, Bin) -> Pkt</name>
+<fsummary>Decode a Diameter message.</fsummary>
+<type>
+<v>Mod = &dictionary;</v>
+<v>Bin = binary()</v>
+<v>Pkt = &packet;</v>
+</type>
+<desc>
+
+<p>
+Decode a Diameter message.</p>
+
+</desc>
+</func>
+
+<func>
+<name>encode(Mod, Msg) -> Pkt</name>
+<fsummary>Encode a Diameter message.</fsummary>
+<type>
+<v>Mod = &dictionary;</v>
+<v>Msg = &message; | &packet;</v>
+<v>Pkt = &packet;</v>
+</type>
+<desc>
+
+<p>
+Encode a Diameter message.
+</p>
+
+</desc>
+</func>
+
+</funcs>
+
+<!-- ===================================================================== -->
+<!-- ===================================================================== -->
+
+<section>
+<title>SEE ALSO</title>
+
+<p>
+&man_compile;, &man_app;, &man_dict;, &man_make;</p>
+
+</section>
+
+</erlref>
diff --git a/lib/diameter/doc/src/diameter_compile.xml b/lib/diameter/doc/src/diameter_compile.xml
index 60e08d41da..0bd7ad1789 100644
--- a/lib/diameter/doc/src/diameter_compile.xml
+++ b/lib/diameter/doc/src/diameter_compile.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE comref SYSTEM "comref.dtd">
+<!DOCTYPE comref SYSTEM "comref.dtd" [
+  <!ENTITY dictionary
+  '<seealso marker="diameter_dict">dictionary file</seealso>'>
+  <!ENTITY % also SYSTEM "seealso.ent" >
+  <!ENTITY % here SYSTEM "seehere.ent" >
+  %also;
+  %here;
+]>
 
 <comref>
 <header>
 <copyright>
-<year>2011</year>
+<year>2011</year><year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -31,12 +38,14 @@ supplied.
 <description>
 
 <p>
-The diameterc utility is used to transform diameter
-<seealso marker="diameter_dict">dictionary files</seealso>
-into Erlang source.
-The resulting source implements the interface diameter requires
+The diameterc utility is used to compile a diameter
+&dictionary; into Erlang source.
+The resulting source implements the interface diameter required
 to encode and decode the dictionary's messages and AVP's.</p>
 
+<p>
+The module &man_make; provides an alternate compilation interface.</p>
+
 </description>
 
 <section>
@@ -47,64 +56,52 @@ to encode and decode the dictionary's messages and AVP's.</p>
 <tag><![CDATA[diameterc [<options>] <file>]]></tag>
 <item>
 <p>
-Transforms a single dictionary file. Valid options are as follows.</p>
-
-<!-- Leave -h/d/v undocumented, except for the usage message from the
-     utility itself. -->
-
-<taglist>
-<tag><![CDATA[-o <dir>]]></tag>
-<item>
-<p>
-Specifies the directory into which the generated source should be written.
-Defaults to the current working directory.</p>
-</item>
+Compile a single dictionary file to Erlang source.
+Valid options are as follows.</p>
 
 <tag><![CDATA[-i <dir>]]></tag>
 <item>
 <p>
-Specifies a directory to add to the code path.
-Use to point at beam files corresponding to dictionaries
-inherited by the one being compiled using <c>@inherits</c> or
-<c>--inherits</c>.
-Inheritance is a beam dependency, not an erl/hrl dependency.</p>
+Prepend the specified directory to the code path.
+Use to point at beam files compiled from inherited dictionaries,
+<c>&dict_inherits;</c> in a dictionary file creating a beam
+dependency, not an erl/hrl dependency.</p>
 
 <p>
 Multiple <c>-i</c> options can be specified.</p>
 </item>
 
-<tag><![CDATA[-E]]></tag>
+<taglist>
+<tag><![CDATA[-o <dir>]]></tag>
 <item>
 <p>
-Supresses erl generation.</p>
+Write generated source to the specified directory.
+Defaults to the current working directory.</p>
 </item>
 
+<tag><![CDATA[-E]]></tag>
 <tag><![CDATA[-H]]></tag>
 <item>
 <p>
-Supresses hrl generation.</p>
+Supress erl and hrl generation, respectively.</p>
 </item>
 
 <tag><![CDATA[--name <name>]]></tag>
-<item>
-<p>
-Set <c>@name</c> in the dictionary file.
-Overrides any setting in the file itself.</p>
-</item>
-
 <tag><![CDATA[--prefix <prefix>]]></tag>
 <item>
 <p>
-Set <c>@prefix</c> in the dictionary file.
+Set <c>&dict_name;</c> or <c>&dict_prefix;</c> to the specified
+string.
 Overrides any setting in the file itself.</p>
 </item>
 
 <tag><![CDATA[--inherits <dict>]]></tag>
 <item>
 <p>
-Append an <c>@inherits</c> to the dictionary file.
-Specifying <c>'-'</c> as the dictionary has the effect of clearing
-any previous inherits, effectively ignoring previous inherits.</p>
+Append &dict_inherits; of the specified module.
+Specifying <c>"-"</c> has the effect of discarding clearing any
+previous inherits, both in the dictionary file and on the options
+list.</p>
 
 <p>
 Multiple <c>--inherits</c> options can be specified.</p>
@@ -130,20 +127,10 @@ Returns 0 on success, non-zero on failure.</p>
 <!-- ===================================================================== -->
 
 <section>
-<title>BUGS</title>
-
-<p>
-The identification of errors in the source file is poor.</p>
-
-</section>
-
-<!-- ===================================================================== -->
-
-<section>
 <title>SEE ALSO</title>
 
 <p>
-<seealso marker="diameter_dict">diameter_dict(4)</seealso></p>
+&man_make;, &man_dict;</p>
 
 </section>
 
diff --git a/lib/diameter/doc/src/diameter_dict.xml b/lib/diameter/doc/src/diameter_dict.xml
index cc638dbc18..8b0687a22e 100644
--- a/lib/diameter/doc/src/diameter_dict.xml
+++ b/lib/diameter/doc/src/diameter_dict.xml
@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "fileref.dtd">
+<!DOCTYPE erlref SYSTEM "fileref.dtd" [
+  <!ENTITY format
+           '<seealso marker="#FILE_FORMAT">FILE FORMAT</seealso>'>
+  <!ENTITY records
+           '<seealso marker="#MESSAGE_RECORDS">MESSAGE RECORDS</seealso>'>
+  <!ENTITY types
+           '<seealso marker="#DATA_TYPES">DATA TYPES</seealso>'>
+  <!ENTITY % also SYSTEM "seealso.ent" >
+  <!ENTITY % here SYSTEM "seehere.ent" >
+  %also;
+  %here;
+]>
 
 <fileref>
 <header>
 
 <copyright>
-<year>2011</year>
+<year>2011</year><year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -40,36 +51,33 @@ under the License.
 
 <description>
 <p>
-A diameter service as configured with <seealso
-marker="diameter#start_service">diameter:start_service/2</seealso>
+A diameter service, as configured with &mod_start_service;,
 specifies one or more supported Diameter applications.
 Each Diameter application specifies a dictionary module that knows how
 to encode and decode its messages and AVPs.
 The dictionary module is in turn generated from a file that defines
 these messages and AVPs.
-The format of such a file is defined in
-<seealso marker="#FILE_FORMAT">FILE FORMAT</seealso> below.
+The format of such a file is defined in &format; below.
 Users add support for their specific applications by creating
 dictionary files, compiling them to Erlang modules using
-<seealso marker="diameterc">diameterc</seealso> and configuring the
+either &man_compile; or &man_make; and configuring the
 resulting dictionaries modules on a service.</p>
 
 <p>
-The codec generation also results in a hrl file that defines records
-for the messages and grouped AVPs defined for the application, these
-records being what a user of the diameter application sends and receives.
-(Modulo other available formats as discussed in <seealso
-marker="diameter_app">diameter_app(3)</seealso>.)
+Dictionary module generation also results in a hrl file that defines
+records for the messages and Grouped AVPs defined by the
+dictionary, these records being what a user of the diameter
+application sends and receives, modulo other possible formats as
+discussed in &man_app;.
 These records and the underlying Erlang data types corresponding to
-Diameter data formats are discussed in <seealso
-marker="#MESSAGE_RECORDS">MESSAGE RECORDS</seealso> and <seealso
-marker="#DATA_TYPES">DATA TYPES</seealso> respectively.
-The generated hrl also contains defines for the possible values of
+Diameter data formats are discussed in &records; and &types;
+respectively.
+The generated hrl also contains macro definitions for the possible values of
 AVPs of type Enumerated.</p>
 
 <p>
 The diameter application includes three dictionary modules
-corresponding to applications defined in section 2.4 of RFC 3588:
+corresponding to applications defined in section 2.4 of &the_rfc;:
 <c>diameter_gen_base_rfc3588</c> for the Diameter Common Messages
 application with application identifier 0,
 <c>diameter_gen_accounting</c> for the Diameter Base Accounting
@@ -108,6 +116,8 @@ The order in which sections are specified is unimportant.</p>
 
 <taglist>
 
+<marker id="id"/>
+
 <tag><c>@id Number</c></tag>
 <item>
 <p>
@@ -125,12 +135,14 @@ is used to identify the relevant dictionary module.</p>
 <p>
 Example:</p>
 
-<code>
+<pre>
 @id 16777231
-</code>
+</pre>
 
 </item>
 
+<marker id="name"/>
+
 <tag><c>@name Mod</c></tag>
 <item>
 <p>
@@ -146,12 +158,14 @@ with existing modules in the system.</p>
 <p>
 Example:</p>
 
-<code>
+<pre>
 @name etsi_e2
-</code>
+</pre>
 
 </item>
 
+<marker id="prefix"/>
+
 <tag><c>@prefix Name</c></tag>
 <item>
 <p>
@@ -169,12 +183,14 @@ different Diameter applications.</p>
 <p>
 Example:</p>
 
-<code>
+<pre>
 @prefix etsi_e2
-</code>
+</pre>
 
 </item>
 
+<marker id="vendor"/>
+
 <tag><c>@vendor Number Name</c></tag>
 <item>
 <p>
@@ -189,12 +205,14 @@ The section has empty content.</p>
 <p>
 Example:</p>
 
-<code>
+<pre>
 @vendor 13019 ETSI
-</code>
+</pre>
 
 </item>
 
+<marker id="avp_vendor_id"/>
+
 <tag><c>@avp_vendor_id Number</c></tag>
 <item>
 <p>
@@ -205,16 +223,18 @@ The section content consists of AVP names.</p>
 <p>
 Example:</p>
 
-<code>
+<pre>
 @avp_vendor_id 2937
 
 WWW-Auth
 Domain-Index
 Region-Set
-</code>
+</pre>
 
 </item>
 
+<marker id="inherits"/>
+
 <tag><c>@inherits Mod</c></tag>
 <item>
 <p>
@@ -238,18 +258,20 @@ is equivalent to using <c>@avp_vendor_id</c> with a copy of the
 dictionary's definitions but the former makes for easier reuse.</p>
 
 <p>
-All dictionaries should typically inherit RFC3588 AVPs from
+All dictionaries should typically inherit &the_rfc; AVPs from
 <c>diameter_gen_base_rfc3588</c>.</p>
 
 <p>
 Example:</p>
 
-<code>
+<pre>
 @inherits diameter_gen_base_rfc3588
-</code>
+</pre>
 
 </item>
 
+<marker id="avp_types"/>
+
 <tag><c>@avp_types</c></tag>
 <item>
 <p>
@@ -260,7 +282,7 @@ The section consists of definitions of the form</p>
 
 <p>
 where Code is the integer AVP code, Type identifies an AVP Data Format
-as defined in <seealso marker="#DATA_TYPES">DATA TYPES</seealso> below,
+as defined in section &types; below,
 and Flags is a string of V, M and P characters indicating the flags to be
 set on an outgoing AVP or a single <c>'-'</c> (minus) character if
 none are to be set.</p>
@@ -268,20 +290,22 @@ none are to be set.</p>
 <p>
 Example:</p>
 
-<code>
+<pre>
 @avp_types
 
 Location-Information   350  Grouped     MV
 Requested-Information  353  Enumerated   V
-</code>
+</pre>
 
+<warning>
 <p>
-Note that the P flag has been deprecated by the Diameter Maintenance
-and Extensions Working Group of the IETF: diameter will set the P flag
-to 0 as mandated by the current draft standard.</p>
+The P flag has been deprecated by &the_rfc;.</p>
+</warning>
 
 </item>
 
+<marker id="custom_types"/>
+
 <tag><c>@custom_types Mod</c></tag>
 <item>
 <p>
@@ -296,13 +320,15 @@ encode/decode.</p>
 <p>
 Example:</p>
 
-<code>
+<pre>
 @custom_types rfc4005_avps
 
 Framed-IP-Address
-</code>
+</pre>
 </item>
 
+<marker id="codecs"/>
+
 <tag><c>@codecs Mod</c></tag>
 <item>
 <p>
@@ -313,22 +339,24 @@ Like <c>@custom_types</c> but requires the specified module to export
 <p>
 Example:</p>
 
-<code>
+<pre>
 @codecs rfc4005_avps
 
 Framed-IP-Address
-</code>
+</pre>
 </item>
 
+<marker id="messages"/>
+
 <tag><c>@messages</c></tag>
 <item>
 <p>
 Defines the messages of the application.
 The section content consists of definitions of the form specified in
-section 3.2 of RFC 3588, "Command Code ABNF specification".</p>
+section 3.2 of &the_rfc;, "Command Code Format Specification".</p>
 
 <!-- RFC 4740 RTR/RTA -->
-<code>
+<pre>
 @messages
 
 RTR ::= &lt; Diameter Header: 287, REQ, PXY >
@@ -361,35 +389,39 @@ RTA ::= &lt; Diameter Header: 287, PXY >
       * [ Proxy-Info ]
       * [ Route-Record ]
       * [ AVP ]
-</code>
+</pre>
 
 </item>
 
+<marker id="grouped"/>
+
 <tag><c>@grouped</c></tag>
 <item>
 <p>
 Defines the contents of the AVPs of the application having type
 Grouped.
 The section content consists of definitions of the form specified in
-section 4.4 of RFC 3588, "Grouped AVP Values".</p>
+section 4.4 of &the_rfc;, "Grouped AVP Values".</p>
 
 <p>
 Example:</p>
 
-<code>
+<pre>
 @grouped
 
 SIP-Deregistration-Reason ::= &lt; AVP Header: 383 >
                               { SIP-Reason-Code }
                               [ SIP-Reason-Info ]
                             * [ AVP ]
-</code>
+</pre>
 
 <p>
 Specifying a Vendor-Id in the definition of a grouped AVP is
 equivalent to specifying it with <c>@avp_vendor_id</c>.</p>
 </item>
 
+<marker id="enum"/>
+
 <tag><c>@enum Name</c></tag>
 <item>
 <p>
@@ -406,16 +438,18 @@ otherwise defined in another dictionary.</p>
 <p>
 Example:</p>
 
-<code>
+<pre>
 @enum SIP-Reason-Code
 
 PERMANENT_TERMINATION    0
 NEW_SIP_SERVER_ASSIGNED  1
 SIP_SERVER_CHANGE        2
 REMOVE_SIP_SERVER        3
-</code>
+</pre>
 </item>
 
+<marker id="end"/>
+
 <tag><c>@end</c></tag>
 <item>
 <p>
@@ -442,28 +476,28 @@ The hrl generated from a dictionary specification defines records for the
 messages and grouped AVPs defined in <c>@messages</c> and
 <c>@grouped</c> sections.
 For each message or grouped AVP definition, a record is defined whose
-name is the message or AVP name prefixed with any dictionary prefix
-defined with <c>@prefix</c> and whose fields are the names of the AVPs
+name is the message or AVP name, prefixed with any dictionary prefix
+defined with <c>@prefix</c>, and whose fields are the names of the AVPs
 contained in the message or grouped AVP in the order specified in the
 definition in question.
 For example, the grouped AVP</p>
 
-<code>
+<pre>
 SIP-Deregistration-Reason ::= &lt; AVP Header: 383 >
                               { SIP-Reason-Code }
                               [ SIP-Reason-Info ]
                             * [ AVP ]
-</code>
+</pre>
 
 <p>
 will result in the following record definition given an empty
 prefix.</p>
 
-<code>
+<pre>
 -record('SIP-Deregistration-Reason' {'SIP-Reason-Code',
                                      'SIP-Reason-Info',
                                      'AVP'}).
-</code>
+</pre>
 
 <p>
 The values encoded in the fields of generated records depends on the
@@ -471,7 +505,7 @@ type and number of times the AVP can occur.
 In particular, an AVP which is specified as occurring exactly once is
 encoded as a value of the AVP's type while an AVP with any other
 specification is encoded as a list of values of the AVP's type.
-The AVP's type is as specified in the AVP definition, the RFC 3588
+The AVP's type is as specified in the AVP definition, the &the_rfc;
 types being described below.</p>
 
 <marker id="DATA_TYPES"/>
@@ -484,13 +518,11 @@ types being described below.</p>
 
 <p>
 The data formats defined in sections 4.2 ("Basic AVP Data
-Formats") and 4.3 ("Derived AVP Data Formats") of RFC 3588 are encoded
+Formats") and 4.3 ("Derived AVP Data Formats") of &the_rfc; are encoded
 as values of the types defined here.
-Values are passed to <seealso
-marker="diameter#call">diameter:call/4</seealso>
+Values are passed to &mod_call;
 in a request record when sending a request, returned in a resulting
-answer record and passed to a <seealso
-marker="diameter_app#handle_request">handle_request</seealso>
+answer record and passed to a &app_handle_request;
 callback upon reception of an incoming request.</p>
 
 <p>
@@ -505,7 +537,7 @@ callback upon reception of an incoming request.</p>
 <marker id="Float64"/>
 <marker id="Grouped"/>
 
-<code>
+<pre>
 OctetString() = [0..255]
 Integer32()   = -2147483647..2147483647
 Integer64()   = -9223372036854775807..9223372036854775807
@@ -514,7 +546,7 @@ Unsigned64()  = 0..18446744073709551615
 Float32()     = '-infinity' | float() | infinity
 Float64()     = '-infinity' | float() | infinity
 Grouped()     = record()
-</code>
+</pre>
 
 <p>
 On encode, an OctetString() can be specified as an iolist(),
@@ -528,10 +560,10 @@ section.</p>
 <em>Derived AVP Data Formats</em></p>
 
 <marker id="Address"/>
-<code>
+<pre>
 Address() = OctetString()
           | tuple()
-</code>
+</pre>
 
 <p>
 On encode, an OctetString() IPv4 address is parsed in the usual
@@ -543,7 +575,7 @@ An IPv6 tuple() has length 8 and contains values of type 0..65535.
 The tuple representation is used on decode.</p>
 
 <marker id="Time"/>
-<code>
+<pre>
 Time() = {date(), time()}
 
 where
@@ -557,19 +589,19 @@ where
   Hour   = 0..23
   Minute = 0..59
   Second = 0..59
-</code>
+</pre>
 
 <p>
 Additionally, values that can be encoded are
-limited by way of their encoding as four octets as required by RFC
-3588 with the required extension from RFC 2030.
+limited by way of their encoding as four octets as required by
+&the_rfc; with the required extension from RFC 2030.
 In particular, only values between <c>{{1968,1,20},{3,14,8}}</c>
 and <c>{{2104,2,26},{9,42,23}}</c> (both inclusive) can be encoded.</p>
 
 <marker id="UTF8String"/>
-<code>
+<pre>
 UTF8String() = [integer()]
-</code>
+</pre>
 
 <p>
 List elements are the UTF-8 encodings of the individual characters
@@ -577,15 +609,15 @@ in the string.
 Invalid codepoints will result in encode/decode failure.</p>
 
 <marker id="DiameterIdentity"/>
-<code>
+<pre>
 DiameterIdentity() = OctetString()
-</code>
+</pre>
 
 <p>
 A value must have length at least 1.</p>
 
 <marker id="DiameterURI"/>
-<code>
+<pre>
 DiameterURI() = OctetString()
               | #diameter_URI{type = Type,
                               fqdn = FQDN,
@@ -600,19 +632,19 @@ where
   Port = integer()
   Transport = sctp | tcp
   Protocol  = diameter | radius | 'tacacs+'
-</code>
+</pre>
 
 <p>
 On encode, fields port, transport and protocol default to 3868, sctp
 and diameter respectively.
 The grammar of an OctetString-valued DiameterURI() is as specified in
-section 4.3 of RFC 3588.
+section 4.3 of &the_rfc;.
 The record representation is used on decode.</p>
 
 <marker id="Enumerated"/>
-<code>
+<pre>
 Enumerated() = Integer32()
-</code>
+</pre>
 
 <p>
 On encode, values can be specified using the macros defined in a
@@ -620,10 +652,10 @@ dictionary's hrl file.</p>
 
 <marker id="IPFilterRule"/>
 <marker id="QoSFilterRule"/>
-<code>
+<pre>
 IPFilterRule()  = OctetString()
 QoSFilterRule() = OctetString()
-</code>
+</pre>
 
 <p>
 Values of these types are not currently parsed by diameter.</p>
@@ -637,9 +669,7 @@ Values of these types are not currently parsed by diameter.</p>
 <title>SEE ALSO</title>
 
 <p>
-<seealso marker="diameterc">diameterc(1)</seealso>,
-<seealso marker="diameter">diameter(3)</seealso>,
-<seealso marker="diameter_app">diameter_app(3)</seealso></p>
+&man_compile;, &man_main;, &man_app;, &man_codec;, &man_make;</p>
 
 </section>
 
diff --git a/lib/diameter/doc/src/diameter_examples.xml b/lib/diameter/doc/src/diameter_examples.xml
index 966d1f1eee..1fd7755695 100644
--- a/lib/diameter/doc/src/diameter_examples.xml
+++ b/lib/diameter/doc/src/diameter_examples.xml
@@ -5,7 +5,7 @@
 <header>
 
 <copyright>
-<year>2011</year>
+<year>2011</year><year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 
@@ -37,7 +37,6 @@ under the License.
 <!-- ===================================================================== -->
 
 <p>
-To be written.
 Example code can be found in the diameter application's
 <c>examples</c> subdirectory.</p>
 
diff --git a/lib/diameter/doc/src/diameter_intro.xml b/lib/diameter/doc/src/diameter_intro.xml
index ef08002a8b..fd578ccf45 100644
--- a/lib/diameter/doc/src/diameter_intro.xml
+++ b/lib/diameter/doc/src/diameter_intro.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
+<!DOCTYPE chapter SYSTEM "chapter.dtd" [
+  <!ENTITY % also SYSTEM "seealso.ent">
+  %also;
+]>
 
 <chapter>
 <header>
 <copyright>
-<year>2011</year>
+<year>2011</year><year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 
@@ -35,7 +38,7 @@ under the License.
 
 <p>
 The diameter application is an implementation of the Diameter protocol
-as defined by RFC 3588.
+as defined by &the_rfc;.
 It supports arbitrary Diameter applications by way of a
 <em>dictionary</em> interface that allows messages and AVP's to be
 defined and input into diameter as configuration.
@@ -44,11 +47,11 @@ agent.
 This chapter provides a short overview of the application.</p>
 
 <p>
-A Diameter peer is implemented by configuring a <em>service</em> and
+A Diameter node is implemented by configuring a <em>service</em> and
 one or more <em>transports</em> using the interface module
 <seealso marker="diameter">diameter</seealso>.
 The service configuration defines the Diameter applications to be
-supported by the peer and, typically, the capabilities that it should
+supported by the node and, typically, the capabilities that it should
 send to remote peers at capabilities exchange upon the establishment
 of transport connections.
 A transport is configured on a service and provides protocol-specific
@@ -57,16 +60,17 @@ diameter and implemented by a transport module.
 The diameter application provides two transport modules: <seealso
 marker="diameter_tcp">diameter_tcp</seealso> and <seealso
 marker="diameter_sctp">diameter_sctp</seealso> for transport over TCP
-(using <c>gen_tcp</c>) and SCTP (using <c>gen_sctp</c>) respectively.
+(using <seealso marker="kernel:gen_tcp">gen_tcp</seealso>) and SCTP
+(using <seealso marker="kernel:gen_sctp">gen_sctp</seealso>) respectively.
 Other transports can be provided by any module that implements
 diameter's <seealso marker="diameter_transport">transport
 interface</seealso>.</p>
 
 <p>
-While a service typically implements a single Diameter peer (as
+While a service typically implements a single Diameter node (as
 identified by an Origin-Host AVP), transports can themselves be
-associated with capabilities AVP's so that a single service be used to
-implement more than one Diameter peer.</p>
+associated with capabilities AVP's so that a single service can be
+used to implement more than one Diameter node.</p>
 
 <p>
 Each Diameter application defined on a service is configured with a
@@ -76,19 +80,19 @@ diameter communicates the connectivity of remote peers, requests peer
 selection for outgoing requests, and communicates the reception of
 incoming Diameter request and answer messages.
 An application using diameter implements these application callback
-modules to provide the functionality of the Diameter peer(s) it
+modules to provide the functionality of the Diameter node(s) it
 implements.</p>
 
 <p>
-Each Diameter application is also configured with one or more
-dictionary modules
+Each Diameter application is also configured with a
+dictionary module
 that provide encode/decode functionality for outgoing/incoming
-Diameter messages.
-A module is generated from a <seealso
-marker="diameter_dict">specification file</seealso> using the <seealso
+Diameter messages belonging to the application.
+A dictionary module is generated from a <seealso
+marker="diameter_dict">dictionary file</seealso> using the <seealso
 marker="diameterc">diameterc</seealso> utility.
-Dictionaries for the RFC 3588 Diameter Common Messages, Base
-Accounting and Relay applications are provided by the diameter
+Dictionaries for the &the_rfc; Diameter Common Messages, Base
+Accounting and Relay applications are provided with the diameter
 application.</p>
 
 </chapter>
diff --git a/lib/diameter/doc/src/diameter_make.xml b/lib/diameter/doc/src/diameter_make.xml
new file mode 100644
index 0000000000..da6124310e
--- /dev/null
+++ b/lib/diameter/doc/src/diameter_make.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="latin1" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd" [
+  <!ENTITY filename
+  '<seealso marker="kernel:file#type-name">file:name()</seealso>'>
+  <!ENTITY dictionary
+  '<seealso marker="diameter_dict">dictionary file</seealso>'>
+  <!ENTITY % also SYSTEM "seealso.ent" >
+  <!ENTITY % here SYSTEM "seehere.ent" >
+  %also;
+  %here;
+]>
+
+<erlref>
+<header>
+<copyright>
+<year>2012</year>
+<holder>Ericsson AB. All Rights Reserved.</holder>
+</copyright>
+<legalnotice>
+The contents of this file are subject to the Erlang Public License,
+Version 1.1, (the "License"); you may not use this file except in
+compliance with the License. You should have received a copy of the
+Erlang Public License along with this software. If not, it can be
+retrieved online at http://www.erlang.org/.
+
+Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+the License for the specific language governing rights and limitations
+under the License.
+
+</legalnotice>
+
+<title>diameter_make(3)</title>
+<prepared>Anders Svensson</prepared>
+<responsible></responsible>
+<docno></docno>
+<approved></approved>
+<checked></checked>
+<date></date>
+<rev></rev>
+<file>diameter_make.xml</file>
+</header>
+
+<module>diameter_make</module>
+<modulesummary>Diameter dictionary compilation.</modulesummary>
+
+<description>
+
+<p>
+The function &codec; is used to compile a diameter
+&dictionary; into Erlang source.
+The resulting source implements the interface diameter required
+to encode and decode the dictionary's messages and AVP's.</p>
+
+<p>
+The utility &man_compile; provides an alternate compilation
+interface.</p>
+
+</description>
+
+<!-- ===================================================================== -->
+
+<funcs>
+
+<func>
+<name>codec(Path::string(), [Opt]) -> ok | {error, Reason}</name>
+<fsummary>Compile a dictionary file into Erlang source.</fsummary>
+<desc>
+
+<p>
+Compile a single dictionary file to Erlang source.
+<c>Opt</c> can have the following types.</p>
+
+<taglist>
+
+<tag><c>{include, Dir::string()}</c></tag>
+<item>
+<p>
+Prepend the specified directory to the code path.
+Use to point at beam files compiled from inherited dictionaries,
+<c>&dict_inherits;</c> in a dictionary file creating a beam
+dependency, not an erl/hrl dependency.</p>
+
+<p>
+Multiple <c>include</c> options can be specified.</p>
+</item>
+
+<tag><c>{outdir, Dir::string()}</c></tag>
+<item>
+<p>
+Write generated source to the specified directory.
+Defaults to the current working directory.</p>
+</item>
+
+<tag><c>{name|prefix, string()}</c></tag>
+<item>
+<p>
+Set <c>&dict_name;</c> or <c>&dict_prefix;</c> to the specified
+string.
+Overrides any setting in the file itself.</p>
+</item>
+
+<tag><c>{inherits, Mod::string()}</c></tag>
+<item>
+<p>
+Append &dict_inherits; of the specified module.
+Specifying <c>"-"</c> has the effect of discarding clearing any
+previous inherits, both in the dictionary file and on the options
+list.</p>
+
+<p>
+Multiple <c>inherits</c> options can be specified.</p>
+</item>
+
+</taglist>
+
+</desc>
+</func>
+
+</funcs>
+
+<!-- ===================================================================== -->
+
+<section>
+<title>BUGS</title>
+
+<p>
+All options are string-valued.
+In particular, it is not currently possible to
+an &dict_inherits; module as an atom() or a path as a &filename;</p>
+
+</section>
+
+<!-- ===================================================================== -->
+
+<section>
+<title>SEE ALSO</title>
+
+<p>
+&man_compile;, &man_dict;</p>
+
+</section>
+
+</erlref>
diff --git a/lib/diameter/doc/src/diameter_sctp.xml b/lib/diameter/doc/src/diameter_sctp.xml
index c1e839b8e1..5e3fd5eaf1 100644
--- a/lib/diameter/doc/src/diameter_sctp.xml
+++ b/lib/diameter/doc/src/diameter_sctp.xml
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
+<!DOCTYPE erlref SYSTEM "erlref.dtd" [
+  <!ENTITY gen_sctp '<seealso marker="kernel:gen_sctp">gen_sctp(3)</seealso>'>
+  <!ENTITY gen_sctp_open1
+  '<seealso marker="kernel:gen_sctp#open-1">gen_sctp:open/1</seealso>'>
+  <!ENTITY ip_address
+  '<seealso marker="kernel:inet#type-ip_address">inet:ip_address()</seealso>'>
+  <!ENTITY inet '<seealso marker="kernel:inet">inet(3)</seealso>'>
+  <!ENTITY % also SYSTEM "seealso.ent" >
+  <!ENTITY % here SYSTEM "seehere.ent" >
+  %also;
+  %here;
+]>
 
 <erlref>
 <header>
 <copyright>
-<year>2011</year>
+<year>2011</year><year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -38,12 +49,11 @@ under the License.
 <description>
 
 <p>
-This module implements diameter transport over SCTP using gen_sctp.
+This module implements diameter transport over SCTP using &gen_sctp;.
 It can be specified as the value of a transport_module option to
-<seealso
-marker="diameter#add_transport">diameter:add_transport/2</seealso>
+&mod_add_transport;
 and implements the behaviour documented in
-<seealso marker="diameter_transport">diameter_transport(3)</seealso>.</p>
+&man_transport;.</p>
 
 <marker id="start"/>
 </description>
@@ -58,29 +68,28 @@ and implements the behaviour documented in
 <fsummary>Start a transport process.</fsummary>
 <type>
 <v>Type = connect | accept</v>
-<v>Ref = reference()</v>
+<v>Ref = &mod_transport_ref;</v>
 <v>Svc = #diameter_service{}</v>
-<v>Opt = {raddr, ip_address()} | {rport, integer()} | term()</v>
+<v>Opt = {raddr, &ip_address;} | {rport, integer()} | term()</v>
 <v>Pid = pid()</v>
-<v>LAddr = ip_address()</v>
+<v>LAddr = &ip_address;</v>
 <v>Reason = term()</v>
 </type>
 <desc>
 
 <p>
-The start function required by <seealso
-marker="diameter_transport#start">diameter_transport(3)</seealso>.</p>
+The start function required by &man_transport;.</p>
 
 <p>
 The only diameter_sctp-specific argument is the options list.
 Options <c>raddr</c> and <c>rport</c> specify the remote address
 and port for a connecting transport and not valid for a listening
-transport.
-The former is required while latter defaults to 3868 if unspecified.
+transport: the former is required while latter defaults to 3868 if
+unspecified.
 More than one <c>raddr</c> option can be specified, in which case the
 connecting transport in question attempts each in sequence until
 an association is established.
-Remaining options are any accepted by gen_sctp:open/1, with the exception
+Remaining options are any accepted by &gen_sctp_open1;, with the exception
 of options <c>mode</c>, <c>binary</c>, <c>list</c>, <c>active</c>
 and <c>sctp_events</c>.
 Note that options <c>ip</c> and <c>port</c> specify the local address
@@ -88,30 +97,40 @@ and port respectively.</p>
 
 <p>
 Multiple <c>ip</c> options can be specified for a multihomed peer.
-If none are specified then the values of Host-IP-Address
-on the service are used. (In particular, one of these must be specified.)
+If none are specified then the values of <c>Host-IP-Address</c>
+in the <c>#diameter_service{}</c> record are used.
+(In particular, one of these must be specified.)
 Option <c>port</c> defaults to 3868 for a listening transport and 0 for a
 connecting transport.</p>
 
+<warning>
+<p>
+An insufficiently large receive buffer may result in a peer having to
+resend incoming messages: set the &inet; option <c>recbuf</c> to increase
+the buffer size.</p>
+
+<p>
+An insufficiently large send buffer may result in outgoing messages
+being discarded: set the &inet; option <c>sndbuf</c> to increase
+the buffer size.</p>
+</warning>
+
 <p>
 diameter_sctp uses the <c>transport_data</c> field of
-the <c>diameter_packet</c> record to communicate the stream on which an
+the <c>#diameter_packet{}</c> record to communicate the stream on which an
 inbound message has been received, or on which an outbound message
 should be sent: the value will be of the form <c>{stream, Id}</c>
-on an inbound message passed to a <seealso
-marker="diameter_app#handle_request">handle_request</seealso> or <seealso
-marker="diameter_app#handle_answer">handle_answer</seealso> callback.
-For an outbound message, either <c>undefined</c> (explicitly of
-by specifying the outbound message as a <c>binary()</c>) or a tuple
-should be set in the return value of <seealso
-marker="diameter_app#handle_request">handle_request</seealso>
+on an inbound message passed to a &app_handle_request; or
+&app_handle_answer; callback.
+For an outbound message, either <c>undefined</c> (explicitly or
+by receiving the outbound message as a <c>binary()</c>) or a tuple
+should be set in the return value of &app_handle_request;
 (typically by retaining the value passed into this function)
-or <seealso
-marker="diameter_app#prepare_request">prepare_request</seealso>.
-The value <c>undefined</c> uses a "next outbound stream" id and then
-increments this modulo the total number outbound streams. That
-is, successive values of <c>undefined</c> cycle through all outbound
-streams.</p>
+or &app_prepare_request;.
+The value <c>undefined</c> uses a "next outbound stream" id and
+increments this modulo the total number outbound streams.
+That is, successive values of <c>undefined</c> cycle through all
+outbound streams.</p>
 
 <!-- TODO: Some way of getting at the number of available outbound -->
 <!--       streams.                                                -->
@@ -128,7 +147,7 @@ streams.</p>
 <title>SEE ALSO</title>
 
 <p>
-<seealso marker="diameter_transport">diameter_transport(3)</seealso></p>
+&man_main;, &man_transport;, &gen_sctp;, &inet;</p>
 
 </section>
 
diff --git a/lib/diameter/doc/src/diameter_soc.xml b/lib/diameter/doc/src/diameter_soc.xml
index 6b9ef9f756..16f6b9d5bb 100644
--- a/lib/diameter/doc/src/diameter_soc.xml
+++ b/lib/diameter/doc/src/diameter_soc.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
+<!DOCTYPE chapter SYSTEM "chapter.dtd" [
+  <!ENTITY % also SYSTEM "seealso.ent" >
+  %also;
+]>
 
 <chapter>
 
 <header>
 <copyright>
 <year>2011</year>
+<year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 
@@ -41,38 +45,20 @@ Known points of questionable or non-compliance.</p>
 <!-- ===================================================================== -->
 
 <section>
-<title>RFC 3588</title>
+<title>&the_rfc;</title>
 
 <list>
 
 <item>
 <p>
-The End-to-End Security framework (section 2.9) isn't implemented
-since it is largely unspecified.
-The document that was to describe it
-(reference [AAACMS]) was abandoned in an uncompleted state several
-years ago and the current draft RFC deprecates the framework,
-including the P Flag in the AVP header.</p>
-</item>
-
-<item>
-<p>
-There is no TLS support over SCTP.
-RFC 3588 requires that a Diameter server support TLS but in
-practise this seems to mean TLS over SCTP since there are limitations
-with running over SCTP: see RFC 6083 (DTLS over SCTP), which is a
-response to RFC 3436 (TLS over SCTP).
-The current RFC 3588 draft acknowledges this by equating
-TLS with TLS/TCP and DTLS/SCTP but we do not yet support DTLS.</p>
+There is no support for DTLS over SCTP.</p>
 </item>
 
 <item>
 <p>
 There is no explicit support for peer discovery (section 5.2).
 It can possibly be implemented on top of diameter as is but this is
-probably something that diameter should do.
-The current draft deprecates portions of the original RFC's mechanisms
-however.</p>
+probably something that diameter should do.</p>
 </item>
 
 <item>
diff --git a/lib/diameter/doc/src/diameter_tcp.xml b/lib/diameter/doc/src/diameter_tcp.xml
index e6b53383c0..e3b8c733b7 100644
--- a/lib/diameter/doc/src/diameter_tcp.xml
+++ b/lib/diameter/doc/src/diameter_tcp.xml
@@ -1,10 +1,32 @@
 <?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
+<!DOCTYPE erlref SYSTEM "erlref.dtd" [
+  <!ENTITY gen_tcp_connect3
+  '<seealso marker="kernel:gen_tcp#connect-3">gen_tcp:connect/3</seealso>'>
+  <!ENTITY gen_tcp_listen2
+  '<seealso marker="kernel:gen_tcp#listen-2">gen_tcp:listen/2</seealso>'>
+  <!ENTITY ip_address
+  '<seealso marker="kernel:inet#type-ip_address">inet:ip_address()</seealso>'>
+  <!ENTITY ssl_connect2
+  '<seealso marker="ssl:ssl#connect-2">ssl:connect/2</seealso>'>
+  <!ENTITY ssl_connect3
+  '<seealso marker="ssl:ssl#connect-3">ssl:connect/3</seealso>'>
+  <!ENTITY ssl_accept2
+  '<seealso marker="ssl:ssl#ssl_accept-2">ssl:ssl_accept/2</seealso>'>
+  <!ENTITY ssl_listen2
+  '<seealso marker="ssl:ssl#listen-2">ssl:listen/2</seealso>'>
+  <!ENTITY gen_tcp '<seealso marker="kernel:gen_tcp">gen_tcp(3)</seealso>'>
+  <!ENTITY inet '<seealso marker="kernel:inet">inet(3)</seealso>'>
+  <!ENTITY ssl '<seealso marker="ssl:ssl">ssl(3)</seealso>'>
+  <!ENTITY % also SYSTEM "seealso.ent" >
+  <!ENTITY % here SYSTEM "seehere.ent" >
+  %also;
+  %here;
+]>
 
 <erlref>
 <header>
 <copyright>
-<year>2011</year>
+<year>2011</year><year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -38,14 +60,13 @@ under the License.
 <description>
 
 <p>
-This module implements diameter transport over TCP using gen_tcp.
-It can be specified as the value of a transport_module option to
-<seealso
-marker="diameter#add_transport">diameter:add_transport/2</seealso>
+This module implements diameter transport over TCP using &gen_tcp;.
+It can be specified as the value of a <c>transport_module</c> option to
+&mod_add_transport;
 and implements the behaviour documented in
-<seealso marker="diameter_transport">diameter_transport(3)</seealso>.
+&man_transport;.
 TLS security is supported, both as an upgrade following
-capabilities exchange as specified by RFC 3588 and
+capabilities exchange as specified by &the_rfc; and
 at connection establishment as in the current draft standard.</p>
 
 <p>
@@ -65,23 +86,22 @@ before configuring TLS capability on diameter transports.</p>
 <fsummary>Start a transport process.</fsummary>
 <type>
 <v>Type = connect | accept</v>
-<v>Ref = reference()</v>
+<v>Ref = &mod_transport_ref;</v>
 <v>Svc = #diameter_service{}</v>
-<v>Opt = OwnOpt | SslOpt | OtherOpt</v>
+<v>Opt = OwnOpt | SslOpt | TcpOpt</v>
 <v>Pid = pid()</v>
-<v>LAddr = ip_address()</v>
+<v>LAddr = &ip_address;</v>
 <v>Reason = term()</v>
-<v>OwnOpt = {raddr, ip_address()}
+<v>OwnOpt = {raddr, &ip_address;}
           | {rport, integer()}
           | {port, integer()}</v>
 <v>SslOpt = {ssl_options, true | list()}</v>
-<v>OtherOpt = term()</v>
+<v>TcpOpt = term()</v>
 </type>
 <desc>
 
 <p>
-The start function required by <seealso
-marker="diameter_transport#start">diameter_transport(3)</seealso>.</p>
+The start function required by &man_transport;.</p>
 
 <p>
 The only diameter_tcp-specific argument is the options list.
@@ -89,28 +109,29 @@ Options <c>raddr</c> and <c>rport</c> specify the remote address
 and port for a connecting transport and are not valid for a listening
 transport.
 Option <c>ssl_options</c> must be specified for a transport
-that must be able to support TLS: a value of <c>true</c> results in a
+that should support TLS: a value of <c>true</c> results in a
 TLS handshake immediately upon connection establishment while
-list() specifies options to be passed to ssl:connect/2 of ssl:ssl_accept/2
+<c>list()</c> specifies options to be passed to &ssl_connect2; or
+&ssl_accept2;
 after capabilities exchange if TLS is negotiated.
-Remaining options are any accepted by ssl:connect/3 or gen_tcp:connect/3 for
-a connecting transport, or ssl:listen/3 or gen_tcp:listen/2 for
+Remaining options are any accepted by &ssl_connect3; or
+&gen_tcp_connect3; for
+a connecting transport, or &ssl_listen2; or &gen_tcp_listen2; for
 a listening transport, depending on whether or not <c>{ssl_options, true}</c>
 has been specified.
-Options <c>binary</c>, <c>packet</c> and <c>active</c> cannot be specified.
+Options <c>binary</c>,
+<c>packet</c> and <c>active</c> cannot be specified.
 Also, option <c>port</c> can be specified for a listening transport
 to specify the local listening port, the default being the standardized
 3868 if unspecified.
-Note that option <c>ip</c> specifies the local address.</p>
+Note that the option <c>ip</c> specifies the local address.</p>
 
 <p>
 An <c>ssl_options</c> list must be specified if and only if
-the transport in question has specified an Inband-Security-Id
-AVP with value TLS on the relevant call to
-<seealso
-marker="diameter#start_service">start_service/2</seealso> or
-<seealso
-marker="diameter#add_transport">add_transport/2</seealso>,
+the transport in question has set <c>Inband-Security-Id</c> to
+1 (<c>TLS</c>), as
+specified to either &mod_start_service; or
+&mod_add_transport;,
 so that the transport process will receive notification of
 whether or not to commence with a TLS handshake following capabilities
 exchange.
@@ -122,9 +143,9 @@ that will not be forthcoming, which will eventually cause the RFC 3539
 watchdog to take down the connection.</p>
 
 <p>
-If the service specifies more than one Host-IP-Address and
-option <c>ip</c> is unspecified then then the
-first of the service's addresses is used as the local address.</p>
+If the <c>#diameter_service{}</c> record has more than one
+<c>Host-IP-Address</c> and option <c>ip</c> is unspecified then the
+first of the these addresses is used as the local address.</p>
 
 <p>
 The returned local address list has length one.</p>
@@ -141,8 +162,7 @@ The returned local address list has length one.</p>
 <title>SEE ALSO</title>
 
 <p>
-<seealso marker="diameter">diameter(3)</seealso>,
-<seealso marker="diameter_transport">diameter_transport(3)</seealso></p>
+&man_main;, &man_transport;, &gen_tcp;, &inet;, &ssl;</p>
 
 </section>
 
diff --git a/lib/diameter/doc/src/diameter_transport.xml b/lib/diameter/doc/src/diameter_transport.xml
index 087a90b099..55b531155f 100644
--- a/lib/diameter/doc/src/diameter_transport.xml
+++ b/lib/diameter/doc/src/diameter_transport.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
+<!DOCTYPE erlref SYSTEM "erlref.dtd" [
+  <!ENTITY message '<seealso marker="#message">message()</seealso>'>
+  <!ENTITY ip_address
+  '<seealso marker="kernel:inet#type-ip_address">inet:ip_address()</seealso>'>
+  <!ENTITY % also SYSTEM "seealso.ent" >
+  <!ENTITY % here SYSTEM "seehere.ent" >
+  %also;
+  %here;
+]>
 
 <erlref>
 <header>
 <copyright>
-<year>2011</year>
+<year>2011</year><year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -38,79 +46,116 @@ under the License.
 <description>
 
 <p>
-A module specified as a <c>transport_module</c> to <seealso
-marker="diameter#add_transport">diameter:add_transport/2</seealso>
+A module specified as a <c>transport_module</c> to &mod_add_transport;
 must implement the interface documented here.
 The interface consists of a function with which
 diameter starts a transport process and a message interface with which
 the transport process communicates with the process that starts it (aka its
 parent).</p>
 
-<marker id="start"/>
 </description>
 
 <!-- ===================================================================== -->
 
+<section>
+<title>DATA TYPES</title>
+
+<taglist>
+
+<marker id="message"/>
+
+<tag><c>message() = binary() | &codec_packet;</c></tag>
+<item>
+<p>
+A Diameter message as passed over the transport interface.</p>
+
+<p>
+For an inbound message from a transport process, a &codec_packet; must
+contain the received message in its <c>bin</c> field.
+In the case of an inbound request, any value set in the
+<c>transport_data</c> field will passed back to the transport module
+in the corresponding answer message, unless the sender supplies
+another value.</p>
+
+<p>
+For an outbound message to a transport process, a &codec_packet; has a
+value other than <c>undefined</c> in its <c>transport_data</c> field
+and has the binary() to send in its <c>bin</c> field.</p>
+</item>
+
+</taglist>
+
+</section>
+
+<!-- ===================================================================== -->
+
 <funcs>
 
 <func>
-<name>Mod:start({Type, Ref}, Svc, Opts)
-         -> {ok, Pid} | {ok, Pid, LAddrs} | {error, Reason}</name>
+<name>Mod:start({Type, Ref}, Svc, Config)
+         -> {ok, Pid}
+          | {ok, Pid, LAddrs}
+          | {error, Reason}</name>
 <fsummary>Start a transport process.</fsummary>
 <type>
 <v>Type = connect | accept</v>
-<v>Ref = reference()</v>
+<v>Ref = &mod_transport_ref;</v>
 <v>Svc = #diameter_service{}</v>
-<v>Opts = term()</v>
+<v>Config = term()</v>
 <v>Pid = pid()</v>
-<v>LAddrs = [ip_address()]</v>
+<v>LAddrs = [&ip_address;]</v>
 <v>Reason = term()</v>
 </type>
 <desc>
 <p>
 Start a transport process.
-Called by diameter as a consequence of a call to <seealso
-marker="diameter#add_transport">diameter:add_transport/2</seealso> in
+Called by diameter as a consequence of a call to &mod_add_transport; in
 order to establish or accept a transport connection respectively.
 A transport process maintains a connection with a single remote peer.</p>
 
 <p>
-The first argument indicates whether the transport process in question
-is being started for a connecting (<c>connect</c>) or listening
-(<c>accept</c>) transport.
+<c>Type</c> indicates whether the transport process in question
+is being started for a connecting (<c>Type=connect</c>) or listening
+(<c>Type=accept</c>) transport.
 In the latter case, transport processes are started as required to
-accept connections from multiple peers.
-Ref is in each case the same value that was returned from the
-call to <seealso
-marker="diameter#add_transport">diameter:add_transport/2</seealso>
+accept connections from multiple peers.</p>
+
+<p>
+Ref is the value that was returned from the call to &mod_add_transport;
 that has lead to starting of a transport process.</p>
 
 <p>
+<c>Svc</c> contains the capabilities passed to &mod_start_service; and
+&mod_add_transport;, values passed to the latter overriding those
+passed to the former.</p>
+
+<p>
+<c>Config</c> is as passed in <c>transport_config</c> tuple in the
+&mod_transport_opt; list passed to &mod_add_transport;.</p>
+
+<p>
+The start function should use the <c>Host-IP-Address</c> list and/or
+<c>Config</c> to select an appropriate list of local IP addresses,
+and should return this list if different from the
+<c>#diameter_service{}</c> addresses.
+The returned list is used to populate <c>Host-IP-Address</c> AVPs in
+outgoing capabilities exchange messages, the
+<c>#diameter_service{}</c> addresses being used otherwise.</p>
+
+<p>
 A transport process must implement the message interface documented below.
 It should retain the pid of its parent, monitor the parent and terminate if
 it dies.
 It should not link to the parent.
 It should exit if its transport connection with its peer is lost.</p>
 
-<p>
-Transport processes for a given service are started sequentially.</p>
-
-<p>
-The start function should use the 'Host-IP-Address' list on the service,
-namely <c>Svc#diameter_service.host_ip_address</c>, and/or
-<c>Opts</c> to select an appropriate list of local IP addresses,
-and should return this list if different from the service addresses.
-The returned list is used to populate 'Host-IP-Address' AVPs in outgoing
-capabilities exchange messages, the service addresses being used
-otherwise.</p>
-
-<marker id="MESSAGES"/>
 </desc>
 </func>
 
 </funcs>
 
 <!-- ===================================================================== -->
+<marker id="MESSAGES"/>
 
 <section>
 <title>MESSAGES</title>
@@ -120,27 +165,24 @@ All messages sent over the transport interface are of the
 form <c>{diameter, term()}</c>.</p>
 
 <p>
-A transport process can expect the following messages from
-diameter.</p>
+A transport process can expect messages of the following types from
+its parent.</p>
 
 <taglist>
 
-<tag><c>{diameter, {send, Packet}}</c></tag>
+<tag><c>{diameter, {send, &message;}}</c></tag>
 <item>
 <p>
-An outbound Diameter message.
-Packet can be either <c>binary()</c> (the message to be sent)
-or a <c>#diameter_packet{}</c> whose <c>transport_data</c> field
-containes a value other than undefined.</p>
+An outbound Diameter message.</p>
 </item>
 
 <tag><c>{diameter, {close, Pid}}</c></tag>
 <item>
 <p>
-A request to close the transport connection.
-The transport process should terminate after closing the
-connection.
-Pid is the pid() of the parent process.</p>
+A request to terminate the transport process after having received DPA
+in response to DPR.
+The transport process should exit.
+<c>Pid</c> is the pid() of the parent process.</p>
 </item>
 
 <tag><c>{diameter, {tls, Ref, Type, Bool}}</c></tag>
@@ -148,17 +190,17 @@ Pid is the pid() of the parent process.</p>
 <p>
 Indication of whether or not capabilities exchange has selected
 inband security using TLS.
-Ref is a reference() that must be included in the
+<c>Ref</c> is a reference() that must be included in the
 <c>{diameter, {tls, Ref}}</c> reply message to the transport's
 parent process (see below).
-Type is either <c>connect</c> or <c>accept</c> depending on
+<c>Type</c> is either <c>connect</c> or <c>accept</c> depending on
 whether the process has been started for a connecting or listening
 transport respectively.
-Bool is a boolean() indicating whether or not the transport connection
-should be upgraded to TLS.</p>
+<c>Bool</c> is a boolean() indicating whether or not the transport
+connection should be upgraded to TLS.</p>
 
 <p>
-If TLS is requested (Bool = true) then a connecting process should
+If TLS is requested (<c>Bool=true</c>) then a connecting process should
 initiate a TLS handshake with the peer and an accepting process should
 prepare to accept a handshake.
 A successful handshake should be followed by a <c>{diameter, {tls, Ref}}</c>
@@ -174,7 +216,7 @@ TLS.</p>
 </taglist>
 
 <p>
-A transport process should send the following messages
+A transport process should send messages of the following types
 to its parent.</p>
 
 <taglist>
@@ -182,41 +224,32 @@ to its parent.</p>
 <tag><c>{diameter, {self(), connected}}</c></tag>
 <item>
 <p>
-Inform the parent that the transport process with Type = accept has
+Inform the parent that the transport process with <c>Type=accept</c> has
 established a connection with the peer.
-Not sent if the transport process has Type = connect.</p>
+Not sent if the transport process has <c>Type=connect</c>.</p>
 </item>
 
 <tag><c>{diameter, {self(), connected, Remote}}</c></tag>
 <item>
 <p>
-Inform the parent that the transport process with Type = connect
+Inform the parent that the transport process with <c>Type=connect</c>
 has established a connection with a peer.
-Not sent if the transport process has Type = accept.
-Remote is an arbitrary term that uniquely identifies the remote
+Not sent if the transport process has <c>Type=accept</c>.
+<c>Remote</c> is an arbitrary term that uniquely identifies the remote
 endpoint to which the transport has connected.</p>
 </item>
 
-<tag><c>{diameter, {recv, Packet}}</c></tag>
+<tag><c>{diameter, {recv, &message;}}</c></tag>
 <item>
 <p>
-An inbound Diameter message.
-Packet can be either <c>binary()</c> (the message to be sent)
-or <c>#diameter_packet{}</c>
-whose <c>packet</c> field contains a <c>binary()</c>.
-Any value (other than undefined) set in
-the <c>transport_data</c> field will be passed back with a
-corresponding answer message in the case that the inbound message is a
-request unless the sender sets another value.
-How the <c>transport_data</c> is used/interpreted is up to the
-transport module.</p>
+An inbound Diameter message.</p>
 </item>
 
 <tag><c>{diameter, {tls, Ref}}</c></tag>
 <item>
 <p>
 Acknowledgment of a successful TLS handshake.
-Ref is the reference() received in the
+<c>Ref</c> is the reference() received in the
 <c>{diameter, {tls, Ref, Type, Bool}}</c> message in response
 to which the reply is sent.
 A transport must exit if a handshake is not successful.</p>
@@ -233,8 +266,7 @@ A transport must exit if a handshake is not successful.</p>
 <title>SEE ALSO</title>
 
 <p>
-<seealso marker="diameter_tcp">diameter_tcp(3)</seealso>,
-<seealso marker="diameter_sctp">diameter_sctp(3)</seealso></p>
+&man_tcp;, &man_sctp;</p>
 
 </section>
 
diff --git a/lib/diameter/doc/src/diameter_using.xml b/lib/diameter/doc/src/diameter_using.xml
index 809b76bdf3..7d9c0cd492 100644
--- a/lib/diameter/doc/src/diameter_using.xml
+++ b/lib/diameter/doc/src/diameter_using.xml
@@ -5,7 +5,7 @@
 
 <header>
 <copyright>
-<year>2011</year>
+<year>2011</year><year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 
@@ -23,7 +23,7 @@ under the License.
     
 </legalnotice>
 
-<title>Using the stack</title>
+<title>Usage</title>
 <prepared></prepared>
 <responsible></responsible>
 <docno></docno>
diff --git a/lib/diameter/doc/src/files.mk b/lib/diameter/doc/src/files.mk
index 79d53abceb..00ced3d91e 100644
--- a/lib/diameter/doc/src/files.mk
+++ b/lib/diameter/doc/src/files.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2011. All Rights Reserved.
+# Copyright Ericsson AB 2010-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -26,6 +26,8 @@ XML_REF1_FILES = \
 XML_REF3_FILES = \
 	diameter.xml \
 	diameter_app.xml \
+	diameter_codec.xml \
+	diameter_make.xml \
 	diameter_transport.xml \
 	diameter_tcp.xml \
 	diameter_sctp.xml
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 6e364a3200..d448b01eba 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
+<!DOCTYPE chapter SYSTEM "chapter.dtd" [
+  <!ENTITY % also SYSTEM "seealso.ent" >
+  <!ENTITY % here SYSTEM "seehere.ent" >
+  %also;
+  %here;
+]>
 
 <chapter>
 
 <header>
 <copyright>
 <year>2011</year>
+<year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -36,6 +42,290 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>Diameter 1.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix faulty handling of Origin-State-Id and faulty config
+	    values.</p>
+          <p>
+	    The former was expected in a list despite the
+	    documentation requiring (correctly) an integer. A bare
+	    value for a list-valued capability was not handled.</p>
+          <p>
+	    Own Id: OTP-10440</p>
+        </item>
+        <item>
+          <p>
+	    Fix timing of up/down events.</p>
+          <p>
+	    Previously, a call to diameter:call/4 following a peer_up
+	    callback might incorrectly return {error, no_connection},
+	    depending on timing. Both events now follow the
+	    corresponding callbacks.</p>
+          <p>
+	    Own Id: OTP-10459</p>
+        </item>
+        <item>
+          <p>
+	    Make diameter:service_info/2 usable in peer_up, peer_down
+	    and pick_peer callbacks.</p>
+          <p>
+	    Except for in pick_peer when {call_mutates_state, false},
+	    it would previously hang indefinitely.</p>
+          <p>
+	    Own Id: OTP-10460</p>
+        </item>
+        <item>
+          <p>
+	    Verify that End-to-End and Hop-by-Hop Identifiers in an
+	    incoming CEA/DPA match those sent in the corresponding
+	    CER/DPR.</p>
+          <p>
+	    The values were previously ignored. Answers whose
+	    identifiers do not match are handled as unexpected.</p>
+          <p>
+	    Own Id: OTP-10565</p>
+        </item>
+        <item>
+          <p>
+	    Fix formatting problems in PDF documentation.</p>
+          <p>
+	    In particular, text corresponding to links in HTML was
+	    omitted in preformatted blocks. There are still issues
+	    with indentation but this is not diameter-specific.</p>
+          <p>
+	    Own Id: OTP-10583</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Let prepare_request, prepare_retransmit and
+	    handle_request callbacks return a function to be invoked
+	    on outgoing messages after encode.</p>
+          <p>
+	    This allows encoded messages to be logged for example.</p>
+          <p>
+	    Own Id: OTP-10441</p>
+        </item>
+        <item>
+          <p>
+	    Add service_opt() 'restrict_connections' to allow
+	    multiple transport connections with the same peer.</p>
+          <p>
+	    Own Id: OTP-10443</p>
+        </item>
+        <item>
+          <p>
+	    Add service_opt() 'sequence' to allow the masking of a
+	    constant onto the topmost bits of End-to-End and
+	    Hop-by-Hop identifiers.</p>
+          <p>
+	    This allows the same service on different nodes to use
+	    distinct values in outgoing request messages.</p>
+          <p>
+	    Own Id: OTP-10445</p>
+        </item>
+        <item>
+          <p>
+	    Add diameter:service_info(PeerRef) to return the
+	    transport_ref() and transport_opt() list of the
+	    corresponding transport.</p>
+          <p>
+	    This allows easy access to these from diameter_app
+	    callbacks that only get peer_ref() as an argument.</p>
+          <p>
+	    Own Id: OTP-10470</p>
+        </item>
+        <item>
+          <p>
+	    Add reference pages diameter_codec(3) and
+	    diameter_make(3).</p>
+          <p>
+	    Own Id: OTP-10471</p>
+        </item>
+        <item>
+          <p>
+	    Add events for service start and stop.</p>
+          <p>
+	    Own Id: OTP-10492</p>
+        </item>
+        <item>
+          <p>
+	    Add transport_opt() 'disconnect_cb' to make the sending
+	    of DPR configurable.</p>
+          <p>
+	    Whether or not DPR should be sent at application stop,
+	    service stop or transport removal is determined by the
+	    value returned by the callback, as is the
+	    Disconnect-Cause and timeout if DPA is not received.</p>
+          <p>
+	    Own Id: OTP-10493</p>
+        </item>
+        <item>
+          <p>
+	    Add transport_opt() 'capx_timeout' for the timeout
+	    associated with non-reception of CER/CEA.</p>
+          <p>
+	    Own Id: OTP-10554</p>
+        </item>
+        <item>
+          <p>
+	    Allow a handle_request callback to return a
+	    #diameter_packet{}.</p>
+          <p>
+	    This allows an answer to set transport_data and header
+	    fields.</p>
+          <p>
+	    Own Id: OTP-10566</p>
+        </item>
+        <item>
+          <p>
+	    Update documentation for RFC 6733.</p>
+          <p>
+	    RFC 3588 is now obsolete.</p>
+          <p>
+	    Own Id: OTP-10568</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Diameter 1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix broken Result-Code setting and Destination-Host/Realm
+	    extraction.</p>
+          <p>
+	    Result-Code was assumed to have arity 1 when setting this
+	    value in an answer to a request containing AVP decode
+	    errors. Destination-Host/Realm were only correctly
+	    extracted from messages in the common application.</p>
+          <p>
+	    Own Id: OTP-10202</p>
+        </item>
+        <item>
+          <p>
+	    Handle insufficient capabilities configuration more
+	    gracefully.</p>
+          <p>
+	    A transport that does not have sufficient capabilities
+	    configuration in order to encode CER/CEA will now emit an
+	    error report noting the configuration error and exit
+	    instead of failing. The error is not detected at
+	    diameter:add_transport/2 since there is no requirement
+	    that a service be configured before its transports.</p>
+          <p>
+	    Own Id: OTP-10203</p>
+        </item>
+        <item>
+          <p>
+	    Ensure a failing peer_up/down callback does not affect
+	    transport connections to other peers.</p>
+          <p>
+	    Such a failure would previously have taken down all of a
+	    service's connections.</p>
+          <p>
+	    Own Id: OTP-10215</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Statistics related to Diameter messages can be retrieved
+	    using diameter:service_info/2.</p>
+          <p>
+	    Both Diameter and socket-level statistics are available,
+	    for both incoming and outgoing messages.</p>
+          <p>
+	    Own Id: OTP-9608</p>
+        </item>
+        <item>
+          <p>
+	    Allow multiple transport_module/config to
+	    diameter:add_transport/2.</p>
+          <p>
+	    Multiple values are attempted in sequence until one
+	    results in an established connection. This provides a way
+	    for a connecting transport to specify configuration in
+	    order of preference. (For example, SCTP before TCP.)</p>
+          <p>
+	    Own Id: OTP-9885</p>
+        </item>
+        <item>
+          <p>
+	    Add events for state transitions in the RFC 3539 watchdog
+	    state machine.</p>
+          <p>
+	    The watchdog state is also available through
+	    diameter:service_info/2.</p>
+          <p>
+	    Own Id: OTP-10212</p>
+        </item>
+        <item>
+          <p>
+	    Add diameter:service_info(SvcName, connections).</p>
+          <p>
+	    This provides an alternative to
+	    diameter:service_info(SvcName, transport) that presents
+	    information per established connection instead of per
+	    transport reference.</p>
+          <p>
+	    Own Id: OTP-10213</p>
+        </item>
+        <item>
+          <p>
+	    Assorted documentation corrections/improvements.</p>
+          <p>
+	    Own Id: OTP-10216</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Diameter 1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix fault in sending of 'closed' events.</p>
+          <p>
+	    The fault made it possible for the 'closed' event not to
+	    be sent following a failed capabilities exchange.</p>
+          <p>
+	    Own Id: OTP-9824</p>
+        </item>
+        <item>
+          <p>
+	    Fix faulty diameterc -name/-prefix.</p>
+          <p>
+	    A minor blunder when introducing the new dictionary
+	    parser in diameter-1.0 broke these options.</p>
+          <p>
+	    Own Id: OTP-9826</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Diameter 1.0</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -295,8 +585,7 @@ Known issues or limitations:</p>
 Some agent-related functionality is not entirely complete.
 In particular, support for proxy agents, that advertise specific
 Diameter applications but otherwise relay messages in much the same
-way as relay agents (for which a <seealso
-marker="diameter_app#handle_request">handle_request/3</seealso>
+way as relay agents (for which a handle_request
 callback can return a <c>relay</c> tuple), will be completed in an
 upcoming release.
 There may also be more explicit support for redirect agents, although
@@ -328,8 +617,7 @@ could likely be expanded upon.</p>
 
 <item>
 <p>
-The function <seealso
-marker="diameter#service_info">diameter:service_info/2</seealso>
+The function diameter:service_info/2
 can be used to retrieve information about a started service
 (statistics, information about connected peers, etc) but
 this is not yet documented and both the input and output may change
diff --git a/lib/diameter/doc/src/ref_man.xml b/lib/diameter/doc/src/ref_man.xml
index 137ce79094..4b99fe716d 100644
--- a/lib/diameter/doc/src/ref_man.xml
+++ b/lib/diameter/doc/src/ref_man.xml
@@ -6,6 +6,7 @@
 <header>
 <copyright>
 <year>2011</year>
+<year>2012</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -40,7 +41,9 @@ applications on top of the Diameter protocol. </p>
 <xi:include href="diameter.xml"/>
 <xi:include href="diameter_compile.xml"/>
 <xi:include href="diameter_app.xml"/>
+<xi:include href="diameter_codec.xml"/>
 <xi:include href="diameter_dict.xml"/>
+<xi:include href="diameter_make.xml"/>
 <xi:include href="diameter_transport.xml"/>
 <xi:include href="diameter_tcp.xml"/>
 <xi:include href="diameter_sctp.xml"/>
diff --git a/lib/diameter/doc/src/seealso.ent b/lib/diameter/doc/src/seealso.ent
new file mode 100644
index 0000000000..4647c42f85
--- /dev/null
+++ b/lib/diameter/doc/src/seealso.ent
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+
+<!--
+
+%CopyrightBegin%
+
+Copyright Ericsson AB 2012. All Rights Reserved.
+
+The contents of this file are subject to the Erlang Public License,
+Version 1.1, (the "License"); you may not use this file except in
+compliance with the License. You should have received a copy of the
+Erlang Public License along with this software. If not, it can be
+retrieved online at http://www.erlang.org/.
+
+Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+the License for the specific language governing rights and limitations
+under the License.
+
+%CopyrightEnd%
+
+-->
+
+<!--
+
+Entities for cross references: less to type, easier to read and
+less error prone.
+
+Additional intra-document entities are generated by seehere.sed.
+That each definition is on a single (hideously long) line is
+significant.
+
+-->
+
+<!ENTITY the_rfc 'RFC 6733'>
+
+<!-- diameter -->
+
+<!ENTITY mod_add_transport '<seealso marker="diameter#add_transport-2">diameter:add_transport/2</seealso>'>
+<!ENTITY mod_call '<seealso marker="diameter#call-4">diameter:call/4</seealso>'>
+<!ENTITY mod_origin_state_id '<seealso marker="diameter#origin_state_id-0">diameter:origin_state_id/0</seealso>'>
+<!ENTITY mod_remove_transport '<seealso marker="diameter#remove_transport-2">diameter:remove_transport/2</seealso>'>
+<!ENTITY mod_service_info '<seealso marker="diameter#service_info-2">diameter:service_info/2</seealso>'>
+<!ENTITY mod_services  '<seealso marker="diameter#services-0">diameter:services/0</seealso>'>
+<!ENTITY mod_start_service '<seealso marker="diameter#start_service-2">diameter:start_service/2</seealso>'>
+<!ENTITY mod_stop_service '<seealso marker="diameter#stop_service-1">diameter:stop_service/1</seealso>'>
+<!ENTITY mod_subscribe '<seealso marker="diameter#subscribe-1">diameter:subscribe/1</seealso>'>
+
+<!ENTITY mod_application_alias '<seealso marker="diameter#application_alias">diameter:application_alias()</seealso>'>
+<!ENTITY mod_application_module '<seealso marker="diameter#application_module">diameter:application_module()</seealso>'>
+<!ENTITY mod_application_opt '<seealso marker="diameter#application_opt">diameter:application_opt()</seealso>'>
+<!ENTITY mod_call_opt '<seealso marker="diameter#call_opt">diameter:call_opt()</seealso>'>
+<!ENTITY mod_capability '<seealso marker="diameter#capability">diameter:capability()</seealso>'>
+<!ENTITY mod_evaluable '<seealso marker="diameter#evaluable">diameter:evaluable()</seealso>'>
+<!ENTITY mod_peer_filter '<seealso marker="diameter#peer_filter">diameter:peer_filter()</seealso>'>
+<!ENTITY mod_service_event '<seealso marker="diameter#service_event">diameter:service_event()</seealso>'>
+<!ENTITY mod_service_name '<seealso marker="diameter#service_name">diameter:service_name()</seealso>'>
+<!ENTITY mod_service_opt '<seealso marker="diameter#service_opt">diameter:service_opt()</seealso>'>
+<!ENTITY mod_transport_opt '<seealso marker="diameter#transport_opt">diameter:transport_opt()</seealso>'>
+<!ENTITY mod_transport_ref '<seealso marker="diameter#transport_ref">diameter:transport_ref()</seealso>'>
+
+<!ENTITY capabilities_cb '<seealso marker="#capabilities_cb">capabilities_cb</seealso>'>
+<!ENTITY capx_timeout '<seealso marker="#capx_timeout">capx_timeout</seealso>'>
+<!ENTITY disconnect_cb '<seealso marker="#disconnect_cb">disconnect_cb</seealso>'>
+<!ENTITY transport_config '<seealso marker="#transport_config">transport_config</seealso>'>
+<!ENTITY transport_module '<seealso marker="#transport_module">transport_module</seealso>'>
+<!ENTITY reconnect_timer '<seealso marker="#reconnect_timer">reconnect_timer</seealso>'>
+<!ENTITY watchdog_timer '<seealso marker="#watchdog_timer">watchdog_timer</seealso>'>
+
+<!-- diameter_app -->
+
+<!ENTITY app_handle_answer '<seealso marker="diameter_app#Mod:handle_answer-4">handle_answer/4</seealso>'>
+<!ENTITY app_handle_request '<seealso marker="diameter_app#Mod:handle_request-3">handle_request/3</seealso>'>
+<!ENTITY app_handle_error '<seealso marker="diameter_app#Mod:handle_error-4">handle_error/4</seealso>'>
+<!ENTITY app_peer_down '<seealso marker="diameter_app#Mod:peer_down-3">peer_up/3</seealso>'>
+<!ENTITY app_peer_up '<seealso marker="diameter_app#Mod:peer_up-3">peer_up/3</seealso>'>
+<!ENTITY app_pick_peer '<seealso marker="diameter_app#Mod:pick_peer-4">pick_peer/4</seealso>'>
+<!ENTITY app_prepare_retransmit '<seealso marker="diameter_app#Mod:prepare_retransmit-3">prepare_retransmit/3</seealso>'>
+<!ENTITY app_prepare_request '<seealso marker="diameter_app#Mod:prepare_request-3">prepare_request/3</seealso>'>
+
+<!ENTITY app_capabilities '<seealso marker="diameter_app#capabilities">diameter_app:capabilities()</seealso>'>
+<!ENTITY app_peer '<seealso marker="diameter_app#peer">diameter_app:peer()</seealso>'>
+<!ENTITY app_peer_ref '<seealso marker="diameter_app#peer_ref">diameter_app:peer_ref()</seealso>'>
+<!ENTITY app_state '<seealso marker="diameter_app#state">diameter_app:state()</seealso>'>
+
+<!-- diameter_codec -->
+
+<!ENTITY codec_encode '<seealso marker="diameter_codec#encode-2">diameter_codec:encode/2</seealso>'>
+<!ENTITY codec_decode '<seealso marker="diameter_codec#decode-2">diameter_codec:decode/2</seealso>'>
+
+<!ENTITY codec_avp '<seealso marker="diameter_codec#avp">diameter_codec:avp()</seealso>'>
+<!ENTITY codec_header '<seealso marker="diameter_codec#header">diameter_codec:header()</seealso>'>
+<!ENTITY codec_dictionary '<seealso marker="diameter_codec#dictionary">diameter_codec:dictionary()</seealso>'>
+<!ENTITY codec_message '<seealso marker="diameter_codec#message">diameter_codec:message()</seealso>'>
+<!ENTITY codec_packet '<seealso marker="diameter_codec#packet">diameter_codec:packet()</seealso>'>
+
+<!-- diameter_dict -->
+
+<!ENTITY dict_data_types '<seealso marker="diameter_dict#DATA_TYPES">diameter_dict(4)</seealso>'>
+
+<!ENTITY dict_Address '<seealso marker="diameter_dict#DATA_TYPES">Address()</seealso>'>
+<!ENTITY dict_DiameterIdentity '<seealso marker="diameter_dict#DATA_TYPES">DiameterIdentity()</seealso>'>
+<!ENTITY dict_Grouped '<seealso marker="diameter_dict#DATA_TYPES">Grouped()</seealso>'>
+<!ENTITY dict_OctetString '<seealso marker="diameter_dict#DATA_TYPES">OctetString()</seealso>'>
+<!ENTITY dict_Time '<seealso marker="diameter_dict#DATA_TYPES">Time()</seealso>'>
+<!ENTITY dict_UTF8String '<seealso marker="diameter_dict#DATA_TYPES">UTF8String()</seealso>'>
+<!ENTITY dict_Unsigned32 '<seealso marker="diameter_dict#DATA_TYPES">Unsigned32()</seealso>'>
+
+<!ENTITY dict_name '<seealso marker="diameter_dict#name">@name</seealso>'>
+<!ENTITY dict_prefix '<seealso marker="diameter_dict#prefix">@prefix</seealso>'>
+<!ENTITY dict_inherits '<seealso marker="diameter_dict#inherits">@inherits</seealso>'>
+
+<!-- diameter_make -->
+
+<!ENTITY make_codec '<seealso marker="diameter_make#codec-2">diameter_make:codec/2</seealso>'>
+
+<!-- diameter_transport -->
+
+<!ENTITY transport_start
+ '<seealso marker="diameter_transport#Mod:start-3">start/3</seealso>'>
+
+<!-- reference pages -->
+
+<!ENTITY man_compile '<seealso marker="diameterc">diameterc(1)</seealso>'>
+<!ENTITY man_main '<seealso marker="diameter">diameter(3)</seealso>'>
+<!ENTITY man_app '<seealso marker="diameter_app">diameter_app(3)</seealso>'>
+<!ENTITY man_codec '<seealso marker="diameter_codec">diameter_codec(3)</seealso>'>
+<!ENTITY man_dict '<seealso marker="diameter_dict">diameter_dict(4)</seealso>'>
+<!ENTITY man_make '<seealso marker="diameter_make">diameter_make(3)</seealso>'>
+<!ENTITY man_transport '<seealso marker="diameter_transport">diameter_transport(3)</seealso>'>
+<!ENTITY man_sctp '<seealso marker="diameter_sctp">diameter_sctp(3)</seealso>'>
+<!ENTITY man_tcp  '<seealso marker="diameter_tcp">diameter_tcp(3)</seealso>'>
diff --git a/lib/diameter/doc/src/seehere.sed b/lib/diameter/doc/src/seehere.sed
new file mode 100644
index 0000000000..c62a783d40
--- /dev/null
+++ b/lib/diameter/doc/src/seehere.sed
@@ -0,0 +1,35 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2012. All Rights Reserved.
+#
+# The contents of this file are subject to the Erlang Public License,
+# Version 1.1, (the "License"); you may not use this file except in
+# compliance with the License. You should have received a copy of the
+# Erlang Public License along with this software. If not, it can be
+# retrieved online at http://www.erlang.org/.
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and limitations
+# under the License.
+#
+# %CopyrightEnd%
+
+#
+# Map entities for inter-document references to ones for
+# intra-document references like this:
+#
+#   <!ENTITY aaa_xxx '<seealso marker="bbb#yyy">ccc:zzz</seealso>'>
+#
+#   ===>
+#
+#   <!ENTITY xxx '<seealso marker="#yyy">zzz</seealso>'>
+#
+
+/<!ENTITY/!d
+/#/!d
+/"#/d
+s@ [^_]*_@ @
+s@"[^#]*#@"#@
+s@>[^:]*:@>@
diff --git a/lib/diameter/doc/standard/draft-ietf-dime-capablities-update-07.txt b/lib/diameter/doc/standard/draft-ietf-dime-capablities-update-07.txt
deleted file mode 100644
index bb7ec2d08c..0000000000
--- a/lib/diameter/doc/standard/draft-ietf-dime-capablities-update-07.txt
+++ /dev/null
@@ -1,392 +0,0 @@
-

-

-

-Network Working Group                                            K. Jiao

-Internet-Draft                                                    Huawei

-Intended status: Standards Track                                 G. Zorn

-Expires: April 27, 2011                                      Network Zen

-                                                        October 24, 2010

-

-

-              The Diameter Capabilities Update Application

-                 draft-ietf-dime-capablities-update-07

-

-Abstract

-

-   This document defines a new Diameter application and associated

-   command codes.  The Capabilities Update application is intended to

-   allow the dynamic update of certain Diameter peer capabilities while

-   the peer-to-peer connection is in the open state.

-

-Status of this Memo

-

-   This Internet-Draft is submitted in full conformance with the

-   provisions of BCP 78 and BCP 79.

-

-   Internet-Drafts are working documents of the Internet Engineering

-   Task Force (IETF).  Note that other groups may also distribute

-   working documents as Internet-Drafts.  The list of current Internet-

-   Drafts is at http://datatracker.ietf.org/drafts/current/.

-

-   Internet-Drafts are draft documents valid for a maximum of six months

-   and may be updated, replaced, or obsoleted by other documents at any

-   time.  It is inappropriate to use Internet-Drafts as reference

-   material or to cite them other than as "work in progress."

-

-   This Internet-Draft will expire on April 27, 2011.

-

-Copyright Notice

-

-   Copyright (c) 2010 IETF Trust and the persons identified as the

-   document authors.  All rights reserved.

-

-   This document is subject to BCP 78 and the IETF Trust's Legal

-   Provisions Relating to IETF Documents

-   (http://trustee.ietf.org/license-info) in effect on the date of

-   publication of this document.  Please review these documents

-   carefully, as they describe your rights and restrictions with respect

-   to this document.  Code Components extracted from this document must

-   include Simplified BSD License text as described in Section 4.e of

-   the Trust Legal Provisions and are provided without warranty as

-   described in the Simplified BSD License.

-

-

-

-Jiao & Zorn              Expires April 27, 2011                 [Page 1]

-

-Internet-Draft        Diameter Capabilities Update          October 2010

-

-

-Table of Contents

-

-   1.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . . . 3

-   2.  Specification of Requirements . . . . . . . . . . . . . . . . . 3

-   3.  Diameter Protocol Considerations  . . . . . . . . . . . . . . . 3

-   4.  Capabilities Update . . . . . . . . . . . . . . . . . . . . . . 3

-     4.1.  Command-Code Values . . . . . . . . . . . . . . . . . . . . 4

-       4.1.1.  Capabilities-Update-Request . . . . . . . . . . . . . . 5

-       4.1.2.  Capabilities-Update-Answer  . . . . . . . . . . . . . . 5

-   5.  Security Considerations . . . . . . . . . . . . . . . . . . . . 6

-   6.  IANA Considerations . . . . . . . . . . . . . . . . . . . . . . 6

-     6.1.  Application Identifier  . . . . . . . . . . . . . . . . . . 6

-     6.2.  Command Codes . . . . . . . . . . . . . . . . . . . . . . . 6

-   7.  Contributors  . . . . . . . . . . . . . . . . . . . . . . . . . 6

-   8.  Acknowledgements  . . . . . . . . . . . . . . . . . . . . . . . 6

-   9.  References  . . . . . . . . . . . . . . . . . . . . . . . . . . 6

-     9.1.  Normative References  . . . . . . . . . . . . . . . . . . . 6

-     9.2.  Informative References  . . . . . . . . . . . . . . . . . . 7

-   Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . . . 7

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-Jiao & Zorn              Expires April 27, 2011                 [Page 2]

-

-Internet-Draft        Diameter Capabilities Update          October 2010

-

-

-1.  Introduction

-

-   Capabilities exchange is an important component of the Diameter Base

-   Protocol [I-D.ietf-dime-rfc3588bis], allowing peers to exchange

-   identities and Diameter capabilities (protocol version number,

-   supported Diameter applications, security mechanisms, etc.).  As

-   defined in RFC 3588, however, the capabilities exchange process takes

-   place only once, at the inception of a transport connection between a

-   given pair of peers.  Therefore, if a peer's capabilities change (due

-   to software update, for example), the existing connection(s) must be

-   torn down (along with all of the associated user sessions) and

-   restarted before the modified capabilities can be advertised.

-

-   This document defines a new Diameter application intended to allow

-   the dynamic update of a subset of Diameter peer capabilities over an

-   existing connection.  Because the Capabilities Update application

-   specified herein operates over an existing transport connection,

-   modification of certain capabilities is prohibited.  Specifically,

-   modifying the security mechanism in use is not allowed; if the

-   security method used between a pair of peers is changed the affected

-   connection MUST be restarted.

-

-

-2.  Specification of Requirements

-

-   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",

-   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this

-   document are to be interpreted as described in RFC 2119 [RFC2119].

-

-

-3.  Diameter Protocol Considerations

-

-   This section details the relationship of the Diameter Capabilities

-   Update application to the Diameter Base Protocol.

-

-   This document specifies Diameter Application-ID <TBD1>.  Diameter

-   nodes conforming to this specification MUST advertise support by

-   including the value <TBD1> in the Auth-Application-Id of the

-   Capabilities-Exchange-Request (CER) and Capabilities-Exchange-Answer

-   (CEA) commands [I-D.ietf-dime-rfc3588bis].

-

-

-4.  Capabilities Update

-

-   When the capabilities of a Diameter node conforming to this

-   specification change, it MUST notify all of the nodes with which it

-   has an open transport connection and which have also advertised

-   support for the Capabilities Update application using the

-

-

-

-Jiao & Zorn              Expires April 27, 2011                 [Page 3]

-

-Internet-Draft        Diameter Capabilities Update          October 2010

-

-

-   Capabilities-Update-Request (CUR) message (Section 4.1.1).  This

-   message allows the update of a peer's capabilities (supported

-   Diameter applications, etc.).

-

-   A Diameter node only issues a given command to those peers that have

-   advertised support for the Diameter application that defines the

-   command; a Diameter node must cache the supported applications in

-   order to ensure that unrecognized commands and/or Attribute-Value

-   Pairs (AVPs) are not unnecessarily sent to a peer.

-

-   The receiver of the CUR MUST determine common applications by

-   computing the intersection of its own set of supported Application Id

-   against all of the application identifier AVPs (Auth-Application-Id,

-   Acct-Application-Id and Vendor-Specific- Application-Id) present in

-   the CUR.  The value of the Vendor-Id AVP in the Vendor-Specific-

-   Application-Id MUST NOT be used during computation.

-

-   If the receiver of a CUR does not have any applications in common

-   with the sender then it MUST return a Capabilities-Update-Answer

-   (CUA) (Section 4.1.2) with the Result-Code AVP set to

-   DIAMETER_NO_COMMON_APPLICATION [I-D.ietf-dime-rfc3588bis], and SHOULD

-   disconnect the transport layer connection; however, if active

-   sessions are using the connection, peers MAY delay disconnection

-   until the sessions can be redirected or gracefully terminated.  Note

-   that receiving a CUA from a peer advertising itself as a Relay (see

-   [I-D.ietf-dime-rfc3588bis], Section 2.4) MUST be interpreted as

-   having common applications with the peer.

-

-   As for CER/CEA messages, the CUR and CUA messages MUST NOT be

-   proxied, redirected or relayed.

-

-   Even though the CUR/CUA messages cannot be proxied, it is still

-   possible for an upstream agent to receive a message for which there

-   are no peers available to handle the application that corresponds to

-   the Command-Code.  This could happen if, for example, the peers are

-   too busy or down.  In such instances, the 'E' bit MUST be set in the

-   answer message with the Result-Code AVP set to

-   DIAMETER_UNABLE_TO_DELIVER to inform the downstream peer to take

-   action (e.g., re-routing requests to an alternate peer).

-

-4.1.  Command-Code Values

-

-   This section defines Command-Code [I-D.ietf-dime-rfc3588bis] values

-   that MUST be supported by all Diameter implementations conforming to

-   this specification.  The following Command Codes are defined (using

-   modified ABNF [I-D.ietf-dime-rfc3588bis]) in this document:

-   Capabilities-Update-Request (CUR, Section 4.1.1) and Capabilities-

-   Update-Answer (CUA, Section 4.1.2).

-

-

-

-Jiao & Zorn              Expires April 27, 2011                 [Page 4]

-

-Internet-Draft        Diameter Capabilities Update          October 2010

-

-

-4.1.1.  Capabilities-Update-Request

-

-   The Capabilities-Update-Request (CUR), indicated by the Command-Code

-   set to <CUCC> and the Command Flags' 'R' bit set, is sent to update

-   local capabilities.  Upon detection of a transport failure, this

-   message MUST NOT be sent to an alternate peer.

-

-   When Diameter is run over the Stream Control Transmission Protocol

-   [RFC4960], which allows connections to span multiple interfaces and

-   multiple IP addresses, the Capabilities-Update-Request message MUST

-   contain one Host-IP-Address AVP for each potential IP address that

-   may be locally used when transmitting Diameter messages.

-

-   Message Format

-

-      <CUR> ::= < Diameter Header: <CUCC>, REQ >

-                { Origin-Host }

-                { Origin-Realm }

-             1* { Host-IP-Address }

-                { Vendor-Id }

-                { Product-Name }

-                [ Origin-State-Id ]

-              * [ Supported-Vendor-Id ]

-              * [ Auth-Application-Id ]

-              * [ Acct-Application-Id ]

-              * [ Vendor-Specific-Application-Id ]

-                [ Firmware-Revision ]

-              * [ AVP ]

-

-4.1.2.  Capabilities-Update-Answer

-

-   The Capabilities-Update-Answer, indicated by the Command-Code set to

-   <CUCC> and the Command Flags' 'R' bit cleared, is sent in response to

-   a CUR message.

-

-                   Message Format

-

-                   <CUA> ::= < Diameter Header: <CUCC> >

-                             { Origin-Host }

-                             { Origin-Realm }

-                             { Result-Code }

-                             [ Error-Message ]

-                           * [ AVP ]

-

-

-

-

-

-

-

-

-Jiao & Zorn              Expires April 27, 2011                 [Page 5]

-

-Internet-Draft        Diameter Capabilities Update          October 2010

-

-

-5.  Security Considerations

-

-   The security considerations applicable to the Diameter Base Protocol

-   [I-D.ietf-dime-rfc3588bis] are also applicable to this document.

-

-

-6.  IANA Considerations

-

-   This section explains the criteria to be used by the IANA for

-   assignment of numbers within namespaces used within this document.

-

-6.1.  Application Identifier

-

-   This specification assigns the value <TBD1> from the Application

-   Identifiers namespace [I-D.ietf-dime-rfc3588bis].  See Section 3 for

-   the assignment of the namespace in this specification.

-

-6.2.  Command Codes

-

-   This specification assigns the value <CUCC> from the Command Codes

-   namespace [I-D.ietf-dime-rfc3588bis].  See Section 4.1 for the

-   assignment of the namespace in this specification.

-

-

-7.  Contributors

-

-   This document is based upon work done by Tina Tsou.

-

-

-8.  Acknowledgements

-

-   Thanks to Sebastien Decugis, Niklas Neumann, Subash Comerica, Lionel

-   Morand, Dan Romascanu, Dan Harkins and Ravi for helpful review and

-   discussion.

-

-

-9.  References

-

-9.1.  Normative References

-

-   [I-D.ietf-dime-rfc3588bis]

-              Fajardo, V., Arkko, J., Loughney, J., and G. Zorn,

-              "Diameter Base Protocol", draft-ietf-dime-rfc3588bis-25

-              (work in progress), September 2010.

-

-   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate

-              Requirement Levels", BCP 14, RFC 2119, March 1997.

-

-

-

-

-Jiao & Zorn              Expires April 27, 2011                 [Page 6]

-

-Internet-Draft        Diameter Capabilities Update          October 2010

-

-

-9.2.  Informative References

-

-   [RFC4960]  Stewart, R., "Stream Control Transmission Protocol",

-              RFC 4960, September 2007.

-

-

-Authors' Addresses

-

-   Jiao Kang

-   Huawei Technologies

-   Section B1, Huawei Industrial Base

-   Bantian, Longgang District

-   Shenzhen  518129

-   P.R. China

-

-   Phone: +86 755 2878-6690

-   Email: [email protected]

-

-

-   Glen Zorn

-   Network Zen

-   227/358 Thanon Sanphawut

-   Bang Na, Bangkok  10260

-   Thailand

-

-   Phone: +66 (0) 87-040-4617

-   Email: [email protected]

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-Jiao & Zorn              Expires April 27, 2011                 [Page 7]

-

diff --git a/lib/diameter/doc/standard/draft-ietf-dime-rfc3588bis-26.txt b/lib/diameter/doc/standard/rfc6733.txt
index 87b9562f93..2f5a477347 100644
--- a/lib/diameter/doc/standard/draft-ietf-dime-rfc3588bis-26.txt
+++ b/lib/diameter/doc/standard/rfc6733.txt
@@ -1,62 +1,72 @@
 
 
 
-DIME                                                     V. Fajardo, Ed.
-Internet-Draft                                    Telcordia Technologies
-Obsoletes: 3588 (if approved)                                   J. Arkko
-Intended status: Standards Track                       Ericsson Research
-Expires: July 24, 2011                                       J. Loughney
+
+
+
+Internet Engineering Task Force (IETF)                   V. Fajardo, Ed.
+Request for Comments: 6733                        Telcordia Technologies
+Obsoletes: 3588, 5719                                           J. Arkko
+Category: Standards Track                              Ericsson Research
+ISSN: 2070-1721                                              J. Loughney
                                                    Nokia Research Center
-                                                                 G. Zorn
+                                                            G. Zorn, Ed.
                                                              Network Zen
-                                                        January 20, 2011
+                                                            October 2012
 
 
                          Diameter Base Protocol
-                   draft-ietf-dime-rfc3588bis-26.txt
 
 Abstract
 
    The Diameter base protocol is intended to provide an Authentication,
-   Authorization and Accounting (AAA) framework for applications such as
-   network access or IP mobility in both local and roaming situations.
-   This document specifies the message format, transport, error
-   reporting, accounting and security services used by all Diameter
-   applications.  The Diameter base protocol as defined in this document
-   must be supported by all Diameter implementations.
+   Authorization, and Accounting (AAA) framework for applications such
+   as network access or IP mobility in both local and roaming
+   situations.  This document specifies the message format, transport,
+   error reporting, accounting, and security services used by all
+   Diameter applications.  The Diameter base protocol as defined in this
+   document obsoletes RFC 3588 and RFC 5719, and it must be supported by
+   all new Diameter implementations.
 
-Status of this Memo
+Status of This Memo
 
-   This Internet-Draft is submitted in full conformance with the
-   provisions of BCP 78 and BCP 79.
+   This is an Internet Standards Track document.
 
-   Internet-Drafts are working documents of the Internet Engineering
-   Task Force (IETF).  Note that other groups may also distribute
-   working documents as Internet-Drafts.  The list of current Internet-
-   Drafts is at http://datatracker.ietf.org/drafts/current/.
+   This document is a product of the Internet Engineering Task Force
+   (IETF).  It represents the consensus of the IETF community.  It has
+   received public review and has been approved for publication by the
+   Internet Engineering Steering Group (IESG).  Further information on
+   Internet Standards is available in Section 2 of RFC 5741.
+
+   Information about the current status of this document, any errata,
+   and how to provide feedback on it may be obtained at
+   http://www.rfc-editor.org/info/rfc6733.
 
-   Internet-Drafts are draft documents valid for a maximum of six months
-   and may be updated, replaced, or obsoleted by other documents at any
-   time.  It is inappropriate to use Internet-Drafts as reference
-   material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on July 24, 2011.
 
-Copyright Notice
 
-   Copyright (c) 2011 IETF Trust and the persons identified as the
-   document authors.  All rights reserved.
 
-   This document is subject to BCP 78 and the IETF Trust's Legal
-   Provisions Relating to IETF Documents
 
 
 
-Fajardo, et al.           Expires July 24, 2011                 [Page 1]
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                    [Page 1]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
+Copyright Notice
+
+   Copyright (c) 2012 IETF Trust and the persons identified as the
+   document authors.  All rights reserved.
+
+   This document is subject to BCP 78 and the IETF Trust's Legal
+   Provisions Relating to IETF Documents
    (http://trustee.ietf.org/license-info) in effect on the date of
    publication of this document.  Please review these documents
    carefully, as they describe your rights and restrictions with respect
@@ -65,256 +75,303 @@ Internet-Draft           Diameter Base Protocol             January 2011
    the Trust Legal Provisions and are provided without warranty as
    described in the Simplified BSD License.
 
+   This document may contain material from IETF Documents or IETF
+   Contributions published or made publicly available before November
+   10, 2008.  The person(s) controlling the copyright in some of this
+   material may not have granted the IETF Trust the right to allow
+   modifications of such material outside the IETF Standards Process.
+   Without obtaining an adequate license from the person(s) controlling
+   the copyright in such materials, this document may not be modified
+   outside the IETF Standards Process, and derivative works of it may
+   not be created outside the IETF Standards Process, except to format
+   it for publication as an RFC or to translate it into languages other
+   than English.
 
 Table of Contents
 
-   1.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . .   6
-     1.1.  Diameter Protocol . . . . . . . . . . . . . . . . . . . .   8
-       1.1.1.  Description of the Document Set . . . . . . . . . . .   9
-       1.1.2.  Conventions Used in This Document . . . . . . . . . .  10
-       1.1.3.  Changes from RFC3588  . . . . . . . . . . . . . . . .  10
-     1.2.  Terminology . . . . . . . . . . . . . . . . . . . . . . .  12
-     1.3.  Approach to Extensibility . . . . . . . . . . . . . . . .  17
-       1.3.1.  Defining New AVP Values . . . . . . . . . . . . . . .  18
-       1.3.2.  Creating New AVPs . . . . . . . . . . . . . . . . . .  18
-       1.3.3.  Creating New Commands . . . . . . . . . . . . . . . .  18
-       1.3.4.  Creating New Diameter Applications  . . . . . . . . .  19
-   2.  Protocol Overview . . . . . . . . . . . . . . . . . . . . . .  21
-     2.1.  Transport . . . . . . . . . . . . . . . . . . . . . . . .  22
-       2.1.1.  SCTP Guidelines . . . . . . . . . . . . . . . . . . .  23
-     2.2.  Securing Diameter Messages  . . . . . . . . . . . . . . .  24
-     2.3.  Diameter Application Compliance . . . . . . . . . . . . .  24
-     2.4.  Application Identifiers . . . . . . . . . . . . . . . . .  24
-     2.5.  Connections vs. Sessions  . . . . . . . . . . . . . . . .  25
-     2.6.  Peer Table  . . . . . . . . . . . . . . . . . . . . . . .  26
-     2.7.  Routing Table . . . . . . . . . . . . . . . . . . . . . .  27
-     2.8.  Role of Diameter Agents . . . . . . . . . . . . . . . . .  28
-       2.8.1.  Relay Agents  . . . . . . . . . . . . . . . . . . . .  29
-       2.8.2.  Proxy Agents  . . . . . . . . . . . . . . . . . . . .  30
-       2.8.3.  Redirect Agents . . . . . . . . . . . . . . . . . . .  31
-       2.8.4.  Translation Agents  . . . . . . . . . . . . . . . . .  32
-     2.9.  Diameter Path Authorization . . . . . . . . . . . . . . .  33
-   3.  Diameter Header . . . . . . . . . . . . . . . . . . . . . . .  35
-     3.1.  Command Codes . . . . . . . . . . . . . . . . . . . . . .  38
-     3.2.  Command Code ABNF specification . . . . . . . . . . . . .  38
-     3.3.  Diameter Command Naming Conventions . . . . . . . . . . .  41
-   4.  Diameter AVPs . . . . . . . . . . . . . . . . . . . . . . . .  42
-     4.1.  AVP Header  . . . . . . . . . . . . . . . . . . . . . . .  42
-       4.1.1.  Optional Header Elements  . . . . . . . . . . . . . .  43
-     4.2.  Basic AVP Data Formats  . . . . . . . . . . . . . . . . .  44
-     4.3.  Derived AVP Data Formats  . . . . . . . . . . . . . . . .  45
-       4.3.1.  Common Derived AVPs . . . . . . . . . . . . . . . . .  45
-     4.4.  Grouped AVP Values  . . . . . . . . . . . . . . . . . . .  52
-
-
-
-Fajardo, et al.           Expires July 24, 2011                 [Page 2]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-       4.4.1.  Example AVP with a Grouped Data type  . . . . . . . .  53
-     4.5.  Diameter Base Protocol AVPs . . . . . . . . . . . . . . .  56
-   5.  Diameter Peers  . . . . . . . . . . . . . . . . . . . . . . .  59
-     5.1.  Peer Connections  . . . . . . . . . . . . . . . . . . . .  59
-     5.2.  Diameter Peer Discovery . . . . . . . . . . . . . . . . .  60
-     5.3.  Capabilities Exchange . . . . . . . . . . . . . . . . . .  61
-       5.3.1.  Capabilities-Exchange-Request . . . . . . . . . . . .  63
-       5.3.2.  Capabilities-Exchange-Answer  . . . . . . . . . . . .  63
-       5.3.3.  Vendor-Id AVP . . . . . . . . . . . . . . . . . . . .  64
-       5.3.4.  Firmware-Revision AVP . . . . . . . . . . . . . . . .  64
-       5.3.5.  Host-IP-Address AVP . . . . . . . . . . . . . . . . .  64
-       5.3.6.  Supported-Vendor-Id AVP . . . . . . . . . . . . . . .  65
-       5.3.7.  Product-Name AVP  . . . . . . . . . . . . . . . . . .  65
-     5.4.  Disconnecting Peer connections  . . . . . . . . . . . . .  65
-       5.4.1.  Disconnect-Peer-Request . . . . . . . . . . . . . . .  66
-       5.4.2.  Disconnect-Peer-Answer  . . . . . . . . . . . . . . .  66
-       5.4.3.  Disconnect-Cause AVP  . . . . . . . . . . . . . . . .  66
-     5.5.  Transport Failure Detection . . . . . . . . . . . . . . .  67
-       5.5.1.  Device-Watchdog-Request . . . . . . . . . . . . . . .  67
-       5.5.2.  Device-Watchdog-Answer  . . . . . . . . . . . . . . .  67
-       5.5.3.  Transport Failure Algorithm . . . . . . . . . . . . .  68
-       5.5.4.  Failover and Failback Procedures  . . . . . . . . . .  68
-     5.6.  Peer State Machine  . . . . . . . . . . . . . . . . . . .  69
-       5.6.1.  Incoming connections  . . . . . . . . . . . . . . . .  71
-       5.6.2.  Events  . . . . . . . . . . . . . . . . . . . . . . .  72
-       5.6.3.  Actions . . . . . . . . . . . . . . . . . . . . . . .  73
-       5.6.4.  The Election Process  . . . . . . . . . . . . . . . .  75
-   6.  Diameter message processing . . . . . . . . . . . . . . . . .  76
-     6.1.  Diameter Request Routing Overview . . . . . . . . . . . .  76
-       6.1.1.  Originating a Request . . . . . . . . . . . . . . . .  77
-       6.1.2.  Sending a Request . . . . . . . . . . . . . . . . . .  77
-       6.1.3.  Receiving Requests  . . . . . . . . . . . . . . . . .  78
-       6.1.4.  Processing Local Requests . . . . . . . . . . . . . .  78
-       6.1.5.  Request Forwarding  . . . . . . . . . . . . . . . . .  78
-       6.1.6.  Request Routing . . . . . . . . . . . . . . . . . . .  78
-       6.1.7.  Predictive Loop Avoidance . . . . . . . . . . . . . .  79
-       6.1.8.  Redirecting Requests  . . . . . . . . . . . . . . . .  79
-       6.1.9.  Relaying and Proxying Requests  . . . . . . . . . . .  80
-     6.2.  Diameter Answer Processing  . . . . . . . . . . . . . . .  82
-       6.2.1.  Processing received Answers . . . . . . . . . . . . .  82
-       6.2.2.  Relaying and Proxying Answers . . . . . . . . . . . .  82
-     6.3.  Origin-Host AVP . . . . . . . . . . . . . . . . . . . . .  83
-     6.4.  Origin-Realm AVP  . . . . . . . . . . . . . . . . . . . .  83
-     6.5.  Destination-Host AVP  . . . . . . . . . . . . . . . . . .  83
-     6.6.  Destination-Realm AVP . . . . . . . . . . . . . . . . . .  84
-     6.7.  Routing AVPs  . . . . . . . . . . . . . . . . . . . . . .  84
-       6.7.1.  Route-Record AVP  . . . . . . . . . . . . . . . . . .  84
-       6.7.2.  Proxy-Info AVP  . . . . . . . . . . . . . . . . . . .  84
-
-
-
-Fajardo, et al.           Expires July 24, 2011                 [Page 3]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-       6.7.3.  Proxy-Host AVP  . . . . . . . . . . . . . . . . . . .  85
-       6.7.4.  Proxy-State AVP . . . . . . . . . . . . . . . . . . .  85
-     6.8.  Auth-Application-Id AVP . . . . . . . . . . . . . . . . .  85
-     6.9.  Acct-Application-Id AVP . . . . . . . . . . . . . . . . .  85
-     6.10. Inband-Security-Id AVP  . . . . . . . . . . . . . . . . .  85
-     6.11. Vendor-Specific-Application-Id AVP  . . . . . . . . . . .  86
-     6.12. Redirect-Host AVP . . . . . . . . . . . . . . . . . . . .  87
-     6.13. Redirect-Host-Usage AVP . . . . . . . . . . . . . . . . .  87
-     6.14. Redirect-Max-Cache-Time AVP . . . . . . . . . . . . . . .  88
-   7.  Error Handling  . . . . . . . . . . . . . . . . . . . . . . .  90
-     7.1.  Result-Code AVP . . . . . . . . . . . . . . . . . . . . .  92
-       7.1.1.  Informational . . . . . . . . . . . . . . . . . . . .  92
-       7.1.2.  Success . . . . . . . . . . . . . . . . . . . . . . .  93
-       7.1.3.  Protocol Errors . . . . . . . . . . . . . . . . . . .  93
-       7.1.4.  Transient Failures  . . . . . . . . . . . . . . . . .  94
-       7.1.5.  Permanent Failures  . . . . . . . . . . . . . . . . .  95
-     7.2.  Error Bit . . . . . . . . . . . . . . . . . . . . . . . .  98
-     7.3.  Error-Message AVP . . . . . . . . . . . . . . . . . . . .  99
-     7.4.  Error-Reporting-Host AVP  . . . . . . . . . . . . . . . .  99
-     7.5.  Failed-AVP AVP  . . . . . . . . . . . . . . . . . . . . .  99
-     7.6.  Experimental-Result AVP . . . . . . . . . . . . . . . . . 100
-     7.7.  Experimental-Result-Code AVP  . . . . . . . . . . . . . . 100
-   8.  Diameter User Sessions  . . . . . . . . . . . . . . . . . . . 101
-     8.1.  Authorization Session State Machine . . . . . . . . . . . 102
-     8.2.  Accounting Session State Machine  . . . . . . . . . . . . 107
-     8.3.  Server-Initiated Re-Auth  . . . . . . . . . . . . . . . . 112
-       8.3.1.  Re-Auth-Request . . . . . . . . . . . . . . . . . . . 112
-       8.3.2.  Re-Auth-Answer  . . . . . . . . . . . . . . . . . . . 113
-     8.4.  Session Termination . . . . . . . . . . . . . . . . . . . 114
-       8.4.1.  Session-Termination-Request . . . . . . . . . . . . . 115
-       8.4.2.  Session-Termination-Answer  . . . . . . . . . . . . . 115
-     8.5.  Aborting a Session  . . . . . . . . . . . . . . . . . . . 116
-       8.5.1.  Abort-Session-Request . . . . . . . . . . . . . . . . 116
-       8.5.2.  Abort-Session-Answer  . . . . . . . . . . . . . . . . 117
-     8.6.  Inferring Session Termination from Origin-State-Id  . . . 118
-     8.7.  Auth-Request-Type AVP . . . . . . . . . . . . . . . . . . 118
-     8.8.  Session-Id AVP  . . . . . . . . . . . . . . . . . . . . . 119
-     8.9.  Authorization-Lifetime AVP  . . . . . . . . . . . . . . . 120
-     8.10. Auth-Grace-Period AVP . . . . . . . . . . . . . . . . . . 121
-     8.11. Auth-Session-State AVP  . . . . . . . . . . . . . . . . . 121
-     8.12. Re-Auth-Request-Type AVP  . . . . . . . . . . . . . . . . 121
-     8.13. Session-Timeout AVP . . . . . . . . . . . . . . . . . . . 122
-     8.14. User-Name AVP . . . . . . . . . . . . . . . . . . . . . . 122
-     8.15. Termination-Cause AVP . . . . . . . . . . . . . . . . . . 122
-     8.16. Origin-State-Id AVP . . . . . . . . . . . . . . . . . . . 124
-     8.17. Session-Binding AVP . . . . . . . . . . . . . . . . . . . 124
-     8.18. Session-Server-Failover AVP . . . . . . . . . . . . . . . 125
-     8.19. Multi-Round-Time-Out AVP  . . . . . . . . . . . . . . . . 126
-
-
-
-Fajardo, et al.           Expires July 24, 2011                 [Page 4]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-     8.20. Class AVP . . . . . . . . . . . . . . . . . . . . . . . . 126
-     8.21. Event-Timestamp AVP . . . . . . . . . . . . . . . . . . . 126
-   9.  Accounting  . . . . . . . . . . . . . . . . . . . . . . . . . 127
-     9.1.  Server Directed Model . . . . . . . . . . . . . . . . . . 127
-     9.2.  Protocol Messages . . . . . . . . . . . . . . . . . . . . 128
-     9.3.  Accounting Application Extension and Requirements . . . . 128
-     9.4.  Fault Resilience  . . . . . . . . . . . . . . . . . . . . 129
-     9.5.  Accounting Records  . . . . . . . . . . . . . . . . . . . 129
-     9.6.  Correlation of Accounting Records . . . . . . . . . . . . 130
-     9.7.  Accounting Command-Codes  . . . . . . . . . . . . . . . . 131
-       9.7.1.  Accounting-Request  . . . . . . . . . . . . . . . . . 131
-       9.7.2.  Accounting-Answer . . . . . . . . . . . . . . . . . . 132
-     9.8.  Accounting AVPs . . . . . . . . . . . . . . . . . . . . . 133
-       9.8.1.  Accounting-Record-Type AVP  . . . . . . . . . . . . . 133
-       9.8.2.  Acct-Interim-Interval AVP . . . . . . . . . . . . . . 134
-       9.8.3.  Accounting-Record-Number AVP  . . . . . . . . . . . . 135
-       9.8.4.  Acct-Session-Id AVP . . . . . . . . . . . . . . . . . 135
-       9.8.5.  Acct-Multi-Session-Id AVP . . . . . . . . . . . . . . 135
-       9.8.6.  Accounting-Sub-Session-Id AVP . . . . . . . . . . . . 135
-       9.8.7.  Accounting-Realtime-Required AVP  . . . . . . . . . . 136
-   10. AVP Occurrence Table  . . . . . . . . . . . . . . . . . . . . 137
-     10.1. Base Protocol Command AVP Table . . . . . . . . . . . . . 137
-     10.2. Accounting AVP Table  . . . . . . . . . . . . . . . . . . 138
-   11. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 140
-     11.1. Changes to AVP Header Allocation  . . . . . . . . . . . . 140
-     11.2. Diameter Header . . . . . . . . . . . . . . . . . . . . . 140
-     11.3. AVP Values  . . . . . . . . . . . . . . . . . . . . . . . 140
-       11.3.1. Experimental-Result-Code AVP  . . . . . . . . . . . . 140
-     11.4. Diameter TCP, SCTP, TLS/TCP and DTLS/SCTP Port Numbers  . 141
-     11.5. S-NAPTR Parameters  . . . . . . . . . . . . . . . . . . . 141
-   12. Diameter protocol related configurable parameters . . . . . . 142
-   13. Security Considerations . . . . . . . . . . . . . . . . . . . 143
-     13.1. TLS/TCP and DTLS/SCTP Usage . . . . . . . . . . . . . . . 143
-     13.2. Peer-to-Peer Considerations . . . . . . . . . . . . . . . 144
-   14. References  . . . . . . . . . . . . . . . . . . . . . . . . . 145
-     14.1. Normative References  . . . . . . . . . . . . . . . . . . 145
-     14.2. Informational References  . . . . . . . . . . . . . . . . 147
-   Appendix A.  Acknowledgements . . . . . . . . . . . . . . . . . . 149
-     A.1.  RFC3588bis  . . . . . . . . . . . . . . . . . . . . . . . 149
-     A.2.  RFC3588 . . . . . . . . . . . . . . . . . . . . . . . . . 150
-   Appendix B.  S-NAPTR Example  . . . . . . . . . . . . . . . . . . 151
-   Appendix C.  Duplicate Detection  . . . . . . . . . . . . . . . . 152
-   Appendix D.  Internationalized Domain Names . . . . . . . . . . . 154
-   Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . . 155
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                 [Page 5]
-
-Internet-Draft           Diameter Base Protocol             January 2011
+   1. Introduction ....................................................7
+      1.1. Diameter Protocol ..........................................9
+           1.1.1. Description of the Document Set ....................10
+           1.1.2. Conventions Used in This Document ..................11
+           1.1.3. Changes from RFC 3588 ..............................11
+      1.2. Terminology ...............................................12
+      1.3. Approach to Extensibility .................................17
+           1.3.1. Defining New AVP Values ............................18
+           1.3.2. Creating New AVPs ..................................18
+           1.3.3. Creating New Commands ..............................18
+           1.3.4. Creating New Diameter Applications .................19
+   2. Protocol Overview ..............................................20
+      2.1. Transport .................................................22
+           2.1.1. SCTP Guidelines ....................................23
+      2.2. Securing Diameter Messages ................................24
+      2.3. Diameter Application Compliance ...........................24
+      2.4. Application Identifiers ...................................24
+      2.5. Connections vs. Sessions ..................................25
+      2.6. Peer Table ................................................26
+
+
+
+Fajardo, et al.              Standards Track                    [Page 2]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+      2.7. Routing Table .............................................27
+      2.8. Role of Diameter Agents ...................................28
+           2.8.1. Relay Agents .......................................30
+           2.8.2. Proxy Agents .......................................31
+           2.8.3. Redirect Agents ....................................31
+           2.8.4. Translation Agents .................................32
+      2.9. Diameter Path Authorization ...............................33
+   3. Diameter Header ................................................34
+      3.1. Command Codes .............................................37
+      3.2. Command Code Format Specification .........................38
+      3.3. Diameter Command Naming Conventions .......................40
+   4. Diameter AVPs ..................................................40
+      4.1. AVP Header ................................................41
+           4.1.1. Optional Header Elements ...........................42
+      4.2. Basic AVP Data Formats ....................................43
+      4.3. Derived AVP Data Formats ..................................44
+           4.3.1. Common Derived AVP Data Formats ....................44
+      4.4. Grouped AVP Values ........................................51
+           4.4.1. Example AVP with a Grouped Data Type ...............52
+      4.5. Diameter Base Protocol AVPs ...............................55
+   5. Diameter Peers .................................................58
+      5.1. Peer Connections ..........................................58
+      5.2. Diameter Peer Discovery ...................................59
+      5.3. Capabilities Exchange .....................................60
+           5.3.1. Capabilities-Exchange-Request ......................62
+           5.3.2. Capabilities-Exchange-Answer .......................63
+           5.3.3. Vendor-Id AVP ......................................63
+           5.3.4. Firmware-Revision AVP ..............................64
+           5.3.5. Host-IP-Address AVP ................................64
+           5.3.6. Supported-Vendor-Id AVP ............................64
+           5.3.7. Product-Name AVP ...................................64
+      5.4. Disconnecting Peer Connections ............................64
+           5.4.1. Disconnect-Peer-Request ............................65
+           5.4.2. Disconnect-Peer-Answer .............................65
+           5.4.3. Disconnect-Cause AVP ...............................66
+      5.5. Transport Failure Detection ...............................66
+           5.5.1. Device-Watchdog-Request ............................67
+           5.5.2. Device-Watchdog-Answer .............................67
+           5.5.3. Transport Failure Algorithm ........................67
+           5.5.4. Failover and Failback Procedures ...................67
+      5.6. Peer State Machine ........................................68
+           5.6.1. Incoming Connections ...............................71
+           5.6.2. Events .............................................71
+           5.6.3. Actions ............................................72
+           5.6.4. The Election Process ...............................74
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                    [Page 3]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+   6. Diameter Message Processing ....................................74
+      6.1. Diameter Request Routing Overview .........................74
+           6.1.1. Originating a Request ..............................75
+           6.1.2. Sending a Request ..................................76
+           6.1.3. Receiving Requests .................................76
+           6.1.4. Processing Local Requests ..........................76
+           6.1.5. Request Forwarding .................................77
+           6.1.6. Request Routing ....................................77
+           6.1.7. Predictive Loop Avoidance ..........................77
+           6.1.8. Redirecting Requests ...............................78
+           6.1.9. Relaying and Proxying Requests .....................79
+      6.2. Diameter Answer Processing ................................80
+           6.2.1. Processing Received Answers ........................81
+           6.2.2. Relaying and Proxying Answers ......................81
+      6.3. Origin-Host AVP ...........................................81
+      6.4. Origin-Realm AVP ..........................................82
+      6.5. Destination-Host AVP ......................................82
+      6.6. Destination-Realm AVP .....................................82
+      6.7. Routing AVPs ..............................................83
+           6.7.1. Route-Record AVP ...................................83
+           6.7.2. Proxy-Info AVP .....................................83
+           6.7.3. Proxy-Host AVP .....................................83
+           6.7.4. Proxy-State AVP ....................................83
+      6.8. Auth-Application-Id AVP ...................................83
+      6.9. Acct-Application-Id AVP ...................................84
+      6.10. Inband-Security-Id AVP ...................................84
+      6.11. Vendor-Specific-Application-Id AVP .......................84
+      6.12. Redirect-Host AVP ........................................85
+      6.13. Redirect-Host-Usage AVP ..................................85
+      6.14. Redirect-Max-Cache-Time AVP ..............................87
+   7. Error Handling .................................................87
+      7.1. Result-Code AVP ...........................................89
+           7.1.1. Informational ......................................90
+           7.1.2. Success ............................................90
+           7.1.3. Protocol Errors ....................................90
+           7.1.4. Transient Failures .................................92
+           7.1.5. Permanent Failures .................................92
+      7.2. Error Bit .................................................95
+      7.3. Error-Message AVP .........................................96
+      7.4. Error-Reporting-Host AVP ..................................96
+      7.5. Failed-AVP AVP ............................................96
+      7.6. Experimental-Result AVP ...................................97
+      7.7. Experimental-Result-Code AVP ..............................97
+   8. Diameter User Sessions .........................................98
+      8.1. Authorization Session State Machine .......................99
+      8.2. Accounting Session State Machine .........................104
+
+
+
+
+
+Fajardo, et al.              Standards Track                    [Page 4]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+      8.3. Server-Initiated Re-Auth .................................110
+           8.3.1. Re-Auth-Request ...................................110
+           8.3.2. Re-Auth-Answer ....................................110
+      8.4. Session Termination ......................................111
+           8.4.1. Session-Termination-Request .......................112
+           8.4.2. Session-Termination-Answer ........................113
+      8.5. Aborting a Session .......................................113
+           8.5.1. Abort-Session-Request .............................114
+           8.5.2. Abort-Session-Answer ..............................114
+      8.6. Inferring Session Termination from Origin-State-Id .......115
+      8.7. Auth-Request-Type AVP ....................................116
+      8.8. Session-Id AVP ...........................................116
+      8.9. Authorization-Lifetime AVP ...............................117
+      8.10. Auth-Grace-Period AVP ...................................118
+      8.11. Auth-Session-State AVP ..................................118
+      8.12. Re-Auth-Request-Type AVP ................................118
+      8.13. Session-Timeout AVP .....................................119
+      8.14. User-Name AVP ...........................................119
+      8.15. Termination-Cause AVP ...................................120
+      8.16. Origin-State-Id AVP .....................................120
+      8.17. Session-Binding AVP .....................................120
+      8.18. Session-Server-Failover AVP .............................121
+      8.19. Multi-Round-Time-Out AVP ................................122
+      8.20. Class AVP ...............................................122
+      8.21. Event-Timestamp AVP .....................................122
+   9. Accounting ....................................................123
+      9.1. Server Directed Model ....................................123
+      9.2. Protocol Messages ........................................124
+      9.3. Accounting Application Extension and Requirements ........124
+      9.4. Fault Resilience .........................................125
+      9.5. Accounting Records .......................................125
+      9.6. Correlation of Accounting Records ........................126
+      9.7. Accounting Command Codes .................................127
+           9.7.1. Accounting-Request ................................127
+           9.7.2. Accounting-Answer .................................128
+      9.8. Accounting AVPs ..........................................129
+           9.8.1. Accounting-Record-Type AVP ........................129
+           9.8.2. Acct-Interim-Interval AVP .........................130
+           9.8.3. Accounting-Record-Number AVP ......................131
+           9.8.4. Acct-Session-Id AVP ...............................131
+           9.8.5. Acct-Multi-Session-Id AVP .........................131
+           9.8.6. Accounting-Sub-Session-Id AVP .....................131
+           9.8.7. Accounting-Realtime-Required AVP ..................132
+   10. AVP Occurrence Tables ........................................132
+      10.1. Base Protocol Command AVP Table .........................133
+      10.2. Accounting AVP Table ....................................134
+
+
+
+
+
+Fajardo, et al.              Standards Track                    [Page 5]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+   11. IANA Considerations ..........................................135
+      11.1. AVP Header ..............................................135
+           11.1.1. AVP Codes ........................................136
+           11.1.2. AVP Flags ........................................136
+      11.2. Diameter Header .........................................136
+           11.2.1. Command Codes ....................................136
+           11.2.2. Command Flags ....................................137
+      11.3. AVP Values ..............................................137
+           11.3.1. Experimental-Result-Code AVP .....................137
+           11.3.2. Result-Code AVP Values ...........................137
+           11.3.3. Accounting-Record-Type AVP Values ................137
+           11.3.4. Termination-Cause AVP Values .....................137
+           11.3.5. Redirect-Host-Usage AVP Values ...................137
+           11.3.6. Session-Server-Failover AVP Values ...............137
+           11.3.7. Session-Binding AVP Values .......................137
+           11.3.8. Disconnect-Cause AVP Values ......................138
+           11.3.9. Auth-Request-Type AVP Values .....................138
+           11.3.10. Auth-Session-State AVP Values ...................138
+           11.3.11. Re-Auth-Request-Type AVP Values .................138
+           11.3.12. Accounting-Realtime-Required AVP Values .........138
+           11.3.13. Inband-Security-Id AVP (code 299) ...............138
+      11.4. _diameters Service Name and Port Number Registration ....138
+      11.5. SCTP Payload Protocol Identifiers .......................139
+      11.6. S-NAPTR Parameters ......................................139
+   12. Diameter Protocol-Related Configurable Parameters ............139
+   13. Security Considerations ......................................140
+      13.1. TLS/TCP and DTLS/SCTP Usage .............................140
+      13.2. Peer-to-Peer Considerations .............................141
+      13.3. AVP Considerations ......................................141
+   14. References ...................................................142
+      14.1. Normative References ....................................142
+      14.2. Informative References ..................................144
+   Appendix A. Acknowledgements .....................................147
+     A.1. This Document .............................................147
+     A.2. RFC 3588 ..................................................148
+   Appendix B. S-NAPTR Example ......................................148
+   Appendix C. Duplicate Detection ..................................149
+   Appendix D. Internationalized Domain Names .......................151
+
+
+
+
+
+
+
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                    [Page 6]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 1.  Introduction
 
-   Authentication, Authorization and Accounting (AAA) protocols such as
+   Authentication, Authorization, and Accounting (AAA) protocols such as
    TACACS [RFC1492] and RADIUS [RFC2865] were initially deployed to
    provide dial-up PPP [RFC1661] and terminal server access.  Over time,
    AAA support was needed on many new access technologies, the scale and
    complexity of AAA networks grew, and AAA was also used on new
-   applications (such as voice over IP).  This lead to new demands on
-   AAA protocols.
+   applications (such as voice over IP).  This led to new demands on AAA
+   protocols.
 
    Network access requirements for AAA protocols are summarized in
-   [RFC2989].  These include:
-
+   Aboba, et al. [RFC2989].  These include:
 
    Failover
 
-      [RFC2865] does not define failover mechanisms, and as a result,
+      [RFC2865] does not define failover mechanisms and, as a result,
       failover behavior differs between implementations.  In order to
       provide well-defined failover behavior, Diameter supports
-      application-layer acknowledgements, and defines failover
-      algorithms and the associated state machine.  This is described in
-      Section 5.5 and [RFC3539].
+      application-layer acknowledgements and defines failover algorithms
+      and the associated state machine.
 
    Transmission-level security
 
-      [RFC2865] defines an application-layer authentication and
-      integrity scheme that is required only for use with Response
+      RADIUS [RFC2865] defines an application-layer authentication and
+      integrity scheme that is required only for use with response
       packets.  While [RFC2869] defines an additional authentication and
       integrity mechanism, use is only required during Extensible
-      Authentication Protocol (EAP) sessions.  While attribute-hiding is
-      supported, [RFC2865] does not provide support for per-packet
-      confidentiality.  In accounting, [RFC2866] assumes that replay
-      protection is provided by the backend billing server, rather than
-      within the protocol itself.
+      Authentication Protocol (EAP) [RFC3748] sessions.  While attribute
+      hiding is supported, [RFC2865] does not provide support for per-
+      packet confidentiality.  In accounting, [RFC2866] assumes that
+      replay protection is provided by the backend billing server rather
+      than within the protocol itself.
 
       While [RFC3162] defines the use of IPsec with RADIUS, support for
       IPsec is not required.  In order to provide universal support for
@@ -322,50 +379,48 @@ Internet-Draft           Diameter Base Protocol             January 2011
       domain AAA deployments, Diameter provides support for TLS/TCP and
       DTLS/SCTP.  Security is discussed in Section 13.
 
-
    Reliable transport
 
-
       RADIUS runs over UDP, and does not define retransmission behavior;
       as a result, reliability varies between implementations.  As
       described in [RFC2975], this is a major issue in accounting, where
+      packet loss may translate directly into revenue loss.  In order to
 
 
 
-Fajardo, et al.           Expires July 24, 2011                 [Page 6]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-      packet loss may translate directly into revenue loss.  In order to
-      provide well defined transport behavior, Diameter runs over
-      reliable transport mechanisms (TCP, SCTP) as defined in [RFC3539].
 
+Fajardo, et al.              Standards Track                    [Page 7]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
-   Agent support
 
-      [RFC2865] does not provide for explicit support for agents,
-      including Proxies, Redirects and Relays.  Since the expected
-      behavior is not defined, it varies between implementations.
-      Diameter defines agent behavior explicitly; this is described in
-      Section 2.8.
+      provide well-defined transport behavior, Diameter runs over
+      reliable transport mechanisms (TCP, Stream Control Transmission
+      Protocol (SCTP)) as defined in [RFC3539].
+
+   Agent support
 
+      RADIUS does not provide for explicit support for agents, including
+      proxies, redirects, and relays.  Since the expected behavior is
+      not defined, it varies between implementations.  Diameter defines
+      agent behavior explicitly; this is described in Section 2.8.
 
    Server-initiated messages
 
-      While RADIUS server-initiated messages are defined in [RFC5176],
+      While server-initiated messages are defined in RADIUS [RFC5176],
       support is optional.  This makes it difficult to implement
       features such as unsolicited disconnect or re-authentication/
       re-authorization on demand across a heterogeneous deployment.  To
-      tackle this issue, support for server-initiated messages is
+      address this issue, support for server-initiated messages is
       mandatory in Diameter.
 
-
    Transition support
 
       While Diameter does not share a common protocol data unit (PDU)
       with RADIUS, considerable effort has been expended in enabling
-      backward compatibility with RADIUS, so that the two protocols may
+      backward compatibility with RADIUS so that the two protocols may
       be deployed in the same network.  Initially, it is expected that
       Diameter will be deployed within new network devices, as well as
       within gateways enabling communication between legacy RADIUS
@@ -373,9 +428,8 @@ Internet-Draft           Diameter Base Protocol             January 2011
       support to be added to legacy networks, by addition of a gateway
       or server speaking both RADIUS and Diameter.
 
-      In addition to addressing the above requirements, Diameter also
-      provides support for the following:
-
+   In addition to addressing the above requirements, Diameter also
+   provides support for the following:
 
    Capability negotiation
 
@@ -383,19 +437,19 @@ Internet-Draft           Diameter Base Protocol             January 2011
       a mandatory/non-mandatory flag for attributes.  Since RADIUS
       clients and servers are not aware of each other's capabilities,
       they may not be able to successfully negotiate a mutually
-      acceptable service, or in some cases, even be aware of what
+      acceptable service or, in some cases, even be aware of what
       service has been implemented.  Diameter includes support for error
+      handling (Section 7), capability negotiation (Section 5.3), and
+      mandatory/non-mandatory Attribute-Value Pairs (AVPs)
+      (Section 4.1).
 
 
 
-Fajardo, et al.           Expires July 24, 2011                 [Page 7]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-      handling (Section 7), capability negotiation (Section 5.3), and
-      mandatory/non-mandatory Attribute-Value Pairs (AVPs) (Section
-      4.1).
+Fajardo, et al.              Standards Track                    [Page 8]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    Peer discovery and configuration
@@ -403,7 +457,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
       RADIUS implementations typically require that the name or address
       of servers or clients be manually configured, along with the
       corresponding shared secrets.  This results in a large
-      administrative burden, and creates the temptation to reuse the
+      administrative burden and creates the temptation to reuse the
       RADIUS shared secret, which can result in major security
       vulnerabilities if the Request Authenticator is not globally and
       temporally unique as required in [RFC2865].  Through DNS, Diameter
@@ -411,7 +465,6 @@ Internet-Draft           Diameter Base Protocol             January 2011
       of dynamic session keys is enabled via transmission-level
       security.
 
-
    Over time, the capabilities of Network Access Server (NAS) devices
    have increased substantially.  As a result, while Diameter is a
    considerably more sophisticated protocol than RADIUS, it remains
@@ -427,42 +480,41 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    o  Error notification
 
-   o  Extensibility, through addition of new applications, commands and
-      AVPs (required in [RFC2989]).
+   o  Extensibility, required in [RFC2989], through addition of new
+      applications, commands, and AVPs
 
-   o  Basic services necessary for applications, such as handling of
+   o  Basic services necessary for applications, such as the handling of
       user sessions or accounting
 
    All data delivered by the protocol is in the form of AVPs.  Some of
    these AVP values are used by the Diameter protocol itself, while
    others deliver data associated with particular applications that
    employ Diameter.  AVPs may be arbitrarily added to Diameter messages,
-   the only restriction being that the Augmented Backus-Naur Form (ABNF,
-   [RFC5234]) Command Code syntax specification (Section 3.2) is
-   satisfied.  AVPs are used by the base Diameter protocol to support
-   the following required features:
+   the only restriction being that the Command Code Format (CCF)
+   specification (Section 3.2) be satisfied.  AVPs are used by the base
+   Diameter protocol to support the following required features:
 
+   o  Transporting of user authentication information, for the purposes
+      of enabling the Diameter server to authenticate the user
 
+   o  Transporting of service-specific authorization information,
+      between client and servers, allowing the peers to decide whether a
+      user's access request should be granted
 
-Fajardo, et al.           Expires July 24, 2011                 [Page 8]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-   o  Transporting of user authentication information, for the purposes
-      of enabling the Diameter server to authenticate the user.
+Fajardo, et al.              Standards Track                    [Page 9]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
-   o  Transporting of service-specific authorization information,
-      between client and servers, allowing the peers to decide whether a
-      user's access request should be granted.
 
    o  Exchanging resource usage information, which may be used for
       accounting purposes, capacity planning, etc.
 
-   o  Routing, relaying, proxying and redirecting of Diameter messages
-      through a server hierarchy.
+   o  Routing, relaying, proxying, and redirecting of Diameter messages
+      through a server hierarchy
 
-   The Diameter base protocol satisfies the minimum requirements for an
+   The Diameter base protocol satisfies the minimum requirements for a
    AAA protocol, as specified by [RFC2989].  The base protocol may be
    used by itself for accounting purposes only, or it may be used with a
    Diameter application, such as Mobile IPv4 [RFC4004], or network
@@ -473,16 +525,16 @@ Internet-Draft           Diameter Base Protocol             January 2011
    many applications might provide functionality not provided by
    Diameter.  Therefore, it is imperative that the designers of new
    applications understand their requirements before using Diameter.
-   See Section 2.4 for more information on Diameter applications.
+   See Section 1.3.4 for more information on Diameter applications.
 
    Any node can initiate a request.  In that sense, Diameter is a peer-
-   to-peer protocol.  In this document, a Diameter Client is a device at
+   to-peer protocol.  In this document, a Diameter client is a device at
    the edge of the network that performs access control, such as a
    Network Access Server (NAS) or a Foreign Agent (FA).  A Diameter
    client generates Diameter messages to request authentication,
    authorization, and accounting services for the user.  A Diameter
    agent is a node that does not provide local user authentication or
-   authorization services; agents include proxies, redirects and relay
+   authorization services; agents include proxies, redirects, and relay
    agents.  A Diameter server performs authentication and/or
    authorization of the user.  A Diameter node may act as an agent for
    certain requests while acting as a server for others.
@@ -494,33 +546,33 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    The Diameter specification consists of an updated version of the base
    protocol specification (this document) and the Transport Profile
-   [RFC3539].  This document obsoletes RFC 3588.  A summary of the base
-   protocol updates included in this document can be found in
-   Section 1.1.3.
-
-
-
-Fajardo, et al.           Expires July 24, 2011                 [Page 9]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
+   [RFC3539].  This document obsoletes both RFC 3588 and RFC 5719.  A
+   summary of the base protocol updates included in this document can be
+   found in Section 1.1.3.
 
    This document defines the base protocol specification for AAA, which
    includes support for accounting.  There are also a myriad of
    applications documents describing applications that use this base
-   specification for Authentication, Authorization and Accounting.
+   specification for Authentication, Authorization, and Accounting.
    These application documents specify how to use the Diameter protocol
    within the context of their application.
 
+
+
+Fajardo, et al.              Standards Track                   [Page 10]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    The Transport Profile document [RFC3539] discusses transport layer
    issues that arise with AAA protocols and recommendations on how to
    overcome these issues.  This document also defines the Diameter
    failover algorithm and state machine.
 
-   Clarifications on the Routing of Diameter Request based on Username
-   and the Realm [RFC5729] defines specific behavior on how to route
-   request based on the content of the User-Name AVP (Attribute Value
-   Pair).
+   "Clarifications on the Routing of Diameter Request Based on the
+   Username and the Realm" [RFC5729] defines specific behavior on how to
+   route requests based on the content of the User-Name AVP (Attribute
+   Value Pair).
 
 1.1.2.  Conventions Used in This Document
 
@@ -528,100 +580,100 @@ Internet-Draft           Diameter Base Protocol             January 2011
    "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
    document are to be interpreted as described in [RFC2119].
 
-1.1.3.  Changes from RFC3588
+1.1.3.  Changes from RFC 3588
 
    This document obsoletes RFC 3588 but is fully backward compatible
    with that document.  The changes introduced in this document focus on
-   fixing issues that have surfaced during implementation of [RFC3588].
-   An overview of some the major changes are given below.
-
-   o  Deprecated the use of Inband-Security AVP for negotiating
-      transport layer security.  It has been generally considered that
-      bootstrapping of TLS via Inband-Security AVP creates certain
-      security risk because it does not completely protect the
-      information carried in the CER (Capabilities Exchange Request)/CEA
-      (Capabilities Exchange Answer).  This version of Diameter adopted
-      a common approach of defining a well-known secured port that peers
-      should use when communicating via TLS/TCP and DTLS/SCTP.  This new
-      approach augments the existing Inband-Security negotiation but
-      does not completely replace it.  The old method is kept for
-      backwards compatibility reasons.
+   fixing issues that have surfaced during the implementation of
+   Diameter (RFC 3588).  An overview of some the major changes are given
+   below.
+
+   o  Deprecated the use of the Inband-Security AVP for negotiating
+      Transport Layer Security (TLS) [RFC5246].  It has been generally
+      considered that bootstrapping of TLS via Inband-Security AVP
+      creates certain security risks because it does not completely
+      protect the information carried in the CER/CEA (Capabilities-
+      Exchange-Request/Capabilities-Exchange-Answer).  This version of
+      Diameter adopts the common approach of defining a well-known
+      secured port that peers should use when communicating via TLS/TCP
+      and DTLS/SCTP.  This new approach augments the existing in-band
+      security negotiation, but it does not completely replace it.  The
+      old method is kept for backward compatibility reasons.
 
    o  Deprecated the exchange of CER/CEA messages in the open state.
-      This feature was implied in the peer state machine table of
-      [RFC3588] but it was not clearly defined anywhere else in that
+      This feature was implied in the peer state machine table of RFC
+      3588, but it was not clearly defined anywhere else in that
       document.  As work on this document progressed, it became clear
-      that the multiplicity of meaning and use of Application Id AVPs in
+      that the multiplicity of meaning and use of Application-Id AVPs in
       the CER/CEA messages (and the messages themselves) is seen as an
+      abuse of the Diameter extensibility rules and thus required
+      simplification.  Capabilities exchange in the open state has been
+      re-introduced in a separate specification [RFC6737], which clearly
+      defines new commands for this feature.
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 10]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-      abuse of the Diameter extensibility rules and thus required
-      simplification.  It is assumed that the capabilities exchange in
-      the open state will be re-introduced in a separate specification
-      which clearly defines new commands for this feature.
+Fajardo, et al.              Standards Track                   [Page 11]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
-   o  Simplified Security Requirements.  The use of a secured transport
+   o  Simplified security requirements.  The use of a secured transport
       for exchanging Diameter messages remains mandatory.  However, TLS/
-      TCP and DTLS/SCTP has become the primary method of securing
-      Diameter and IPsec is a secondary alternative.  See Section 13 for
-      details.  The support for the End-to-End security framework
-      (E2ESequence AVP and 'P'-bit in the AVP header) has also been
+      TCP and DTLS/SCTP have become the primary methods of securing
+      Diameter with IPsec as a secondary alternative.  See Section 13
+      for details.  The support for the End-to-End security framework
+      (E2E-Sequence AVP and 'P'-bit in the AVP header) has also been
       deprecated.
 
-   o  Diameter Extensibility Changes.  This includes fixes to the
+   o  Changed Diameter extensibility.  This includes fixes to the
       Diameter extensibility description (Section 1.3 and others) to
       better aid Diameter application designers; in addition, the new
       specification relaxes the policy with respect to the allocation of
-      command codes for vendor-specific uses.
-
-   o  Application Id Usage.  Clarify the proper use of Application Id
-      information which can be found in multiple places within a
-      Diameter message.  This includes correlating Application Ids found
-      in the message headers and AVPs.  These changes also clearly
-      specify the proper Application Id value to use for specific base
-      protocol messages (ASR/ASA, STR/STA) as well as clarifying the
-      content and use of Vendor-Specific-Application-Id.
-
-   o  Routing Fixes.  This document more clearly specifies what
-      information (AVPs and Application Id) can be used for making
+      Command Codes for vendor-specific uses.
+
+   o  Clarified Application Id usage.  Clarify the proper use of
+      Application Id information, which can be found in multiple places
+      within a Diameter message.  This includes correlating Application
+      Ids found in the message headers and AVPs.  These changes also
+      clearly specify the proper Application Id value to use for
+      specific base protocol messages (ASR/ASA, STR/STA) as well as
+      clarify the content and use of Vendor-Specific-Application-Id.
+
+   o  Clarified routing fixes.  This document more clearly specifies
+      what information (AVPs and Application Ids) can be used for making
       general routing decisions.  A rule for the prioritization of
       redirect routing criteria when multiple route entries are found
-      via redirects has also been added (See Section 6.13 for details).
+      via redirects has also been added (see Section 6.13).
 
-   o  Simplification of Diameter Peer Discovery.  The Diameter discovery
+   o  Simplified Diameter peer discovery.  The Diameter discovery
       process now supports only widely used discovery schemes; the rest
       have been deprecated (see Section 5.2 for details).
 
-   There are many other many miscellaneous fixes that have been
-   introduced in this document that may not be considered significant
-   but they are important nonetheless.  Examples are removal of obsolete
-   types, fixes to command ABNFs, fixes to the state machine,
-   clarification of the election process, message validation, fixes to
-   Failed-AVP and Result-Code AVP values, etc.  A comprehensive list of
-   changes is not shown here for practical reasons.
-
-
-
+   There are many other miscellaneous fixes that have been introduced in
+   this document that may not be considered significant, but they have
+   value nonetheless.  Examples are removal of obsolete types, fixes to
+   the state machine, clarification of the election process, message
+   validation, fixes to Failed-AVP and Result-Code AVP values, etc.  All
+   of the errata filed against RFC 3588 prior to the publication of this
+   document have been addressed.  A comprehensive list of changes is not
+   shown here for practical reasons.
 
+1.2.  Terminology
 
+   AAA
 
+      Authentication, Authorization, and Accounting.
 
-Fajardo, et al.           Expires July 24, 2011                [Page 11]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-1.2.  Terminology
 
-   AAA
 
-      Authentication, Authorization and Accounting.
+Fajardo, et al.              Standards Track                   [Page 12]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    ABNF
@@ -631,14 +683,12 @@ Internet-Draft           Diameter Base Protocol             January 2011
       is used to define message exchanges in a bi-directional
       communications protocol.
 
-
    Accounting
 
       The act of collecting information on resource usage for the
-      purpose of capacity planning, auditing, billing or cost
+      purpose of capacity planning, auditing, billing, or cost
       allocation.
 
-
    Accounting Record
 
       An accounting record represents a summary of the resource
@@ -647,114 +697,102 @@ Internet-Draft           Diameter Base Protocol             January 2011
       accounting events or accounting events from several devices
       serving the same user.
 
-
    Authentication
 
       The act of verifying the identity of an entity (subject).
 
-
    Authorization
 
       The act of determining whether a requesting entity (subject) will
       be allowed access to a resource (object).
 
-
-   AVP
+   Attribute-Value Pair (AVP)
 
       The Diameter protocol consists of a header followed by one or more
       Attribute-Value-Pairs (AVPs).  An AVP includes a header and is
       used to encapsulate protocol-specific data (e.g., routing
-      information) as well as authentication, authorization or
+      information) as well as authentication, authorization, or
+      accounting information.
 
+   Command Code Format (CCF)
 
+      A modified form of ABNF used to define Diameter commands (see
+      Section 3.2).
 
-Fajardo, et al.           Expires July 24, 2011                [Page 12]
-
-Internet-Draft           Diameter Base Protocol             January 2011
+   Diameter Agent
 
+      A Diameter Agent is a Diameter node that provides relay, proxy,
+      redirect, or translation services.
 
-      accounting information.
 
 
-   Diameter Agent
 
-      A Diameter Agent is a Diameter Node that provides either relay,
-      proxy, redirect or translation services.
+Fajardo, et al.              Standards Track                   [Page 13]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    Diameter Client
 
-      A Diameter Client is a Diameter Node that supports Diameter client
-      applications as well as the base protocol.  Diameter Clients are
+      A Diameter client is a Diameter node that supports Diameter client
+      applications as well as the base protocol.  Diameter clients are
       often implemented in devices situated at the edge of a network and
       provide access control services for that network.  Typical
-      examples of Diameter Clients include the Network Access Server
+      examples of Diameter clients include the Network Access Server
       (NAS) and the Mobile IP Foreign Agent (FA).
 
-
    Diameter Node
 
-      A Diameter Node is a host process that implements the Diameter
-      protocol, and acts either as a Client, Agent or Server.
-
+      A Diameter node is a host process that implements the Diameter
+      protocol and acts as either a client, an agent, or a server.
 
    Diameter Peer
 
-      If a Diameter Node shares a direct transport connection with
-      another Diameter Node, it is a Diameter Peer to that Diameter
-      Node.
-
+      Two Diameter nodes sharing a direct TCP or SCTP transport
+      connection are called Diameter peers.
 
    Diameter Server
 
-      A Diameter Server is a Diameter Node that handles authentication,
-      authorization and accounting requests for a particular realm.  By
-      its very nature, a Diameter Server must support Diameter server
+      A Diameter server is a Diameter node that handles authentication,
+      authorization, and accounting requests for a particular realm.  By
+      its very nature, a Diameter server must support Diameter server
       applications in addition to the base protocol.
 
-
    Downstream
 
       Downstream is used to identify the direction of a particular
-      Diameter message from the Home Server towards the Diameter Client.
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 13]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
+      Diameter message from the home server towards the Diameter client.
 
    Home Realm
 
       A Home Realm is the administrative domain with which the user
       maintains an account relationship.
 
-
    Home Server
 
-      A Diameter Server which serves the Home Realm.
-
+      A Diameter server that serves the Home Realm.
 
-   Interim accounting
+   Interim Accounting
 
       An interim accounting message provides a snapshot of usage during
-      a user's session.  It is typically implemented in order to provide
-      for partial accounting of a user's session in the case a device
-      reboot or other network problem prevents the delivery of a session
-      summary message or session record.
+      a user's session.  Typically, it is implemented in order to
+      provide for partial accounting of a user's session in case a
+      device reboot or other network problem prevents the delivery of a
+      session summary message or session record.
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 14]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    Local Realm
 
       A local realm is the administrative domain providing services to a
       user.  An administrative domain may act as a local realm for
-      certain users, while being a home realm for others.
-
+      certain users while being a home realm for others.
 
    Multi-session
 
@@ -764,60 +802,56 @@ Internet-Draft           Diameter Base Protocol             January 2011
       leg of the bundle would be a session while the entire bundle would
       be a multi-session.
 
-
    Network Access Identifier
 
       The Network Access Identifier, or NAI [RFC4282], is used in the
       Diameter protocol to extract a user's identity and realm.  The
       identity is used to identify the user during authentication and/or
-      authorization, while the realm is used for message routing
+      authorization while the realm is used for message routing
       purposes.
 
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 14]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    Proxy Agent or Proxy
 
       In addition to forwarding requests and responses, proxies make
       policy decisions relating to resource usage and provisioning.
-      This is typically accomplished by tracking the state of NAS
-      devices.  While proxies typically do not respond to client
-      Requests prior to receiving a Response from the server, they may
-      originate Reject messages in cases where policies are violated.
-      As a result, proxies need to understand the semantics of the
-      messages passing through them, and may not support all Diameter
+      Typically, this is accomplished by tracking the state of NAS
+      devices.  While proxies usually do not respond to client requests
+      prior to receiving a response from the server, they may originate
+      Reject messages in cases where policies are violated.  As a
+      result, proxies need to understand the semantics of the messages
+      passing through them, and they may not support all Diameter
       applications.
 
-
    Realm
 
       The string in the NAI that immediately follows the '@' character.
-      NAI realm names are required to be unique, and are piggybacked on
+      NAI realm names are required to be unique and are piggybacked on
       the administration of the DNS namespace.  Diameter makes use of
       the realm, also loosely referred to as domain, to determine
-      whether messages can be satisfied locally, or whether they must be
+      whether messages can be satisfied locally or whether they must be
       routed or redirected.  In RADIUS, realm names are not necessarily
       piggybacked on the DNS namespace but may be independent of it.
 
 
-   Real-time Accounting
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 15]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+   Real-Time Accounting
 
       Real-time accounting involves the processing of information on
-      resource usage within a defined time window.  Time constraints are
-      typically imposed in order to limit financial risk.  The Diameter
-      Credit Control Application [RFC4006] is an example of an
+      resource usage within a defined time window.  Typically, time
+      constraints are imposed in order to limit financial risk.  The
+      Diameter Credit-Control Application [RFC4006] is an example of an
       application that defines real-time accounting functionality.
 
-
    Relay Agent or Relay
 
       Relays forward requests and responses based on routing-related
@@ -827,20 +861,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
       the semantics of messages or non-routing AVPs, and are capable of
       handling any Diameter application or message type.  Since relays
       make decisions based on information in routing AVPs and realm
-      forwarding tables they do not keep state on NAS resource usage or
+      forwarding tables, they do not keep state on NAS resource usage or
       sessions in progress.
 
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 15]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    Redirect Agent
 
       Rather than forwarding requests and responses between clients and
@@ -850,11 +873,10 @@ Internet-Draft           Diameter Base Protocol             January 2011
       client and server.  Redirect agents do not originate messages and
       are capable of handling any message type, although they may be
       configured only to redirect messages of certain types, while
-      acting as relay or proxy agents for other types.  As with proxy
+      acting as relay or proxy agents for other types.  As with relay
       agents, redirect agents do not keep state with respect to sessions
       or NAS resources.
 
-
    Session
 
       A session is a related progression of events devoted to a
@@ -863,14 +885,19 @@ Internet-Draft           Diameter Base Protocol             January 2011
       packets with the same Session-Id are considered to be part of the
       same session.
 
-
    Stateful Agent
 
       A stateful agent is one that maintains session state information,
       by keeping track of all authorized active sessions.  Each
       authorized session is bound to a particular service, and its state
-      is considered active either until it is notified otherwise, or by
-      expiration.
+      is considered active either until it is notified otherwise or
+      until expiration.
+
+
+
+Fajardo, et al.              Standards Track                   [Page 16]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    Sub-session
@@ -881,53 +908,33 @@ Internet-Draft           Diameter Base Protocol             January 2011
       during the same session) or serially.  These changes in sessions
       are tracked with the Accounting-Sub-Session-Id.
 
-
-   Transaction state
+   Transaction State
 
       The Diameter protocol requires that agents maintain transaction
       state, which is used for failover purposes.  Transaction state
-      implies that upon forwarding a request, the Hop-by-Hop identifier
+      implies that upon forwarding a request, the Hop-by-Hop Identifier
       is saved; the field is replaced with a locally unique identifier,
       which is restored to its original value when the corresponding
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 16]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
       answer is received.  The request's state is released upon receipt
       of the answer.  A stateless agent is one that only maintains
       transaction state.
 
-
    Translation Agent
 
-      A translation agent is a stateful Diameter node that performs
-      protocol translation between Diameter and another AAA protocol,
-      such as RADIUS.
-
-
-   Transport Connection
-
-      A transport connection is a TCP or SCTP connection existing
-      directly between two Diameter peers, otherwise known as a Peer-to-
-      Peer Connection.
-
+      A translation agent (TLA in Figure 4) is a stateful Diameter node
+      that performs protocol translation between Diameter and another
+      AAA protocol, such as RADIUS.
 
    Upstream
 
       Upstream is used to identify the direction of a particular
-      Diameter message from the Diameter Client towards the Home Server.
-
+      Diameter message from the Diameter client towards the home server.
 
    User
 
       The entity or device requesting or using some resource, in support
       of which a Diameter client has generated a request.
 
-
 1.3.  Approach to Extensibility
 
    The Diameter protocol is designed to be extensible, using several
@@ -941,107 +948,108 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    o  Creating new applications
 
-   From the point of view of extensibility Diameter authentication,
-   authorization and accounting applications are treated in the same
-   way.
-
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 17]
+Fajardo, et al.              Standards Track                   [Page 17]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-   Note: Protocol designers should try to re-use existing functionality,
+   From the point of view of extensibility, Diameter authentication,
+   authorization, and accounting applications are treated in the same
+   way.
+
+   Note: Protocol designers should try to reuse existing functionality,
    namely AVP values, AVPs, commands, and Diameter applications.  Reuse
    simplifies standardization and implementation.  To avoid potential
-   interoperability issues it is important to ensure that the semantics
-   of the re-used features are well understood.  Given that Diameter can
-   also carry RADIUS attributes as Diameter AVPs, such re-use
-   considerations apply also to existing RADIUS attributes that may be
+   interoperability issues, it is important to ensure that the semantics
+   of the reused features are well understood.  Given that Diameter can
+   also carry RADIUS attributes as Diameter AVPs, such reuse
+   considerations also apply to existing RADIUS attributes that may be
    useful in a Diameter application.
 
-1.3.1.   Defining New AVP Values
+1.3.1.  Defining New AVP Values
 
    In order to allocate a new AVP value for AVPs defined in the Diameter
-   Base protocol, the IETF needs to approve a new RFC that describes the
+   base protocol, the IETF needs to approve a new RFC that describes the
    AVP value.  IANA considerations for these AVP values are discussed in
-   Section 11.4.
+   Section 11.3.
 
    The allocation of AVP values for other AVPs is guided by the IANA
    considerations of the document that defines those AVPs.  Typically,
-   allocation of new values for an AVP defined in an IETF RFC should
-   require IETF Review [RFC5226], whereas values for vendor-specific
-   AVPs can be allocated by the vendor.
+   allocation of new values for an AVP defined in an RFC would require
+   IETF Review [RFC5226], whereas values for vendor-specific AVPs can be
+   allocated by the vendor.
 
-1.3.2.   Creating New AVPs
+1.3.2.  Creating New AVPs
 
    A new AVP being defined MUST use one of the data types listed in
-   Section 4.2 or Section 4.3.  If an appropriate derived data type is
-   already defined, it SHOULD be used instead of a base data type to
-   encourage reusability and good design practice.
+   Sections 4.2 or 4.3.  If an appropriate derived data type is already
+   defined, it SHOULD be used instead of a base data type to encourage
+   reusability and good design practice.
 
    In the event that a logical grouping of AVPs is necessary, and
    multiple "groups" are possible in a given command, it is recommended
    that a Grouped AVP be used (see Section 4.4).
 
    The creation of new AVPs can happen in various ways.  The recommended
-   approach is to define a new general-purpose AVP in a standards track
-   RFC approved by the IETF.  However, as described in Section 11.1.1
-   there are also other mechanisms.
+   approach is to define a new general-purpose AVP in a Standards Track
+   RFC approved by the IETF.  However, as described in Section 11.1.1,
+   there are other mechanisms.
 
-1.3.3.   Creating New Commands
+1.3.3.  Creating New Commands
 
    A new Command Code MUST be allocated when required AVPs (those
-   indicated as {AVP} in the ABNF definition) are added to, deleted from
+   indicated as {AVP} in the CCF definition) are added to, deleted from,
    or redefined in (for example, by changing a required AVP into an
    optional one) an existing command.
 
-   Furthermore, if the transport characteristics of a command are
-   changed (for example, with respect to the number of round trips
-   required) a new Command Code MUST be registered.
 
 
-
-Fajardo, et al.           Expires July 24, 2011                [Page 18]
+Fajardo, et al.              Standards Track                   [Page 18]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
+   Furthermore, if the transport characteristics of a command are
+   changed (for example, with respect to the number of round trips
+   required), a new Command Code MUST be registered.
 
-   A change to the ABNF of a command, such as described above, MUST
+   A change to the CCF of a command, such as described above, MUST
    result in the definition of a new Command Code.  This subsequently
-   leads to the need to define a new Diameter Application for any
-   application that will use that new Command.
-
-   The IANA considerations for commands are discussed in Section 11.2.1.
-
-1.3.4.   Creating New Diameter Applications
-
-   Every Diameter application specification MUST have an IANA assigned
-   Application Id (see Section 2.4 and Section 11.3).  The managed
-   Application Id space is flat and there is no relationship between
-   different Diameter applications with respect to their Application
-   Ids. As such, there is no versioning support provided by these
-   application Ids itself; every Diameter application is a standalone
-   application.  If the application has a relationship with other
-   Diameter applications, such a relationship is not known to Diameter.
-
-   Before describing the rules for creating new Diameter applications it
-   is important to discuss the semantics of the AVPs occurrences as
-   stated in the ABNF and the M-bit flag (Section 4.1) for an AVP.
-   There is no relationship imposed between the two; they are set
+   leads to the need to define a new Diameter application for any
+   application that will use that new command.
+
+   The IANA considerations for Command Codes are discussed in
+   Section 3.1.
+
+1.3.4.  Creating New Diameter Applications
+
+   Every Diameter application specification MUST have an IANA-assigned
+   Application Id (see Section 2.4).  The managed Application ID space
+   is flat, and there is no relationship between different Diameter
+   applications with respect to their Application Ids.  As such, there
+   is no versioning support provided by these Application Ids
+   themselves; every Diameter application is a standalone application.
+   If the application has a relationship with other Diameter
+   applications, such a relationship is not known to Diameter.
+
+   Before describing the rules for creating new Diameter applications,
+   it is important to discuss the semantics of the AVP occurrences as
+   stated in the CCF and the M-bit flag (Section 4.1) for an AVP.  There
+   is no relationship imposed between the two; they are set
    independently.
 
-   o  The ABNF indicates what AVPs are placed into a Diameter Command by
-      the sender of that Command.  Often, since there are multiple modes
-      of protocol interactions many of the AVPs are indicated as
+   o  The CCF indicates what AVPs are placed into a Diameter command by
+      the sender of that command.  Often, since there are multiple modes
+      of protocol interactions, many of the AVPs are indicated as
       optional.
 
    o  The M-bit allows the sender to indicate to the receiver whether or
       not understanding the semantics of an AVP and its content is
       mandatory.  If the M-bit is set by the sender and the receiver
-      does not understand the AVP or the values carried within that AVP
+      does not understand the AVP or the values carried within that AVP,
       then a failure is generated (see Section 7).
 
    It is the decision of the protocol designer when to develop a new
@@ -1050,77 +1058,48 @@ Internet-Draft           Diameter Base Protocol             January 2011
    of the following criteria are met:
 
 
-   M-bit Setting
 
-      An AVP with the M-bit in the MUST column of the AVP flag table is
-      added to an existing Command/Application.
 
-      An AVP with the M-bit in the MAY column of the AVP flag table is
-      added to an existing Command/Application.
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 19]
+Fajardo, et al.              Standards Track                   [Page 19]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
+   M-bit Setting
+
+      An AVP with the M-bit in the MUST column of the AVP flag table is
+      added to an existing Command/Application.  An AVP with the M-bit
+      in the MAY column of the AVP flag table is added to an existing
+      Command/Application.
 
       Note: The M-bit setting for a given AVP is relevant to an
-      Application and each command within that application which
-      includes the AVP.  That is, if an AVP appears in two commands for
+      Application and each command within that application that includes
+      the AVP.  That is, if an AVP appears in two commands for
       application Foo and the M-bit settings are different in each
       command, then there should be two AVP flag tables describing when
       to set the M-bit.
 
    Commands
 
-      A new command is used within the existing application either
-      because an additional command is added, an existing command has
+      A new command is used within the existing application because
+      either an additional command is added, an existing command has
       been modified so that a new Command Code had to be registered, or
       a command has been deleted.
 
-   If the ABNF definition of a command allows it, an implementation may
+   AVP Flag bits
+
+      If an existing application changes the meaning/semantics of its
+      AVP Flags or adds new flag bits, then a new Diameter application
+      MUST be created.
+
+   If the CCF definition of a command allows it, an implementation may
    add arbitrary optional AVPs with the M-bit cleared (including vendor-
    specific AVPs) to that command without needing to define a new
    application.  Please refer to Section 11.1.1 for details.
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 20]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
 2.  Protocol Overview
 
    The base Diameter protocol concerns itself with establishing
@@ -1137,9 +1116,17 @@ Internet-Draft           Diameter Base Protocol             January 2011
    The initial request for authentication and/or authorization of a user
    would include the Session-Id AVP.  The Session-Id is then used in all
    subsequent messages to identify the user's session (see Section 8 for
-   more information).  The communicating party may accept the request,
-   or reject it by returning an answer message with the Result-Code AVP
-   set to indicate an error occurred.  The specific behavior of the
+
+
+
+Fajardo, et al.              Standards Track                   [Page 20]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+   more information).  The communicating party may accept the request or
+   reject it by returning an answer message with the Result-Code AVP set
+   to indicate that an error occurred.  The specific behavior of the
    Diameter server or client receiving a request depends on the Diameter
    application employed.
 
@@ -1153,30 +1140,23 @@ Internet-Draft           Diameter Base Protocol             January 2011
    applications.  For authentication and authorization, it is always
    extended for a particular application.
 
-   Diameter Clients MUST support the base protocol, which includes
+   Diameter clients MUST support the base protocol, which includes
    accounting.  In addition, they MUST fully support each Diameter
    application that is needed to implement the client's service, e.g.,
-   NASREQ and/or Mobile IPv4.  A Diameter Client MUST be referred to as
-   "Diameter X Client" where X is the application which it supports, and
-   not a "Diameter Client".
+   Network Access Server Requirements (NASREQ) [RFC2881] and/or Mobile
+   IPv4.  A Diameter client MUST be referred to as "Diameter X Client"
+   where X is the application that it supports and not a "Diameter
+   Client".
 
-   Diameter Servers MUST support the base protocol, which includes
+   Diameter servers MUST support the base protocol, which includes
    accounting.  In addition, they MUST fully support each Diameter
    application that is needed to implement the intended service, e.g.,
-   NASREQ and/or Mobile IPv4.  A Diameter Server MUST be referred to as
-   "Diameter X Server" where X is the application which it supports, and
+   NASREQ and/or Mobile IPv4.  A Diameter server MUST be referred to as
+   "Diameter X Server" where X is the application that it supports, and
    not a "Diameter Server".
 
-   Diameter Relays and redirect agents are transparent to the Diameter
-   applications but they MUST support the Diameter base protocol, which
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 21]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
+   Diameter relays and redirect agents are transparent to the Diameter
+   applications, but they MUST support the Diameter base protocol, which
    includes accounting, and all Diameter applications.
 
    Diameter proxies MUST support the base protocol, which includes
@@ -1186,55 +1166,75 @@ Internet-Draft           Diameter Base Protocol             January 2011
    "Diameter X Proxy" where X is the application which it supports, and
    not a "Diameter Proxy".
 
+
+
+
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 21]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
 2.1.  Transport
 
    The Diameter Transport profile is defined in [RFC3539].
 
-   The base Diameter protocol is run on port 3868 for both TCP [RFC793]
-   and SCTP [RFC4960].  For TLS [RFC5246] and DTLS [RFC4347], a Diameter
-   node that initiate a connection prior to any message exchanges MUST
-   run on port [TBD].  It is assumed that TLS is run on top of TCP when
-   it is used and DTLS is run on top of SCTP when it is used.
+   The base Diameter protocol is run on port 3868 for both TCP [RFC0793]
+   and SCTP [RFC4960].  For TLS [RFC5246] and Datagram Transport Layer
+   Security (DTLS) [RFC6347], a Diameter node that initiates a
+   connection prior to any message exchanges MUST run on port 5658.  It
+   is assumed that TLS is run on top of TCP when it is used, and DTLS is
+   run on top of SCTP when it is used.
 
    If the Diameter peer does not support receiving TLS/TCP and DTLS/SCTP
-   connections on port [TBD], i.e. the peer complies only with
-   [RFC3588], then the initiator MAY revert to using TCP or SCTP and on
-   port 3868.  Note that this scheme is kept for the purpose of
-   backwards compatibility only and that there are inherent security
-   vulnerabilities when the initial CER/CEA messages are sent un-
-   protected (see Section 5.6).
+   connections on port 5658 (i.e., the peer complies only with RFC
+   3588), then the initiator MAY revert to using TCP or SCTP on port
+   3868.  Note that this scheme is kept only for the purpose of backward
+   compatibility and that there are inherent security vulnerabilities
+   when the initial CER/CEA messages are sent unprotected (see
+   Section 5.6).
 
-   Diameter clients MUST support either TCP or SCTP, while agents and
-   servers SHOULD support both.
+   Diameter clients MUST support either TCP or SCTP; agents and servers
+   SHOULD support both.
 
    A Diameter node MAY initiate connections from a source port other
    than the one that it declares it accepts incoming connections on, and
-   MUST be prepared to receive connections on port 3868 for TCP or SCTP
-   and port [TBD] for TLS/TCP and DTLS/SCTP connections.  A given
-   Diameter instance of the peer state machine MUST NOT use more than
-   one transport connection to communicate with a given peer, unless
-   multiple instances exist on the peer in which case a separate
-   connection per process is allowed.
+   it MUST always be prepared to receive connections on port 3868 for
+   TCP or SCTP and port 5658 for TLS/TCP and DTLS/SCTP connections.
+   When DNS-based peer discovery (Section 5.2) is used, the port numbers
+   received from SRV records take precedence over the default ports
+   (3868 and 5658).
+
+   A given Diameter instance of the peer state machine MUST NOT use more
+   than one transport connection to communicate with a given peer,
+   unless multiple instances exist on the peer, in which, case a
+   separate connection per process is allowed.
 
    When no transport connection exists with a peer, an attempt to
-   connect SHOULD be periodically made.  This behavior is handled via
+   connect SHOULD be made periodically.  This behavior is handled via
    the Tc timer (see Section 12 for details), whose recommended value is
    30 seconds.  There are certain exceptions to this rule, such as when
    a peer has terminated the transport connection stating that it does
    not wish to communicate.
 
    When connecting to a peer and either zero or more transports are
-   specified, TLS SHOULD be tried first, followed by DTLS, then by TCP
+   specified, TLS SHOULD be tried first, followed by DTLS, then by TCP,
+   and finally by SCTP.  See Section 5.2 for more information on peer
+   discovery.
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 22]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-   and finally by SCTP.  See Section 5.2 for more information on peer
-   discovery.
+Fajardo, et al.              Standards Track                   [Page 22]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
    Diameter implementations SHOULD be able to interpret ICMP protocol
    port unreachable messages as explicit indications that the server is
@@ -1253,18 +1253,18 @@ Internet-Draft           Diameter Base Protocol             January 2011
    Diameter messages SHOULD be mapped into SCTP streams in a way that
    avoids head-of-the-line (HOL) blocking.  Among different ways of
    performing the mapping that fulfill this requirement it is
-   RECOMMENDED that a Diameter node sends every Diameter message
-   (request or response) over the stream zero with the unordered flag
-   set.  However, Diameter nodes MAY select and implement other design
-   alternatives for avoiding HOL blocking such as using multiple streams
-   with the unordered flag cleared (as originally instructed in
-   RFC3588).  On the receiving side, a Diameter entity MUST be ready to
-   receive Diameter messages over any stream and it is free to return
-   responses over a different stream.  This way, both sides manage the
-   available streams in the sending direction, independently of the
-   streams chosen by the other side to send a particular Diameter
-   message.  These messages can be out-of-order and belong to different
-   Diameter sessions.
+   RECOMMENDED that a Diameter node send every Diameter message (request
+   or response) over stream zero with the unordered flag set.  However,
+   Diameter nodes MAY select and implement other design alternatives for
+   avoiding HOL blocking such as using multiple streams with the
+   unordered flag cleared (as originally instructed in RFC 3588).  On
+   the receiving side, a Diameter entity MUST be ready to receive
+   Diameter messages over any stream, and it is free to return responses
+   over a different stream.  This way, both sides manage the available
+   streams in the sending direction, independently of the streams chosen
+   by the other side to send a particular Diameter message.  These
+   messages can be out-of-order and belong to different Diameter
+   sessions.
 
    Out-of-order delivery has special concerns during a connection
    establishment and termination.  When a connection is established, the
@@ -1275,30 +1275,37 @@ Internet-Draft           Diameter Base Protocol             January 2011
    the connection.  In order to avoid this race condition, the receiver
    side SHOULD NOT use out-of-order delivery methods until the first
    message has been received from the initiator, proving that it has
-   moved to I-Open state.  To trigger such message, the receiver side
-   could send a DWR immediatly after sending CEA.  Upon reception of the
-   corresponding DWA, the receiver side should start using out-of-order
-   delivery methods to counter the HOL blocking.
+   moved to I-Open state.  To trigger such a message, the receiver side
+   could send a DWR immediately after sending a CEA.  Upon reception of
+   the corresponding DWA, the receiver side should start using out-of-
+   order delivery methods to counter the HOL blocking.
 
    Another race condition may occur when DPR and DPA messages are used.
+   Both DPR and DPA are small in size; thus, they may be delivered to
+   the peer faster than application messages when an out-of-order
+   delivery mechanism is used.  Therefore, it is possible that a DPR/DPA
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 23]
+Fajardo, et al.              Standards Track                   [Page 23]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
+   exchange completes while application messages are still in transit,
+   resulting in a loss of these messages.  An implementation could
+   mitigate this race condition, for example, using timers, and wait for
+   a short period of time for pending application level messages to
+   arrive before proceeding to disconnect the transport connection.
+   Eventually, lost messages are handled by the retransmission mechanism
+   described in Section 5.5.4.
 
-   Both DPR and DPA are small in size, thus they may be delivered faster
-   to the peer than application messages when out-of-order delivery
-   mechanism is used.  Therefore, it is possible that a DPR/DPA exchange
-   completes while application messages are still in transit, resulting
-   to a loss of these messages.  An implementation could mitigate this
-   race condition, for example, using timers and wait for a short period
-   of time for pending application level messages to arrive before
-   proceeding to disconnect the transport connection.  Eventually, lost
-   messages are handled by the retransmission mechanism described in
-   Section 5.5.4.
+   A Diameter agent SHOULD use dedicated payload protocol identifiers
+   (PPIDs) for clear text and encrypted SCTP DATA chunks instead of only
+   using the unspecified payload protocol identifier (value 0).  For
+   this purpose, two PPID values are allocated: the PPID value 46 is for
+   Diameter messages in clear text SCTP DATA chunks, and the PPID value
+   47 is for Diameter messages in protected DTLS/SCTP DATA chunks.
 
 2.2.  Securing Diameter Messages
 
@@ -1307,7 +1314,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
    the use of TLS/TCP and DTLS/SCTP.  If desired, alternative security
    mechanisms that are independent of Diameter, such as IPsec [RFC4301],
    can be deployed to secure connections between peers.  The Diameter
-   protocol MUST NOT be used without any security mechanism.
+   protocol MUST NOT be used without one of TLS, DTLS, or IPsec.
 
 2.3.  Diameter Application Compliance
 
@@ -1318,37 +1325,40 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    Implementations MAY add arbitrary optional AVPs with the M-bit
    cleared (including vendor-specific AVPs) to a command defined in an
-   application, but only if the command's ABNF syntax specification
+   application, but only if the command's CCF syntax specification
    allows for it.  Please refer to Section 11.1.1 for details.
 
 2.4.  Application Identifiers
 
-   Each Diameter application MUST have an IANA assigned Application Id
-   (see Section 11.3).  The base protocol does not require an
-   Application Id since its support is mandatory.  During the
-   capabilities exchange, Diameter nodes inform their peers of locally
-   supported applications.  Furthermore, all Diameter messages contain
-   an Application Id, which is used in the message forwarding process.
+   Each Diameter application MUST have an IANA-assigned Application ID.
+   The base protocol does not require an Application Id since its
+   support is mandatory.  During the capabilities exchange, Diameter
+   nodes inform their peers of locally supported applications.
+   Furthermore, all Diameter messages contain an Application Id, which
+   is used in the message forwarding process.
 
-   The following Application Id values are defined:
 
-         Diameter Common Messages      0
-         Diameter Base Accounting      3
-         Relay                         0xffffffff
 
-   Relay and redirect agents MUST advertise the Relay Application
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 24]
+
+Fajardo, et al.              Standards Track                   [Page 24]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
+   The following Application Id values are defined:
+
+         Diameter common message       0
+         Diameter base accounting      3
+         Relay                         0xffffffff
 
-   Identifier, while all other Diameter nodes MUST advertise locally
-   supported applications.  The receiver of a Capabilities Exchange
-   message advertising Relay service MUST assume that the sender
-   supports all current and future applications.
+   Relay and redirect agents MUST advertise the Relay Application ID,
+   while all other Diameter nodes MUST advertise locally supported
+   applications.  The receiver of a Capabilities Exchange message
+   advertising relay service MUST assume that the sender supports all
+   current and future applications.
 
    Diameter relay and proxy agents are responsible for finding an
    upstream server that supports the application of a particular
@@ -1358,16 +1368,15 @@ Internet-Draft           Diameter Base Protocol             January 2011
 2.5.  Connections vs. Sessions
 
    This section attempts to provide the reader with an understanding of
-   the difference between connection and session, which are terms used
-   extensively throughout this document.
+   the difference between "connection" and "session", which are terms
+   used extensively throughout this document.
 
-   A connection refers to a transport level connection between two peers
+   A connection refers to a transport-level connection between two peers
    that is used to send and receive Diameter messages.  A session is a
-   logical concept at the application layer existing between the
+   logical concept at the application layer that exists between the
    Diameter client and the Diameter server; it is identified via the
    Session-Id AVP.
 
-
              +--------+          +-------+          +--------+
              | Client |          | Relay |          | Server |
              +--------+          +-------+          +--------+
@@ -1377,100 +1386,93 @@ Internet-Draft           Diameter Base Protocol             January 2011
                       <----------------------------->
                               User session x
 
-                Figure 1: Diameter connections and sessions
+                Figure 1: Diameter Connections and Sessions
 
    In the example provided in Figure 1, peer connection A is established
-   between the Client and the Relay.  Peer connection B is established
-   between the Relay and the Server.  User session X spans from the
-   Client via the Relay to the Server.  Each "user" of a service causes
+   between the client and the relay.  Peer connection B is established
+   between the relay and the server.  User session X spans from the
+   client via the relay to the server.  Each "user" of a service causes
    an auth request to be sent, with a unique session identifier.  Once
    accepted by the server, both the client and the server are aware of
    the session.
 
-   It is important to note that there is no relationship between a
-   connection and a session, and that Diameter messages for multiple
-   sessions are all multiplexed through a single connection.  Also note
-   that Diameter messages pertaining to the session, both application
-   specific and those that are defined in this document such as ASR/ASA,
-   RAR/RAA and STR/STA MUST carry the Application Id of the application.
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 25]
+Fajardo, et al.              Standards Track                   [Page 25]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-   Diameter messages pertaining to peer connection establishment and
-   maintenance such as CER/CEA, DWR/DWA and DPR/DPA MUST carry an
-   Application Id of zero (0).
+   It is important to note that there is no relationship between a
+   connection and a session, and that Diameter messages for multiple
+   sessions are all multiplexed through a single connection.  Also, note
+   that Diameter messages pertaining to the session, both application-
+   specific and those that are defined in this document such as ASR/ASA,
+   RAR/RAA, and STR/STA, MUST carry the Application Id of the
+   application.  Diameter messages pertaining to peer connection
+   establishment and maintenance such as CER/CEA, DWR/DWA, and DPR/DPA
+   MUST carry an Application Id of zero (0).
 
 2.6.  Peer Table
 
-   The Diameter Peer Table is used in message forwarding, and referenced
-   by the Routing Table.  A Peer Table entry contains the following
-   fields:
+   The Diameter peer table is used in message forwarding and is
+   referenced by the routing table.  A peer table entry contains the
+   following fields:
 
-   Host identity
+   Host Identity
 
-      Following the conventions described for the DiameterIdentity
-      derived AVP data format in Section 4.3.  This field contains the
+      Following the conventions described for the DiameterIdentity-
+      derived AVP data format in Section 4.3.1, this field contains the
       contents of the Origin-Host (Section 6.3) AVP found in the CER or
       CEA message.
 
-
    StatusT
 
-      This is the state of the peer entry, and MUST match one of the
+      This is the state of the peer entry, and it MUST match one of the
       values listed in Section 5.6.
 
-
    Static or Dynamic
 
       Specifies whether a peer entry was statically configured or
       dynamically discovered.
 
-
-   Expiration time
+   Expiration Time
 
       Specifies the time at which dynamically discovered peer table
-      entries are to be either refreshed, or expired.
-
+      entries are to be either refreshed or expired.  If public key
+      certificates are used for Diameter security (e.g., with TLS), this
+      value MUST NOT be greater than the expiry times in the relevant
+      certificates.
 
    TLS/TCP and DTLS/SCTP Enabled
 
       Specifies whether TLS/TCP and DTLS/SCTP is to be used when
       communicating with the peer.
 
-
    Additional security information, when needed (e.g., keys,
-   certificates)
-
-
+   certificates).
 
 
 
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 26]
+Fajardo, et al.              Standards Track                   [Page 26]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 2.7.  Routing Table
 
    All Realm-Based routing lookups are performed against what is
-   commonly known as the Routing Table (see Section 12).  A Routing
-   Table Entry contains the following fields:
+   commonly known as the routing table (see Section 12).  Each routing
+   table entry contains the following fields:
 
    Realm Name
 
-      This is the field that is MUST be used as a primary key in the
+      This is the field that MUST be used as a primary key in the
       routing table lookups.  Note that some implementations perform
       their lookups based on longest-match-from-the-right on the realm
       rather than requiring an exact match.
 
-
    Application Identifier
 
       An application is identified by an Application Id.  A route entry
@@ -1478,21 +1480,19 @@ Internet-Draft           Diameter Base Protocol             January 2011
       the message header.  This field MUST be used as a secondary key
       field in routing table lookups.
 
-
    Local Action
 
       The Local Action field is used to identify how a message should be
       treated.  The following actions are supported:
 
-
-      1.  LOCAL - Diameter messages that can be satisfied locally, and
-          do not need to be routed to another Diameter entity.
+      1.  LOCAL - Diameter messages that can be satisfied locally and do
+          not need to be routed to another Diameter entity.
 
       2.  RELAY - All Diameter messages that fall within this category
-          MUST be routed to a next hop Diameter entity that is indicated
+          MUST be routed to a next-hop Diameter entity that is indicated
           by the identifier described below.  Routing is done without
           modifying any non-routing AVPs.  See Section 6.1.9 for
-          relaying guidelines
+          relaying guidelines.
 
       3.  PROXY - All Diameter messages that fall within this category
           MUST be routed to a next Diameter entity that is indicated by
@@ -1504,47 +1504,53 @@ Internet-Draft           Diameter Base Protocol             January 2011
       4.  REDIRECT - Diameter messages that fall within this category
           MUST have the identity of the home Diameter server(s)
           appended, and returned to the sender of the message.  See
-          Section 6.1.8 for redirect guidelines.
+          Section 6.1.8 for redirection guidelines.
+
+
+
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 27]
+Fajardo, et al.              Standards Track                   [Page 27]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    Server Identifier
 
-      One or more servers to which the message is to be routed.  These
-      servers MUST also be present in the Peer table.  When the Local
-      Action is set to RELAY or PROXY, this field contains the identity
-      of the server(s) the message MUST be routed to.  When the Local
+      The identity of one or more servers to which the message is to be
+      routed.  This identity MUST also be present in the Host Identity
+      field of the peer table (Section 2.6).  When the Local Action is
+      set to RELAY or PROXY, this field contains the identity of the
+      server(s) to which the message MUST be routed.  When the Local
       Action field is set to REDIRECT, this field contains the identity
-      of one or more servers the message MUST be redirected to.
+      of one or more servers to which the message MUST be redirected.
 
    Static or Dynamic
 
       Specifies whether a route entry was statically configured or
       dynamically discovered.
 
-   Expiration time
+   Expiration Time
 
       Specifies the time at which a dynamically discovered route table
-      entry expires.
+      entry expires.  If public key certificates are used for Diameter
+      security (e.g., with TLS), this value MUST NOT be greater than the
+      expiry time in the relevant certificates.
 
    It is important to note that Diameter agents MUST support at least
-   one of the LOCAL, RELAY, PROXY or REDIRECT modes of operation.
+   one of the LOCAL, RELAY, PROXY, or REDIRECT modes of operation.
    Agents do not need to support all modes of operation in order to
-   conform with the protocol specification, but MUST follow the protocol
-   compliance guidelines in Section 2.  Relay agents and proxies MUST
-   NOT reorder AVPs.
+   conform with the protocol specification, but they MUST follow the
+   protocol compliance guidelines in Section 2.  Relay agents and
+   proxies MUST NOT reorder AVPs.
 
    The routing table MAY include a default entry that MUST be used for
    any requests not matching any of the other entries.  The routing
    table MAY consist of only such an entry.
 
    When a request is routed, the target server MUST have advertised the
-   Application Id (see Section 2.4) for the given message, or have
+   Application Id (see Section 2.4) for the given message or have
    advertised itself as a relay or proxy agent.  Otherwise, an error is
    returned with the Result-Code AVP set to DIAMETER_UNABLE_TO_DELIVER.
 
@@ -1552,23 +1558,24 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    In addition to clients and servers, the Diameter protocol introduces
    relay, proxy, redirect, and translation agents, each of which is
-   defined in Section 1.3.  These Diameter agents are useful for several
+   defined in Section 1.2.  Diameter agents are useful for several
    reasons:
 
    o  They can distribute administration of systems to a configurable
       grouping, including the maintenance of security associations.
 
-   o  They can be used for concentration of requests from an number of
-      co-located or distributed NAS equipment sets to a set of like user
-      groups.
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 28]
+Fajardo, et al.              Standards Track                   [Page 28]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
+   o  They can be used for concentration of requests from a number of
+      co-located or distributed NAS equipment sets to a set of like user
+      groups.
+
    o  They can do value-added processing to the requests or responses.
 
    o  They can be used for load balancing.
@@ -1578,7 +1585,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    The Diameter protocol requires that agents maintain transaction
    state, which is used for failover purposes.  Transaction state
-   implies that upon forwarding a request, its Hop-by-Hop identifier is
+   implies that upon forwarding a request, its Hop-by-Hop Identifier is
    saved; the field is replaced with a locally unique identifier, which
    is restored to its original value when the corresponding answer is
    received.  The request's state is released upon receipt of the
@@ -1593,7 +1600,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
    A stateful agent is one that maintains session state information by
    keeping track of all authorized active sessions.  Each authorized
    session is bound to a particular service, and its state is considered
-   active either until the agent is notified otherwise, or the session
+   active until either the agent is notified otherwise or the session
    expires.  Each authorized session has an expiration, which is
    communicated by Diameter servers via the Session-Timeout AVP.
 
@@ -1604,40 +1611,43 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    o  Limiting resources authorized to a particular user
 
-   o  Per user or transaction auditing
+   o  Per-user or per-transaction auditing
 
    A Diameter agent MAY act in a stateful manner for some requests and
    be stateless for others.  A Diameter implementation MAY act as one
-   type of agent for some requests, and as another type of agent for
+   type of agent for some requests and as another type of agent for
    others.
 
-2.8.1.  Relay Agents
 
-   Relay Agents are Diameter agents that accept requests and route
-   messages to other Diameter nodes based on information found in the
-   messages (e.g., Destination-Realm).  This routing decision is
-   performed using a list of supported realms, and known peers.  This is
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 29]
+
+Fajardo, et al.              Standards Track                   [Page 29]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
+2.8.1.  Relay Agents
 
-   known as the Routing Table, as is defined further in Section 2.7.
+   Relay agents are Diameter agents that accept requests and route
+   messages to other Diameter nodes based on information found in the
+   messages (e.g., the value of the Destination-Realm AVP Section 6.6).
+   This routing decision is performed using a list of supported realms
+   and known peers.  This is known as the routing table, as is defined
+   further in Section 2.7.
 
    Relays may, for example, be used to aggregate requests from multiple
    Network Access Servers (NASes) within a common geographical area
-   (POP).  The use of Relays is advantageous since it eliminates the
-   need for NASes to be configured with the necessary security
-   information they would otherwise require to communicate with Diameter
-   servers in other realms.  Likewise, this reduces the configuration
-   load on Diameter servers that would otherwise be necessary when NASes
-   are added, changed or deleted.
+   (Point of Presence, POP).  The use of relays is advantageous since it
+   eliminates the need for NASes to be configured with the necessary
+   security information they would otherwise require to communicate with
+   Diameter servers in other realms.  Likewise, this reduces the
+   configuration load on Diameter servers that would otherwise be
+   necessary when NASes are added, changed, or deleted.
 
    Relays modify Diameter messages by inserting and removing routing
-   information, but do not modify any other portion of a message.
+   information, but they do not modify any other portion of a message.
    Relays SHOULD NOT maintain session state but MUST maintain
    transaction state.
 
@@ -1650,44 +1660,46 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
                   Figure 2: Relaying of Diameter messages
 
-   The example provided in Figure 2 depicts a request issued from NAS,
+   The example provided in Figure 2 depicts a request issued from a NAS,
    which is an access device, for the user [email protected].  Prior to
-   issuing the request, NAS performs a Diameter route lookup, using
+   issuing the request, the NAS performs a Diameter route lookup, using
    "example.com" as the key, and determines that the message is to be
-   relayed to DRL, which is a Diameter Relay.  DRL performs the same
-   route lookup as NAS, and relays the message to HMS, which is
-   example.com's Home Diameter Server.  HMS identifies that the request
-   can be locally supported (via the realm), processes the
+   relayed to a DRL, which is a Diameter relay.  The DRL performs the
+   same route lookup as the NAS, and relays the message to the HMS,
+   which is example.com's home server.  The HMS identifies that the
+   request can be locally supported (via the realm), processes the
    authentication and/or authorization request, and replies with an
-   answer, which is routed back to NAS using saved transaction state.
-
-   Since Relays do not perform any application level processing, they
-   provide relaying services for all Diameter applications, and
-   therefore MUST advertise the Relay Application Id.
+   answer, which is routed back to the NAS using saved transaction
+   state.
 
-2.8.2.  Proxy Agents
+   Since relays do not perform any application-level processing, they
+   provide relaying services for all Diameter applications; therefore,
+   they MUST advertise the Relay Application Id.
 
-   Similarly to relays, proxy agents route Diameter messages using the
-   Diameter Routing Table.  However, they differ since they modify
-   messages to implement policy enforcement.  This requires that proxies
-   maintain the state of their downstream peers (e.g., access devices)
-   to enforce resource usage, provide admission control, and
-   provisioning.
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 30]
+Fajardo, et al.              Standards Track                   [Page 30]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
+2.8.2.  Proxy Agents
+
+   Similar to relays, proxy agents route Diameter messages using the
+   Diameter routing table.  However, they differ since they modify
+   messages to implement policy enforcement.  This requires that proxies
+   maintain the state of their downstream peers (e.g., access devices)
+   to enforce resource usage, provide admission control, and provide
+   provisioning.
 
    Proxies may, for example, be used in call control centers or access
-   ISPs that provide outsourced connections, they can monitor the number
-   and types of ports in use, and make allocation and admission
-   decisions according to their configuration.
+   ISPs that provide outsourced connections; they can monitor the number
+   and type of ports in use and make allocation and admission decisions
+   according to their configuration.
 
    Since enforcing policies requires an understanding of the service
-   being provided, Proxies MUST only advertise the Diameter applications
+   being provided, proxies MUST only advertise the Diameter applications
    they support.
 
 2.8.3.  Redirect Agents
@@ -1709,18 +1721,12 @@ Internet-Draft           Diameter Base Protocol             January 2011
    The example provided in Figure 3 depicts a request issued from the
    access device, NAS, for the user [email protected].  The message is
    forwarded by the NAS to its relay, DRL, which does not have a routing
-   entry in its Diameter Routing Table for example.com.  DRL has a
+   entry in its Diameter routing table for example.com.  The DRL has a
    default route configured to DRD, which is a redirect agent that
-   returns a redirect notification to DRL, as well as HMS' contact
-   information.  Upon receipt of the redirect notification, DRL
-   establishes a transport connection with HMS, if one doesn't already
-   exist, and forwards the request to it.
-
-
-
-
-
-
+   returns a redirect notification to DRL, as well as the HMS' contact
+   information.  Upon receipt of the redirect notification, the DRL
+   establishes a transport connection with the HMS, if one doesn't
+   already exist, and forwards the request to it.
 
 
 
@@ -1729,12 +1735,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 31]
+Fajardo, et al.              Standards Track                   [Page 31]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
                                   +------+
@@ -1755,10 +1758,10 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
                  Figure 3: Redirecting a Diameter Message
 
-   Since redirect agents do not perform any application level
+   Since redirect agents do not perform any application-level
    processing, they provide relaying services for all Diameter
-   applications, and therefore MUST advertise the Relay Application
-   Identifier.
+   applications; therefore, they MUST advertise the Relay Application
+   ID.
 
 2.8.4.  Translation Agents
 
@@ -1773,7 +1776,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
    MUST maintain transaction state.
 
    Translation of messages can only occur if the agent recognizes the
-   application of a particular request, and therefore translation agents
+   application of a particular request; therefore, translation agents
    MUST only advertise their locally supported applications.
 
        +------+    --------->     +------+     --------->    +------+
@@ -1788,23 +1791,24 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 32]
+Fajardo, et al.              Standards Track                   [Page 32]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 2.9.  Diameter Path Authorization
 
-   As noted in Section 2.2, Diameter provides transmission level
+   As noted in Section 2.2, Diameter provides transmission-level
    security for each connection using TLS/TCP and DTLS/SCTP.  Therefore,
-   each connection can be authenticated, replay and integrity protected.
+   each connection can be authenticated and can be replay and integrity
+   protected.
 
-   In addition to authenticating each connection, each connection as
-   well as the entire session MUST also be authorized.  Before
-   initiating a connection, a Diameter Peer MUST check that its peers
-   are authorized to act in their roles.  For example, a Diameter peer
-   may be authentic, but that does not mean that it is authorized to act
-   as a Diameter Server advertising a set of Diameter applications.
+   In addition to authenticating each connection, the entire session
+   MUST also be authorized.  Before initiating a connection, a Diameter
+   peer MUST check that its peers are authorized to act in their roles.
+   For example, a Diameter peer may be authentic, but that does not mean
+   that it is authorized to act as a Diameter server advertising a set
+   of Diameter applications.
 
    Prior to bringing up a connection, authorization checks are performed
    at each connection along the path.  Diameter capabilities negotiation
@@ -1815,7 +1819,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    As noted in Section 6.1.9, a relay or proxy agent MUST append a
    Route-Record AVP to all requests forwarded.  The AVP contains the
-   identity of the peer the request was received from.
+   identity of the peer from which the request was received.
 
    The home Diameter server, prior to authorizing a session, MUST check
    the Route-Record AVPs to make sure that the route traversed by the
@@ -1823,7 +1827,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
    realm may not wish to honor requests that have been routed through an
    untrusted realm.  By authorizing a request, the home Diameter server
    is implicitly indicating its willingness to engage in the business
-   transaction as specified by the contractual relationship between the
+   transaction as specified by any contractual relationship between the
    server and the previous hop.  A DIAMETER_AUTHORIZATION_REJECTED error
    message (see Section 7.1.5) is sent if the route traversed by the
    request is unacceptable.
@@ -1839,72 +1843,24 @@ Internet-Draft           Diameter Base Protocol             January 2011
    willingness to take on financial risk relative to the session.  A
    local realm may wish to limit this exposure, for example, by
    establishing credit limits for intermediate realms and refusing to
-   accept responses which would violate those limits.  By issuing an
-   accounting request corresponding to the authorization response, the
+   accept responses that would violate those limits.  By issuing an
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 33]
+Fajardo, et al.              Standards Track                   [Page 33]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
+   accounting request corresponding to the authorization response, the
    local realm implicitly indicates its agreement to provide the service
    indicated in the authorization response.  If the service cannot be
    provided by the local realm, then a DIAMETER_UNABLE_TO_COMPLY error
    message MUST be sent within the accounting request; a Diameter client
    receiving an authorization response for a service that it cannot
-   perform MUST NOT substitute an alternate service, and then send
+   perform MUST NOT substitute an alternate service and then send
    accounting requests for the alternate service instead.
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 34]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
 3.  Diameter Header
 
    A summary of the Diameter header format is shown below.  The fields
@@ -1915,7 +1871,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       |    Version    |                 Message Length                |
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      | command flags |                  Command-Code                 |
+      | Command Flags |                  Command Code                 |
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       |                         Application-ID                        |
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -1935,13 +1891,23 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
       The Message Length field is three octets and indicates the length
       of the Diameter message including the header fields and the padded
-      AVPs.  Thus the message length field is always a multiple of 4.
+      AVPs.  Thus, the Message Length field is always a multiple of 4.
 
    Command Flags
 
       The Command Flags field is eight bits.  The following bits are
       assigned:
 
+
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 34]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
           0 1 2 3 4 5 6 7
          +-+-+-+-+-+-+-+-+
          |R P E T r r r r|
@@ -1952,127 +1918,113 @@ Internet-Draft           Diameter Base Protocol             January 2011
          If set, the message is a request.  If cleared, the message is
          an answer.
 
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 35]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
       P(roxiable)
 
-         If set, the message MAY be proxied, relayed or redirected.  If
+         If set, the message MAY be proxied, relayed, or redirected.  If
          cleared, the message MUST be locally processed.
 
-
       E(rror)
 
          If set, the message contains a protocol error, and the message
-         will not conform to the ABNF described for this command.
+         will not conform to the CCF described for this command.
          Messages with the 'E' bit set are commonly referred to as error
-         messages.  This bit MUST NOT be set in request messages.  See
-         Section 7.2.
+         messages.  This bit MUST NOT be set in request messages (see
+         Section 7.2).
 
-
-      T(Potentially re-transmitted message)
+      T(Potentially retransmitted message)
 
          This flag is set after a link failover procedure, to aid the
          removal of duplicate requests.  It is set when resending
          requests not yet acknowledged, as an indication of a possible
          duplicate due to a link failure.  This bit MUST be cleared when
-         sending a request for the first time, otherwise the sender MUST
-         set this flag.  Diameter agents only need to be concerned about
-         the number of requests they send based on a single received
-         request; retransmissions by other entities need not be tracked.
-         Diameter agents that receive a request with the T flag set,
-         MUST keep the T flag set in the forwarded request.  This flag
-         MUST NOT be set if an error answer message (e.g., a protocol
-         error) has been received for the earlier message.  It can be
-         set only in cases where no answer has been received from the
-         server for a request and the request is sent again.  This flag
-         MUST NOT be set in answer messages.
-
+         sending a request for the first time; otherwise, the sender
+         MUST set this flag.  Diameter agents only need to be concerned
+         about the number of requests they send based on a single
+         received request; retransmissions by other entities need not be
+         tracked.  Diameter agents that receive a request with the T
+         flag set, MUST keep the T flag set in the forwarded request.
+         This flag MUST NOT be set if an error answer message (e.g., a
+         protocol error) has been received for the earlier message.  It
+         can be set only in cases where no answer has been received from
+         the server for a request, and the request has been sent again.
+         This flag MUST NOT be set in answer messages.
 
       r(eserved)
 
-         These flag bits are reserved for future use, and MUST be set to
-         zero, and ignored by the receiver.
+         These flag bits are reserved for future use; they MUST be set
+         to zero and ignored by the receiver.
 
-   Command-Code
 
-      The Command-Code field is three octets, and is used in order to
-      communicate the command associated with the message.  The 24-bit
-      address space is managed by IANA (see Section 11.2.1).
 
-      Command-Code values 16,777,214 and 16,777,215 (hexadecimal values
-      FFFFFE -FFFFFF) are reserved for experimental use (See Section
-      11.3).
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 36]
+Fajardo, et al.              Standards Track                   [Page 35]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+   Command Code
 
+      The Command Code field is three octets and is used in order to
+      communicate the command associated with the message.  The 24-bit
+      address space is managed by IANA (see Section 3.1).  Command Code
+      values 16,777,214 and 16,777,215 (hexadecimal values FFFFFE-
+      FFFFFF) are reserved for experimental use (see Section 11.2).
 
-    Application-ID
+   Application-ID
 
-      Application-ID is four octets and is used to identify to which
-      application the message is applicable for.  The application can be
-      an authentication application, an accounting application or a
-      vendor specific application.  See Section 11.3 for the possible
-      values that the application-id may use.
+      Application-ID is four octets and is used to identify for which
+      application the message is applicable.  The application can be an
+      authentication application, an accounting application, or a
+      vendor-specific application.
 
-      The value of the application-id field in the header MUST be the
-      same as any relevant application-id AVPs contained in the message.
+      The value of the Application-ID field in the header MUST be the
+      same as any relevant Application-Id AVPs contained in the message.
 
    Hop-by-Hop Identifier
 
       The Hop-by-Hop Identifier is an unsigned 32-bit integer field (in
-      network byte order) and aids in matching requests and replies.
-      The sender MUST ensure that the Hop-by-Hop identifier in a request
-      is unique on a given connection at any given time, and MAY attempt
-      to ensure that the number is unique across reboots.  The sender of
-      an Answer message MUST ensure that the Hop-by-Hop Identifier field
-      contains the same value that was found in the corresponding
-      request.  The Hop-by-Hop identifier is normally a monotonically
-      increasing number, whose start value was randomly generated.  An
-      answer message that is received with an unknown Hop-by-Hop
-      Identifier MUST be discarded.
-
+      network byte order) that aids in matching requests and replies.
+      The sender MUST ensure that the Hop-by-Hop Identifier in a request
+      is unique on a given connection at any given time, and it MAY
+      attempt to ensure that the number is unique across reboots.  The
+      sender of an answer message MUST ensure that the Hop-by-Hop
+      Identifier field contains the same value that was found in the
+      corresponding request.  The Hop-by-Hop Identifier is normally a
+      monotonically increasing number, whose start value was randomly
+      generated.  An answer message that is received with an unknown
+      Hop-by-Hop Identifier MUST be discarded.
 
    End-to-End Identifier
 
       The End-to-End Identifier is an unsigned 32-bit integer field (in
-      network byte order) and is used to detect duplicate messages.
-      Upon reboot implementations MAY set the high order 12 bits to
+      network byte order) that is used to detect duplicate messages.
+      Upon reboot, implementations MAY set the high order 12 bits to
       contain the low order 12 bits of current time, and the low order
       20 bits to a random value.  Senders of request messages MUST
       insert a unique identifier on each message.  The identifier MUST
       remain locally unique for a period of at least 4 minutes, even
-      across reboots.  The originator of an Answer message MUST ensure
+      across reboots.  The originator of an answer message MUST ensure
       that the End-to-End Identifier field contains the same value that
       was found in the corresponding request.  The End-to-End Identifier
       MUST NOT be modified by Diameter agents of any kind.  The
-      combination of the Origin-Host (see Section 6.3) and this field is
+      combination of the Origin-Host AVP (Section 6.3) and this field is
       used to detect duplicates.  Duplicate requests SHOULD cause the
-      same answer to be transmitted (modulo the hop-by-hop Identifier
-      field and any routing AVPs that may be present), and MUST NOT
-      affect any state that was set when the original request was
-      processed.  Duplicate answer messages that are to be locally
-      consumed (see Section 6.2) SHOULD be silently discarded.
-
-
+      same answer to be transmitted (modulo the Hop-by-Hop Identifier
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 37]
+Fajardo, et al.              Standards Track                   [Page 36]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
+      field and any routing AVPs that may be present), and they MUST NOT
+      affect any state that was set when the original request was
+      processed.  Duplicate answer messages that are to be locally
+      consumed (see Section 6.2) SHOULD be silently discarded.
+
    AVPs
 
       AVPs are a method of encapsulating information relevant to the
@@ -2080,17 +2032,17 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 3.1.  Command Codes
 
-   Each command Request/Answer pair is assigned a command code, and the
+   Each command Request/Answer pair is assigned a Command Code, and the
    sub-type (i.e., request or answer) is identified via the 'R' bit in
    the Command Flags field of the Diameter header.
 
-
-   Every Diameter message MUST contain a command code in its header's
-   Command-Code field, which is used to determine the action that is to
+   Every Diameter message MUST contain a Command Code in its header's
+   Command Code field, which is used to determine the action that is to
    be taken for a particular message.  The following Command Codes are
    defined in the Diameter base protocol:
 
-    Command-Name             Abbrev.    Code       Reference
+                                                   Section
+    Command Name             Abbrev.    Code       Reference
       --------------------------------------------------------
       Abort-Session-Request     ASR       274           8.5.1
       Abort-Session-Answer      ASA       274           8.5.2
@@ -2111,140 +2063,142 @@ Internet-Draft           Diameter Base Protocol             January 2011
       Session-Termination-      STA       275           8.4.2
          Answer
 
-3.2.  Command Code ABNF specification
 
-   Every Command Code defined MUST include a corresponding ABNF
-   specification, which is used to define the AVPs that MUST or MAY be
-   present when sending the message.  The following format is used in
-   the definition:
 
-  command-def      = <command-name> "::=" diameter-message
 
-  command-name     = diameter-name
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 38]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-  diameter-name    = ALPHA *(ALPHA / DIGIT / "-")
+Fajardo, et al.              Standards Track                   [Page 37]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
-  diameter-message = header  [ *fixed] [ *required] [ *optional]
 
-  header           = "<" "Diameter Header:" command-id
-                     [r-bit] [p-bit] [e-bit] [application-id] ">"
+3.2.  Command Code Format Specification
 
-  application-id   = 1*DIGIT
+   Every Command Code defined MUST include a corresponding Command Code
+   Format (CCF) specification, which is used to define the AVPs that
+   MUST or MAY be present when sending the message.  The following ABNF
+   specifies the CCF used in the definition:
 
-  command-id       = 1*DIGIT
-                     ; The Command Code assigned to the command
+   command-def      = "<" command-name ">" "::=" diameter-message
 
-  r-bit            = ", REQ"
-                     ; If present, the 'R' bit in the Command
-                     ; Flags is set, indicating that the message
-                     ; is a request, as opposed to an answer.
+   command-name     = diameter-name
 
-  p-bit            = ", PXY"
-                     ; If present, the 'P' bit in the Command
-                     ; Flags is set, indicating that the message
-                     ; is proxiable.
+   diameter-name    = ALPHA *(ALPHA / DIGIT / "-")
 
-  e-bit            = ", ERR"
-                     ; If present, the 'E' bit in the Command
-                     ; Flags is set, indicating that the answer
-                     ; message contains a Result-Code AVP in
-                     ; the "protocol error" class.
+   diameter-message = header   *fixed  *required *optional
 
-  fixed            = [qual] "<" avp-spec ">"
-                     ; Defines the fixed position of an AVP
+   header           = "<Diameter-Header:" command-id
+                         [r-bit] [p-bit] [e-bit] [application-id]">"
 
-  required         = [qual] "{" avp-spec "}"
-                     ; The AVP MUST be present and can appear
-                     ; anywhere in the message.
+   application-id   = 1*DIGIT
 
+   command-id       = 1*DIGIT
+                      ; The Command Code assigned to the command.
 
-  optional         = [qual] "[" avp-name "]"
-                     ; The avp-name in the 'optional' rule cannot
-                     ; evaluate to any AVP Name which is included
-                     ; in a fixed or required rule.  The AVP can
-                     ; appear anywhere in the message.
-                     ;
-                     ; NOTE:  "[" and "]" have a slightly different
-                     ; meaning than in ABNF (RFC 5234]). These braces
-                     ; cannot be used to express optional fixed rules
-                     ; (such as an optional ICV at the end). To do this,
-                     ; the convention is '0*1fixed'.
+   r-bit            = ", REQ"
+                      ; If present, the 'R' bit in the Command
+                      ; Flags is set, indicating that the message
+                      ; is a request as opposed to an answer.
 
+   p-bit            = ", PXY"
+                      ; If present, the 'P' bit in the Command
+                      ; Flags is set, indicating that the message
+                      ; is proxiable.
 
+   e-bit            = ", ERR"
+                      ; If present, the 'E' bit in the Command
+                      ; Flags is set, indicating that the answer
+                      ; message contains a Result-Code AVP in
+                      ; the "protocol error" class.
 
+   fixed            = [qual] "<" avp-spec ">"
+                      ; Defines the fixed position of an AVP.
 
-Fajardo, et al.           Expires July 24, 2011                [Page 39]
-
-Internet-Draft           Diameter Base Protocol             January 2011
+   required         = [qual] "{" avp-spec "}"
+                      ; The AVP MUST be present and can appear
+                      ; anywhere in the message.
 
 
-  qual             = [min] "*" [max]
-                     ; See ABNF conventions, RFC 5234 Section 4.
-                     ; The absence of any qualifiers depends on
-                     ; whether it precedes a fixed, required, or
-                     ; optional rule. If a fixed or required rule has
-                     ; no qualifier, then exactly one such AVP MUST
-                     ; be present.  If an optional rule has no
-                     ; qualifier, then 0 or 1 such AVP may be
-                     ; present. If an optional rule has a qualifier,
-                     ; then the value of min MUST be 0 if present.
 
-  min              = 1*DIGIT
-                     ; The minimum number of times the element may
-                     ; be present. If absent, the default value is zero
-                     ; for fixed and optional rules and one for required
-                     ; rules. The value MUST be at least one for for
-                     ; required rules.
 
-  max              = 1*DIGIT
-                     ; The maximum number of times the element may
-                     ; be present. If absent, the default value is
-                     ; infinity. A value of zero implies the AVP MUST
-                     ; NOT be present.
 
-  avp-spec         = diameter-name
-                     ; The avp-spec has to be an AVP Name, defined
-                     ; in the base or extended Diameter
-                     ; specifications.
-
-  avp-name         = avp-spec / "AVP"
-                     ; The string "AVP" stands for *any* arbitrary AVP
-                     ; Name, not otherwise listed in that command code
-                     ; definition. Addition this AVP is recommended for
-                     ; all command ABNFs to allow for extensibility.
 
+Fajardo, et al.              Standards Track                   [Page 38]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-  The following is a definition of a fictitious command code:
+   optional         = [qual] "[" avp-name "]"
+                      ; The avp-name in the 'optional' rule cannot
+                      ; evaluate to any AVP Name that is included
+                      ; in a fixed or required rule.  The AVP can
+                      ; appear anywhere in the message.
+                      ;
+                      ; NOTE:  "[" and "]" have a slightly different
+                      ; meaning than in ABNF.  These braces
+                      ; cannot be used to express optional fixed rules
+                      ; (such as an optional ICV at the end).  To do
+                      ; this, the convention is '0*1fixed'.
 
-  Example-Request ::= < Diameter Header: 9999999, REQ, PXY >
-                      { User-Name }
-                    * { Origin-Host }
-                    * [ AVP ]
+   qual             = [min] "*" [max]
+                      ; See ABNF conventions, RFC 5234, Section 4.
+                      ; The absence of any qualifier depends on
+                      ; whether it precedes a fixed, required, or
+                      ; optional rule.  If a fixed or required rule has
+                      ; no qualifier, then exactly one such AVP MUST
+                      ; be present.  If an optional rule has no
+                      ; qualifier, then 0 or 1 such AVP may be
+                      ; present.  If an optional rule has a qualifier,
+                      ; then the value of min MUST be 0 if present.
 
+   min              = 1*DIGIT
+                      ; The minimum number of times the element may
+                      ; be present.  If absent, the default value is 0
+                      ; for fixed and optional rules and 1 for
+                      ; required rules.  The value MUST be at least 1
+                      ; for required rules.
 
+   max              = 1*DIGIT
+                      ; The maximum number of times the element may
+                      ; be present.  If absent, the default value is
+                      ; infinity.  A value of 0 implies the AVP MUST
+                      ; NOT be present.
 
+   avp-spec         = diameter-name
+                      ; The avp-spec has to be an AVP Name, defined
+                      ; in the base or extended Diameter
+                      ; specifications.
 
+   avp-name         = avp-spec / "AVP"
+                      ; The string "AVP" stands for *any* arbitrary AVP
+                      ; Name, not otherwise listed in that Command Code
+                      ; definition.  The inclusion of this string
+                      ; is recommended for all CCFs to allow for
+                      ; extensibility.
 
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 40]
+Fajardo, et al.              Standards Track                   [Page 39]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+   The following is a definition of a fictitious Command Code:
 
+   Example-Request ::= < Diameter Header: 9999999, REQ, PXY >
+                       { User-Name }
+                    1* { Origin-Host }
+                     * [ AVP ]
 
 3.3.  Diameter Command Naming Conventions
 
    Diameter command names typically includes one or more English words
-   followed by the verb Request or Answer.  Each English word is
+   followed by the verb "Request" or "Answer".  Each English word is
    delimited by a hyphen.  A three-letter acronym for both the request
    and answer is also normally provided.
 
@@ -2253,10 +2207,10 @@ Internet-Draft           Diameter Base Protocol             January 2011
    the acronyms are STR and STA, respectively.
 
    Both the request and the answer for a given command share the same
-   command code.  The request is identified by the R(equest) bit in the
+   Command Code.  The request is identified by the R(equest) bit in the
    Diameter header set to one (1), to ask that a particular action be
    performed, such as authorizing a user or terminating a session.  Once
-   the receiver has completed the request it issues the corresponding
+   the receiver has completed the request, it issues the corresponding
    answer, which includes a result code that communicates one of the
    following:
 
@@ -2274,38 +2228,25 @@ Internet-Draft           Diameter Base Protocol             January 2011
    Additional information, encoded within AVPs, may also be included in
    answer messages.
 
+4.  Diameter AVPs
 
+   Diameter AVPs carry specific authentication, accounting,
+   authorization, and routing information as well as configuration
+   details for the request and reply.
 
 
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 41]
+Fajardo, et al.              Standards Track                   [Page 40]
 
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-4.  Diameter AVPs
+RFC 6733                 Diameter Base Protocol             October 2012
 
-   Diameter AVPs carry specific authentication, accounting,
-   authorization and routing information as well as configuration
-   details for the request and reply.
 
    Each AVP of type OctetString MUST be padded to align on a 32-bit
    boundary, while other AVP types align naturally.  A number of zero-
-   valued bytes are added to the end of the AVP Data field till a word
+   valued bytes are added to the end of the AVP Data field until a word
    boundary is reached.  The length of the padding is not reflected in
    the AVP Length field.
 
@@ -2330,92 +2271,96 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
       The AVP Code, combined with the Vendor-Id field, identifies the
       attribute uniquely.  AVP numbers 1 through 255 are reserved for
-      re-use of RADIUS attributes, without setting the Vendor-Id field.
+      reuse of RADIUS attributes, without setting the Vendor-Id field.
       AVP numbers 256 and above are used for Diameter, which are
-      allocated by IANA (see Section 11.1).
-
+      allocated by IANA (see Section 11.1.1).
 
    AVP Flags
 
       The AVP Flags field informs the receiver how each attribute must
-      be handled.  The 'r' (reserved) bits are unused and SHOULD be set
-      to 0.  Note that subsequent Diameter applications MAY define
-      additional bits within the AVP Header, and an unrecognized bit
-      SHOULD be considered an error.  The 'P' bit has been reserved for
-      future usage of end-to-end security.  At the time of writing there
-      are no end-to-end security mechanisms specified therefore the 'P'
-      bit SHOULD be set to 0.
+      be handled.  New Diameter applications SHOULD NOT define
+      additional AVP Flag bits.  However, note that new Diameter
+      applications MAY define additional bits within the AVP header, and
+      an unrecognized bit SHOULD be considered an error.  The sender of
+      the AVP MUST set 'R' (reserved) bits to 0 and the receiver SHOULD
+      ignore all 'R' (reserved) bits.  The 'P' bit has been reserved for
+      future usage of end-to-end security.  At the time of writing,
+      there are no end-to-end security mechanisms specified; therefore,
+      the 'P' bit SHOULD be set to 0.
+
+      The 'M' bit, known as the Mandatory bit, indicates whether the
+      receiver of the AVP MUST parse and understand the semantics of the
+      AVP including its content.  The receiving entity MUST return an
+      appropriate error message if it receives an AVP that has the M-bit
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 42]
+Fajardo, et al.              Standards Track                   [Page 41]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-      The 'M' Bit, known as the Mandatory bit, indicates whether the
-      receiver of the AVP MUST parse and understand the semantic of the
-      AVP including its content.  The receiving entity MUST return an
-      appropriate error message if it receives an AVP that has the M-bit
       set but does not understand it.  An exception applies when the AVP
       is embedded within a Grouped AVP.  See Section 4.4 for details.
-      Diameter Relay and redirect agents MUST NOT reject messages with
+      Diameter relay and redirect agents MUST NOT reject messages with
       unrecognized AVPs.
 
       The 'M' bit MUST be set according to the rules defined in the
-      application specification which introduces or re-uses this AVP.
-      Within a given application, the M-bit setting for an AVP is either
-      defined for all command types or for each command type.
+      application specification that introduces or reuses this AVP.
+      Within a given application, the M-bit setting for an AVP is
+      defined either for all command types or for each command type.
 
-      AVPs with the 'M' bit cleared are informational only and a
-      receiver that receives a message with such an AVP that is not
-      supported, or whose value is not supported, MAY simply ignore the
-      AVP.
+      AVPs with the 'M' bit cleared are informational only; a receiver
+      that receives a message with such an AVP that is not supported, or
+      whose value is not supported, MAY simply ignore the AVP.
 
       The 'V' bit, known as the Vendor-Specific bit, indicates whether
       the optional Vendor-ID field is present in the AVP header.  When
-      set the AVP Code belongs to the specific vendor code address
+      set, the AVP Code belongs to the specific vendor code address
       space.
 
    AVP Length
 
       The AVP Length field is three octets, and indicates the number of
-      octets in this AVP including the AVP Code, AVP Length, AVP Flags,
-      Vendor-ID field (if present) and the AVP data.  If a message is
-      received with an invalid attribute length, the message MUST be
-      rejected.
+      octets in this AVP including the AVP Code field, AVP Length field,
+      AVP Flags field, Vendor-ID field (if present), and the AVP Data
+      field.  If a message is received with an invalid attribute length,
+      the message MUST be rejected.
 
 4.1.1.  Optional Header Elements
 
-   The AVP Header contains one optional field.  This field is only
+   The AVP header contains one optional field.  This field is only
    present if the respective bit-flag is enabled.
 
-
    Vendor-ID
 
       The Vendor-ID field is present if the 'V' bit is set in the AVP
       Flags field.  The optional four-octet Vendor-ID field contains the
-      IANA assigned "SMI Network Management Private Enterprise Codes"
-      [RFC3232] value, encoded in network byte order.  Any vendor or
-      standardization organization that are also treated like vendors in
-      the IANA managed "SMI Network Management Private Enterprise Codes"
-      space wishing to implement a vendor-specific Diameter AVP MUST use
-      their own Vendor-ID along with their privately managed AVP address
+      IANA-assigned "SMI Network Management Private Enterprise Codes"
+      [ENTERPRISE] value, encoded in network byte order.  Any vendors or
+      standardization organizations that are also treated like vendors
+      in the IANA-managed "SMI Network Management Private Enterprise
+      Codes" space wishing to implement a vendor-specific Diameter AVP
+      MUST use their own Vendor-ID along with their privately managed
+      AVP address space, guaranteeing that they will not collide with
+      any other vendor's vendor-specific AVP(s) or with future IETF
+      AVPs.
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 43]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-      space, guaranteeing that they will not collide with any other
-      vendor's vendor-specific AVP(s), nor with future IETF AVPs.
 
-      A vendor ID value of zero (0) corresponds to the IETF adopted AVP
-      values, as managed by the IANA.  Since the absence of the vendor
-      ID field implies that the AVP in question is not vendor specific,
-      implementations MUST NOT use the zero (0) vendor ID.
+Fajardo, et al.              Standards Track                   [Page 42]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+      A Vendor-ID value of zero (0) corresponds to the IETF-adopted AVP
+      values, as managed by IANA.  Since the absence of the Vendor-ID
+      field implies that the AVP in question is not vendor specific,
+      implementations MUST NOT use the value of zero (0) for the
+      Vendor-ID field.
 
 4.2.  Basic AVP Data Formats
 
@@ -2426,49 +2371,45 @@ Internet-Draft           Diameter Base Protocol             January 2011
    type derived from the base data types.  In the event that a new Basic
    AVP Data Format is needed, a new version of this RFC MUST be created.
 
-
    OctetString
 
       The data contains arbitrary data of variable length.  Unless
       otherwise noted, the AVP Length field MUST be set to at least 8
-      (12 if the 'V' bit is enabled).  AVP Values of this type that are
-      not a multiple of four-octets in length is followed by the
-      necessary padding so that the next AVP (if any) will start on a
-      32-bit boundary.
-
+      (12 if the 'V' bit is enabled).  AVP values of this type that are
+      not a multiple of 4 octets in length are followed by the necessary
+      padding so that the next AVP (if any) will start on a 32-bit
+      boundary.
 
    Integer32
 
-      32 bit signed value, in network byte order.  The AVP Length field
+      32-bit signed value, in network byte order.  The AVP Length field
       MUST be set to 12 (16 if the 'V' bit is enabled).
 
-
    Integer64
 
-      64 bit signed value, in network byte order.  The AVP Length field
+      64-bit signed value, in network byte order.  The AVP Length field
       MUST be set to 16 (20 if the 'V' bit is enabled).
 
-
    Unsigned32
 
-      32 bit unsigned value, in network byte order.  The AVP Length
+      32-bit unsigned value, in network byte order.  The AVP Length
       field MUST be set to 12 (16 if the 'V' bit is enabled).
 
+   Unsigned64
 
+      64-bit unsigned value, in network byte order.  The AVP Length
+      field MUST be set to 16 (20 if the 'V' bit is enabled).
 
 
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 44]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-   Unsigned64
 
-      64 bit unsigned value, in network byte order.  The AVP Length
-      field MUST be set to 16 (20 if the 'V' bit is enabled).
+Fajardo, et al.              Standards Track                   [Page 43]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    Float32
@@ -2478,7 +2419,6 @@ Internet-Draft           Diameter Base Protocol             January 2011
       network byte order.  The AVP Length field MUST be set to 12 (16 if
       the 'V' bit is enabled).
 
-
    Float64
 
       This represents floating point values of double precision as
@@ -2486,73 +2426,69 @@ Internet-Draft           Diameter Base Protocol             January 2011
       network byte order.  The AVP Length field MUST be set to 16 (20 if
       the 'V' bit is enabled).
 
-
    Grouped
 
-      The Data field is specified as a sequence of AVPs.  Each of these
-      AVPs follows - in the order in which they are specified -
-      including their headers and padding.  The AVP Length field is set
-      to 8 (12 if the 'V' bit is enabled) plus the total length of all
-      included AVPs, including their headers and padding.  Thus the AVP
-      length field of an AVP of type Grouped is always a multiple of 4.
-
+      The Data field is specified as a sequence of AVPs.  These AVPs are
+      concatenated -- including their headers and padding -- in the
+      order in which they are specified and the result encapsulated in
+      the Data field.  The AVP Length field is set to 8 (12 if the 'V'
+      bit is enabled) plus the total length of all included AVPs,
+      including their headers and padding.  Thus, the AVP Length field
+      of an AVP of type Grouped is always a multiple of 4.
 
 4.3.  Derived AVP Data Formats
 
    In addition to using the Basic AVP Data Formats, applications may
    define data formats derived from the Basic AVP Data Formats.  An
    application that defines new Derived AVP Data Formats MUST include
-   them in a section entitled "Derived AVP Data Formats", using the same
+   them in a section titled "Derived AVP Data Formats", using the same
    format as the definitions below.  Each new definition MUST be either
    defined or listed with a reference to the RFC that defines the
    format.
 
-4.3.1.  Common Derived AVPs
+4.3.1.  Common Derived AVP Data Formats
 
    The following are commonly used Derived AVP Data Formats.
 
+   Address
 
+      The Address format is derived from the OctetString Basic AVP
+      Format.  It is a discriminated union representing, for example, a
+      32-bit (IPv4) [RFC0791] or 128-bit (IPv6) [RFC4291] address, most
+      significant octet first.  The first two octets of the Address AVP
+      represent the AddressType, which contains an Address Family,
+      defined in [IANAADFAM].  The AddressType is used to discriminate
+      the content and format of the remaining octets.
 
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 45]
+Fajardo, et al.              Standards Track                   [Page 44]
 
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-   Address
-
-      The Address format is derived from the OctetString AVP Base
-      Format.  It is a discriminated union, representing, for example a
-      32-bit (IPv4) [RFC791] or 128-bit (IPv6) [RFC4291] address, most
-      significant octet first.  The first two octets of the Address AVP
-      represents the AddressType, which contains an Address Family
-      defined in [IANAADFAM].  The AddressType is used to discriminate
-      the content and format of the remaining octets.
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    Time
 
-      The Time format is derived from the OctetString AVP Base Format.
+      The Time format is derived from the OctetString Basic AVP Format.
       The string MUST contain four octets, in the same format as the
       first four bytes are in the NTP timestamp format.  The NTP
-      Timestamp format is defined in Chapter 3 of [RFC5905].
+      timestamp format is defined in Section 3 of [RFC5905].
 
       This represents the number of seconds since 0h on 1 January 1900
       with respect to the Coordinated Universal Time (UTC).
 
-      On 6h 28m 16s UTC, 7 February 2036 the time value will overflow.
-      SNTP [RFC5905] describes a procedure to extend the time to 2104.
-      This procedure MUST be supported by all Diameter nodes.
-
+      On 6h 28m 16s UTC, 7 February 2036, the time value will overflow.
+      Simple Network Time Protocol (SNTP) [RFC5905] describes a
+      procedure to extend the time to 2104.  This procedure MUST be
+      supported by all Diameter nodes.
 
    UTF8String
 
-      The UTF8String format is derived from the OctetString AVP Base
-      Format.  This is a human readable string represented using the
+      The UTF8String format is derived from the OctetString Basic AVP
+      Format.  This is a human-readable string represented using the
       ISO/IEC IS 10646-1 character set, encoded as an OctetString using
-      the UTF-8 [RFC3629] transformation format described in RFC 3629.
+      the UTF-8 transformation format [RFC3629].
 
       Since additional code points are added by amendments to the 10646
       standard from time to time, implementations MUST be prepared to
@@ -2570,78 +2506,79 @@ Internet-Draft           Diameter Base Protocol             January 2011
       or software, an alternative means of entry and display, such as
       hexadecimal, MAY be provided.
 
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 46]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
       For information encoded in 7-bit US-ASCII, the UTF-8 charset is
       identical to the US-ASCII charset.
 
       UTF-8 may require multiple bytes to represent a single character /
-      code point; thus the length of an UTF8String in octets may be
+      code point; thus, the length of a UTF8String in octets may be
       different from the number of characters encoded.
 
       Note that the AVP Length field of an UTF8String is measured in
-      octets, not characters.
+      octets not characters.
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 45]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
    DiameterIdentity
 
-      The DiameterIdentity format is derived from the OctetString AVP
-      Base Format.
+      The DiameterIdentity format is derived from the OctetString Basic
+      AVP Format.
 
                         DiameterIdentity  = FQDN/Realm
 
-
-      DiameterIdentity value is used to uniquely identify either:
+   The DiameterIdentity value is used to uniquely identify either:
 
       *  A Diameter node for purposes of duplicate connection and
          routing loop detection.
 
-      *  A Realm to determine whether messages can be satisfied locally,
+      *  A Realm to determine whether messages can be satisfied locally
          or whether they must be routed or redirected.
 
+      When a DiameterIdentity value is used to identify a Diameter node,
+      the contents of the string MUST be the Fully Qualified Domain Name
+      (FQDN) of the Diameter node.  If multiple Diameter nodes run on
+      the same host, each Diameter node MUST be assigned a unique
+      DiameterIdentity.  If a Diameter node can be identified by several
+      FQDNs, a single FQDN should be picked at startup and used as the
+      only DiameterIdentity for that node, whatever the connection on
+      which it is sent.  In this document, note that DiameterIdentity is
+      in ASCII form in order to be compatible with existing DNS
+      infrastructure.  See Appendix D for interactions between the
+      Diameter protocol and Internationalized Domain Names (IDNs).
 
-      When a DiameterIdentity is used to identify a Diameter node the
-      contents of the string MUST be the FQDN of the Diameter node.  If
-      multiple Diameter nodes run on the same host, each Diameter node
-      MUST be assigned a unique DiameterIdentity.  If a Diameter node
-      can be identified by several FQDNs, a single FQDN should be picked
-      at startup, and used as the only DiameterIdentity for that node,
-      whatever the connection it is sent on.  Note that in this
-      document, DiameterIdentity is in ASCII form in order to be
-      compatible with existing DNS infrastructure.  See Appendix D for
-      interactions between the Diameter protocol and Internationalized
-      Domain Name (IDNs).
+   DiameterURI
 
+      The DiameterURI MUST follow the Uniform Resource Identifiers (RFC
+      3986) syntax [RFC3986] rules specified below:
 
-   DiameterURI
+      "aaa://" FQDN [ port ] [ transport ] [ protocol ]
 
-      The DiameterURI MUST follow the Uniform Resource Identifiers (URI)
-      syntax [RFC3986] rules specified below:
+                      ; No transport security
 
+      "aaas://" FQDN [ port ] [ transport ] [ protocol ]
 
+                      ; Transport security used
 
+      FQDN               = < Fully Qualified Domain Name >
 
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 47]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-      "aaa://" FQDN [ port ] [ transport ] [ protocol ]
 
-                      ; No transport security
 
-      "aaas://" FQDN [ port ] [ transport ] [ protocol ]
 
-                      ; Transport security used
 
-      FQDN               = Fully Qualified Host Name
+Fajardo, et al.              Standards Track                   [Page 46]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
       port               = ":" 1*DIGIT
 
@@ -2649,8 +2586,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
                       ; incoming connections.
                       ; If absent, the default Diameter port
                       ; (3868) is assumed if no transport
-                      ; security is used and port (TBD) when
-                      ; transport security (TLS/TCP and DTLS/SCTP) is used.
+                      ; security is used and port 5658 when
+                      ; transport security (TLS/TCP and DTLS/SCTP)
+                      ; is used.
 
       transport          = ";transport=" transport-protocol
 
@@ -2660,46 +2598,47 @@ Internet-Draft           Diameter Base Protocol             January 2011
                       ; UDP MUST NOT be used when the aaa-protocol
                       ; field is set to diameter.
 
-    transport-protocol = ( "tcp" / "sctp" / "udp" )
+      transport-protocol = ( "tcp" / "sctp" / "udp" )
 
-    protocol           = ";protocol=" aaa-protocol
+      protocol           = ";protocol=" aaa-protocol
 
                       ; If absent, the default AAA protocol
                       ; is Diameter.
 
-    aaa-protocol       = ( "diameter" / "radius" / "tacacs+" )
+      aaa-protocol       = ( "diameter" / "radius" / "tacacs+" )
 
-    The following are examples of valid Diameter host identities:
+      The following are examples of valid Diameter host identities:
 
-    aaa://host.example.com;transport=tcp
-    aaa://host.example.com:6666;transport=tcp
-    aaa://host.example.com;protocol=diameter
-    aaa://host.example.com:6666;protocol=diameter
-    aaa://host.example.com:6666;transport=tcp;protocol=diameter
-    aaa://host.example.com:1813;transport=udp;protocol=radius
+      aaa://host.example.com;transport=tcp
+      aaa://host.example.com:6666;transport=tcp
+      aaa://host.example.com;protocol=diameter
+      aaa://host.example.com:6666;protocol=diameter
+      aaa://host.example.com:6666;transport=tcp;protocol=diameter
+      aaa://host.example.com:1813;transport=udp;protocol=radius
 
+   Enumerated
 
+      The Enumerated format is derived from the Integer32 Basic AVP
+      Format.  The definition contains a list of valid values and their
+      interpretation and is described in the Diameter application
+      introducing the AVP.
 
 
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 48]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-   Enumerated
 
-      Enumerated is derived from the Integer32 AVP Base Format.  The
-      definition contains a list of valid values and their
-      interpretation and is described in the Diameter application
-      introducing the AVP.
+
+Fajardo, et al.              Standards Track                   [Page 47]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    IPFilterRule
 
-      The IPFilterRule format is derived from the OctetString AVP Base
+      The IPFilterRule format is derived from the OctetString Basic AVP
       Format and uses the ASCII charset.  The rule syntax is a modified
       subset of ipfw(8) from FreeBSD.  Packets may be filtered based on
       the following information that is associated with it:
@@ -2713,13 +2652,13 @@ Internet-Draft           Diameter Base Protocol             January 2011
             IP options
             ICMP types
 
-      Rules for the appropriate direction are evaluated in order, with
-      the first matched rule terminating the evaluation.  Each packet is
-      evaluated once.  If no rule matches, the packet is dropped if the
-      last rule evaluated was a permit, and passed if the last rule was
-      a deny.
+   Rules for the appropriate direction are evaluated in order, with the
+   first matched rule terminating the evaluation.  Each packet is
+   evaluated once.  If no rule matches, the packet is dropped if the
+   last rule evaluated was a permit, and passed if the last rule was a
+   deny.
 
-      IPFilterRule filters MUST follow the format:
+   IPFilterRule filters MUST follow the format:
 
          action dir proto from src to dst [options]
 
@@ -2737,22 +2676,28 @@ Internet-Draft           Diameter Base Protocol             January 2011
                       The <address/mask> may be specified as:
                       ipno       An IPv4 or IPv6 number in dotted-
                                  quad or canonical IPv6 form.  Only
+                                 this exact IP number will match the
+                                 rule.
+
+
+
+
+
+
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 49]
+Fajardo, et al.              Standards Track                   [Page 48]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-                                 this exact IP number will match the
-                                 rule.
                       ipno/bits  An IP number as above with a mask
                                  width of the form 192.0.2.10/24.  In
                                  this case, all IP numbers from
                                  192.0.2.0 to 192.0.2.255 will match.
                                  The bit width MUST be valid for the
-                                 IP version and the IP number MUST
+                                 IP version, and the IP number MUST
                                  NOT have bits set beyond the mask.
                                  For a match to occur, the same IP
                                  version must be present in the
@@ -2765,7 +2710,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
                                  is the address or set of addresses
                                  assigned to the terminal.  For IPv4,
                                  a typical first rule is often "deny
-                                 in ip! assigned"
+                                 in ip! assigned".
 
                       The sense of the match can be inverted by
                       preceding an address with the not modifier (!),
@@ -2773,7 +2718,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
                       instead.  This does not affect the selection of
                       port numbers.
 
-                      With the TCP, UDP and SCTP protocols, optional
+                      With the TCP, UDP, and SCTP protocols, optional
                       ports may be specified as:
 
                          {port/port-port}[,ports[,...]]
@@ -2796,33 +2741,35 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 50]
+
+
+Fajardo, et al.              Standards Track                   [Page 49]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-             ipoptions spec
-                    Match if the IP header contains the comma
-                    separated list of options specified in spec.  The
+            ipoptions spec
+                    Match if the IP header contains the comma-separated
+                    list of options specified in spec.  The
                     supported IP options are:
 
                     ssrr (strict source route), lsrr (loose source
-                    route), rr (record packet route) and ts
+                    route), rr (record packet route), and ts
                     (timestamp).  The absence of a particular option
                     may be denoted with a '!'.
 
             tcpoptions spec
-                    Match if the TCP header contains the comma
-                    separated list of options specified in spec.  The
+                    Match if the TCP header contains the comma-separated
+                    list of options specified in spec.  The
                     supported TCP options are:
 
                     mss (maximum segment size), window (tcp window
                     advertisement), sack (selective ack), ts (rfc1323
-                    timestamp) and cc (rfc1644 t/tcp connection
+                    timestamp), and cc (rfc1644 t/tcp connection
                     count).  The absence of a particular option may
                     be denoted with a '!'.
 
-             established
+            established
                     TCP packets only.  Match packets that have the RST
                     or ACK bits set.
 
@@ -2832,10 +2779,10 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
             tcpflags spec
                     TCP packets only.  Match if the TCP header
-                    contains the comma separated list of flags
+                    contains the comma-separated list of flags
                     specified in spec.  The supported TCP flags are:
 
-                    fin, syn, rst, psh, ack and urg.  The absence of a
+                    fin, syn, rst, psh, ack, and urg.  The absence of a
                     particular flag may be denoted with a '!'.  A rule
                     that contains a tcpflags specification can never
                     match a fragmented packet that has a non-zero
@@ -2852,9 +2799,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 51]
+Fajardo, et al.              Standards Track                   [Page 50]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
                     echo reply (0), destination unreachable (3),
@@ -2863,21 +2810,20 @@ Internet-Draft           Diameter Base Protocol             January 2011
                     solicitation (10), time-to-live exceeded (11), IP
                     header bad (12), timestamp request (13),
                     timestamp reply (14), information request (15),
-                    information reply (16), address mask request (17)
+                    information reply (16), address mask request (17),
                     and address mask reply (18).
 
-      There is one kind of packet that the access device MUST always
-      discard, that is an IP fragment with a fragment offset of one.
-      This is a valid packet, but it only has one use, to try to
-      circumvent firewalls.
-
-      An access device that is unable to interpret or apply a deny rule
-      MUST terminate the session.  An access device that is unable to
-      interpret or apply a permit rule MAY apply a more restrictive
-      rule.  An access device MAY apply deny rules of its own before the
-      supplied rules, for example to protect the access device owner's
-      infrastructure.
+   There is one kind of packet that the access device MUST always
+   discard, that is an IP fragment with a fragment offset of one.  This
+   is a valid packet, but it only has one use, to try to circumvent
+   firewalls.
 
+   An access device that is unable to interpret or apply a deny rule
+   MUST terminate the session.  An access device that is unable to
+   interpret or apply a permit rule MAY apply a more restrictive rule.
+   An access device MAY apply deny rules of its own before the supplied
+   rules, for example to protect the access device owner's
+   infrastructure.
 
 4.4.   Grouped AVP Values
 
@@ -2885,75 +2831,76 @@ Internet-Draft           Diameter Base Protocol             January 2011
    implies that the Data field is actually a sequence of AVPs.  It is
    possible to include an AVP with a Grouped type within a Grouped type,
    that is, to nest them.  AVPs within an AVP of type Grouped have the
-   same padding requirements as non-Grouped AVPs, as defined in Section
-   4.
+   same padding requirements as non-Grouped AVPs, as defined in
+   Section 4.4.
 
    The AVP Code numbering space of all AVPs included in a Grouped AVP is
-   the same as for non-grouped AVPs.  Receivers of a Grouped AVP that
+   the same as for non-Grouped AVPs.  Receivers of a Grouped AVP that
    does not have the 'M' (mandatory) bit set and one or more of the
    encapsulated AVPs within the group has the 'M' (mandatory) bit set
    MAY simply be ignored if the Grouped AVP itself is unrecognized.  The
    rule applies even if the encapsulated AVP with its 'M' (mandatory)
-   bit set is further encapsulated within other sub-groups; i.e. other
+   bit set is further encapsulated within other sub-groups, i.e., other
    Grouped AVPs embedded within the Grouped AVP.
 
-   Every Grouped AVP defined MUST include a corresponding grammar, using
-   ABNF [RFC5234] (with modifications), as defined below.
-
+   Every Grouped AVP definition MUST include a corresponding grammar,
+   using ABNF [RFC5234] (with modifications), as defined below.
 
+         grouped-avp-def  = "<" name ">" "::=" avp
 
+         name-fmt         = ALPHA *(ALPHA / DIGIT / "-")
 
 
 
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 52]
+Fajardo, et al.              Standards Track                   [Page 51]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-                            grouped-avp-def  = <name> "::=" avp
-
-         name-fmt         = ALPHA *(ALPHA / DIGIT / "-")
-
          name             = name-fmt
                             ; The name has to be the name of an AVP,
                             ; defined in the base or extended Diameter
                             ; specifications.
 
-         avp              = header  [ *fixed] [ *required] [ *optional]
+         avp              = header *fixed *required *optional
 
          header           = "<" "AVP-Header:" avpcode [vendor] ">"
 
          avpcode          = 1*DIGIT
-                            ; The AVP Code assigned to the Grouped AVP
+                            ; The AVP Code assigned to the Grouped AVP.
 
          vendor           = 1*DIGIT
                             ; The Vendor-ID assigned to the Grouped AVP.
                             ; If absent, the default value of zero is
                             ; used.
 
-4.4.1.  Example AVP with a Grouped Data type
+4.4.1.  Example AVP with a Grouped Data Type
 
    The Example-AVP (AVP Code 999999) is of type Grouped and is used to
    clarify how Grouped AVP values work.  The Grouped Data field has the
-   following ABNF grammar:
-
-
-
-
-
-
-
-
+   following CCF grammar:
 
+         Example-AVP  ::= < AVP Header: 999999 >
+                          { Origin-Host }
+                        1*{ Session-Id }
+                         *[ AVP ]
 
+      An Example-AVP with Grouped Data follows.
 
+      The Origin-Host AVP (Section 6.3) is required.  In this case:
 
+         Origin-Host = "example.com".
 
+      One or more Session-Ids must follow.  Here there are two:
 
+         Session-Id =
+           "grump.example.com:33041;23432;893;0AF3B81"
 
+         Session-Id =
+           "grump.example.com:33054;23561;2358;0AF3B82"
 
 
 
@@ -2964,31 +2911,11 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 53]
+Fajardo, et al.              Standards Track                   [Page 52]
 
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-         Example-AVP  ::= < AVP Header: 999999 >
-                          { Origin-Host }
-                        1*{ Session-Id }
-                         *[ AVP ]
-
-      An Example-AVP with Grouped Data follows.
-
-      The Origin-Host AVP is required (Section 6.3).  In this case:
-
-         Origin-Host = "example.com".
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-      One or more Session-Ids must follow.  Here there are two:
-
-         Session-Id =
-           "grump.example.com:33041;23432;893;0AF3B81"
-
-         Session-Id =
-           "grump.example.com:33054;23561;2358;0AF3B82"
-
       optional AVPs included are
 
          Recovery-Policy = <binary>
@@ -3007,25 +2934,42 @@ Internet-Draft           Diameter Base Protocol             January 2011
             41d018d56fe938f3cbf089aac12a912a2f0d1923a9390e5f789cb2e5067
             d3427475e49968f841
 
-   The data for the optional AVPs is represented in hex since the format
-   of these AVPs is neither known at the time of definition of the
-   Example-AVP group, nor (likely) at the time when the example instance
-   of this AVP is interpreted - except by Diameter implementations which
-   support the same set of AVPs.  The encoding example illustrates how
-   padding is used and how length fields are calculated.  Also note that
-   AVPs may be present in the Grouped AVP value which the receiver
-   cannot interpret (here, the Recover-Policy and Futuristic-Acct-Record
-   AVPs).  The length of the Example-AVP is the sum of all the length of
-   the member AVPs including their padding plus the Example-AVP header
+   The data for the optional AVPs is represented in hexadecimal form
+   since the format of these AVPs is not known at the time of definition
+   of the Example-AVP group nor (likely) at the time when the example
+   instance of this AVP is interpreted -- except by Diameter
+   implementations that support the same set of AVPs.  The encoding
+   example illustrates how padding is used and how length fields are
+   calculated.  Also, note that AVPs may be present in the Grouped AVP
+   value that the receiver cannot interpret (here, the Recover-Policy
+   and Futuristic-Acct-Record AVPs).  The length of the Example-AVP is
+   the sum of all the length of the member AVPs, including their
+   padding, plus the Example-AVP header size.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 54]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-   size.
+
+Fajardo, et al.              Standards Track                   [Page 53]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    This AVP would be encoded as follows:
@@ -3076,15 +3020,18 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 55]
+
+
+
+Fajardo, et al.              Standards Track                   [Page 54]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 4.5.  Diameter Base Protocol AVPs
 
    The following table describes the Diameter AVPs defined in the base
-   protocol, their AVP Code values, types, possible flag values.
+   protocol, their AVP Code values, types, and possible flag values.
 
    Due to space constraints, the short form DiamIdent is used to
    represent DiameterIdentity.
@@ -3132,9 +3079,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 56]
+Fajardo, et al.              Standards Track                   [Page 55]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
                                             +----------+
@@ -3154,7 +3101,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
      Record-Number                          |    |     |
    Accounting-      480  9.8.1   Enumerated | M  |  V  |
      Record-Type                            |    |     |
-   Accounting-       44  9.8.4   OctetString| M  |  V  |
+   Acct-             44  9.8.4   OctetString| M  |  V  |
     Session-Id                              |    |     |
    Accounting-      287  9.8.6   Unsigned64 | M  |  V  |
      Sub-Session-Id                         |    |     |
@@ -3188,9 +3135,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 57]
+Fajardo, et al.              Standards Track                   [Page 56]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
                                             +----------+
@@ -3244,9 +3191,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 58]
+Fajardo, et al.              Standards Track                   [Page 57]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 5.  Diameter Peers
@@ -3258,25 +3205,25 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    Connections between diameter peers are established using their valid
    DiameterIdentity.  A Diameter node initiating a connection to a peer
-   MUST know the peers DiameterIdentity.  Methods for discovering a
+   MUST know the peer's DiameterIdentity.  Methods for discovering a
    Diameter peer can be found in Section 5.2.
 
-   Although a Diameter node may have many possible peers that it is able
-   to communicate with, it may not be economical to have an established
-   connection to all of them.  At a minimum, a Diameter node SHOULD have
-   an established connection with two peers per realm, known as the
-   primary and secondary peers.  Of course, a node MAY have additional
-   connections, if it is deemed necessary.  Typically, all messages for
-   a realm are sent to the primary peer, but in the event that failover
-   procedures are invoked, any pending requests are sent to the
-   secondary peer.  However, implementations are free to load balance
-   requests between a set of peers.
-
-   Note that a given peer MAY act as a primary for a given realm, while
+   Although a Diameter node may have many possible peers with which it
+   is able to communicate, it may not be economical to have an
+   established connection to all of them.  At a minimum, a Diameter node
+   SHOULD have an established connection with two peers per realm, known
+   as the primary and secondary peers.  Of course, a node MAY have
+   additional connections, if it is deemed necessary.  Typically, all
+   messages for a realm are sent to the primary peer but, in the event
+   that failover procedures are invoked, any pending requests are sent
+   to the secondary peer.  However, implementations are free to load
+   balance requests between a set of peers.
+
+   Note that a given peer MAY act as a primary for a given realm while
    acting as a secondary for another realm.
 
    When a peer is deemed suspect, which could occur for various reasons,
-   including not receiving a DWA within an allotted timeframe, no new
+   including not receiving a DWA within an allotted time frame, no new
    requests should be forwarded to the peer, but failover procedures are
    invoked.  When an active peer is moved to this mode, additional
    connections SHOULD be established to ensure that the necessary number
@@ -3284,15 +3231,14 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    There are two ways that a peer is removed from the suspect peer list:
 
-
    1.  The peer is no longer reachable, causing the transport connection
-       to be shutdown.  The peer is moved to the closed state.
+       to be shut down.  The peer is moved to the closed state.
 
-   2.  Three watchdog messages are exchanged with accepted round trip
+   2.  Three watchdog messages are exchanged with accepted round-trip
        times, and the connection to the peer is considered stabilized.
 
    In the event the peer being removed is either the primary or
-   secondary, an alternate peer SHOULD replace the deleted peer, and
+   secondary, an alternate peer SHOULD replace the deleted peer and
    assume the role of either primary or secondary.
 
 
@@ -3300,99 +3246,106 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 59]
+
+Fajardo, et al.              Standards Track                   [Page 58]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 5.2.  Diameter Peer Discovery
 
-   Allowing for dynamic Diameter agent discovery will make it possible
-   for simpler and more robust deployment of Diameter services.  In
-   order to promote interoperable implementations of Diameter peer
-   discovery, the following mechanisms are described.  These are based
-   on existing IETF standards.  The first option (manual configuration)
-   MUST be supported by all Diameter nodes, while the latter option
-   (DNS) MAY be supported.
+   Allowing for dynamic Diameter agent discovery makes possible simpler
+   and more robust deployment of Diameter services.  In order to promote
+   interoperable implementations of Diameter peer discovery, the
+   following mechanisms (manual configuration and DNS) are described.
+   These are based on existing IETF standards.  Both mechanisms MUST be
+   supported by all Diameter implementations; either MAY be used.
 
    There are two cases where Diameter peer discovery may be performed.
    The first is when a Diameter client needs to discover a first-hop
    Diameter agent.  The second case is when a Diameter agent needs to
-   discover another agent - for further handling of a Diameter
-   operation.  In both cases, the following 'search order' is
-   recommended:
-
+   discover another agent for further handling of a Diameter operation.
+   In both cases, the following 'search order' is recommended:
 
-   1.  The Diameter implementation consults its list of static
+   1.  The Diameter implementation consults its list of statically
        (manually) configured Diameter agent locations.  These will be
        used if they exist and respond.
 
-
    2.  The Diameter implementation performs a NAPTR query for a server
-       in a particular realm.  The Diameter implementation has to know
-       in advance which realm to look for a Diameter agent.  This could
-       be deduced, for example, from the 'realm' in a NAI that a
-       Diameter implementation needed to perform a Diameter operation
-       on.
+       in a particular realm.  The Diameter implementation has to know,
+       in advance, in which realm to look for a Diameter agent.  This
+       could be deduced, for example, from the 'realm' in an NAI on
+       which a Diameter implementation needed to perform a Diameter
+       operation.
 
        The NAPTR usage in Diameter follows the S-NAPTR DDDS application
        [RFC3958] in which the SERVICE field includes tags for the
        desired application and supported application protocol.  The
        application service tag for a Diameter application is 'aaa' and
        the supported application protocol tags are 'diameter.tcp',
-       'diameter.sctp', 'diameter.dtls' or 'diameter.tls.tcp'.
+       'diameter.sctp', 'diameter.dtls', or 'diameter.tls.tcp'
+       [RFC6408].
 
        The client can follow the resolution process defined by the
-       S-NAPTR DDDS [RFC3958] application to find a matching SRV, A or
+       S-NAPTR DDDS [RFC3958] application to find a matching SRV, A, or
        AAAA record of a suitable peer.  The domain suffixes in the NAPTR
        replacement field SHOULD match the domain of the original query.
        An example can be found in Appendix B.
 
    3.  If no NAPTR records are found, the requester directly queries for
-       SRV records '_diameter._sctp'.realm, '_diameter._dtls'.realm,
-       '_diameter._tcp'.realm and '_diameter._tls'.realm depending on
-       the requesters network protocol capabilities.  If SRV records are
-       found then the requester can perform address record query (A RR's
+       one of the following SRV records: for Diameter over TCP, use
+       "_diameter._tcp.realm"; for Diameter over TLS, use
+       "_diameters._tcp.realm"; for Diameter over SCTP, use
+       "_diameter._sctp.realm"; for Diameter over DTLS, use
+       "_diameters._sctp.realm".  If SRV records are found, then the
+       requester can perform address record query (A RR's and/or AAAA
+
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 60]
+Fajardo, et al.              Standards Track                   [Page 59]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-       and/or AAAA RR's) for the target hostname specified in the SRV
-       records.  If no SRV records are found, the requester gives up.
+       RR's) for the target hostname specified in the SRV records
+       following the rules given in [RFC2782].  If no SRV records are
+       found, the requester gives up.
 
    If the server is using a site certificate, the domain name in the
    NAPTR query and the domain name in the replacement field MUST both be
    valid based on the site certificate handed out by the server in the
-   TLS/TCP and DTLS/SCTP or IKE exchange.  Similarly, the domain name in
-   the SRV query and the domain name in the target in the SRV record
-   MUST both be valid based on the same site certificate.  Otherwise, an
-   attacker could modify the DNS records to contain replacement values
-   in a different domain, and the client could not validate that this
-   was the desired behavior, or the result of an attack.
-
-   Also, the Diameter Peer MUST check to make sure that the discovered
+   TLS/TCP and DTLS/SCTP or Internet Key Exchange Protocol (IKE)
+   exchange.  Similarly, the domain name in the SRV query and the domain
+   name in the target in the SRV record MUST both be valid based on the
+   same site certificate.  Otherwise, an attacker could modify the DNS
+   records to contain replacement values in a different domain, and the
+   client could not validate whether this was the desired behavior or
+   the result of an attack.
+
+   Also, the Diameter peer MUST check to make sure that the discovered
    peers are authorized to act in its role.  Authentication via IKE or
    TLS/TCP and DTLS/SCTP, or validation of DNS RRs via DNSSEC is not
    sufficient to conclude this.  For example, a web server may have
    obtained a valid TLS/TCP and DTLS/SCTP certificate, and secured RRs
    may be included in the DNS, but this does not imply that it is
-   authorized to act as a Diameter Server.
-
-   Authorization can be achieved for example, by configuration of a
-   Diameter Server CA.  Alternatively this can be achieved by definition
-   of OIDs within TLS/TCP and DTLS/SCTP or IKE certificates so as to
-   signify Diameter Server authorization.
-
-   A dynamically discovered peer causes an entry in the Peer Table (see
+   authorized to act as a Diameter server.
+
+   Authorization can be achieved, for example, by the configuration of a
+   Diameter server Certification Authority (CA).  The server CA issues a
+   certificate to the Diameter server, which includes an Object
+   Identifier (OID) to indicate the subject is a Diameter server in the
+   Extended Key Usage extension [RFC5280].  This certificate is then
+   used during TLS/TCP, DTLS/SCTP, or IKE security negotiation.
+   However, note that, at the time of writing, no Diameter server
+   Certification Authorities exist.
+
+   A dynamically discovered peer causes an entry in the peer table (see
    Section 2.6) to be created.  Note that entries created via DNS MUST
-   expire (or be refreshed) within the DNS TTL.  If a peer is discovered
-   outside of the local realm, a routing table entry (see Section 2.7)
-   for the peer's realm is created.  The routing table entry's
-   expiration MUST match the peer's expiration value.
+   expire (or be refreshed) within the DNS Time to Live (TTL).  If a
+   peer is discovered outside of the local realm, a routing table entry
+   (see Section 2.7) for the peer's realm is created.  The routing table
+   entry's expiration MUST match the peer's expiration value.
 
 5.3.  Capabilities Exchange
 
@@ -3400,35 +3353,36 @@ Internet-Draft           Diameter Base Protocol             January 2011
    exchange the Capabilities Exchange messages, as specified in the peer
    state machine (see Section 5.6).  This message allows the discovery
    of a peer's identity and its capabilities (protocol version number,
-   supported Diameter applications, security mechanisms, etc.)
+   the identifiers of supported Diameter applications, security
+   mechanisms, etc.).
 
-   The receiver only issues commands to its peers that have advertised
-   support for the Diameter application that defines the command.  A
-   Diameter node MUST cache the supported applications in order to
-   ensure that unrecognized commands and/or AVPs are not unnecessarily
-   sent to a peer.
-
-   A receiver of a Capabilities-Exchange-Req (CER) message that does not
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 61]
+Fajardo, et al.              Standards Track                   [Page 60]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-   have any applications in common with the sender MUST return a
+   The receiver only issues commands to its peers that have advertised
+   support for the Diameter application that defines the command.  A
+   Diameter node MUST cache the supported Application Ids in order to
+   ensure that unrecognized commands and/or AVPs are not unnecessarily
+   sent to a peer.
+
+   A receiver of a Capabilities-Exchange-Request (CER) message that does
+   not have any applications in common with the sender MUST return a
    Capabilities-Exchange-Answer (CEA) with the Result-Code AVP set to
-   DIAMETER_NO_COMMON_APPLICATION, and SHOULD disconnect the transport
+   DIAMETER_NO_COMMON_APPLICATION and SHOULD disconnect the transport
    layer connection.  Note that receiving a CER or CEA from a peer
-   advertising itself as a Relay (see Section 2.4) MUST be interpreted
+   advertising itself as a relay (see Section 2.4) MUST be interpreted
    as having common applications with the peer.
 
    The receiver of the Capabilities-Exchange-Request (CER) MUST
    determine common applications by computing the intersection of its
-   own set of supported Application Id against all of the application
-   identifier AVPs (Auth-Application-Id, Acct-Application-Id and Vendor-
-   Specific-Application-Id) present in the CER.  The value of the
+   own set of supported Application Ids against all of the
+   Application-Id AVPs (Auth-Application-Id, Acct-Application-Id, and
+   Vendor-Specific-Application-Id) present in the CER.  The value of the
    Vendor-Id AVP in the Vendor-Specific-Application-Id MUST NOT be used
    during computation.  The sender of the Capabilities-Exchange-Answer
    (CEA) SHOULD include all of its supported applications as a hint to
@@ -3438,12 +3392,13 @@ Internet-Draft           Diameter Base Protocol             January 2011
    and DTLS/SCTP connection prior to the CER/CEA exchange.  This
    protects the capabilities information of both peers.  To support
    older Diameter implementations that do not fully conform to this
-   document, the transport security MAY still be negotiated via Inband-
-   Security AVP.  In this case, the receiver of a Capabilities-Exchange-
-   Req (CER) message that does not have any security mechanisms in
-   common with the sender MUST return a Capabilities-Exchange-Answer
-   (CEA) with the Result-Code AVP set to DIAMETER_NO_COMMON_SECURITY,
-   and SHOULD disconnect the transport layer connection.
+   document, the transport security MAY still be negotiated via an
+   Inband-Security AVP.  In this case, the receiver of a Capabilities-
+   Exchange-Request (CER) message that does not have any security
+   mechanisms in common with the sender MUST return a Capabilities-
+   Exchange-Answer (CEA) with the Result-Code AVP set to
+   DIAMETER_NO_COMMON_SECURITY and SHOULD disconnect the transport layer
+   connection.
 
    CERs received from unknown peers MAY be silently discarded, or a CEA
    MAY be issued with the Result-Code AVP set to DIAMETER_UNKNOWN_PEER.
@@ -3455,34 +3410,34 @@ Internet-Draft           Diameter Base Protocol             January 2011
    failure, all the pending transactions destined to the unknown peer
    can be discarded.
 
-   The CER and CEA messages MUST NOT be proxied, redirected or relayed.
+   The CER and CEA messages MUST NOT be proxied, redirected, or relayed.
 
-   Since the CER/CEA messages cannot be proxied, it is still possible
-   that an upstream agent receives a message for which it has no
-   available peers to handle the application that corresponds to the
-   Command-Code.  In such instances, the 'E' bit is set in the answer
-   message (see Section 7.) with the Result-Code AVP set to
-   DIAMETER_UNABLE_TO_DELIVER to inform the downstream to take action
-   (e.g., re-routing request to an alternate peer).
 
 
 
-
-Fajardo, et al.           Expires July 24, 2011                [Page 62]
+Fajardo, et al.              Standards Track                   [Page 61]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
+   Since the CER/CEA messages cannot be proxied, it is still possible
+   that an upstream agent will receive a message for which it has no
+   available peers to handle the application that corresponds to the
+   Command Code.  In such instances, the 'E' bit is set in the answer
+   message (Section 7) with the Result-Code AVP set to
+   DIAMETER_UNABLE_TO_DELIVER to inform the downstream agent to take
+   action (e.g., re-routing request to an alternate peer).
+
    With the exception of the Capabilities-Exchange-Request message, a
    message of type Request that includes the Auth-Application-Id or
    Acct-Application-Id AVPs, or a message with an application-specific
-   command code, MAY only be forwarded to a host that has explicitly
+   Command Code MAY only be forwarded to a host that has explicitly
    advertised support for the application (or has advertised the Relay
    Application Id).
 
 5.3.1.  Capabilities-Exchange-Request
 
-   The Capabilities-Exchange-Request (CER), indicated by the Command-
+   The Capabilities-Exchange-Request (CER), indicated by the Command
    Code set to 257 and the Command Flags' 'R' bit set, is sent to
    exchange local capabilities.  Upon detection of a transport failure,
    this message MUST NOT be sent to an alternate peer.
@@ -3490,7 +3445,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
    When Diameter is run over SCTP [RFC4960] or DTLS/SCTP [RFC6083],
    which allow for connections to span multiple interfaces and multiple
    IP addresses, the Capabilities-Exchange-Request message MUST contain
-   one Host-IP- Address AVP for each potential IP address that MAY be
+   one Host-IP-Address AVP for each potential IP address that MAY be
    locally used when transmitting Diameter messages.
 
       Message Format
@@ -3510,9 +3465,20 @@ Internet-Draft           Diameter Base Protocol             January 2011
                    [ Firmware-Revision ]
                  * [ AVP ]
 
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 62]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
 5.3.2.  Capabilities-Exchange-Answer
 
-   The Capabilities-Exchange-Answer (CEA), indicated by the Command-Code
+   The Capabilities-Exchange-Answer (CEA), indicated by the Command Code
    set to 257 and the Command Flags' 'R' bit cleared, is sent in
    response to a CER message.
 
@@ -3522,13 +3488,6 @@ Internet-Draft           Diameter Base Protocol             January 2011
    one Host-IP-Address AVP for each potential IP address that MAY be
    locally used when transmitting Diameter messages.
 
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 63]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    Message Format
 
          <CEA> ::= < Diameter Header: 257 >
@@ -3552,22 +3511,34 @@ Internet-Draft           Diameter Base Protocol             January 2011
 5.3.3.  Vendor-Id AVP
 
    The Vendor-Id AVP (AVP Code 266) is of type Unsigned32 and contains
-   the IANA "SMI Network Management Private Enterprise Codes" [RFC3232]
-   value assigned to the vendor of the Diameter device.  It is
+   the IANA "SMI Network Management Private Enterprise Codes"
+   [ENTERPRISE] value assigned to the Diameter Software vendor.  It is
    envisioned that the combination of the Vendor-Id, Product-Name
-   (Section 5.3.7) and the Firmware-Revision (Section 5.3.4) AVPs may
+   (Section 5.3.7), and Firmware-Revision (Section 5.3.4) AVPs may
    provide useful debugging information.
 
-   A Vendor-Id value of zero in the CER or CEA messages is reserved and
+   A Vendor-Id value of zero in the CER or CEA message is reserved and
    indicates that this field is ignored.
 
+
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 63]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
 5.3.4.  Firmware-Revision AVP
 
    The Firmware-Revision AVP (AVP Code 267) is of type Unsigned32 and is
    used to inform a Diameter peer of the firmware revision of the
    issuing device.
 
-   For devices that do not have a firmware revision (general purpose
+   For devices that do not have a firmware revision (general-purpose
    computers running Diameter software modules, for instance), the
    revision of the Diameter software module may be reported instead.
 
@@ -3577,77 +3548,70 @@ Internet-Draft           Diameter Base Protocol             January 2011
    to inform a Diameter peer of the sender's IP address.  All source
    addresses that a Diameter node expects to use with SCTP [RFC4960] or
    DTLS/SCTP [RFC6083] MUST be advertised in the CER and CEA messages by
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 64]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    including a Host-IP-Address AVP for each address.
 
 5.3.6.  Supported-Vendor-Id AVP
 
    The Supported-Vendor-Id AVP (AVP Code 265) is of type Unsigned32 and
    contains the IANA "SMI Network Management Private Enterprise Codes"
-   [RFC3232] value assigned to a vendor other than the device vendor but
-   including the application vendor.  This is used in the CER and CEA
-   messages in order to inform the peer that the sender supports (a
-   subset of) the vendor-specific AVPs defined by the vendor identified
+   [ENTERPRISE] value assigned to a vendor other than the device vendor
+   but including the application vendor.  This is used in the CER and
+   CEA messages in order to inform the peer that the sender supports (a
+   subset of) the Vendor-Specific AVPs defined by the vendor identified
    in this AVP.  The value of this AVP MUST NOT be set to zero.
    Multiple instances of this AVP containing the same value SHOULD NOT
    be sent.
 
 5.3.7.  Product-Name AVP
 
-   The Product-Name AVP (AVP Code 269) is of type UTF8String, and
-   contains the vendor assigned name for the product.  The Product-Name
+   The Product-Name AVP (AVP Code 269) is of type UTF8String and
+   contains the vendor-assigned name for the product.  The Product-Name
    AVP SHOULD remain constant across firmware revisions for the same
    product.
 
-5.4.  Disconnecting Peer connections
+5.4.  Disconnecting Peer Connections
 
    When a Diameter node disconnects one of its transport connections,
-   its peer cannot know the reason for the disconnect, and will most
-   likely assume that a connectivity problem occurred, or that the peer
+   its peer cannot know the reason for the disconnect and will most
+   likely assume that a connectivity problem occurred or that the peer
    has rebooted.  In these cases, the peer may periodically attempt to
    reconnect, as stated in Section 2.1.  In the event that the
-   disconnect was a result of either a shortage of internal resources,
-   or simply that the node in question has no intentions of forwarding
-   any Diameter messages to the peer in the foreseeable future, a
-   periodic connection request would not be welcomed.  The
-   Disconnection-Reason AVP contains the reason the Diameter node issued
-   the Disconnect-Peer-Request message.
+   disconnect was a result of either a shortage of internal resources or
+   simply that the node in question has no intentions of forwarding any
+   Diameter messages to the peer in the foreseeable future, a periodic
 
-   The Disconnect-Peer-Request message is used by a Diameter node to
-   inform its peer of its intent to disconnect the transport layer, and
-   that the peer shouldn't reconnect unless it has a valid reason to do
-   so (e.g., message to be forwarded).  Upon receipt of the message, the
-   Disconnect-Peer-Answer is returned, which SHOULD contain an error if
-   messages have recently been forwarded, and are likely in flight,
-   which would otherwise cause a race condition.
 
-   The receiver of the Disconnect-Peer-Answer initiates the transport
-   disconnect.  The sender of the Disconnect-Peer-Answer should be able
-   to detect the transport closure and cleanup the connection.
 
 
+Fajardo, et al.              Standards Track                   [Page 64]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
+   connection request would not be welcomed.  The Disconnection-Reason
+   AVP contains the reason the Diameter node issued the Disconnect-Peer-
+   Request message.
 
-Fajardo, et al.           Expires July 24, 2011                [Page 65]
-
-Internet-Draft           Diameter Base Protocol             January 2011
+   The Disconnect-Peer-Request message is used by a Diameter node to
+   inform its peer of its intent to disconnect the transport layer and
+   that the peer shouldn't reconnect unless it has a valid reason to do
+   so (e.g., message to be forwarded).  Upon receipt of the message, the
+   Disconnect-Peer-Answer message is returned, which SHOULD contain an
+   error if messages have recently been forwarded, and are likely in
+   flight, which would otherwise cause a race condition.
 
+   The receiver of the Disconnect-Peer-Answer message initiates the
+   transport disconnect.  The sender of the Disconnect-Peer-Answer
+   message should be able to detect the transport closure and clean up
+   the connection.
 
 5.4.1.  Disconnect-Peer-Request
 
-   The Disconnect-Peer-Request (DPR), indicated by the Command-Code set
+   The Disconnect-Peer-Request (DPR), indicated by the Command Code set
    to 282 and the Command Flags' 'R' bit set, is sent to a peer to
-   inform its intentions to shutdown the transport connection.  Upon
-   detection of a transport failure, this message MUST NOT be sent to an
-   alternate peer.
+   inform it of its intentions to shut down the transport connection.
+   Upon detection of a transport failure, this message MUST NOT be sent
+   to an alternate peer.
 
       Message Format
 
@@ -3659,28 +3623,14 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 5.4.2.   Disconnect-Peer-Answer
 
-   The Disconnect-Peer-Answer (DPA), indicated by the Command-Code set
+   The Disconnect-Peer-Answer (DPA), indicated by the Command Code set
    to 282 and the Command Flags' 'R' bit cleared, is sent as a response
    to the Disconnect-Peer-Request message.  Upon receipt of this
-   message, the transport connection is shutdown.
+   message, the transport connection is shut down.
 
-      Message Format
 
-         <DPA>  ::= < Diameter Header: 282 >
-                    { Result-Code }
-                    { Origin-Host }
-                    { Origin-Realm }
-                    [ Error-Message ]
-                    [ Failed-AVP ]
-                  * [ AVP ]
 
-5.4.3.   Disconnect-Cause AVP
 
-   The Disconnect-Cause AVP (AVP Code 273) is of type Enumerated.  A
-   Diameter node MUST include this AVP in the Disconnect-Peer-Request
-   message to inform the peer of the reason for its intention to
-   shutdown the transport connection.  The following values are
-   supported:
 
 
 
@@ -3689,29 +3639,44 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
+Fajardo, et al.              Standards Track                   [Page 65]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
+      Message Format
+
+         <DPA>  ::= < Diameter Header: 282 >
+                    { Result-Code }
+                    { Origin-Host }
+                    { Origin-Realm }
+                    [ Error-Message ]
+                    [ Failed-AVP ]
+                  * [ AVP ]
 
-Fajardo, et al.           Expires July 24, 2011                [Page 66]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
+5.4.3.   Disconnect-Cause AVP
+
+   The Disconnect-Cause AVP (AVP Code 273) is of type Enumerated.  A
+   Diameter node MUST include this AVP in the Disconnect-Peer-Request
+   message to inform the peer of the reason for its intention to shut
+   down the transport connection.  The following values are supported:
 
-    REBOOTING                         0
-       A scheduled reboot is imminent. Receiver of DPR with above result
-       code MAY attempt reconnection.
+      REBOOTING                         0
+         A scheduled reboot is imminent.  A receiver of a DPR with
+         above result code MAY attempt reconnection.
 
-    BUSY                              1
-       The peer's internal resources are constrained, and it has
-       determined that the transport connection needs to be closed.
-       Receiver of DPR with above result code SHOULD NOT attempt
-       reconnection.
+      BUSY                              1
+         The peer's internal resources are constrained, and it has
+         determined that the transport connection needs to be closed.
+         A receiver of a DPR with above result code SHOULD NOT attempt
+         reconnection.
 
-    DO_NOT_WANT_TO_TALK_TO_YOU        2
-       The peer has determined that it does not see a need for the
-       transport connection to exist, since it does not expect any
-       messages to be exchanged in the near future. Receiver of DPR
-       with above result code SHOULD NOT attempt reconnection.
+      DO_NOT_WANT_TO_TALK_TO_YOU        2
+         The peer has determined that it does not see a need for the
+         transport connection to exist, since it does not expect any
+         messages to be exchanged in the near future.  A receiver of a
+         DPR with above result code SHOULD NOT attempt reconnection.
 
 5.5.  Transport Failure Detection
 
@@ -3723,9 +3688,21 @@ Internet-Draft           Diameter Base Protocol             January 2011
    Watchdog-Answer messages, defined in this section, are used to pro-
    actively detect transport failures.
 
+
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 66]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
 5.5.1.  Device-Watchdog-Request
 
-   The Device-Watchdog-Request (DWR), indicated by the Command-Code set
+   The Device-Watchdog-Request (DWR), indicated by the Command Code set
    to 280 and the Command Flags' 'R' bit set, is sent to a peer when no
    traffic has been exchanged between two peers (see Section 5.5.3).
    Upon detection of a transport failure, this message MUST NOT be sent
@@ -3741,18 +3718,10 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 5.5.2.  Device-Watchdog-Answer
 
-   The Device-Watchdog-Answer (DWA), indicated by the Command-Code set
+   The Device-Watchdog-Answer (DWA), indicated by the Command Code set
    to 280 and the Command Flags' 'R' bit cleared, is sent as a response
    to the Device-Watchdog-Request message.
 
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 67]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
       Message Format
 
          <DWA>  ::= < Diameter Header: 280 >
@@ -3767,7 +3736,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
 5.5.3.   Transport Failure Algorithm
 
    The transport failure algorithm is defined in [RFC3539].  All
-   Diameter implementations MUST support the algorithm defined in the
+   Diameter implementations MUST support the algorithm defined in that
    specification in order to be compliant to the Diameter base protocol.
 
 5.5.4.  Failover and Failback Procedures
@@ -3775,7 +3744,17 @@ Internet-Draft           Diameter Base Protocol             January 2011
    In the event that a transport failure is detected with a peer, it is
    necessary for all pending request messages to be forwarded to an
    alternate agent, if possible.  This is commonly referred to as
-   failover.
+   "failover".
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 67]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
    In order for a Diameter node to perform failover procedures, it is
    necessary for the node to maintain a pending message queue for a
@@ -3783,16 +3762,16 @@ Internet-Draft           Diameter Base Protocol             January 2011
    request is removed from the queue.  The Hop-by-Hop Identifier field
    is used to match the answer with the queued request.
 
-   When a transport failure is detected, if possible all messages in the
-   queue are sent to an alternate agent with the T flag set.  On booting
-   a Diameter client or agent, the T flag is also set on any records
-   still remaining to be transmitted in non-volatile storage.  An
-   example of a case where it is not possible to forward the message to
-   an alternate server is when the message has a fixed destination, and
-   the unavailable peer is the message's final destination (see
-   Destination-Host AVP).  Such an error requires that the agent return
-   an answer message with the 'E' bit set and the Result-Code AVP set to
-   DIAMETER_UNABLE_TO_DELIVER.
+   When a transport failure is detected, if possible, all messages in
+   the queue are sent to an alternate agent with the T flag set.  On
+   booting a Diameter client or agent, the T flag is also set on any
+   remaining records in non-volatile storage that are still waiting to
+   be transmitted.  An example of a case where it is not possible to
+   forward the message to an alternate server is when the message has a
+   fixed destination, and the unavailable peer is the message's final
+   destination (see Destination-Host AVP).  Such an error requires that
+   the agent return an answer message with the 'E' bit set and the
+   Result-Code AVP set to DIAMETER_UNABLE_TO_DELIVER.
 
    It is important to note that multiple identical requests or answers
    MAY be received as a result of a failover.  The End-to-End Identifier
@@ -3801,17 +3780,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    As described in Section 2.1, a connection request should be
    periodically attempted with the failed peer in order to re-establish
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 68]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    the transport connection.  Once a connection has been successfully
    established, messages can once again be forwarded to the peer.  This
-   is commonly referred to as failback.
+   is commonly referred to as "failback".
 
 5.6.  Peer State Machine
 
@@ -3824,16 +3795,24 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    This state machine is closely coupled with the state machine
    described in [RFC3539], which is used to open, close, failover,
-   probe, and reopen transport connections.  Note in particular that
+   probe, and reopen transport connections.  In particular, note that
    [RFC3539] requires the use of watchdog messages to probe connections.
    For Diameter, DWR and DWA messages are to be used.
 
-   I- is used to represent the initiator (connecting) connection, while
-   the R- is used to represent the responder (listening) connection.
-   The lack of a prefix indicates that the event or action is the same
-   regardless of the connection on which the event occurred.
+   The I- prefix is used to represent the initiator (connecting)
+   connection, while the R- prefix is used to represent the responder
+   (listening) connection.  The lack of a prefix indicates that the
+   event or action is the same regardless of the connection on which the
+   event occurred.
+
+
+
+Fajardo, et al.              Standards Track                   [Page 68]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
-   The stable states that a state machine may be in are Closed, I-Open
+   The stable states that a state machine may be in are Closed, I-Open,
    and R-Open; all other states are intermediate.  Note that I-Open and
    R-Open are equivalent except for whether the initiator or responder
    transport connection is used for communication.
@@ -3848,23 +3827,15 @@ Internet-Draft           Diameter Base Protocol             January 2011
    the results of an election on one peer are guaranteed to be the
    inverse of the results on the other.
 
-   For TLS/TCP and DTLS/SCTP usage, TLS/TCP and DTLS/SCTP handshake
+   For TLS/TCP and DTLS/SCTP usage, a TLS/TCP and DTLS/SCTP handshake
    SHOULD begin when both ends are in the closed state prior to any
    Diameter message exchanges.  The TLS/TCP and DTLS/SCTP connection
    SHOULD be established before sending any CER or CEA message to secure
    and protect the capabilities information of both peers.  The TLS/TCP
    and DTLS/SCTP connection SHOULD be disconnected when the state
    machine moves to the closed state.  When connecting to responders
-   that do not conform to this document (i.e. older Diameter
+   that do not conform to this document (i.e., older Diameter
    implementations that are not prepared to received TLS/TCP and DTLS/
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 69]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    SCTP connections in the closed state), the initial TLS/TCP and DTLS/
    SCTP connection attempt will fail.  The initiator MAY then attempt to
    connect via TCP or SCTP and initiate the TLS/TCP and DTLS/SCTP
@@ -3878,6 +3849,25 @@ Internet-Draft           Diameter Base Protocol             January 2011
    Any implementation that produces equivalent results is considered
    compliant.
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 69]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
       state            event              action         next state
       -----------------------------------------------------------------
       Closed           Start            I-Snd-Conn-Req   Wait-Conn-Ack
@@ -3914,13 +3904,6 @@ Internet-Draft           Diameter Base Protocol             January 2011
                        R-Conn-CER       R-Reject         Wait-Returns
                        Timeout          Error            Closed
 
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 70]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
       R-Open           Send-Message     R-Snd-Message    R-Open
                        R-Rcv-Message    Process          R-Open
                        R-Rcv-DWR        Process-DWR,     R-Open
@@ -3928,10 +3911,19 @@ Internet-Draft           Diameter Base Protocol             January 2011
                        R-Rcv-DWA        Process-DWA      R-Open
                        R-Conn-CER       R-Reject         R-Open
                        Stop             R-Snd-DPR        Closing
-                       R-Rcv-DPR        R-Snd-DPA,       Closed
-                                        R-Disc
+                       R-Rcv-DPR        R-Snd-DPA        Closing
                        R-Peer-Disc      R-Disc           Closed
 
+
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 70]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
       I-Open           Send-Message     I-Snd-Message    I-Open
                        I-Rcv-Message    Process          I-Open
                        I-Rcv-DWR        Process-DWR,     I-Open
@@ -3939,8 +3931,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
                        I-Rcv-DWA        Process-DWA      I-Open
                        R-Conn-CER       R-Reject         I-Open
                        Stop             I-Snd-DPR        Closing
-                       I-Rcv-DPR        I-Snd-DPA,       Closed
-                                        I-Disc
+                       I-Rcv-DPR        I-Snd-DPA        Closing
                        I-Peer-Disc      I-Disc           Closed
 
       Closing          I-Rcv-DPA        I-Disc           Closed
@@ -3949,88 +3940,44 @@ Internet-Draft           Diameter Base Protocol             January 2011
                        I-Peer-Disc      I-Disc           Closed
                        R-Peer-Disc      R-Disc           Closed
 
-5.6.1.  Incoming connections
+5.6.1.  Incoming Connections
 
    When a connection request is received from a Diameter peer, it is
    not, in the general case, possible to know the identity of that peer
    until a CER is received from it.  This is because host and port
-   determine the identity of a Diameter peer; and the source port of an
-   incoming connection is arbitrary.  Upon receipt of CER, the identity
-   of the connecting peer can be uniquely determined from Origin-Host.
+   determine the identity of a Diameter peer; the source port of an
+   incoming connection is arbitrary.  Upon receipt of a CER, the
+   identity of the connecting peer can be uniquely determined from the
+   Origin-Host.
 
    For this reason, a Diameter peer must employ logic separate from the
    state machine to receive connection requests, accept them, and await
-   CER.  Once CER arrives on a new connection, the Origin-Host that
-   identifies the peer is used to locate the state machine associated
-   with that peer, and the new connection and CER are passed to the
-   state machine as an R-Conn-CER event.
+   the CER.  Once the CER arrives on a new connection, the Origin-Host
+   that identifies the peer is used to locate the state machine
+   associated with that peer, and the new connection and CER are passed
+   to the state machine as an R-Conn-CER event.
 
    The logic that handles incoming connections SHOULD close and discard
-   the connection if any message other than CER arrives, or if an
+   the connection if any message other than a CER arrives or if an
    implementation-defined timeout occurs prior to receipt of CER.
 
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 71]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    Because handling of incoming connections up to and including receipt
-   of CER requires logic, separate from that of any individual state
+   of a CER requires logic, separate from that of any individual state
    machine associated with a particular peer, it is described separately
    in this section rather than in the state machine above.
 
 5.6.2.  Events
 
    Transitions and actions in the automaton are caused by events.  In
-   this section, we will ignore the -I and -R prefix, since the actual
-   event would be identical, but would occur on one of two possible
+   this section, we will ignore the I- and R- prefixes, since the actual
+   event would be identical, but it would occur on one of two possible
    connections.
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 72]
+Fajardo, et al.              Standards Track                   [Page 71]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    Start          The Diameter application has signaled that a
@@ -4053,7 +4000,8 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    Rcv-CEA        A CEA message from the peer was received.
 
-   Rcv-Non-CEA    A message other than CEA from the peer was received.
+   Rcv-Non-CEA    A message, other than a CEA, from the peer was
+                  received.
 
    Peer-Disc      A disconnection indication from the peer was received.
 
@@ -4066,7 +4014,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    Send-Message   A message is to be sent.
 
-   Rcv-Message    A message other than CER, CEA, DPR, DPA, DWR or DWA
+   Rcv-Message    A message other than CER, CEA, DPR, DPA, DWR, or DWA
                   was received.
 
    Stop           The Diameter application has signaled that a
@@ -4077,16 +4025,15 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    Actions in the automaton are caused by events and typically indicate
    the transmission of packets and/or an action to be taken on the
-   connection.  In this section we will ignore the I- and R-prefix,
-   since the actual action would be identical, but would occur on one of
-   two possible connections.
-
+   connection.  In this section, we will ignore the I- and R- prefixes,
+   since the actual action would be identical, but it would occur on one
+   of two possible connections.
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 73]
+Fajardo, et al.              Standards Track                   [Page 72]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    Snd-Conn-Req   A transport connection is initiated with the peer.
@@ -4098,11 +4045,12 @@ Internet-Draft           Diameter Base Protocol             January 2011
                   is disconnected.
 
    Process-CER    The CER associated with the R-Conn-CER is processed.
+
    Snd-CER        A CER message is sent to the peer.
 
    Snd-CEA        A CEA message is sent to the peer.
 
-   Cleanup        If necessary, the connection is shutdown, and any
+   Cleanup        If necessary, the connection is shut down, and any
                   local resources are freed.
 
    Error          The transport layer connection is disconnected,
@@ -4139,10 +4087,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-
-Fajardo, et al.           Expires July 24, 2011                [Page 74]
+Fajardo, et al.              Standards Track                   [Page 73]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 5.6.4.  The Election Process
@@ -4150,134 +4097,97 @@ Internet-Draft           Diameter Base Protocol             January 2011
    The election is performed on the responder.  The responder compares
    the Origin-Host received in the CER with its own Origin-Host as two
    streams of octets.  If the local Origin-Host lexicographically
-   succeeds the received Origin-Host a Win-Election event is issued
-   locally.  Diameter identities are in ASCII form therefore the lexical
-   comparison is consistent with DNS case insensitivity where octets
-   that fall in the ASCII range 'a' through 'z' MUST compare equally to
-   their upper-case counterparts between 'A' and 'Z'.  See Appendix D
-   for interactions between the Diameter protocol and Internationalized
-   Domain Name (IDNs).
+   succeeds the received Origin-Host, a Win-Election event is issued
+   locally.  Diameter identities are in ASCII form; therefore, the
+   lexical comparison is consistent with DNS case insensitivity, where
+   octets that fall in the ASCII range 'a' through 'z' MUST compare
+   equally to their uppercase counterparts between 'A' and 'Z'.  See
+   Appendix D for interactions between the Diameter protocol and
+   Internationalized Domain Name (IDNs).
 
    The winner of the election MUST close the connection it initiated.
    Historically, maintaining the responder side of a connection was more
    efficient than maintaining the initiator side.  However, current
    practices makes this distinction irrelevant.
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 75]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-6.  Diameter message processing
+6.  Diameter Message Processing
 
    This section describes how Diameter requests and answers are created
    and processed.
 
 6.1.  Diameter Request Routing Overview
 
-   A request is sent towards its final destination using a combination
-   of the Destination-Realm and Destination-Host AVPs, in one of these
-   three combinations:
+   A request is sent towards its final destination using one of the
+   following three combinations of the Destination-Realm and
+   Destination-Host AVPs:
 
-   o  a request that is not able to be proxied (such as CER) MUST NOT
+   o  A request that is not able to be proxied (such as a CER) MUST NOT
       contain either Destination-Realm or Destination-Host AVPs.
 
-   o  a request that needs to be sent to a home server serving a
+   o  A request that needs to be sent to a home server serving a
       specific realm, but not to a specific server (such as the first
-      request of a series of round-trips), MUST contain a Destination-
-      Realm AVP, but MUST NOT contain a Destination-Host AVP.  For
+      request of a series of round trips), MUST contain a Destination-
+      Realm AVP but MUST NOT contain a Destination-Host AVP.  For
       Diameter clients, the value of the Destination-Realm AVP MAY be
       extracted from the User-Name AVP, or other methods.
 
-   o  otherwise, a request that needs to be sent to a specific home
-      server among those serving a given realm, MUST contain both the
+   o  Otherwise, a request that needs to be sent to a specific home
+      server among those serving a given realm MUST contain both the
       Destination-Realm and Destination-Host AVPs.
 
    The Destination-Host AVP is used as described above when the
    destination of the request is fixed, which includes:
 
-   o  Authentication requests that span multiple round trips
+   o  Authentication requests that span multiple round trips.
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 74]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
    o  A Diameter message that uses a security mechanism that makes use
       of a pre-established session key shared between the source and the
       final destination of the message.
 
-   o  Server initiated messages that MUST be received by a specific
+   o  Server-initiated messages that MUST be received by a specific
       Diameter client (e.g., access device), such as the Abort-Session-
       Request message, which is used to request that a particular user's
       session be terminated.
 
-   Note that an agent can forward a request to a host described in the
-   Destination-Host AVP only if the host in question is included in its
-   peer table (see Section 2.7).  Otherwise, the request is routed based
-   on the Destination-Realm only (see Sections 6.1.6).
+   Note that an agent can only forward a request to a host described in
+   the Destination-Host AVP if the host in question is included in its
+   peer table (see Section 2.6).  Otherwise, the request is routed based
+   on the Destination-Realm only (see Section 6.1.6).
 
    When a message is received, the message is processed in the following
    order:
 
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 76]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    o  If the message is destined for the local host, the procedures
       listed in Section 6.1.4 are followed.
 
    o  If the message is intended for a Diameter peer with whom the local
       host is able to directly communicate, the procedures listed in
-      Section 6.1.5 are followed.  This is known as Request Forwarding.
+      Section 6.1.5 are followed.  This is known as "Request
+      Forwarding".
 
-   o  The procedures listed in Section 6.1.6 are followed, which is
-      known as Request Routing.
+   o  The procedure listed in Section 6.1.6 is followed, which is known
+      as "Request Routing".
 
-   o  If none of the above is successful, an answer is returned with the
-      Result-Code set to DIAMETER_UNABLE_TO_DELIVER, with the E-bit set.
+   o  If none of the above are successful, an answer is returned with
+      the Result-Code set to DIAMETER_UNABLE_TO_DELIVER, with the 'E'
+      bit set.
 
    For routing of Diameter messages to work within an administrative
    domain, all Diameter nodes within the realm MUST be peers.
 
-   Note the processing rules contained in this section are intended to
-   be used as general guidelines to Diameter developers.  Certain
-   implementations MAY use different methods than the ones described
-   here, and still comply with the protocol specification.  See Section
-   7 for more detail on error handling.
+   The overview contained in this section (6.1) is intended to provide
+   general guidelines to Diameter developers.  Implementations are free
+   to use different methods than the ones described here as long as they
+   conform to the requirements specified in Sections 6.1.1 through
+   6.1.9.  See Section 7 for more details on error handling.
 
 6.1.1.  Originating a Request
 
@@ -4285,33 +4195,35 @@ Internet-Draft           Diameter Base Protocol             January 2011
    described in the application definition for that specific request,
    the following procedures MUST be followed:
 
-   o  the Command-Code is set to the appropriate value
 
-   o  the 'R' bit is set
 
-   o  the End-to-End Identifier is set to a locally unique value
 
-   o  the Origin-Host and Origin-Realm AVPs MUST be set to the
-      appropriate values, used to identify the source of the message
 
-   o  the Destination-Host and Destination-Realm AVPs MUST be set to the
-      appropriate values as described in Section 6.1.
+Fajardo, et al.              Standards Track                   [Page 75]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
-6.1.2.  Sending a Request
 
-   When sending a request, originated either locally, or as the result
-   of a forwarding or routing operation, the following procedures SHOULD
-   be followed:
+   o  the Command Code is set to the appropriate value;
 
-   o  The Hop-by-Hop Identifier SHOULD be set to a locally unique value.
+   o  the 'R' bit is set;
 
+   o  the End-to-End Identifier is set to a locally unique value;
 
+   o  the Origin-Host and Origin-Realm AVPs MUST be set to the
+      appropriate values, used to identify the source of the message;
+      and
 
+   o  the Destination-Host and Destination-Realm AVPs MUST be set to the
+      appropriate values, as described in Section 6.1.
 
-Fajardo, et al.           Expires July 24, 2011                [Page 77]
-
-Internet-Draft           Diameter Base Protocol             January 2011
+6.1.2.  Sending a Request
 
+   When sending a request, originated either locally or as the result of
+   a forwarding or routing operation, the following procedures SHOULD be
+   followed:
+
+   o  The Hop-by-Hop Identifier SHOULD be set to a locally unique value.
 
    o  The message SHOULD be saved in the list of pending requests.
 
@@ -4328,25 +4240,34 @@ Internet-Draft           Diameter Base Protocol             January 2011
 6.1.4.  Processing Local Requests
 
    A request is known to be for local consumption when one of the
-   following conditions occur:
+   following conditions occurs:
 
-   o  The Destination-Host AVP contains the local host's identity,
+   o  The Destination-Host AVP contains the local host's identity;
 
    o  The Destination-Host AVP is not present, the Destination-Realm AVP
       contains a realm the server is configured to process locally, and
-      the Diameter application is locally supported, or
+      the Diameter application is locally supported; or
 
    o  Both the Destination-Host and the Destination-Realm are not
       present.
 
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 76]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    When a request is locally processed, the rules in Section 6.2 should
    be used to generate the corresponding answer.
 
 6.1.5.  Request Forwarding
 
-   Request forwarding is done using the Diameter Peer Table.  The
-   Diameter peer table contains all of the peers that the local node is
-   able to directly communicate with.
+   Request forwarding is done using the Diameter peer table.  The
+   Diameter peer table contains all of the peers with which the local
+   node is able to directly communicate.
 
    When a request is received, and the host encoded in the Destination-
    Host AVP is one that is present in the peer table, the message SHOULD
@@ -4354,29 +4275,21 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 6.1.6.  Request Routing
 
-   Diameter request message routing is done via realms and application
-   identifiers.  A Diameter message that may be forwarded by Diameter
-   agents (proxies, redirect or relay agents) MUST include the target
+   Diameter request message routing is done via realms and Application
+   Ids. A Diameter message that may be forwarded by Diameter agents
+   (proxies, redirect agents, or relay agents) MUST include the target
    realm in the Destination-Realm AVP.  Request routing SHOULD rely on
    the Destination-Realm AVP and the Application Id present in the
    request message header to aid in the routing decision.  The realm MAY
    be retrieved from the User-Name AVP, which is in the form of a
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 78]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    Network Access Identifier (NAI).  The realm portion of the NAI is
    inserted in the Destination-Realm AVP.
 
    Diameter agents MAY have a list of locally supported realms and
-   applications, and MAY have a list of externally supported realms and
-   applications.  When a request is received that includes a realm
+   applications, and they MAY have a list of externally supported realms
+   and applications.  When a request is received that includes a realm
    and/or application that is not locally supported, the message is
-   routed to the peer configured in the Routing Table (see Section 2.7).
+   routed to the peer configured in the routing table (see Section 2.7).
 
    Realm names and Application Ids are the minimum supported routing
    criteria, additional information may be needed to support redirect
@@ -4385,13 +4298,23 @@ Internet-Draft           Diameter Base Protocol             January 2011
 6.1.7.  Predictive Loop Avoidance
 
    Before forwarding or routing a request, Diameter agents, in addition
-   to processing done in Section 6.1.3, SHOULD check for the presence of
-   candidate route's peer identity in any of the Route-Record AVPs.  In
-   an event of the agent detecting the presence of a candidate route's
-   peer identity in a Route-Record AVP, the agent MUST ignore such route
-   for the Diameter request message and attempt alternate routes if any.
-   In case all the candidate routes are eliminated by the above
-   criteria, the agent SHOULD return DIAMETER_UNABLE_TO_DELIVER message.
+   to performing the processing described in Section 6.1.3, SHOULD check
+   for the presence of a candidate route's peer identity in any of the
+   Route-Record AVPs.  In the event of the agent detecting the presence
+   of a candidate route's peer identity in a Route-Record AVP, the agent
+   MUST ignore such a route for the Diameter request message and attempt
+   alternate routes if any exist.  In case all the candidate routes are
+   eliminated by the above criteria, the agent SHOULD return a
+   DIAMETER_UNABLE_TO_DELIVER message.
+
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 77]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
 6.1.8.  Redirecting Requests
 
@@ -4399,7 +4322,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
    to REDIRECT, it MUST reply with an answer message with the 'E' bit
    set, while maintaining the Hop-by-Hop Identifier in the header, and
    include the Result-Code AVP to DIAMETER_REDIRECT_INDICATION.  Each of
-   the servers associated with the routing entry are added in separate
+   the servers associated with the routing entry are added in a separate
    Redirect-Host AVP.
 
                      +------------------+
@@ -4417,21 +4340,13 @@ Internet-Draft           Diameter Base Protocol             January 2011
                   |    Agent    |<-------------|    Server   |
                   +-------------+  4. Answer   +-------------+
 
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 79]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
                      Figure 5: Diameter Redirect Agent
 
-   The receiver of the answer message with the 'E' bit set, and the
-   Result-Code AVP set to DIAMETER_REDIRECT_INDICATION uses the hop-by-
-   hop field in the Diameter header to identify the request in the
-   pending message queue (see Section 5.3) that is to be redirected.  If
-   no transport connection exists with the new agent, one is created,
+   The receiver of an answer message with the 'E' bit set and the
+   Result-Code AVP set to DIAMETER_REDIRECT_INDICATION uses the Hop-by-
+   Hop Identifier in the Diameter header to identify the request in the
+   pending message queue (see Section 5.5.4) that is to be redirected.
+   If no transport connection exists with the new peer, one is created,
    and the request is sent directly to it.
 
    Multiple Redirect-Host AVPs are allowed.  The receiver of the answer
@@ -4440,17 +4355,26 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    When the Redirect-Host-Usage AVP included in the answer message has a
    non-zero value, a route entry for the redirect indications is created
-   and cached by the receiver.  The redirect usage for such route entry
-   is set by the value of Redirect-Host-Usage AVP and the lifetime of
-   the cached route entry is set by Redirect-Max-Cache-Time AVP value.
+   and cached by the receiver.  The redirect usage for such a route
+   entry is set by the value of Redirect-Host-Usage AVP and the lifetime
+   of the cached route entry is set by Redirect-Max-Cache-Time AVP
+   value.
 
    It is possible that multiple redirect indications can create multiple
    cached route entries differing only in their redirect usage and the
    peer to forward messages to.  As an example, two(2) route entries
    that are created by two(2) redirect indications results in two(2)
+
+
+
+Fajardo, et al.              Standards Track                   [Page 78]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    cached routes for the same realm and Application Id.  However, one
-   has a redirect usage of ALL_SESSION where matching request will be
-   forwarded to one peer and the other has a redirect usage of ALL_REALM
+   has a redirect usage of ALL_SESSION, where matching requests will be
+   forwarded to one peer; the other has a redirect usage of ALL_REALM,
    where request are forwarded to another peer.  Therefore, an incoming
    request that matches the realm and Application Id of both routes will
    need additional resolution.  In such a case, a routing precedence
@@ -4460,32 +4384,24 @@ Internet-Draft           Diameter Base Protocol             January 2011
 6.1.9.  Relaying and Proxying Requests
 
    A relay or proxy agent MUST append a Route-Record AVP to all requests
-   forwarded.  The AVP contains the identity of the peer the request was
-   received from.
+   forwarded.  The AVP contains the identity of the peer from which the
+   request was received.
 
-   The Hop-by-Hop identifier in the request is saved, and replaced with
-   a locally unique value.  The source of the request is also saved,
-   which includes the IP address, port and protocol.
+   The Hop-by-Hop Identifier in the request is saved and replaced with a
+   locally unique value.  The source of the request is also saved, which
+   includes the IP address, port, and protocol.
 
    A relay or proxy agent MAY include the Proxy-Info AVP in requests if
    it requires access to any local state information when the
    corresponding response is received.  The Proxy-Info AVP has security
-   implications as state information is distribute to other entities.
-   As such, it is RECOMMMENDED to protect the content of the Proxy-Info
-   AVP with cryptographic mechanisms, for example by using a keyed
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 80]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-   message digest.  Such a mechanism, however, requires the management
-   of keys, although only locally at the Diameter server.  Still, a full
-   description of the management of the keys used to protect the Proxy-
-   Info AVP is beyond the scope of this document.  Below is a list of
-   commonly recommended:
+   implications as state information is distributed to other entities.
+   As such, it is RECOMMENDED that the content of the Proxy-Info AVP be
+   protected with cryptographic mechanisms, for example, by using a
+   keyed message digest such as HMAC-SHA1 [RFC2104].  Such a mechanism,
+   however, requires the management of keys, although only locally at
+   the Diameter server.  Still, a full description of the management of
+   the keys used to protect the Proxy-Info AVP is beyond the scope of
+   this document.  Below is a list of common recommendations:
 
    o  The keys should be generated securely following the randomness
       recommendations in [RFC4086].
@@ -4494,32 +4410,39 @@ Internet-Draft           Diameter Base Protocol             January 2011
       least 128 bits in strength.
 
    o  The keys should not be used for any other purpose than generating
-      and verifying tickets.
+      and verifying instances of the Proxy-Info AVP.
 
    o  The keys should be changed regularly.
 
-   o  The keys should be changed if the ticket format or cryptographic
+   o  The keys should be changed if the AVP format or cryptographic
       protection algorithms change.
 
    The message is then forwarded to the next hop, as identified in the
-   Routing Table.
+   routing table.
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 79]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
    Figure 6 provides an example of message routing using the procedures
    listed in these sections.
 
-        (Origin-Host=nas.example.net)    (Origin-Host=nas.example.net)
-        (Origin-Realm=example.net)       (Origin-Realm=example.net)
-        (Destination-Realm=example.com)  (Destination-
-                                            Realm=example.com)
+       (Origin-Host=nas.example.net)    (Origin-Host=nas.example.net)
+       (Origin-Realm=example.net)       (Origin-Realm=example.net)
+       (Destination-Realm=example.com)  (Destination-Realm=example.com)
                                         (Route-Record=nas.example.net)
-       +------+      ------>      +------+      ------>      +------+
-       |      |     (Request)     |      |      (Request)    |      |
-       | NAS  +-------------------+ DRL  +-------------------+ HMS  |
-       |      |                   |      |                   |      |
-       +------+     <------       +------+     <------       +------+
-      example.net    (Answer)   example.net     (Answer)   example.com
-           (Origin-Host=hms.example.com)   (Origin-Host=hms.example.com)
-           (Origin-Realm=example.com)      (Origin-Realm=example.com)
+      +------+      ------>      +------+      ------>      +------+
+      |      |     (Request)     |      |      (Request)    |      |
+      | NAS  +-------------------+ DRL  +-------------------+ HMS  |
+      |      |                   |      |                   |      |
+      +------+     <------       +------+     <------       +------+
+     example.net    (Answer)   example.net     (Answer)   example.com
+          (Origin-Host=hms.example.com)   (Origin-Host=hms.example.com)
+          (Origin-Realm=example.com)      (Origin-Realm=example.com)
 
                   Figure 6: Routing of Diameter messages
 
@@ -4527,15 +4450,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
    incoming messages.  At a minimum, validation of the message header
    and relevant routing AVPs has to be done when relaying messages.
    Proxy agents may optionally perform more in-depth message validation
-   for applications it is interested in.
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 81]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
+   for applications in which it is interested.
 
 6.2.  Diameter Answer Processing
 
@@ -4544,7 +4459,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
    additional procedures that MAY be discussed in the Diameter
    application defining the command:
 
-   o  The same Hop-by-Hop identifier in the request is used in the
+   o  The same Hop-by-Hop Identifier in the request is used in the
       answer.
 
    o  The local host's identity is encoded in the Origin-Host AVP.
@@ -4561,15 +4476,23 @@ Internet-Draft           Diameter Base Protocol             January 2011
    o  Any Proxy-Info AVPs in the request MUST be added to the answer
       message, in the same order they were present in the request.
 
+
+
+
+Fajardo, et al.              Standards Track                   [Page 80]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    o  The 'P' bit is set to the same value as the one in the request.
 
    o  The same End-to-End identifier in the request is used in the
       answer.
 
-   Note that the error messages (see Section 7.3) are also subjected to
+   Note that the error messages (see Section 7) are also subjected to
    the above processing rules.
 
-6.2.1.   Processing received Answers
+6.2.1.   Processing Received Answers
 
    A Diameter client or proxy MUST match the Hop-by-Hop Identifier in an
    answer received against the list of pending requests.  The
@@ -4579,31 +4502,23 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 6.2.2.  Relaying and Proxying Answers
 
-   If the answer is for a request which was proxied or relayed, the
-   agent MUST restore the original value of the Diameter header's Hop-
-   by-Hop Identifier field.
+   If the answer is for a request that was proxied or relayed, the agent
+   MUST restore the original value of the Diameter header's Hop-by-Hop
+   Identifier field.
 
    If the last Proxy-Info AVP in the message is targeted to the local
    Diameter server, the AVP MUST be removed before the answer is
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 82]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    forwarded.
 
    If a relay or proxy agent receives an answer with a Result-Code AVP
    indicating a failure, it MUST NOT modify the contents of the AVP.
-   Any additional local errors detected SHOULD be logged, but not
+   Any additional local errors detected SHOULD be logged but not
    reflected in the Result-Code AVP.  If the agent receives an answer
    message with a Result-Code AVP indicating success, and it wishes to
    modify the AVP to indicate an error, it MUST modify the Result-Code
    AVP to contain the appropriate error in the message destined towards
-   the access device as well as include the Error-Reporting-Host AVP and
-   it MUST issue an STR on behalf of the access device towards the
+   the access device as well as include the Error-Reporting-Host AVP; it
+   MUST also issue an STR on behalf of the access device towards the
    Diameter server.
 
    The agent MUST then send the answer to the host that it received the
@@ -4612,10 +4527,19 @@ Internet-Draft           Diameter Base Protocol             January 2011
 6.3.  Origin-Host AVP
 
    The Origin-Host AVP (AVP Code 264) is of type DiameterIdentity, and
-   MUST be present in all Diameter messages.  This AVP identifies the
+   it MUST be present in all Diameter messages.  This AVP identifies the
    endpoint that originated the Diameter message.  Relay agents MUST NOT
    modify this AVP.
 
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 81]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    The value of the Origin-Host AVP is guaranteed to be unique within a
    single host.
 
@@ -4638,17 +4562,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    The Destination-Host AVP (AVP Code 293) is of type DiameterIdentity.
    This AVP MUST be present in all unsolicited agent initiated messages,
-   MAY be present in request messages, and MUST NOT be present in Answer
+   MAY be present in request messages, and MUST NOT be present in answer
    messages.
 
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 83]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    The absence of the Destination-Host AVP will cause a message to be
    sent to any Diameter server supporting the application within the
    realm specified in Destination-Realm AVP.
@@ -4658,20 +4574,28 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 6.6.  Destination-Realm AVP
 
-   The Destination-Realm AVP (AVP Code 283) is of type DiameterIdentity,
-   and contains the realm the message is to be routed to.  The
-   Destination-Realm AVP MUST NOT be present in Answer messages.
-   Diameter Clients insert the realm portion of the User-Name AVP.
+   The Destination-Realm AVP (AVP Code 283) is of type DiameterIdentity
+   and contains the realm to which the message is to be routed.  The
+   Destination-Realm AVP MUST NOT be present in answer messages.
+   Diameter clients insert the realm portion of the User-Name AVP.
    Diameter servers initiating a request message use the value of the
    Origin-Realm AVP from a previous message received from the intended
    target host (unless it is known a priori).  When present, the
    Destination-Realm AVP is used to perform message routing decisions.
 
-   An ABNF for a request message that includes the Destination-Realm AVP
+   The CCF for a request message that includes the Destination-Realm AVP
    SHOULD list the Destination-Realm AVP as a required AVP (an AVP
-   indicated as {AVP}) otherwise the message is inherently a non-
+   indicated as {AVP}); otherwise, the message is inherently a non-
    routable message.
 
+
+
+
+Fajardo, et al.              Standards Track                   [Page 82]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    This AVP SHOULD be placed as close to the Diameter header as
    possible.
 
@@ -4692,19 +4616,11 @@ Internet-Draft           Diameter Base Protocol             January 2011
    The Proxy-Info AVP (AVP Code 284) is of type Grouped.  This AVP
    contains the identity and local state information of the Diameter
    node that creates and adds it to a message.  The Grouped Data field
-   has the following ABNF grammar:
+   has the following CCF grammar:
 
          Proxy-Info ::= < AVP Header: 284 >
                         { Proxy-Host }
                         { Proxy-State }
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 84]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
                       * [ AVP ]
 
 6.7.3.  Proxy-Host AVP
@@ -4728,10 +4644,18 @@ Internet-Draft           Diameter Base Protocol             January 2011
    Application-Id AVP MUST match the Application Id present in the
    Diameter message header.
 
+
+
+
+Fajardo, et al.              Standards Track                   [Page 83]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
 6.9.  Acct-Application-Id AVP
 
    The Acct-Application-Id AVP (AVP Code 259) is of type Unsigned32 and
-   is used in order to advertise support of the Accounting portion of an
+   is used in order to advertise support of the accounting portion of an
    application (see Section 2.4).  If present in a message other than
    CER and CEA, the value of the Acct-Application-Id AVP MUST match the
    Application Id present in the Diameter message header.
@@ -4740,10 +4664,10 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    The Inband-Security-Id AVP (AVP Code 299) is of type Unsigned32 and
    is used in order to advertise support of the security portion of the
-   application.  The use of this AVP in CER and CEA messages is no
-   longer recommended.  Instead, discovery of a Diameter entities
-   security capabilities can be done either through static configuration
-   or via Diameter Peer Discovery described in Section 5.2.
+   application.  The use of this AVP in CER and CEA messages is NOT
+   RECOMMENDED.  Instead, discovery of a Diameter entity's security
+   capabilities can be done either through static configuration or via
+   Diameter Peer Discovery as described in Section 5.2.
 
    The following values are supported:
 
@@ -4753,36 +4677,37 @@ Internet-Draft           Diameter Base Protocol             January 2011
       This peer does not support TLS/TCP and DTLS/SCTP.  This is the
       default value, if the AVP is omitted.
 
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 85]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    TLS 1
 
-      This node supports TLS/TCP and DTLS/SCTP security, as defined by
-      [RFC5246].
+      This node supports TLS/TCP [RFC5246] and DTLS/SCTP [RFC6083]
+      security.
 
 6.11.  Vendor-Specific-Application-Id AVP
 
    The Vendor-Specific-Application-Id AVP (AVP Code 260) is of type
    Grouped and is used to advertise support of a vendor-specific
-   Diameter Application.  Exactly one instance of either Auth-
+   Diameter application.  Exactly one instance of either Auth-
    Application-Id or Acct-Application-Id AVP MUST be present.  The
    Application Id carried by either Auth-Application-Id or Acct-
-   Application-Id AVP MUST comply with vendor specific Application Id
-   assignment described in Sec 11.3.  It MUST also match the Application
-   Id present in the Diameter header except when used in a CER or CEA
-   message.
+   Application-Id AVP MUST comply with vendor-specific Application Id
+   assignment described in Section 11.3.  It MUST also match the
+   Application Id present in the Diameter header except when used in a
+   CER or CEA message.
 
    The Vendor-Id AVP is an informational AVP pertaining to the vendor
    who may have authorship of the vendor-specific Diameter application.
    It MUST NOT be used as a means of defining a completely separate
    vendor-specific Application Id space.
 
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 84]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    The Vendor-Specific-Application-Id AVP SHOULD be placed as close to
    the Diameter header as possible.
 
@@ -4795,9 +4720,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    A Vendor-Specific-Application-Id AVP MUST contain exactly one of
    either Auth-Application-Id or Acct-Application-Id.  If a Vendor-
-   Specific-Application-Id is received without any of these two AVPs,
+   Specific-Application-Id is received without one of these two AVPs,
    then the recipient SHOULD issue an answer with a Result-Code set to
-   DIAMETER_MISSING_AVP.  The answer SHOULD also include a Failed-AVP
+   DIAMETER_MISSING_AVP.  The answer SHOULD also include a Failed-AVP,
    which MUST contain an example of an Auth-Application-Id AVP and an
    Acct-Application-Id AVP.
 
@@ -4805,22 +4730,13 @@ Internet-Draft           Diameter Base Protocol             January 2011
    Auth-Application-Id and Acct-Application-Id, then the recipient MUST
    issue an answer with Result-Code set to
    DIAMETER_AVP_OCCURS_TOO_MANY_TIMES.  The answer MUST also include a
-   Failed-AVP which MUST contain the received Auth-Application-Id AVP
+   Failed-AVP, which MUST contain the received Auth-Application-Id AVP
    and Acct-Application-Id AVP.
 
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 86]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
 6.12.  Redirect-Host AVP
 
    The Redirect-Host AVP (AVP Code 292) is of type DiameterURI.  One or
-   more of instances of this AVP MUST be present if the answer message's
+   more instances of this AVP MUST be present if the answer message's
    'E' bit is set and the Result-Code AVP is set to
    DIAMETER_REDIRECT_INDICATION.
 
@@ -4836,63 +4752,55 @@ Internet-Draft           Diameter Base Protocol             January 2011
    This AVP MAY be present in answer messages whose 'E' bit is set and
    the Result-Code AVP is set to DIAMETER_REDIRECT_INDICATION.
 
-   When present, this AVP provides a hints about how the routing entry
+   When present, this AVP provides hints about how the routing entry
    resulting from the Redirect-Host is to be used.  The following values
    are supported:
 
 
+
+
+Fajardo, et al.              Standards Track                   [Page 85]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    DONT_CACHE 0
 
       The host specified in the Redirect-Host AVP SHOULD NOT be cached.
       This is the default value.
 
-
    ALL_SESSION 1
 
       All messages within the same session, as defined by the same value
       of the Session-ID AVP SHOULD be sent to the host specified in the
       Redirect-Host AVP.
 
-
    ALL_REALM 2
 
       All messages destined for the realm requested SHOULD be sent to
       the host specified in the Redirect-Host AVP.
 
-
    REALM_AND_APPLICATION 3
 
       All messages for the application requested to the realm specified
       SHOULD be sent to the host specified in the Redirect-Host AVP.
 
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 87]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    ALL_APPLICATION 4
 
       All messages for the application requested SHOULD be sent to the
       host specified in the Redirect-Host AVP.
 
-
    ALL_HOST 5
 
       All messages that would be sent to the host that generated the
       Redirect-Host SHOULD be sent to the host specified in the
-      Redirect- Host AVP.
-
+      Redirect-Host AVP.
 
    ALL_USER 6
 
       All messages for the user requested SHOULD be sent to the host
       specified in the Redirect-Host AVP.
 
-
-
    When multiple cached routes are created by redirect indications and
    they differ only in redirect usage and peers to forward requests to
    (see Section 6.1.8), a precedence rule MUST be applied to the
@@ -4902,6 +4810,16 @@ Internet-Draft           Diameter Base Protocol             January 2011
    other as they appear.  The order is as follows:
 
 
+
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 86]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    1.  ALL_SESSION
 
    2.  ALL_USER
@@ -4917,58 +4835,31 @@ Internet-Draft           Diameter Base Protocol             January 2011
 6.14.  Redirect-Max-Cache-Time AVP
 
    The Redirect-Max-Cache-Time AVP (AVP Code 262) is of type Unsigned32.
-   This AVP MUST be present in answer messages whose 'E' bit is set, the
-   Result-Code AVP is set to DIAMETER_REDIRECT_INDICATION and the
-   Redirect-Host-Usage AVP set to a non-zero value.
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 88]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
+   This AVP MUST be present in answer messages whose 'E' bit is set,
+   whose Result-Code AVP is set to DIAMETER_REDIRECT_INDICATION, and
+   whose Redirect-Host-Usage AVP set to a non-zero value.
 
    This AVP contains the maximum number of seconds the peer and route
    table entries, created as a result of the Redirect-Host, SHOULD be
    cached.  Note that once a host is no longer reachable, any associated
-   cache, peer and routing table entries MUST be deleted.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+   cache, peer, and routing table entries MUST be deleted.
 
+7.  Error Handling
 
+   There are two different types of errors in Diameter; protocol errors
+   and application errors.  A protocol error is one that occurs at the
+   base protocol level and MAY require per-hop attention (e.g., a
+   message routing error).  Application errors, on the other hand,
+   generally occur due to a problem with a function specified in a
+   Diameter application (e.g., user authentication, missing AVP).
 
+   Result-Code AVP values that are used to report protocol errors MUST
+   only be present in answer messages whose 'E' bit is set.  When a
+   request message is received that causes a protocol error, an answer
+   message is returned with the 'E' bit set, and the Result-Code AVP is
+   set to the appropriate protocol error value.  As the answer is sent
+   back towards the originator of the request, each proxy or relay agent
+   MAY take action on the message.
 
 
 
@@ -4980,27 +4871,10 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 89]
+Fajardo, et al.              Standards Track                   [Page 87]
 
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-7.  Error Handling
+RFC 6733                 Diameter Base Protocol             October 2012
 
-   There are two different types of errors in Diameter; protocol and
-   application errors.  A protocol error is one that occurs at the base
-   protocol level, and MAY require per hop attention (e.g., message
-   routing error).  Application errors, on the other hand, generally
-   occur due to a problem with a function specified in a Diameter
-   application (e.g., user authentication, missing AVP).
-
-   Result-Code AVP values that are used to report protocol errors MUST
-   only be present in answer messages whose 'E' bit is set.  When a
-   request message is received that causes a protocol error, an answer
-   message is returned with the 'E' bit set, and the Result-Code AVP is
-   set to the appropriate protocol error value.  As the answer is sent
-   back towards the originator of the request, each proxy or relay agent
-   MAY take action on the message.
 
                           1. Request        +---------+ Link Broken
                 +-------------------------->|Diameter |----///----+
@@ -5014,7 +4888,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
                                             | Relay 3 |-----------+
                                             +---------+
 
-        Figure 7: Example of Protocol Error causing answer message
+        Figure 7: Example of Protocol Error Causing Answer Message
 
    Figure 7 provides an example of a message forwarded upstream by a
    Diameter relay.  When the message is received by Relay 2, and it
@@ -5032,40 +4906,40 @@ Internet-Draft           Diameter Base Protocol             January 2011
             +---------+  4. Answer  +---------+  3. Answer  +---------+
                        (Missing AVP)           (Missing AVP)
 
-           Figure 8: Example of Application Error Answer message
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 90]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
+           Figure 8: Example of Application Error Answer Message
 
    Figure 8 provides an example of a Diameter message that caused an
    application error.  When application errors occur, the Diameter
-   entity reporting the error clears the 'R' bit in the Command Flags,
+   entity reporting the error clears the 'R' bit in the Command Flags
    and adds the Result-Code AVP with the proper value.  Application
-   errors do not require any proxy or relay agent involvement, and
-   therefore the message would be forwarded back to the originator of
+   errors do not require any proxy or relay agent involvement;
+   therefore, the message would be forwarded back to the originator of
    the request.
 
    In the case where the answer message itself contains errors, any
    related session SHOULD be terminated by sending an STR or ASR
    message.  The Termination-Cause AVP in the STR MAY be filled with the
    appropriate value to indicate the cause of the error.  An application
-   MAY also send an application-specific request instead of STR or ASR
-   to signal the error in the case where no state is maintained or to
-   allow for some form of error recovery with the corresponding Diameter
-   entity.
+   MAY also send an application-specific request instead of an STR or
+   ASR message to signal the error in the case where no state is
+   maintained or to allow for some form of error recovery with the
+   corresponding Diameter entity.
+
+
+
+Fajardo, et al.              Standards Track                   [Page 88]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
    There are certain Result-Code AVP application errors that require
    additional AVPs to be present in the answer.  In these cases, the
    Diameter node that sets the Result-Code AVP to indicate the error
-   MUST add the AVPs.  Examples are:
+   MUST add the AVPs.  Examples are as follows:
 
    o  A request with an unrecognized AVP is received with the 'M' bit
-      (Mandatory bit) set, causes an answer to be sent with the Result-
-      Code AVP set to DIAMETER_AVP_UNSUPPORTED, and the Failed-AVP AVP
+      (Mandatory bit) set causes an answer to be sent with the Result-
+      Code AVP set to DIAMETER_AVP_UNSUPPORTED and the Failed-AVP AVP
       containing the offending AVP.
 
    o  A request with an AVP that is received with an unrecognized value
@@ -5073,46 +4947,46 @@ Internet-Draft           Diameter Base Protocol             January 2011
       DIAMETER_INVALID_AVP_VALUE, with the Failed-AVP AVP containing the
       AVP causing the error.
 
-   o  A received command which is missing AVP(s) that are defined as
-      required in the commands ABNF; examples are AVPs indicated as
+   o  A received command that is missing AVPs that are defined as
+      required in the commands CCF; examples are AVPs indicated as
       {AVP}.  The receiver issues an answer with the Result-Code set to
-      DIAMETER_MISSING_AVP, and creates an AVP with the AVP Code and
+      DIAMETER_MISSING_AVP and creates an AVP with the AVP Code and
       other fields set as expected in the missing AVP.  The created AVP
-      is then added to the Failed- AVP AVP.
+      is then added to the Failed-AVP AVP.
 
    The Result-Code AVP describes the error that the Diameter node
    encountered in its processing.  In case there are multiple errors,
    the Diameter node MUST report only the first error it encountered
-   (detected possibly in some implementation dependent order).  The
+   (detected possibly in some implementation-dependent order).  The
    specific errors that can be described by this AVP are described in
    the following section.
 
+7.1.  Result-Code AVP
 
+   The Result-Code AVP (AVP Code 268) is of type Unsigned32 and
+   indicates whether a particular request was completed successfully or
+   an error occurred.  All Diameter answer messages in IETF-defined
+   Diameter application specifications MUST include one Result-Code AVP.
+   A non-successful Result-Code AVP (one containing a non-2xxx value
+   other than DIAMETER_REDIRECT_INDICATION) MUST include the Error-
+   Reporting-Host AVP if the host setting the Result-Code AVP is
+   different from the identity encoded in the Origin-Host AVP.
 
+   The Result-Code data field contains an IANA-managed 32-bit address
+   space representing errors (see Section 11.3.2).  Diameter provides
+   the following classes of errors, all identified by the thousands
+   digit in the decimal notation:
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 91]
-
-Internet-Draft           Diameter Base Protocol             January 2011
 
 
-7.1.  Result-Code AVP
 
-   The Result-Code AVP (AVP Code 268) is of type Unsigned32 and
-   indicates whether a particular request was completed successfully or
-   whether an error occurred.  All Diameter answer messages in IETF
-   defined Diameter application specification MUST include one Result-
-   Code AVP.  A non-successful Result-Code AVP (one containing a non
-   2xxx value other than DIAMETER_REDIRECT_INDICATION) MUST include the
-   Error-Reporting-Host AVP if the host setting the Result-Code AVP is
-   different from the identity encoded in the Origin-Host AVP.
 
+Fajardo, et al.              Standards Track                   [Page 89]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
-   The Result-Code data field contains an IANA-managed 32-bit address
-   space representing errors (see Section 11.4).  Diameter provides the
-   following classes of errors, all identified by the thousands digit in
-   the decimal notation:
 
    o  1xxx (Informational)
 
@@ -5124,7 +4998,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    o  5xxx (Permanent Failure)
 
-   A non-recognized class (one whose first digit is not defined in this
+   An unrecognized class (one whose first digit is not defined in this
    section) MUST be handled as a permanent failure.
 
 7.1.1.  Informational
@@ -5133,7 +5007,6 @@ Internet-Draft           Diameter Base Protocol             January 2011
    requester that a request could not be satisfied, and additional
    action is required on its part before access is granted.
 
-
    DIAMETER_MULTI_ROUND_AUTH 1001
 
       This informational error is returned by a Diameter server to
@@ -5141,24 +5014,11 @@ Internet-Draft           Diameter Base Protocol             January 2011
       used requires multiple round trips, and a subsequent request needs
       to be issued in order for access to be granted.
 
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 92]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
 7.1.2.  Success
 
    Errors that fall within the Success category are used to inform a
    peer that a request has been successfully completed.
 
-
    DIAMETER_SUCCESS 2001
 
       The request was successfully completed.
@@ -5174,27 +5034,33 @@ Internet-Draft           Diameter Base Protocol             January 2011
    Errors that fall within the Protocol Error category SHOULD be treated
    on a per-hop basis, and Diameter proxies MAY attempt to correct the
    error, if it is possible.  Note that these errors MUST only be used
-   in answer messages whose 'E' bit is set.  This document omits some
-   error codes defined in [RFC3588].  To provide backward compatibility
-   with [RFC3588] implementations these error code values are not re-
-   used and hence the error codes values enumerated below are non-
-   sequential.
+   in answer messages whose 'E' bit is set.
+
 
 
+
+Fajardo, et al.              Standards Track                   [Page 90]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+   DIAMETER_COMMAND_UNSUPPORTED 3001
+
+      This error code is used when a Diameter entity receives a message
+      with a Command Code that it does not support.
+
    DIAMETER_UNABLE_TO_DELIVER 3002
 
-      This error is given when Diameter can not deliver the message to
+      This error is given when Diameter cannot deliver the message to
       the destination, either because no host within the realm
       supporting the required application was available to process the
-      request, or because Destination-Host AVP was given without the
+      request or because the Destination-Host AVP was given without the
       associated Destination-Realm AVP.
 
-
    DIAMETER_REALM_NOT_SERVED 3003
 
       The intended realm of the request is not recognized.
 
-
    DIAMETER_TOO_BUSY 3004
 
       When returned, a Diameter node SHOULD attempt to send the message
@@ -5202,13 +5068,6 @@ Internet-Draft           Diameter Base Protocol             January 2011
       specific server is requested, and it cannot provide the requested
       service.
 
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 93]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    DIAMETER_LOOP_DETECTED 3005
 
       An agent detected a loop while trying to get the message to the
@@ -5216,121 +5075,110 @@ Internet-Draft           Diameter Base Protocol             January 2011
       if one is available, but the peer reporting the error has
       identified a configuration problem.
 
-
    DIAMETER_REDIRECT_INDICATION 3006
 
       A redirect agent has determined that the request could not be
-      satisfied locally and the initiator of the request SHOULD direct
+      satisfied locally, and the initiator of the request SHOULD direct
       the request directly to the server, whose contact information has
       been added to the response.  When set, the Redirect-Host AVP MUST
       be present.
 
-
    DIAMETER_APPLICATION_UNSUPPORTED 3007
 
       A request was sent for an application that is not supported.
 
+   DIAMETER_INVALID_HDR_BITS 3008
 
-   DIAMETER_INVALID_BIT_IN_HEADER 3011
+      A request was received whose bits in the Diameter header were set
+      either to an invalid combination or to a value that is
+      inconsistent with the Command Code's definition.
 
-      This error is returned when a reserved bit in the Diameter header
-      is set to one (1) or the bits in the Diameter header defined in
-      Section 3 are set incorrectly.
 
 
-   DIAMETER_INVALID_MESSAGE_LENGTH 3012
+Fajardo, et al.              Standards Track                   [Page 91]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
-      This error is returned when a request is received with an invalid
-      message length.
 
+   DIAMETER_INVALID_AVP_BITS 3009
+
+      A request was received that included an AVP whose flag bits are
+      set to an unrecognized value or that is inconsistent with the
+      AVP's definition.
+
+   DIAMETER_UNKNOWN_PEER 3010
+
+      A CER was received from an unknown peer.
 
 7.1.4.  Transient Failures
 
    Errors that fall within the transient failures category are used to
    inform a peer that the request could not be satisfied at the time it
-   was received, but MAY be able to satisfy the request in the future.
+   was received but MAY be able to satisfy the request in the future.
    Note that these errors MUST be used in answer messages whose 'E' bit
    is not set.
 
-
    DIAMETER_AUTHENTICATION_REJECTED 4001
 
       The authentication process for the user failed, most likely due to
       an invalid password used by the user.  Further attempts MUST only
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 94]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
       be tried after prompting the user for a new password.
 
-
    DIAMETER_OUT_OF_SPACE 4002
 
       A Diameter node received the accounting request but was unable to
       commit it to stable storage due to a temporary lack of space.
 
-
    ELECTION_LOST 4003
 
       The peer has determined that it has lost the election process and
       has therefore disconnected the transport connection.
 
-
 7.1.5.  Permanent Failures
 
    Errors that fall within the permanent failures category are used to
-   inform the peer that the request failed, and should not be attempted
+   inform the peer that the request failed and should not be attempted
    again.  Note that these errors SHOULD be used in answer messages
    whose 'E' bit is not set.  In error conditions where it is not
-   possible or efficient to compose application-specific answer grammar
-   then answer messages with E-bit set and complying to the grammar
-   described in 7.2 MAY also be used for permanent errors.
+   possible or efficient to compose application-specific answer grammar,
+   answer messages with the 'E' bit set and which comply to the grammar
+   described in Section 7.2 MAY also be used for permanent errors.
 
-   To provide backward compatibility with existing implementations that
-   follow [RFC3588], some of the error values that have previously been
-   used in this category by [RFC3588] will not be re-used.  Therefore
-   the error values enumerated here may be non-sequential.
 
 
-   DIAMETER_AVP_UNSUPPORTED 5001
 
-      The peer received a message that contained an AVP that is not
-      recognized or supported and was marked with the Mandatory bit.  A
-      Diameter message with this error MUST contain one or more Failed-
-      AVP AVP containing the AVPs that caused the failure.
 
 
-   DIAMETER_UNKNOWN_SESSION_ID 5002
 
-      The request contained an unknown Session-Id.
 
+Fajardo, et al.              Standards Track                   [Page 92]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
-   DIAMETER_AUTHORIZATION_REJECTED 5003
 
-      A request was received for which the user could not be authorized.
-      This error could occur if the service requested is not permitted
+   DIAMETER_AVP_UNSUPPORTED 5001
 
+      The peer received a message that contained an AVP that is not
+      recognized or supported and was marked with the 'M' (Mandatory)
+      bit.  A Diameter message with this error MUST contain one or more
+      Failed-AVP AVPs containing the AVPs that caused the failure.
 
+   DIAMETER_UNKNOWN_SESSION_ID 5002
 
-Fajardo, et al.           Expires July 24, 2011                [Page 95]
-
-Internet-Draft           Diameter Base Protocol             January 2011
+      The request contained an unknown Session-Id.
 
+   DIAMETER_AUTHORIZATION_REJECTED 5003
 
+      A request was received for which the user could not be authorized.
+      This error could occur if the service requested is not permitted
       to the user.
 
-
    DIAMETER_INVALID_AVP_VALUE 5004
 
       The request contained an AVP with an invalid value in its data
       portion.  A Diameter message indicating this error MUST include
       the offending AVPs within a Failed-AVP AVP.
 
-
    DIAMETER_MISSING_AVP 5005
 
       The request did not contain an AVP that is required by the Command
@@ -5340,21 +5188,28 @@ Internet-Draft           Diameter Base Protocol             January 2011
       Vendor-Id if applicable.  The value field of the missing AVP
       should be of correct minimum length and contain zeroes.
 
-
    DIAMETER_RESOURCES_EXCEEDED 5006
 
       A request was received that cannot be authorized because the user
       has already expended allowed resources.  An example of this error
-      condition is a user that is restricted to one dial-up PPP port,
-      attempts to establish a second PPP connection.
-
+      condition is when a user that is restricted to one dial-up PPP
+      port attempts to establish a second PPP connection.
 
    DIAMETER_CONTRADICTING_AVPS 5007
 
       The Home Diameter server has detected AVPs in the request that
-      contradicted each other, and is not willing to provide service to
-      the user.  The Failed-AVP AVPs MUST be present which contains the
-      AVPs that contradicted each other.
+      contradicted each other, and it is not willing to provide service
+      to the user.  The Failed-AVP AVP MUST be present, which contain
+      the AVPs that contradicted each other.
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                   [Page 93]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    DIAMETER_AVP_NOT_ALLOWED 5008
@@ -5363,22 +5218,12 @@ Internet-Draft           Diameter Base Protocol             January 2011
       Failed-AVP AVP MUST be included and contain a copy of the
       offending AVP.
 
-
    DIAMETER_AVP_OCCURS_TOO_MANY_TIMES 5009
 
       A message was received that included an AVP that appeared more
       often than permitted in the message definition.  The Failed-AVP
       AVP MUST be included and contain a copy of the first instance of
-
-
-
-Fajardo, et al.           Expires July 24, 2011                [Page 96]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-      the offending AVP that exceeded the maximum number of occurrences
-
+      the offending AVP that exceeded the maximum number of occurrences.
 
    DIAMETER_NO_COMMON_APPLICATION 5010
 
@@ -5386,18 +5231,21 @@ Internet-Draft           Diameter Base Protocol             January 2011
       whereby no applications are common between the CER sending peer
       and the CER receiving peer.
 
-
    DIAMETER_UNSUPPORTED_VERSION 5011
 
       This error is returned when a request was received, whose version
       number is unsupported.
 
-
    DIAMETER_UNABLE_TO_COMPLY 5012
 
       This error is returned when a request is rejected for unspecified
       reasons.
 
+   DIAMETER_INVALID_BIT_IN_HEADER 5013
+
+      This error is returned when a reserved bit in the Diameter header
+      is set to one (1) or the bits in the Diameter header are set
+      incorrectly.
 
    DIAMETER_INVALID_AVP_LENGTH 5014
 
@@ -5407,56 +5255,41 @@ Internet-Draft           Diameter Base Protocol             January 2011
       value exceeds the message length or is less than the minimum AVP
       header length, it is sufficient to include the offending AVP
       header and a zero filled payload of the minimum required length
-      for the payloads data type.  If the AVP is a grouped AVP, the
-      grouped AVP header with an empty payload would be sufficient to
+      for the payloads data type.  If the AVP is a Grouped AVP, the
+      Grouped AVP header with an empty payload would be sufficient to
       indicate the offending AVP.  In the case where the offending AVP
       header cannot be fully decoded when the AVP length is less than
-      the minimum AVP header length, it is sufficient to include an
-      offending AVP header that is formulated by padding the incomplete
-      AVP header with zero up to the minimum AVP header length.
-
-
-   DIAMETER_NO_COMMON_SECURITY 5017
-
-      This error is returned when a CER message is received, and there
-      are no common security mechanisms supported between the peers.  A
-      Capabilities-Exchange-Answer (CEA) MUST be returned with the
-      Result-Code AVP set to DIAMETER_NO_COMMON_SECURITY.
-
-
 
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 97]
+Fajardo, et al.              Standards Track                   [Page 94]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-   DIAMETER_UNKNOWN_PEER 5018
-
-      A CER was received from an unknown peer.
-
-
-   DIAMETER_COMMAND_UNSUPPORTED 5019
-
-      This error code is used when a Diameter entity receives a message
-      with a Command Code that it does not support.
-
+      the minimum AVP header length, it is sufficient to include an
+      offending AVP header that is formulated by padding the incomplete
+      AVP header with zero up to the minimum AVP header length.
 
-   DIAMETER_INVALID_HDR_BITS 5020
+   DIAMETER_INVALID_MESSAGE_LENGTH 5015
 
-      A request was received whose bits in the Diameter header were
-      either set to an invalid combination, or to a value that is
-      inconsistent with the command code's definition.
+      This error is returned when a request is received with an invalid
+      message length.
 
+   DIAMETER_INVALID_AVP_BIT_COMBO 5016
 
-   DIAMETER_INVALID_AVP_BITS 5021
+      The request contained an AVP with which is not allowed to have the
+      given value in the AVP Flags field.  A Diameter message indicating
+      this error MUST include the offending AVPs within a Failed-AVP
+      AVP.
 
-      A request was received that included an AVP whose flag bits are
-      set to an unrecognized value, or that is inconsistent with the
-      AVP's definition.
+   DIAMETER_NO_COMMON_SECURITY 5017
 
+      This error is returned when a CER message is received, and there
+      are no common security mechanisms supported between the peers.  A
+      Capabilities-Exchange-Answer (CEA) message MUST be returned with
+      the Result-Code AVP set to DIAMETER_NO_COMMON_SECURITY.
 
 7.2.  Error Bit
 
@@ -5465,12 +5298,12 @@ Internet-Draft           Diameter Base Protocol             January 2011
    the 'E' bit MUST NOT be sent as a response to an answer message.
    Note that a message with the 'E' bit set is still subjected to the
    processing rules defined in Section 6.2.  When set, the answer
-   message will not conform to the ABNF specification for the command,
-   and will instead conform to the following ABNF:
+   message will not conform to the CCF specification for the command;
+   instead, it and will conform to the following CCF:
 
       Message Format
 
-      <answer-message> ::= < Diameter Header: code, ERR [PXY] >
+      <answer-message> ::= < Diameter Header: code, ERR [, PXY] >
                         0*1< Session-Id >
                            { Origin-Host }
                            { Origin-Realm }
@@ -5481,16 +5314,16 @@ Internet-Draft           Diameter Base Protocol             January 2011
                            [ Failed-AVP ]
                            [ Experimental-Result ]
                          * [ Proxy-Info ]
+                         * [ AVP ]
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 98]
+
+Fajardo, et al.              Standards Track                   [Page 95]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-                         * [ AVP ]
-
    Note that the code used in the header is the same than the one found
    in the request message, but with the 'R' bit cleared and the 'E' bit
    set.  The 'P' bit in the header is set to the same value as the one
@@ -5499,10 +5332,10 @@ Internet-Draft           Diameter Base Protocol             January 2011
 7.3.  Error-Message AVP
 
    The Error-Message AVP (AVP Code 281) is of type UTF8String.  It MAY
-   accompany a Result-Code AVP as a human readable error message.  The
+   accompany a Result-Code AVP as a human-readable error message.  The
    Error-Message AVP is not intended to be useful in an environment
    where error messages are processed automatically.  It SHOULD NOT be
-   expected that the content of this AVP is parsed by network entities.
+   expected that the content of this AVP be parsed by network entities.
 
 7.4.  Error-Reporting-Host AVP
 
@@ -5511,8 +5344,8 @@ Internet-Draft           Diameter Base Protocol             January 2011
    host that sent the Result-Code AVP to a value other than 2001
    (Success), only if the host setting the Result-Code is different from
    the one encoded in the Origin-Host AVP.  This AVP is intended to be
-   used for troubleshooting purposes, and MUST be set when the Result-
-   Code AVP indicates a failure.
+   used for troubleshooting purposes, and it MUST be set when the
+   Result-Code AVP indicates a failure.
 
 7.5.  Failed-AVP AVP
 
@@ -5520,43 +5353,44 @@ Internet-Draft           Diameter Base Protocol             January 2011
    debugging information in cases where a request is rejected or not
    fully processed due to erroneous information in a specific AVP.  The
    value of the Result-Code AVP will provide information on the reason
-   for the Failed-AVP AVP.  A Diameter message SHOULD contain only one
-   Failed-AVP that corresponds to the error indicated by the Result-Code
-   AVP.  For practical purposes, this Failed-AVP would typically refer
-   to the first AVP processing error that a Diameter node encounters.
+   for the Failed-AVP AVP.  A Diameter answer message SHOULD contain an
+   instance of the Failed-AVP AVP that corresponds to the error
+   indicated by the Result-Code AVP.  For practical purposes, this
+   Failed-AVP would typically refer to the first AVP processing error
+   that a Diameter node encounters.
 
    The possible reasons for this AVP are the presence of an improperly
    constructed AVP, an unsupported or unrecognized AVP, an invalid AVP
    value, the omission of a required AVP, the presence of an explicitly
-   excluded AVP (see tables in Section 10), or the presence of two or
-   more occurrences of an AVP which is restricted to 0, 1, or 0-1
+   excluded AVP (see tables in Section 10) or the presence of two or
+   more occurrences of an AVP that is restricted to 0, 1, or 0-1
    occurrences.
 
    A Diameter message SHOULD contain one Failed-AVP AVP, containing the
    entire AVP that could not be processed successfully.  If the failure
    reason is omission of a required AVP, an AVP with the missing AVP
-   code, the missing vendor id, and a zero filled payload of the minimum
+   code, the missing Vendor-Id, and a zero-filled payload of the minimum
    required length for the omitted AVP will be added.  If the failure
+   reason is an invalid AVP length where the reported length is less
 
 
 
-Fajardo, et al.           Expires July 24, 2011                [Page 99]
+Fajardo, et al.              Standards Track                   [Page 96]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-   reason is an invalid AVP length where the reported length is less
    than the minimum AVP header length or greater than the reported
-   message length, a copy of the offending AVP header and a zero filled
+   message length, a copy of the offending AVP header and a zero-filled
    payload of the minimum required length SHOULD be added.
 
-   In the case where the offending AVP is embedded within a grouped AVP,
-   the Failed-AVP MAY contain the grouped AVP which in turn contains the
-   single offending AVP.  The same method MAY be employed if the grouped
-   AVP itself is embedded in yet another grouped AVP and so on.  In this
-   case, the Failed-AVP MAY contain the grouped AVP hierarchy up to the
-   single offending AVP.  This enables the recipient to detect the
-   location of the offending AVP when embedded in a group.
+   In the case where the offending AVP is embedded within a Grouped AVP,
+   the Failed-AVP MAY contain the grouped AVP, which in turn contains
+   the single offending AVP.  The same method MAY be employed if the
+   grouped AVP itself is embedded in yet another grouped AVP and so on.
+   In this case, the Failed-AVP MAY contain the grouped AVP hierarchy up
+   to the single offending AVP.  This enables the recipient to detect
+   the location of the offending AVP when embedded in a group.
 
    AVP Format
 
@@ -5577,7 +5411,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
                                  { Experimental-Result-Code }
 
    The Vendor-Id AVP (see Section 5.3.3) in this grouped AVP identifies
-   the vendor responsible for the assignment of the result code which
+   the vendor responsible for the assignment of the result code that
    follows.  All Diameter answer messages defined in vendor-specific
    applications MUST include either one Result-Code AVP or one
    Experimental-Result AVP.
@@ -5590,23 +5424,24 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    It is recommended that vendor-specific result codes follow the same
    conventions given for the Result-Code AVP regarding the different
-   types of result codes and the handling of errors (for non 2xxx
+   types of result codes and the handling of errors (for non-2xxx
    values).
 
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 100]
+
+Fajardo, et al.              Standards Track                   [Page 97]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 8.  Diameter User Sessions
 
    In general, Diameter can provide two different types of services to
    applications.  The first involves authentication and authorization,
-   and can optionally make use of accounting.  The second only makes use
-   of accounting.
+   and it can optionally make use of accounting.  The second only makes
+   use of accounting.
 
    When a service makes use of the authentication and/or authorization
    portion of an application, and a user requests access to the network,
@@ -5614,27 +5449,28 @@ Internet-Draft           Diameter Base Protocol             January 2011
    auth request is defined in a service-specific Diameter application
    (e.g., NASREQ).  The request contains a Session-Id AVP, which is used
    in subsequent messages (e.g., subsequent authorization, accounting,
-   etc) relating to the user's session.  The Session-Id AVP is a means
+   etc.) relating to the user's session.  The Session-Id AVP is a means
    for the client and servers to correlate a Diameter message with a
    user session.
 
-   When a Diameter server authorizes a user to use network resources for
-   a finite amount of time, and it is willing to extend the
-   authorization via a future request, it MUST add the Authorization-
-   Lifetime AVP to the answer message.  The Authorization-Lifetime AVP
-   defines the maximum number of seconds a user MAY make use of the
-   resources before another authorization request is expected by the
-   server.  The Auth-Grace-Period AVP contains the number of seconds
-   following the expiration of the Authorization-Lifetime, after which
-   the server will release all state information related to the user's
-   session.  Note that if payment for services is expected by the
-   serving realm from the user's home realm, the Authorization-Lifetime
-   AVP, combined with the Auth-Grace-Period AVP, implies the maximum
-   length of the session the home realm is willing to be fiscally
-   responsible for.  Services provided past the expiration of the
-   Authorization-Lifetime and Auth-Grace-Period AVPs are the
-   responsibility of the access device.  Of course, the actual cost of
-   services rendered is clearly outside the scope of the protocol.
+   When a Diameter server authorizes a user to implement network
+   resources for a finite amount of time, and it is willing to extend
+   the authorization via a future request, it MUST add the
+   Authorization- Lifetime AVP to the answer message.  The
+   Authorization-Lifetime AVP defines the maximum number of seconds a
+   user MAY make use of the resources before another authorization
+   request is expected by the server.  The Auth-Grace-Period AVP
+   contains the number of seconds following the expiration of the
+   Authorization-Lifetime, after which the server will release all state
+   information related to the user's session.  Note that if payment for
+   services is expected by the serving realm from the user's home realm,
+   the Authorization-Lifetime AVP, combined with the Auth-Grace-Period
+   AVP, implies the maximum length of the session for which the home
+   realm is willing to be fiscally responsible.  Services provided past
+   the expiration of the Authorization-Lifetime and Auth-Grace-Period
+   AVPs are the responsibility of the access device.  Of course, the
+   actual cost of services rendered is clearly outside the scope of the
+   protocol.
 
    An access device that does not expect to send a re-authorization or a
    session termination request to the server MAY include the Auth-
@@ -5648,32 +5484,33 @@ Internet-Draft           Diameter Base Protocol             January 2011
    value NO_STATE_MAINTAINED MUST NOT be set in subsequent re-
    authorization requests and answers.
 
-   The base protocol does not include any authorization request
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 101]
+Fajardo, et al.              Standards Track                   [Page 98]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
+   The base protocol does not include any authorization request
    messages, since these are largely application-specific and are
    defined in a Diameter application document.  However, the base
    protocol does define a set of messages that are used to terminate
    user sessions.  These are used to allow servers that maintain state
    information to free resources.
 
-   When a service only makes use of the Accounting portion of the
+   When a service only makes use of the accounting portion of the
    Diameter protocol, even in combination with an application, the
    Session-Id is still used to identify user sessions.  However, the
    session termination messages are not used, since a session is
    signaled as being terminated by issuing an accounting stop message.
 
    Diameter may also be used for services that cannot be easily
-   categorized as authentication, authorization or accounting (e.g.,
-   certain 3GPP IMS interfaces).  In such cases, the finite state
+   categorized as authentication, authorization, or accounting (e.g.,
+   certain Third Generation Partnership Project Internet Multimedia
+   System (3GPP IMS) interfaces).  In such cases, the finite state
    machine defined in subsequent sections may not be applicable.
-   Therefore, the applications itself MAY need to define its own finite
+   Therefore, the application itself MAY need to define its own finite
    state machine.  However, such application-specific state machines
    SHOULD follow the general state machine framework outlined in this
    document such as the use of Session-Id AVPs and the use of STR/STA,
@@ -5681,12 +5518,12 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 8.1.  Authorization Session State Machine
 
-   This section contains a set of finite state machines, representing
-   the life cycle of Diameter sessions, and which MUST be observed by
-   all Diameter implementations that make use of the authentication
-   and/or authorization portion of a Diameter application.  The term
-   Service-Specific below refers to a message defined in a Diameter
-   application (e.g., Mobile IPv4, NASREQ).
+   This section contains a set of finite state machines, which represent
+   the life cycle of Diameter sessions and which MUST be observed by all
+   Diameter implementations that make use of the authentication and/or
+   authorization portion of a Diameter application.  The term "Service-
+   Specific" below refers to a message defined in a Diameter application
+   (e.g., Mobile IPv4, NASREQ).
 
    There are four different authorization session state machines
    supported in the Diameter base protocol.  The first two describe a
@@ -5700,26 +5537,25 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    When a session is moved to the Idle state, any resources that were
    allocated for the particular session must be released.  Any event not
-   listed in the state machines MUST be considered as an error
-   condition, and an answer, if applicable, MUST be returned to the
-   originator of the message.
+   listed in the state machines MUST be considered an error condition,
+   and an answer, if applicable, MUST be returned to the originator of
+   the message.
 
-   In the case that an application does not support re-auth, the state
 
 
-
-Fajardo, et al.           Expires July 24, 2011               [Page 102]
+Fajardo, et al.              Standards Track                   [Page 99]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-   transitions related to server-initiated re-auth when both client and
-   server session maintains state (e.g., Send RAR, Pending, Receive RAA)
-   MAY be ignored.
+   In the case that an application does not support re-auth, the state
+   transitions related to server-initiated re-auth, when both client and
+   server sessions maintain state (e.g., Send RAR, Pending, Receive
+   RAA), MAY be ignored.
 
-   In the state table, the event 'Failure to send X' means that the
+   In the state table, the event "Failure to send X" means that the
    Diameter agent is unable to send command X to the desired
-   destination.  This could be due to the peer being down, or due to the
+   destination.  This could be due to the peer being down or due to the
    peer sending back a transient failure or temporary protocol error
    notification DIAMETER_TOO_BUSY or DIAMETER_LOOP_DETECTED in the
    Result-Code AVP of the corresponding Answer command.  The event 'X
@@ -5731,8 +5567,8 @@ Internet-Draft           Diameter Base Protocol             January 2011
                               CLIENT, STATEFUL
       State     Event                          Action       New State
       ---------------------------------------------------------------
-      Idle      Client or Device Requests      Send         Pending
-                access                         service
+      Idle      Client or device requests      Send         Pending
+                access                         service-
                                                specific
                                                auth req
 
@@ -5748,39 +5584,38 @@ Internet-Draft           Diameter Base Protocol             January 2011
                                                UNKNOWN_
                                                SESSION_ID
 
-      Pending   Successful Service-specific    Grant        Open
+      Pending   Successful service-specific    Grant        Open
                 authorization answer           Access
                 received with default
                 Auth-Session-State value
 
-      Pending   Successful Service-specific    Sent STR     Discon
-                authorization answer received
+      Pending   Successful service-specific    Sent STR     Discon
+                authorization answer received,
                 but service not provided
 
       Pending   Error processing successful    Sent STR     Discon
-                Service-specific authorization
+                service-specific authorization
                 answer
 
 
 
-
-Fajardo, et al.           Expires July 24, 2011               [Page 103]
+Fajardo, et al.              Standards Track                  [Page 100]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-      Pending   Failed Service-specific        Cleanup      Idle
+      Pending   Failed service-specific        Clean up     Idle
                 authorization answer received
 
       Open      User or client device          Send         Open
-                requests access to service     service
+                requests access to service     service-
                                                specific
                                                auth req
 
-      Open      Successful Service-specific    Provide      Open
-                authorization answer received  Service
+      Open      Successful service-specific    Provide      Open
+                authorization answer received  service
 
-      Open      Failed Service-specific        Discon.      Idle
+      Open      Failed service-specific        Discon.      Idle
                 authorization answer           user/device
                 received.
 
@@ -5796,10 +5631,10 @@ Internet-Draft           Diameter Base Protocol             January 2011
                                                Discon.
                                                user/device
 
-      Open      Session-Timeout Expires on     Send STR     Discon
-                Access Device
+      Open      Session-Timeout expires on     Send STR     Discon
+                access device
 
-      Open      ASR Received,                  Send ASA     Discon
+      Open      ASR received,                  Send ASA     Discon
                 client will comply             with
                 with request to end the        Result-Code =
                 session                        = SUCCESS,
@@ -5814,17 +5649,18 @@ Internet-Draft           Diameter Base Protocol             January 2011
                 Auth-Grace-Period expires on
                 access device
 
-      Discon    ASR Received                   Send ASA     Discon
+      Discon    ASR received                   Send ASA     Discon
+
 
-      Discon    STA Received                   Discon.      Idle
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 104]
+Fajardo, et al.              Standards Track                  [Page 101]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
+      Discon    STA received                   Discon.      Idle
                                                user/device
 
    The following state machine is observed by a server when it is
@@ -5835,31 +5671,34 @@ Internet-Draft           Diameter Base Protocol             January 2011
       ---------------------------------------------------------------
       Idle      Service-specific authorization Send         Open
                 request received, and          successful
-                user is authorized             serv.
+                user is authorized             service-
                                                specific
                                                answer
 
       Idle      Service-specific authorization Send         Idle
-                request received, and          failed serv.
-                user is not authorized         specific
+                request received, and          failed
+                user is not authorized         service-
+                                               specific
                                                answer
 
       Open      Service-specific authorization Send         Open
                 request received, and user     successful
-                is authorized                  serv. specific
+                is authorized                  service-
+                                               specific
                                                answer
 
       Open      Service-specific authorization Send         Idle
-                request received, and user     failed serv.
-                is not authorized              specific
+                request received, and user     failed
+                is not authorized              service-
+                                               specific
                                                answer,
-                                               Cleanup
+                                               Clean up
 
       Open      Home server wants to confirm   Send RAR     Pending
                 authentication and/or
                 authorization of the user
 
-      Pending   Received RAA with a failed     Cleanup      Idle
+      Pending   Received RAA with a failed     Clean up     Idle
                 Result-Code
 
       Pending   Received RAA with Result-Code  Update       Open
@@ -5868,32 +5707,33 @@ Internet-Draft           Diameter Base Protocol             January 2011
       Open      Home server wants to           Send ASR     Discon
                 terminate the service
 
-      Open      Authorization-Lifetime (and    Cleanup      Idle
-                Auth-Grace-Period) expires
-                on home server.
 
-      Open      Session-Timeout expires on     Cleanup      Idle
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 105]
+Fajardo, et al.              Standards Track                  [Page 102]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
+      Open      Authorization-Lifetime (and    Clean up     Idle
+                Auth-Grace-Period) expires
+                on home server
+
+      Open      Session-Timeout expires on     Clean up     Idle
                 home server
 
       Discon    Failure to send ASR            Wait,        Discon
                                                resend ASR
 
-      Discon    ASR successfully sent and      Cleanup      Idle
+      Discon    ASR successfully sent and      Clean up     Idle
                 ASA Received with Result-Code
 
-      Not       ASA Received                   None         No Change.
+      Not       ASA Received                   None         No Change
       Discon
 
       Any       STR Received                   Send STA,    Idle
-                                               Cleanup.
+                                               Clean up
 
    The following state machine is observed by a client when state is not
    maintained on the server:
@@ -5901,48 +5741,47 @@ Internet-Draft           Diameter Base Protocol             January 2011
                               CLIENT, STATELESS
       State     Event                          Action       New State
       ---------------------------------------------------------------
-      Idle      Client or Device Requests      Send         Pending
-                access                         service
+      Idle      Client or device requests      Send         Pending
+                access                         service-
                                                specific
                                                auth req
 
-      Pending   Successful Service-specific    Grant        Open
-                authorization answer           Access
+      Pending   Successful service-specific    Grant        Open
+                authorization answer           access
                 received with Auth-Session-
                 State set to
                 NO_STATE_MAINTAINED
 
-      Pending   Failed Service-specific        Cleanup      Idle
+      Pending   Failed service-specific        Clean up     Idle
                 authorization answer
                 received
 
-      Open      Session-Timeout Expires on     Discon.      Idle
-                Access Device                  user/device
+      Open      Session-Timeout expires on     Discon.      Idle
+                access device                  user/device
 
       Open      Service to user is terminated  Discon.      Idle
                                                user/device
 
-   The following state machine is observed by a server when it is not
-   maintaining state for the session:
-
-
 
 
 
 
 
-
-Fajardo, et al.           Expires July 24, 2011               [Page 106]
+Fajardo, et al.              Standards Track                  [Page 103]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
+   The following state machine is observed by a server when it is not
+   maintaining state for the session:
 
                               SERVER, STATELESS
       State     Event                          Action       New State
       ---------------------------------------------------------------
-      Idle      Service-specific authorization Send serv.   Idle
-                request received, and          specific
-                successfully processed         answer
+      Idle      Service-specific authorization Send         Idle
+                request received, and          service-
+                successfully processed         specific
+                                               answer
 
 8.2.  Accounting Session State Machine
 
@@ -5960,8 +5799,8 @@ Internet-Draft           Diameter Base Protocol             January 2011
    machine in this section described below.
 
    The default server side state machine requires the reception of
-   accounting records in any order and at any time, and does not place
-   any standards requirement on the processing of these records.
+   accounting records in any order and at any time, and it does not
+   place any standards requirement on the processing of these records.
    Implementations of Diameter may perform checking, ordering,
    correlation, fraud detection, and other tasks based on these records.
    AVPs may need to be inspected as a part of these tasks.  The tasks
@@ -5970,7 +5809,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
    or even policy dependent, they are not standardized by the Diameter
    specifications.  Applications MAY define requirements on when to
    accept accounting records based on the used value of Accounting-
-   Realtime-Required AVP, credit limits checks, and so on.
+   Realtime-Required AVP, credit-limit checks, and so on.
 
    However, the Diameter base protocol defines one optional server side
    state machine that MAY be followed by applications that require
@@ -5978,31 +5817,31 @@ Internet-Draft           Diameter Base Protocol             January 2011
    that such tracking is incompatible with the ability to sustain long
    duration connectivity problems.  Therefore, the use of this state
    machine is recommended only in applications where the value of the
-   Accounting-Realtime-Required AVP is DELIVER_AND_GRANT, and hence
+   Accounting-Realtime-Required AVP is DELIVER_AND_GRANT; hence,
    accounting connectivity problems are required to cause the serviced
    user to be disconnected.  Otherwise, records produced by the client
-   may be lost by the server which no longer accepts them after the
-   connectivity is re-established.  This state machine is the third
-   state machine in this section.  The state machine is supervised by a
-   supervision session timer Ts, which the value should be reasonably
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 107]
+Fajardo, et al.              Standards Track                  [Page 104]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-   higher than the Acct_Interim_Interval value.  Ts MAY be set to two
-   times the value of the Acct_Interim_Interval so as to avoid the
-   accounting session in the Diameter server to change to Idle state in
-   case of short transient network failure.
+   may be lost by the server, which no longer accepts them after the
+   connectivity is re-established.  This state machine is the third
+   state machine in this section.  The state machine is supervised by a
+   supervision session timer Ts, whose value should be reasonably higher
+   than the Acct_Interim_Interval value.  Ts MAY be set to two times the
+   value of the Acct_Interim_Interval so as to avoid the accounting
+   session in the Diameter server to change to Idle state in case of
+   short transient network failure.
 
    Any event not listed in the state machines MUST be considered as an
    error condition, and a corresponding answer, if applicable, MUST be
    returned to the originator of the message.
 
-   In the state table, the event 'Failure to send' means that the
+   In the state table, the event "Failure to send" means that the
    Diameter client is unable to communicate with the desired
    destination.  This could be due to the peer being down, or due to the
    peer sending back a transient failure or temporary protocol error
@@ -6010,17 +5849,17 @@ Internet-Draft           Diameter Base Protocol             January 2011
    DIAMETER_LOOP_DETECTED in the Result-Code AVP of the Accounting
    Answer command.
 
-   The event 'Failed answer' means that the Diameter client received a
+   The event "Failed answer" means that the Diameter client received a
    non-transient failure notification in the Accounting Answer command.
 
-   Note that the action 'Disconnect user/dev' MUST have an effect also
-   to the authorization session state table, e.g., cause the STR message
+   Note that the action "Disconnect user/dev" MUST also have an effect
+   on the authorization session state table, e.g., cause the STR message
    to be sent, if the given application has both authentication/
    authorization and accounting portions.
 
-   The states PendingS, PendingI, PendingL, PendingE and PendingB stand
+   The states PendingS, PendingI, PendingL, PendingE, and PendingB stand
    for pending states to wait for an answer to an accounting request
-   related to a Start, Interim, Stop, Event or buffered record,
+   related to a Start, Interim, Stop, Event, or buffered record,
    respectively.
 
                             CLIENT, ACCOUNTING
@@ -6037,36 +5876,36 @@ Internet-Draft           Diameter Base Protocol             January 2011
       Idle      Records in storage             Send         PendingB
                                                record
 
-      PendingS  Successful accounting                       Open
-                start answer received
-
-      PendingS  Failure to send and buffer     Store        Open
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 108]
+Fajardo, et al.              Standards Track                  [Page 105]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-                space available and realtime   Start
+      PendingS  Successful accounting                       Open
+                start answer received
+
+      PendingS  Failure to send and buffer     Store        Open
+                space available and real time  Start
                 not equal to DELIVER_AND_GRANT Record
 
       PendingS  Failure to send and no buffer               Open
-                space available and realtime
+                space available and real time
                 equal to GRANT_AND_LOSE
 
       PendingS  Failure to send and no         Disconnect   Idle
                 buffer space available and     user/dev
-                realtime not equal to
+                real time not equal to
                 GRANT_AND_LOSE
 
       PendingS  Failed accounting start answer              Open
-                received and realtime equal
+                received and real time equal
                 to GRANT_AND_LOSE
 
       PendingS  Failed accounting start answer Disconnect   Idle
-                received and realtime not      user/dev
+                received and real time not     user/dev
                 equal to GRANT_AND_LOSE
 
       PendingS  User service terminated        Store        PendingS
@@ -6077,6 +5916,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
                                                accounting
                                                interim
                                                record
+
       Open      User service terminated        Send         PendingL
                                                accounting
                                                stop req.
@@ -6087,34 +5927,35 @@ Internet-Draft           Diameter Base Protocol             January 2011
       PendingI  Failure to send and (buffer    Store        Open
                 space available or old         interim
                 record can be overwritten)     record
-                and realtime not equal to
+                and real time not equal to
                 DELIVER_AND_GRANT
 
-      PendingI  Failure to send and no buffer               Open
-                space available and realtime
-                equal to GRANT_AND_LOSE
 
 
-      PendingI  Failure to send and no         Disconnect   Idle
-                buffer space available and     user/dev
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 109]
+Fajardo, et al.              Standards Track                  [Page 106]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
+      PendingI  Failure to send and no buffer               Open
+                space available and real time
+                equal to GRANT_AND_LOSE
 
-                realtime not equal to
+      PendingI  Failure to send and no         Disconnect   Idle
+                buffer space available and     user/dev
+                real time not equal to
                 GRANT_AND_LOSE
 
       PendingI  Failed accounting interim                   Open
-                answer received and realtime
+                answer received and real time
                 equal to GRANT_AND_LOSE
 
       PendingI  Failed accounting interim      Disconnect   Idle
                 answer received and            user/dev
-                realtime not equal to
+                real time not equal to
                 GRANT_AND_LOSE
 
       PendingI  User service terminated        Store        PendingI
@@ -6148,6 +5989,13 @@ Internet-Draft           Diameter Base Protocol             January 2011
                 space available                stop
                                                record
 
+
+
+Fajardo, et al.              Standards Track                  [Page 107]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
       PendingL  Failure to send and no buffer               Idle
                 space available
 
@@ -6155,124 +6003,133 @@ Internet-Draft           Diameter Base Protocol             January 2011
                 received
 
 
-
-Fajardo, et al.           Expires July 24, 2011               [Page 110]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
                        SERVER, STATELESS ACCOUNTING
       State     Event                          Action       New State
       ---------------------------------------------------------------
 
       Idle      Accounting start request       Send         Idle
-                received, and successfully     accounting
+                received and successfully      accounting
                 processed.                     start
                                                answer
 
       Idle      Accounting event request       Send         Idle
-                received, and successfully     accounting
+                received and successfully      accounting
                 processed.                     event
                                                answer
 
-      Idle      Interim record received,       Send         Idle
+      Idle      Interim record received        Send         Idle
                 and successfully processed.    accounting
                                                interim
                                                answer
 
       Idle      Accounting stop request        Send         Idle
-                received, and successfully     accounting
+                received and successfully      accounting
                 processed                      stop answer
 
-      Idle      Accounting request received,   Send         Idle
+      Idle      Accounting request received;   Send         Idle
                 no space left to store         accounting
-                records                        answer,
+                records                        answer;
                                                Result-Code =
                                                OUT_OF_
                                                SPACE
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                  [Page 108]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
                             SERVER, STATEFUL ACCOUNTING
       State     Event                          Action       New State
       ---------------------------------------------------------------
 
       Idle      Accounting start request       Send         Open
-                received, and successfully     accounting
+                received and successfully      accounting
                 processed.                     start
-                                               answer,
+                                               answer;
                                                Start Ts
 
       Idle      Accounting event request       Send         Idle
-                received, and successfully     accounting
+                received and successfully      accounting
                 processed.                     event
                                                answer
-
-      Idle      Accounting request received,   Send         Idle
+      Idle      Accounting request received;   Send         Idle
                 no space left to store         accounting
-                records                        answer,
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 111]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
+                records                        answer;
                                                Result-Code =
                                                OUT_OF_
                                                SPACE
 
-      Open      Interim record received,       Send         Open
+      Open      Interim record received        Send         Open
                 and successfully processed.    accounting
                                                interim
-                                               answer,
+                                               answer;
                                                Restart Ts
 
       Open      Accounting stop request        Send         Idle
-                received, and successfully     accounting
-                processed                      stop answer,
+                received and successfully      accounting
+                processed                      stop answer;
                                                Stop Ts
 
-      Open      Accounting request received,   Send         Idle
+      Open      Accounting request received;   Send         Idle
                 no space left to store         accounting
-                records                        answer,
+                records                        answer;
                                                Result-Code =
                                                OUT_OF_
-                                               SPACE,
+                                               SPACE;
                                                Stop Ts
 
       Open      Session supervision timer Ts   Stop Ts      Idle
                 expired
 
+
+
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                  [Page 109]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
 8.3.  Server-Initiated Re-Auth
 
    A Diameter server may initiate a re-authentication and/or re-
    authorization service for a particular session by issuing a Re-Auth-
    Request (RAR).
 
-   For example, for pre-paid services, the Diameter server that
+   For example, for prepaid services, the Diameter server that
    originally authorized a session may need some confirmation that the
    user is still using the services.
 
-   An access device that receives a RAR message with Session-Id equal to
-   a currently active session MUST initiate a re-auth towards the user,
-   if the service supports this particular feature.  Each Diameter
-   application MUST state whether server-initiated re-auth is supported,
-   since some applications do not allow access devices to prompt the
-   user for re-auth.
+   An access device that receives an RAR message with the Session-Id
+   equal to a currently active session MUST initiate a re-auth towards
+   the user, if the service supports this particular feature.  Each
+   Diameter application MUST state whether server-initiated re-auth is
+   supported, since some applications do not allow access devices to
+   prompt the user for re-auth.
 
 8.3.1.  Re-Auth-Request
 
-   The Re-Auth-Request (RAR), indicated by the Command-Code set to 258
+   The Re-Auth-Request (RAR), indicated by the Command Code set to 258
    and the message flags' 'R' bit set, may be sent by any server to the
    access device that is providing session service, to request that the
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 112]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    user be re-authenticated and/or re-authorized.
 
 
@@ -6294,15 +6151,22 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 8.3.2.  Re-Auth-Answer
 
-   The Re-Auth-Answer (RAA), indicated by the Command-Code set to 258
+   The Re-Auth-Answer (RAA), indicated by the Command Code set to 258
    and the message flags' 'R' bit clear, is sent in response to the RAR.
-   The Result-Code AVP MUST be present, and indicates the disposition of
-   the request.
+   The Result-Code AVP MUST be present, and it indicates the disposition
+   of the request.
+
+
+
+
+Fajardo, et al.              Standards Track                  [Page 110]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
    A successful RAA message MUST be followed by an application-specific
    authentication and/or authorization message.
 
-
     Message Format
 
          <RAA>  ::= < Diameter Header: 258, PXY >
@@ -6321,14 +6185,6 @@ Internet-Draft           Diameter Base Protocol             January 2011
                   * [ Proxy-Info ]
                   * [ AVP ]
 
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 113]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
 8.4.  Session Termination
 
    It is necessary for a Diameter server that authorized a session, for
@@ -6356,6 +6212,14 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    It is also possible that a session that was authorized is never
    actually started due to action of a proxy.  For example, a proxy may
+
+
+
+Fajardo, et al.              Standards Track                  [Page 111]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    modify an authorization answer, converting the result from success to
    failure, prior to forwarding the message to the access device.  If
    the answer did not contain an Auth-Session-State AVP with the value
@@ -6366,36 +6230,27 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    A Diameter server that receives an STR message MUST clean up
    resources (e.g., session state) associated with the Session-Id
-   specified in the STR, and return a Session-Termination-Answer.
+   specified in the STR and return a Session-Termination-Answer.
 
    A Diameter server also MUST clean up resources when the Session-
    Timeout expires, or when the Authorization-Lifetime and the Auth-
-   Grace-Period AVPs expires without receipt of a re-authorization
+   Grace-Period AVPs expire without receipt of a re-authorization
    request, regardless of whether an STR for that session is received.
    The access device is not expected to provide service beyond the
    expiration of these timers; thus, expiration of either of these
    timers implies that the access device may have unexpectedly shut
    down.
 
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 114]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
 8.4.1.  Session-Termination-Request
 
-   The Session-Termination-Request (STR), indicated by the Command-Code
+   The Session-Termination-Request (STR), indicated by the Command Code
    set to 275 and the Command Flags' 'R' bit set, is sent by a Diameter
-   client or by a Diameter proxy to inform the Diameter Server that an
+   client or by a Diameter proxy to inform the Diameter server that an
    authenticated and/or authorized session is being terminated.
 
+    Message Format
 
-                   Message Format
-
-         <STR> ::= < Diameter Header: 275, REQ, PXY >
+        <STR>  ::= < Diameter Header: 275, REQ, PXY >
                    < Session-Id >
                    { Origin-Host }
                    { Origin-Realm }
@@ -6410,40 +6265,33 @@ Internet-Draft           Diameter Base Protocol             January 2011
                  * [ Route-Record ]
                  * [ AVP ]
 
-8.4.2.  Session-Termination-Answer
-
-   The Session-Termination-Answer (STA), indicated by the Command-Code
-   set to 275 and the message flags' 'R' bit clear, is sent by the
-   Diameter Server to acknowledge the notification that the session has
-   been terminated.  The Result-Code AVP MUST be present, and MAY
-   contain an indication that an error occurred while servicing the STR.
-
-   Upon sending or receipt of the STA, the Diameter Server MUST release
-   all resources for the session indicated by the Session-Id AVP.  Any
-   intermediate server in the Proxy-Chain MAY also release any
-   resources, if necessary.
-
-
-
-
-
 
 
 
 
 
 
+Fajardo, et al.              Standards Track                  [Page 112]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
+8.4.2.  Session-Termination-Answer
 
-Fajardo, et al.           Expires July 24, 2011               [Page 115]
-
-Internet-Draft           Diameter Base Protocol             January 2011
+   The Session-Termination-Answer (STA), indicated by the Command Code
+   set to 275 and the message flags' 'R' bit clear, is sent by the
+   Diameter server to acknowledge the notification that the session has
+   been terminated.  The Result-Code AVP MUST be present, and it MAY
+   contain an indication that an error occurred while servicing the STR.
 
+   Upon sending or receipt of the STA, the Diameter server MUST release
+   all resources for the session indicated by the Session-Id AVP.  Any
+   intermediate server in the Proxy-Chain MAY also release any
+   resources, if necessary.
 
-                    Message Format
+    Message Format
 
-         <STA>  ::= < Diameter Header: 275, PXY >
+         <STA> ::= < Diameter Header: 275, PXY >
                     < Session-Id >
                     { Result-Code }
                     { Origin-Host }
@@ -6473,31 +6321,29 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    An access device that receives an ASR with Session-ID equal to a
    currently active session MAY stop the session.  Whether the access
-   device stops the session or not is implementation- and/or
-   configuration-dependent.  For example, an access device may honor
+   device stops the session or not is implementation and/or
+   configuration dependent.  For example, an access device may honor
    ASRs from certain agents only.  In any case, the access device MUST
+
+
+
+Fajardo, et al.              Standards Track                  [Page 113]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    respond with an Abort-Session-Answer, including a Result-Code AVP to
    indicate what action it took.
 
 8.5.1.  Abort-Session-Request
 
-   The Abort-Session-Request (ASR), indicated by the Command-Code set to
+   The Abort-Session-Request (ASR), indicated by the Command Code set to
    274 and the message flags' 'R' bit set, may be sent by any Diameter
    server or any Diameter proxy to the access device that is providing
    session service, to request that the session identified by the
    Session-Id be stopped.
 
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 116]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-                    Message Format
+    Message Format
 
          <ASR>  ::= < Diameter Header: 274, REQ, PXY >
                     < Session-Id >
@@ -6514,20 +6360,35 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 8.5.2.  Abort-Session-Answer
 
-   The Abort-Session-Answer (ASA), indicated by the Command-Code set to
+   The Abort-Session-Answer (ASA), indicated by the Command Code set to
    274 and the message flags' 'R' bit clear, is sent in response to the
-   ASR.  The Result-Code AVP MUST be present, and indicates the
+   ASR.  The Result-Code AVP MUST be present and indicates the
    disposition of the request.
 
    If the session identified by Session-Id in the ASR was successfully
-   terminated, Result-Code is set to DIAMETER_SUCCESS.  If the session
-   is not currently active, Result-Code is set to
+   terminated, the Result-Code is set to DIAMETER_SUCCESS.  If the
+   session is not currently active, the Result-Code is set to
    DIAMETER_UNKNOWN_SESSION_ID.  If the access device does not stop the
-   session for any other reason, Result-Code is set to
+   session for any other reason, the Result-Code is set to
    DIAMETER_UNABLE_TO_COMPLY.
 
 
-                    Message Format
+
+
+
+
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                  [Page 114]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+    Message Format
 
          <ASA>  ::= < Diameter Header: 274, PXY >
                     < Session-Id >
@@ -6545,14 +6406,6 @@ Internet-Draft           Diameter Base Protocol             January 2011
                   * [ Proxy-Info ]
                   * [ AVP ]
 
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 117]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
 8.6.  Inferring Session Termination from Origin-State-Id
 
    The Origin-State-Id is used to allow detection of terminated sessions
@@ -6560,94 +6413,96 @@ Internet-Draft           Diameter Base Protocol             January 2011
    shutdown of an access device.
 
    A Diameter client or access device increments the value of the
-   Origin-State-Id every time it is started or powered-up.  The new
+   Origin-State-Id every time it is started or powered up.  The new
    Origin-State-Id is then sent in the CER/CEA message immediately upon
    connection to the server.  The Diameter server receiving the new
    Origin-State-Id can determine whether the sending Diameter client had
-   abruptly shutdown by comparing the old value of the Origin-State-Id
+   abruptly shut down by comparing the old value of the Origin-State-Id
    it has kept for that specific client is less than the new value and
    whether it has un-terminated sessions originating from that client.
 
    An access device can also include the Origin-State-Id in request
-   messages other than CER if there are relays or proxies in between the
-   access device and the server.  In this case, however, the server
+   messages other than the CER if there are relays or proxies in between
+   the access device and the server.  In this case, however, the server
    cannot discover that the access device has been restarted unless and
-   until it receives a new request from it.  Therefore this mechanism is
-   more opportunistic across proxies and relays.
+   until it receives a new request from it.  Therefore, this mechanism
+   is more opportunistic across proxies and relays.
 
    The Diameter server may assume that all sessions that were active
    prior to detection of a client restart have been terminated.  The
    Diameter server MAY clean up all session state associated with such
-   lost sessions, and MAY also issues STRs for all such lost sessions
+   lost sessions, and it MAY also issue STRs for all such lost sessions
    that were authorized on upstream servers, to allow session state to
    be cleaned up globally.
 
+
+
+
+
+Fajardo, et al.              Standards Track                  [Page 115]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
 8.7.  Auth-Request-Type AVP
 
    The Auth-Request-Type AVP (AVP Code 274) is of type Enumerated and is
    included in application-specific auth requests to inform the peers
-   whether a user is to be authenticated only, authorized only or both.
+   whether a user is to be authenticated only, authorized only, or both.
    Note any value other than both MAY cause RADIUS interoperability
    issues.  The following values are defined:
 
-
    AUTHENTICATE_ONLY 1
 
-      The request being sent is for authentication only, and MUST
-      contain the relevant application specific authentication AVPs that
+      The request being sent is for authentication only, and it MUST
+      contain the relevant application-specific authentication AVPs that
       are needed by the Diameter server to authenticate the user.
 
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 118]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    AUTHORIZE_ONLY 2
 
-      The request being sent is for authorization only, and MUST contain
-      the application-specific authorization AVPs that are necessary to
-      identify the service being requested/offered.
-
+      The request being sent is for authorization only, and it MUST
+      contain the application-specific authorization AVPs that are
+      necessary to identify the service being requested/offered.
 
    AUTHORIZE_AUTHENTICATE 3
 
       The request contains a request for both authentication and
       authorization.  The request MUST include both the relevant
-      application-specific authentication information, and authorization
+      application-specific authentication information and authorization
       information necessary to identify the service being requested/
       offered.
 
-
 8.8.  Session-Id AVP
 
    The Session-Id AVP (AVP Code 263) is of type UTF8String and is used
    to identify a specific session (see Section 8).  All messages
-   pertaining to a specific session MUST include only one Session-Id AVP
-   and the same value MUST be used throughout the life of a session.
-   When present, the Session-Id SHOULD appear immediately following the
-   Diameter Header (see Section 3).
+   pertaining to a specific session MUST include only one Session-Id
+   AVP, and the same value MUST be used throughout the life of a
+   session.  When present, the Session-Id SHOULD appear immediately
+   following the Diameter header (see Section 3).
 
    The Session-Id MUST be globally and eternally unique, as it is meant
    to uniquely identify a user session without reference to any other
-   information, and may be needed to correlate historical authentication
-   information with accounting information.  The Session-Id includes a
-   mandatory portion and an implementation-defined portion; a
-   recommended format for the implementation-defined portion is outlined
-   below.
+   information, and it may be needed to correlate historical
+   authentication information with accounting information.  The
+   Session-Id includes a mandatory portion and an implementation-defined
+   portion; a recommended format for the implementation-defined portion
+   is outlined below.
 
    The Session-Id MUST begin with the sender's identity encoded in the
-   DiameterIdentity type (see Section 4.4).  The remainder of the
-   Session-Id is delimited by a ";" character, and MAY be any sequence
-   that the client can guarantee to be eternally unique; however, the
-   following format is recommended, (square brackets [] indicate an
-   optional element):
+   DiameterIdentity type (see Section 4.3.1).  The remainder of the
+   Session-Id is delimited by a ";" character, and it MAY be any
+
+
+
+Fajardo, et al.              Standards Track                  [Page 116]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+   sequence that the client can guarantee to be eternally unique;
+   however, the following format is recommended, (square brackets []
+   indicate an optional element):
 
       <DiameterIdentity>;<high 32 bits>;<low 32 bits>[;<optional value>]
 
@@ -6657,22 +6512,14 @@ Internet-Draft           Diameter Base Protocol             January 2011
    processors.  At startup, the high 32 bits of the 64-bit value MAY be
    initialized to the time in NTP format [RFC5905], and the low 32 bits
    MAY be initialized to zero.  This will for practical purposes
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 119]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    eliminate the possibility of overlapping Session-Ids after a reboot,
    assuming the reboot process takes longer than a second.
    Alternatively, an implementation MAY keep track of the increasing
    value in non-volatile memory.
 
 
-   <optional value> is implementation specific but may include a modem's
-   device Id, a layer 2 address, timestamp, etc.
+   <optional value> is implementation specific, but it may include a
+   modem's device Id, a Layer 2 address, timestamp, etc.
 
    Example, in which there is no optional value:
 
@@ -6683,45 +6530,44 @@ Internet-Draft           Diameter Base Protocol             January 2011
      accesspoint7.example.com;1876543210;523;[email protected]
 
    The Session-Id is created by the Diameter application initiating the
-   session, which in most cases is done by the client.  Note that a
-   Session-Id MAY be used for both the authentication, authorization and
-   accounting commands of a given application.
+   session, which, in most cases, is done by the client.  Note that a
+   Session-Id MAY be used for both the authentication, authorization,
+   and accounting commands of a given application.
 
 8.9.  Authorization-Lifetime AVP
 
    The Authorization-Lifetime AVP (AVP Code 291) is of type Unsigned32
    and contains the maximum number of seconds of service to be provided
    to the user before the user is to be re-authenticated and/or re-
-   authorized.  Care should be taken when the Authorization- Lifetime
-   value is determined, since a low, non-zero, value could create
+   authorized.  Care should be taken when the Authorization-Lifetime
+   value is determined, since a low, non-zero value could create
    significant Diameter traffic, which could congest both the network
    and the agents.
 
    A value of zero (0) means that immediate re-auth is necessary by the
    access device.  The absence of this AVP, or a value of all ones
-   (meaning all bits in the 32 bit field are set to one) means no re-
+   (meaning all bits in the 32-bit field are set to one) means no re-
    auth is expected.
 
+
+
+Fajardo, et al.              Standards Track                  [Page 117]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    If both this AVP and the Session-Timeout AVP are present in a
    message, the value of the latter MUST NOT be smaller than the
    Authorization-Lifetime AVP.
 
    An Authorization-Lifetime AVP MAY be present in re-authorization
-   messages, and contains the number of seconds the user is authorized
-   to receive service from the time the re-auth answer message is
-   received by the access device.
+   messages, and it contains the number of seconds the user is
+   authorized to receive service from the time the re-auth answer
+   message is received by the access device.
 
    This AVP MAY be provided by the client as a hint of the maximum
    lifetime that it is willing to accept.  The server MUST return a
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 120]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-   value that is equal to, or smaller, than the one provided by the
+   value that is equal to, or smaller than, the one provided by the
    client.
 
 8.10.  Auth-Grace-Period AVP
@@ -6739,7 +6585,6 @@ Internet-Draft           Diameter Base Protocol             January 2011
    the value in the server's answer message is binding.  The following
    values are supported:
 
-
    STATE_MAINTAINED 0
 
       This value is used to specify that session state is being
@@ -6747,46 +6592,42 @@ Internet-Draft           Diameter Base Protocol             January 2011
       message when service to the user is terminated.  This is the
       default value.
 
-
    NO_STATE_MAINTAINED 1
 
       This value is used to specify that no session termination messages
       will be sent by the access device upon expiration of the
       Authorization-Lifetime.
 
-
 8.12.  Re-Auth-Request-Type AVP
 
    The Re-Auth-Request-Type AVP (AVP Code 285) is of type Enumerated and
    is included in application-specific auth answers to inform the client
    of the action expected upon expiration of the Authorization-Lifetime.
-   If the answer message contains an Authorization-Lifetime AVP with a
-   positive value, the Re-Auth-Request-Type AVP MUST be present in an
-   answer message.  The following values are defined:
 
 
-   AUTHORIZE_ONLY 0
 
-      An authorization only re-auth is expected upon expiration of the
-      Authorization-Lifetime.  This is the default value if the AVP is
 
+Fajardo, et al.              Standards Track                  [Page 118]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 121]
-
-Internet-Draft           Diameter Base Protocol             January 2011
+   If the answer message contains an Authorization-Lifetime AVP with a
+   positive value, the Re-Auth-Request-Type AVP MUST be present in an
+   answer message.  The following values are defined:
 
+   AUTHORIZE_ONLY 0
 
+      An authorization only re-auth is expected upon expiration of the
+      Authorization-Lifetime.  This is the default value if the AVP is
       not present in answer messages that include the Authorization-
       Lifetime.
 
-
    AUTHORIZE_AUTHENTICATE 1
 
       An authentication and authorization re-auth is expected upon
       expiration of the Authorization-Lifetime.
 
-
 8.13.  Session-Timeout AVP
 
    The Session-Timeout AVP (AVP Code 27) [RFC2865] is of type Unsigned32
@@ -6799,10 +6640,10 @@ Internet-Draft           Diameter Base Protocol             January 2011
    A session that terminates on an access device due to the expiration
    of the Session-Timeout MUST cause an STR to be issued, unless both
    the access device and the home server had previously agreed that no
-   session termination messages would be sent (see Section 8.11).
+   session termination messages would be sent (see Section 8).
 
    A Session-Timeout AVP MAY be present in a re-authorization answer
-   message, and contains the remaining number of seconds from the
+   message, and it contains the remaining number of seconds from the
    beginning of the re-auth.
 
    A value of zero, or the absence of this AVP, means that this session
@@ -6810,7 +6651,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    This AVP MAY be provided by the client as a hint of the maximum
    timeout that it is willing to accept.  However, the server MAY return
-   a value that is equal to, or smaller, than the one provided by the
+   a value that is equal to, or smaller than, the one provided by the
    client.
 
 8.14.  User-Name AVP
@@ -6819,83 +6660,29 @@ Internet-Draft           Diameter Base Protocol             January 2011
    contains the User-Name, in a format consistent with the NAI
    specification [RFC4282].
 
-8.15.  Termination-Cause AVP
-
-   The Termination-Cause AVP (AVP Code 295) is of type Enumerated, and
-   is used to indicate the reason why a session was terminated on the
-   access device.  The following values are defined:
-
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 122]
+Fajardo, et al.              Standards Track                  [Page 119]
 
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-   DIAMETER_LOGOUT 1
-
-      The user initiated a disconnect
-
-
-   DIAMETER_SERVICE_NOT_PROVIDED 2
-
-      This value is used when the user disconnected prior to the receipt
-      of the authorization answer message.
-
-
-   DIAMETER_BAD_ANSWER 3
-
-      This value indicates that the authorization answer received by the
-      access device was not processed successfully.
-
-
-    DIAMETER_ADMINISTRATIVE 4
-
-      The user was not granted access, or was disconnected, due to
-      administrative reasons, such as the receipt of a Abort-Session-
-      Request message.
-
-
-    DIAMETER_LINK_BROKEN 5
-
-      The communication to the user was abruptly disconnected.
-
-
-    DIAMETER_AUTH_EXPIRED 6
-
-      The user's access was terminated since its authorized session time
-      has expired.
-
-
-    DIAMETER_USER_MOVED 7
-
-      The user is receiving services from another access device.
-
-
-    DIAMETER_SESSION_TIMEOUT 8
+RFC 6733                 Diameter Base Protocol             October 2012
 
-      The user's session has timed out, and service has been terminated.
 
+8.15.  Termination-Cause AVP
 
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 123]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
+   The Termination-Cause AVP (AVP Code 295) is of type Enumerated, and
+   is used to indicate the reason why a session was terminated on the
+   access device.  The currently assigned values for this AVP can be
+   found in the IANA registry for Termination-Cause AVP Values
+   [IANATCV].
 
 8.16.  Origin-State-Id AVP
 
    The Origin-State-Id AVP (AVP Code 278), of type Unsigned32, is a
    monotonically increasing value that is advanced whenever a Diameter
-   entity restarts with loss of previous state, for example upon reboot.
-   Origin-State-Id MAY be included in any Diameter message, including
-   CER.
+   entity restarts with loss of previous state, for example, upon
+   reboot.  Origin-State-Id MAY be included in any Diameter message,
+   including CER.
 
    A Diameter entity issuing this AVP MUST create a higher value for
    this AVP each time its state is reset.  A Diameter entity MAY set
@@ -6911,20 +6698,34 @@ Internet-Draft           Diameter Base Protocol             January 2011
    message, it allows other Diameter entities to infer that sessions
    associated with a lower Origin-State-Id are no longer active.  If an
    access device does not intend for such inferences to be made, it MUST
-   either not include Origin-State-Id in any message, or set its value
-   to 0.
+   either not include Origin-State-Id in any message or set its value to
+   0.
 
 8.17.  Session-Binding AVP
 
-   The Session-Binding AVP (AVP Code 270) is of type Unsigned32, and MAY
-   be present in application-specific authorization answer messages.  If
-   present, this AVP MAY inform the Diameter client that all future
+   The Session-Binding AVP (AVP Code 270) is of type Unsigned32, and it
+   MAY be present in application-specific authorization answer messages.
+   If present, this AVP MAY inform the Diameter client that all future
    application-specific re-auth and Session-Termination-Request messages
    for this session MUST be sent to the same authorization server.
 
-   This field is a bit mask, and the following bits have been defined:
 
 
+
+
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                  [Page 120]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+   This field is a bit mask, and the following bits have been defined:
+
    RE_AUTH 1
 
       When set, future re-auth messages for this session MUST NOT
@@ -6932,23 +6733,13 @@ Internet-Draft           Diameter Base Protocol             January 2011
       value, the Destination-Host AVP MUST be present in all re-auth
       messages for this session.
 
-
    STR 2
 
       When set, the STR message for this session MUST NOT include the
       Destination-Host AVP.  When cleared, the default value, the
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 124]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
       Destination-Host AVP MUST be present in the STR message for this
       session.
 
-
    ACCOUNTING 4
 
       When set, all accounting messages for this session MUST NOT
@@ -6956,10 +6747,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
       value, the Destination-Host AVP, if known, MUST be present in all
       accounting messages for this session.
 
-
 8.18.  Session-Server-Failover AVP
 
-   The Session-Server-Failover AVP (AVP Code 271) is of type Enumerated,
+   The Session-Server-Failover AVP (AVP Code 271) is of type Enumerated
    and MAY be present in application-specific authorization answer
    messages that either do not include the Session-Binding AVP or
    include the Session-Binding AVP with any of the bits set to a zero
@@ -6970,11 +6760,24 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    The following values are supported:
 
-
    REFUSE_SERVICE 0
 
       If either the re-auth or the STR message delivery fails, terminate
-      service with the user, and do not attempt any subsequent attempts.
+      service with the user and do not attempt any subsequent attempts.
+
+
+
+
+
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                  [Page 121]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    TRY_AGAIN 1
@@ -6982,34 +6785,23 @@ Internet-Draft           Diameter Base Protocol             January 2011
       If either the re-auth or the STR message delivery fails, resend
       the failed message without the Destination-Host AVP present.
 
-
    ALLOW_SERVICE 2
 
       If re-auth message delivery fails, assume that re-authorization
       succeeded.  If STR message delivery fails, terminate the session.
 
-
    TRY_AGAIN_ALLOW_SERVICE 3
 
       If either the re-auth or the STR message delivery fails, resend
       the failed message without the Destination-Host AVP present.  If
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 125]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
       the second delivery fails for re-auth, assume re-authorization
       succeeded.  If the second delivery fails for STR, terminate the
       session.
 
-
 8.19.  Multi-Round-Time-Out AVP
 
-   The Multi-Round-Time-Out AVP (AVP Code 272) is of type Unsigned32,
-   and SHOULD be present in application-specific authorization answer
+   The Multi-Round-Time-Out AVP (AVP Code 272) is of type Unsigned32 and
+   SHOULD be present in application-specific authorization answer
    messages whose Result-Code AVP is set to DIAMETER_MULTI_ROUND_AUTH.
    This AVP contains the maximum number of seconds that the access
    device MUST provide the user in responding to an authentication
@@ -7031,37 +6823,24 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 8.21.  Event-Timestamp AVP
 
-   The Event-Timestamp (AVP Code 55) is of type Time, and MAY be
-   included in an Accounting-Request and Accounting-Answer messages to
-   record the time that the reported event occurred, in seconds since
-   January 1, 1900 00:00 UTC.
-
-
+   The Event-Timestamp (AVP Code 55) is of type Time and MAY be included
+   in an Accounting-Request and Accounting-Answer messages to record the
+   time that the reported event occurred, in seconds since January 1,
+   1900 00:00 UTC.
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 126]
+Fajardo, et al.              Standards Track                  [Page 122]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 9.  Accounting
 
    This accounting protocol is based on a server directed model with
    capabilities for real-time delivery of accounting information.
-   Several fault resilience methods [RFC2975] have been built in to the
+   Several fault resilience methods [RFC2975] have been built into the
    protocol in order minimize loss of accounting data in various fault
    situations and under different assumptions about the capabilities of
    the used devices.
@@ -7075,15 +6854,16 @@ Internet-Draft           Diameter Base Protocol             January 2011
    timeliness requirements.
 
    As discussed in [RFC2975], real-time transfer of accounting records
-   is a requirement, such as the need to perform credit limit checks and
+   is a requirement, such as the need to perform credit-limit checks and
    fraud detection.  Note that batch accounting is not a requirement,
    and is therefore not supported by Diameter.  Should batched
    accounting be required in the future, a new Diameter application will
    need to be created, or it could be handled using another protocol.
-   Note, however, that even if at the Diameter layer accounting requests
-   are processed one by one, transport protocols used under Diameter
-   typically batch several requests in the same packet under heavy
-   traffic conditions.  This may be sufficient for many applications.
+   Note, however, that even if at the Diameter layer, accounting
+   requests are processed one by one; transport protocols used under
+   Diameter typically batch several requests in the same packet under
+   heavy traffic conditions.  This may be sufficient for many
+   applications.
 
    The authorization server (chain) directs the selection of proper
    transfer strategy, based on its knowledge of the user and
@@ -7097,7 +6877,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
    records from the Diameter client is delayed or unsuccessful.
 
    The Diameter accounting server MAY override the interim interval or
-   the realtime requirements by including the Acct-Interim-Interval or
+   the real-time requirements by including the Acct-Interim-Interval or
    Accounting-Realtime-Required AVP in the Accounting-Answer message.
    When one of these AVPs is present, the latest value received SHOULD
    be used in further accounting activities for the same session.
@@ -7107,16 +6887,15 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-
-Fajardo, et al.           Expires July 24, 2011               [Page 127]
+Fajardo, et al.              Standards Track                  [Page 123]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 9.2.  Protocol Messages
 
    A Diameter node that receives a successful authentication and/or
-   authorization messages from the Diameter server SHOULD collect
+   authorization message from the Diameter server SHOULD collect
    accounting information for the session.  The Accounting-Request
    message is used to transmit the accounting information to the
    Diameter server, which MUST reply with the Accounting-Answer message
@@ -7129,12 +6908,12 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 9.3.  Accounting Application Extension and Requirements
 
-   Each Diameter application (e.g., NASREQ, MobileIP), SHOULD define
-   their Service-Specific AVPs that MUST be present in the Accounting-
-   Request message in a section entitled "Accounting AVPs".  The
-   application MUST assume that the AVPs described in this document will
-   be present in all Accounting messages, so only their respective
-   service-specific AVPs need to be defined in that section.
+   Each Diameter application (e.g., NASREQ, Mobile IP) SHOULD define its
+   service-specific AVPs that MUST be present in the Accounting-Request
+   message in a section titled "Accounting AVPs".  The application MUST
+   assume that the AVPs described in this document will be present in
+   all Accounting messages, so only their respective service-specific
+   AVPs need to be defined in that section.
 
    Applications have the option of using one or both of the following
    accounting application extension models:
@@ -7150,40 +6929,37 @@ Internet-Draft           Diameter Base Protocol             January 2011
       advertise the Diameter base accounting Application Id during
       capabilities exchange.
 
-
    Coupled Accounting Service
 
-      The accounting messages will carry the Application Id of the
+      The accounting message will carry the Application Id of the
       application that is using it.  The application itself will process
       the received accounting records or forward them to an accounting
       server.  There is no accounting application advertisement required
-      during capabilities exchange and the accounting messages will be
-      routed the same as any of the other application messages.
-
+      during capabilities exchange, and the accounting messages will be
+      routed the same way as any of the other application messages.
 
+   In cases where an application does not define its own accounting
+   service, it is preferred that the split accounting model be used.
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 128]
+Fajardo, et al.              Standards Track                  [Page 124]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-      In cases where an application does not define its own accounting
-      service, it is preferred that the split accounting model be used.
-
 9.4.  Fault Resilience
 
-   Diameter Base protocol mechanisms are used to overcome small message
-   loss and network faults of temporary nature.
+   Diameter base protocol mechanisms are used to overcome small message
+   loss and network faults of a temporary nature.
 
    Diameter peers acting as clients MUST implement the use of failover
    to guard against server failures and certain network failures.
    Diameter peers acting as agents or related off-line processing
    systems MUST detect duplicate accounting records caused by the
-   sending of same record to several servers and duplication of messages
-   in transit.  This detection MUST be based on the inspection of the
-   Session-Id and Accounting-Record-Number AVP pairs.  Appendix C
+   sending of the same record to several servers and duplication of
+   messages in transit.  This detection MUST be based on the inspection
+   of the Session-Id and Accounting-Record-Number AVP pairs.  Appendix C
    discusses duplicate detection needs and implementation issues.
 
    Diameter clients MAY have non-volatile memory for the safe storage of
@@ -7191,23 +6967,23 @@ Internet-Draft           Diameter Base Protocol             January 2011
    partitions, and server failures.  If such memory is available, the
    client SHOULD store new accounting records there as soon as the
    records are created and until a positive acknowledgement of their
-   reception from the Diameter Server has been received.  Upon a reboot,
-   the client MUST starting sending the records in the non-volatile
-   memory to the accounting server with appropriate modifications in
+   reception from the Diameter server has been received.  Upon a reboot,
+   the client MUST start sending the records in the non-volatile memory
+   to the accounting server with the appropriate modifications in
    termination cause, session length, and other relevant information in
    the records.
 
    A further application of this protocol may include AVPs to control
-   how many accounting records may at most be stored in the Diameter
-   client without committing them to the non-volatile memory or
+   the maximum number of accounting records that may be stored in the
+   Diameter client without committing them to the non-volatile memory or
    transferring them to the Diameter server.
 
    The client SHOULD NOT remove the accounting data from any of its
    memory areas before the correct Accounting-Answer has been received.
-   The client MAY remove oldest, undelivered or yet unacknowledged
-   accounting data if it runs out of resources such as memory.  It is an
-   implementation dependent matter for the client to accept new sessions
-   under this condition.
+   The client MAY remove the oldest, undelivered, or as yet
+   unacknowledged accounting data if it runs out of resources such as
+   memory.  It is an implementation-dependent matter for the client to
+   accept new sessions under this condition.
 
 9.5.  Accounting Records
 
@@ -7217,15 +6993,17 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    Different types of accounting records are sent depending on the
    actual type of accounted service and the authorization server's
+   directions for interim accounting.  If the accounted service is a
+
+
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 129]
+Fajardo, et al.              Standards Track                  [Page 125]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-   directions for interim accounting.  If the accounted service is a
    one-time event, meaning that the start and stop of the event are
    simultaneous, then the Accounting-Record-Type AVP MUST be present and
    set to the value EVENT_RECORD.
@@ -7251,11 +7029,11 @@ Internet-Draft           Diameter Base Protocol             January 2011
    session.
 
    A particular value of Accounting-Sub-Session-Id MUST appear only in
-   one sequence of accounting records from a DIAMETER client, except for
+   one sequence of accounting records from a Diameter client, except for
    the purposes of retransmission.  The one sequence that is sent MUST
    be either one record with Accounting-Record-Type AVP set to the value
-   EVENT_RECORD, or several records starting with one having the value
-   START_RECORD, followed by zero or more INTERIM_RECORD and a single
+   EVENT_RECORD or several records starting with one having the value
+   START_RECORD, followed by zero or more INTERIM_RECORDs and a single
    STOP_RECORD.  A particular Diameter application specification MUST
    define the type of sequences that MUST be used.
 
@@ -7265,20 +7043,21 @@ Internet-Draft           Diameter Base Protocol             January 2011
    accounting records with a specific application session by using the
    Session-Id of the particular application session in the accounting
    messages.  Accounting messages MAY also use a different Session-Id
-   from that of the application sessions in which case other session
+   from that of the application sessions, in which case, other session-
    related information is needed to perform correlation.
 
    In cases where an application requires multiple accounting sub-
-   session, an Accounting-Sub-Session-Id AVP is used to differentiate
+   sessions, an Accounting-Sub-Session-Id AVP is used to differentiate
    each sub-session.  The Session-Id would remain constant for all sub-
-   sessions and is be used to correlate all the sub-sessions to a
+   sessions and is used to correlate all the sub-sessions to a
    particular application session.  Note that receiving a STOP_RECORD
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 130]
+
+Fajardo, et al.              Standards Track                  [Page 126]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    with no Accounting-Sub-Session-Id AVP when sub-sessions were
@@ -7290,36 +7069,36 @@ Internet-Draft           Diameter Base Protocol             January 2011
    record may span multiple different Diameter applications and sessions
    used by the same user at a given time.  In such cases, the Acct-
    Multi-Session-Id AVP is used.  The Acct-Multi-Session-Id AVP SHOULD
-   be signaled by the server to the access device (typically during
+   be signaled by the server to the access device (typically, during
    authorization) when it determines that a request belongs to an
    existing session.  The access device MUST then include the Acct-
    Multi-Session-Id AVP in all subsequent accounting messages.
 
    The Acct-Multi-Session-Id AVP MAY include the value of the original
-   Session-Id.  It's contents are implementation specific, but MUST be
-   globally unique across other Acct-Multi-Session-Id, and MUST NOT
+   Session-Id.  Its contents are implementation specific, but the MUST
+   be globally unique across other Acct-Multi-Session-Ids and MUST NOT
    change during the life of a session.
 
    A Diameter application document MUST define the exact concept of a
-   session that is being accounted, and MAY define the concept of a
+   session that is being accounted, and it MAY define the concept of a
    multi-session.  For instance, the NASREQ DIAMETER application treats
-   a single PPP connection to a Network Access Server as one session,
-   and a set of Multilink PPP sessions as one multi-session.
+   a single PPP connection to a Network Access Server as one session and
+   a set of Multilink PPP sessions as one multi-session.
 
-9.7.  Accounting Command-Codes
+9.7.  Accounting Command Codes
 
-   This section defines Command-Code values that MUST be supported by
-   all Diameter implementations that provide Accounting services.
+   This section defines Command Code values that MUST be supported by
+   all Diameter implementations that provide accounting services.
 
 9.7.1.  Accounting-Request
 
-   The Accounting-Request (ACR) command, indicated by the Command-Code
+   The Accounting-Request (ACR) command, indicated by the Command Code
    field set to 271 and the Command Flags' 'R' bit set, is sent by a
    Diameter node, acting as a client, in order to exchange accounting
    information with a peer.
 
-   The AVP listed below SHOULD include service-specific accounting AVPs,
-   as described in Section 9.3.
+   In addition to the AVPs listed below, Accounting-Request messages
+   SHOULD include service-specific accounting AVPs.
 
 
 
@@ -7332,9 +7111,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 131]
+Fajardo, et al.              Standards Track                  [Page 127]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
       Message Format
@@ -7363,16 +7142,16 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 9.7.2.  Accounting-Answer
 
-   The Accounting-Answer (ACA) command, indicated by the Command-Code
+   The Accounting-Answer (ACA) command, indicated by the Command Code
    field set to 271 and the Command Flags' 'R' bit cleared, is used to
    acknowledge an Accounting-Request command.  The Accounting-Answer
    command contains the same Session-Id as the corresponding request.
 
-   Only the target Diameter Server, known as the home Diameter Server,
+   Only the target Diameter server, known as the home Diameter server,
    SHOULD respond with the Accounting-Answer command.
 
-   The AVP listed below SHOULD include service-specific accounting AVPs,
-   as described in Section 9.3.
+   In addition to the AVPs listed below, Accounting-Answer messages
+   SHOULD include service-specific accounting AVPs.
 
 
 
@@ -7388,9 +7167,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 132]
+Fajardo, et al.              Standards Track                  [Page 128]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
       Message Format
@@ -7429,13 +7208,12 @@ Internet-Draft           Diameter Base Protocol             January 2011
    and contains the type of accounting record being sent.  The following
    values are currently defined for the Accounting-Record-Type AVP:
 
-
    EVENT_RECORD 1
 
       An Accounting Event Record is used to indicate that a one-time
       event has occurred (meaning that the start and end of the event
       are simultaneous).  This record contains all information relevant
-      to the service, and is the only record of the service.
+      to the service, and it is the only record of the service.
 
 
 
@@ -7444,20 +7222,20 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 133]
+
+Fajardo, et al.              Standards Track                  [Page 129]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
    START_RECORD 2
 
-      An Accounting Start, Interim, and Stop Records are used to
-      indicate that a service of a measurable length has been given.  An
-      Accounting Start Record is used to initiate an accounting session,
+      Accounting Start, Interim, and Stop Records are used to indicate
+      that a service of a measurable length has been given.  An
+      Accounting Start Record is used to initiate an accounting session
       and contains accounting information that is relevant to the
       initiation of the session.
 
-
    INTERIM_RECORD 3
 
       An Interim Accounting Record contains cumulative accounting
@@ -7468,14 +7246,12 @@ Internet-Draft           Diameter Base Protocol             January 2011
       applications.  The selection of whether to use INTERIM_RECORD
       records is done by the Acct-Interim-Interval AVP.
 
-
    STOP_RECORD 4
 
       An Accounting Stop Record is sent to terminate an accounting
       session and contains cumulative accounting information relevant to
       the existing session.
 
-
 9.8.2.  Acct-Interim-Interval AVP
 
    The Acct-Interim-Interval AVP (AVP Code 85) is of type Unsigned32 and
@@ -7483,31 +7259,31 @@ Internet-Draft           Diameter Base Protocol             January 2011
    client.  The client uses information in this AVP to decide how and
    when to produce accounting records.  With different values in this
    AVP, service sessions can result in one, two, or two+N accounting
-   records, based on the needs of the home-organization.  The following
+   records, based on the needs of the home organization.  The following
    accounting record production behavior is directed by the inclusion of
    this AVP:
 
-
    1.  The omission of the Acct-Interim-Interval AVP or its inclusion
        with Value field set to 0 means that EVENT_RECORD, START_RECORD,
        and STOP_RECORD are produced, as appropriate for the service.
 
-
    2.  The inclusion of the AVP with Value field set to a non-zero value
        means that INTERIM_RECORD records MUST be produced between the
        START_RECORD and STOP_RECORD records.  The Value field of this
        AVP is the nominal interval between these records in seconds.
+       The Diameter node that originates the accounting information,
+       known as the client, MUST produce the first INTERIM_RECORD record
+       roughly at the time when this nominal interval has elapsed from
+
+
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 134]
+Fajardo, et al.              Standards Track                  [Page 130]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-       The Diameter node that originates the accounting information,
-       known as the client, MUST produce the first INTERIM_RECORD record
-       roughly at the time when this nominal interval has elapsed from
        the START_RECORD, the next one again as the interval has elapsed
        once more, and so on until the session ends and a STOP_RECORD
        record is produced.
@@ -7522,10 +7298,10 @@ Internet-Draft           Diameter Base Protocol             January 2011
    The Accounting-Record-Number AVP (AVP Code 485) is of type Unsigned32
    and identifies this record within one session.  As Session-Id AVPs
    are globally unique, the combination of Session-Id and Accounting-
-   Record-Number AVPs is also globally unique, and can be used in
+   Record-Number AVPs is also globally unique and can be used in
    matching accounting records with confirmations.  An easy way to
    produce unique numbers is to set the value to 0 for records of type
-   EVENT_RECORD and START_RECORD, and set the value to 1 for the first
+   EVENT_RECORD and START_RECORD and set the value to 1 for the first
    INTERIM_RECORD, 2 for the second, and so on until the value for
    STOP_RECORD is one more than for the last INTERIM_RECORD.
 
@@ -7539,10 +7315,10 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
    The Acct-Multi-Session-Id AVP (AVP Code 50) is of type UTF8String,
    following the format specified in Section 8.8.  The Acct-Multi-
-   Session-Id AVP is used to link together multiple related accounting
-   sessions, where each session would have a unique Session-Id, but the
-   same Acct-Multi-Session-Id AVP.  This AVP MAY be returned by the
-   Diameter server in an authorization answer, and MUST be used in all
+   Session-Id AVP is used to link multiple related accounting sessions,
+   where each session would have a unique Session-Id but the same Acct-
+   Multi-Session-Id AVP.  This AVP MAY be returned by the Diameter
+   server in an authorization answer, and it MUST be used in all
    accounting messages for the given session.
 
 9.8.6.  Accounting-Sub-Session-Id AVP
@@ -7553,18 +7329,17 @@ Internet-Draft           Diameter Base Protocol             January 2011
    session, and the value of this AVP MUST be monotonically increased by
    one for all new sub-sessions.  The absence of this AVP implies no
    sub-sessions are in use, with the exception of an Accounting-Request
+   whose Accounting-Record-Type is set to STOP_RECORD.  A STOP_RECORD
+   message with no Accounting-Sub-Session-Id AVP present will signal the
+   termination of all sub-sessions for a given Session-Id.
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 135]
+Fajardo, et al.              Standards Track                  [Page 131]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-   whose Accounting-Record-Type is set to STOP_RECORD.  A STOP_RECORD
-   message with no Accounting-Sub-Session-Id AVP present will signal the
-   termination of all sub-sessions for a given Session-Id.
-
 9.8.7.   Accounting-Realtime-Required AVP
 
    The Accounting-Realtime-Required AVP (AVP Code 483) is of type
@@ -7574,7 +7349,6 @@ Internet-Draft           Diameter Base Protocol             January 2011
    if the sending of accounting records to the accounting server has
    been temporarily prevented due to, for instance, a network problem.
 
-
    DELIVER_AND_GRANT 1
 
       The AVP with Value field set to DELIVER_AND_GRANT means that the
@@ -7584,7 +7358,6 @@ Internet-Draft           Diameter Base Protocol             January 2011
       the accounting record stream to a backup server is not a reason to
       discontinue the service to the user.
 
-
    GRANT_AND_STORE 2
 
       The AVP with Value field set to GRANT_AND_STORE means that service
@@ -7594,60 +7367,51 @@ Internet-Draft           Diameter Base Protocol             January 2011
       This is the default behavior if the AVP isn't included in the
       reply from the authorization server.
 
-
    GRANT_AND_LOSE 3
 
       The AVP with Value field set to GRANT_AND_LOSE means that service
       SHOULD be granted even if the records cannot be delivered or
       stored.
 
+10.  AVP Occurrence Tables
 
+   The following tables present the AVPs defined in this document and
+   specify in which Diameter messages they MAY or MAY NOT be present.
+   AVPs that occur only inside a Grouped AVP are not shown in these
+   tables.
 
+   The tables use the following symbols:
 
+   0     The AVP MUST NOT be present in the message.
 
+   0+    Zero or more instances of the AVP MAY be present in the
+         message.
 
 
 
 
 
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 136]
+Fajardo, et al.              Standards Track                  [Page 132]
 
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-10.  AVP Occurrence Table
-
-   The following tables presents the AVPs defined in this document, and
-   specifies in which Diameter messages they MAY be present or not.
-   AVPs that occur only inside a Grouped AVP are not shown in this
-   table.
+RFC 6733                 Diameter Base Protocol             October 2012
 
-   The table uses the following symbols:
 
+   0-1   Zero or one instance of the AVP MAY be present in the message.
+         It is considered an error if there are more than one instance
+         of the AVP.
 
-      0 The AVP MUST NOT be present in the message.
+   1     One instance of the AVP MUST be present in the message.
 
-      0+ Zero or more instances of the AVP MAY be present in the
-      message.
-
-      0-1 Zero or one instance of the AVP MAY be present in the message.
-      It is considered an error if there are more than one instance of
-      the AVP.
-
-      1 One instance of the AVP MUST be present in the message.
-
-      1+ At least one instance of the AVP MUST be present in the
-      message.
+   1+    At least one instance of the AVP MUST be present in the
+         message.
 
 10.1.  Base Protocol Command AVP Table
 
-   The table in this section is limited to the non-accounting Command
+   The table in this section is limited to the non-Accounting Command
    Codes defined in this specification.
 
                        +-----------------------------------------------+
-                       |                  Command-Code                 |
+                       |                  Command Code                 |
                        +---+---+---+---+---+---+---+---+---+---+---+---+
    Attribute Name      |CER|CEA|DPR|DPA|DWR|DWA|RAR|RAA|ASR|ASA|STR|STA|
    --------------------+---+---+---+---+---+---+---+---+---+---+---+---+
@@ -7665,22 +7429,29 @@ Internet-Draft           Diameter Base Protocol             January 2011
    Class               |0  |0  |0  |0  |0  |0  |0  |0  |0  |0  |0+ |0+ |
    Destination-Host    |0  |0  |0  |0  |0  |0  |1  |0  |1  |0  |0-1|0  |
    Destination-Realm   |0  |0  |0  |0  |0  |0  |1  |0  |1  |0  |1  |0  |
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 137]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    Disconnect-Cause    |0  |0  |1  |0  |0  |0  |0  |0  |0  |0  |0  |0  |
    Error-Message       |0  |0-1|0  |0-1|0  |0-1|0  |0-1|0  |0-1|0  |0-1|
    Error-Reporting-Host|0  |0  |0  |0  |0  |0  |0  |0-1|0  |0-1|0  |0-1|
-   Failed-AVP          |0  |0+ |0  |0+ |0  |0+ |0  |0+ |0  |0+ |0  |0+ |
+   Failed-AVP          |0  |0-1|0  |0-1|0  |0-1|0  |0-1|0  |0-1|0  |0-1|
    Firmware-Revision   |0-1|0-1|0  |0  |0  |0  |0  |0  |0  |0  |0  |0  |
    Host-IP-Address     |1+ |1+ |0  |0  |0  |0  |0  |0  |0  |0  |0  |0  |
    Inband-Security-Id  |0  |0  |0  |0  |0  |0  |0  |0  |0  |0  |0  |0  |
    Multi-Round-Time-Out|0  |0  |0  |0  |0  |0  |0  |0  |0  |0  |0  |0  |
+
+
+
+
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                  [Page 133]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    Origin-Host         |1  |1  |1  |1  |1  |1  |1  |1  |1  |1  |1  |1  |
    Origin-Realm        |1  |1  |1  |1  |1  |1  |1  |1  |1  |1  |1  |1  |
    Origin-State-Id     |0-1|0-1|0  |0  |0-1|0-1|0-1|0-1|0-1|0-1|0-1|0-1|
@@ -7724,9 +7495,17 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 138]
+
+
+
+
+
+
+
+
+Fajardo, et al.              Standards Track                  [Page 134]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
                                     +-----------+
@@ -7749,6 +7528,7 @@ Internet-Draft           Diameter Base Protocol             January 2011
       Destination-Realm             | 1   | 0   |
       Error-Reporting-Host          | 0   | 0+  |
       Event-Timestamp               | 0-1 | 0-1 |
+      Failed-AVP                    | 0   | 0-1 |
       Origin-Host                   | 1   | 1   |
       Origin-Realm                  | 1   | 1   |
       Proxy-Info                    | 0+  | 0+  |
@@ -7760,144 +7540,220 @@ Internet-Draft           Diameter Base Protocol             January 2011
       Vendor-Specific-Application-Id| 0-1 | 0-1 |
       ------------------------------+-----+-----+
 
+11.  IANA Considerations
 
+   This section provides guidance to the Internet Assigned Numbers
+   Authority (IANA) regarding registration of values related to the
+   Diameter protocol, in accordance with [RFC5226].  Existing IANA
+   registries and assignments put in place by RFC 3588 remain the same
+   unless explicitly updated or deprecated in this section.
 
+11.1.  AVP Header
 
+   As defined in Section 4, the AVP header contains three fields that
+   require IANA namespace management: the AVP Code, Vendor-ID, and Flags
+   fields.
 
 
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 139]
+Fajardo, et al.              Standards Track                  [Page 135]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-11.  IANA Considerations
+11.1.1.  AVP Codes
 
-   This section provides guidance to the Internet Assigned Numbers
-   Authority (IANA) regarding registration of values related to the
-   Diameter protocol, in accordance with BCP 26 [RFC5226].  The policies
-   and procedures for the IANA put in place by [RFC3588] applies here.
-   The criteria used by the IANA for assignment of numbers within this
-   namespace remains the same unless otherwise stated in this section.
-   Existing assignments remains the same unless explicitly updated or
-   deprecated in this secion.
+   There are multiple namespaces.  Vendors can have their own AVP Codes
+   namespace that will be identified by their Vendor-ID (also known as
+   Enterprise-Number), and they control the assignments of their vendor-
+   specific AVP Codes within their own namespace.  The absence of a
+   Vendor-ID or a Vendor-ID value of zero (0) identifies the IETF AVP
+   Codes namespace, which is under IANA control.  The AVP Codes and
+   sometimes possible values in an AVP are controlled and maintained by
+   IANA.  AVP Code 0 is not used.  AVP Codes 1-255 are managed
+   separately as RADIUS Attribute Types.  Where a Vendor-Specific AVP is
+   implemented by more than one vendor, allocation of global AVPs should
+   be encouraged instead.
+
+   AVPs may be allocated following Expert Review (by a Designated
+   Expert) with Specification Required [RFC5226].  A block allocation
+   (release of more than three AVPs at a time for a given purpose)
+   requires IETF Review [RFC5226].
 
-11.1.  Changes to AVP Header Allocation
+11.1.2.  AVP Flags
 
-   For AVP Headers, the only change is the AVP code block allocations.
-   Block allocation (release of more than 3 at a time for a given
-   purpose) now only require IETF Review as opposed to an IETF
-   Consensus.
+   Section 4.1 describes the existing AVP Flags.  The remaining bits can
+   only be assigned via a Standards Action [RFC5226].
 
 11.2.  Diameter Header
 
-   For the Diameter Header, the command code namespace allocation has
+11.2.1.  Command Codes
+
+   For the Diameter header, the Command Code namespace allocation has
    changed.  The new allocation rules are as follows:
 
-      The command code values 256 - 8,388,607 (0x100 to 0x7fffff) are
+      The Command Code values 256 - 8,388,607 (0x100 to 0x7fffff) are
       for permanent, standard commands, allocated by IETF Review
       [RFC5226].
 
       The values 8,388,608 - 16,777,213 (0x800000 - 0xfffffd) are
-      reserved for vendor-specific command codes, to be allocated on a
+      reserved for vendor-specific Command Codes, to be allocated on a
       First Come, First Served basis by IANA [RFC5226].  The request to
       IANA for a Vendor-Specific Command Code SHOULD include a reference
-      to a publicly available specification which documents the command
+      to a publicly available specification that documents the command
       in sufficient detail to aid in interoperability between
       independent implementations.  If the specification cannot be made
-      publicly available, the request for a vendor-specific command code
+      publicly available, the request for a vendor-specific Command Code
       MUST include the contact information of persons and/or entities
       responsible for authoring and maintaining the command.
 
+
+
+
+
+
+Fajardo, et al.              Standards Track                  [Page 136]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+      The values 16,777,214 and 16,777,215 (hexadecimal values 0xfffffe
+      - 0xffffff) are reserved for experimental commands.  As these
+      codes are only for experimental and testing purposes, no guarantee
+      is made for interoperability between Diameter peers using
+      experimental commands.
+
+11.2.2.  Command Flags
+
+   Section 3 describes the existing Command Flags field.  The remaining
+   bits can only be assigned via a Standards Action [RFC5226].
+
 11.3.  AVP Values
 
    For AVP values, the Experimental-Result-Code AVP value allocation has
-   been added.  The new rule is as follows:
+   been added; see Section 11.3.1.  The old AVP value allocation rule,
+   IETF Consensus, has been updated to IETF Review as per [RFC5226], and
+   affected AVPs are listed as reminders.
 
 11.3.1.  Experimental-Result-Code AVP
 
    Values for this AVP are purely local to the indicated vendor, and no
    IANA registry is maintained for them.
 
+11.3.2.  Result-Code AVP Values
 
+   New values are available for assignment via IETF Review [RFC5226].
 
+11.3.3.  Accounting-Record-Type AVP Values
 
-Fajardo, et al.           Expires July 24, 2011               [Page 140]
-
-Internet-Draft           Diameter Base Protocol             January 2011
+   New values are available for assignment via IETF Review [RFC5226].
+
+11.3.4.  Termination-Cause AVP Values
 
+   New values are available for assignment via IETF Review [RFC5226].
 
-11.4.  Diameter TCP, SCTP, TLS/TCP and DTLS/SCTP Port Numbers
+11.3.5.  Redirect-Host-Usage AVP Values
 
-   Updated port number assignments are described in this section.  The
-   IANA has assigned port number 3868 for TCP and SCTP.  The port number
-   [TBD] has been assigned for TLS/TCP and DTLS/SCTP.
+   New values are available for assignment via IETF Review [RFC5226].
 
-11.5.  S-NAPTR Parameters
+11.3.6.  Session-Server-Failover AVP Values
 
-   This document registers a new S-NAPTR Application Service Tag value
-   of "aaa".
+   New values are available for assignment via IETF Review [RFC5226].
 
-   This document also registers the following S-NAPTR Application
-   Protocol Tags:
+11.3.7.  Session-Binding AVP Values
 
-     Tag                | Protocol
-     -------------------|---------
-     diameter.tcp       | TCP
-     diameter.sctp      | SCTP
-     diameter.tls.tcp   | TLS/TCP
-     diameter.dtls.sctp | DTLS/SCTP
+   New values are available for assignment via IETF Review [RFC5226].
 
 
 
 
 
+Fajardo, et al.              Standards Track                  [Page 137]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+11.3.8.  Disconnect-Cause AVP Values
 
+   New values are available for assignment via IETF Review [RFC5226].
 
+11.3.9.  Auth-Request-Type AVP Values
 
+   New values are available for assignment via IETF Review [RFC5226].
 
+11.3.10.  Auth-Session-State AVP Values
 
+   New values are available for assignment via IETF Review [RFC5226].
 
+11.3.11.  Re-Auth-Request-Type AVP Values
 
+   New values are available for assignment via IETF Review [RFC5226].
 
+11.3.12.  Accounting-Realtime-Required AVP Values
 
+   New values are available for assignment via IETF Review [RFC5226].
 
+11.3.13.  Inband-Security-Id AVP (code 299)
 
+   The use of this AVP has been deprecated.
 
+11.4.  _diameters Service Name and Port Number Registration
 
+   IANA has registered the "_diameters" service name and assigned port
+   numbers for TLS/TCP and DTLS/SCTP according to the guidelines given
+   in [RFC6335].
 
+      Service Name:         _diameters
 
+      Transport Protocols:  TCP, SCTP
 
+      Assignee:             IESG <[email protected]>
 
+      Contact:              IETF Chair <[email protected]>
 
+      Description:          Diameter over TLS/TCP and DTLS/SCTP
 
+      Reference:            RFC 6733
 
+      Port  Number:         5868, from the User Range
 
 
 
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 141]
+
+
+Fajardo, et al.              Standards Track                  [Page 138]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+11.5.  SCTP Payload Protocol Identifiers
+
+   Two SCTP payload protocol identifiers have been registered in the
+   SCTP Payload Protocol Identifiers registry:
+
+
+    Value | SCTP Payload Protocol Identifier
+   -------|-----------------------------------
+     46   | Diameter in a SCTP DATA chunk
+     47   | Diameter in a DTLS/SCTP DATA chunk
+
 
+11.6.  S-NAPTR Parameters
 
-12.  Diameter protocol related configurable parameters
+   The following tag has been registered in the S-NAPTR Application
+   Protocol Tags registry:
+
+   Tag                | Protocol
+   -------------------|---------
+   diameter.dtls.sctp | DTLS/SCTP
+
+12.  Diameter Protocol-Related Configurable Parameters
 
    This section contains the configurable parameters that are found
    throughout this document:
@@ -7915,8 +7771,8 @@ Internet-Draft           Diameter Base Protocol             January 2011
       A Diameter proxy server routes messages based on the realm portion
       of a Network Access Identifier (NAI).  The server MUST have a
       table of Realm Names, and the address of the peer to which the
-      message must be forwarded to.  The routing table MAY also include
-      a "default route", which is typically used for all messages that
+      message must be forwarded.  The routing table MAY also include a
+      "default route", which is typically used for all messages that
       cannot be locally processed.
 
    Tc timer
@@ -7927,30 +7783,9 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 142]
+Fajardo, et al.              Standards Track                  [Page 139]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 13.  Security Considerations
@@ -7959,34 +7794,34 @@ Internet-Draft           Diameter Base Protocol             January 2011
    [RFC5246] or DTLS/SCTP [RFC6083].  Additional security mechanisms
    such as IPsec [RFC4301] MAY also be deployed to secure connections
    between peers.  However, all Diameter base protocol implementations
-   MUST support the use of TLS/TCP and DTLS/SCTP and the Diameter
-   protocol MUST NOT be used without any security mechanism.
+   MUST support the use of TLS/TCP and DTLS/SCTP, and the Diameter
+   protocol MUST NOT be used without one of TLS, DTLS, or IPsec.
 
    If a Diameter connection is to be protected via TLS/TCP and DTLS/SCTP
    or IPsec, then TLS/TCP and DTLS/SCTP or IPsec/IKE SHOULD begin prior
    to any Diameter message exchange.  All security parameters for TLS/
    TCP and DTLS/SCTP or IPsec are configured independent of the Diameter
-   protocol.  All Diameter message will be sent through the TLS/TCP and
+   protocol.  All Diameter messages will be sent through the TLS/TCP and
    DTLS/SCTP or IPsec connection after a successful setup.
 
    For TLS/TCP and DTLS/SCTP connections to be established in the open
    state, the CER/CEA exchange MUST include an Inband-Security-ID AVP
    with a value of TLS/TCP and DTLS/SCTP.  The TLS/TCP and DTLS/SCTP
-   handshake will begin when both ends successfully reached the open
+   handshake will begin when both ends successfully reach the open
    state, after completion of the CER/CEA exchange.  If the TLS/TCP and
    DTLS/SCTP handshake is successful, all further messages will be sent
-   via TLS/TCP and DTLS/SCTP.  If the handshake fails, both ends move to
-   the closed state.  See Sections 13.1 for more details.
+   via TLS/TCP and DTLS/SCTP.  If the handshake fails, both ends MUST
+   move to the closed state.  See Section 13.1 for more details.
 
 13.1.  TLS/TCP and DTLS/SCTP Usage
 
    Diameter nodes using TLS/TCP and DTLS/SCTP for security MUST mutually
    authenticate as part of TLS/TCP and DTLS/SCTP session establishment.
    In order to ensure mutual authentication, the Diameter node acting as
-   TLS/TCP and DTLS/SCTP server MUST request a certificate from the
+   the TLS/TCP and DTLS/SCTP server MUST request a certificate from the
    Diameter node acting as TLS/TCP and DTLS/SCTP client, and the
-   Diameter node acting as TLS/TCP and DTLS/SCTP client MUST be prepared
-   to supply a certificate on request.
+   Diameter node acting as the TLS/TCP and DTLS/SCTP client MUST be
+   prepared to supply a certificate on request.
 
    Diameter nodes MUST be able to negotiate the following TLS/TCP and
    DTLS/SCTP cipher suites:
@@ -8000,16 +7835,24 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
          TLS_RSA_WITH_AES_128_CBC_SHA
 
-   Diameter nodes MAY negotiate other TLS/TCP and DTLS/SCTP cipher
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 143]
+
+Fajardo, et al.              Standards Track                  [Page 140]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
+   Note that it is quite possible that support for the
+   TLS_RSA_WITH_AES_128_CBC_SHA cipher suite will be REQUIRED at some
+   future date.  Diameter nodes MAY negotiate other TLS/TCP and DTLS/
+   SCTP cipher suites.
 
-   suites.
+   If public key certificates are used for Diameter security (for
+   example, with TLS), the value of the expiration times in the routing
+   and peer tables MUST NOT be greater than the expiry time in the
+   relevant certificates.
 
 13.2.  Peer-to-Peer Considerations
 
@@ -8027,67 +7870,105 @@ Internet-Draft           Diameter Base Protocol             January 2011
    peers may not be known beforehand and therefore peer discovery may be
    required.
 
+13.3.  AVP Considerations
 
+   Diameter AVPs often contain security-sensitive data; for example,
+   user passwords and location data, network addresses and cryptographic
+   keys.  The following AVPs defined in this document are considered to
+   be security-sensitive:
 
+   o  Acct-Interim-Interval
 
+   o  Accounting-Realtime-Required
 
+   o  Acct-Multi-Session-Id
 
+   o  Accounting-Record-Number
 
+   o  Accounting-Record-Type
 
+   o  Accounting-Session-Id
 
+   o  Accounting-Sub-Session-Id
 
+   o  Class
 
 
 
+Fajardo, et al.              Standards Track                  [Page 141]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
+   o  Session-Id
 
+   o  Session-Binding
 
+   o  Session-Server-Failover
 
+   o  User-Name
 
+   Diameter messages containing these or any other AVPs considered to be
+   security-sensitive MUST only be sent protected via mutually
+   authenticated TLS or IPsec.  In addition, those messages MUST NOT be
+   sent via intermediate nodes unless there is end-to-end security
+   between the originator and recipient or the originator has locally
+   trusted configuration that indicates that end-to-end security is not
+   needed.  For example, end-to-end security may not be required in the
+   case where an intermediary node is known to be operated as part of
+   the same administrative domain as the endpoints so that an ability to
+   successfully compromise the intermediary would imply a high
+   probability of being able to compromise the endpoints as well.  Note
+   that no end-to-end security mechanism is specified in this document.
 
+14.  References
 
+14.1.  Normative References
 
+   [FLOATPOINT]
+              Institute of Electrical and Electronics Engineers, "IEEE
+              Standard for Binary Floating-Point Arithmetic, ANSI/IEEE
+              Standard 754-1985", August 1985.
 
+   [IANAADFAM]
+              IANA, "Address Family Numbers",
+              <http://www.iana.org/assignments/address-family-numbers>.
 
+   [RFC0791]  Postel, J., "Internet Protocol", STD 5, RFC 791,
+              September 1981.
 
+   [RFC0793]  Postel, J., "Transmission Control Protocol", STD 7,
+              RFC 793, September 1981.
 
+   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
+              Requirement Levels", BCP 14, RFC 2119, March 1997.
 
+   [RFC3492]  Costello, A., "Punycode: A Bootstring encoding of Unicode
+              for Internationalized Domain Names in Applications
+              (IDNA)", RFC 3492, March 2003.
 
 
 
 
 
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 144]
+Fajardo, et al.              Standards Track                  [Page 142]
 
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
-14.  References
-
-14.1.  Normative References
-
-   [FLOATPOINT]
-              Institute of Electrical and Electronics Engineers, "IEEE
-              Standard for Binary Floating-Point Arithmetic, ANSI/IEEE
-              Standard 754-1985", August 1985.
+RFC 6733                 Diameter Base Protocol             October 2012
 
-   [IANAADFAM]
-              IANA,, "Address Family Numbers",
-               http://www.iana.org/assignments/address-family-numbers.
 
-   [RADTYPE]  IANA,, "RADIUS Types",
-               http://www.iana.org/assignments/radius-types.
+   [RFC3539]  Aboba, B. and J. Wood, "Authentication, Authorization and
+              Accounting (AAA) Transport Profile", RFC 3539, June 2003.
 
-   [RFC791]   Postel, J., "Internet Protocol", RFC 791, September 1981.
+   [RFC3629]  Yergeau, F., "UTF-8, a transformation format of ISO
+              10646", STD 63, RFC 3629, November 2003.
 
-   [RFC793]   Postel, J., "Transmission Control Protocol", RFC 793,
-              January 1981.
+   [RFC3958]  Daigle, L. and A. Newton, "Domain-Based Application
+              Service Location Using SRV RRs and the Dynamic Delegation
+              Discovery Service (DDDS)", RFC 3958, January 2005.
 
-   [RFC3539]  Aboba, B. and J. Wood, "Authentication, Authorization and
-              Accounting (AAA) Transport Profile", RFC 3539, June 2003.
+   [RFC3986]  Berners-Lee, T., Fielding, R., and L. Masinter, "Uniform
+              Resource Identifier (URI): Generic Syntax", STD 66,
+              RFC 3986, January 2005.
 
    [RFC4004]  Calhoun, P., Johansson, T., Perkins, C., Hiller, T., and
               P. McCann, "Diameter Mobile IPv4 Application", RFC 4004,
@@ -8101,51 +7982,44 @@ Internet-Draft           Diameter Base Protocol             January 2011
               Loughney, "Diameter Credit-Control Application", RFC 4006,
               August 2005.
 
-   [RFC5234]  Crocker, D. and P. Overell, "Augmented BNF for Syntax
-              Specifications: ABNF", STD 68, RFC 5234, January 2008.
-
-   [RFC3588]  Calhoun, P., Loughney, J., Guttman, E., Zorn, G., and J.
-              Arkko, "Diameter Base Protocol", RFC 3588, September 2003.
+   [RFC4086]  Eastlake, D., Schiller, J., and S. Crocker, "Randomness
+              Requirements for Security", BCP 106, RFC 4086, June 2005.
 
-   [RFC5226]  Narten, T. and H. Alvestrand, "Guidelines for Writing an
-              IANA Considerations Section in RFCs", BCP 26, RFC 5226,
-              May 2008.
+   [RFC4282]  Aboba, B., Beadles, M., Arkko, J., and P. Eronen, "The
+              Network Access Identifier", RFC 4282, December 2005.
 
    [RFC4291]  Hinden, R. and S. Deering, "IP Version 6 Addressing
               Architecture", RFC 4291, February 2006.
 
+   [RFC4960]  Stewart, R., "Stream Control Transmission Protocol",
+              RFC 4960, September 2007.
 
+   [RFC5226]  Narten, T. and H. Alvestrand, "Guidelines for Writing an
+              IANA Considerations Section in RFCs", BCP 26, RFC 5226,
+              May 2008.
 
-Fajardo, et al.           Expires July 24, 2011               [Page 145]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
+   [RFC5234]  Crocker, D. and P. Overell, "Augmented BNF for Syntax
+              Specifications: ABNF", STD 68, RFC 5234, January 2008.
 
-   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
-              Requirement Levels", BCP 14, RFC 2119, March 1997.
+   [RFC5246]  Dierks, T. and E. Rescorla, "The Transport Layer Security
+              (TLS) Protocol Version 1.2", RFC 5246, August 2008.
 
-   [RFC4282]  Aboba, B., Beadles, M., Arkko, J., and P. Eronen, "The
-              Network Access Identifier", RFC 4282, December 2005.
 
-   [RFC4086]  Eastlake, D., Schiller, J., and S. Crocker, "Randomness
-              Requirements for Security", BCP 106, RFC 4086, June 2005.
 
-   [RFC4960]  Stewart, R., "Stream Control Transmission Protocol",
-              RFC 4960, September 2007.
 
-   [RFC3958]  Daigle, L. and A. Newton, "Domain-Based Application
-              Service Location Using SRV RRs and the Dynamic Delegation
-              Discovery Service (DDDS)", RFC 3958, January 2005.
+Fajardo, et al.              Standards Track                  [Page 143]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
-   [RFC5246]  Dierks, T. and E. Rescorla, "The Transport Layer Security
-              (TLS) Protocol Version 1.2", RFC 5246, August 2008.
 
-   [RFC3986]  Berners-Lee, T., Fielding, R., and L. Masinter, "Uniform
-              Resource Identifier (URI): Generic Syntax", STD 66,
-              RFC 3986, January 2005.
+   [RFC5280]  Cooper, D., Santesson, S., Farrell, S., Boeyen, S.,
+              Housley, R., and W. Polk, "Internet X.509 Public Key
+              Infrastructure Certificate and Certificate Revocation List
+              (CRL) Profile", RFC 5280, May 2008.
 
-   [RFC3629]  Yergeau, F., "UTF-8, a transformation format of ISO
-              10646", STD 63, RFC 3629, November 2003.
+   [RFC5729]  Korhonen, J., Jones, M., Morand, L., and T. Tsou,
+              "Clarifications on the Routing of Diameter Requests Based
+              on the Username and the Realm", RFC 5729, December 2009.
 
    [RFC5890]  Klensin, J., "Internationalized Domain Names for
               Applications (IDNA): Definitions and Document Framework",
@@ -8154,103 +8028,120 @@ Internet-Draft           Diameter Base Protocol             January 2011
    [RFC5891]  Klensin, J., "Internationalized Domain Names in
               Applications (IDNA): Protocol", RFC 5891, August 2010.
 
-   [RFC3492]  Costello, A., "Punycode: A Bootstring encoding of Unicode
-              for Internationalized Domain Names in Applications
-              (IDNA)", RFC 3492, March 2003.
-
-   [RFC5729]  Korhonen, J., Jones, M., Morand, L., and T. Tsou,
-              "Clarifications on the Routing of Diameter Requests Based
-              on the Username and the Realm", RFC 5729, December 2009.
-
-   [RFC4347]  Rescorla, E. and N. Modadugu, "Datagram Transport Layer
-              Security", RFC 4347, April 2006.
-
    [RFC6083]  Tuexen, M., Seggelmann, R., and E. Rescorla, "Datagram
               Transport Layer Security (DTLS) for Stream Control
               Transmission Protocol (SCTP)", RFC 6083, January 2011.
 
+   [RFC6347]  Rescorla, E. and N. Modadugu, "Datagram Transport Layer
+              Security Version 1.2", RFC 6347, January 2012.
 
+   [RFC6408]  Jones, M., Korhonen, J., and L. Morand, "Diameter
+              Straightforward-Naming Authority Pointer (S-NAPTR) Usage",
+              RFC 6408, November 2011.
 
+14.2.  Informative References
 
-Fajardo, et al.           Expires July 24, 2011               [Page 146]
-
-Internet-Draft           Diameter Base Protocol             January 2011
+   [ENTERPRISE]  IANA, "SMI Network Management Private Enterprise
+                 Codes",
+                 <http://www.iana.org/assignments/enterprise-numbers>.
 
+   [IANATCV]     IANA, "Termination-Cause AVP Values (code 295)",
+                 <http://www.iana.org/assignments/aaa-parameters/
+                 aaa-parameters.xml#aaa-parameters-16>.
 
-14.2.  Informational References
+   [RFC1492]     Finseth, C., "An Access Control Protocol, Sometimes
+                 Called TACACS", RFC 1492, July 1993.
 
-   [RFC2989]  Aboba, B., Calhoun, P., Glass, S., Hiller, T., McCann, P.,
-              Shiino, H., Walsh, P., Zorn, G., Dommety, G., Perkins, C.,
-              Patil, B., Mitton, D., Manning, S., Beadles, M., Chen, X.,
-              Sivalingham, S., Hameed, A., Munson, M., Jacobs, S., Lim,
-              B., Hirschman, B., Hsu, R., Koo, H., Lipford, M.,
-              Campbell, E., Xu, Y., Baba, S., and E. Jaques, "Criteria
-              for Evaluating AAA Protocols for Network Access",
-              RFC 2989, November 2000.
+   [RFC1661]     Simpson, W., "The Point-to-Point Protocol (PPP)",
+                 STD 51, RFC 1661, July 1994.
 
-   [RFC2975]  Aboba, B., Arkko, J., and D. Harrington, "Introduction to
-              Accounting Management", RFC 2975, October 2000.
+   [RFC2104]     Krawczyk, H., Bellare, M., and R. Canetti, "HMAC:
+                 Keyed-Hashing for Message Authentication", RFC 2104,
+                 February 1997.
 
-   [RFC3232]  Reynolds, J., "Assigned Numbers: RFC 1700 is Replaced by
-              an On-line Database", RFC 3232, January 2002.
 
-   [RFC5176]  Chiba, M., Dommety, G., Eklund, M., Mitton, D., and B.
-              Aboba, "Dynamic Authorization Extensions to Remote
-              Authentication Dial In User Service (RADIUS)", RFC 5176,
-              January 2008.
 
-   [RFC1661]  Simpson, W., "The Point-to-Point Protocol (PPP)", STD 51,
-              RFC 1661, July 1994.
 
-   [RFC2866]  Rigney, C., "RADIUS Accounting", RFC 2866, June 2000.
 
-   [RFC2869]  Rigney, C., Willats, W., and P. Calhoun, "RADIUS
-              Extensions", RFC 2869, June 2000.
+Fajardo, et al.              Standards Track                  [Page 144]
+
+RFC 6733                 Diameter Base Protocol             October 2012
 
-   [RFC2865]  Rigney, C., Willens, S., Rubens, A., and W. Simpson,
-              "Remote Authentication Dial In User Service (RADIUS)",
-              RFC 2865, June 2000.
 
-   [RFC3162]  Aboba, B., Zorn, G., and D. Mitton, "RADIUS and IPv6",
-              RFC 3162, August 2001.
+   [RFC2782]     Gulbrandsen, A., Vixie, P., and L. Esibov, "A DNS RR
+                 for specifying the location of services (DNS SRV)",
+                 RFC 2782, February 2000.
 
-   [RFC4301]  Kent, S. and K. Seo, "Security Architecture for the
-              Internet Protocol", RFC 4301, December 2005.
+   [RFC2865]     Rigney, C., Willens, S., Rubens, A., and W. Simpson,
+                 "Remote Authentication Dial In User Service (RADIUS)",
+                 RFC 2865, June 2000.
 
-   [RFC5905]  Mills, D., Martin, J., Burbank, J., and W. Kasch, "Network
-              Time Protocol Version 4: Protocol and Algorithms
-              Specification", RFC 5905, June 2010.
+   [RFC2866]     Rigney, C., "RADIUS Accounting", RFC 2866, June 2000.
 
-   [RFC1492]  Finseth, C., "An Access Control Protocol, Sometimes Called
-              TACACS", RFC 1492, July 1993.
+   [RFC2869]     Rigney, C., Willats, W., and P. Calhoun, "RADIUS
+                 Extensions", RFC 2869, June 2000.
 
-   [RFC4690]  Klensin, J., Faltstrom, P., Karp, C., and IAB, "Review and
+   [RFC2881]     Mitton, D. and M. Beadles, "Network Access Server
+                 Requirements Next Generation (NASREQNG) NAS Model",
+                 RFC 2881, July 2000.
 
+   [RFC2975]     Aboba, B., Arkko, J., and D. Harrington, "Introduction
+                 to Accounting Management", RFC 2975, October 2000.
 
+   [RFC2989]     Aboba, B., Calhoun, P., Glass, S., Hiller, T., McCann,
+                 P., Shiino, H., Walsh, P., Zorn, G., Dommety, G.,
+                 Perkins, C., Patil, B., Mitton, D., Manning, S.,
+                 Beadles, M., Chen, X., Sivalingham, S., Hameed, A.,
+                 Munson, M., Jacobs, S., Lim, B., Hirschman, B., Hsu,
+                 R., Koo, H., Lipford, M., Campbell, E., Xu, Y., Baba,
+                 S., and E. Jaques, "Criteria for Evaluating AAA
+                 Protocols for Network Access", RFC 2989, November 2000.
 
-Fajardo, et al.           Expires July 24, 2011               [Page 147]
-
-Internet-Draft           Diameter Base Protocol             January 2011
+   [RFC3162]     Aboba, B., Zorn, G., and D. Mitton, "RADIUS and IPv6",
+                 RFC 3162, August 2001.
 
+   [RFC3748]     Aboba, B., Blunk, L., Vollbrecht, J., Carlson, J., and
+                 H. Levkowetz, "Extensible Authentication Protocol
+                 (EAP)", RFC 3748, June 2004.
 
-              Recommendations for Internationalized Domain Names
-              (IDNs)", RFC 4690, September 2006.
+   [RFC4301]     Kent, S. and K. Seo, "Security Architecture for the
+                 Internet Protocol", RFC 4301, December 2005.
 
-   [RFC5461]  Gont, F., "TCP's Reaction to Soft Errors", RFC 5461,
-              February 2009.
+   [RFC4690]     Klensin, J., Faltstrom, P., Karp, C., and IAB, "Review
+                 and Recommendations for Internationalized Domain Names
+                 (IDNs)", RFC 4690, September 2006.
 
-   [RFC5927]  Gont, F., "ICMP Attacks against TCP", RFC 5927, July 2010.
+   [RFC5176]     Chiba, M., Dommety, G., Eklund, M., Mitton, D., and B.
+                 Aboba, "Dynamic Authorization Extensions to Remote
+                 Authentication Dial In User Service (RADIUS)",
+                 RFC 5176, January 2008.
 
-   [RFC3692]  Narten, T., "Assigning Experimental and Testing Numbers
-              Considered Useful", BCP 82, RFC 3692, January 2004.
 
 
 
+Fajardo, et al.              Standards Track                  [Page 145]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
 
+   [RFC5461]     Gont, F., "TCP's Reaction to Soft Errors", RFC 5461,
+                 February 2009.
 
+   [RFC5905]     Mills, D., Martin, J., Burbank, J., and W. Kasch,
+                 "Network Time Protocol Version 4: Protocol and
+                 Algorithms Specification", RFC 5905, June 2010.
 
+   [RFC5927]     Gont, F., "ICMP Attacks against TCP", RFC 5927,
+                 July 2010.
 
+   [RFC6335]     Cotton, M., Eggert, L., Touch, J., Westerlund, M., and
+                 S. Cheshire, "Internet Assigned Numbers Authority
+                 (IANA) Procedures for the Management of the Service
+                 Name and Transport Protocol Port Number Registry",
+                 BCP 165, RFC 6335, August 2011.
 
+   [RFC6737]     Kang, J. and G. Zorn, "The Diameter Capabilities Update
+                 Application", RFC 6737, October 2012.
 
 
 
@@ -8284,80 +8175,83 @@ Internet-Draft           Diameter Base Protocol             January 2011
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 148]
+Fajardo, et al.              Standards Track                  [Page 146]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 Appendix A.  Acknowledgements
 
-A.1.  RFC3588bis
+A.1.  This Document
 
    The authors would like to thank the following people that have
    provided proposals and contributions to this document:
 
    To Vishnu Ram and Satendra Gera for their contributions on
-   Capabilities Updates, Predictive Loop Avoidance as well as many other
-   technical proposals.  To Tolga Asveren for his insights and
+   capabilities updates, predictive loop avoidance, as well as many
+   other technical proposals.  To Tolga Asveren for his insights and
    contributions on almost all of the proposed solutions incorporated
-   into this document.  To Timothy Smith for helping on the Capabilities
-   Updates and other topics.  To Tony Zhang for providing fixes to loop
-   holes on composing Failed-AVPs as well as many other issues and
+   into this document.  To Timothy Smith for helping on the capabilities
+   Update and other topics.  To Tony Zhang for providing fixes to
+   loopholes on composing Failed-AVPs as well as many other issues and
    topics.  To Jan Nordqvist for clearly stating the usage of
-   Application Ids. To Anders Kristensen for providing needed technical
+   Application Ids.  To Anders Kristensen for providing needed technical
    opinions.  To David Frascone for providing invaluable review of the
    document.  To Mark Jones for providing clarifying text on vendor
-   command codes and other vendor specific indicators.
+   command codes and other vendor-specific indicators.  To Victor
+   Pascual and Sebastien Decugis for new text and recommendations on
+   SCTP/DTLS.  To Jouni Korhonen for taking over the editing task and
+   resolving last bits from versions 27 through 29.
 
-   Special thanks to the Diameter extensibility design team which helped
-   resolve the tricky question of mandatory AVPs and ABNF semantics.
-   The members of this team are as follows:
+   Special thanks to the Diameter extensibility design team, which
+   helped resolve the tricky question of mandatory AVPs and ABNF
+   semantics.  The members of this team are as follows:
 
    Avi Lior, Jari Arkko, Glen Zorn, Lionel Morand, Mark Jones, Tolga
-   Asveren Jouni Korhonen, Glenn McGregor.
+   Asveren, Jouni Korhonen, and Glenn McGregor.
 
    Special thanks also to people who have provided invaluable comments
    and inputs especially in resolving controversial issues:
 
-   Glen Zorn, Yoshihiro Ohba, Marco Stura, and Pasi Eronen.
+   Glen Zorn, Yoshihiro Ohba, Marco Stura, Stephen Farrel, Pete Resnick,
+   Peter Saint-Andre, Robert Sparks, Krishna Prasad, Sean Turner, Barry
+   Leiba, and Pasi Eronen.
 
    Finally, we would like to thank the original authors of this
    document:
 
-   Pat Calhoun, John Loughney, Jari Arkko, Erik Guttman and Glen Zorn.
+   Pat Calhoun, John Loughney, Jari Arkko, Erik Guttman, and Glen Zorn.
 
    Their invaluable knowledge and experience has given us a robust and
    flexible AAA protocol that many people have seen great value in
    adopting.  We greatly appreciate their support and stewardship for
    the continued improvements of Diameter as a protocol.  We would also
    like to extend our gratitude to folks aside from the authors who have
-   assisted and contributed to the original version of this document.
-   Their efforts significantly contributed to the success of Diameter.
-
 
 
 
 
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 149]
+Fajardo, et al.              Standards Track                  [Page 147]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
-A.2.  RFC3588
+   assisted and contributed to the original version of this document.
+   Their efforts significantly contributed to the success of Diameter.
+
+A.2.  RFC 3588
 
    The authors would like to thank Nenad Trifunovic, Tony Johansson and
    Pankaj Patel for their participation in the pre-IETF Document Reading
-   Party.  Allison Mankin, Jonathan Wood and Bernard Aboba provided
-   invaluable assistance in working out transport issues, and similarly
-   with Steven Bellovin in the security area.
+   Party.  Allison Mankin, Jonathan Wood, and Bernard Aboba provided
+   invaluable assistance in working out transport issues and this was
+   also the case with Steven Bellovin in the security area.
 
    Paul Funk and David Mitton were instrumental in getting the Peer
    State Machine correct, and our deep thanks go to them for their time.
 
    Text in this document was also provided by Paul Funk, Mark Eklund,
-   Mark Jones and Dave Spence.  Jacques Caron provided many great
+   Mark Jones, and Dave Spence.  Jacques Caron provided many great
    comments as a result of a thorough review of the spec.
 
    The authors would also like to acknowledge the following people for
@@ -8367,96 +8261,57 @@ A.2.  RFC3588
    David Frascone, Daniel C. Fox, Lol Grant, Ignacio Goyret, Nancy
    Greene, Peter Heitman, Fredrik Johansson, Mark Jones, Martin Julien,
    Bob Kopacz, Paul Krumviede, Fergal Ladley, Ryan Moats, Victor Muslin,
-   Kenneth Peirce, John Schnizlein, Sumit Vakil, John R. Vollbrecht and
+   Kenneth Peirce, John Schnizlein, Sumit Vakil, John R. Vollbrecht, and
    Jeff Weisberg.
 
    Finally, Pat Calhoun would like to thank Sun Microsystems since most
    of the effort put into this document was done while he was in their
    employ.
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 150]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
 Appendix B.  S-NAPTR Example
 
    As an example, consider a client that wishes to resolve aaa:
-   example1.com.  The client performs a NAPTR query for that domain, and
-   the following NAPTR records are returned:
+   ex1.example.com.  The client performs a NAPTR query for that domain,
+   and the following NAPTR records are returned:
 
     ;;        order pref flags service   regexp replacement
     IN NAPTR  50    50   "s"   "aaa:diameter.tls.tcp" ""
-                 _diameter._tls.example1.com
+                 _diameter._tls.ex1.example.com
     IN NAPTR  100   50   "s"   "aaa:diameter.tcp"     ""
-                 _aaa._tcp.example1.com
+                 _aaa._tcp.ex1.example.com
     IN NAPTR  150   50   "s"   "aaa:diameter.sctp"    ""
-                 _diameter._sctp.example1.com
+                 _diameter._sctp.ex1.example.com
 
-   This indicates that the server supports TLS, TCP and SCTP in that
+   This indicates that the server supports TLS, TCP, and SCTP in that
    order.  If the client supports TLS, TLS will be used, targeted to a
-   host determined by an SRV lookup of _diameter._tls.example1.com.
+
+
+
+Fajardo, et al.              Standards Track                  [Page 148]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
+   host determined by an SRV lookup of _diameter._tls.ex1.example.com.
    That lookup would return:
 
     ;;       Priority  Weight  Port    Target
-    IN SRV   0         1       5060    server1.example1.com
-    IN SRV   0         2       5060    server2.example1.com
+    IN SRV   0         1       5060    server1.ex1.example.com
+    IN SRV   0         2       5060    server2.ex1.example.com
 
    As an alternative example, a client that wishes to resolve aaa:
-   example2.com.  The client performs a NAPTR query for that domain, and
-   the following NAPTR records are returned:
+   ex2.example.com.  The client performs a NAPTR query for that domain,
+   and the following NAPTR records are returned:
 
     ;;        order pref flags service   regexp replacement
     IN NAPTR  150   50   "a"   "aaa:diameter.tls.tcp"  ""
-                 server1.example2.com
+                 server1.ex2.example.com
     IN NAPTR  150   50   "a"   "aaa:diameter.tls.tcp"  ""
-                 server2.example2.com
+                 server2.ex2.example.com
 
    This indicates that the server supports TCP available at the returned
    host names.
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 151]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
 Appendix C.  Duplicate Detection
 
    As described in Section 9.4, accounting record duplicate detection is
@@ -8464,14 +8319,14 @@ Appendix C.  Duplicate Detection
    reasons:
 
    o  Failover to an alternate server.  Where close to real-time
-      performance is required, failover thresholds need to be kept low
-      and this may lead to an increased likelihood of duplicates.
-      Failover can occur at the client or within Diameter agents.
-
-   o  Failure of a client or agent after sending of a record from non-
-      volatile memory, but prior to receipt of an application layer ACK
-      and deletion of the record. record to be sent.  This will result
-      in retransmission of the record soon after the client or agent has
+      performance is required, failover thresholds need to be kept low.
+      This may lead to an increased likelihood of duplicates.  Failover
+      can occur at the client or within Diameter agents.
+
+   o  Failure of a client or agent after sending a record from non-
+      volatile memory, but prior to receipt of an application-layer ACK
+      and deletion of the record to be sent.  This will result in
+      retransmission of the record soon after the client or agent has
       rebooted.
 
    o  Duplicates received from RADIUS gateways.  Since the
@@ -8481,48 +8336,48 @@ Appendix C.  Duplicate Detection
 
    o  Implementation problems and misconfiguration.
 
-   The T flag is used as an indication of an application layer
+   The T flag is used as an indication of an application-layer
    retransmission event, e.g., due to failover to an alternate server.
    It is defined only for request messages sent by Diameter clients or
    agents.  For instance, after a reboot, a client may not know whether
+
+
+
+Fajardo, et al.              Standards Track                  [Page 149]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
    it has already tried to send the accounting records in its non-
    volatile memory before the reboot occurred.  Diameter servers MAY use
    the T flag as an aid when processing requests and detecting duplicate
    messages.  However, servers that do this MUST ensure that duplicates
    are found even when the first transmitted request arrives at the
    server after the retransmitted request.  It can be used only in cases
-   where no answer has been received from the Server for a request and
+   where no answer has been received from the server for a request and
    the request is sent again, (e.g., due to a failover to an alternate
    peer, due to a recovered primary peer or due to a client re-sending a
    stored record from non-volatile memory such as after reboot of a
    client or agent).
 
-   In some cases the Diameter accounting server can delay the duplicate
+   In some cases, the Diameter accounting server can delay the duplicate
    detection and accounting record processing until a post-processing
    phase takes place.  At that time records are likely to be sorted
    according to the included User-Name and duplicate elimination is easy
-   in this case.  In other situations it may be necessary to perform
+   in this case.  In other situations, it may be necessary to perform
    real-time duplicate detection, such as when credit limits are imposed
    or real-time fraud detection is desired.
 
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 152]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
    In general, only generation of duplicates due to failover or re-
    sending of records in non-volatile storage can be reliably detected
-   by Diameter clients or agents.  In such cases the Diameter client or
-   agents can mark the message as possible duplicate by setting the T
+   by Diameter clients or agents.  In such cases, the Diameter client or
+   agents can mark the message as a possible duplicate by setting the T
    flag.  Since the Diameter server is responsible for duplicate
-   detection, it can choose to make use of the T flag or not, in order
-   to optimize duplicate detection.  Since the T flag does not affect
-   interoperability, and may not be needed by some servers, generation
-   of the T flag is REQUIRED for Diameter clients and agents, but MAY be
-   implemented by Diameter servers.
+   detection, it can choose whether or not to make use of the T flag, in
+   order to optimize duplicate detection.  Since the T flag does not
+   affect interoperability, and it may not be needed by some servers,
+   generation of the T flag is REQUIRED for Diameter clients and agents,
+   but it MAY be implemented by Diameter servers.
 
    As an example, it can be usually be assumed that duplicates appear
    within a time window of longest recorded network partition or device
@@ -8535,40 +8390,39 @@ Internet-Draft           Diameter Base Protocol             January 2011
    The following is an example of how the T flag may be used by the
    server to detect duplicate requests.
 
-
       A Diameter server MAY check the T flag of the received message to
       determine if the record is a possible duplicate.  If the T flag is
       set in the request message, the server searches for a duplicate
       within a configurable duplication time window backward and
       forward.  This limits database searching to those records where
-      the T flag is set.  In a well run network, network partitions and
+      the T flag is set.  In a well-run network, network partitions and
+
+
+
+Fajardo, et al.              Standards Track                  [Page 150]
+
+RFC 6733                 Diameter Base Protocol             October 2012
+
+
       device faults will presumably be rare events, so this approach
       represents a substantial optimization of the duplicate detection
       process.  During failover, it is possible for the original record
-      to be received after the T flag marked record, due to differences
+      to be received after the T-flag-marked record, due to differences
       in network delays experienced along the path by the original and
       duplicate transmissions.  The likelihood of this occurring
       increases as the failover interval is decreased.  In order to be
-      able to detect out of order duplicates, the Diameter server should
-      use backward and forward time windows when performing duplicate
-      checking for the T flag marked request.  For example, in order to
-      allow time for the original record to exit the network and be
-      recorded by the accounting server, the Diameter server can delay
-      processing records with the T flag set until a time period
-      TIME_WAIT + RECORD_PROCESSING_TIME has elapsed after the closing
-      of the original transport connection.  After this time period has
-      expired, then it may check the T flag marked records against the
+      able to detect duplicates that are out of order, the Diameter
+      server should use backward and forward time windows when
+      performing duplicate checking for the T-flag-marked request.  For
+      example, in order to allow time for the original record to exit
+      the network and be recorded by the accounting server, the Diameter
+      server can delay processing records with the T flag set until a
+      time period TIME_WAIT + RECORD_PROCESSING_TIME has elapsed after
+      the closing of the original transport connection.  After this time
+      period, it may check the T-flag-marked records against the
       database with relative assurance that the original records, if
       sent, have been received and recorded.
 
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 153]
-
-Internet-Draft           Diameter Base Protocol             January 2011
-
-
 Appendix D.  Internationalized Domain Names
 
    To be compatible with the existing DNS infrastructure and simplify
@@ -8579,14 +8433,7 @@ Appendix D.  Internationalized Domain Names
    recommendations in [RFC4690] and [RFC5890].  Applications that
    provide support for IDNs outside of the Diameter protocol but
    interacting with it SHOULD use the representation and conversion
-   framework described in [RFC5890], [RFC5891] and [RFC3492].
-
-
-
-
-
-
-
+   framework described in [RFC5890], [RFC5891], and [RFC3492].
 
 
 
@@ -8608,21 +8455,9 @@ Appendix D.  Internationalized Domain Names
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-Fajardo, et al.           Expires July 24, 2011               [Page 154]
+Fajardo, et al.              Standards Track                  [Page 151]
 
-Internet-Draft           Diameter Base Protocol             January 2011
+RFC 6733                 Diameter Base Protocol             October 2012
 
 
 Authors' Addresses
@@ -8634,7 +8469,7 @@ Authors' Addresses
    USA
 
    Phone: +1-908-421-1845
-   Email: [email protected]
+   EMail: [email protected]
 
 
    Jari Arkko
@@ -8643,7 +8478,7 @@ Authors' Addresses
    Finland
 
    Phone: +358 40 5079256
-   Email: [email protected]
+   EMail: [email protected]
 
 
    John Loughney
@@ -8653,17 +8488,17 @@ Authors' Addresses
    US
 
    Phone: +1-650-283-8068
-   Email: [email protected]
+   EMail: [email protected]
 
 
-   Glenn Zorn
+   Glen Zorn (editor)
    Network Zen
-   1310 East Thomas Street
-   Seattle, WA  98102
-   US
+   227/358 Thanon Sanphawut
+   Bang Na, Bangkok  10260
+   Thailand
 
-   Phone:
-   Email: [email protected]
+   Phone: +66 (0) 87-0404617
+   EMail: [email protected]
 
 
 
@@ -8676,6 +8511,5 @@ Authors' Addresses
 
 
 
-Fajardo, et al.           Expires July 24, 2011               [Page 155]
+Fajardo, et al.              Standards Track                  [Page 152]
 
-
diff --git a/lib/diameter/doc/standard/rfc6737.txt b/lib/diameter/doc/standard/rfc6737.txt
new file mode 100644
index 0000000000..50aa33e98f
--- /dev/null
+++ b/lib/diameter/doc/standard/rfc6737.txt
@@ -0,0 +1,339 @@
+
+
+
+
+
+
+Internet Engineering Task Force (IETF)                           K. Jiao
+Request for Comments: 6737                                        Huawei
+Category: Standards Track                                        G. Zorn
+ISSN: 2070-1721                                              Network Zen
+                                                            October 2012
+
+
+              The Diameter Capabilities Update Application
+
+Abstract
+
+   This document defines a new Diameter application and associated
+   Command Codes.  The Capabilities Update application is intended to
+   allow the dynamic update of certain Diameter peer capabilities while
+   the peer-to-peer connection is in the open state.
+
+Status of This Memo
+
+   This is an Internet Standards Track document.
+
+   This document is a product of the Internet Engineering Task Force
+   (IETF).  It represents the consensus of the IETF community.  It has
+   received public review and has been approved for publication by the
+   Internet Engineering Steering Group (IESG).  Further information on
+   Internet Standards is available in Section 2 of RFC 5741.
+
+   Information about the current status of this document, any errata,
+   and how to provide feedback on it may be obtained at
+   http://www.rfc-editor.org/info/rfc6737.
+
+Copyright Notice
+
+   Copyright (c) 2012 IETF Trust and the persons identified as the
+   document authors.  All rights reserved.
+
+   This document is subject to BCP 78 and the IETF Trust's Legal
+   Provisions Relating to IETF Documents
+   (http://trustee.ietf.org/license-info) in effect on the date of
+   publication of this document.  Please review these documents
+   carefully, as they describe your rights and restrictions with respect
+   to this document.  Code Components extracted from this document must
+   include Simplified BSD License text as described in Section 4.e of
+   the Trust Legal Provisions and are provided without warranty as
+   described in the Simplified BSD License.
+
+
+
+
+
+
+
+Jiao & Zorn                  Standards Track                    [Page 1]
+
+RFC 6737              Diameter Capabilities Update          October 2012
+
+
+Table of Contents
+
+   1.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . . . 2
+   2.  Specification of Requirements . . . . . . . . . . . . . . . . . 2
+   3.  Diameter Protocol Considerations  . . . . . . . . . . . . . . . 3
+   4.  Capabilities Update . . . . . . . . . . . . . . . . . . . . . . 3
+     4.1.  Command Code Values . . . . . . . . . . . . . . . . . . . . 4
+       4.1.1.  Capabilities-Update-Request . . . . . . . . . . . . . . 4
+       4.1.2.  Capabilities-Update-Answer  . . . . . . . . . . . . . . 5
+   5.  Security Considerations . . . . . . . . . . . . . . . . . . . . 5
+   6.  IANA Considerations . . . . . . . . . . . . . . . . . . . . . . 5
+     6.1.  Application Identifier  . . . . . . . . . . . . . . . . . . 5
+     6.2.  Command Codes . . . . . . . . . . . . . . . . . . . . . . . 5
+   7.  Contributors  . . . . . . . . . . . . . . . . . . . . . . . . . 5
+   8.  Acknowledgements  . . . . . . . . . . . . . . . . . . . . . . . 5
+   9.  References  . . . . . . . . . . . . . . . . . . . . . . . . . . 6
+     9.1.  Normative References  . . . . . . . . . . . . . . . . . . . 6
+     9.2.  Informative References  . . . . . . . . . . . . . . . . . . 6
+
+1.  Introduction
+
+   Capabilities exchange is an important component of the Diameter base
+   protocol [RFC6733], allowing peers to exchange identities and
+   Diameter capabilities (protocol version number, supported Diameter
+   applications, security mechanisms, etc.).  As defined in RFC 3588,
+   however, the capabilities exchange process takes place only once, at
+   the inception of a transport connection between a given pair of
+   peers.  Therefore, if a peer's capabilities change (due to a software
+   update, for example), the existing connection(s) must be torn down
+   (along with all of the associated user sessions) and restarted before
+   the modified capabilities can be advertised.
+
+   This document defines a new Diameter application intended to allow
+   the dynamic update of a subset of Diameter peer capabilities over an
+   existing connection.  Because the Capabilities Update application
+   specified herein operates over an existing transport connection,
+   modification of certain capabilities is prohibited.  Specifically,
+   modifying the security mechanism in use is not allowed; if the
+   security method used between a pair of peers is changed, the affected
+   connection MUST be restarted.
+
+2.  Specification of Requirements
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described in RFC 2119 [RFC2119].
+
+
+
+
+
+Jiao & Zorn                  Standards Track                    [Page 2]
+
+RFC 6737              Diameter Capabilities Update          October 2012
+
+
+3.  Diameter Protocol Considerations
+
+   This section details the relationship of the Diameter Capabilities
+   Update application to the Diameter base protocol.
+
+   This document specifies Diameter Application-Id 10.  Diameter nodes
+   conforming to this specification MUST advertise support by including
+   the value 10 in the Auth-Application-Id of the Capabilities-Exchange-
+   Request (CER) and Capabilities-Exchange-Answer (CEA) commands
+   [RFC6733].
+
+4.  Capabilities Update
+
+   When the capabilities of a Diameter node conforming to this
+   specification change, the node MUST notify all of the nodes with
+   which it has an open transport connection and which have also
+   advertised support for the Capabilities Update application using the
+   Capabilities-Update-Request (CUR) message (Section 4.1.1).  This
+   message allows the update of a peer's capabilities (supported
+   Diameter applications, etc.).
+
+   A Diameter node only issues a given command to those peers that have
+   advertised support for the Diameter application that defines the
+   command; a Diameter node must cache the supported applications in
+   order to ensure that unrecognized commands and/or Attribute-Value
+   Pairs (AVPs) are not unnecessarily sent to a peer.
+
+   The receiver of the CUR MUST determine common applications by
+   computing the intersection of its own set of supported Application
+   Ids against all of the Application-Id AVPs (Auth-Application-Id,
+   Acct-Application-Id, and Vendor-Specific-Application-Id) present in
+   the CUR.  The value of the Vendor-Id AVP in the Vendor-Specific-
+   Application-Id MUST NOT be used during computation.
+
+   If the receiver of a CUR does not have any applications in common
+   with the sender, then it MUST return a Capabilities-Update-Answer
+   (CUA) (Section 4.1.2) with the Result-Code AVP set to
+   DIAMETER_NO_COMMON_APPLICATION [RFC6733], and it SHOULD disconnect
+   the transport-layer connection.  However, if active sessions are
+   using the connection, peers MAY delay disconnection until the
+   sessions can be redirected or gracefully terminated.  Note that
+   receiving a CUA from a peer advertising itself as a relay (see
+   [RFC6733], Section 2.4) MUST be interpreted as having common
+   applications with the peer.
+
+   As for CER/CEA messages, the CUR and CUA messages MUST NOT be
+   proxied, redirected, or relayed.
+
+
+
+
+Jiao & Zorn                  Standards Track                    [Page 3]
+
+RFC 6737              Diameter Capabilities Update          October 2012
+
+
+   Even though the CUR/CUA messages cannot be proxied, it is still
+   possible for an upstream agent to receive a message for which there
+   are no peers available to handle the application that corresponds to
+   the Command Code.  This could happen if, for example, the peers are
+   too busy or down.  In such instances, the 'E' bit MUST be set in the
+   answer message with the Result-Code AVP set to
+   DIAMETER_UNABLE_TO_DELIVER to inform the downstream peer to take
+   action (e.g., re-routing requests to an alternate peer).
+
+4.1.  Command Code Values
+
+   This section defines Command Code [RFC6733] values that MUST be
+   supported by all Diameter implementations conforming to this
+   specification.  The following Command Codes are defined in this
+   document: Capabilities-Update-Request (CUR, Section 4.1.1), and
+   Capabilities-Update-Answer (CUA, Section 4.1.2).  The Diameter
+   Command Code Format (CCF) ([RFC6733], Section 3.2) is used in the
+   definitions.
+
+4.1.1.  Capabilities-Update-Request
+
+   The Capabilities-Update-Request (CUR), indicated by the Command Code
+   set to 328 and the Command Flags' 'R' bit set, is sent to update
+   local capabilities.  Upon detection of a transport failure, this
+   message MUST NOT be sent to an alternate peer.
+
+   When Diameter is run over the Stream Control Transmission Protocol
+   (SCTP) [RFC4960], which allows connections to span multiple
+   interfaces and multiple IP addresses, the Capabilities-Update-Request
+   message MUST contain one Host-IP-Address AVP for each potential IP
+   address that may be locally used when transmitting Diameter messages.
+
+   Message Format
+
+      <CUR> ::= < Diameter Header: 328, REQ >
+                { Origin-Host }
+                { Origin-Realm }
+             1* { Host-IP-Address }
+                { Vendor-Id }
+                { Product-Name }
+                [ Origin-State-Id ]
+              * [ Supported-Vendor-Id ]
+              * [ Auth-Application-Id ]
+              * [ Acct-Application-Id ]
+              * [ Vendor-Specific-Application-Id ]
+                [ Firmware-Revision ]
+              * [ AVP ]
+
+
+
+
+Jiao & Zorn                  Standards Track                    [Page 4]
+
+RFC 6737              Diameter Capabilities Update          October 2012
+
+
+4.1.2.  Capabilities-Update-Answer
+
+   The Capabilities-Update-Answer, indicated by the Command Code set to
+   328 and the Command Flags' 'R' bit cleared, is sent in response to a
+   CUR message.
+
+                     Message Format
+
+                     <CUA> ::= < Diameter Header: 328 >
+                               { Origin-Host }
+                               { Origin-Realm }
+                               { Result-Code }
+                               [ Error-Message ]
+                             * [ AVP ]
+
+5.  Security Considerations
+
+   The security considerations applicable to the Diameter base protocol
+   [RFC6733] are also applicable to this document.
+
+6.  IANA Considerations
+
+   This section explains the criteria to be used by the IANA for
+   assignment of numbers within namespaces used within this document.
+
+6.1.  Application Identifier
+
+   This specification assigns the value 10 (Diameter Capabilities
+   Update) from the Application Identifiers namespace [RFC6733].  See
+   Section 3 for the assignment of the namespace in this specification.
+
+6.2.  Command Codes
+
+   This specification assigns the value 328 (Capabilities-Update-
+   Request/Capabilities-Update-Answer (CUR/CUA)) from the Command Codes
+   namespace [RFC6733].  See Section 4.1 for the assignment of the
+   namespace in this specification.
+
+7.  Contributors
+
+   This document is based upon work done by Tina Tsou.
+
+8.  Acknowledgements
+
+   Thanks to Sebastien Decugis, Niklas Neumann, Subash Comerica, Lionel
+   Morand, Dan Romascanu, Dan Harkins, and Ravi for helpful review and
+   discussion.
+
+
+
+
+Jiao & Zorn                  Standards Track                    [Page 5]
+
+RFC 6737              Diameter Capabilities Update          October 2012
+
+
+9.  References
+
+9.1.  Normative References
+
+   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
+              Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [RFC6733]  Fajardo, V., Arkko, J., Loughney, J., and G. Zorn,
+              "Diameter Base Protocol", RFC 6733, October 2012.
+
+9.2.  Informative References
+
+   [RFC4960]  Stewart, R., "Stream Control Transmission Protocol",
+              RFC 4960, September 2007.
+
+Authors' Addresses
+
+   Jiao Kang
+   Huawei Technologies
+   Section F1, Huawei Industrial Base
+   Bantian, Longgang District
+   Shenzhen  518129
+   P.R. China
+
+   EMail: [email protected]
+
+
+   Glen Zorn
+   Network Zen
+   227/358 Thanon Sanphawut
+   Bang Na, Bangkok  10260
+   Thailand
+
+   Phone: +66 (0) 909-201060
+   EMail: [email protected]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Jiao & Zorn                  Standards Track                    [Page 6]
+
diff --git a/lib/diameter/examples/code/peer.erl b/lib/diameter/examples/code/peer.erl
index b07cd32b98..8fdeba57bf 100644
--- a/lib/diameter/examples/code/peer.erl
+++ b/lib/diameter/examples/code/peer.erl
@@ -117,6 +117,11 @@ server(T) ->
 %%
 %% Return config for a connecting transport.
 
+client({all, LA, RA, RP}) ->
+    [[M,{K,C}], T]
+        = [client({P, LA, RA, RP}) || P <- [sctp,tcp]],
+    [M, {K,C,2000} | T];
+
 client({T, LA, RA, RP}) ->
     [{transport_module, tmod(T)},
      {transport_config, [{ip, addr(LA)},
diff --git a/lib/diameter/include/diameter.hrl b/lib/diameter/include/diameter.hrl
index 4273262015..beb577afaf 100644
--- a/lib/diameter/include/diameter.hrl
+++ b/lib/diameter/include/diameter.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -139,7 +139,6 @@
          init_state, %% option 'state', initial callback state
          id,         %% 32-bit unsigned application identifier = Dict:id()
          mutable = false, %% boolean(), do traffic callbacks modify state?
-         answer_errors = report}). %% | callback | discard
-                                   %% how to handle containing errors?
+         options = [{answer_errors, report}]}).  %% | callback | discard
 
 -endif. %% -ifdef(diameter_hrl).
diff --git a/lib/diameter/make/release_targets.mk b/lib/diameter/make/release_targets.mk
deleted file mode 100644
index 5a3b585cbc..0000000000
--- a/lib/diameter/make/release_targets.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-#
-
-ifeq ($(TOPDOC),)
-$(HTMLDIR)/index.html: $(XML_FILES)
-	date=`date +"%B %e %Y"`; \
-	$(XSLTPROC) --noout --stringparam outdir $(HTMLDIR) --stringparam docgen "$(DOCGEN)" --stringparam topdocdir "$(TOPDOCDIR)" \
-		--stringparam pdfdir "$(PDFDIR)" \
-		--stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude \
-		-path $(DOCGEN)/priv/docbuilder_dtd -path $(DOCGEN)/priv/dtd_html_entities $(DOCGEN)/priv/xsl/db_html.xsl book.xml
-endif
-
-$(HTMLDIR)/users_guide.html: $(XML_FILES)
-	date=`date +"%B %e %Y"`; \
-	$(XSLTPROC) --noout --stringparam outdir $(HTMLDIR) --stringparam docgen "$(DOCGEN)" --stringparam topdocdir "$(TOPDOCDIR)" \
-		--stringparam pdfdir "$(PDFDIR)" \
-		--stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude  \
-		-path $(DOCGEN)/priv/docbuilder_dtd -path $(DOCGEN)/priv/dtd_html_entities $(DOCGEN)/priv/xsl/db_html.xsl book.xml
-
-
-%.fo: $(XML_FILES)
-	date=`date +"%B %e %Y"`; \
-	$(XSLTPROC) --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" \
-		--stringparam appver "$(VSN)" --xinclude \
-		-path $(DOCGEN)/priv/docbuilder_dtd -path $(DOCGEN)/priv/dtd_html_entities $(DOCGEN)/priv/xsl/db_pdf.xsl book.xml > $@
-
-
-
-# ------------------------------------------------------------------------
-# The following targets just exist in the documentation directory
-# ------------------------------------------------------------------------
-ifneq ($(XML_FILES),)
-
-# ----------------------------------------------------
-# Generation of application index data
-# ----------------------------------------------------
-$(HTMLDIR)/$(APPLICATION).eix: $(XML_FILES)
-	date=`date +"%B %e %Y"`; \
-	$(XSLTPROC) --stringparam docgen "$(DOCGEN)" \
-		--stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude  \
-		-path $(DOCGEN)/priv/docbuilder_dtd -path $(DOCGEN)/priv/dtd_html_entities $(DOCGEN)/priv/xsl/db_eix.xsl book.xml >  $@ 
-
-docs:
-#docs: $(HTMLDIR)/$(APPLICATION).eix
-
-# ----------------------------------------------------
-# Local documentation target for testing 
-# ----------------------------------------------------
-local_docs: TOPDOCDIR=.
-local_docs: local_copy_of_topdefs docs
-
-local_html: TOPDOCDIR=.
-local_html: local_copy_of_topdefs html
-
-local_copy_of_topdefs:
-	$(INSTALL) $(DOCGEN)/priv/css/otp_doc.css $(HTMLDIR)
-	$(INSTALL) $(DOCGEN)/priv/images/erlang-logo.png $(HTMLDIR)
-	$(INSTALL) $(DOCGEN)/priv/images/erlang-logo.gif $(HTMLDIR)
-	$(INSTALL_DIR) $(HTMLDIR)/js/flipmenu
-	$(INSTALL) $(DOCGEN)/priv/js/flipmenu/flip_closed.gif \
-	 	$(DOCGEN)/priv/js/flipmenu/flip_open.gif \
-		$(DOCGEN)/priv/js/flipmenu/flip_static.gif \
-		$(DOCGEN)/priv/js/flipmenu/flipmenu.js $(HTMLDIR)/js/flipmenu
-
-endif
-
-# ----------------------------------------------------
-# Standard release target
-# ----------------------------------------------------
-
-ifneq ($(PREFIX),)
-
-release release_docs release_tests release_html:
-	$(MAKE) $(MFLAGS) RELEASE_PATH=$(PREFIX) $(TARGET_MAKEFILE) $@_spec 
-
-endif
diff --git a/lib/diameter/make/rules.mk.in b/lib/diameter/make/rules.mk.in
deleted file mode 100644
index cd3c297d75..0000000000
--- a/lib/diameter/make/rules.mk.in
+++ /dev/null
@@ -1,193 +0,0 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-# ----------------------------------------------------
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2009-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-
-.SUFFIXES: .erl .beam .yrl .hrl .xml .xmlsrc .html \
-        .3 .1 .pdf .fo .el .elc
-
-# ----------------------------------------------------
-#       Common macros
-# ----------------------------------------------------
-DEFAULT_TARGETS = opt debug release release_docs clean docs
-
-
-# Slash separated list of return values from $(origin VAR)
-# that are untrusted - set default in this file instead.
-# The list is not space separated since some return values
-# contain space, and we want to use $(findstring ...) to
-# search the list.
-DUBIOUS_ORIGINS = /undefined/environment/
-
-
-# # ----------------------------------------------------
-# # TARGET definition
-# # ----------------------------------------------------
-# # TARGET = @TARGET@
-# ifneq ($(OVERRIDE_TARGET),)
-# ifneq ($(TARGET), $(OVERRIDE_TARGET))
-# $(warning overriding $$(TARGET) = \
-#         "$(TARGET)" \
-#         with \
-#         $$(OVERRIDE_TARGET) = \
-#         "$(OVERRIDE_TARGET)")
-# override TARGET := $(OVERRIDE_TARGET)
-# endif
-# endif
-# 
-
-# ----------------------------------------------------
-#       Command macros
-# ----------------------------------------------------
-PREFIX          = @prefix@
-INSTALL         = @INSTALL@
-INSTALL_DIR     = @INSTALL_DIR@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT  = @INSTALL_SCRIPT@
-INSTALL_DATA    = @INSTALL_DATA@
-
-
-# ----------------------------------------------------
-#       Erlang language section
-# ----------------------------------------------------
-ERL_ROOT_DIR = @ERLANG_ROOT_DIR@
-ERL_LIB_DIR = @ERLANG_LIB_DIR@
-DOCGEN_DIR = @ERLANG_LIB_DIR_erl_docgen@
-TEST_SERVER_DIR = @ERLANG_LIB_VER_test_server@
-EMULATOR = beam
-ERL_COMPILE_FLAGS += +debug_info
-ERLC_WFLAGS = -W
-ERLC = $(ERL_ROOT_DIR)/bin/erlc $(ERLC_WFLAGS) $(ERLC_FLAGS)
-ERL = $(ERL_ROOT_DIR)/bin/erl -boot start_clean
-#ERLC = @ERLC@ $(ERLC_WFLAGS) $(ERLC_FLAGS)
-#ERL = @ERL@ -boot start_clean
-
-ifneq (,$(findstring $(origin EBIN),$(DUBIOUS_ORIGINS)))
-EBIN = ../../ebin
-endif
-
-# Generated (non ebin) files...
-ifneq (,$(findstring $(origin EGEN),$(DUBIOUS_ORIGINS)))
-EGEN = .
-endif
-
-ifneq (,$(findstring $(origin ESRC),$(DUBIOUS_ORIGINS)))
-ESRC = .
-endif
-
-$(EBIN)/%.beam: $(EGEN)/%.erl
-	$(ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
-
-$(EBIN)/%.beam: $(ESRC)/%.erl
-	$(ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
-
-.erl.beam:
-	$(ERLC) $(ERL_COMPILE_FLAGS) -o$(dir $@) $<
-
-
-#
-# When .erl files are automatically created GNU make removes them if
-# they were the result of a chain of implicit rules. To prevent this
-# we say that all .erl files are "precious".
-#
-.PRECIOUS: %.erl %.fo
-
-
-# ----------------------------------------------------
-#       Documentation section
-# ----------------------------------------------------
-# export VSN
-
-# TOPDOCDIR=../../../../doc
-
-DOCDIR = ..
-
-PDFDIR=$(DOCDIR)/pdf
-
-HTMLDIR = $(DOCDIR)/html
-
-MAN1DIR = $(DOCDIR)/man1
-MAN2DIR = $(DOCDIR)/man2
-MAN3DIR = $(DOCDIR)/man3
-MAN4DIR = $(DOCDIR)/man4
-MAN6DIR = $(DOCDIR)/man6
-MAN9DIR = $(DOCDIR)/man9
-
-# HTML & GIF files that always are generated and must be delivered
-XML_COLL_FILES = $(XML_APPLICATION_FILES) $(XML_PART_FILES)
-DEFAULT_HTML_FILES = \
-	$(XML_COLL_FILES:%.xml=$(HTMLDIR)/%_frame.html) \
-	$(XML_COLL_FILES:%.xml=$(HTMLDIR)/%_first.html) \
-	$(XML_COLL_FILES:%.xml=$(HTMLDIR)/%_term.html) \
-	$(XML_COLL_FILES:%.xml=$(HTMLDIR)/%_cite.html) \
-	$(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%_index.html) \
-	$(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.kwc) \
-	$(HTMLDIR)/index.html
-
-DEFAULT_GIF_FILES = $(HTMLDIR)/min_head.gif
-
-#
-# Flags & Commands
-#
-XSLTPROC = @XSLTPROC@
-FOP = @FOP@
-
-DOCGEN=$(DOCGEN_DIR)
-
-$(MAN1DIR)/%.1:: %.xml
-	date=`date +"%B %e %Y"`; \
-	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
-
-
-$(MAN2DIR)/%.2:: %.xml
-	date=`date +"%B %e %Y"`; \
-	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
-
-
-$(MAN3DIR)/%.3:: %.xml
-	date=`date +"%B %e %Y"`; \
-	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
-
-# left for compatibility
-$(MAN4DIR)/%.4:: %.xml
-	date=`date +"%B %e %Y"`; \
-	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
-
-$(MAN4DIR)/%.5:: %.xml
-	date=`date +"%B %e %Y"`; \
-	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
-
-# left for compatibility
-$(MAN6DIR)/%.6:: %_app.xml
-	date=`date +"%B %e %Y"`; \
-	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
-
-$(MAN6DIR)/%.7:: %_app.xml
-	date=`date +"%B %e %Y"`; \
-	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
-
-$(MAN9DIR)/%.9:: %.xml
-	date=`date +"%B %e %Y"`; \
-	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
-
-
-.xmlsrc.xml:
-	escript $(DOCGEN)/priv/bin/codeline_preprocessing.escript $< $@
-
-.fo.pdf:
-	$(FOP) -fo $< -pdf $@
-
diff --git a/lib/diameter/make/subdir.mk b/lib/diameter/make/subdir.mk
deleted file mode 100644
index 24b08080ae..0000000000
--- a/lib/diameter/make/subdir.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# 
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
-# 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# %CopyrightEnd%
-#
-# Make include file for otp
-
-.PHONY: debug opt release docs release_docs tests release_tests \
-	clean depend valgrind
-
-#
-# Targets that don't affect documentation directories
-#
-opt debug release docs release_docs tests release_tests clean depend valgrind:
-	@set -e ;							\
-	app_pwd=`pwd` ;							\
-	if test -f vsn.mk; then						\
-	    echo "=== Entering application" `basename $$app_pwd` ;	\
-	fi ;								\
-	case "$(MAKE)" in *clearmake*) tflag="-T";; *) tflag="";; esac;	\
-	for d in $(SUB_DIRS); do					\
-	    if test -f $$d/SKIP ; then					\
-		echo "=== Skipping subdir $$d, reason:" ;		\
-		cat $$d/SKIP ;						\
-		echo "===" ;						\
-	    else							\
-		if test ! -d $$d ; then					\
-		    echo "=== Skipping subdir $$d, it is missing" ;	\
-		else							\
-		    xflag="" ;						\
-		    if test -f $$d/ignore_config_record.inf; then	\
-			xflag=$$tflag ;					\
-		    fi ;						\
-		    (cd $$d && $(MAKE) $$xflag $@) || exit $$? ;	\
-		fi ;							\
-	    fi ;							\
-	done ;								\
-	if test -f vsn.mk; then						\
-	    echo "=== Leaving application" `basename $$app_pwd` ;	\
-	fi
diff --git a/lib/diameter/make/target.mk b/lib/diameter/make/target.mk
deleted file mode 100644
index 4ae470b9e2..0000000000
--- a/lib/diameter/make/target.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-ifeq ($(OVERRIDE_TARGET),)
-
-ifeq ($(TARGET),)
-
-TARGET := $(shell $(DIAMETER_TOP)/autoconf/config.guess)
-
-else
-
-endif
-
-else
-
-ifneq ($(TARGET),)
-
-ifneq ($(TARGET), $(OVERRIDE_TARGET))
-$(warning overriding $$(TARGET) = \
-	"$(TARGET)" \
-	with \
-	$$(OVERRIDE_TARGET) = \
-	"$(OVERRIDE_TARGET)")
-else
-endif
-
-override TARGET := $(OVERRIDE_TARGET)
-
-else
-
-TARGET := $(OVERRIDE_TARGET)
-
-endif
-
-endif
-
diff --git a/lib/diameter/src/.gitignore b/lib/diameter/src/.gitignore
index feeb378fd8..cc06720fd1 100644
--- a/lib/diameter/src/.gitignore
+++ b/lib/diameter/src/.gitignore
@@ -1,2 +1,3 @@
 
 /depend.mk
+/otp.plt
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index dbfaa4e140..060659bce9 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2010-2011. All Rights Reserved.
+# Copyright Ericsson AB 2010-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -16,13 +16,8 @@
 # 
 # %CopyrightEnd%
 
-ifeq ($(ERL_TOP),)
-include $(DIAMETER_TOP)/make/target.mk
-include $(DIAMETER_TOP)/make/$(TARGET)/rules.mk
-else
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
-endif
 
 # ----------------------------------------------------
 # Application version
@@ -181,41 +176,62 @@ clean:
 	rm -f $(TARGET_FILES) gen/*
 	rm -f depend.mk
 
+realclean: clean
+	rm -f ../ebin/*
+# Not $(EBIN) just to be a bit paranoid
+
+PLT = ./otp.plt
+
+plt:
+	dialyzer --build_plt \
+	         --apps erts stdlib kernel \
+	                xmerl ssl public_key crypto \
+	                compiler syntax_tools runtime_tools \
+	         --output_plt $(PLT) \
+	         --verbose
+
+dialyze: opt $(PLT)
+	dialyzer --plt $(PLT) \
+	         --verbose \
+	         -Wno_improper_lists \
+	         $(EBIN)/diameter_gen_base_rfc3588.$(EMULATOR) \
+	         $(patsubst %, $(EBIN)/%.$(EMULATOR), \
+                          $(notdir $(RT_MODULES) $(CT_MODULES)))
+# Omit all but the common dictionary module since these
+# (diameter_gen_relay in particular) generate warning depending on how
+# much of the included diameter_gen.hrl they use.
+
 # ----------------------------------------------------
 # Release targets
 # ----------------------------------------------------
 
-ifeq ($(ERL_TOP),)
-include $(DIAMETER_TOP)/make/release_targets.mk
-else
 include $(ERL_TOP)/make/otp_release_targets.mk
-endif
 
 # Can't $(INSTALL_DIR) more than one directory at a time on Solaris.
 
 release_spec: opt
 	for d in bin ebin include src/dict; do \
-	    $(INSTALL_DIR) $(RELSYSDIR)/$$d; \
+	    $(INSTALL_DIR) "$(RELSYSDIR)/$$d"; \
 	done
-	$(INSTALL_SCRIPT) $(BINS:%=../bin/%) $(RELSYSDIR)/bin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_SCRIPT) $(BINS:%=../bin/%) "$(RELSYSDIR)/bin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(EXTERNAL_HRLS:%=../include/%) $(DICT_HRLS) \
-	                $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(DICTS:%=dict/%.dia) $(RELSYSDIR)/src/dict
+	                "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(DICTS:%=dict/%.dia) "$(RELSYSDIR)/src/dict"
 	$(MAKE) $(TARGET_DIRS:%/=release_src_%)
 	$(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%)
 
 $(TARGET_DIRS:%/=release_src_%): release_src_%:
-	$(INSTALL_DIR) $(RELSYSDIR)/src/$*
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/$*"
 	$(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \
 	                               $(INTERNAL_HRLS)) \
 	                $(filter $*/%, compiler/$(DICT_YRL).yrl) \
-	                $(RELSYSDIR)/src/$*
+	                "$(RELSYSDIR)/src/$*"
 
 $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%:
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/$*
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/$*"
 	$(INSTALL_DATA) $(patsubst %, ../examples/%, $(filter $*/%, $(EXAMPLES))) \
-	                $(RELSYSDIR)/examples/$*
+	                "$(RELSYSDIR)/examples/$*"
 
 release_docs_spec:
 
@@ -245,10 +261,11 @@ depend.mk: depend.sed $(MODULES:%=%.erl) Makefile
 
 -include depend.mk
 
-.PHONY: app clean depend dict info release_subdir
+.PHONY: app clean realclean depend dict info release_subdir
 .PHONY: debug opt release_docs_spec release_spec
 .PHONY: $(TARGET_DIRS:%/=%) $(TARGET_DIRS:%/=release_src_%)
 .PHONY: $(EXAMPLE_DIRS:%/=release_examples_%)
+.PHONY: plt dialyze
 
 # Keep intermediate files.
 .SECONDARY: $(DICT_ERLS) $(DICT_HRLS) gen/$(DICT_YRL:%=%.erl)
diff --git a/lib/diameter/src/base/diameter.appup.src b/lib/diameter/src/base/diameter.appup.src
index 2ebdad598f..5655f98c1b 100644
--- a/lib/diameter/src/base/diameter.appup.src
+++ b/lib/diameter/src/base/diameter.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -20,15 +20,38 @@
 
 {"%VSN%",
  [
-  {"0.9",  [{restart_application, diameter}]},
-  {"0.10", [{restart_application, diameter}]},
-  {"1.0",  [{update, diameter_service},
-            {update, diameter_watchdog}]}
+  {"0.9",   [{restart_application, diameter}]},
+  {"0.10",  [{restart_application, diameter}]},
+  {"1.0",   [{restart_application, diameter}]},
+  {"1.1",   [{restart_application, diameter}]},
+  {"1.2",   [{load, diameter},
+             {load, diameter_capx},
+             {load, diameter_codec},
+             {load, diameter_peer},
+             {load, diameter_reg},
+             %% order significant from here
+             {load, diameter_session},
+             {load, diameter_peer_fsm},
+             {load, diameter_service},
+             {load, diameter_watchdog},
+             {load, diameter_config}]},
+  {"1.2.1", [{load, diameter},
+             {load, diameter_capx},
+             {load, diameter_peer},
+             {load, diameter_reg},
+             %% order significant from here
+             {load, diameter_session},
+             {load, diameter_peer_fsm},
+             {load, diameter_service},
+             {load, diameter_watchdog},
+             {load, diameter_config}]}
  ],
  [
-  {"0.9",  [{restart_application, diameter}]},
-  {"0.10", [{restart_application, diameter}]},
-  {"1.0",  [{update, diameter_watchdog},
-            {update, diameter_service}]}
+  {"0.9",   [{restart_application, diameter}]},
+  {"0.10",  [{restart_application, diameter}]},
+  {"1.0",   [{restart_application, diameter}]},
+  {"1.1",   [{restart_application, diameter}]},
+  {"1.2",   [{restart_application, diameter}]},
+  {"1.2.1", [{restart_application, diameter}]}
  ]
 }.
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl
index 336f0c1f2d..8f9901907a 100644
--- a/lib/diameter/src/base/diameter.erl
+++ b/lib/diameter/src/base/diameter.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -44,6 +44,8 @@
          stop/0]).
 
 -export_type([evaluable/0,
+              restriction/0,
+              sequence/0,
               app_alias/0,
               service_name/0,
               capability/0,
@@ -280,11 +282,23 @@ call(SvcName, App, Message) ->
     | fun()
     | maybe_improper_list(evaluable(), list()).
 
+-type sequence()
+   :: {'Unsigned32'(), 0..32}.
+
+-type restriction()
+   :: false
+    | node
+    | nodes
+    | [node()]
+    | evaluable().
+
 %% Options passed to start_service/2
 
 -type service_opt()
    :: capability()
-    | {application, [application_opt()]}.
+    | {application, [application_opt()]}
+    | {restrict_connections, restriction()}
+    | {sequence, sequence() | evaluable()}.
 
 -type application_opt()
    :: {alias, app_alias()}
@@ -312,9 +326,12 @@ call(SvcName, App, Message) ->
 -type transport_opt()
    :: {transport_module, atom()}
     | {transport_config, any()}
+    | {transport_config, any(), non_neg_integer() | infinity}
     | {applications, [app_alias()]}
     | {capabilities, [capability()]}
     | {capabilities_cb, evaluable()}
+    | {capx_timeout, 'Unsigned32'()}
+    | {disconnect_cb, evaluable()}
     | {watchdog_timer, 'Unsigned32'() | {module(), atom(), list()}}
     | {reconnect_timer, 'Unsigned32'()}
     | {private, any()}.
@@ -322,10 +339,11 @@ call(SvcName, App, Message) ->
 %% Predicate passed to remove_transport/2
 
 -type transport_pred()
-   :: fun((reference(), connect|listen, list()) -> boolean())
-    | fun((reference(), list()) -> boolean())
+   :: fun((transport_ref(), connect|listen, list()) -> boolean())
+    | fun((transport_ref(), list()) -> boolean())
     | fun((list()) -> boolean())
-    | reference()
+    | transport_ref()
+    | boolean()
     | list()
     | {connect|listen, transport_pred()}
     | {atom(), atom(), list()}.
diff --git a/lib/diameter/src/base/diameter_capx.erl b/lib/diameter/src/base/diameter_capx.erl
index 6c4d60ee9b..c6c3d2934d 100644
--- a/lib/diameter/src/base/diameter_capx.erl
+++ b/lib/diameter/src/base/diameter_capx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -141,7 +141,9 @@ cap('Host-IP-Address', Vs)
   when is_list(Vs) ->
     lists:map(fun ipaddr/1, Vs);
 
-cap('Firmware-Revision', V) ->
+cap(K, V)
+  when K == 'Firmware-Revision';
+       K == 'Origin-State-Id' ->
     [V];
 
 cap(_, Vs)
@@ -149,7 +151,7 @@ cap(_, Vs)
     Vs;
 
 cap(K, V) ->
-    ?THROW({invalid, K, V}).
+    ?THROW({invalid, {K,V}}).
 
 ipaddr(A) ->
     try
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl
index fe1212b7e0..a94d37f7a8 100644
--- a/lib/diameter/src/base/diameter_codec.erl
+++ b/lib/diameter/src/base/diameter_codec.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -63,9 +63,9 @@ encode(Mod, #diameter_packet{} = Pkt) ->
         e(Mod, Pkt)
     catch
         error: Reason ->
-            %% Be verbose rather than letting the emulator truncate the
-            %% error report.
-            X = {Reason, ?STACK},
+            %% Be verbose since a crash report may be truncated and
+            %% encode errors are self-inflicted.
+            X = {?MODULE, encode, {Reason, ?STACK}},
             diameter_lib:error_report(X, {?MODULE, encode, [Mod, Pkt]}),
             exit(X)
     end;
@@ -91,7 +91,8 @@ e(_, #diameter_packet{msg = [#diameter_header{} = Hdr | As]} = Pkt) ->
 
     Flags = make_flags(0, Hdr),
 
-    Pkt#diameter_packet{bin = <<Vsn:8, Length:24,
+    Pkt#diameter_packet{header = Hdr,
+                        bin = <<Vsn:8, Length:24,
                                 Flags:8, Code:24,
                                 Aid:32,
                                 Hid:32,
@@ -332,6 +333,9 @@ decode_header(_) ->
 %% wraparound counter. The 8-bit counter is incremented each time the
 %% system is restarted.
 
+sequence_numbers({_,_} = T) ->
+    T;
+
 sequence_numbers(#diameter_packet{bin = Bin})
   when is_binary(Bin) ->
     sequence_numbers(Bin);
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl
index 9253af0de2..63d28f25a2 100644
--- a/lib/diameter/src/base/diameter_config.erl
+++ b/lib/diameter/src/base/diameter_config.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -97,6 +97,9 @@
 -record(monitor, {mref = make_ref() :: reference(),
                   service}). %% name
 
+%% The default sequence mask.
+-define(NOMASK, {0,32}).
+
 %% Time to lay low before restarting a dead service.
 -define(RESTART_SLEEP, 2000).
 
@@ -519,6 +522,7 @@ rm(SvcName, L) ->
     Refs = lists:map(fun(#transport{ref = R}) -> R end, L),
     case stop_transport(SvcName, Refs) of
         ok ->
+            diameter_stats:flush(Refs),
             lists:foreach(fun delete_object/1, L);
         {error, _} = No ->
             No
@@ -548,9 +552,11 @@ make_config(SvcName, Opts) ->
 
     ok = encode_CER(COpts),
 
-    Os = split(Opts, [{[fun erlang:is_boolean/1], false, share_peers},
-                      {[fun erlang:is_boolean/1], false, use_shared_peers},
-                      {[fun erlang:is_pid/1, false], false, monitor}]),
+    Os = split(Opts, fun opt/2, [{false, share_peers},
+                                 {false, use_shared_peers},
+                                 {false, monitor},
+                                 {?NOMASK, sequence},
+                                 {nodes, restrict_connections}]),
     %% share_peers and use_shared_peers are currently undocumented.
 
     #service{name = SvcName,
@@ -558,11 +564,66 @@ make_config(SvcName, Opts) ->
                                      capabilities = Caps},
              options = Os}.
 
+split(Opts, F, Defs) ->
+    [{K, F(K, get_opt(K, Opts, D))} || {D,K} <- Defs].
+
+opt(K, false = B)
+  when K /= sequence ->
+    B;
+
+opt(K, true = B)
+  when K == share_peer;
+       K == use_shared_peers ->
+    B;
+
+opt(monitor, P)
+  when is_pid(P) ->
+    P;
+
+opt(restrict_connections, T)
+  when T == node;
+       T == nodes;
+       T == [];
+       is_atom(hd(T)) ->
+    T;
+
+opt(restrict_connections = K, F) ->
+    try diameter_lib:eval(F) of  %% no guarantee that it won't fail later
+        Nodes when is_list(Nodes) ->
+            F;
+        V ->
+            ?THROW({value, {K,V}})
+    catch
+        E:R ->
+            ?THROW({value, {K, E, R, ?STACK}})
+    end;
+
+opt(sequence, {_,_} = T) ->
+    sequence(T);
+
+opt(sequence = K, F) ->
+    try diameter_lib:eval(F) of
+        T -> sequence(T)
+    catch
+        E:R ->
+            ?THROW({value, {K, E, R, ?STACK}})
+    end;
+            
+opt(K, _) ->
+    ?THROW({value, K}).
+
+sequence({H,N} = T)
+  when 0 =< N, N =< 32, 0 =< H, 0 == H bsr N ->
+    T;
+    
+sequence(_) ->
+    ?THROW({value, sequence}).
+
 make_caps(Caps, Opts) ->
     case diameter_capx:make_caps(Caps, Opts) of
         {ok, T} ->
             T;
-        {error, {Reason, _}} ->
+        {error, Reason} ->
             ?THROW(Reason)
     end.
 
@@ -600,7 +661,7 @@ app_acc({application, Opts}, Acc) ->
                    module = init_mod(Mod),
                    init_state = ModS,
                    mutable = init_mutable(M),
-                   answer_errors = init_answers(A)}
+                   options = [{answer_errors, init_answers(A)}]}
      | Acc];
 app_acc(_, Acc) ->
     Acc.
@@ -662,21 +723,6 @@ get_opt(Key, List, Def) ->
         _   -> ?THROW({arity, Key})
     end.
 
-split(Opts, Defs) ->
-    [{K, value(D, Opts)} || {_,_,K} = D <- Defs].
-
-value({Preds, Def, Key}, Opts) ->
-    V = get_opt(Key, Opts, Def),
-    lists:any(fun(P) -> pred(P,V) end, Preds)
-        orelse ?THROW({value, Key}),
-    V.
-
-pred(F, V)
-  when is_function(F) ->
-    F(V);
-pred(T, V) ->
-    T == V.
-
 cb(M,F) ->
     try M:F() of
         V -> V
diff --git a/lib/diameter/src/base/diameter_peer.erl b/lib/diameter/src/base/diameter_peer.erl
index 3e78c4caef..1b2f32ddff 100644
--- a/lib/diameter/src/base/diameter_peer.erl
+++ b/lib/diameter/src/base/diameter_peer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -27,12 +27,15 @@
          up/2]).
 
 %% ... and the stack.
--export([start/3,
+-export([start/1,
          send/2,
          close/1,
          abort/1,
          notify/2]).
 
+%% Old interface only called from old code.
+-export([start/3]).  %% < diameter-1.2 (R15B02)
+
 %% Server start.
 -export([start_link/0]).
 
@@ -57,6 +60,11 @@
 %% Server state.
 -record(state, {id = now()}).
 
+%% Default transport_module/config.
+-define(DEFAULT_TMOD, diameter_tcp).
+-define(DEFAULT_TCFG, []).
+-define(DEFAULT_TTMO, infinity).
+
 %%% ---------------------------------------------------------------------------
 %%% # notify/2
 %%% ---------------------------------------------------------------------------
@@ -68,9 +76,119 @@ notify(SvcName, T) ->
 %%% # start/3
 %%% ---------------------------------------------------------------------------
 
-start(T, Opts, #diameter_service{} = Svc) ->
-    {Mod, Cfg} = split_transport(Opts),
-    apply(Mod, start, [T, Svc, Cfg]).
+%% From old code: make it restart.
+start(_T, _Opts, #diameter_service{}) ->
+    {error, restart}.
+
+%%% ---------------------------------------------------------------------------
+%%% # start/1
+%%% ---------------------------------------------------------------------------
+
+-spec start({T, [Opt], #diameter_service{}})
+   -> {TPid, [Addr], Tmo, Data}
+    | {error, [term()]}
+ when T    :: {connect|accept, diameter:transport_ref()},
+      Opt  :: diameter:transport_opt(),
+      TPid :: pid(),
+      Addr :: inet:ip_address(),
+      Tmo  :: non_neg_integer() | infinity,
+      Data :: {{T, Mod, Cfg}, [Mod], [{T, [Mod], Cfg}], [Err]},
+      Mod  :: module(),
+      Cfg  :: term(),
+      Err  :: term()
+    ; ({#diameter_service{}, Tmo, Data})
+   -> {TPid, [Addr], Tmo, Data}
+    | {error, [term()]}
+ when TPid :: pid(),
+      Addr :: inet:ip_address(),
+      Tmo  :: non_neg_integer() | infinity,
+      Data :: {{T, Mod, Cfg}, [Mod], [{T, [Mod], Cfg}], [Err]},
+      T    :: {connect|accept, diameter:transport_ref()},
+      Mod  :: module(),
+      Cfg  :: term(),
+      Err  :: term().
+
+%% Initial start.
+start({T, Opts, #diameter_service{} = Svc}) ->
+    start(T, Svc, pair(Opts, [], []), []);
+
+%% Subsequent start.
+start({#diameter_service{} = Svc, Tmo, {{T, _, Cfg}, Ms, Rest, Errs}}) ->
+    start(T, Ms, Cfg, Svc, Tmo, Rest, Errs).
+
+%% pair/3
+%%
+%% Pair transport modules with config.
+
+%% Another transport_module: accumulate it.
+pair([{transport_module, M} | Rest], Mods, Acc) ->
+    pair(Rest, [M|Mods], Acc);
+
+%% Another transport_config: accumulate another tuple.
+pair([{transport_config = T, C} | Rest], Mods, Acc) ->
+    pair([{T, C, ?DEFAULT_TTMO} | Rest], Mods, Acc);
+pair([{transport_config, C, Tmo} | Rest], Mods, Acc) ->
+    pair(Rest, [], acc({Mods, C, Tmo}, Acc));
+
+pair([_ | Rest], Mods, Acc) ->
+    pair(Rest, Mods, Acc);
+
+%% No transport_module or transport_config: defaults.
+pair([], [], []) ->  
+    [{[?DEFAULT_TMOD], ?DEFAULT_TCFG, ?DEFAULT_TTMO}];
+
+%% One transport_module, one transport_config.
+pair([], [M], [{[], Cfg, Tmo}]) ->
+    [{[M], Cfg, Tmo}];
+
+%% Trailing transport_module: default transport_config.
+pair([], [_|_] = Mods, Acc) ->
+    lists:reverse(acc({Mods, ?DEFAULT_TCFG, ?DEFAULT_TTMO}, Acc));
+
+pair([], [], Acc) ->
+    lists:reverse(def(Acc)).
+
+%% acc/2
+
+acc(T, Acc) ->
+    [T | def(Acc)].
+
+%% def/1
+%%
+%% Default module of previous pair if none were specified.
+
+def([{[], Cfg, Tmo} | Acc]) ->
+    [{[?DEFAULT_TMOD], Cfg, Tmo} | Acc];
+def(Acc) ->
+    Acc.
+
+%% start/4
+
+start(T, Svc, [{Ms, Cfg, Tmo} | Rest], Errs) ->
+    start(T, Ms, Cfg, Svc, Tmo, Rest, Errs);
+
+start(_, _, [], Errs) ->
+    {error, Errs}.
+
+%% start/7
+
+start(T, [], _, Svc, _, Rest, Errs) ->
+    start(T, Svc, Rest, Errs);
+
+start(T, [M|Ms], Cfg, Svc, Tmo, Rest, Errs) ->
+    case start(M, [T, Svc, Cfg]) of
+        {ok, TPid} ->
+            {TPid, [], Tmo, {{T, M, Cfg}, Ms, Rest, Errs}};
+        {ok, TPid, [_|_] = Addrs} ->
+            {TPid, Addrs, Tmo, {{T, M, Cfg}, Ms, Rest, Errs}};
+        E ->
+            start(T, Ms, Cfg, Svc, Tmo, Rest, [E|Errs])
+    end.
+
+%% start/2
+
+start(Mod, Args) ->
+    apply(Mod, start, Args).
 
 %%% ---------------------------------------------------------------------------
 %%% # up/[12]
@@ -204,21 +322,6 @@ bang(undefined = No, _) ->
 bang(Pid, T) ->
     Pid ! T.
 
-%% split_transport/1
-%%
-%% Split options into transport module, transport config and
-%% remaining options.
-
-split_transport(Opts) ->
-    {[M,C], _} = proplists:split(Opts, [transport_module,
-                                        transport_config]),
-    {value(M, diameter_tcp), value(C, [])}.
-
-value([{_,V}], _) ->
-    V;
-value([], V) ->
-    V.
-
 %% call/1
 
 call(Request) ->
diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 99644814d2..c4320fcb99 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -48,37 +48,64 @@
 -include("diameter_internal.hrl").
 -include("diameter_gen_base_rfc3588.hrl").
 
+%% Values of Disconnect-Cause in DPR.
 -define(GOAWAY, ?'DIAMETER_BASE_DISCONNECT-CAUSE_DO_NOT_WANT_TO_TALK_TO_YOU').
 -define(REBOOT, ?'DIAMETER_BASE_DISCONNECT-CAUSE_REBOOTING').
+-define(BUSY, ?'DIAMETER_BASE_DISCONNECT-CAUSE_BUSY').
 
 -define(NO_INBAND_SECURITY, 0).
 -define(TLS, 1).
 
+%% Keys in process dictionary.
+-define(CB_KEY, cb).         %% capabilities callback
+-define(DPR_KEY, dpr).       %% disconnect callback
+-define(DWA_KEY, dwa).       %% outgoing DWA
+-define(REF_KEY, ref).       %% transport_ref()
+-define(Q_KEY, q).           %% transport start queue
+-define(START_KEY, start).   %% start of connected transport
+-define(SEQUENCE_KEY, mask). %% mask for sequence numbers
+-define(RESTRICT_KEY, restrict). %% nodes for connection check
+
+%% The default sequence mask.
+-define(NOMASK, {0,32}).
+
 %% A 2xxx series Result-Code. Not necessarily 2001.
 -define(IS_SUCCESS(N), 2 == (N) div 1000).
 
+%% Guards.
+-define(IS_UINT32(N), (is_integer(N) andalso 0 =< N andalso 0 == N bsr 32)).
+-define(IS_TIMEOUT(N), ?IS_UINT32(N)).
+-define(IS_CAUSE(N), N == ?REBOOT; N == rebooting;
+                     N == ?GOAWAY; N == goaway;
+                     N == ?BUSY;   N == busy).
+
 %% RFC 3588:
 %%
 %%   Timeout        An application-defined timer has expired while waiting
 %%                  for some event.
 %%
 -define(EVENT_TIMEOUT, 10000).
+%% Default timeout for reception of CER/CEA.
 
-%% How long to wait for a DPA in response to DPR before simply
-%% aborting. Used to distinguish between shutdown and not but there's
-%% not really any need. Stopping a service will require a timeout if
-%% the peer doesn't answer DPR so the value should be short-ish.
+%% Default timeout for DPA in response to DPR. A bit short but the
+%% timeout used to be hardcoded. (So it could be worse.)
 -define(DPA_TIMEOUT, 1000).
 
+-type uint32() :: diameter:'Unsigned32'().
+
 -record(state,
-        {state = 'Wait-Conn-Ack'   %% state of RFC 3588 Peer State Machine
-              :: 'Wait-Conn-Ack' | recv_CER | 'Wait-CEA' | 'Open',
+        {state %% of RFC 3588 Peer State Machine
+              :: 'Wait-Conn-Ack'  %% old code
+               | {'Wait-Conn-Ack', uint32()}
+               | recv_CER
+               | 'Wait-CEA' %% old code
+               | {'Wait-CEA', uint32(), uint32()}
+               | 'Open',
          mode :: accept | connect | {connect, reference()},
-         parent       :: pid(),
-         transport    :: pid(),
+         parent       :: pid(),  %% watchdog process
+         transport    :: pid(),  %% transport process
          service      :: #diameter_service{},
-         dpr = false  :: false | {diameter:'Unsigned32'(),
-                                  diameter:'Unsigned32'()}}).
+         dpr = false  :: false | {uint32(), uint32()}}).
                             %% | hop by hop and end to end identifiers
 
 %% There are non-3588 states possible as a consequence of 5.6.1 of the
@@ -115,16 +142,21 @@
 %%% Output: Pid
 %%% ---------------------------------------------------------------------------
 
+-spec start(T, [Opt], #diameter_service{}  %% from old code
+                    | {diameter:sequence(),
+                       diameter:restriction(),
+                       #diameter_service{}})
+   -> pid()
+ when T   :: {connect|accept, diameter:transport_ref()},
+      Opt :: diameter:transport_opt().
+
 %% diameter_config requires a non-empty list of applications on the
 %% service but diameter_service then constrains the list to any
 %% specified on the transport in question. Check here that the list is
 %% still non-empty.
 
-start({_, Ref} = Type, Opts, #diameter_service{applications = Apps} = Svc) ->
-    [] /= Apps orelse ?ERROR({no_apps, Type, Opts}),
-    T = {self(), Type, Opts, Svc},
-    {ok, Pid} = diameter_peer_fsm_sup:start_child(T),
-    diameter_stats:reg(Pid, Ref),
+start({_,_} = Type, Opts, MS) ->
+    {ok, Pid} = diameter_peer_fsm_sup:start_child({self(), Type, Opts, MS}),
     Pid.
 
 start_link(T) ->
@@ -143,18 +175,31 @@ init(T) ->
     proc_lib:init_ack({ok, self()}),
     gen_server:enter_loop(?MODULE, [], i(T)).
 
-i({WPid, T, Opts, #diameter_service{capabilities = Caps} = Svc0}) ->
-    putr(dwa, dwa(Caps)),
+i({WPid, Type, Opts, #diameter_service{} = Svc}) ->  %% from old code
+    i({WPid, Type, Opts, {?NOMASK, [node() | nodes()], Svc}});
+
+i({WPid, T, Opts, {Mask, Nodes, #diameter_service{applications = Apps,
+                                                  capabilities = LCaps}
+                                = Svc}}) ->
+    [] /= Apps orelse ?ERROR({no_apps, T, Opts}),
+    putr(?DWA_KEY, dwa(LCaps)),
     {M, Ref} = T,
-    {[Ts], Rest} = proplists:split(Opts, [capabilities_cb]),
-    putr(capabilities_cb, {Ref, [F || {_,F} <- Ts]}),
-    {ok, TPid, Svc} = start_transport(T, Rest, Svc0),
-    erlang:monitor(process, TPid),
+    diameter_stats:reg(Ref),
+    {[Cs,Ds], Rest} = proplists:split(Opts, [capabilities_cb, disconnect_cb]),
+    putr(?CB_KEY, {Ref, [F || {_,F} <- Cs]}),
+    putr(?DPR_KEY, [F || {_, F} <- Ds]),
+    putr(?REF_KEY, Ref),
+    putr(?SEQUENCE_KEY, Mask),
+    putr(?RESTRICT_KEY, Nodes),
     erlang:monitor(process, WPid),
-    #state{parent = WPid,
+    {TPid, Addrs} = start_transport(T, Rest, Svc),
+    Tmo = proplists:get_value(capx_timeout, Opts, ?EVENT_TIMEOUT),
+    ?IS_TIMEOUT(Tmo) orelse ?ERROR({invalid, {capx_timeout, Tmo}}),
+    #state{state = {'Wait-Conn-Ack', Tmo},
+           parent = WPid,
            transport = TPid,
            mode = M,
-           service = Svc}.
+           service = svc(Svc, Addrs)}.
 %% The transport returns its local ip addresses so that different
 %% transports on the same service can use different local addresses.
 %% The local addresses are put into Host-IP-Address avps here when
@@ -164,18 +209,56 @@ i({WPid, T, Opts, #diameter_service{capabilities = Caps} = Svc0}) ->
 %% watchdog start (start/2) succeeds regardless so as not to crash the
 %% service.
 
-start_transport(T, Opts, Svc) ->
-    case diameter_peer:start(T, Opts, Svc) of
-        {ok, TPid} ->
-            {ok, TPid, Svc};
-        {ok, TPid, [_|_] = Addrs} ->
-            #diameter_service{capabilities = Caps0} = Svc,
-            Caps = Caps0#diameter_caps{host_ip_address = Addrs},
-            {ok, TPid, Svc#diameter_service{capabilities = Caps}};
+start_transport(T, Opts, #diameter_service{capabilities = LCaps} = Svc) ->
+    Addrs0 = LCaps#diameter_caps.host_ip_address,
+    start_transport(Addrs0, {T, Opts, Svc}).
+
+start_transport(Addrs0, T) ->
+    case diameter_peer:start(T) of
+        {TPid, Addrs, Tmo, Data} ->
+            erlang:monitor(process, TPid),
+            q_next(TPid, Addrs0, Tmo, Data),
+            {TPid, addrs(Addrs, Addrs0)};
         No ->
             exit({shutdown, No})
     end.
 
+addrs([], Addrs0) ->
+    Addrs0;
+addrs(Addrs, _) ->
+    Addrs.
+
+svc(Svc, []) ->
+    Svc;
+svc(Svc, Addrs) ->
+    readdr(Svc, Addrs).
+
+readdr(#diameter_service{capabilities = LCaps0} = Svc, Addrs) ->
+    LCaps = LCaps0#diameter_caps{host_ip_address = Addrs},
+    Svc#diameter_service{capabilities = LCaps}.
+
+%% The 4-tuple Data returned from diameter_peer:start/1 identifies the
+%% transport module/config use to start the transport process in
+%% question as well as any alternates to try if a connection isn't
+%% established within Tmo.
+q_next(TPid, Addrs0, Tmo, {_,_,_,_} = Data) ->
+    send_after(Tmo, {connection_timeout, TPid}),
+    putr(?Q_KEY, {Addrs0, Tmo, Data}).
+
+%% Connection has been established: retain the started
+%% pid/module/config in the process dictionary. This is a part of the
+%% interface defined by this module, so that the transport pid can be
+%% found when constructing service_info (in order to extract further
+%% information from it).
+keep_transport(TPid) ->
+    {_, _, {{_,_,_} = T, _, _, _}} = eraser(?Q_KEY),
+    putr(?START_KEY, {TPid, T}).
+
+send_after(infinity, _) ->
+    ok;
+send_after(Tmo, T) ->
+    erlang:send_after(Tmo, self(), T).
+
 %% handle_call/3
 
 handle_call(_, _, State) ->
@@ -202,14 +285,27 @@ handle_info(T, #state{} = State) ->
             ?LOG(stop, T),
             x(T, State)
     catch
+        exit: {diameter_codec, encode, _} = Reason ->
+            close_wd(Reason, State#state.parent),
+            ?LOG(stop, Reason),
+            %% diameter_codec:encode/2 emits an error report. Only
+            %% indicate the probable reason here.
+            diameter_lib:info_report(probable_configuration_error,
+                                     insufficient_capabilities),
+            {stop, {shutdown, Reason}, State};
         {?MODULE, Tag, Reason}  ->
             ?LOG(Tag, {Reason, T}),
             {stop, {shutdown, Reason}, State}
     end.
-%% The form of the exception caught here is historical. It's
+%% The form of the throw caught here is historical. It's
 %% significant that it's not a 2-tuple, as in ?FAILURE(Reason),
 %% since these are caught elsewhere.
 
+%% Note that there's no guarantee that the service and transport
+%% capabilities are good enough to build a CER/CEA that can be
+%% succesfully encoded. It's not checked at diameter:add_transport/2
+%% since this can be called before creating the service.
+
 x(Reason, #state{} = S) ->
     close_wd(Reason, S),
     {stop, {shutdown, Reason}, S}.
@@ -238,27 +334,54 @@ eraser(Key) ->
 
 %% transition/2
 
+%% Started in old code.
+transition(T, #state{state = 'Wait-Conn-Ack' = PS} = S) ->
+    transition(T, S#state{state = {PS, ?EVENT_TIMEOUT}});
+
 %% Connection to peer.
 transition({diameter, {TPid, connected, Remote}},
-           #state{state = PS,
+           #state{transport = TPid,
+                  state = PS,
                   mode = M}
            = S) ->
-    'Wait-Conn-Ack' = PS,  %% assert
+    {'Wait-Conn-Ack', _} = PS,  %% assert
     connect = M,           %%
-    send_CER(S#state{mode = {M, Remote},
-                     transport = TPid});
+    keep_transport(TPid),
+    send_CER(S#state{mode = {M, Remote}});
 
 %% Connection from peer.
 transition({diameter, {TPid, connected}},
-           #state{state = PS,
+           #state{transport = TPid,
+                  state = PS,
                   mode = M,
                   parent = Pid}
            = S) ->
-    'Wait-Conn-Ack' = PS,  %% assert
+    {'Wait-Conn-Ack', Tmo} = PS,  %% assert
     accept = M,            %%
+    keep_transport(TPid),
     Pid ! {accepted, self()},
-    start_timer(S#state{state = recv_CER,
-                        transport = TPid});
+    start_timer(Tmo, S#state{state = recv_CER});
+
+%% Connection established after receiving a connection_timeout
+%% message. This may be followed by an incoming message which arrived
+%% before the transport was killed and this can't be distinguished
+%% from one from the transport that's been started to replace it.
+transition({diameter, {_, connected}}, _) ->
+    {stop, connection_timeout};
+transition({diameter, {_, connected, _}}, _) ->
+    {stop, connection_timeout};
+
+%% Connection has timed out: start an alternate.
+transition({connection_timeout = T, TPid},
+           #state{transport = TPid,
+                  state = {'Wait-Conn-Ack', _}}
+           = S) ->
+    exit(TPid, {shutdown, T}),
+    start_next(S);
+
+%% Connect timeout after connection or alternate start: ignore.
+transition({connection_timeout, _}, _) ->
+    ok;
 
 %% Incoming message from the transport.
 transition({diameter, {recv, Pkt}}, S) ->
@@ -266,7 +389,7 @@ transition({diameter, {recv, Pkt}}, S) ->
 
 %% Timeout when still in the same state ...
 transition({timeout, PS}, #state{state = PS}) ->
-    stop;
+    {stop, {capx(PS), timeout}};
 
 %% ... or not.
 transition({timeout, _}, _) ->
@@ -277,25 +400,19 @@ transition({send, Msg}, #state{transport = TPid}) ->
     send(TPid, Msg),
     ok;
 
-%% Request for graceful shutdown.
-transition({shutdown, Pid}, #state{parent = Pid, dpr = false} = S) ->
-    dpr(?GOAWAY, S);
-transition({shutdown, Pid}, #state{parent = Pid}) ->
-    ok;
-
-%% Application shutdown.
-transition(shutdown, #state{dpr = false} = S) ->
-    dpr(?REBOOT, S);
-transition(shutdown, _) ->  %% DPR already send: ensure expected timeout
-    dpa_timer(),
+%% Messages from old (diameter_service) code.
+transition(shutdown = T, #state{parent = Pid} = S) ->
+    transition({T, Pid, service}, S); %% Reason irrelevant: old code has no cb
+
+%% Request for graceful shutdown at remove_transport, stop_service of
+%% application shutdown.
+transition({shutdown = T, Pid}, S) ->
+    transition({T, Pid, transport}, S);
+transition({shutdown, Pid, Reason}, #state{parent = Pid, dpr = false} = S) ->
+    dpr(Reason, S);
+transition({shutdown, Pid, _}, #state{parent = Pid}) ->
     ok;
 
-%% Request to close the transport connection.
-transition({close = T, Pid}, #state{parent = Pid,
-                                    transport = TPid}) ->
-    diameter_peer:close(TPid),
-    {stop, T};
-
 %% DPA reception has timed out.
 transition(dpa_timeout, _) ->
     stop;
@@ -305,14 +422,21 @@ transition({resolve_port, _Pid} = T, #state{transport = TPid}) ->
     TPid ! T,
     ok;
 
-%% Parent or transport has died.
-transition({'DOWN', _, process, P, _},
-           #state{parent = Pid,
-                  transport = TPid})
-  when P == Pid;
-       P == TPid ->
+%% Parent has died.
+transition({'DOWN', _, process, WPid, _},
+           #state{parent = WPid}) ->
     stop;
 
+%% Transport has died before connection timeout.
+transition({'DOWN', _, process, TPid, _},
+           #state{transport = TPid}
+           = S) ->
+    start_next(S);
+
+%% Transport has died after connection timeout.
+transition({'DOWN', _, process, _, _}, _) ->
+    ok;
+
 %% State query.
 transition({state, Pid}, #state{state = S, transport = TPid}) ->
     Pid ! {self(), [S, TPid]},
@@ -320,20 +444,43 @@ transition({state, Pid}, #state{state = S, transport = TPid}) ->
 
 %% Crash on anything unexpected.
 
+capx(recv_CER) ->
+    'CER';
+capx({'Wait-CEA', _, _}) ->
+    'CEA'.
+
+%% start_next/1
+
+start_next(#state{service = Svc0} = S) ->
+    case getr(?Q_KEY) of
+        {Addrs0, Tmo, Data} ->
+            Svc = readdr(Svc0, Addrs0),
+            {TPid, Addrs} = start_transport(Addrs0, {Svc, Tmo, Data}),
+            S#state{transport = TPid,
+                    service = svc(Svc, Addrs)};
+        undefined ->
+            stop
+    end.
+
 %% send_CER/1
 
-send_CER(#state{mode = {connect, Remote},
-                service = #diameter_service{capabilities = Caps},
+send_CER(#state{state = {'Wait-Conn-Ack', Tmo},
+                mode = {connect, Remote},
+                service = #diameter_service{capabilities = LCaps},
                 transport = TPid}
          = S) ->
-    OH = Caps#diameter_caps.origin_host,
+    OH = LCaps#diameter_caps.origin_host,
     req_send_CER(OH, Remote)
         orelse
-        close({already_connected, Remote, Caps}, S),
+        close({already_connected, Remote, LCaps}, S),
     CER = build_CER(S),
     ?LOG(send, 'CER'),
-    send(TPid, encode(CER)),
-    start_timer(S#state{state = 'Wait-CEA'}).
+    #diameter_packet{header = #diameter_header{end_to_end_id = Eid,
+                                               hop_by_hop_id = Hid}}
+        = Pkt
+        = encode(CER),
+    send(TPid, Pkt),
+    start_timer(Tmo, S#state{state = {'Wait-CEA', Hid, Eid}}).
 
 %% Register ourselves as connecting to the remote endpoint in
 %% question. This isn't strictly necessary since a peer implementing
@@ -345,23 +492,36 @@ send_CER(#state{mode = {connect, Remote},
 req_send_CER(OriginHost, Remote) ->
     register_everywhere({?MODULE, connection, OriginHost, {remote, Remote}}).
 
-%% start_timer/1
+%% start_timer/2
 
-start_timer(#state{state = PS} = S) ->
-    erlang:send_after(?EVENT_TIMEOUT, self(), {timeout, PS}),
+start_timer(Tmo, #state{state = PS} = S) ->
+    erlang:send_after(Tmo, self(), {timeout, PS}),
     S.
 
 %% build_CER/1
 
-build_CER(#state{service = #diameter_service{capabilities = Caps}}) ->
-    {ok, CER} = diameter_capx:build_CER(Caps),
+build_CER(#state{service = #diameter_service{capabilities = LCaps}}) ->
+    {ok, CER} = diameter_capx:build_CER(LCaps),
     CER.
 
 %% encode/1
 
 encode(Rec) ->
-    #diameter_packet{bin = Bin} = diameter_codec:encode(?BASE, Rec),
-    Bin.
+    Seq = diameter_session:sequence(sequence()),
+    Hdr = #diameter_header{version = ?DIAMETER_VERSION,
+                           end_to_end_id = Seq,
+                           hop_by_hop_id = Seq},
+    diameter_codec:encode(?BASE, #diameter_packet{header = Hdr,
+                                                  msg = Rec}).
+
+sequence() ->
+    case getr(?SEQUENCE_KEY) of
+        {_,_} = Mask ->
+            Mask;
+        undefined ->  %% started in old code
+            putr(?SEQUENCE_KEY, ?NOMASK),
+            ?NOMASK
+    end.
 
 %% recv/2
 
@@ -420,7 +580,14 @@ discard(Reason, F, A) ->
 %% rcv/3
 
 %% Incoming CEA.
-rcv('CEA', Pkt, #state{state = 'Wait-CEA'} = S) ->
+rcv('CEA',
+    #diameter_packet{header = #diameter_header{end_to_end_id = Eid,
+                                               hop_by_hop_id = Hid}}
+    = Pkt,
+    #state{state = {'Wait-CEA' = T, Hid, Eid}}
+    = S) ->
+    handle_CEA(Pkt, S#state{state = T});
+rcv('CEA', Pkt, #state{state = 'Wait-CEA'} = S) ->  %% old code
     handle_CEA(Pkt, S);
 
 %% Incoming CER
@@ -440,16 +607,16 @@ rcv(N, Pkt, S)
        N == 'DPR' ->
     handle_request(N, Pkt, S);
 
-%% DPA even though we haven't sent DPR: ignore.
-rcv('DPA', _Pkt, #state{dpr = false}) ->
-    ok;
-
-%% DPA in response to DPR. We could check the sequence numbers but
-%% don't bother, just close.
-rcv('DPA' = N, _Pkt, #state{transport = TPid}) ->
+%% DPA in response to DPR and with the expected identifiers.
+rcv('DPA' = N,
+    #diameter_packet{header = #diameter_header{end_to_end_id = Eid,
+                                               hop_by_hop_id = Hid}},
+    #state{transport = TPid,
+           dpr = {Hid, Eid}}) ->
     diameter_peer:close(TPid),
     {stop, N};
 
+%% Ignore anything else, an unsolicited DPA in particular.
 rcv(_, _, _) ->
     ok.
 
@@ -649,7 +816,7 @@ rc([RC|_]) ->
 %% answer/2
 
 answer('DWR', _) ->
-    getr(dwa);
+    getr(?DWA_KEY);
 
 answer(Name, #state{service = #diameter_service{capabilities = Caps}}) ->
     a(Name, Caps).
@@ -667,8 +834,8 @@ a('CER', #diameter_caps{vendor_id = Vid,
             {'Product-Name', Name},
             {'Origin-State-Id', OSI}];
 
-a('DPR', #diameter_caps{origin_host = Host,
-                        origin_realm = Realm}) ->
+a('DPR', #diameter_caps{origin_host = {Host, _},
+                        origin_realm = {Realm, _}}) ->
     ['DPA', {'Origin-Host', Host},
             {'Origin-Realm', Realm}].
 
@@ -749,15 +916,15 @@ caps(#state{service = Svc}) ->
 %% caps_cb/1
 
 caps_cb(Caps) ->
-    {Ref, Ts} = eraser(capabilities_cb),
-    ccb(Ts, [Ref, Caps]).
+    {Ref, Ts} = eraser(?CB_KEY),
+    caps_cb(Ts, [Ref, Caps]).
 
-ccb([], _) ->
+caps_cb([], _) ->
     ok;
-ccb([F | Rest], T) ->
+caps_cb([F | Rest], T) ->
     case diameter_lib:eval([F|T]) of
         ok ->
-            ccb(Rest, T);
+            caps_cb(Rest, T);
         N when ?IS_SUCCESS(N) ->  %% 2xxx result code: accept immediately
             N;
         Res ->
@@ -776,7 +943,9 @@ rejected(N)
 
 %% open/5
 
-open(Pkt, SupportedApps, Caps, {Type, IS}, #state{parent = Pid} = S) ->
+open(Pkt, SupportedApps, Caps, {Type, IS}, #state{parent = Pid,
+                                                  service = Svc}
+                                           = S) ->
     #diameter_caps{origin_host = {_,_} = H,
                    inband_security_id = {LS,_}}
         = Caps,
@@ -784,7 +953,9 @@ open(Pkt, SupportedApps, Caps, {Type, IS}, #state{parent = Pid} = S) ->
     tls_ack(lists:member(?TLS, LS), Caps, Type, IS, S),
     Pid ! {open, self(), H, {Caps, SupportedApps, Pkt}},
 
-    S#state{state = 'Open'}.
+    %% Replace capabilities record with local/remote pairs.
+    S#state{state = 'Open',
+            service = Svc#diameter_service{capabilities = Caps}}.
 
 %% We've advertised TLS support: tell the transport the result
 %% and expect a reply when the handshake is complete.
@@ -837,38 +1008,148 @@ dwa(#diameter_caps{origin_host = OH,
             {'Origin-State-Id', OSI}].
 
 %% dpr/2
+%%
+%% The RFC isn't clear on whether DPR should be send in a non-Open
+%% state. The Peer State Machine transitions it documents aren't
+%% exhaustive (no Stop in Wait-I-CEA for example) so assume it's up to
+%% the implementation and transition to Closed (ie. die) if we haven't
+%% yet reached Open.
+
+%% Connection is open, DPR has not been sent.
+dpr(Reason, #state{state = 'Open',
+                   dpr = false,
+                   service = #diameter_service{capabilities = Caps}}
+            = S) ->
+    case getr(?DPR_KEY) of
+        CBs when is_list(CBs) ->
+            Ref = getr(?REF_KEY),
+            Peer = {self(), Caps},
+            dpr(CBs, [Reason, Ref, Peer], S);
+        undefined ->  %% started in old code
+            send_dpr(Reason, [], S)
+    end;
 
-dpr(Cause, #state{transport = TPid,
-                  service = #diameter_service{capabilities = Caps}}
-           = S) ->
-    #diameter_caps{origin_host = OH,
-                   origin_realm = OR}
+%% Connection is open, DPR already sent.
+dpr(_, #state{state = 'Open'}) ->
+    ok;
+
+%% Connection not open.
+dpr(_Reason, _S) ->
+    stop.
+
+%% dpr/3
+%%
+%% Note that an implementation that wants to do something
+%% transport_module-specific can lookup the pid of the transport
+%% process and contact it. (eg. diameter:service_info/2)
+
+dpr([CB|Rest], [Reason | _] = Args, S) ->
+    try diameter_lib:eval([CB | Args]) of
+        {dpr, Opts} when is_list(Opts) ->
+            send_dpr(Reason, Opts, S);
+        dpr ->
+            send_dpr(Reason, [], S);
+        close = T ->
+            {stop, {disconnect_cb, T}};
+        ignore ->
+            dpr(Rest, Args, S);
+        T ->
+            No = {disconnect_cb, T},
+            diameter_lib:error_report(invalid, No),
+            {stop, No}
+    catch
+        E:R ->
+            No = {disconnect_cb, E, R, ?STACK},
+            diameter_lib:error_report(failure, No),
+            {stop, No}
+    end;
+        
+dpr([], [Reason | _], S) ->
+    send_dpr(Reason, [], S).
+
+-record(opts, {cause, timeout = ?DPA_TIMEOUT}).
+
+send_dpr(Reason, Opts, #state{transport = TPid,
+                              service = #diameter_service{capabilities = Caps}}
+                       = S) ->
+    #opts{cause = Cause, timeout = Tmo}
+        = lists:foldl(fun opt/2,
+                      #opts{cause = case Reason of
+                                        transport -> ?GOAWAY;
+                                        _         -> ?REBOOT
+                                    end,
+                            timeout = ?DPA_TIMEOUT},
+                      Opts),
+    #diameter_caps{origin_host = {OH, _},
+                   origin_realm = {OR, _}}
         = Caps,
 
-    Bin = encode(['DPR', {'Origin-Host', OH},
+    #diameter_packet{header = #diameter_header{end_to_end_id = Eid,
+                                               hop_by_hop_id = Hid}}
+        = Pkt
+        = encode(['DPR', {'Origin-Host', OH},
                          {'Origin-Realm', OR},
                          {'Disconnect-Cause', Cause}]),
-    send(TPid, Bin),
-    dpa_timer(),
+    send(TPid, Pkt),
+    dpa_timer(Tmo),
     ?LOG(send, 'DPR'),
-    S#state{dpr = diameter_codec:sequence_numbers(Bin)}.
-
-dpa_timer() ->
-    erlang:send_after(?DPA_TIMEOUT, self(), dpa_timeout).
+    S#state{dpr = {Hid, Eid}}.
+
+opt({timeout, Tmo}, Rec)
+  when ?IS_TIMEOUT(Tmo) ->
+    Rec#opts{timeout = Tmo};
+opt({cause, Cause}, Rec)
+  when ?IS_CAUSE(Cause) ->
+    Rec#opts{cause = cause(Cause)};
+opt(T, _) ->
+    ?ERROR({invalid_option, T}).
+
+cause(rebooting) -> ?REBOOT;
+cause(goaway)    -> ?GOAWAY;
+cause(busy)      -> ?BUSY;
+cause(N)
+  when ?IS_CAUSE(N) ->
+    N;
+cause(N) ->
+    ?ERROR({invalid_cause, N}).
+
+dpa_timer(Tmo) ->
+    erlang:send_after(Tmo, self(), dpa_timeout).
 
 %% register_everywhere/1
 %%
 %% Register a term and ensure it's not registered elsewhere. Note that
 %% two process that simultaneously register the same term may well
 %% both fail to do so this isn't foolproof.
+%%
+%% Everywhere is no longer everywhere, it's where a
+%% restrict_connections service_opt() specifies.
 
 register_everywhere(T) ->
-    diameter_reg:add_new(T)
-        andalso unregistered(T).
+    reg(getr(?RESTRICT_KEY), T).
+
+reg(Nodes, T) ->
+    add(lists:member(node(), Nodes), T) andalso unregistered(Nodes, T).
+
+add(true, T) ->
+    diameter_reg:add_new(T);
+add(false, T) ->
+    diameter_reg:add(T).
+
+%% unregistered
+%%
+%% Ensure that the term in question isn't registered on other nodes.
+
+unregistered(Nodes, T) ->
+    {ResL, _} = rpc:multicall(Nodes, ?MODULE, match, [{node(), T}]),
+    lists:all(fun nomatch/1, ResL).
+
+nomatch({badrpc, {'EXIT', {undef, _}}}) ->  %% no diameter on remote node
+    true;
+nomatch(L) ->
+    [] == L.
 
-unregistered(T) ->
-    {ResL, _} = rpc:multicall(?MODULE, match, [{node(), T}]),
-    lists:all(fun(L) -> [] == L end, ResL).
+%% match/1
 
 match({Node, _})
   when Node == node() ->
diff --git a/lib/diameter/src/base/diameter_reg.erl b/lib/diameter/src/base/diameter_reg.erl
index 882b9da238..619b12ecad 100644
--- a/lib/diameter/src/base/diameter_reg.erl
+++ b/lib/diameter/src/base/diameter_reg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -30,7 +30,8 @@
          add_new/1,
          del/1,
          repl/2,
-         match/1]).
+         match/1,
+         wait/1]).
 
 -export([start_link/0]).
 
@@ -65,27 +66,22 @@
 %% Table entry containing the Term -> Pid mapping.
 -define(MAPPING(Term, Pid), {Term, Pid}).
 
--record(state, {id = now()}).
-
-%%% ----------------------------------------------------------
-%%% # add(T)
-%%%
-%%% Input:  Term = term()
-%%%
-%%% Output: true
-%%%
-%%% Description: Associate the specified term with self(). The list of pids
-%%%              having this or other assocations can be retrieved using
-%%%              match/1.
-%%%
-%%%              An association is removed when the calling process dies
-%%%              or as a result of calling del/1. Adding the same term
-%%%              more than once is equivalent to adding it exactly once.
-%%%
-%%%              Note that since match/1 takes a pattern as argument,
-%%%              specifying a term that contains match variables is
-%%%              probably not a good idea
-%%% ----------------------------------------------------------
+-record(state, {id = now(),
+                q = []}). %% [{From, Pat}]
+
+%% ===========================================================================
+%% # add(T)
+%%
+%% Associate the specified term with self(). The list of pids having
+%% this or other assocations can be retrieved using match/1.
+%%
+%% An association is removed when the calling process dies or as a
+%% result of calling del/1. Adding the same term more than once is
+%% equivalent to adding it exactly once.
+%%
+%% Note that since match/1 takes a pattern as argument, specifying a
+%% term that contains match variables is probably not a good idea
+%% ===========================================================================
 
 -spec add(any())
    -> true.
@@ -93,17 +89,12 @@
 add(T) ->
     call({add, fun ets:insert/2, T, self()}).
 
-%%% ----------------------------------------------------------
-%%% # add_new(T)
-%%%
-%%% Input:  T = term()
-%%%
-%%% Output: true | false
-%%%
-%%% Description: Like add/1 but only one process is allowed to have the
-%%%              the association, false being returned if an association
-%%%              already exists.
-%%% ----------------------------------------------------------
+%% ===========================================================================
+%% # add_new(T)
+%%
+%% Like add/1 but only one process is allowed to have the the
+%% association, false being returned if an association already exists.
+%% ===========================================================================
 
 -spec add_new(any())
    -> boolean().
@@ -111,16 +102,12 @@ add(T) ->
 add_new(T) ->
     call({add, fun insert_new/2, T, self()}).
 
-%%% ----------------------------------------------------------
-%%% # repl(T, NewT)
-%%%
-%%% Input:  T, NewT = term()
-%%%
-%%% Output: true | false
-%%%
-%%% Description: Like add/1 but only replace an existing association on T,
-%%%              false being returned if it doesn't exist.
-%%% ----------------------------------------------------------
+%% ===========================================================================
+%% # repl(T, NewT)
+%%
+%% Like add/1 but only replace an existing association on T, false
+%% being returned if it doesn't exist.
+%% ===========================================================================
 
 -spec repl(any(), any())
    -> boolean().
@@ -128,15 +115,11 @@ add_new(T) ->
 repl(T, U) ->
     call({repl, T, U, self()}).
 
-%%% ----------------------------------------------------------
-%%% # del(Term)
-%%%
-%%% Input:  Term = term()
-%%%
-%%% Output: true
-%%%
-%%% Description: Remove any existing association of Term with self().
-%%% ----------------------------------------------------------
+%% ===========================================================================
+%% # del(Term)
+%%
+%% Remove any existing association of Term with self().
+%% ===========================================================================
 
 -spec del(any())
    -> true.
@@ -144,20 +127,16 @@ repl(T, U) ->
 del(T) ->
     call({del, T, self()}).
 
-%%% ----------------------------------------------------------
-%%% # match(Pat)
-%%%
-%%% Input:  Pat = pattern in the sense of ets:match_object/2.
-%%%
-%%% Output: list of {Term, Pid}
-%%%
-%%% Description: Return the list of associations whose Term, as specified
-%%%              to add/1 or add_new/1, matches the specified pattern.
-%%%
-%%%              Note that there's no guarantee that the returned processes
-%%%              are still alive. (Although one that isn't will soon have
-%%%              its associations removed.)
-%%% ----------------------------------------------------------
+%% ===========================================================================
+%% # match(Pat)
+%%
+%% Return the list of associations whose Term, as specified to add/1
+%% or add_new/1, matches the specified pattern.
+%%
+%% Note that there's no guarantee that the returned processes are
+%% still alive. (Although one that isn't will soon have its
+%% associations removed.)
+%% ===========================================================================
 
 -spec match(tuple())
    -> [{term(), pid()}].
@@ -165,9 +144,17 @@ del(T) ->
 match(Pat) ->
     ets:match_object(?TABLE, ?MAPPING(Pat, '_')).
 
-%% ---------------------------------------------------------
-%% EXPORTED INTERNAL FUNCTIONS
-%% ---------------------------------------------------------
+%% ===========================================================================
+%% # wait(Pat)
+%%
+%% Like match/1 but return only when the result is non-empty or fails.
+%% It's up to the caller to ensure that the wait won't be forever.
+%% ===========================================================================
+
+wait(Pat) ->
+    call({wait, Pat}).
+
+%% ===========================================================================
 
 start_link() ->
     ServerName = {local, ?SERVER},
@@ -182,7 +169,7 @@ uptime() ->
 
 %% pids/0
 %%
-%% Output: list of {Pid, [Term, ...]}
+%% Return: list of {Pid, [Term, ...]}
 
 pids() ->
     to_list(fun swap/1).
@@ -202,89 +189,100 @@ id(T) -> T.
 
 %% terms/0
 %%
-%% Output: list of {Term, [Pid, ...]}
+%% Return: list of {Term, [Pid, ...]}
 
 terms() ->
     to_list(fun id/1).
 
 swap({X,Y}) -> {Y,X}.
 
-%%% ----------------------------------------------------------
-%%% # init(Role)
-%%%
-%%% Output: {ok, State}
-%%% ----------------------------------------------------------
+%% ----------------------------------------------------------
+%% # init/1
+%% ----------------------------------------------------------
 
 init(_) ->
     ets:new(?TABLE, [bag, named_table]),
     {ok, #state{}}.
 
-%%% ----------------------------------------------------------
-%%% # handle_call(Request, From, State)
-%%% ----------------------------------------------------------
+%% ----------------------------------------------------------
+%% # handle_call/3
+%% ----------------------------------------------------------
 
-handle_call({add, Fun, Key, Pid}, _, State) ->
+handle_call(Req, From, S)
+  when not is_record(S, state) ->
+    handle_call(Req, From, upgrade(S));
+
+handle_call({add, Fun, Key, Pid}, _, S) ->
     B = Fun(?TABLE, {Key, Pid}),
     monitor(B andalso no_monitor(Pid), Pid),
-    {reply, B, State};
+    {reply, B, pending(B, S)};
 
-handle_call({del, Key, Pid}, _, State) ->
-    {reply, ets:delete_object(?TABLE, ?MAPPING(Key, Pid)), State};
+handle_call({del, Key, Pid}, _, S) ->
+    {reply, ets:delete_object(?TABLE, ?MAPPING(Key, Pid)), S};
 
-handle_call({repl, T, U, Pid}, _, State) ->
+handle_call({repl, T, U, Pid}, _, S) ->
     MatchSpec = [{?MAPPING('$1', Pid),
                   [{'=:=', '$1', {const, T}}],
                   ['$_']}],
-    {reply, repl(ets:select(?TABLE, MatchSpec), U, Pid), State};
+    {reply, repl(ets:select(?TABLE, MatchSpec), U, Pid), S};
+
+handle_call({wait, Pat}, From, #state{q = Q} = S) ->
+    case find(Pat) of
+        {ok, L} ->
+            {reply, L, S};
+        false ->
+            {noreply, S#state{q = [{From, Pat} | Q]}}
+    end;
 
-handle_call(state, _, State) ->
-    {reply, State, State};
+handle_call(state, _, S) ->
+    {reply, S, S};
 
-handle_call(uptime, _, #state{id = Time} = State) ->
-    {reply, diameter_lib:now_diff(Time), State};
+handle_call(uptime, _, #state{id = Time} = S) ->
+    {reply, diameter_lib:now_diff(Time), S};
 
-handle_call(Req, From, State) ->
+handle_call(Req, From, S) ->
     ?UNEXPECTED([Req, From]),
-    {reply, nok, State}.
+    {reply, nok, S}.
 
-%%% ----------------------------------------------------------
-%%% # handle_cast(Request, State)
-%%% ----------------------------------------------------------
+%% ----------------------------------------------------------
+%% # handle_cast/2
+%% ----------------------------------------------------------
 
-handle_cast(Msg, State)->
+handle_cast(Msg, S)->
     ?UNEXPECTED([Msg]),
-    {noreply, State}.
+    {noreply, S}.
 
-%%% ----------------------------------------------------------
-%%% # handle_info(Request, State)
-%%% ----------------------------------------------------------
+%% ----------------------------------------------------------
+%% # handle_info/2
+%% ----------------------------------------------------------
 
-handle_info({'DOWN', MRef, process, Pid, _}, State) ->
+handle_info({'DOWN', MRef, process, Pid, _}, S) ->
     ets:delete_object(?TABLE, ?MONITOR(Pid, MRef)),
     ets:match_delete(?TABLE, ?MAPPING('_', Pid)),
-    {noreply, State};
+    {noreply, S};
 
-handle_info(Info, State) ->
+handle_info(Info, S) ->
     ?UNEXPECTED([Info]),
-    {noreply, State}.
+    {noreply, S}.
 
-%%% ----------------------------------------------------------
-%%% # terminate(Reason, State)
-%%% ----------------------------------------------------------
+%% ----------------------------------------------------------
+%% # terminate/2
+%% ----------------------------------------------------------
 
 terminate(_Reason, _State)->
     ok.
 
-%%% ----------------------------------------------------------
-%%% # code_change(OldVsn, State, Extra)
-%%% ----------------------------------------------------------
+%% ----------------------------------------------------------
+%% # code_change/3
+%% ----------------------------------------------------------
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
-%% ---------------------------------------------------------
-%% INTERNAL FUNCTIONS
-%% ---------------------------------------------------------
+%% ===========================================================================
+
+upgrade(S) ->
+    #state{} = list_to_tuple(tuple_to_list(S) ++ [[]]).
 
 monitor(true, Pid) ->
     ets:insert(?TABLE, ?MONITOR(Pid, erlang:monitor(process, Pid)));
@@ -321,6 +319,37 @@ repl([?MAPPING(_, Pid) = M], Key, Pid) ->
 repl([], _, _) ->
     false.
 
+%% pending/1
+
+pending(true, #state{q = [_|_] = Q} = S) ->
+    S#state{q = q(lists:reverse(Q), [])}; %% retain reply order
+pending(_, S) ->
+    S.
+
+q([], Q) ->
+    Q;
+q([{From, Pat} = T | Rest], Q) ->
+    case find(Pat) of
+        {ok, L} ->
+            gen_server:reply(From, L),
+            q(Rest, Q);
+        false ->
+            q(Rest, [T|Q])
+    end.
+
+%% find/1
+
+find(Pat) ->
+    try match(Pat) of
+        [] ->
+            false;
+        L ->
+            {ok, L}
+    catch
+        _:_ ->
+            {ok, []}
+    end.
+
 %% call/1
 
 call(Request) ->
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 3dfdcee2b2..a4a0b80348 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -43,8 +43,7 @@
          subscriptions/0,
          services/0,
          services/1,
-         whois/1,
-         flush_stats/1]).
+         whois/1]).
 
 %% test/debug
 -export([call_module/3,
@@ -65,13 +64,33 @@
 -include_lib("diameter/include/diameter.hrl").
 -include("diameter_internal.hrl").
 
+%% The states mirrored by peer_up/peer_down callbacks.
 -define(STATE_UP,   up).
 -define(STATE_DOWN, down).
 
+-type op_state() :: ?STATE_UP
+                  | ?STATE_DOWN.
+
+%% The RFC 3539 watchdog states that are now maintained, albeit
+%% along with the old up/down. okay = up, else down.
+-define(WD_INITIAL, initial).
+-define(WD_OKAY,    okay).
+-define(WD_SUSPECT, suspect).
+-define(WD_DOWN,    down).
+-define(WD_REOPEN,  reopen).
+
+-type wd_state() :: ?WD_INITIAL
+                  | ?WD_OKAY
+                  | ?WD_SUSPECT
+                  | ?WD_DOWN
+                  | ?WD_REOPEN.
+
 -define(DEFAULT_TC,     30000).  %% RFC 3588 ch 2.1
 -define(DEFAULT_TIMEOUT, 5000).  %% for outgoing requests
 -define(RESTART_TC,      1000).  %% if restart was this recent
 
+-define(RELAY, ?DIAMETER_DICT_RELAY).
+
 %% Used to be able to swap this with anything else dict-like but now
 %% rely on the fact that a service's #state{} record does not change
 %% in storing in it ?STATE table and not always going through the
@@ -88,6 +107,12 @@
 %% process.
 -define(STATE_TABLE, ?MODULE).
 
+%% The default sequence mask.
+-define(NOMASK, {0,32}).
+
+%% The default restrict_connections.
+-define(RESTRICT, nodes).
+
 %% Workaround for dialyzer's lack of understanding of match specs.
 -type match(T)
    :: T | '_' | '$1' | '$2' | '$3' | '$4'.
@@ -95,15 +120,18 @@
 %% State of service gen_server.
 -record(state,
         {id = now(),
-         service_name,      %% as passed to start_service/2, key in ?STATE_TABLE
+         service_name,  %% as passed to start_service/2, key in ?STATE_TABLE
          service :: #diameter_service{},
-         peerT = ets_new(peers) :: ets:tid(), %% #peer{} at start_fsm
-         connT = ets_new(conns) :: ets:tid(), %% #conn{} at connection_up
-         share_peers = false :: boolean(), %% broadcast peers to remote nodes?
-         use_shared_peers = false :: boolean(),  %% use broadcasted peers?
+         peerT = ets_new(peers) :: ets:tid(),%% #peer{} at start_fsm
+         connT = ets_new(conns) :: ets:tid(),%% #conn{} at connection_up/reopen
          shared_peers = ?Dict:new(),         %% Alias -> [{TPid, Caps}, ...]
          local_peers = ?Dict:new(),          %% Alias -> [{TPid, Caps}, ...]
-         monitor = false :: false | pid()}). %% process to die with
+         monitor = false :: false | pid(),   %% process to die with
+         options
+         :: [{sequence, diameter:sequence()}  %% sequence mask
+             | {restrict_connections, diameter:restriction()}
+             | {share_peers, boolean()}  %% broadcast peers to remote nodes?
+             | {use_shared_peers, boolean()}]}).%% use broadcasted peers?
 %% shared_peers reflects the peers broadcast from remote nodes. Note
 %% that the state term itself doesn't change, which is relevant for
 %% the stateless application callbacks since the state is retrieved
@@ -111,18 +139,30 @@
 %% service record is used to determine whether or not we need to call
 %% the process for a pick_peer callback.
 
-%% Record representing a watchdog process.
+%% Record representing a watchdog process as implemented by
+%% diameter_watchdog. The term "peer" here is historical, made
+%% especially confusing by the fact that a peer_ref() in the
+%% documentation is the key of a #conn{} record, not a #peer{} record.
+%% The name is also unfortunate given the meaning of peer in the
+%% Diameter sense.
 -record(peer,
         {pid  :: match(pid()),
          type :: match(connect | accept),
          ref  :: match(reference()),  %% key into diameter_config
          options :: match([diameter:transport_opt()]),%% from start_transport
-         op_state = ?STATE_DOWN :: match(?STATE_DOWN | ?STATE_UP),
+         op_state = {?STATE_DOWN, ?WD_INITIAL}
+                 :: match(op_state() | {op_state(), wd_state()}),
          started = now(),      %% at process start
          conn = false :: match(boolean() | pid())}).
-                      %% true at accept, pid() at connection_up (connT key)
-
-%% Record representing a peer_fsm process.
+                      %% true at accepted, pid() at connection_up or reopen
+
+%% Record representing a peer process as implemented by
+%% diameter_peer_fsm. The term "conn" is historical. Despite the name
+%% here, comments refer to watchdog and peer processes, that are keys
+%% in #peer{} and #conn{} records respectively. To add to the
+%% confusion, a #request.transport is a peer process = key in a
+%% #conn{} record. The actual transport process (that the peer process
+%% knows about and that has a transport connection) isn't seen here.
 -record(conn,
         {pid   :: pid(),
          apps  :: [{0..16#FFFFFFFF, diameter:app_alias()}], %% {Id, Alias}
@@ -136,10 +176,9 @@
          handler    :: match(pid()), %% request process
          transport  :: match(pid()), %% peer process
          caps       :: match(#diameter_caps{}),
-         app        :: match(diameter:app_alias()),  %% #diameter_app.alias
-         dictionary :: match(module()),     %% #diameter_app.dictionary
-         module     :: match([module() | list()]),
-                    %% #diameter_app.module
+         app        :: match(diameter:app_alias()),%% #diameter_app.alias
+         dictionary :: match(module()),            %% #diameter_app.dictionary
+         module     :: match([module() | list()]), %% #diameter_app.module
          filter     :: match(diameter:peer_filter()),
          packet     :: match(#diameter_packet{})}).
 
@@ -150,20 +189,6 @@
          timeout = ?DEFAULT_TIMEOUT :: 0..16#FFFFFFFF,
          detach = false :: boolean()}).
 
-%% Since RFC 3588 requires that a Diameter agent not modify End-to-End
-%% Identifiers, the possibility of explicitly setting an End-to-End
-%% Identifier would be needed to be able to implement an agent in
-%% which one side of the communication is not implemented on top of
-%% diameter. For example, Diameter being sent or received encapsulated
-%% in some other protocol, or even another Diameter stack in a
-%% non-Erlang environment. (Not that this is likely to be a normal
-%% case.)
-%%
-%% The implemented solution is not an option but to respect any header
-%% values set in a diameter_header record returned from a
-%% prepare_request callback. A call to diameter:call/4 can communicate
-%% values to the callback using the 'extra' option if so desired.
-
 %%% ---------------------------------------------------------------------------
 %%% # start(SvcName)
 %%% ---------------------------------------------------------------------------
@@ -216,20 +241,20 @@ stop_transport(SvcName, [_|_] = Refs) ->
 %%% ---------------------------------------------------------------------------
 
 info(SvcName, Item) ->
-    info_rc(call_service_by_name(SvcName, {info, Item})).
-
-info_rc({error, _}) ->
-    undefined;
-info_rc(Info) ->
-    Info.
+    case find_state(SvcName) of
+        #state{} = S ->
+            service_info(Item, S);
+        false ->
+            undefined
+    end.
 
 %%% ---------------------------------------------------------------------------
 %%% # receive_message(TPid, Pkt, MessageData)
 %%% ---------------------------------------------------------------------------
 
-%% Handle an incoming message in the watchdog process. This used to
-%% come through the service process but this avoids that becoming a
-%% bottleneck.
+%% Handle an incoming Diameter message in the watchdog process. This
+%% used to come through the service process but this avoids that
+%% becoming a bottleneck.
 
 receive_message(TPid, Pkt, T)
   when is_pid(TPid) ->
@@ -309,21 +334,39 @@ call_rc(_, _, Sent) ->
 %% In the process spawned for the outgoing request.
 
 call(SvcName, App, Msg, Opts, Caller) ->
-    c(ets:lookup(?STATE_TABLE, SvcName), App, Msg, Opts, Caller).
+    c(find_state(SvcName), App, Msg, Opts, Caller).
 
-c([#state{service_name = SvcName} = S], App, Msg, Opts, Caller) ->
+c(#state{service_name = Svc, options = [{_, Mask} | _]} = S,
+  App,
+  Msg,
+  Opts,
+  Caller) ->
     case find_transport(App, Msg, Opts, S) of
         {_,_,_} = T ->
-            send_request(T, Msg, Opts, Caller, SvcName);
+            send_request(T, Mask, Msg, Opts, Caller, Svc);
         false ->
             {error, no_connection};
         {error, _} = No ->
             No
     end;
 
-c([], _, _, _, _) ->
+c(false, _, _, _, _) ->
     {error, no_service}.
 
+%% find_state/1
+
+find_state(SvcName) ->
+    fs(ets:lookup(?STATE_TABLE, SvcName)).
+
+fs([#state{} = S]) ->
+    S;
+
+fs([S]) ->  %% inserted from old code
+    upgrade(S);
+
+fs([]) ->
+    false.
+
 %% make_options/1
 
 make_options(Options) ->
@@ -388,15 +431,6 @@ whois(SvcName) ->
             undefined
     end.
 
-%%% ---------------------------------------------------------------------------
-%%% # flush_stats/1
-%%%
-%%% Output: list of {{SvcName, Alias, Counter}, Value}
-%%% ---------------------------------------------------------------------------
-
-flush_stats(TPid) ->
-    diameter_stats:flush(TPid).
-
 %% ===========================================================================
 %% ===========================================================================
 
@@ -428,6 +462,10 @@ i(_, false) ->
 %%% # handle_call(Req, From, State)
 %%% ---------------------------------------------------------------------------
 
+handle_call(T, From, S)
+  when not is_record(S, state) ->
+    handle_call(T, From, upgrade(S));
+
 handle_call(state, _, S) ->
     {reply, S, S};
 
@@ -451,16 +489,25 @@ handle_call({pick_peer, Local, Remote, App}, _From, S) ->
 handle_call({call_module, AppMod, Req}, From, S) ->
     call_module(AppMod, Req, From, S);
 
+%% Call from old code.
 handle_call({info, Item}, _From, S) ->
     {reply, service_info(Item, S), S};
 
 handle_call(stop, _From, S) ->
-    shutdown(S),
+    shutdown(service, S),
     {stop, normal, ok, S};
 %% The server currently isn't guaranteed to be dead when the caller
 %% gets the reply. We deal with this in the call to the server,
 %% stating a monitor that waits for DOWN before returning.
 
+%% Watchdog is asking for the sequence mask.
+handle_call(sequence, _From, #state{options = [{_, Mask} | _]} = S) ->
+    {reply, Mask, S};
+
+%% Watchdog is asking for the nodes restriction.
+handle_call(restriction, _From, #state{options = [_,_,_,{_,R} | _]} = S) ->
+    {reply, R, S};
+
 handle_call(Req, From, S) ->
     unexpected(handle_call, [Req, From], S),
     {reply, nok, S}.
@@ -477,15 +524,16 @@ handle_cast(Req, S) ->
 %%% # handle_info(Req, State)
 %%% ---------------------------------------------------------------------------
 
-handle_info(T,S) ->
+handle_info(T, #state{} = S) ->
     case transition(T,S) of
         ok ->
             {noreply, S};
-        #state{} = NS ->
-            {noreply, NS};
         {stop, Reason} ->
             {stop, {shutdown, Reason}, S}
-    end.
+    end;
+
+handle_info(T, S) ->
+    handle_info(T, upgrade(S)).
 
 %% transition/2
 
@@ -496,15 +544,26 @@ transition({accepted, Pid, TPid}, S) ->
 
 %% Peer process has a new open connection.
 transition({connection_up, Pid, T}, S) ->
-    connection_up(Pid, T, S);
+    connection_up(Pid, T, S),
+    ok;
+
+%% Watchdog has a new connection that will be opened after DW[RA]
+%% exchange. This message was added long after connection_up, to
+%% communicate the information as soon as it's available. Leave
+%% connection_up as is it for now, duplicated information and all.
+transition({reopen, Pid, T}, S) ->
+    reopen(Pid, T, S),
+    ok;
 
-%% Peer process has left state open.
+%% Watchdog has left state OKAY.
 transition({connection_down, Pid}, S) ->
-    connection_down(Pid, S);
+    connection_down(Pid, S),
+    ok;
 
-%% Peer process has returned to state open.
+%% Watchdog has returned to state OKAY.
 transition({connection_up, Pid}, S) ->
-    connection_up(Pid, S);
+    connection_up(Pid, S),
+    ok;
 
 %% Accepting transport has lost connectivity.
 transition({close, Pid}, S) ->
@@ -516,29 +575,61 @@ transition({reconnect, Pid}, S) ->
     reconnect(Pid, S),
     ok;
 
+%% Watchdog is sending notification of a state transition. Note that
+%% the connection_up/down messages are pre-date this message and are
+%% still used. A watchdog message will follow these and communicate
+%% the same state as was set in handling connection_up/down.
+transition({watchdog, Pid, {TPid, From, To}}, #state{service_name = SvcName,
+                                                     peerT = PeerT}) ->
+    #peer{ref = Ref, type = T, options = Opts, op_state = {OS,_}}
+        = P
+        = fetch(PeerT, Pid),
+    insert(PeerT, P#peer{op_state = {OS, To}}),
+    send_event(SvcName, {watchdog, Ref, TPid, {From, To}, {T, Opts}}),
+    ok;
+%% Death of a watchdog process (#peer.pid) results in the removal of
+%% it's peer and any associated conn record when 'DOWN' is received
+%% (after this) but the states will be {?STATE_UP, ?WD_DOWN} for a
+%% short time. (No real problem since ?WD_* is only used in
+%% service_info.) We set ?WD_OKAY as a consequence of connection_up
+%% since we know a watchdog is coming. We can't set anything at
+%% connection_down since we don't know if the subsequent watchdog
+%% message will be ?WD_DOWN or ?WD_SUSPECT. We don't (yet) set
+%% ?STATE_* as a consequence of a watchdog message since this requires
+%% changing some of the matching on ?STATE_*.
+%%
+%% Death of a peer process process (#conn.pid, #peer.conn) results in
+%% connection_down followed by watchdog ?WD_DOWN. The latter doesn't
+%% result in the conn record being deleted since 'DOWN' from death of
+%% its watchdog doesn't (yet) deal with the record having been
+%% removed.
+
 %% Monitor process has died. Just die with a reason that tells
 %% diameter_config about the happening. If a cleaner shutdown is
 %% required then someone should stop us.
 transition({'DOWN', MRef, process, _, Reason}, #state{monitor = MRef}) ->
     {stop, {monitor, Reason}};
 
-%% Local peer process has died.
+%% Local watchdog process has died.
 transition({'DOWN', _, process, Pid, Reason}, S)
   when node(Pid) == node() ->
-    peer_down(Pid, Reason, S);
+    peer_down(Pid, Reason, S),
+    ok;
 
-%% Remote service wants to know about shared transports.
+%% Remote service wants to know about shared peers.
 transition({service, Pid}, S) ->
     share_peers(Pid, S),
     ok;
 
 %% Remote service is communicating a shared peer.
 transition({peer, TPid, Aliases, Caps}, S) ->
-    remote_peer_up(TPid, Aliases, Caps, S);
+    remote_peer_up(TPid, Aliases, Caps, S),
+    ok;
 
 %% Remote peer process has died.
 transition({'DOWN', _, process, TPid, _}, S) ->
-    remote_peer_down(TPid, S);
+    remote_peer_down(TPid, S),
+    ok;
 
 %% Restart after tc expiry.
 transition({tc_timeout, T}, S) ->
@@ -552,18 +643,48 @@ transition({failover, TRef, Seqs}, S) ->
     failover(TRef, Seqs, S),
     ok;
 
+%% Ensure upgraded state is stored in state table.
+transition(upgrade, _) ->
+    ok;
+
 transition(Req, S) ->
     unexpected(handle_info, [Req], S),
     ok.
 
+%% upgrade/1
+
+upgrade({state, Id, Svc, Name, Svc, PT, CT, SB, UB, SD, LD, MPid}) ->
+    S = #state{id = Id,
+               service_name = Name,
+               service = Svc,
+               peerT = PT,
+               connT = CT,
+               shared_peers = SD,
+               local_peers = LD,
+               monitor = MPid,
+               options = [{sequence, ?NOMASK},
+                          {share_peers, SB},
+                          {use_shared_peers, UB},
+                          {restrict_connections, ?RESTRICT}]},
+    upgrade_insert(S),
+    S.
+
+upgrade_insert(#state{service = #diameter_service{pid = Pid}} = S) ->
+    if Pid == self() ->
+            ets:insert(?STATE_TABLE, S);
+       true ->
+            Pid ! upgrade
+    end.
+
 %%% ---------------------------------------------------------------------------
 %%% # terminate(Reason, State)
 %%% ---------------------------------------------------------------------------
 
 terminate(Reason, #state{service_name = Name} = S) ->
+    send_event(Name, stop),
     ets:delete(?STATE_TABLE, Name),
     shutdown == Reason  %% application shutdown
-        andalso shutdown(S).
+        andalso shutdown(application, S).
 
 %%% ---------------------------------------------------------------------------
 %%% # code_change(FromVsn, State, Extra)
@@ -646,41 +767,49 @@ mod_state(Alias, ModS) ->
 %%% # shutdown/2
 %%% ---------------------------------------------------------------------------
 
-shutdown(Refs, #state{peerT = PeerT}) ->
-    ets:foldl(fun(P,ok) -> s(P, Refs), ok end, ok, PeerT).
-
-s(#peer{ref = Ref, pid = Pid}, Refs) ->
-    s(lists:member(Ref, Refs), Pid);
-
-s(true, Pid) ->
-    Pid ! {shutdown, self()};  %% 'DOWN' will cleanup as usual
-s(false, _) ->
-    ok.
+%% remove_transport: ask watchdogs to terminate their transport.
+shutdown(Refs, #state{peerT = PeerT})
+  when is_list(Refs) ->
+    ets:foldl(fun(P,ok) -> sp(P, Refs), ok end, ok, PeerT);
 
-%%% ---------------------------------------------------------------------------
-%%% # shutdown/1
-%%% ---------------------------------------------------------------------------
-
-shutdown(#state{peerT = PeerT}) ->
+%% application/service shutdown: ask transports to terminate themselves.
+shutdown(Reason, #state{peerT = PeerT}) ->
     %% A transport might not be alive to receive the shutdown request
     %% but give those that are a chance to shutdown gracefully.
-    wait(fun st/2, PeerT),
+    shutdown(conn, Reason, PeerT),
     %% Kill the watchdogs explicitly in case there was no transport.
-    wait(fun sw/2, PeerT).
+    shutdown(peer, Reason, PeerT).
 
-wait(Fun, T) ->
-    diameter_lib:wait(ets:foldl(Fun, [], T)).
+%% sp/2
 
-st(#peer{conn = B}, Acc)
-  when is_boolean(B) ->
-    Acc;
-st(#peer{conn = Pid}, Acc) ->
-    Pid ! shutdown,
-    [Pid | Acc].
+sp(#peer{ref = Ref, pid = Pid}, Refs) ->
+    lists:member(Ref, Refs)
+        andalso (Pid ! {shutdown, self()}).  %% 'DOWN' cleans up
+
+%% shutdown/3
+
+shutdown(Who, Reason, T) ->
+    diameter_lib:wait(ets:foldl(fun(X,A) -> shutdown(Who, X, Reason, A) end,
+                                [],
+                                T)).
+
+shutdown(conn = Who, #peer{op_state = {OS,_}} = P, Reason, Acc) ->
+    shutdown(Who, P#peer{op_state = OS}, Reason, Acc);
 
-sw(#peer{pid = Pid}, Acc) ->
+shutdown(conn,
+         #peer{pid = Pid, op_state = ?STATE_UP, conn = TPid},
+         Reason,
+         Acc) ->
+    TPid ! {shutdown, Pid, Reason},
+    [TPid | Acc];
+
+shutdown(peer, #peer{pid = Pid}, _Reason, Acc)
+  when is_pid(Pid) ->
     exit(Pid, shutdown),
-    [Pid | Acc].
+    [Pid | Acc];
+
+shutdown(_, #peer{}, _, Acc) ->
+    Acc.
 
 %%% ---------------------------------------------------------------------------
 %%% # call_service/2
@@ -733,6 +862,7 @@ i(SvcName) ->
     lists:foreach(fun(T) -> start_fsm(T,S) end, CL),
 
     init_shared(S),
+    send_event(SvcName, start),
     S.
 
 cfg_acc({SvcName, #diameter_service{applications = Apps} = Rec, Opts},
@@ -740,9 +870,8 @@ cfg_acc({SvcName, #diameter_service{applications = Apps} = Rec, Opts},
     lists:foreach(fun init_mod/1, Apps),
     S = #state{service_name = SvcName,
                service = Rec#diameter_service{pid = self()},
-               share_peers = get_value(share_peers, Opts),
-               use_shared_peers = get_value(use_shared_peers, Opts),
-               monitor = mref(get_value(monitor, Opts))},
+               monitor = mref(get_value(monitor, Opts)),
+               options = service_options(Opts)},
     {S, Acc};
 
 cfg_acc({_Ref, Type, _Opts} = T, {S, Acc})
@@ -750,15 +879,24 @@ cfg_acc({_Ref, Type, _Opts} = T, {S, Acc})
        Type == listen ->
     {S, [T | Acc]}.
 
+service_options(Opts) ->
+    [{sequence, proplists:get_value(sequence, Opts, ?NOMASK)},
+     {share_peers, get_value(share_peers, Opts)},
+     {use_shared_peers, get_value(use_shared_peers, Opts)},
+     {restrict_connections, proplists:get_value(restrict_connections,
+                                                Opts,
+                                                ?RESTRICT)}].
+%% The order of options is significant since we match against the list.
+
 mref(false = No) ->
     No;
 mref(P) ->
     erlang:monitor(process, P).
 
-init_shared(#state{use_shared_peers = true,
+init_shared(#state{options = [_, _, {_, true} | _],
                    service_name = Svc}) ->
     diameter_peer:notify(Svc, {service, self()});
-init_shared(#state{use_shared_peers = false}) ->
+init_shared(#state{options = [_, _, {_, false} | _]}) ->
     ok.
 
 init_mod(#diameter_app{alias = Alias,
@@ -821,9 +959,8 @@ start(Ref, Type, Opts, #state{peerT = PeerT,
     Pid.
 
 %% Note that the service record passed into the watchdog is the merged
-%% record so that each watchdog (and peer_fsm) may get a different
-%% record. This record is what is passed back into application
-%% callbacks.
+%% record so that each watchdog may get a different record. This
+%% record is what is passed back into application callbacks.
 
 s(Type, Ref, T) ->
     case diameter_watchdog:start({Type, Ref}, T) of
@@ -874,20 +1011,25 @@ accepted(Pid, _TPid, #state{peerT = PeerT} = S) ->
     #peer{ref = Ref, type = accept = T, conn = false, options = Opts}
         = P
         = fetch(PeerT, Pid),
-    insert(PeerT, P#peer{conn = true}),  %% mark replacement transport started
-    start(Ref, T, Opts, S).              %% start new peer
+    insert(PeerT, P#peer{conn = true}),  %% mark replacement as started
+    start(Ref, T, Opts, S).              %% start new watchdog
 
 fetch(Tid, Key) ->
     [T] = ets:lookup(Tid, Key),
-    T.
+    case T of
+        #peer{op_state = ?STATE_UP} = P ->
+            P#peer{op_state = {?STATE_UP, ?WD_OKAY}};
+        #peer{op_state = ?STATE_DOWN} = P ->
+            P#peer{op_state = {?STATE_DOWN, ?WD_DOWN}};
+        _ ->
+            T
+    end.
 
 %%% ---------------------------------------------------------------------------
 %%% # connection_up/3
-%%%
-%%% Output: #state{}
 %%% ---------------------------------------------------------------------------
 
-%% Peer process has reached the open state.
+%% Watchdog process has reached state OKAY.
 
 connection_up(Pid, {TPid, {Caps, SApps, Pkt}}, #state{peerT = PeerT,
                                                       connT = ConnT}
@@ -902,9 +1044,29 @@ connection_up(Pid, {TPid, {Caps, SApps, Pkt}}, #state{peerT = PeerT,
     connection_up([Pkt], P#peer{conn = TPid}, C, S).
 
 %%% ---------------------------------------------------------------------------
+%%% # reopen/3
+%%% ---------------------------------------------------------------------------
+
+%% Note that this connection_up/3 rewrites the same #conn{} now
+%% written here. Both do so in case reopen has not happened in old
+%% code.
+
+reopen(Pid, {TPid, {Caps, SApps, _Pkt}}, #state{peerT = PeerT,
+                                                connT = ConnT}) ->
+    P = fetch(PeerT, Pid),
+    C = #conn{pid = TPid,
+              apps = SApps,
+              caps = Caps,
+              peer = Pid},
+
+    insert(ConnT, C),
+    #peer{op_state = {?STATE_DOWN, _}}
+        = P,
+    insert(PeerT, P#peer{op_state = {?STATE_DOWN, ?WD_REOPEN},
+                         conn = TPid}).
+
+%%% ---------------------------------------------------------------------------
 %%% # connection_up/2
-%%%
-%%% Output: #state{}
 %%% ---------------------------------------------------------------------------
 
 %% Peer process has transitioned back into the open state. Note that there
@@ -925,18 +1087,16 @@ connection_up(T, P, C, #state{peerT = PeerT,
                               service
                               = #diameter_service{applications = Apps}}
                        = S) ->
-    #peer{conn = TPid, op_state = ?STATE_DOWN}
+    #peer{conn = TPid, op_state = {?STATE_DOWN, _}}
         = P,
     #conn{apps = SApps, caps = Caps}
         = C,
 
-    insert(PeerT, P#peer{op_state = ?STATE_UP}),
+    insert(PeerT, P#peer{op_state = {?STATE_UP, ?WD_OKAY}}),
 
     request_peer_up(TPid),
-    report_status(up, P, C, S, T),
-    S#state{local_peers = insert_local_peer(SApps,
-                                            {{TPid, Caps}, {SvcName, Apps}},
-                                            LDict)}.
+    insert_local_peer(SApps, {{TPid, Caps}, {SvcName, Apps}}, LDict),
+    report_status(up, P, C, S, T).
 
 insert_local_peer(SApps, T, LDict) ->
     lists:foldl(fun(A,D) -> ilp(A, T, D) end, LDict, SApps).
@@ -945,56 +1105,62 @@ ilp({Id, Alias}, {TC, SA}, LDict) ->
     init_conn(Id, Alias, TC, SA),
     ?Dict:append(Alias, TC, LDict).
 
-init_conn(Id, Alias, TC, {SvcName, Apps}) ->
+init_conn(Id, Alias, {TPid, _} = TC, {SvcName, Apps}) ->
     #diameter_app{module = ModX,
                   id = Id}  %% assert
         = find_app(Alias, Apps),
 
-    peer_cb({ModX, peer_up, [SvcName, TC]}, Alias).
+    peer_cb({ModX, peer_up, [SvcName, TC]}, Alias)
+        orelse exit(TPid, kill).  %% fake transport failure
+
+%% find_app/2
 
 find_app(Alias, Apps) ->
-    lists:keyfind(Alias, #diameter_app.alias, Apps).
+    case lists:keyfind(Alias, #diameter_app.alias, Apps) of
+        #diameter_app{options = E} = A when is_atom(E) ->  %% upgrade
+            A#diameter_app{options = [{answer_errors, E}]};
+        A ->
+            A
+    end.
 
-%% A failing peer callback brings down the service. In the case of
-%% peer_up we could just kill the transport and emit an error but for
-%% peer_down we have no way to cleanup any state change that peer_up
-%% may have introduced.
+%% Don't bring down the service (and all associated connections)
+%% regardless of what happens.
 peer_cb(MFA, Alias) ->
     try state_cb(MFA, Alias) of
         ModS ->
-            mod_state(Alias, ModS)
+            mod_state(Alias, ModS),
+            true
     catch
-        E: Reason ->
-            ?ERROR({E, Reason, MFA, ?STACK})
+        E:R ->
+            diameter_lib:error_report({failure, {E, R, Alias, ?STACK}}, MFA),
+            false
     end.
 
 %%% ---------------------------------------------------------------------------
 %%% # connection_down/2
-%%%
-%%% Output: #state{}
 %%% ---------------------------------------------------------------------------
 
-%% Peer process has transitioned out of the open state.
+%% Watchdog has transitioned out of state OKAY.
 
 connection_down(Pid, #state{peerT = PeerT,
                             connT = ConnT}
                      = S) ->
-    #peer{op_state = ?STATE_UP,  %% assert
+    #peer{op_state = {?STATE_UP, WS},  %% assert
           conn = TPid}
         = P
         = fetch(PeerT, Pid),
 
     C = fetch(ConnT, TPid),
-    insert(PeerT, P#peer{op_state = ?STATE_DOWN}),
+    insert(PeerT, P#peer{op_state = {?STATE_DOWN, WS}}),
     connection_down(P,C,S).
 
 %% connection_down/3
 
-connection_down(#peer{op_state = ?STATE_DOWN}, _, S) ->
-    S;
+connection_down(#peer{op_state = {?STATE_DOWN, _}}, _, _) ->
+    ok;
 
 connection_down(#peer{conn = TPid,
-                      op_state = ?STATE_UP}
+                      op_state = {?STATE_UP, _}}
                 = P,
                 #conn{caps = Caps,
                       apps = SApps}
@@ -1004,12 +1170,8 @@ connection_down(#peer{conn = TPid,
                        local_peers = LDict}
                 = S) ->
     report_status(down, P, C, S, []),
-    NewS = S#state{local_peers
-                   = remove_local_peer(SApps,
-                                       {{TPid, Caps}, {SvcName, Apps}},
-                                       LDict)},
-    request_peer_down(TPid, NewS),
-    NewS.
+    remove_local_peer(SApps, {{TPid, Caps}, {SvcName, Apps}}, LDict),
+    request_peer_down(TPid, S).
 
 remove_local_peer(SApps, T, LDict) ->
     lists:foldl(fun(A,D) -> rlp(A, T, D) end, LDict, SApps).
@@ -1028,11 +1190,9 @@ down_conn(Id, Alias, TC, {SvcName, Apps}) ->
 
 %%% ---------------------------------------------------------------------------
 %%% # peer_down/3
-%%%
-%%% Output: #state{}
 %%% ---------------------------------------------------------------------------
 
-%% Peer process has died.
+%% Watchdog process has died.
 
 peer_down(Pid, Reason, #state{peerT = PeerT} = S) ->
     P = fetch(PeerT, Pid),
@@ -1043,7 +1203,7 @@ peer_down(Pid, Reason, #state{peerT = PeerT} = S) ->
 
 %% Send an event at connection establishment failure.
 closed({shutdown, {close, _TPid, Reason}},
-       #peer{op_state = ?STATE_DOWN,
+       #peer{op_state = {?STATE_DOWN, _},
              ref = Ref,
              type = Type,
              options = Opts},
@@ -1052,12 +1212,12 @@ closed({shutdown, {close, _TPid, Reason}},
 closed(_, _, _) ->
     ok.
 
-%% The peer has never come up ...
-peer_down(#peer{conn = B}, S)
+%% The watchdog has never reached OKAY ...
+peer_down(#peer{conn = B}, _)
   when is_boolean(B) ->
-    S;
+    ok;
 
-%% ... or it has.
+%% ... or maybe it has.
 peer_down(#peer{conn = TPid} = P, #state{connT = ConnT} = S) ->
     #conn{} = C = fetch(ConnT, TPid),
     ets:delete_object(ConnT, C),
@@ -1085,7 +1245,7 @@ restart(#peer{ref = Ref,
               started = Time}) ->
     {Time, {Ref, T, Opts}};
 
-%% ... or it has: a replacement transport has already been spawned.
+%% ... or it has: a replacement has already been spawned.
 restart(#peer{type = accept}) ->
     false.
 
@@ -1111,8 +1271,8 @@ default_tc(connect, Opts) ->
 default_tc(accept, _) ->
     0.
 
-%% Bound tc below if the peer was restarted recently to avoid
-%% continuous in case of faulty config or other problems.
+%% Bound tc below if the watchdog was restarted recently to avoid
+%% continuous restarted in case of faulty config or other problems.
 tc(Time, Tc) ->
     choose(Tc > ?RESTART_TC
              orelse timer:now_diff(now(), Time) > 1000*?RESTART_TC,
@@ -1234,7 +1394,7 @@ cm([_,_|_], _, _, _) ->
     multiple.
 
 %%% ---------------------------------------------------------------------------
-%%% # send_request/5
+%%% # send_request/6
 %%% ---------------------------------------------------------------------------
 
 %% Send an outgoing request in its dedicated process.
@@ -1247,71 +1407,89 @@ cm([_,_|_], _, _, _) ->
 %% The mod field of the #diameter_app{} here includes any extra
 %% arguments passed to diameter:call/2.
 
-send_request({TPid, Caps, App}, Msg, Opts, Caller, SvcName) ->
+send_request({TPid, Caps, App} = T, Mask, Msg, Opts, Caller, SvcName) ->
     #diameter_app{module = ModX}
         = App,
 
-    Pkt = make_request_packet(Msg),
-
-    case cb(ModX, prepare_request, [Pkt, SvcName, {TPid, Caps}]) of
-        {send, P} ->
-            send_request(make_request_packet(P, Pkt),
-                         TPid,
-                         Caps,
-                         App,
-                         Opts,
-                         Caller,
-                         SvcName);
-        {discard, Reason} ->
-            {error, Reason};
-        discard ->
-            {error, discarded};
-        T ->
-            ?ERROR({invalid_return, prepare_request, App, T})
-    end.
+    Pkt = make_prepare_packet(Mask, Msg),
+
+    send_req(cb(ModX, prepare_request, [Pkt, SvcName, {TPid, Caps}]),
+             Pkt,
+             T,
+             Opts,
+             Caller,
+             SvcName,
+             []).
+
+send_req({send, P}, Pkt, T, Opts, Caller, SvcName, Fs) ->
+    send_req(make_request_packet(P, Pkt), T, Opts, Caller, SvcName, Fs);
+
+send_req({discard, Reason} , _, _, _, _, _, _) ->
+    {error, Reason};
+
+send_req(discard, _, _, _, _, _, _) ->
+    {error, discarded};
 
-%% make_request_packet/1
+send_req({eval_packet, RC, F}, Pkt, T, Opts, Caller, SvcName, Fs) ->
+    send_req(RC, Pkt, T, Opts, Caller, SvcName, [F|Fs]);
+
+send_req(E, _, {_, _, App}, _, _, _, _) ->
+    ?ERROR({invalid_return, prepare_request, App, E}).
+
+%% make_prepare_packet/2
 %%
 %% Turn an outgoing request as passed to call/4 into a diameter_packet
 %% record in preparation for a prepare_request callback.
 
-make_request_packet(Bin)
+make_prepare_packet(_, Bin)
   when is_binary(Bin) ->
     #diameter_packet{header = diameter_codec:decode_header(Bin),
                      bin = Bin};
 
-make_request_packet(#diameter_packet{msg = [#diameter_header{} = Hdr | Avps]}
-                    = Pkt) ->
-    Pkt#diameter_packet{msg = [make_request_header(Hdr) | Avps]};
+make_prepare_packet(Mask, #diameter_packet{msg = [#diameter_header{} = Hdr
+                                                  | Avps]}
+                          = Pkt) ->
+    Pkt#diameter_packet{msg = [make_prepare_header(Mask, Hdr) | Avps]};
 
-make_request_packet(#diameter_packet{header = Hdr} = Pkt) ->
-    Pkt#diameter_packet{header = make_request_header(Hdr)};
+make_prepare_packet(Mask, #diameter_packet{header = Hdr} = Pkt) ->
+    Pkt#diameter_packet{header = make_prepare_header(Mask, Hdr)};
 
-make_request_packet(Msg) ->
-    make_request_packet(#diameter_packet{msg = Msg}).
+make_prepare_packet(Mask, Msg) ->
+    make_prepare_packet(Mask, #diameter_packet{msg = Msg}).
 
-%% make_request_header/1
+%% make_prepare_header/1
+
+make_prepare_header(Mask, undefined) ->
+    Seq = diameter_session:sequence(Mask),
+    make_prepare_header(#diameter_header{end_to_end_id = Seq,
+                                         hop_by_hop_id = Seq});
 
-make_request_header(undefined) ->
-    Seq = diameter_session:sequence(),
-    make_request_header(#diameter_header{end_to_end_id = Seq,
+make_prepare_header(Mask, #diameter_header{end_to_end_id = undefined,
+                                           hop_by_hop_id = undefined}) ->
+    Seq = diameter_session:sequence(Mask),
+    make_prepare_header(#diameter_header{end_to_end_id = Seq,
                                          hop_by_hop_id = Seq});
 
-make_request_header(#diameter_header{version = undefined} = Hdr) ->
-    make_request_header(Hdr#diameter_header{version = ?DIAMETER_VERSION});
+make_prepare_header(Mask, #diameter_header{end_to_end_id = undefined} = H) ->
+    Seq = diameter_session:sequence(Mask),
+    make_prepare_header(H#diameter_header{end_to_end_id = Seq});
 
-make_request_header(#diameter_header{end_to_end_id = undefined} = H) ->
-    Seq = diameter_session:sequence(),
-    make_request_header(H#diameter_header{end_to_end_id = Seq});
+make_prepare_header(Mask, #diameter_header{hop_by_hop_id = undefined} = H) ->
+    Seq = diameter_session:sequence(Mask),
+    make_prepare_header(H#diameter_header{hop_by_hop_id = Seq});
 
-make_request_header(#diameter_header{hop_by_hop_id = undefined} = H) ->
-    Seq = diameter_session:sequence(),
-    make_request_header(H#diameter_header{hop_by_hop_id = Seq});
+make_prepare_header(_, Hdr) ->
+    make_prepare_header(Hdr).
 
-make_request_header(#diameter_header{} = Hdr) ->
+%% make_prepare_header/1
+
+make_prepare_header(#diameter_header{version = undefined} = Hdr) ->
+    make_prepare_header(Hdr#diameter_header{version = ?DIAMETER_VERSION});
+
+make_prepare_header(#diameter_header{} = Hdr) ->
     Hdr;
 
-make_request_header(T) ->
+make_prepare_header(T) ->
     ?ERROR({invalid_header, T}).
 
 %% make_request_packet/2
@@ -1321,7 +1499,7 @@ make_request_header(T) ->
 
 make_request_packet(Bin, _)
   when is_binary(Bin) ->
-    make_request_packet(Bin);
+    make_prepare_packet(false, Bin);
 
 make_request_packet(#diameter_packet{msg = [#diameter_header{} | _]}
                     = Pkt,
@@ -1333,7 +1511,7 @@ make_request_packet(#diameter_packet{msg = [#diameter_header{} | _]}
 %% This is primarily so that the end to end and hop by hop identifiers
 %% are retained.
 make_request_packet(#diameter_packet{header = Hdr} = Pkt,
-            #diameter_packet{header = Hdr0}) ->
+                    #diameter_packet{header = Hdr0}) ->
     Pkt#diameter_packet{header = fold_record(Hdr0, Hdr)};
 
 make_request_packet(Msg, Pkt) ->
@@ -1346,16 +1524,16 @@ fold_record(undefined, R) ->
 fold_record(Rec, R) ->
     diameter_lib:fold_tuple(2, Rec, R).
 
-%% send_request/7
+%% send_req/6
 
-send_request(Pkt, TPid, Caps, App, Opts, Caller, SvcName) ->
+send_req(Pkt, {TPid, Caps, App}, Opts, Caller, SvcName, Fs) ->
     #diameter_app{alias = Alias,
                   dictionary = Dict,
                   module = ModX,
-                  answer_errors = AE}
+                  options = [{answer_errors, AE} | _]}
         = App,
 
-    EPkt = encode(Dict, Pkt),
+    EPkt = encode(Dict, Pkt, Fs),
 
     #options{filter = Filter,
              timeout = Timeout}
@@ -1436,6 +1614,13 @@ msg(#diameter_packet{msg = undefined, bin = Bin}) ->
 msg(#diameter_packet{msg = Msg}) ->
     Msg.
 
+%% encode/3
+
+encode(Dict, Pkt, Fs) ->
+    P = encode(Dict, Pkt),
+    eval_packet(P, Fs),
+    P.
+
 %% encode/2
 
 %% Note that prepare_request can return a diameter_packet containing
@@ -1517,38 +1702,47 @@ send(Pid, Pkt) ->
 
 %% retransmit/4
 
-retransmit({TPid, Caps, #diameter_app{alias = Alias} = App},
-           #request{app = Alias,
-                    packet = Pkt}
+retransmit({TPid, Caps, #diameter_app{alias = Alias} = App} = T,
+           #request{app = Alias, packet = Pkt}
            = Req,
            SvcName,
            Timeout) ->
     have_request(Pkt, TPid)      %% Don't failover to a peer we've
         andalso ?THROW(timeout), %% already sent to.
 
-    case cb(App, prepare_retransmit, [Pkt, SvcName, {TPid, Caps}]) of
-        {send, P} ->
-            retransmit(make_request_packet(P, Pkt), TPid, Caps, Req, Timeout);
-        {discard, Reason} ->
-            ?THROW(Reason);
-        discard ->
-            ?THROW(discarded);
-        T ->
-            ?ERROR({invalid_return, prepare_retransmit, App, T})
-    end.
+    resend_req(cb(App, prepare_retransmit, [Pkt, SvcName, {TPid, Caps}]),
+               T,
+               Req,
+               Timeout,
+               []).
+
+resend_req({send, P}, T, #request{packet = Pkt} = Req, Timeout, Fs) ->
+    retransmit(make_request_packet(P, Pkt), T, Req, Timeout, Fs);
+
+resend_req({discard, Reason}, _, _, _, _) ->
+    ?THROW(Reason);
+
+resend_req(discard, _, _, _, _) ->
+    ?THROW(discarded);
 
-%% retransmit/5
+resend_req({eval_packet, RC, F}, T, Req, Timeout, Fs) ->
+    resend_req(RC, T, Req, Timeout, [F|Fs]);
+    
+resend_req(T, {_, _, App}, _, _, _) ->
+    ?ERROR({invalid_return, prepare_retransmit, App, T}).
 
-retransmit(Pkt, TPid, Caps, #request{dictionary = Dict} = Req, Timeout) ->
-    EPkt = encode(Dict, Pkt),
+%% retransmit/6
 
-    NewReq = Req#request{transport = TPid,
-                         packet = Pkt,
-                         caps = Caps},
+retransmit(Pkt, {TPid, Caps, _}, #request{dictionary = D} = Req0, Tmo, Fs) ->
+    EPkt = encode(D, Pkt, Fs),
 
-    ?LOG(retransmission, NewReq),
-    TRef = send_request(TPid, EPkt, NewReq, Timeout),
-    {TRef, NewReq}.
+    Req = Req0#request{transport = TPid,
+                       packet = Pkt,
+                       caps = Caps},
+
+    ?LOG(retransmission, Req),
+    TRef = send_request(TPid, EPkt, Req, Tmo),
+    {TRef, Req}.
 
 %% store_request/4
 
@@ -1620,10 +1814,13 @@ request_peer_down(TPid, S) ->
 %%% recv_request/3
 %%% ---------------------------------------------------------------------------
 
-recv_request(TPid, Pkt, {ConnT, SvcName, Apps}) ->
+recv_request(TPid, Pkt, {ConnT, SvcName, Apps}) ->  %% upgrade
+    recv_request(TPid, Pkt, {ConnT, SvcName, Apps, ?NOMASK});
+
+recv_request(TPid, Pkt, {ConnT, SvcName, Apps, Mask}) ->
     try ets:lookup(ConnT, TPid) of
         [C] ->
-            recv_request(C, TPid, Pkt, SvcName, Apps);
+            recv_request(C, TPid, Pkt, SvcName, Apps, Mask);
         [] ->             %% transport has gone down
             ok
     catch
@@ -1633,7 +1830,12 @@ recv_request(TPid, Pkt, {ConnT, SvcName, Apps}) ->
 
 %% recv_request/5
 
-recv_request(#conn{apps = SApps, caps = Caps}, TPid, Pkt, SvcName, Apps) ->
+recv_request(#conn{apps = SApps, caps = Caps},
+             TPid,
+             Pkt,
+             SvcName,
+             Apps,
+             Mask) ->
     #diameter_caps{origin_host = {OH,_},
                    origin_realm = {OR,_}}
         = Caps,
@@ -1645,6 +1847,7 @@ recv_request(#conn{apps = SApps, caps = Caps}, TPid, Pkt, SvcName, Apps) ->
                  {SvcName, OH, OR},
                  TPid,
                  Apps,
+                 Mask,
                  Caps,
                  Pkt).
 
@@ -1670,20 +1873,24 @@ keyfind([Key | Rest], Pos, L) ->
             T
     end.
 
-%% recv_request/6
+%% recv_request/7
 
-recv_request({Id, Alias}, T, TPid, Apps, Caps, Pkt) ->
+recv_request({Id, Alias}, T, TPid, Apps, Mask, Caps, Pkt) ->
     #diameter_app{dictionary = Dict}
         = A
         = find_app(Alias, Apps),
-    recv_request(T, {TPid, Caps}, A, diameter_codec:decode(Id, Dict, Pkt));
+    recv_request(T,
+                 {TPid, Caps},
+                 A,
+                 Mask,
+                 diameter_codec:decode(Id, Dict, Pkt));
 %% Note that the decode is different depending on whether or not Id is
 %% ?APP_ID_RELAY.
 
 %%   DIAMETER_APPLICATION_UNSUPPORTED   3007
 %%      A request was sent for an application that is not supported.
 
-recv_request(false, T, TPid, _, _, Pkt) ->
+recv_request(false, T, TPid, _, _, _, Pkt) ->
     As = collect_avps(Pkt),
     protocol_error(3007, T, TPid, Pkt#diameter_packet{avps = As}).
 
@@ -1695,7 +1902,7 @@ collect_avps(Pkt) ->
             As
     end.
 
-%% recv_request/4
+%% recv_request/5
 
 %% Wrong number of bits somewhere in the message: reply.
 %%
@@ -1704,7 +1911,7 @@ collect_avps(Pkt) ->
 %%      set to an unrecognized value, or that is inconsistent with the
 %%      AVP's definition.
 %%
-recv_request(T, {TPid, _}, _, #diameter_packet{errors = [Bs | _]} = Pkt)
+recv_request(T, {TPid, _}, _, _, #diameter_packet{errors = [Bs | _]} = Pkt)
   when is_bitstring(Bs) ->
     protocol_error(3009, T, TPid, Pkt);
 
@@ -1719,6 +1926,7 @@ recv_request(T, {TPid, _}, _, #diameter_packet{errors = [Bs | _]} = Pkt)
 recv_request(T,
              {TPid, _},
              #diameter_app{id = Id},
+             _,
              #diameter_packet{header = #diameter_header{is_proxiable = P},
                               msg = M}
              = Pkt)
@@ -1736,6 +1944,7 @@ recv_request(T,
 recv_request(T,
              {TPid, _},
              _,
+             _,
              #diameter_packet{header = #diameter_header{is_error = true}}
              = Pkt) ->
     protocol_error(3008, T, TPid, Pkt);
@@ -1744,14 +1953,20 @@ recv_request(T,
 %% in the relay application. Don't distinguish between the two since
 %% each application has its own callback config. That is, the user can
 %% easily distinguish between the two cases.
-recv_request(T, TC, App, Pkt) ->
-    request_cb(T, TC, App, examine(Pkt)).
+recv_request(T, TC, App, Mask, Pkt) ->
+    request_cb(T, TC, App, Mask, examine(Pkt)).
 
 %% Note that there may still be errors but these aren't protocol
 %% (3xxx) errors that lead to an answer-message.
 
-request_cb({SvcName, _OH, _OR} = T, TC, App, Pkt) ->
-    request_cb(cb(App, handle_request, [Pkt, SvcName, TC]), App, T, TC, Pkt).
+request_cb({SvcName, _OH, _OR} = T, TC, App, Mask, Pkt) ->
+    request_cb(cb(App, handle_request, [Pkt, SvcName, TC]),
+               App,
+               Mask,
+               T,
+               TC,
+               [],
+               Pkt).
 
 %% examine/1
 %%
@@ -1771,7 +1986,7 @@ examine(#diameter_packet{errors = Es} = Pkt) ->
     Pkt#diameter_packet{errors = [5011 | Es]}.
 %% It's odd/unfortunate that this isn't a protocol error.
 
-%% request_cb/5
+%% request_cb/7
 
 %% A reply may be an answer-message, constructed either here or by
 %% the handle_request callback. The header from the incoming request
@@ -1781,21 +1996,23 @@ examine(#diameter_packet{errors = Es} = Pkt) ->
 request_cb({reply, Ans},
            #diameter_app{dictionary = Dict},
            _,
+           _,
            {TPid, _},
+           Fs,
            Pkt) ->
-    reply(Ans, Dict, TPid, Pkt);
+    reply(Ans, Dict, TPid, Fs, Pkt);
 
 %% An 3xxx result code, for which the E-bit is set in the header.
-request_cb({protocol_error, RC}, _, T, {TPid, _}, Pkt)
+request_cb({protocol_error, RC}, _, _, T, {TPid, _}, Fs, Pkt)
   when 3000 =< RC, RC < 4000 ->
-    protocol_error(RC, T, TPid, Pkt);
+    protocol_error(RC, T, TPid, Fs, Pkt);
 
 %% RFC 3588 says we must reply 3001 to anything unrecognized or
 %% unsupported. 'noreply' is undocumented (and inappropriately named)
 %% backwards compatibility for this, protocol_error the documented
 %% alternative.
-request_cb(noreply, _, T, {TPid, _}, Pkt) ->
-    protocol_error(3001, T, TPid, Pkt);
+request_cb(noreply, _, _, T, {TPid, _}, Fs, Pkt) ->
+    protocol_error(3001, T, TPid, Fs, Pkt);
 
 %% Relay a request to another peer. This is equivalent to doing an
 %% explicit call/4 with the message in question except that (1) a loop
@@ -1815,38 +2032,51 @@ request_cb(noreply, _, T, {TPid, _}, Pkt) ->
 request_cb({A, Opts},
            #diameter_app{id = Id}
            = App,
+           Mask,
            T,
            TC,
+           Fs,
            Pkt)
   when A == relay, Id == ?APP_ID_RELAY;
        A == proxy, Id /= ?APP_ID_RELAY;
        A == resend ->
-    resend(Opts, App, T, TC, Pkt);
+    resend(Opts, App, Mask, T, TC, Fs, Pkt);
 
-request_cb(discard, _, _, _, _) ->
+request_cb(discard, _, _, _, _, _, _) ->
     ok;
 
-request_cb({eval, RC, F}, App, T, TC, Pkt) ->
-    request_cb(RC, App, T, TC, Pkt),
+request_cb({eval_packet, RC, F}, App, Mask, T, TC, Fs, Pkt) ->
+    request_cb(RC, App, Mask, T, TC, [F|Fs], Pkt);
+
+request_cb({eval, RC, F}, App, Mask, T, TC, Fs, Pkt) ->
+    request_cb(RC, App, Mask, T, TC, Pkt, Fs),
     diameter_lib:eval(F).
 
-%% protocol_error/4
+%% protocol_error/5
 
-protocol_error(RC, {_, OH, OR}, TPid, #diameter_packet{avps = Avps} = Pkt) ->
+protocol_error(RC, {_, OH, OR}, TPid, Fs, Pkt) ->
+    #diameter_packet{avps = Avps} = Pkt,
     ?LOG({error, RC}, Pkt),
-    reply(answer_message({OH, OR, RC}, Avps), ?BASE, TPid, Pkt).
+    reply(answer_message({OH, OR, RC}, Avps), ?BASE, TPid, Fs, Pkt).
+
+%% protocol_error/4
 
-%% resend/5
+protocol_error(RC, T, TPid, Pkt) ->
+    protocol_error(RC, T, TPid, [], Pkt).
+
+%% resend/7
 %%
 %% Resend a message as a relay or proxy agent.
 
 resend(Opts,
        #diameter_app{} = App,
+       Mask,
        {_SvcName, OH, _OR} = T,
        {_TPid, _Caps} = TC,
+       Fs,
        #diameter_packet{avps = Avps} = Pkt) ->
     {Code, _Flags, Vid} = ?BASE:avp_header('Route-Record'),
-    resend(is_loop(Code, Vid, OH, Avps), Opts, App, T, TC, Pkt).
+    resend(is_loop(Code, Vid, OH, Avps), Opts, App, Mask, T, TC, Fs, Pkt).
 
 %%   DIAMETER_LOOP_DETECTED             3005
 %%      An agent detected a loop while trying to get the message to the
@@ -1854,8 +2084,8 @@ resend(Opts,
 %%      if one is available, but the peer reporting the error has
 %%      identified a configuration problem.
 
-resend(true, _, _, T, {TPid, _}, Pkt) ->  %% Route-Record loop
-    protocol_error(3005, T, TPid, Pkt);
+resend(true, _, _, _, T, {TPid, _}, Fs, Pkt) ->  %% Route-Record loop
+    protocol_error(3005, T, TPid, Fs, Pkt);
 
 %% 6.1.8.  Relaying and Proxying Requests
 %%
@@ -1866,16 +2096,18 @@ resend(true, _, _, T, {TPid, _}, Pkt) ->  %% Route-Record loop
 resend(false,
        Opts,
        App,
+       Mask,
        {SvcName, _, _} = T,
        {TPid, #diameter_caps{origin_host = {_, OH}}},
+       Fs,
        #diameter_packet{header = Hdr0,
                         avps = Avps}
        = Pkt) ->
     Route = #diameter_avp{data = {?BASE, 'Route-Record', OH}},
-    Seq = diameter_session:sequence(),
+    Seq = diameter_session:sequence(Mask),
     Hdr = Hdr0#diameter_header{hop_by_hop_id = Seq},
     Msg = [Hdr, Route | Avps],
-    resend(call(SvcName, App, Msg, Opts), T, TPid, Pkt).
+    resend(call(SvcName, App, Msg, Opts), T, TPid, Fs, Pkt).
 %% The incoming request is relayed with the addition of a
 %% Route-Record. Note the requirement on the return from call/4 below,
 %% which places a requirement on the value returned by the
@@ -1901,15 +2133,18 @@ resend(#diameter_packet{bin = B}
        = Pkt,
        _,
        TPid,
+       Fs,
        #diameter_packet{header = #diameter_header{hop_by_hop_id = Id},
                         transport_data = TD}) ->
-    send(TPid, Pkt#diameter_packet{bin = diameter_codec:hop_by_hop_id(Id, B),
-                                   transport_data = TD});
+    P = Pkt#diameter_packet{bin = diameter_codec:hop_by_hop_id(Id, B),
+                                   transport_data = TD},
+    eval_packet(P, Fs),
+    send(TPid, P);
 %% TODO: counters
 
 %% Or not: DIAMETER_UNABLE_TO_DELIVER.
-resend(_, T, TPid, Pkt) ->
-    protocol_error(3002, T, TPid, Pkt).
+resend(_, T, TPid, Fs, Pkt) ->
+    protocol_error(3002, T, TPid, Fs, Pkt).
 
 %% is_loop/4
 %%
@@ -1931,46 +2166,68 @@ is_loop(Code, Vid, OH, [_ | Avps])
 is_loop(Code, Vid, OH, Avps) ->
     is_loop(Code, Vid, ?BASE:avp(encode, OH, 'Route-Record'), Avps).
 
-%% reply/4
+%% reply/5
 %%
 %% Send a locally originating reply.
 
+%% Skip the setting of Result-Code and Failed-AVP's below.
+reply([Msg], Dict, TPid, Fs, Pkt)
+  when is_list(Msg);
+       is_tuple(Msg) ->
+    reply(Msg, Dict, TPid, Fs, Pkt#diameter_packet{errors = []});
+
 %% No errors or a diameter_header/avp list.
-reply(Msg, Dict, TPid, #diameter_packet{errors = Es,
-                                        transport_data = TD}
-                       = ReqPkt)
+reply(Msg, Dict, TPid, Fs, #diameter_packet{errors = Es} = ReqPkt)
   when [] == Es;
        is_record(hd(Msg), diameter_header) ->
     Pkt = diameter_codec:encode(Dict, make_answer_packet(Msg, ReqPkt)),
-    incr(send, Pkt, TPid),  %% count result codes in sent answers
-    send(TPid, Pkt#diameter_packet{transport_data = TD});
+    eval_packet(Pkt, Fs),
+    incr(send, Pkt, Dict, TPid),  %% count result codes in sent answers
+    send(TPid, Pkt);
 
 %% Or not: set Result-Code and Failed-AVP AVP's.
-reply(Msg, Dict, TPid, #diameter_packet{errors = [H|_] = Es} = Pkt) ->
+reply(Msg, Dict, TPid, Fs, #diameter_packet{errors = [H|_] = Es} = Pkt) ->
     reply(rc(Msg, rc(H), [A || {_,A} <- Es], Dict),
           Dict,
           TPid,
+          Fs,
           Pkt#diameter_packet{errors = []}).
 
+eval_packet(Pkt, Fs) ->
+    lists:foreach(fun(F) -> diameter_lib:eval([F,Pkt]) end, Fs).
+    
 %% make_answer_packet/2
 
+%% A reply message clears the R and T flags and retains the P flag.
+%% The E flag will be set at encode. 6.2 of 3588 requires the same P
+%% flag on an answer as on the request. A #diameter_packet{} returned
+%% from a handle_request callback can circumvent this by setting its
+%% own header values.
+make_answer_packet(#diameter_packet{header = Hdr,
+                                    msg = Msg,
+                                    transport_data = TD},
+                   #diameter_packet{header = ReqHdr}) ->
+    Hdr0 = ReqHdr#diameter_header{version = ?DIAMETER_VERSION,
+                                  is_request = false,
+                                  is_error = undefined,
+                                  is_retransmitted = false},
+    #diameter_packet{header = fold_record(Hdr0, Hdr),
+                     msg = Msg,
+                     transport_data = TD};
+
 %% Binaries and header/avp lists are sent as-is.
-make_answer_packet(Bin, _)
+make_answer_packet(Bin, #diameter_packet{transport_data = TD})
   when is_binary(Bin) ->
-    #diameter_packet{bin = Bin};
-make_answer_packet([#diameter_header{} | _] = Msg, _) ->
-    #diameter_packet{msg = Msg};
-
-%% Otherwise a reply message clears the R and T flags and retains the
-%% P flag. The E flag will be set at encode. 6.2 of 3588 requires the
-%% same P flag on an answer as on the request.
-make_answer_packet(Msg, #diameter_packet{header = ReqHdr}) ->
-    Hdr = ReqHdr#diameter_header{version = ?DIAMETER_VERSION,
-                                 is_request = false,
-                                 is_error = undefined,
-                                 is_retransmitted = false},
-    #diameter_packet{header = Hdr,
-                     msg = Msg}.
+    #diameter_packet{bin = Bin,
+                     transport_data = TD};
+make_answer_packet([#diameter_header{} | _] = Msg,
+                   #diameter_packet{transport_data = TD}) ->
+    #diameter_packet{msg = Msg,
+                     transport_data = TD};
+
+%% Otherwise, preserve transport_data.
+make_answer_packet(Msg, #diameter_packet{transport_data = TD} = Pkt) ->
+    make_answer_packet(#diameter_packet{msg = Msg, transport_data = TD}, Pkt).
 
 %% rc/1
 
@@ -1983,7 +2240,10 @@ rc(RC) ->
 
 rc(Rec, RC, Failed, Dict)
   when is_integer(RC) ->
-    set(Rec, [{'Result-Code', RC} | failed_avp(Rec, Failed, Dict)], Dict).
+    set(Rec,
+        lists:append([rc(Rec, {'Result-Code', RC}, Dict),
+                      failed_avp(Rec, Failed, Dict)]),
+        Dict).
 
 %% Reply as name and tuple list ...
 set([_|_] = Ans, Avps, _) ->
@@ -1993,6 +2253,22 @@ set([_|_] = Ans, Avps, _) ->
 set(Rec, Avps, Dict) ->
     Dict:'#set-'(Avps, Rec).
 
+%% rc/3
+%%
+%% Turn the result code into a list if its optional and only set it if
+%% the arity is 1 or {0,1}. In other cases (which probably shouldn't
+%% exist in practise) we can't know what's appropriate.
+
+rc([MsgName | _], {'Result-Code' = K, RC} = T, Dict) ->
+    case Dict:avp_arity(MsgName, 'Result-Code') of
+        1     -> [T];
+        {0,1} -> [{K, [RC]}];
+        _     -> []
+    end;
+
+rc(Rec, T, Dict) ->
+    rc([Dict:rec2msg(element(1, Rec))], T, Dict).
+
 %% failed_avp/3
 
 failed_avp(_, [] = No, _) ->
@@ -2200,44 +2476,39 @@ handle_answer(SvcName, _, {error, Req, Reason}) ->
 handle_answer(SvcName,
               AnswerErrors,
               {answer, #request{dictionary = Dict} = Req, Pkt}) ->
-    a(examine(diameter_codec:decode(Dict, Pkt)),
-      SvcName,
-      AnswerErrors,
-      Req).
+    answer(examine(diameter_codec:decode(Dict, Pkt)),
+           SvcName,
+           AnswerErrors,
+           Req).
 
 %% We don't really need to do a full decode if we're a relay and will
 %% just resend with a new hop by hop identifier, but might a proxy
 %% want to examine the answer?
 
-a(#diameter_packet{errors = []}
-  = Pkt,
-  SvcName,
-  AE,
-  #request{transport = TPid,
-           caps = Caps,
-           packet = P}
-  = Req) ->
+answer(Pkt, SvcName, AE, #request{transport = TPid,
+                                  dictionary = Dict}
+                         = Req) ->
     try
-        incr(in, Pkt, TPid)
+        incr(recv, Pkt, Dict, TPid)
     of
-        _ ->
-            cb(Req, handle_answer, [Pkt, msg(P), SvcName, {TPid, Caps}])
+        _ -> a(Pkt, SvcName, AE, Req)
     catch
         exit: {invalid_error_bit, _} = E ->
-            e(Pkt#diameter_packet{errors = [E]}, SvcName, AE, Req)
-    end;
+            a(Pkt#diameter_packet{errors = [E]}, SvcName, AE, Req)
+    end.
 
-a(#diameter_packet{} = Pkt, SvcName, AE, Req) ->
-    e(Pkt, SvcName, AE, Req).
+a(#diameter_packet{errors = Es} = Pkt, SvcName, AE, #request{transport = TPid,
+                                                             caps = Caps,
+                                                             packet = P}
+                                                    = Req)
+  when [] == Es;
+       callback == AE ->
+    cb(Req, handle_answer, [Pkt, msg(P), SvcName, {TPid, Caps}]);
 
-e(Pkt, SvcName, callback, #request{transport = TPid,
-                                   caps = Caps,
-                                   packet = Pkt}
-                          = Req) ->
-    cb(Req, handle_answer, [Pkt, msg(Pkt), SvcName, {TPid, Caps}]);
-e(Pkt, SvcName, report, Req) ->
+a(Pkt, SvcName, report, Req) ->
     x(errors, handle_answer, [SvcName, Req, Pkt]);
-e(Pkt, SvcName, discard, Req) ->
+
+a(Pkt, SvcName, discard, Req) ->
     x({errors, handle_answer, [SvcName, Req, Pkt]}).
 
 %% Note that we don't check that the application id in the answer's
@@ -2249,17 +2520,19 @@ e(Pkt, SvcName, discard, Req) ->
 %% Increment a stats counter for an incoming or outgoing message.
 
 %% TODO: fix
-incr(_, #diameter_packet{msg = undefined}, _) ->
+incr(_, #diameter_packet{msg = undefined}, _, _) ->
     ok;
 
-incr(Dir, Pkt, TPid)
-  when is_pid(TPid) ->
+incr(recv = D, #diameter_packet{header = H, errors = [_|_]}, _, TPid) ->
+    incr(TPid, {diameter_codec:msg_id(H), D, error});
+
+incr(Dir, Pkt, Dict, TPid) ->
     #diameter_packet{header = #diameter_header{is_error = E}
                             = Hdr,
                      msg = Rec}
         = Pkt,
 
-    RC = int(get_avp_value(?BASE, 'Result-Code', Rec)),
+    RC = int(get_avp_value(Dict, 'Result-Code', Rec)),
     PE = is_protocol_error(RC),
 
     %% Check that the E bit is set only for 3xxx result codes.
@@ -2267,15 +2540,21 @@ incr(Dir, Pkt, TPid)
         orelse (E andalso PE)
         orelse x({invalid_error_bit, RC}, answer, [Dir, Pkt]),
 
-    Ctr = rc_counter(Rec, RC),
-    is_tuple(Ctr)
-        andalso incr(TPid, {diameter_codec:msg_id(Hdr), Dir, Ctr}).
+    irc(TPid, Hdr, Dir, rc_counter(Dict, Rec, RC)).
+
+irc(_, _, _, undefined) ->
+    false;
+
+irc(TPid, Hdr, Dir, Ctr) ->
+    incr(TPid, {diameter_codec:msg_id(Hdr), Dir, Ctr}).
 
 %% incr/2
 
 incr(TPid, Counter) ->
     diameter_stats:incr(Counter, TPid, 1).
 
+%% error_counter/2
+
 %% RFC 3588, 7.6:
 %%
 %%   All Diameter answer messages defined in vendor-specific
@@ -2285,26 +2564,27 @@ incr(TPid, Counter) ->
 %% Maintain statistics assuming one or the other, not both, which is
 %% surely the intent of the RFC.
 
-rc_counter(_, RC)
-  when is_integer(RC) ->
-    {'Result-Code', RC};
-rc_counter(Rec, _) ->
-    rcc(get_avp_value(?BASE, 'Experimental-Result', Rec)).
+rc_counter(Dict, Rec, undefined) ->
+    er(get_avp_value(Dict, 'Experimental-Result', Rec));
+rc_counter(_, _, RC) ->
+    {'Result-Code', RC}.
 
 %% Outgoing answers may be in any of the forms messages can be sent
 %% in. Incoming messages will be records. We're assuming here that the
 %% arity of the result code AVP's is 0 or 1.
 
-rcc([{_,_,RC} = T])
-  when is_integer(RC) ->
+er([{_,_,N} = T | _])
+  when is_integer(N) ->
     T;
-rcc({_,_,RC} = T)
-  when is_integer(RC) ->
+er({_,_,N} = T)
+  when is_integer(N) ->
     T;
-rcc(_) ->
+er(_) ->
     undefined.
 
-int([N])
+%% Extract the first good looking integer. There's no guarantee
+%% that what we're looking for has arity 1.
+int([N|_])
   when is_integer(N) ->
     N;
 int(N)
@@ -2349,8 +2629,11 @@ rt(#request{packet = #diameter_packet{msg = undefined}}, _) ->
     false;  %% TODO: Not what we should do.
 
 %% ... or not.
-rt(#request{packet = #diameter_packet{msg = Msg}} = Req, S) ->
-    find_transport(get_destination(Msg), Req, S).
+rt(#request{packet = #diameter_packet{msg = Msg},
+            dictionary = Dict}
+   = Req,
+   S) ->
+    find_transport(get_destination(Dict, Msg), Req, S).
 
 %%% ---------------------------------------------------------------------------
 %%% # report_status/5
@@ -2383,7 +2666,7 @@ send_event(#diameter_event{service = SvcName} = E) ->
 %%% # share_peer/5
 %%% ---------------------------------------------------------------------------
 
-share_peer(up, Caps, Aliases, TPid, #state{share_peers = true,
+share_peer(up, Caps, Aliases, TPid, #state{options = [_, {_, true} | _],
                                            service_name = Svc}) ->
     diameter_peer:notify(Svc, {peer, TPid, Aliases, Caps});
 
@@ -2394,11 +2677,11 @@ share_peer(_, _, _, _, _) ->
 %%% # share_peers/2
 %%% ---------------------------------------------------------------------------
 
-share_peers(Pid, #state{share_peers = true,
+share_peers(Pid, #state{options = [_, {_, true} | _],
                         local_peers = PDict}) ->
     ?Dict:fold(fun(A,Ps,ok) -> sp(Pid, A, Ps), ok end, ok, PDict);
 
-share_peers(_, #state{share_peers = false}) ->
+share_peers(_, _) ->
     ok.
 
 sp(Pid, Alias, Peers) ->
@@ -2408,39 +2691,31 @@ sp(Pid, Alias, Peers) ->
 %%% # remote_peer_up/4
 %%% ---------------------------------------------------------------------------
 
-remote_peer_up(Pid, Aliases, Caps, #state{use_shared_peers = true,
+remote_peer_up(Pid, Aliases, Caps, #state{options = [_, _, {_, true} | _],
                                           service = Svc,
-                                          shared_peers = PDict}
-                                   = S) ->
+                                          shared_peers = PDict}) ->
     #diameter_service{applications = Apps} = Svc,
-    Update = lists:filter(fun(A) ->
-                                  lists:keymember(A, #diameter_app.alias, Apps)
-                          end,
-                          Aliases),
-    S#state{shared_peers = rpu(Pid, Caps, PDict, Update)};
+    Key = #diameter_app.alias,
+    As = lists:filter(fun(A) -> lists:keymember(A, Key, Apps) end, Aliases),
+    rpu(Pid, Caps, PDict, As);
 
-remote_peer_up(_, _, _, #state{use_shared_peers = false} = S) ->
-    S.
+remote_peer_up(_, _, _, #state{options = [_, _, {_, false} | _]}) ->
+    ok.
 
 rpu(_, _, PDict, []) ->
     PDict;
 rpu(Pid, Caps, PDict, Aliases) ->
     erlang:monitor(process, Pid),
     T = {Pid, Caps},
-    lists:foldl(fun(A,D) -> ?Dict:append(A, T, D) end,
-                PDict,
-                Aliases).
+    lists:foreach(fun(A) -> ?Dict:append(A, T, PDict) end, Aliases).
 
 %%% ---------------------------------------------------------------------------
 %%% # remote_peer_down/2
 %%% ---------------------------------------------------------------------------
 
-remote_peer_down(Pid, #state{use_shared_peers = true,
-                             shared_peers = PDict}
-                      = S) ->
-    S#state{shared_peers = lists:foldl(fun(A,D) -> rpd(Pid, A, D) end,
-                                       PDict,
-                                       ?Dict:fetch_keys(PDict))}.
+remote_peer_down(Pid, #state{options = [_, _, {_, true} | _],
+                             shared_peers = PDict}) ->
+    lists:foreach(fun(A) -> rpd(Pid, A, PDict) end, ?Dict:fetch_keys(PDict)).
 
 rpd(Pid, Alias, PDict) ->
     ?Dict:update(Alias, fun(Ps) -> lists:keydelete(Pid, 1, Ps) end, PDict).
@@ -2462,12 +2737,12 @@ find_transport({alias, Alias}, Msg, Opts, #state{service = Svc} = S) ->
 find_transport(#diameter_app{} = App, Msg, Opts, S) ->
     ft(App, Msg, Opts, S).
 
-ft(#diameter_app{module = Mod} = App, Msg, Opts, S) ->
+ft(#diameter_app{module = Mod, dictionary = Dict} = App, Msg, Opts, S) ->
     #options{filter = Filter,
              extra = Xtra}
         = Opts,
     pick_peer(App#diameter_app{module = Mod ++ Xtra},
-              get_destination(Msg),
+              get_destination(Dict, Msg),
               Filter,
               S);
 ft(false = No, _, _, _) ->
@@ -2503,11 +2778,11 @@ find_transport([_,_] = RH,
               Filter,
               S).
 
-%% get_destination/1
+%% get_destination/2
 
-get_destination(Msg) ->
-    [str(get_avp_value(?BASE, 'Destination-Realm', Msg)),
-     str(get_avp_value(?BASE, 'Destination-Host', Msg))].
+get_destination(Dict, Msg) ->
+    [str(get_avp_value(Dict, 'Destination-Realm', Msg)),
+     str(get_avp_value(Dict, 'Destination-Host', Msg))].
 
 %% This is not entirely correct. The avp could have an arity 1, in
 %% which case an empty list is a DiameterIdentity of length 0 rather
@@ -2531,6 +2806,15 @@ str(T) ->
 %% question. The third form allows messages to be sent as is, without
 %% a dictionary, which is needed in the case of relay agents, for one.
 
+%% Messages will be header/avps list as a relay and the only AVP's we
+%% look for are in the common dictionary. This is required since the
+%% relay dictionary doesn't inherit the common dictionary (which maybe
+%% it should).
+get_avp_value(?RELAY, Name, Msg) ->
+    get_avp_value(?BASE, Name, Msg);
+
+%% Message sent as a header/avps list, probably a relay case but not
+%% necessarily.
 get_avp_value(Dict, Name, [#diameter_header{} | Avps]) ->
     try
         {Code, _, VId} = Dict:avp_header(Name),
@@ -2544,6 +2828,7 @@ get_avp_value(Dict, Name, [#diameter_header{} | Avps]) ->
             undefined
     end;
 
+%% Outgoing message as a name/values list.
 get_avp_value(_, Name, [_MsgName | Avps]) ->
     case lists:keyfind(Name, 1, Avps) of
         {_, V} ->
@@ -2552,6 +2837,11 @@ get_avp_value(_, Name, [_MsgName | Avps]) ->
             undefined
     end;
 
+%% Record might be an answer message in the common dictionary.
+get_avp_value(Dict, Name, Rec)
+  when Dict /= ?BASE, element(1, Rec) == 'diameter_base_answer-message' ->
+    get_avp_value(?BASE, Name, Rec);
+
 %% Message is typically a record but not necessarily: diameter:call/4
 %% can be passed an arbitrary term.
 get_avp_value(Dict, Name, Rec) ->
@@ -2746,20 +3036,59 @@ transports(#state{peerT = PeerT}) ->
                    'Vendor-Specific-Application-Id',
                    'Firmware-Revision']).
 
+%% The config returned by diameter:service_info(SvcName, all).
 -define(ALL_INFO, [capabilities,
                    applications,
                    transport,
                    pending,
-                   statistics]).
+                   options]).
+
+%% The rest.
+-define(OTHER_INFO, [connections,
+                     name,
+                     peers,
+                     statistics]).
 
-service_info(Items, S)
-  when is_list(Items) ->
-    [{complete(I), service_info(I,S)} || I <- Items];
 service_info(Item, S)
   when is_atom(Item) ->
-    service_info(Item, S, true).
+    case tagged_info(Item, S) of
+        {_, T} -> T;
+        undefined = No -> No
+    end;
+
+service_info(Items, S) ->
+    tagged_info(Items, S).
+
+tagged_info(Item, S)
+  when is_atom(Item) ->
+    case complete(Item) of
+        {value, I} ->
+            {I, complete_info(I,S)};
+        false ->
+            undefined
+    end;
 
-service_info(Item, #state{service = Svc} = S, Complete) ->
+tagged_info(TPid, #state{peerT = PT, connT = CT})
+  when is_pid(TPid) ->
+    try
+        [#conn{peer = Pid}] = ets:lookup(CT, TPid),
+        [#peer{ref = Ref, type = Type, options = Opts}] = ets:lookup(PT, Pid),
+        [{ref, Ref},
+         {type, Type},
+         {options, Opts}]
+    catch
+        error:_ ->
+            []
+    end;
+
+tagged_info(Items, S)
+  when is_list(Items) ->
+    [T || I <- Items, T <- [tagged_info(I,S)], T /= undefined, T /= []];
+
+tagged_info(_, _) ->
+    undefined.
+
+complete_info(Item, #state{service = Svc} = S) ->
     case Item of
         name ->
             S#state.service_name;
@@ -2802,85 +3131,176 @@ service_info(Item, #state{service = Svc} = S, Complete) ->
         capabilities -> service_info(?CAP_INFO, S);
         applications -> info_apps(S);
         transport    -> info_transport(S);
+        options      -> info_options(S);
         pending      -> info_pending(S);
-        statistics   -> info_stats(S);
-        keys         -> ?ALL_INFO ++ ?CAP_INFO;  %% mostly for test
+        keys         -> ?ALL_INFO ++ ?CAP_INFO ++ ?OTHER_INFO;
         all          -> service_info(?ALL_INFO, S);
-        _ when Complete   -> service_info(complete(Item), S, false);
-        _            -> undefined
+        statistics   -> info_stats(S);
+        connections  -> info_connections(S);
+        peers        -> info_peers(S)
     end.
 
+complete(I)
+  when I == keys;
+       I == all ->
+    {value, I};
 complete(Pre) ->
     P = atom_to_list(Pre),
-    case [I || I <- [name | ?ALL_INFO] ++ ?CAP_INFO,
+    case [I || I <- ?ALL_INFO ++ ?CAP_INFO ++ ?OTHER_INFO,
                lists:prefix(P, atom_to_list(I))]
     of
-        [I] -> I;
-        _   -> Pre
+        [I] -> {value, I};
+        _   -> false
     end.
 
+%% info_stats/1
+
 info_stats(#state{peerT = PeerT}) ->
-    Peers = ets:select(PeerT, [{#peer{ref = '$1', conn = '$2', _ = '_'},
-                                [{'is_pid', '$2'}],
-                                [['$1', '$2']]}]),
-    diameter_stats:read(lists:append(Peers)).
-%% TODO: include peer identities in return value
-
-info_transport(#state{peerT = PeerT, connT = ConnT}) ->
-    dict:fold(fun it/3,
+    MatchSpec = [{#peer{ref = '$1', conn = '$2', _ = '_'},
+                  [{'is_pid', '$2'}],
+                  [['$1', '$2']]}],
+    try ets:select(PeerT, MatchSpec) of
+        L ->
+            diameter_stats:read(lists:append(L))
+    catch
+        error: badarg -> []  %% service  has gone down
+    end.
+
+%% info_transport/1
+%%
+%% One entry per configured transport. Statistics for each entry are
+%% the accumulated values for the ref and associated peer pids.
+
+info_transport(S) ->
+    PeerD = peer_dict(S, config_dict(S)),
+    RefsD = dict:map(fun(_, Ls) -> [P || L <- Ls, {peer, {P,_}} <- L] end,
+                     PeerD),
+    Refs = lists:append(dict:fold(fun(R, Ps, A) -> [[R|Ps] | A] end,
+                                  [],
+                                  RefsD)),
+    Stats = diameter_stats:read(Refs),
+    dict:fold(fun(R, Ls, A) ->
+                      Ps = dict:fetch(R, RefsD),
+                      [[{ref, R} | transport(Ls)] ++ [stats([R|Ps], Stats)]
+                       | A]
+              end,
               [],
-              ets:foldl(fun(T,A) -> it_acc(ConnT, A, T) end,
-                        dict:new(),
-                        PeerT)).
-
-it(Ref, [[{type, connect} | _] = L], Acc) ->
-    [[{ref, Ref} | L] | Acc];
-it(Ref, [[{type, accept}, {options, Opts} | _] | _] = L, Acc) ->
-    [[{ref, Ref},
-      {type, listen},
-      {options, Opts},
-      {accept, [lists:nthtail(2,A) || A <- L]}]
-     | Acc].
-%% Each entry has the same Opts. (TODO)
-
-it_acc(ConnT, Acc, #peer{pid = Pid,
-                         type = Type,
-                         ref = Ref,
-                         options = Opts,
-                         op_state = OS,
-                         started = T,
-                         conn = TPid}) ->
+              PeerD).
+
+%% Only a config entry for a listening transport: use it.
+transport([[{type, listen}, _] = L]) ->
+    L ++ [{accept, []}];
+
+%% Only one config or peer entry for a connecting transport: use it.
+transport([[{type, connect} | _] = L]) ->
+    L;
+
+%% Peer entries: discard config. Note that the peer entries have
+%% length at least 3.
+transport([[_,_] | L]) ->
+    transport(L);
+
+%% Possibly many peer entries for a listening transport. Note that all
+%% have the same options by construction, which is not terribly space
+%% efficient. (TODO: all entries for the same Ref should share options.)
+transport([[{type, accept}, {options, Opts} | _] | _] = Ls) ->
+    [{type, listen},
+     {options, Opts},
+     {accept, [lists:nthtail(2,L) || L <- Ls]}].
+
+peer_dict(#state{peerT = PeerT, connT = ConnT}, Dict0) ->
+    try ets:tab2list(PeerT) of
+        L ->
+            lists:foldl(fun(T,A) -> peer_acc(ConnT, A, T) end, Dict0, L)
+    catch
+        error: badarg -> Dict0  %% service has gone down
+    end.
+
+peer_acc(ConnT, Acc, #peer{pid = Pid,
+                           type = Type,
+                           ref = Ref,
+                           options = Opts,
+                           op_state = OS,
+                           started = T,
+                           conn = TPid}) ->
+    WS = wd_state(OS),
     dict:append(Ref,
                 [{type, Type},
                  {options, Opts},
-                 {watchdog, {Pid, T, OS}}
-                 | info_conn(ConnT, TPid)],
+                 {watchdog, {Pid, T, WS}}
+                 | info_conn(ConnT, TPid, WS /= ?WD_DOWN)],
                 Acc).
 
-info_conn(ConnT, TPid) ->
-    info_conn(ets:lookup(ConnT, TPid)).
+info_conn(ConnT, TPid, true)
+  when is_pid(TPid) ->
+    try ets:lookup(ConnT, TPid) of
+        T -> info_conn(T)
+    catch
+        error: badarg -> []  %% service has gone down
+    end;
+info_conn(_, _, _) ->
+    [].
+
+%% The point of extracting the config here is so that 'transport' info
+%% has one entry for each transport ref, the peer table only
+%% containing entries that have a living watchdog.
+
+config_dict(#state{service_name = SvcName}) ->
+    lists:foldl(fun config_acc/2,
+                dict:new(),
+                diameter_config:lookup(SvcName)).
+
+config_acc({Ref, T, Opts}, Dict)
+  when T == listen;
+       T == connect ->
+    dict:store(Ref, [[{type, T}, {options, Opts}]], Dict);
+config_acc(_, Dict) ->
+    Dict.
+
+wd_state({_,S}) ->
+    S;
+wd_state(?STATE_UP) ->
+    ?WD_OKAY;
+wd_state(?STATE_DOWN) ->
+    ?WD_DOWN.
 
 info_conn([#conn{pid = Pid, apps = SApps, caps = Caps, started = T}]) ->
     [{peer, {Pid, T}},
      {apps, SApps},
-     {caps, info_caps(Caps)}];
+     {caps, info_caps(Caps)}
+     | try [{port, info_port(Pid)}] catch _:_ -> [] end];
 info_conn([] = No) ->
     No.
 
+%% Extract information that the processes involved are expected to
+%% "publish" in their process dictionaries. Simple but backhanded.
+info_port(Pid) ->
+    {_, PD} = process_info(Pid, dictionary),
+    {_, T} = lists:keyfind({diameter_peer_fsm, start}, 1, PD),
+    {TPid, {_Type, TMod, _Cfg}} = T,
+    {_, TD} = process_info(TPid, dictionary),
+    {_, Data} = lists:keyfind({TMod, info}, 1, TD),
+    [{owner, TPid},
+     {module, TMod}
+     | try TMod:info(Data) catch _:_ -> [] end].
+
+%% Use the fields names from diameter_caps instead of
+%% diameter_base_CER to distinguish between the 2-tuple values
+%% compared to the single capabilities values. Note also that the
+%% returned list is tagged 'caps' rather than 'capabilities' to
+%% emphasize the difference.
 info_caps(#diameter_caps{} = C) ->
     lists:zip(record_info(fields, diameter_caps), tl(tuple_to_list(C))).
 
 info_apps(#state{service = #diameter_service{applications = Apps}}) ->
     lists:map(fun mk_app/1, Apps).
 
-mk_app(#diameter_app{alias = Alias,
-                     dictionary = Dict,
-                     module = ModX,
-                     id = Id}) ->
-    [{alias, Alias},
-     {dictionary, Dict},
-     {module, ModX},
-     {id, Id}].
+mk_app(#diameter_app{} = A) ->
+    lists:zip(record_info(fields, diameter_app), tl(tuple_to_list(A))).
+
+%% info_pending/1
+%%
+%% One entry for each outgoing request whose answer is outstanding.
 
 info_pending(#state{} = S) ->
     MatchSpec = [{{'$1',
@@ -2894,4 +3314,67 @@ info_pending(#state{} = S) ->
                             {{transport, '$2'}},
                             {{from, '$3'}}]}}]}],
 
-    ets:select(?REQUEST_TABLE, MatchSpec).
+    try
+        ets:select(?REQUEST_TABLE, MatchSpec)
+    catch
+        error: badarg -> []  %% service has gone down
+    end.
+
+%% info_connections/1
+%%
+%% One entry per transport connection. Statistics for each entry are
+%% for the peer pid only.
+
+info_connections(S) ->
+    ConnL = conn_list(S),
+    Stats = diameter_stats:read([P || L <- ConnL, {peer, {P,_}} <- L]),
+    [L ++ [stats([P], Stats)] || L <- ConnL, {peer, {P,_}} <- L].
+
+conn_list(S) ->
+    lists:append(dict:fold(fun conn_acc/3, [], peer_dict(S, dict:new()))).
+
+conn_acc(Ref, Peers, Acc) ->
+    [[[{ref, Ref} | L] || L <- Peers, lists:keymember(peer, 1, L)]
+     | Acc].
+
+stats(Refs, Stats) ->
+    {statistics, dict:to_list(lists:foldl(fun(R,D) ->
+                                                  stats_acc(R, D, Stats)
+                                          end,
+                                          dict:new(),
+                                          Refs))}.
+
+stats_acc(Ref, Dict, Stats) ->
+    lists:foldl(fun({C,N}, D) -> dict:update_counter(C, N, D) end,
+                Dict,
+                proplists:get_value(Ref, Stats, [])).
+
+%% info_peers/1
+%%
+%% One entry per peer Origin-Host. Statistics for each entry are
+%% accumulated values for all peer pids.
+
+info_peers(S) ->
+    {PeerD, RefD} = lists:foldl(fun peer_acc/2,
+                                {dict:new(), dict:new()},
+                                conn_list(S)),
+    Refs = lists:append(dict:fold(fun(_, Rs, A) -> [Rs|A] end,
+                                  [],
+                                  RefD)),
+    Stats = diameter_stats:read(Refs),
+    dict:fold(fun(OH, Cs, A) ->
+                      Rs = dict:fetch(OH, RefD),
+                      [{OH, [{connections, Cs}, stats(Rs, Stats)]} | A]
+              end,
+              [],
+              PeerD).
+
+peer_acc(Peer, {PeerD, RefD}) ->
+    [{TPid, _}, [{origin_host, {_, OH}} | _]]
+        = [proplists:get_value(K, Peer) || K <- [peer, caps]],
+    {dict:append(OH, Peer, PeerD), dict:append(OH, TPid, RefD)}.
+
+%% info_options/1
+
+info_options(S) ->
+    S#state.options.
diff --git a/lib/diameter/src/base/diameter_session.erl b/lib/diameter/src/base/diameter_session.erl
index 4c468f207c..3b236f109a 100644
--- a/lib/diameter/src/base/diameter_session.erl
+++ b/lib/diameter/src/base/diameter_session.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -20,6 +20,7 @@
 -module(diameter_session).
 
 -export([sequence/0,
+         sequence/1,
          session_id/1,
          origin_state_id/0]).
 
@@ -30,7 +31,7 @@
 -define(INT32, 16#FFFFFFFF).
 
 %% ---------------------------------------------------------------------------
-%% # sequence/0
+%% # sequence/0-1
 %%
 %% Output: 32-bit
 %% ---------------------------------------------------------------------------
@@ -77,6 +78,15 @@ sequence() ->
     Instr = {_Pos = 2, _Incr = 1, _Threshold = ?INT32, _SetVal = 0},
     ets:update_counter(diameter_sequence, sequence, Instr).
 
+-spec sequence(diameter:sequence())
+   -> diameter:'Unsigned32'().
+
+sequence({_,32}) ->
+    sequence();
+
+sequence({H,N}) ->
+    (H bsl N) bor (sequence() band (1 bsl N - 1)).
+
 %% ---------------------------------------------------------------------------
 %% # origin_state_id/0
 %% ---------------------------------------------------------------------------
diff --git a/lib/diameter/src/base/diameter_stats.erl b/lib/diameter/src/base/diameter_stats.erl
index 71479afa95..70727d068e 100644
--- a/lib/diameter/src/base/diameter_stats.erl
+++ b/lib/diameter/src/base/diameter_stats.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -22,14 +22,13 @@
 %%
 
 -module(diameter_stats).
--compile({no_auto_import, [monitor/2]}).
 
 -behaviour(gen_server).
 
--export([reg/1, reg/2,
-         incr/1, incr/2, incr/3,
+-export([reg/2, reg/1,
+         incr/3, incr/1,
          read/1,
-         flush/0, flush/1]).
+         flush/1]).
 
 %% supervisor callback
 -export([start_link/0]).
@@ -48,123 +47,105 @@
 
 -include("diameter_internal.hrl").
 
-%% ets table containing stats. reg(Pid, Ref) inserts a {Pid, Ref},
-%% incr(Counter, X, N) updates the counter keyed at {Counter, X}, and
-%% Pid death causes counters keyed on {Counter, Pid} to be deleted and
-%% added to those keyed on {Counter, Ref}.
+%% ets table containing 2-tuple stats. reg(Pid, Ref) inserts a {Pid,
+%% Ref}, incr(Counter, X, N) updates the counter keyed at {Counter,
+%% X}, and Pid death causes counters keyed on {Counter, Pid} to be
+%% deleted and added to those keyed on {Counter, Ref}.
 -define(TABLE, ?MODULE).
 
 %% Name of registered server.
 -define(SERVER, ?MODULE).
 
-%% Entries in the table.
--define(REC(Key, Value), {Key, Value}).
-
 %% Server state.
 -record(state, {id = now()}).
 
 -type counter() :: any().
--type contrib() :: any().
-
-%%% ---------------------------------------------------------------------------
-%%% # reg(Pid, Contrib)
-%%%
-%%% Description: Register a process as a contributor of statistics
-%%%              associated with a specified term. Statistics can be
-%%%              contributed by specifying either Pid or Contrib as
-%%%              the second argument to incr/3. Statistics contributed
-%%%              by Pid are folded into the corresponding entry for
-%%%              Contrib when the process dies.
-%%%
-%%%              Contrib can be any term but should not be a pid
-%%%              passed as the first argument to reg/2. Subsequent
-%%%              registrations for the same Pid overwrite the association
-%%% ---------------------------------------------------------------------------
-
--spec reg(pid(), contrib())
-   -> true.
+-type ref() :: any().
+
+%% ---------------------------------------------------------------------------
+%% # reg(Pid, Ref)
+%%
+%% Register a process as a contributor of statistics associated with a
+%% specified term. Statistics can be contributed by specifying either
+%% Pid or Ref as the second argument to incr/3. Statistics contributed
+%% by Pid are folded into the corresponding entry for Ref when the
+%% process dies.
+%% ---------------------------------------------------------------------------
+
+-spec reg(pid(), ref())
+   -> boolean().
 
-reg(Pid, Contrib)
+reg(Pid, Ref)
   when is_pid(Pid) ->
-    call({reg, Pid, Contrib}).
+    call({reg, Pid, Ref}).
 
--spec reg(contrib())
+-spec reg(ref())
    -> true.
 
 reg(Ref) ->
     reg(self(), Ref).
 
-%%% ---------------------------------------------------------------------------
-%%% # incr(Counter, Contrib, N)
-%%%
-%%% Description: Increment a counter for the specified contributor.
-%%%
-%%%              Contrib will typically be an argument passed to reg/2
-%%%              but there's nothing that requires this. In particular,
-%%%              if Contrib is a pid that hasn't been registered then
-%%%              counters are unaffected by the death of the process.
-%%% ---------------------------------------------------------------------------
-
--spec incr(counter(), contrib(), integer())
-   -> integer().
+%% ---------------------------------------------------------------------------
+%% # incr(Counter, Ref, N)
+%%
+%% Increment a counter for the specified contributor.
+%%
+%% Ref will typically be an argument passed to reg/2 but there's
+%% nothing that requires this. Only registered pids can contribute
+%% counters however, otherwise incr/3 is a no-op.
+%% ---------------------------------------------------------------------------
 
-incr(Ctr, Contrib, N) ->
-    update_counter({Ctr, Contrib}, N).
+-spec incr(counter(), ref(), integer())
+   -> integer() | false.
 
-incr(Ctr, N)
+incr(Ctr, Ref, N)
   when is_integer(N) ->
-    incr(Ctr, self(), N);
-
-incr(Ctr, Contrib) ->
-    incr(Ctr, Contrib, 1).
+    update_counter({Ctr, Ref}, N).
 
 incr(Ctr) ->
     incr(Ctr, self(), 1).
 
-%%% ---------------------------------------------------------------------------
-%%% # read(Contribs)
-%%%
-%%% Description: Retrieve counters for the specified contributors.
-%%% ---------------------------------------------------------------------------
+%% ---------------------------------------------------------------------------
+%% # read(Refs)
+%%
+%% Retrieve counters for the specified contributors.
+%% ---------------------------------------------------------------------------
 
--spec read([contrib()])
-   -> [{contrib(), [{counter(), integer()}]}].
+-spec read([ref()])
+   -> [{ref(), [{counter(), integer()}]}].
 
-read(Contribs) ->
-    lists:foldl(fun(?REC({T,C}, N), D) -> orddict:append(C, {T,N}, D) end,
+read(Refs) ->
+    read(Refs, false).
+
+read(Refs, B) ->
+    MatchSpec = [{{{'_', '$1'}, '_'},
+                  [?ORCOND([{'=:=', '$1', {const, R}}
+                            || R <- Refs])],
+                  ['$_']}],
+    L = ets:select(?TABLE, MatchSpec),
+    B andalso delete(L),
+    lists:foldl(fun({{C,R}, N}, D) -> orddict:append(R, {C,N}, D) end,
                 orddict:new(),
-                ets:select(?TABLE, [{?REC({'_', '$1'}, '_'),
-                                     [?ORCOND([{'=:=', '$1', {const, C}}
-                                               || C <- Contribs])],
-                                     ['$_']}])).
-
-%%% ---------------------------------------------------------------------------
-%%% # flush(Contrib)
-%%%
-%%% Description: Retrieve and delete statistics for the specified
-%%%              contributor.
-%%%
-%%%              If Contrib is a pid registered with reg/2 then statistics
-%%%              for both and its associated contributor are retrieved.
-%%% ---------------------------------------------------------------------------
-
--spec flush(contrib())
-   -> [{counter(), integer()}].
+                L).
+
+%% ---------------------------------------------------------------------------
+%% # flush(Refs)
+%%
+%% Retrieve and delete statistics for the specified contributors.
+%% ---------------------------------------------------------------------------
+
+-spec flush([ref()])
+   -> [{ref(), {counter(), integer()}}].
                    
-flush(Contrib) ->
+flush(Refs) ->
     try
-        call({flush, Contrib})
+        call({flush, Refs})
     catch
         exit: _ ->
             []
     end.
 
-flush() ->
-    flush(self()).
-
-%%% ---------------------------------------------------------
-%%% EXPORTED INTERNAL FUNCTIONS
-%%% ---------------------------------------------------------
+%% ===========================================================================
 
 start_link() ->
     ServerName = {local, ?SERVER},
@@ -179,18 +160,16 @@ state() ->
 uptime() ->
     call(uptime).
 
-%%% ----------------------------------------------------------
-%%% # init(_)
-%%%
-%%% Output: {ok, State}
-%%% ----------------------------------------------------------
+%% ----------------------------------------------------------
+%% # init/1
+%% ----------------------------------------------------------
 
 init([]) ->
     ets:new(?TABLE, [named_table, ordered_set, public]),
     {ok, #state{}}.
 
 %% ----------------------------------------------------------
-%% handle_call(Request, From, State)
+%% # handle_call/3
 %% ----------------------------------------------------------
 
 handle_call(state, _, State) ->
@@ -199,31 +178,31 @@ handle_call(state, _, State) ->
 handle_call(uptime, _, #state{id = Time} = State) ->
     {reply, diameter_lib:now_diff(Time), State};
 
-handle_call({reg, Pid, Contrib}, _From, State) ->
-    monitor(not ets:member(?TABLE, Pid), Pid),
-    {reply, insert(?REC(Pid, Contrib)), State};
+handle_call({incr, T}, _, State) ->
+    {reply, update_counter(T), State};
 
-handle_call({flush, Contrib}, _From, State) ->
-    {reply, fetch(Contrib), State};
+handle_call({reg, Pid, Ref}, _From, State) ->
+    B = ets:insert_new(?TABLE, {Pid, Ref}),
+    B andalso erlang:monitor(process, Pid),
+    {reply, B, State};
+
+handle_call({flush, Refs}, _From, State) ->
+    {reply, read(Refs, true), State};
 
 handle_call(Req, From, State) ->
     ?UNEXPECTED([Req, From]),
     {reply, nok, State}.
 
 %% ----------------------------------------------------------
-%% handle_cast(Request, State)
+%% # handle_cast/2
 %% ----------------------------------------------------------
 
-handle_cast({incr, Rec}, State) ->
-    update_counter(Rec),
-    {noreply, State};
-
 handle_cast(Msg, State) ->
     ?UNEXPECTED([Msg]),
     {noreply, State}.
 
 %% ----------------------------------------------------------
-%% handle_info(Request, State)
+%% # handle_info/2
 %% ----------------------------------------------------------
 
 handle_info({'DOWN', _MRef, process, Pid, _}, State) ->
@@ -235,91 +214,62 @@ handle_info(Info, State) ->
     {noreply, State}.
 
 %% ----------------------------------------------------------
-%% terminate(Reason, State)
+%% # terminate/2
 %% ----------------------------------------------------------
 
 terminate(_Reason, _State) ->
     ok.
 
 %% ----------------------------------------------------------
-%% code_change(OldVsn, State, Extra)
+%% # code_change/3
 %% ----------------------------------------------------------
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
-%%% ---------------------------------------------------------
-%%% INTERNAL FUNCTIONS
-%%% ---------------------------------------------------------
-
-%% monitor/2
-
-monitor(true, Pid) ->
-    erlang:monitor(process, Pid);
-monitor(false = No, _) ->
-    No.
+%% ===========================================================================
 
 %% down/1
 
 down(Pid) ->
-    L = ets:match_object(?TABLE, ?REC({'_', Pid}, '_')),
-    [?REC(_, Ref) = T] = lookup(Pid),
+    down(lookup(Pid), ets:match_object(?TABLE, {{'_', Pid}, '_'})).
+
+down([{_, Ref} = T], L) ->
     fold(Ref, L),
-    delete_object(T),
+    delete([T|L]);
+down([], L) -> %% flushed
     delete(L).
 
-%% Fold Pid-based entries into Ref-based ones.
+%% Fold pid-based entries into ref-based ones.
 fold(Ref, L) ->
-    lists:foreach(fun(?REC({K, _}, V)) -> update_counter({{K, Ref}, V}) end,
-                  L).
-
-delete(Objs) ->
-    lists:foreach(fun delete_object/1, Objs).
-
-%% fetch/1
-
-fetch(X) ->
-    MatchSpec = [{?REC({'_', '$1'}, '_'),
-                  [?ORCOND([{'==', '$1', {const, T}} || T <- [X | ref(X)]])],
-                  ['$_']}],
-    L = ets:select(?TABLE, MatchSpec),
-    delete(L),
-    D = lists:foldl(fun sum/2, dict:new(), L),
-    dict:to_list(D).
-
-sum({{Ctr, _}, N}, Dict) ->
-    dict:update(Ctr, fun(V) -> V+N end, N, Dict).
-
-ref(Pid)
-  when is_pid(Pid) ->
-    ets:select(?TABLE, [{?REC(Pid, '$1'), [], ['$1']}]);
-ref(_) ->
-    [].
+    lists:foreach(fun({{K, _}, V}) -> update_counter({{K, Ref}, V}) end, L).
 
 %% update_counter/2
 %%
-%% From an arbitrary request process. Cast to the server process to
-%% insert a new element if the counter doesn't exists so that two
-%% processes don't do so simultaneously.
+%% From an arbitrary process. Call to the server process to insert a
+%% new element if the counter doesn't exists so that two processes
+%% don't insert simultaneously.
 
 update_counter(Key, N) ->
     try
         ets:update_counter(?TABLE, Key, N)
     catch
         error: badarg ->
-            cast({incr, ?REC(Key, N)})
+            call({incr, {Key, N}})
     end.
 
 %% update_counter/1
 %%
-%% From the server process.
+%% From the server process, when update_counter/2 failed due to a
+%% non-existent entry.
 
-update_counter(?REC(Key, N) = T) ->
+update_counter({{_Ctr, Ref} = Key, N} = T) ->
     try
         ets:update_counter(?TABLE, Key, N)
     catch
         error: badarg ->
-            insert(T)
+            (not is_pid(Ref) orelse ets:member(?TABLE, Ref))
+                andalso begin insert(T), N end
     end.
 
 insert(T) ->
@@ -328,13 +278,8 @@ insert(T) ->
 lookup(Key) ->
     ets:lookup(?TABLE, Key).
 
-delete_object(T) ->
-    ets:delete_object(?TABLE, T).
-
-%% cast/1
-
-cast(Msg) ->
-    gen_server:cast(?SERVER, Msg).
+delete(Objs) ->
+    lists:foreach(fun({K,_}) -> ets:delete(?TABLE, K) end, Objs).
 
 %% call/1
 
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index fb22fd8275..243ad0a986 100644
--- a/lib/diameter/src/base/diameter_watchdog.erl
+++ b/lib/diameter/src/base/diameter_watchdog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -43,20 +43,24 @@
 -include("diameter_internal.hrl").
 
 -define(DEFAULT_TW_INIT, 30000). %% RFC 3539 ch 3.4.1
+-define(NOMASK, {0,32}).  %% default sequence mask
 
 -record(watchdog,
         {%% PCB - Peer Control Block; see RFC 3539, Appendix A
          status = initial :: initial | okay | suspect | down | reopen,
-         pending = false  :: boolean(),
+         pending = false  :: boolean(),  %% DWA
          tw :: 6000..16#FFFFFFFF | {module(), atom(), list()},
                                 %% {M,F,A} -> integer() >= 0
          num_dwa = 0 :: -1 | non_neg_integer(),
                      %% number of DWAs received during reopen
          %% end PCB
-         parent = self() :: pid(),
-         transport       :: pid(),
+         parent = self() :: pid(),              %% service process
+         transport       :: pid() | undefined,  %% peer_fsm process
          tref :: reference(), %% reference for current watchdog timer
-         message_data}).   %% term passed into diameter_service with message
+         message_data,      %% term passed into diameter_service with message
+         sequence :: diameter:sequence(),     %% mask
+         restrict :: {diameter:restriction(), boolean()},
+         shutdown = false :: boolean()}).
 
 %% start/2
 %%
@@ -64,6 +68,13 @@
 %% that a failed capabilities exchange produces the desired exit
 %% reason.
 
+-spec start(Type, {RecvData, [Opt], SvcName, #diameter_service{}})
+   -> {reference(), pid()}
+ when Type :: {connect|accept, diameter:transport_ref()},
+      RecvData :: term(),
+      Opt :: diameter:transport_opt(),
+      SvcName :: diameter:service_name().
+
 start({_,_} = Type, T) ->
     Ref = make_ref(),
     {ok, Pid} = diameter_watchdog_sup:start_child({Ref, {Type, self(), T}}),
@@ -102,7 +113,7 @@ i({_, Pid, _} = T) ->  %% from old code
     erlang:monitor(process, Pid),
     make_state(T).
 
-make_state({T, Pid, {ConnT,
+make_state({T, Pid, {RecvData,
                      Opts,
                      SvcName,
                      #diameter_service{applications = Apps,
@@ -111,12 +122,23 @@ make_state({T, Pid, {ConnT,
     random:seed(now()),
     putr(restart, {T, Opts, Svc}),  %% save seeing it in trace
     putr(dwr, dwr(Caps)),           %%
+    {_,_} = Mask = call(Pid, sequence),
+    Restrict = call(Pid, restriction),
+    Nodes = restrict_nodes(Restrict),
     #watchdog{parent = Pid,
-              transport = monitor(diameter_peer_fsm:start(T, Opts, Svc)),
+              transport = monitor(diameter_peer_fsm:start(T,
+                                                        Opts,
+                                                      {Mask, Nodes, Svc})),
               tw = proplists:get_value(watchdog_timer,
                                        Opts,
                                        ?DEFAULT_TW_INIT),
-              message_data = {ConnT, SvcName, Apps}}.
+              message_data = {RecvData, SvcName, Apps, Mask},
+              sequence = Mask,
+              restrict = {Restrict, lists:member(node(), Nodes)}}.
+
+%% Retrieve the sequence mask from the parent from the parent, rather
+%% than having it passed into init/1, for upgrade reasons: the call to
+%% diameter_service:receive_message/3 passes back the mask.
 
 %% handle_call/3
 
@@ -130,17 +152,46 @@ handle_cast(_, State) ->
 
 %% handle_info/2
 
-handle_info(T, State) ->
+handle_info(T, #watchdog{} = State) ->
     case transition(T, State) of
         ok ->
             {noreply, State};
-        #watchdog{status = X} = S ->
-            ?LOGC(X =/= State#watchdog.status, transition, X),
+        #watchdog{} = S ->
+            event(State, S),
             {noreply, S};
         stop ->
             ?LOG(stop, T),
+            event(State, State#watchdog{status = down}),
             {stop, {shutdown, T}, State}
-    end.
+    end;
+
+handle_info(T, S) ->
+    handle_info(T, upgrade(S)).
+
+upgrade(S) ->
+    #watchdog{} = list_to_tuple(tuple_to_list(S)
+                                ++ [?NOMASK, {nodes, true}, false]).
+
+event(#watchdog{status = T}, #watchdog{status = T}) ->
+    ok;
+
+event(#watchdog{transport = undefined}, #watchdog{transport = undefined}) ->
+    ok;
+
+event(#watchdog{status = From, transport = F, parent = Pid},
+      #watchdog{status = To, transport = T}) ->
+    E = {tpid(F,T), From, To},
+    notify(Pid, E),
+    ?LOG(transition, {self(), E}).
+
+tpid(_, Pid)
+  when is_pid(Pid) ->
+    Pid;
+tpid(Pid, _) ->
+    Pid.
+
+notify(Pid, E) ->
+    Pid ! {watchdog, self(), E}.
 
 %% terminate/2
 
@@ -176,9 +227,10 @@ transition({shutdown, Pid}, #watchdog{parent = Pid,
     down = S,  %% sanity check
     stop;
 transition({shutdown = T, Pid}, #watchdog{parent = Pid,
-                                          transport = TPid}) ->
+                                          transport = TPid}
+                                = S) ->
     TPid ! {T, self()},
-    ok;
+    S#watchdog{shutdown = true};
 
 %% Parent process has died,
 transition({'DOWN', _, process, Pid, _Reason},
@@ -212,9 +264,10 @@ transition({close, TPid, _Reason}, #watchdog{transport = TPid}) ->
 transition({open, TPid, Hosts, T} = Open,
            #watchdog{transport = TPid,
                      status = initial,
-                     parent = Pid}
+                     parent = Pid,
+                     restrict = {_, R}}
            = S) ->
-    case okay(getr(restart), Hosts) of
+    case okay(getr(restart), Hosts, R) of
         okay ->
             open(Pid, {TPid, T}),
             set_watchdog(S#watchdog{status = okay});
@@ -229,12 +282,15 @@ transition({open, TPid, Hosts, T} = Open,
 
 transition({open = P, TPid, _Hosts, T},
            #watchdog{transport = TPid,
+                     parent = Pid,
                      status = down}
            = S) ->
     %% Store the info we need to notify the parent to reopen the
     %% connection after the requisite DWA's are received, at which
-    %% time we eraser(open).
+    %% time we eraser(open). The reopen message is a later addition,
+    %% to communicate the new capabilities as soon as they're known.
     putr(P, {TPid, T}),
+    Pid ! {reopen, self(), {TPid, T}},
     set_watchdog(send_watchdog(S#watchdog{status = reopen,
                                           num_dwa = 0}));
 
@@ -248,11 +304,14 @@ transition({open = P, TPid, _Hosts, T},
 
 transition({'DOWN', _, process, TPid, _},
            #watchdog{transport = TPid,
-                     status = initial}) ->
+                     status = S,
+                     shutdown = D})
+  when S == initial;
+       D ->
     stop;
 
-transition({'DOWN', _, process, Pid, _},
-           #watchdog{transport = Pid}
+transition({'DOWN', _, process, TPid, _},
+           #watchdog{transport = TPid}
            = S) ->
     failover(S),
     close(S),
@@ -283,6 +342,15 @@ transition({state, Pid}, #watchdog{status = S}) ->
 
 %% ===========================================================================
 
+%% Only call "upwards", to the parent service.
+call(Pid, Req) ->
+    try
+        gen_server:call(Pid, Req, infinity)
+    catch
+        exit: Reason ->
+            exit({shutdown, {Req, Reason}})
+    end.
+
 monitor(Pid) ->
     erlang:monitor(process, Pid),
     Pid.
@@ -296,26 +364,36 @@ getr(Key) ->
 eraser(Key) ->
     erase({?MODULE, Key}).
 
-%% encode/1
+%% encode/2
 
-encode(Msg) ->
-    #diameter_packet{bin = Bin} = diameter_codec:encode(?BASE, Msg),
+encode(Msg, Mask) ->
+    Seq = diameter_session:sequence(Mask),
+    Hdr = #diameter_header{version = ?DIAMETER_VERSION,
+                           end_to_end_id = Seq,
+                           hop_by_hop_id = Seq},
+    Pkt = #diameter_packet{header = Hdr,
+                           msg = Msg},
+    #diameter_packet{bin = Bin} = diameter_codec:encode(?BASE, Pkt),
     Bin.
 
-%% okay/2
+%% okay/3
 
-okay({{accept, Ref}, _, _}, Hosts) ->
+okay({{accept, Ref}, _, _}, Hosts, Restrict) ->
     T = {?MODULE, connection, Ref, Hosts},
     diameter_reg:add(T),
-    okay(diameter_reg:match(T));
+    if Restrict ->
+            okay(diameter_reg:match(T));
+       true ->
+            okay
+    end;
 %% Register before matching so that at least one of two registering
-%% processes will match the other. (Which can't happen as long as
-%% diameter_peer_fsm guarantees at most one open connection to the same
-%% peer.)
+%% processes will match the other.
 
-okay({{connect, _}, _, _}, _) ->
+okay({{connect, _}, _, _}, _, _) ->
     okay.
 
+%% okay/2
+
 %% The peer hasn't been connected recently ...
 okay([{_,P}]) ->
     P = self(),  %% assert
@@ -371,9 +449,10 @@ close(#watchdog{parent = Pid}) ->
 %% send_watchdog/1
 
 send_watchdog(#watchdog{pending = false,
-                        transport = TPid}
+                        transport = TPid,
+                        sequence = Mask}
               = S) ->
-    TPid ! {send, encode(getr(dwr))},
+    TPid ! {send, encode(getr(dwr), Mask)},
     ?LOG(send, 'DWR'),
     S#watchdog{pending = true}.
 
@@ -385,7 +464,7 @@ recv(Name, Pkt, S) ->
             rcv(Name, Pkt, S),
             NS
     catch
-        throw: {?MODULE, throwaway, #watchdog{} = NS} ->
+        {?MODULE, throwaway, #watchdog{} = NS} ->
             NS
     end.
 
@@ -408,6 +487,14 @@ throwaway(S) ->
     throw({?MODULE, throwaway, S}).
 
 %% rcv/2
+%%
+%% The lack of Hop-by-Hop and End-to-End Identifiers checks in a
+%% received DWA is intentional. The purpose of the message is to
+%% demonstrate life but a peer that consistently bungles it by sending
+%% the wrong identifiers causes the connection to toggle between OPEN
+%% and SUSPECT, with failover and failback as result, despite there
+%% being no real problem with connectivity. Thus, relax and accept any
+%% incoming DWA as being in response to an outgoing DWR.
 
 %%   INITIAL       Receive DWA          Pending = FALSE
 %%                                      Throwaway()          INITIAL
@@ -526,7 +613,7 @@ timeout(#watchdog{status = T,
         = S)
   when T == suspect;
        T == reopen, P, N < 0 ->
-    exit(TPid, shutdown),
+    exit(TPid, {shutdown, watchdog_timeout}),
     close(S),
     S#watchdog{status = down};
 
@@ -571,19 +658,40 @@ restart(#watchdog{transport = undefined} = S) ->
 restart(S) ->
     S.
 
+%% restart/2
+%%
 %% Only restart the transport in the connecting case. For an accepting
-%% transport, we've registered the peer connection when leaving state
-%% initial and this is used by a new accepting process to realize that
-%% it's actually in state down rather then initial when receiving
-%% notification of an open connection.
-
-restart({{connect, _} = T, Opts, Svc}, #watchdog{parent = Pid} = S) ->
+%% transport, there's no guarantee that an accepted connection in a
+%% restarted transport if from the peer we've lost contact with so
+%% have to be prepared for another watchdog to handle it. This is what
+%% the diameter_reg registration in this module is for: the peer
+%% connection is registered when leaving state initial and this is
+%% used by a new accepting watchdog to realize that it's actually in
+%% state down rather then initial when receiving notification of an
+%% open connection.
+
+restart({{connect, _} = T, Opts, Svc}, #watchdog{parent = Pid,
+                                                 sequence = Mask,
+                                                 restrict = {R,_}}
+                                       = S) ->
     Pid ! {reconnect, self()},
-    S#watchdog{transport = monitor(diameter_peer_fsm:start(T, Opts, Svc))};
+    Nodes = restrict_nodes(R),
+    S#watchdog{transport = monitor(diameter_peer_fsm:start(T,
+                                                         Opts,
+                                                       {Mask, Nodes, Svc})),
+               restrict = {R, lists:member(node(), Nodes)}};
+
+%% No restriction on the number of connections to the same peer: just
+%% die. Note that a state machine never enters state REOPEN in this
+%% case.
+restart({{accept, _}, _, _}, #watchdog{restrict = {_, false}}) ->
+    stop;
+
+%% Otherwise hang around until told to die.
 restart({{accept, _}, _, _}, S) ->
     S.
-%% Don't currently use Opts/Svc in the accept case but having them in
-%% the process dictionary is helpful if the process dies unexpectedly.
+
+%% Don't currently use Opts/Svc in the accept case.
 
 %% dwr/1
 
@@ -593,3 +701,22 @@ dwr(#diameter_caps{origin_host = OH,
     ['DWR', {'Origin-Host', OH},
             {'Origin-Realm', OR},
             {'Origin-State-Id', OSI}].
+
+%% restrict_nodes/1
+
+restrict_nodes(false) ->
+    [];
+
+restrict_nodes(nodes) ->
+    [node() | nodes()];
+
+restrict_nodes(node) ->
+    [node()];
+
+restrict_nodes(Nodes)
+  when [] == Nodes;
+       is_atom(hd(Nodes)) ->
+    Nodes;
+
+restrict_nodes(F) ->
+    diameter_lib:eval(F).
diff --git a/lib/diameter/src/modules.mk b/lib/diameter/src/modules.mk
index 7a700a6d53..01f9284881 100644
--- a/lib/diameter/src/modules.mk
+++ b/lib/diameter/src/modules.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2011. All Rights Reserved.
+# Copyright Ericsson AB 2010-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -58,6 +58,7 @@ RT_MODULES = \
 	transport/diameter_tcp_sup \
 	transport/diameter_sctp \
 	transport/diameter_sctp_sup \
+	transport/diameter_transport \
 	transport/diameter_transport_sup
 
 # Handwritten (compile time) modules not included in the app file.
diff --git a/lib/diameter/src/transport/diameter_etcp.erl b/lib/diameter/src/transport/diameter_etcp.erl
index d925d62545..cd62cf34fa 100644
--- a/lib/diameter/src/transport/diameter_etcp.erl
+++ b/lib/diameter/src/transport/diameter_etcp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -36,7 +36,9 @@
          send/2,
          close/1,
          setopts/2,
-         port/1]).
+         sockname/1,
+         peername/1,
+         getstat/1]).
 
 %% child start
 -export([start_link/1]).
@@ -113,10 +115,20 @@ close(Pid) ->
 setopts(_, _) ->
     ok.
 
-%% port/1
+%% sockname/1
 
-port(_) ->
-    3868.  %% We have no local port: fake it.
+sockname(_) ->
+    {error, ?MODULE}.
+
+%% peername/1
+
+peername(_) ->
+    {error, ?MODULE}.
+
+%% getstat/1
+
+getstat(_) ->
+    {error, ?MODULE}.
 
 %% start_link/1
 
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl
index 68b0342cd5..79b8b851fb 100644
--- a/lib/diameter/src/transport/diameter_sctp.erl
+++ b/lib/diameter/src/transport/diameter_sctp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -37,12 +37,18 @@
          code_change/3,
          terminate/2]).
 
+-export([info/1]).  %% service_info callback
+
 -export([ports/0,
          ports/1]).
 
 -include_lib("kernel/include/inet_sctp.hrl").
 -include_lib("diameter/include/diameter.hrl").
 
+%% Keys into process dictionary.
+-define(INFO_KEY, info).
+-define(REF_KEY,  ref).
+
 -define(ERROR(T), erlang:error({T, ?MODULE, ?LINE})).
 
 %% The default port for a listener.
@@ -62,6 +68,7 @@
 -record(transport,
         {parent  :: pid(),
          mode :: {accept, pid()}
+               | accept
                | {connect, {list(inet:ip_address()), uint(), list()}}
                         %% {RAs, RP, Errors}
                | connect,
@@ -134,6 +141,24 @@ start_link(T) ->
                         diameter_lib:spawn_opts(server, [])).
 
 %% ---------------------------------------------------------------------------
+%% # info/1
+%% ---------------------------------------------------------------------------
+
+info({gen_sctp, Sock}) ->
+    lists:flatmap(fun(K) -> info(K, Sock) end,
+                  [{socket, sockname},
+                   {peer, peername},
+                   {statistics, getstat}]).
+
+info({K,F}, Sock) ->
+    case inet:F(Sock) of
+        {ok, V} ->
+            [{K,V}];
+        _ ->
+            []
+    end.
+
+%% ---------------------------------------------------------------------------
 %% # init/1
 %% ---------------------------------------------------------------------------
 
@@ -157,7 +182,7 @@ i({connect, Pid, Opts, Addrs, Ref}) ->
     RAs  = [diameter_lib:ipaddr(A) || {raddr, A} <- As],
     [RP] = [P || {rport, P} <- Ps] ++ [P || P <- [?DEFAULT_PORT], [] == Ps],
     {LAs, Sock} = open(Addrs, Rest, 0),
-    putr(ref, Ref),
+    putr(?REF_KEY, Ref),
     proc_lib:init_ack({ok, self(), LAs}),
     erlang:monitor(process, Pid),
     #transport{parent = Pid,
@@ -169,7 +194,7 @@ i({connect, _, _, _} = T) ->  %% from old code
 %% An accepting transport spawned by diameter.
 i({accept, Pid, LPid, Sock, Ref})
   when is_pid(Pid) ->
-    putr(ref, Ref),
+    putr(?REF_KEY, Ref),
     proc_lib:init_ack({ok, self()}),
     erlang:monitor(process, Pid),
     erlang:monitor(process, LPid),
@@ -181,7 +206,7 @@ i({accept, _, _, _} = T) ->  %% from old code
 
 %% An accepting transport spawned at association establishment.
 i({accept, Ref, LPid, Sock, Id}) ->
-    putr(ref, Ref),
+    putr(?REF_KEY, Ref),
     proc_lib:init_ack({ok, self()}),
     MRef = erlang:monitor(process, LPid),
     %% Wait for a signal that the transport has been started before
@@ -325,6 +350,11 @@ terminate(_, #transport{assoc_id = undefined}) ->
     ok;
 
 terminate(_, #transport{socket = Sock,
+                        mode = accept,
+                        assoc_id = Id}) ->
+    close(Sock, Id);
+
+terminate(_, #transport{socket = Sock,
                         mode = {accept, _},
                         assoc_id = Id}) ->
     close(Sock, Id);
@@ -356,13 +386,16 @@ start_timer(S) ->
 
 %% Incoming message from SCTP.
 l({sctp, Sock, _RA, _RP, Data} = Msg, #listener{socket = Sock} = S) ->
-    setopts(Sock),
-    case find(Data, S) of
+    Id = assoc_id(Data),
+
+    try find(Id, Data, S) of
         {TPid, NewS} ->
-            TPid ! Msg,
+            TPid ! {peeloff, peeloff(Sock, Id, TPid), Msg},
             NewS;
         false ->
             S
+    after
+        setopts(Sock)
     end;
 
 %% Transport is asking message to be sent. See send/3 for why the send
@@ -430,15 +463,19 @@ t(T,S) ->
 
 %% transition/2
 
-%% Incoming message.
-transition({sctp, Sock, _RA, _RP, Data}, #transport{socket = Sock,
-                                                    mode = {accept, _}}
-                                         = S) ->
-    recv(Data, S);
+%% Listening process is transfering ownership of an association.
+transition({peeloff, Sock, {sctp, LSock, _RA, _RP, _Data} = Msg},
+           #transport{mode = {accept, _},
+                      socket = LSock}
+           = S) ->
+    transition(Msg, S#transport{socket = Sock});
 
-transition({sctp, Sock, _RA, _RP, Data}, #transport{socket = Sock} = S) ->
+%% Incoming message.
+transition({sctp, _Sock, _RA, _RP, Data}, #transport{socket = Sock} = S) ->
     setopts(Sock),
     recv(Data, S);
+%% Don't match on Sock since in R15B01 it can be the listening socket
+%% in the (peeled-off) accept case, which is likely a bug.
 
 %% Outgoing message.
 transition({diameter, {send, Msg}}, S) ->
@@ -456,13 +493,18 @@ transition({diameter, {close, Pid}}, #transport{parent = Pid}) ->
 transition({diameter, {tls, _Ref, _Type, _Bool}}, _) ->
     stop;
 
+%% Parent process has died.
+transition({'DOWN', _, process, Pid, _}, #transport{parent = Pid}) ->
+    stop;
+
 %% Listener process has died.
 transition({'DOWN', _, process, Pid, _}, #transport{mode = {accept, Pid}}) ->
     stop;
 
-%% Parent process has died.
-transition({'DOWN', _, process, Pid, _}, #transport{parent = Pid}) ->
-    stop;
+%% Ditto but we have ownership of the association. It might be that
+%% we'll go down anyway though.
+transition({'DOWN', _, process, _Pid, _}, #transport{mode = accept}) ->
+    ok;
 
 %% Request for the local port number.
 transition({resolve_port, Pid}, #transport{socket = Sock})
@@ -521,14 +563,6 @@ send(Bin, #transport{streams = {_, OS},
 
 %% send/3
 
-%% Messages have to be sent from the controlling process, which is
-%% probably a bug. Sending from here causes an inet_reply, Sock,
-%% Status} message to be sent to the controlling process while
-%% gen_sctp:send/4 here hangs.
-send(StreamId, Bin, #transport{assoc_id = AId,
-                               mode = {accept, LPid}}) ->
-    LPid ! {send, AId, StreamId, Bin};
-
 send(StreamId, Bin, #transport{socket = Sock,
                                assoc_id = AId}) ->
     send(Sock, AId, StreamId, Bin).
@@ -554,10 +588,9 @@ recv({_, #sctp_assoc_change{state = comm_up,
                 mode = {T, _},
                 socket = Sock}
      = S) ->
-    Ref = getr(ref),
+    Ref = getr(?REF_KEY),
     is_reference(Ref)  %% started in new code
-        andalso
-        (true = diameter_reg:add_new({?MODULE, T, {Ref, {Id, Sock}}})),
+        andalso publish(T, Ref, Id, Sock),
     up(S#transport{assoc_id = Id,
                    streams = {IS, OS}});
 
@@ -599,6 +632,10 @@ recv({_, #sctp_paddr_change{}}, _) ->
 recv({_, #sctp_pdapi_event{}}, _) ->
     ok.
 
+publish(T, Ref, Id, Sock) ->
+    true = diameter_reg:add_new({?MODULE, T, {Ref, {Id, Sock}}}),
+    putr(?INFO_KEY, {gen_sctp, Sock}).  %% for info/1
+
 %% up/1
 
 up(#transport{parent = Pid,
@@ -608,21 +645,15 @@ up(#transport{parent = Pid,
     S#transport{mode = C};
 
 up(#transport{parent = Pid,
-              mode = {accept, _}}
+              mode = {accept = A, _}}
    = S) ->
     diameter_peer:up(Pid),
-    S.
+    S#transport{mode = A}.
 
-%% find/2
-
-find({[#sctp_sndrcvinfo{assoc_id = Id}], _}
-     = Data,
-     #listener{tmap = T}
-     = S) ->
-    f(ets:lookup(T, Id), Data, S);
+%% find/3
 
-find({_, Rec} = Data, #listener{tmap = T} = S) ->
-    f(ets:lookup(T, assoc_id(Rec)), Data, S).
+find(Id, Data, #listener{tmap = T} = S) ->
+    f(ets:lookup(T, Id), Data, S).
 
 %% New association and a transport waiting for one: use it.
 f([],
@@ -663,17 +694,29 @@ f([], _, _) ->
 
 %% assoc_id/1
 
-assoc_id(#sctp_shutdown_event{assoc_id = Id}) ->
+assoc_id({[#sctp_sndrcvinfo{assoc_id = Id}], _}) ->
     Id;
-assoc_id(#sctp_assoc_change{assoc_id = Id}) ->
+assoc_id({_, Rec}) ->
+    id(Rec).
+
+id(#sctp_shutdown_event{assoc_id = Id}) ->
+    Id;
+id(#sctp_assoc_change{assoc_id = Id}) ->
     Id;
-assoc_id(#sctp_sndrcvinfo{assoc_id = Id}) ->
+id(#sctp_sndrcvinfo{assoc_id = Id}) ->
     Id;
-assoc_id(#sctp_paddr_change{assoc_id = Id}) ->
+id(#sctp_paddr_change{assoc_id = Id}) ->
     Id;
-assoc_id(#sctp_adaptation_event{assoc_id = Id}) ->
+id(#sctp_adaptation_event{assoc_id = Id}) ->
     Id.
 
+%% peeloff/3
+
+peeloff(LSock, Id, TPid) ->
+    {ok, Sock} = gen_sctp:peeloff(LSock, Id),
+    ok = gen_sctp:controlling_process(Sock, TPid),
+    Sock.
+
 %% connect/4
 
 connect(_, [], _, Reasons) ->
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl
index 78dbda6888..f3fbbee609 100644
--- a/lib/diameter/src/transport/diameter_tcp.erl
+++ b/lib/diameter/src/transport/diameter_tcp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -37,11 +37,17 @@
          code_change/3,
          terminate/2]).
 
+-export([info/1]).  %% service_info callback
+
 -export([ports/0,
          ports/1]).
 
 -include_lib("diameter/include/diameter.hrl").
 
+%% Keys into process dictionary.
+-define(INFO_KEY, info).
+-define(REF_KEY,  ref).
+
 -define(ERROR(T), erlang:error({T, ?MODULE, ?LINE})).
 
 -define(DEFAULT_PORT, 3868).  %% RFC 3588, ch 2.1
@@ -74,7 +80,7 @@
 
 %% Accepting/connecting transport process state.
 -record(transport,
-        {socket  :: inet:socket(),  %% accept or connect socket
+        {socket  :: inet:socket() | ssl:sslsock(), %% accept or connect socket
          parent  :: pid(),          %% of process that started us
          module  :: module(),       %% gen_tcp-like module
          frag = <<>> :: binary() | {tref(), frag()},  %% message fragment
@@ -111,6 +117,33 @@ start_link(T) ->
                         diameter_lib:spawn_opts(server, [])).
 
 %% ---------------------------------------------------------------------------
+%% # info/1
+%% ---------------------------------------------------------------------------
+
+info({Mod, Sock}) ->
+    lists:flatmap(fun(K) -> info(Mod, K, Sock) end,
+                  [{socket, fun sockname/2},
+                   {peer, fun peername/2},
+                   {statistics, fun getstat/2}
+                   | ssl_info(Mod, Sock)]).
+
+info(Mod, {K,F}, Sock) ->
+    case F(Mod, Sock) of
+        {ok, V} ->
+            [{K,V}];
+        _ ->
+            []
+    end.
+
+ssl_info(ssl = M, Sock) ->
+    [{M, ssl_info(Sock)}];
+ssl_info(_, _) ->
+    [].
+
+ssl_info(Sock) ->
+    [{peercert, C} || {ok, C} <- [ssl:peercert(Sock)]].
+
+%% ---------------------------------------------------------------------------
 %% # init/1
 %% ---------------------------------------------------------------------------
 
@@ -133,7 +166,7 @@ i({T, Ref, Mod, Pid, Opts, Addrs})
     MPid ! {stop, self()},  %% tell the monitor to die
     M = if SslOpts -> ssl; true -> Mod end,
     setopts(M, Sock),
-    putr(ref, Ref),
+    putr(?REF_KEY, Ref),
     #transport{parent = Pid,
                module = M,
                socket = Sock,
@@ -191,7 +224,7 @@ i(accept = T, Ref, Mod, Pid, Opts, Addrs) ->
     {LAddr, LSock} = listener(Ref, {Mod, Opts, Addrs}),
     proc_lib:init_ack({ok, self(), [LAddr]}),
     Sock = ok(accept(Mod, LSock)),
-    true = diameter_reg:add_new({?MODULE, T, {Ref, Sock}}),
+    publish(Mod, T, Ref, Sock),
     diameter_peer:up(Pid),
     Sock;
 
@@ -202,10 +235,14 @@ i(connect = T, Ref, Mod, Pid, Opts, Addrs) ->
     RPort = get_port(RP),
     proc_lib:init_ack({ok, self(), [LAddr]}),
     Sock = ok(connect(Mod, RAddr, RPort, gen_opts(LAddr, Rest))),
-    true = diameter_reg:add_new({?MODULE, T, {Ref, Sock}}),
+    publish(Mod, T, Ref, Sock),
     diameter_peer:up(Pid, {RAddr, RPort}),
     Sock.
 
+publish(Mod, T, Ref, Sock) ->
+    true = diameter_reg:add_new({?MODULE, T, {Ref, Sock}}),
+    putr(?INFO_KEY, {Mod, Sock}).  %% for info/1
+
 ok({ok, T}) ->
     T;
 ok(No) ->
@@ -521,7 +558,7 @@ tls_handshake(Type, true, #transport{socket = Sock,
                                      ssl = Opts}
                           = S) ->
     {ok, SSock} = tls(Type, Sock, [{cb_info, ?TCP_CB(M)} | Opts]),
-    Ref = getr(ref),
+    Ref = getr(?REF_KEY),
     is_reference(Ref)  %% started in new code
         andalso
         (true = diameter_reg:add_new({?MODULE, Type, {Ref, SSock}})),
@@ -696,12 +733,32 @@ setopts(M, Sock) ->
 
 portnr(gen_tcp, Sock) ->
     inet:port(Sock);
-portnr(ssl, Sock) ->
-    case ssl:sockname(Sock) of
+portnr(M, Sock) ->
+    case M:sockname(Sock) of
         {ok, {_Addr, PortNr}} ->
             {ok, PortNr};
         {error, _} = No ->
             No
-    end;
-portnr(M, Sock) ->
-    M:port(Sock).
+    end.
+
+%% sockname/2
+
+sockname(gen_tcp, Sock) ->
+    inet:sockname(Sock);
+sockname(M, Sock) ->
+    M:sockname(Sock).
+
+%% peername/2
+
+peername(gen_tcp, Sock) ->
+    inet:peername(Sock);
+peername(M, Sock) ->
+    M:peername(Sock).
+
+%% getstat/2
+
+getstat(gen_tcp, Sock) ->
+    inet:getstat(Sock);
+getstat(M, Sock) ->
+    M:getstat(Sock).
+%% Note that ssl:getstat/1 doesn't yet exist in R15B01.
diff --git a/lib/diameter/src/transport/diameter_transport.erl b/lib/diameter/src/transport/diameter_transport.erl
new file mode 100644
index 0000000000..ff4b6bbc6d
--- /dev/null
+++ b/lib/diameter/src/transport/diameter_transport.erl
@@ -0,0 +1,55 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(diameter_transport).
+
+%%
+%% This module implements a transport start function that
+%% evaluates its config argument.
+%%
+
+%% Transport start functions
+-export([start/3,
+         select/3,
+         eval/3]).
+
+%% start/3
+
+%% Call a start function in this module ...
+start(T, Svc, {F,A}) ->
+    start(T, Svc, {?MODULE, F, [A]});
+
+%% ... or some other.
+start(T, Svc, F) ->
+    diameter_lib:eval([F, T, Svc]).
+
+%% select/3
+%%
+%% A start function that whose config argument is expected to return a
+%% new start function.
+
+select(T, Svc, F) ->
+    start(T, Svc, diameter_lib:eval([F, T, Svc])).
+
+%% eval/3
+%%
+%% A start function that simply evaluates its config argument.
+
+eval(_, _, F) ->
+    diameter_lib:eval(F).
diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index ab5b45ff3d..866d135bd9 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2011. All Rights Reserved.
+# Copyright Ericsson AB 2010-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -16,13 +16,8 @@
 #
 # %CopyrightEnd%
 
-ifeq ($(ERL_TOP),)
-include $(DIAMETER_TOP)/make/target.mk
-include $(DIAMETER_TOP)/make/$(TARGET)/rules.mk
-else
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
-endif
 
 # ----------------------------------------------------
 # Application version
@@ -67,8 +62,13 @@ ERL_COMPILE_FLAGS += +warn_export_vars \
 # Targets
 # ----------------------------------------------------
 
+# Require success ...
 all: opt
 
+# ... or not.
+any: opt
+	$(MAKE) -i $(SUITES)
+
 run: $(SUITES)
 
 debug opt: $(TARGET_FILES)
@@ -113,7 +113,7 @@ help:
 	@echo "        Echo some relevant variables."
 	@echo ========================================
 
-.PHONY: all run clean debug docs help info opt realclean
+.PHONY: all any run clean debug docs help info opt realclean
 
 # ----------------------------------------------------
 # Special Targets
@@ -141,28 +141,24 @@ log:
 # ---------------------------------------------------- 
 
 /%: % force
-	sed -f release.sed $< > $(RELSYSDIR)$@
+	sed -f release.sed $< > "$(RELSYSDIR)$@"
 
-ifeq ($(ERL_TOP),)
-include $(DIAMETER_TOP)/make/release_targets.mk
-else
 include $(ERL_TOP)/make/otp_release_targets.mk
-endif
 
 release_spec release_docs_spec:
 
 release_tests_spec:
-	$(INSTALL_DIR)  $(RELSYSDIR)
+	$(INSTALL_DIR)  "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(TEST_SPEC_FILE) \
 	                $(COVER_SPEC_FILE) \
 	                $(HRL_FILES) \
-	                $(RELSYSDIR)
+	                "$(RELSYSDIR)"
 	$(MAKE) $(DATA_DIRS:%/=release_data_%)
 	$(MAKE) $(ERL_FILES:%=/%)
 
 $(DATA_DIRS:%/=release_data_%): release_data_%:
-	$(INSTALL_DIR) $(RELSYSDIR)/$*
-	$(INSTALL_DATA) $(filter $*/%, $(DATA)) $(RELSYSDIR)/$*
+	$(INSTALL_DIR) "$(RELSYSDIR)/$*"
+	$(INSTALL_DATA) $(filter $*/%, $(DATA)) "$(RELSYSDIR)/$*"
 
 force:
 
diff --git a/lib/diameter/test/diameter_capx_SUITE.erl b/lib/diameter/test/diameter_capx_SUITE.erl
index 54a161d606..ae128b8203 100644
--- a/lib/diameter/test/diameter_capx_SUITE.erl
+++ b/lib/diameter/test/diameter_capx_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -93,12 +93,12 @@
 
 -define(fail(T), erlang:error({T, process_info(self(), messages)})).
 
--define(TIMEOUT, 2000).
+-define(TIMEOUT, 10000).
 
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {seconds, 10}}].
+    [{timetrap, {seconds, 60}}].
 
 all() -> [start,
           start_services,
diff --git a/lib/diameter/test/diameter_compiler_SUITE.erl b/lib/diameter/test/diameter_compiler_SUITE.erl
index 3b4c9706e0..79bf9d32db 100644
--- a/lib/diameter/test/diameter_compiler_SUITE.erl
+++ b/lib/diameter/test/diameter_compiler_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -31,8 +31,8 @@
 %% testcases
 -export([format/1,    format/2,
          replace/1,   replace/2,
-         generate/1,  generate/4,  generate/0,
-         examples/1, examples/0]).
+         generate/1,  generate/4,
+         examples/1]).
 
 -export([dict/0]).  %% fake dictionary module
 
@@ -339,7 +339,7 @@
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {seconds, 5}}].
+    [{timetrap, {minutes, 10}}].
 
 all() ->
     [format,
@@ -407,9 +407,6 @@ re({RE, Repl}, Bin) ->
 %%
 %% Ensure success when generating code and compiling.
 
-generate() ->
-    [{timetrap, {seconds, 2*length(?REPLACE)}}].
-
 generate(Config) ->
     Bin = proplists:get_value(base, Config),
     Rs  = lists:zip(?REPLACE, lists:seq(1, length(?REPLACE))),
@@ -436,9 +433,6 @@ generate(Mods, Bin, N, Mode) ->
 %%
 %% Compile dictionaries extracted from various standards.
 
-examples() ->
-    [{timetrap, {seconds, 3*length(?EXAMPLES)}}].
-
 examples(_Config) ->
     Dir = filename:join([code:lib_dir(diameter, examples), "dict"]),
     [D || D <- ?EXAMPLES, _ <- [examples(?S(D), Dir)]].
diff --git a/lib/diameter/test/diameter_ct.erl b/lib/diameter/test/diameter_ct.erl
index f8ee3dc1d7..ded50bf6c5 100644
--- a/lib/diameter/test/diameter_ct.erl
+++ b/lib/diameter/test/diameter_ct.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -25,15 +25,14 @@
 
 -export([run/1]).
 
-%% ct:run_test/1 is currently documented as returning a list of test
-%% results ... but no. Instead it returns 'ok' regardless of whether
-%% or not the suite in question has failed testcases.
+%% The makefile looks for signs of failure so ignore the ct:run_test/1
+%% return value.
 
 run([Suite]) ->
     Start = info(),
-    ok = ct:run_test([{suite, Suite},
-                      {logdir, "./log"},
-                      {auto_compile, false}]),
+    ct:run_test([{suite, Suite},
+                 {logdir, "./log"},
+                 {auto_compile, false}]),
     info(Start , info()).
 
 info() ->
diff --git a/lib/diameter/test/diameter_dict_SUITE.erl b/lib/diameter/test/diameter_dict_SUITE.erl
index 5cf8506d3f..3cc65c0257 100644
--- a/lib/diameter/test/diameter_dict_SUITE.erl
+++ b/lib/diameter/test/diameter_dict_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -48,7 +48,7 @@
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {seconds, 10}}].
+    [{timetrap, {seconds, 60}}].
 
 all() ->
     [{group, all},
diff --git a/lib/diameter/test/diameter_dpr_SUITE.erl b/lib/diameter/test/diameter_dpr_SUITE.erl
new file mode 100644
index 0000000000..9252650bf7
--- /dev/null
+++ b/lib/diameter/test/diameter_dpr_SUITE.erl
@@ -0,0 +1,196 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of the disconnect_cb configuration.
+%%
+
+-module(diameter_dpr_SUITE).
+
+-export([suite/0,
+         all/0,
+         groups/0,
+         init_per_group/2,
+         end_per_group/2]).
+
+%% testcases
+-export([start/1,
+         connect/1,
+         remove_transport/1,
+         stop_service/1,
+         check/1,
+         stop/1]).
+
+%% disconnect_cb
+-export([disconnect/5]).
+
+-include("diameter.hrl").
+
+%% ===========================================================================
+
+-define(util, diameter_util).
+
+-define(ADDR, {127,0,0,1}).
+
+-define(CLIENT, "CLIENT").
+-define(SERVER, "SERVER").
+
+-define(DICT_COMMON, ?DIAMETER_DICT_COMMON).
+-define(APP_ID, ?DICT_COMMON:id()).
+
+%% Config for diameter:start_service/2.
+-define(SERVICE(Host),
+        [{'Origin-Host', Host},
+         {'Origin-Realm', "erlang.org"},
+         {'Host-IP-Address', [?ADDR]},
+         {'Vendor-Id', hd(Host)},  %% match this in disconnect/5
+         {'Product-Name', "OTP/diameter"},
+         {'Acct-Application-Id', [?APP_ID]},
+         {restrict_connections, false},
+         {application, [{dictionary, ?DICT_COMMON},
+                        {module, #diameter_callback{_ = false}}]}]).
+
+%% Disconnect reasons that diameter passes as the first argument of a
+%% function configured as disconnect_cb.
+-define(REASONS, [transport, service, application]).
+
+%% Valid values for Disconnect-Cause.
+-define(CAUSES, [0, rebooting, 1, busy, 2, goaway]).
+
+%% Establish one client connection for element of this list,
+%% configured with disconnect/5 as disconnect_cb and returning the
+%% specified value.
+-define(RETURNS,
+        [[close, {dpr, [{cause, invalid}]}], [ignore, close], []]
+        ++ [[{dpr, [{timeout, 5000}, {cause, T}]}] || T <- ?CAUSES]).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 60}}].
+
+all() ->
+    [{group, R} || R <- ?REASONS].
+
+%% The group determines how transports are terminated: by remove_transport,
+%% stop_service or application stop.
+groups() ->
+    Ts = tc(),
+    [{R, [], Ts} || R <- ?REASONS].
+
+init_per_group(Name, Config) ->
+    [{group, Name} | Config].
+
+end_per_group(_, _) ->
+    ok.
+
+tc() ->
+    [start, connect, remove_transport, stop_service, check, stop].
+
+%% ===========================================================================
+%% start/stop testcases
+
+start(_Config) ->
+    ok = diameter:start(),
+    ok = diameter:start_service(?SERVER, ?SERVICE(?SERVER)),
+    ok = diameter:start_service(?CLIENT, ?SERVICE(?CLIENT)).
+
+connect(Config) ->
+    Pid = spawn(fun init/0),  %% process for disconnect_cb to bang
+    Grp = group(Config),
+    LRef = ?util:listen(?SERVER, tcp),
+    Refs = [?util:connect(?CLIENT, tcp, LRef, opts(RCs, {Grp, Pid}))
+            || RCs <- ?RETURNS],
+    ?util:write_priv(Config, config, [Pid | Refs]).
+
+%% Remove all the client transports only in the transport group.
+remove_transport(Config) ->
+    transport == group(Config)
+        andalso (ok = diameter:remove_transport(?CLIENT, true)).
+
+%% Stop the service only in the service group.
+stop_service(Config) ->
+    service == group(Config)
+        andalso (ok = diameter:stop_service(?CLIENT)).
+
+%% Check for callbacks and stop the service. (Not the other way around
+%% for the timing reason explained below.)
+check(Config) ->
+    Grp = group(Config),
+    [Pid | Refs] = ?util:read_priv(Config, config),
+    Pid ! self(),                      %% ask for dictionary
+    Dict = receive {Pid, D} -> D end,  %% get it
+    check(Refs, ?RETURNS, Grp, Dict).  %% check for callbacks
+
+stop(_Config) ->
+    ok = diameter:stop().
+
+%% Whether or not there are callbacks after diameter:stop() depends on
+%% timing as long as the server runs on the same node: a server
+%% transport could close the connection before the client has chance
+%% to apply its callback. Therefore, just check that there haven't
+%% been any callbacks yet.
+check(_, _, application, Dict) ->
+    [] = dict:to_list(Dict);
+
+check([], [], _, _) ->
+    ok;
+
+check([Ref | Refs], CBs, Grp, Dict) ->
+    check1(Ref, hd(CBs), Grp, Dict),
+    check(Refs, tl(CBs), Grp, Dict).
+
+check1(Ref, [ignore | RCs], Reason, Dict) ->
+    check1(Ref, RCs, Reason, Dict);
+
+check1(Ref, [_|_], Reason, Dict) ->
+    {ok, Reason} = dict:find(Ref, Dict);  %% callback with expected reason
+
+check1(Ref, [], _, Dict) ->
+    error = dict:find(Ref, Dict).  %% no callback
+
+%% ----------------------------------------
+
+group(Config) ->
+    {group, Grp} = lists:keyfind(group, 1, Config),
+    Grp.
+
+%% Configure the callback with the group name (= disconnect reason) as
+%% extra argument.
+opts(RCs, T) ->
+    [{disconnect_cb, {?MODULE, disconnect, [T, RC]}} || RC <- RCs].
+
+%% Match the group name with the disconnect reason to ensure the
+%% callback is being called as expected.
+disconnect(Reason, Ref, Peer, {Reason, Pid}, RC) ->
+    io:format("disconnect: ~p ~p~n", [Ref, Reason]),
+    {_, #diameter_caps{vendor_id = {$C,$S}}} = Peer,
+    Pid ! {Reason, Ref},
+    RC.
+
+init() ->
+    exit(recv(dict:new())).
+
+recv(Dict) ->
+    receive
+        Pid when is_pid(Pid) ->
+            Pid ! {self(), Dict};
+        {Reason, Ref} ->
+            recv(dict:store(Ref, Reason, Dict))
+    end.
diff --git a/lib/diameter/test/diameter_failover_SUITE.erl b/lib/diameter/test/diameter_failover_SUITE.erl
index 53398dd93e..ed31670031 100644
--- a/lib/diameter/test/diameter_failover_SUITE.erl
+++ b/lib/diameter/test/diameter_failover_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -101,7 +101,7 @@
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {seconds, 10}}].
+    [{timetrap, {seconds, 60}}].
 
 all() ->
     [start,
diff --git a/lib/diameter/test/diameter_gen_sctp_SUITE.erl b/lib/diameter/test/diameter_gen_sctp_SUITE.erl
index 7f435a6b7a..2fde7b9fdb 100644
--- a/lib/diameter/test/diameter_gen_sctp_SUITE.erl
+++ b/lib/diameter/test/diameter_gen_sctp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -175,7 +175,8 @@ send(Sock, Id) ->
 
 send_from_multiple_clients(_) ->
     {S, Rs} = T = send_from_multiple_clients(8, 1024),
-    {false, [], _} = {?FOREVER < S,
+    Max = ?FOREVER*1000,
+    {false, [], _} = {Max < S,
                       Rs -- [OI || {O,_} = OI <- Rs, is_integer(O)],
                       T}.
 
@@ -223,6 +224,11 @@ send_from_multiple_clients(_) ->
 %%                {134,100},
 %%                {117,98},
 %%                {149,125}]}
+%%
+%% This turns out to have been due to SCTP resends as a consequence of
+%% the listener having an insufficient recbuf. Increasing the size
+%% solves the problem.
+%%
 
 send_from_multiple_clients(N, Sz)
   when is_integer(N), 0 < N, is_integer(Sz), 0 < Sz ->
@@ -341,8 +347,15 @@ receive_what_was_sent(_Config) ->
 %% open/0
 
 open() ->
-    gen_sctp:open([{ip, ?ADDR}, {port, 0}, {active, true}, binary]).
+    open([]).
+
+%% open/1
 
+open(Opts) ->
+    gen_sctp:open([{ip, ?ADDR}, {port, 0}, {active, true}, binary,
+                   {recbuf, 1 bsl 16}, {sndbuf, 1 bsl 16}
+                   | Opts]).
+    
 %% assoc/1
 
 assoc(Sock) ->
diff --git a/lib/diameter/test/diameter_reg_SUITE.erl b/lib/diameter/test/diameter_reg_SUITE.erl
index ec6a0ca731..4939019f7a 100644
--- a/lib/diameter/test/diameter_reg_SUITE.erl
+++ b/lib/diameter/test/diameter_reg_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -43,7 +43,7 @@
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {seconds, 10}}].
+    [{timetrap, {seconds, 60}}].
 
 all() ->
     [{group, all},
diff --git a/lib/diameter/test/diameter_relay_SUITE.erl b/lib/diameter/test/diameter_relay_SUITE.erl
index 70e1866791..f10d82bdf8 100644
--- a/lib/diameter/test/diameter_relay_SUITE.erl
+++ b/lib/diameter/test/diameter_relay_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -48,6 +48,7 @@
          send_loop/1,
          send_timeout_1/1,
          send_timeout_2/1,
+         info/1,
          disconnect/1,
          stop_services/1,
          stop/1]).
@@ -112,7 +113,7 @@
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {seconds, 10}}].
+    [{timetrap, {seconds, 60}}].
 
 all() ->
     [start,
@@ -136,7 +137,8 @@ tc() ->
      send4,
      send_loop,
      send_timeout_1,
-     send_timeout_2].
+     send_timeout_2,
+     info].
 
 %% ===========================================================================
 %% start/stop testcases
@@ -224,6 +226,9 @@ send_timeout(Tmo) ->
                   {'Re-Auth-Request-Type', ?AUTHORIZE_ONLY}],
     call(Req, [{filter, realm}, {timeout, Tmo}]).
 
+info(_Config) ->
+    [] = ?util:info().
+
 %% ===========================================================================
 
 realm(Host) ->
diff --git a/lib/diameter/test/diameter_stats_SUITE.erl b/lib/diameter/test/diameter_stats_SUITE.erl
index e7807fd360..8b7d8cb1b6 100644
--- a/lib/diameter/test/diameter_stats_SUITE.erl
+++ b/lib/diameter/test/diameter_stats_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -30,16 +30,17 @@
          end_per_suite/1]).
 
 %% testcases
--export([an/1,
-         twa/1]).
+-export([reg/1,
+         incr/1,
+         read/1,
+         flush/1]).
 
 -define(stat, diameter_stats).
--define(util, diameter_util).
 
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {seconds, 10}}].
+    [{timetrap, {seconds, 60}}].
 
 all() ->
     [{group, all},
@@ -49,8 +50,10 @@ groups() ->
     [{all, [], tc()}].
 
 tc() ->
-    [an,
-     twa].
+    [reg,
+     incr,
+     read,
+     flush].
 
 init_per_suite(Config) ->
     ok = diameter:start(),
@@ -61,25 +64,62 @@ end_per_suite(_Config) ->
 
 %% ===========================================================================
 
-an(_) ->
-    Ref = {'_', make_ref()},
+reg(_) ->
+    Ref = '$1',
     true = ?stat:reg(Ref),
-    true = ?stat:reg(Ref),  %% duplicate
-    ok = ?stat:incr(x),
-    ok = ?stat:incr(x, Ref),
-    ok = ?stat:incr(y, 2),
-    ok = ?stat:incr(y, Ref),
-    %% Flushing a pid flushes even stats on the registered reference.
-    [{x,2},{y,3}] = lists:sort(?stat:flush()),
-    [] = ?stat:flush(Ref),
-    [] = ?stat:flush().
-
-twa(_) ->
+    false = ?stat:reg(Ref).  %% duplicate
+
+incr(_) ->    
+    Ref = '_',
+    Ctr = x,
+    false = ?stat:incr(Ctr),      %% not registered,
+    1 = ?stat:incr(Ctr, Ref, 1),  %% only pids need register
+    true = ?stat:reg(Ref),
+    spawn(fun() ->
+                  true = ?stat:reg(Ref),
+                  2 = ?stat:incr(Ctr, self(), 2)
+          end),
+    ok = fold(Ctr, Ref, 3),  %% folded
+    ?stat:flush([self(), Ref]).
+
+read(_) ->
+    Ref = make_ref(),
+    C1 = {a,b},
+    C2 = {b,a},
+    true = ?stat:reg(Ref),
+    1 = ?stat:incr(C1),
+    1 = ?stat:incr(C2),
+    2 = ?stat:incr(C1),
+    7 = ?stat:incr(C1, Ref, 7),
+    Self = self(),
+    [{Ref,  [{C1,7}]}, {Self, [{C1,2}, {C2,1}]}]
+        = lists:sort(?stat:read([self(), Ref, make_ref()])),
+    [] = ?stat:read([]),
+    [] = ?stat:read([make_ref()]),
+    ?stat:flush([self(), Ref, make_ref()]).
+
+flush(_) ->
     Ref = make_ref(),
-    ok = ?stat:incr(x, 8),
-    ok = ?stat:incr(x, Ref, 7),
-    %% Flushing a reference doesn't affect registered pids.
-    [{x,7}] = ?stat:flush(Ref),
-    [] = ?stat:flush(Ref),
-    [{x,8}] = ?stat:flush(),
-    [] = ?stat:flush().
+    Ctr = '_',
+    true = ?stat:reg(Ref),
+    1 = ?stat:incr(Ctr),
+    3 = ?stat:incr(Ctr, self(), 2),
+    2 = ?stat:incr(Ctr, Ref, 2),
+    Self = self(),
+    [{Self, [{Ctr, 3}]}] = ?stat:flush([self()]),
+    1 = ?stat:incr(Ctr),
+    [{Ref,  [{Ctr, 2}]}] = ?stat:flush([Ref]),
+    [{Self, [{Ctr, 1}]}] = ?stat:flush([self()]),
+    [] = ?stat:flush([self(), Ref]).
+
+%% ===========================================================================
+
+%% Keep incremented until a fold results in the specified value.
+fold(Ctr, Ref, N) ->
+    case ?stat:incr(Ctr, Ref, 0) of
+        N ->
+            ok;
+        M when M < N ->
+            erlang:yield(),
+            fold(Ctr, Ref, N)
+    end.
diff --git a/lib/diameter/test/diameter_sync_SUITE.erl b/lib/diameter/test/diameter_sync_SUITE.erl
index ab629fb1c1..457efab8ae 100644
--- a/lib/diameter/test/diameter_sync_SUITE.erl
+++ b/lib/diameter/test/diameter_sync_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -43,7 +43,7 @@
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {seconds, 10}}].
+    [{timetrap, {seconds, 60}}].
 
 all() ->
     [{group, all},
diff --git a/lib/diameter/test/diameter_tls_SUITE.erl b/lib/diameter/test/diameter_tls_SUITE.erl
index 85b953dc1a..6cc34b20c5 100644
--- a/lib/diameter/test/diameter_tls_SUITE.erl
+++ b/lib/diameter/test/diameter_tls_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -127,7 +127,7 @@
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {seconds, 10}}].
+    [{timetrap, {seconds, 60}}].
 
 all() ->
     [start_ssl,
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index 6eed8d3b5d..c157b0e304 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -37,6 +37,8 @@
          add_transports/1,
          result_codes/1,
          send_ok/1,
+         send_nok/1,
+         send_bad_answer/1,
          send_arbitrary/1,
          send_unknown/1,
          send_unknown_mandatory/1,
@@ -80,15 +82,16 @@
 %% diameter callbacks
 -export([peer_up/3,
          peer_down/3,
-         pick_peer/5, pick_peer/6,
-         prepare_request/4, prepare_request/5,
-         prepare_retransmit/4,
-         handle_answer/5, handle_answer/6,
-         handle_error/5,
+         pick_peer/6, pick_peer/7,
+         prepare_request/5, prepare_request/6,
+         prepare_retransmit/5,
+         handle_answer/6, handle_answer/7,
+         handle_error/6,
          handle_request/3]).
 
 -include("diameter.hrl").
 -include("diameter_gen_base_rfc3588.hrl").
+-include("diameter_gen_base_accounting.hrl").
 
 %% ===========================================================================
 
@@ -101,11 +104,23 @@
 -define(REALM, "erlang.org").
 -define(HOST(Host, Realm), Host ++ [$.|Realm]).
 
--define(APP_ALIAS, base).
 -define(EXTRA, an_extra_argument).
+
+-define(BASE, ?DIAMETER_DICT_COMMON).
+-define(ACCT, ?DIAMETER_DICT_ACCOUNTING).
+
+%% Sequence mask for End-to-End and Hop-by-Hop identifiers.
+-define(CLIENT_MASK, {1,26}).  %% 1 in top 6 bits
+
+%% Run tests cases in different encoding variants. Send outgoing
+%% messages as lists or records.
 -define(ENCODINGS, [list, record]).
 
--define(DICT,   ?DIAMETER_DICT_COMMON).
+%% Identifers for client connections.
+-define(CONNECTIONS, [c1,c2,c3]).
+
+%% Not really what we should be setting unless the message is sent in
+%% the common application but diameter doesn't care.
 -define(APP_ID, ?DIAMETER_APP_ID_COMMON).
 
 %% Config for diameter:start_service/2.
@@ -115,11 +130,13 @@
          {'Host-IP-Address', [?ADDR]},
          {'Vendor-Id', 12345},
          {'Product-Name', "OTP/diameter"},
-         {'Acct-Application-Id', [?DIAMETER_APP_ID_COMMON]},
-         {application, [{alias, ?APP_ALIAS},
-                        {dictionary, ?DIAMETER_DICT_COMMON},
-                        {module, ?MODULE},
-                        {answer_errors, callback}]}]).
+         {'Auth-Application-Id', [?DIAMETER_APP_ID_COMMON]},
+         {'Acct-Application-Id', [?DIAMETER_APP_ID_ACCOUNTING]},
+         {restrict_connections, false}
+         | [{application, [{dictionary, D},
+                           {module, ?MODULE},
+                           {answer_errors, callback}]}
+            || D <- [?BASE, ?ACCT]]]).
 
 -define(SUCCESS,
         ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_SUCCESS').
@@ -131,6 +148,8 @@
         ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_APPLICATION_UNSUPPORTED').
 -define(INVALID_HDR_BITS,
         ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_INVALID_HDR_BITS').
+-define(INVALID_AVP_BITS,
+        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_INVALID_AVP_BITS').
 -define(AVP_UNSUPPORTED,
         ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_AVP_UNSUPPORTED').
 -define(UNSUPPORTED_VERSION,
@@ -154,24 +173,27 @@
 
 -define(A, list_to_atom).
 -define(L, atom_to_list).
--define(P(N), ?A("p_" ++ ?L(N))).
+
+-define(NAME(A,B), ?A(?L(A) ++ "," ++ ?L(B))).
 
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {seconds, 10}}].
+    [{timetrap, {seconds, 60}}].
 
 all() ->
     [start, start_services, add_transports, result_codes]
-        ++ [{group, E, P} || E <- ?ENCODINGS, P <- [[], [parallel]]]
+        ++ [{group, ?util:name([E,C]), P} || E <- ?ENCODINGS,
+                                             C <- ?CONNECTIONS,
+                                             P <- [[], [parallel]]]
         ++ [remove_transports, stop_services, stop].
 
 groups() ->
     Ts = tc(),
-    [{E, [], Ts} || E <- ?ENCODINGS].
+    [{?util:name([E,C]), [], Ts} || E <- ?ENCODINGS, C <- ?CONNECTIONS].
 
 init_per_group(Name, Config) ->
-    [{encode, Name} | Config].
+    [{group, Name} | Config].
 
 end_per_group(_, _) ->
     ok.
@@ -186,6 +208,8 @@ end_per_testcase(_, _) ->
 %% established.
 tc() ->
     [send_ok,
+     send_nok,
+     send_bad_answer,
      send_arbitrary,
      send_unknown,
      send_unknown_mandatory,
@@ -231,16 +255,17 @@ start(_Config) ->
 
 start_services(_Config) ->
     ok = diameter:start_service(?SERVER, ?SERVICE(?SERVER)),
-    ok = diameter:start_service(?CLIENT, ?SERVICE(?CLIENT)).
+    ok = diameter:start_service(?CLIENT, [{sequence, ?CLIENT_MASK}
+                                          | ?SERVICE(?CLIENT)]).
 
 add_transports(Config) ->
     LRef = ?util:listen(?SERVER, tcp, [{capabilities_cb, fun capx/2}]),
-    CRef = ?util:connect(?CLIENT, tcp, LRef),
-    ?util:write_priv(Config, "transport", {LRef, CRef}).
+    Cs = [?util:connect(?CLIENT, tcp, LRef, [{id, C}]) || C <- ?CONNECTIONS],
+    ?util:write_priv(Config, "transport", [LRef | Cs]).
 
 remove_transports(Config) ->
-    {LRef, CRef} = ?util:read_priv(Config, "transport"),
-    ?util:disconnect(?CLIENT, CRef, ?SERVER, LRef).
+    [LRef | Cs] = ?util:read_priv(Config, "transport"),
+    [?util:disconnect(?CLIENT, C, ?SERVER, LRef) || C <- Cs].
 
 stop_services(_Config) ->
     ok = diameter:stop_service(?CLIENT),
@@ -257,7 +282,7 @@ capx(_, #diameter_caps{origin_host = {OH,DH}}) ->
 
 %% Ensure that result codes have the expected values.
 result_codes(_Config) ->
-    {2001, 3001, 3002, 3003, 3004, 3007, 3008, 5001, 5011}
+    {2001, 3001, 3002, 3003, 3004, 3007, 3008, 3009, 5001, 5011}
         = {?SUCCESS,
            ?COMMAND_UNSUPPORTED,
            ?UNABLE_TO_DELIVER,
@@ -265,6 +290,7 @@ result_codes(_Config) ->
            ?TOO_BUSY,
            ?APPLICATION_UNSUPPORTED,
            ?INVALID_HDR_BITS,
+           ?INVALID_AVP_BITS,
            ?AVP_UNSUPPORTED,
            ?UNSUPPORTED_VERSION}.
 
@@ -272,9 +298,26 @@ result_codes(_Config) ->
 send_ok(Config) ->
     Req = ['ACR', {'Accounting-Record-Type', ?EVENT_RECORD},
                   {'Accounting-Record-Number', 1}],
-    #diameter_base_ACA{'Result-Code' = ?SUCCESS}
+    
+    #diameter_base_accounting_ACA{'Result-Code' = ?SUCCESS}
         = call(Config, Req).
 
+%% Send an accounting ACR that the server answers badly to.
+send_nok(Config) ->
+    Req = ['ACR', {'Accounting-Record-Type', ?EVENT_RECORD},
+                  {'Accounting-Record-Number', 0}],
+    
+    #'diameter_base_answer-message'{'Result-Code' = ?INVALID_AVP_BITS}
+        = call(Config, Req).
+
+%% Send an accounting ACR that the server tries to answer with an
+%% inappropriate header, resulting in no answer being sent and the
+%% request timing out.
+send_bad_answer(Config) ->
+    Req = ['ACR', {'Accounting-Record-Type', ?EVENT_RECORD},
+                  {'Accounting-Record-Number', 2}],
+    {error, timeout} = call(Config, Req).
+
 %% Send an ASR with an arbitrary AVP and expect success and the same
 %% AVP in the reply.
 send_arbitrary(Config) ->
@@ -324,7 +367,7 @@ send_unsupported(Config) ->
     #'diameter_base_answer-message'{'Result-Code' = ?COMMAND_UNSUPPORTED}
         = call(Config, Req).
 
-%% Send an unsupported command and expect 3007.
+%% Send an unsupported application and expect 3007.
 send_unsupported_app(Config) ->
     Req = ['STR', {'Termination-Cause', ?BAD_ANSWER}],
     #'diameter_base_answer-message'{'Result-Code' = ?APPLICATION_UNSUPPORTED}
@@ -516,32 +559,44 @@ call(Config, Req) ->
 
 call(Config, Req, Opts) ->
     Name = proplists:get_value(testcase, Config),
-    Enc = proplists:get_value(encode, Config),
+    [Encoding, Client] = ?util:name(proplists:get_value(group, Config)),
     diameter:call(?CLIENT,
-                  ?APP_ALIAS,
-                  msg(Req, Enc),
-                  [{extra, [Name]} | Opts]).
-
-msg([_|_] = L, list) ->
-    L;
-msg([H|T], record) ->
-    ?DICT:'#new-'(?DICT:msg2rec(H), T);
-msg(T, _) ->
+                  dict(Req),
+                  req(Req, Encoding),
+                  [{extra, [Name, Client]} | Opts]).
+
+req(['ACR' = H | T], record) ->
+    ?ACCT:'#new-'(?ACCT:msg2rec(H), T);
+req([H|T], record) ->
+    ?BASE:'#new-'(?BASE:msg2rec(H), T);
+req(T, _) ->
     T.
 
+dict(['ACR' | _]) ->
+    ?ACCT;
+dict(_) ->
+    ?BASE.
+
 %% Set only values that aren't already.
 set([H|T], Vs) ->
     [H | Vs ++ T];
+set(#diameter_base_accounting_ACR{} = Rec, Vs) ->
+    set(Rec, Vs, ?ACCT);
 set(Rec, Vs) ->
-    lists:foldl(fun({F,_} = FV, A) -> set(?DICT:'#get-'(F, A), FV, A) end,
+    set(Rec, Vs, ?BASE).
+
+set(Rec, Vs, Dict) ->
+    lists:foldl(fun({F,_} = FV, A) ->
+                        set(Dict, Dict:'#get-'(F, A), FV, A)
+                end,
                 Rec,
                 Vs).
 
-set(E, FV, Rec)
+set(Dict, E, FV, Rec)
   when E == undefined;
        E == [] ->
-    ?DICT:'#set-'(FV, Rec);
-set(_, _, Rec) ->
+    Dict:'#set-'(FV, Rec);
+set(_, _, _, Rec) ->
     Rec.
 
 %% ===========================================================================
@@ -557,41 +612,53 @@ peer_up(_SvcName, _Peer, State) ->
 peer_down(_SvcName, _Peer, State) ->
     State.
 
-%% pick_peer/5/6
+%% pick_peer/6-7
 
-pick_peer([Peer], _, ?CLIENT, _State, Name)
+pick_peer(Peers, _, ?CLIENT, _State, Name, Id)
   when Name /= send_detach ->
-    {ok, Peer}.
+    find(Id, Peers).
 
-pick_peer([_Peer], _, ?CLIENT, _State, send_nopeer, ?EXTRA) ->
+pick_peer(_Peers, _, ?CLIENT, _State, send_nopeer, _, ?EXTRA) ->
     false;
 
-pick_peer([Peer], _, ?CLIENT, _State, send_detach, {_,_}) ->
-    {ok, Peer}.
+pick_peer(Peers, _, ?CLIENT, _State, send_detach, Id, {_,_}) ->
+    find(Id, Peers).
+
+find(Id, Peers) ->
+    [P] = [P || P <- Peers, id(Id, P)],
+    {ok, P}.
+
+id(Id, {Pid, _Caps}) ->
+    [{ref, _}, {type, _}, {options, Opts} | _]
+        = diameter:service_info(?CLIENT, Pid),
+    lists:member({id, Id}, Opts).
 
-%% prepare_request/4/5
+%% prepare_request/5-6
 
-prepare_request(_Pkt, ?CLIENT, {_Ref, _Caps}, send_discard) ->
+prepare_request(_Pkt, ?CLIENT, {_Ref, _Caps}, send_discard, _) ->
     {discard, unprepared};
 
-prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, Name) ->
+prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, Name, _) ->
     {send, prepare(Pkt, Caps, Name)}.
 
-prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, send_detach, _) ->
-    {send, prepare(Pkt, Caps)}.
+prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, send_detach, _, _) ->
+    {eval_packet, {send, prepare(Pkt, Caps)}, [fun log/2, detach]}.
+
+log(#diameter_packet{} = P, T) ->
+    io:format("~p: ~p~n", [T,P]).
 
 prepare(Pkt, Caps, send_unsupported) ->
     Req = prepare(Pkt, Caps),
     #diameter_packet{bin = <<H:5/binary, _CmdCode:3/binary, T/binary>>}
         = E
-        = diameter_codec:encode(?DICT, Pkt#diameter_packet{msg = Req}),
+        = diameter_codec:encode(?BASE, Pkt#diameter_packet{msg = Req}),
     E#diameter_packet{bin = <<H/binary, 42:24/integer, T/binary>>};
 
 prepare(Pkt, Caps, send_unsupported_app) ->
     Req = prepare(Pkt, Caps),
     #diameter_packet{bin = <<H:8/binary, _ApplId:4/binary, T/binary>>}
         = E
-        = diameter_codec:encode(?DICT, Pkt#diameter_packet{msg = Req}),
+        = diameter_codec:encode(?BASE, Pkt#diameter_packet{msg = Req}),
     E#diameter_packet{bin = <<H/binary, 42:32/integer, T/binary>>};
 
 prepare(Pkt, Caps, send_error_bit) ->
@@ -612,7 +679,7 @@ prepare(Pkt, Caps, _Name) ->
     prepare(Pkt, Caps).
 
 prepare(#diameter_packet{msg = Req}, Caps)
-  when is_record(Req, diameter_base_ACR);
+  when is_record(Req, diameter_base_accounting_ACR);
        'ACR' == hd(Req) ->
     #diameter_caps{origin_host  = {OH, _},
                    origin_realm = {OR, DR}}
@@ -661,25 +728,25 @@ prepare(#diameter_packet{msg = Req}, Caps)
               {'Destination-Realm', DR},
               {'Auth-Application-Id', ?APP_ID}]).
 
-%% prepare_retransmit/4
+%% prepare_retransmit/5
 
-prepare_retransmit(_Pkt, false, _Peer, _Name) ->
+prepare_retransmit(_Pkt, false, _Peer, _Name, _Id) ->
     discard.
 
-%% handle_answer/5/6
+%% handle_answer/6-7
 
-handle_answer(Pkt, Req, ?CLIENT, Peer, Name) ->
+handle_answer(Pkt, Req, ?CLIENT, Peer, Name, _Id) ->
     answer(Pkt, Req, Peer, Name).
 
-handle_answer(Pkt, _Req, ?CLIENT, _Peer, send_detach, {Pid, Ref}) ->
+handle_answer(Pkt, _Req, ?CLIENT, _Peer, send_detach, _Id, {Pid, Ref}) ->
     Pid ! {Ref, Pkt}.
 
 answer(#diameter_packet{msg = Rec, errors = []}, _Req, _Peer, _) ->
     Rec.
 
-%% handle_error/5
+%% handle_error/6
 
-handle_error(Reason, _Req, ?CLIENT, _Peer, _Name) ->
+handle_error(Reason, _Req, ?CLIENT, _Peer, _Name, _Id) ->
     {error, Reason}.
 
 %% handle_request/3
@@ -687,13 +754,37 @@ handle_error(Reason, _Req, ?CLIENT, _Peer, _Name) ->
 %% Note that diameter will set Result-Code and Failed-AVPs if
 %% #diameter_packet.errors is non-null.
 
-handle_request(Pkt, ?SERVER, {_Ref, Caps}) ->
-    request(Pkt, Caps).
-
-request(#diameter_packet{msg
-                         = #diameter_base_ACR{'Session-Id' = SId,
-                                              'Accounting-Record-Type' = RT,
-                                              'Accounting-Record-Number' = RN}},
+handle_request(#diameter_packet{header = H, msg = M}, ?SERVER, {_Ref, Caps}) ->
+    #diameter_header{end_to_end_id = EI,
+                     hop_by_hop_id = HI}
+        = H,
+    {V,B} = ?CLIENT_MASK,
+    V = EI bsr B,  %% assert
+    V = HI bsr B,  %%
+    request(M, Caps).
+
+request(#diameter_base_accounting_ACR{'Accounting-Record-Number' = 0},
+        _) ->
+    {eval_packet, {protocol_error, ?INVALID_AVP_BITS}, [fun log/2, invalid]};
+
+request(#diameter_base_accounting_ACR{'Session-Id' = SId,
+                                      'Accounting-Record-Type' = RT,
+                                      'Accounting-Record-Number' = 2 = RN},
+        #diameter_caps{origin_host = {OH, _},
+                       origin_realm = {OR, _}}) ->
+    Ans = ['ACA', {'Result-Code', ?SUCCESS},
+                  {'Session-Id', SId},
+                  {'Origin-Host', OH},
+                  {'Origin-Realm', OR},
+                  {'Accounting-Record-Type', RT},
+                  {'Accounting-Record-Number', RN}],
+
+    {reply, #diameter_packet{header = #diameter_header{is_error = true},%% not
+                             msg = Ans}};
+
+request(#diameter_base_accounting_ACR{'Session-Id' = SId,
+                                      'Accounting-Record-Type' = RT,
+                                      'Accounting-Record-Number' = RN},
         #diameter_caps{origin_host = {OH, _},
                        origin_realm = {OR, _}}) ->
     {reply, ['ACA', {'Result-Code', ?SUCCESS},
@@ -703,8 +794,8 @@ request(#diameter_packet{msg
                     {'Accounting-Record-Type', RT},
                     {'Accounting-Record-Number', RN}]};
 
-request(#diameter_packet{msg = #diameter_base_ASR{'Session-Id' = SId,
-                                                  'AVP' = Avps}},
+request(#diameter_base_ASR{'Session-Id' = SId,
+                           'AVP' = Avps},
         #diameter_caps{origin_host = {OH, _},
                        origin_realm = {OR, _}}) ->
     {reply, #diameter_base_ASA{'Result-Code' = ?SUCCESS,
@@ -713,22 +804,22 @@ request(#diameter_packet{msg = #diameter_base_ASR{'Session-Id' = SId,
                                'Origin-Realm' = OR,
                                'AVP' = Avps}};
 
-request(#diameter_packet{msg = #diameter_base_STR{'Termination-Cause' = T}},
+request(#diameter_base_STR{'Termination-Cause' = T},
         _Caps)
   when T /= ?LOGOUT ->
     discard;
 
-request(#diameter_packet{msg = #diameter_base_STR{'Destination-Realm'= R}},
+request(#diameter_base_STR{'Destination-Realm'= R},
         #diameter_caps{origin_realm = {OR, _}})
   when R /= undefined, R /= OR ->
     {protocol_error, ?REALM_NOT_SERVED};
 
-request(#diameter_packet{msg = #diameter_base_STR{'Destination-Host'= [H]}},
+request(#diameter_base_STR{'Destination-Host'= [H]},
         #diameter_caps{origin_host = {OH, _}})
   when H /= OH ->
     {protocol_error, ?UNABLE_TO_DELIVER};
 
-request(#diameter_packet{msg = #diameter_base_STR{'Session-Id' = SId}},
+request(#diameter_base_STR{'Session-Id' = SId},
         #diameter_caps{origin_host  = {OH, _},
                        origin_realm = {OR, _}}) ->
     {reply, #diameter_base_STA{'Result-Code' = ?SUCCESS,
@@ -736,6 +827,6 @@ request(#diameter_packet{msg = #diameter_base_STR{'Session-Id' = SId}},
                                'Origin-Host' = OH,
                                'Origin-Realm' = OR}};
 
-request(#diameter_packet{msg = #diameter_base_RAR{}}, _Caps) ->
+request(#diameter_base_RAR{}, _Caps) ->
     receive after 2000 -> ok end,
     {protocol_error, ?TOO_BUSY}.
diff --git a/lib/diameter/test/diameter_util.erl b/lib/diameter/test/diameter_util.erl
index 0c42f955ad..5af4ad9ba5 100644
--- a/lib/diameter/test/diameter_util.erl
+++ b/lib/diameter/test/diameter_util.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -24,7 +24,8 @@
 %%
 
 %% generic
--export([consult/2,
+-export([name/1,
+         consult/2,
          run/1,
          fold/3,
          foldl/3,
@@ -35,7 +36,8 @@
          lport/3,
          listen/2, listen/3,
          connect/3, connect/4,
-         disconnect/4]).
+         disconnect/4,
+         info/0]).
 
 %% common_test-specific
 -export([write_priv/3,
@@ -44,6 +46,21 @@
 
 -define(L, atom_to_list).
 
+
+%% ---------------------------------------------------------------------------
+%% name/2
+%%
+%% Contruct and deconstruct lists of atoms as atoms to work around
+%% group names in common_test being restricted to atoms.
+
+name(Names)
+  when is_list(Names) ->
+    list_to_atom(string:join([atom_to_list(A) || A <- Names], ","));
+
+name(A)
+  when is_atom(A) ->
+    [list_to_atom(S) || S <- string:tokens(atom_to_list(A), ",")].
+
 %% ---------------------------------------------------------------------------
 %% consult/2
 %%
@@ -262,7 +279,10 @@ listen(SvcName, Prot) ->
     listen(SvcName, Prot, []).
 
 listen(SvcName, Prot, Opts) ->
-    add_transport(SvcName, {listen, opts(Prot, listen) ++ Opts}).
+    SvcName = diameter:service_info(SvcName, name),  %% assert
+    Ref = add_transport(SvcName, {listen, opts(Prot, listen) ++ Opts}),
+    true = transport(SvcName, Ref),                  %% assert
+    Ref.
 
 %% ---------------------------------------------------------------------------
 %% connect/2-3
@@ -275,15 +295,22 @@ connect(Client, Prot, LRef) ->
 
 connect(Client, Prot, LRef, Opts) ->
     [PortNr] = lport(Prot, LRef, 20),
-    Ref = add_transport(Client, {connect, opts(Prot, PortNr) ++ Opts}),
+    Client = diameter:service_info(Client, name),  %% assert
     true = diameter:subscribe(Client),
+    Ref = add_transport(Client, {connect, opts(Prot, PortNr) ++ Opts}),
+    true = transport(Client, Ref),                 %% assert
+
     ok = receive
              {diameter_event, Client, {up, Ref, _, _, _}} -> ok
-         after 2000 ->
+         after 10000 ->
                  {Client, Prot, PortNr, process_info(self(), messages)}
          end,
     Ref.
 
+transport(SvcName, Ref) ->
+    [Ref] == [R || [{ref, R} | _] <- diameter:service_info(SvcName, transport),
+                   R == Ref].
+
 %% ---------------------------------------------------------------------------
 %% disconnect/4
 %%
@@ -295,7 +322,7 @@ disconnect(Client, Ref, Server, LRef) ->
     ok = diameter:remove_transport(Client, Ref),
     ok = receive
              {diameter_event, Server, {down, LRef, _, _}} -> ok
-         after 2000 ->
+         after 10000 ->
                  {Client, Ref, Server, LRef, process_info(self(), messages)}
          end.
 
@@ -320,3 +347,17 @@ opts(listen) ->
     [];
 opts(PortNr) ->
     [{raddr, ?ADDR}, {rport, PortNr}].
+
+%% ---------------------------------------------------------------------------
+%% info/0
+
+info() ->
+    [_|_] = Svcs = diameter:services(),  %% assert
+    run([[fun info/1, S] || S <- Svcs]).
+
+info(S) ->
+    [_|_] = Keys = diameter:service_info(S, keys),
+    [] = run([[fun info/2, K, S] || K <- Keys]).
+
+info(Key, SvcName) ->
+    [{Key, _}] = diameter:service_info(SvcName, [Key]).
diff --git a/lib/diameter/test/diameter_watchdog_SUITE.erl b/lib/diameter/test/diameter_watchdog_SUITE.erl
index ff40326947..7ce09e93ca 100644
--- a/lib/diameter/test/diameter_watchdog_SUITE.erl
+++ b/lib/diameter/test/diameter_watchdog_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -30,11 +30,21 @@
          end_per_suite/1]).
 
 %% testcases
--export([reopen/1, reopen/4]).
+-export([reopen/1, reopen/4, reopen/7]).
 
--export([start/3, %% diameter_transport callback
-         id/1,    %% jitter callback
-         run/1]).
+-export([id/1,    %% jitter callback
+         run1/1]).
+
+%% diameter_app callbacks
+-export([peer_up/3,
+         peer_down/3]).
+
+%% gen_tcp-ish interface
+-export([listen/2,
+         accept/1,
+         connect/3,
+         send/2,
+         setopts/2]).
 
 -include("diameter.hrl").
 -include("diameter_ct.hrl").
@@ -43,33 +53,21 @@
 
 -define(util, diameter_util).
 
--define(BASE,    diameter_gen_base_rfc3588).
--define(APPL_ID, diameter_gen_base_rfc3588:id()).
--define(SUCCESS, 2001).  %% DIAMETER_SUCCESS
-
-%% Addresses for the local and remote diameter nodes. The values don't
-%% matter since we're faking transport.
--define(LOCALHOST, {127,0,0,1}).
--define(REMOTEHOST, {10,0,0,1}).
-
--define(CAPS, #diameter_caps{origin_host = "node.innan.com",
-                             origin_realm = "innan.com",
-                             host_ip_address = [?LOCALHOST],
-                             vendor_id = 1022,
-                             product_name = "remote",
-                             auth_application_id = [?APPL_ID]}).
-
--define(APPL, #diameter_app{alias = ?MODULE,
-                            dictionary = ?BASE,
-                            module = [?MODULE],
-                            init_state = now(),
-                            id = ?APPL_ID,
-                            mutable = false}).
-
-%% Service record maintained by our faked service process.
--define(SERVICE, #diameter_service{pid = self(),
-                                   capabilities = ?CAPS,
-                                   applications = [?APPL]}).
+-define(BASE, ?DIAMETER_DICT_COMMON).
+-define(REALM, "erlang.org").
+-define(ADDR, {127,0,0,1}).
+
+%% Config for diameter:start_service/2.
+-define(SERVICE(Name),
+        [{'Origin-Host', Name ++ "." ++ ?REALM},
+         {'Origin-Realm', ?REALM},
+         {'Host-IP-Address', [?ADDR]},
+         {'Vendor-Id', 42},
+         {'Product-Name', "OTP/diameter"},
+         {'Auth-Application-Id', [?DIAMETER_APP_ID_COMMON]},
+         {application, [{alias, Name},
+                        {dictionary, ?BASE},
+                        {module, ?MODULE}]}]).
 
 %% Watchdog timer as a callback.
 -define(WD(T), {?MODULE, id, [T]}).
@@ -82,28 +80,28 @@
                                  F_ <- [fun(T__) -> T__ end,
                                         fun(T__) -> ?WD(T__) end]]]).
 
-%% Transport types.
--define(TRANSPORTS, [connect, accept]).
+%% Watchdog timer of the misbehaving peer.
+-define(PEER_WD, 10000).
 
-%% Message over the transport interface.
--define(TMSG(T), {diameter, T}).
-
-%% Receive a message within a specified time.
--define(RECV(T, Timeout),
-        receive T -> now()
-        after Timeout -> ?ERROR({timeout, Timeout})
+%% Receive a watchdog event within a specified time.
+-define(EVENT(T, Tmo),
+        receive #diameter_event{info = T} -> now()
+        after Tmo -> ?ERROR({timeout, Tmo})
         end).
 
-%% Receive a message in a given number of watchdogs, plus or minus
+%% Receive an event in a given number of watchdogs, plus or minus
 %% half. Note that the call to now_diff assumes left to right
 %% evaluation order.
--define(RECV(T, N, WdL, WdH),
+-define(EVENT(T, N, WdL, WdH),
         [?ERROR({received, _Elapsed_, _LowerBound_, N, WdL})
          || _UpperBound_ <- [(N)*(WdH) + (WdH) div 2],
-            _Elapsed_    <- [now_diff(now(), ?RECV(T, _UpperBound_))],
+            _Elapsed_    <- [now_diff(now(), ?EVENT(T, _UpperBound_))],
             _LowerBound_ <- [(N)*(WdL) - (WdL) div 2],
             _Elapsed_ =< _LowerBound_*1000]).
 
+-define(EVENT(T, N, Wd),
+        ?EVENT(T, N, Wd, Wd)).
+
 %% A timeout that ensures one watchdog. The ensure only one watchdog
 %% requires (Wd + 2000) + 1000 < 2*(Wd - 2000) ==> 7000 < Wd for the
 %% case with random jitter.
@@ -112,7 +110,7 @@
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {minutes, 6}}].%% enough for 11 watchdogs @ 30 sec plus jitter
+    [{timetrap, {minutes, 10}}].%% enough for 17 watchdogs @ 30 sec plus jitter
 
 all() ->
     [reopen].
@@ -134,52 +132,97 @@ end_per_suite(_Config) ->
 %% implement a transport process that plays the role of the peer
 %% Diameter node.
 
+%reopen(_) ->
+%    reopen(connect, ?WD(10000), 1, 'DWR');
+
 reopen(_) ->
-    [] = ?util:run([{?MODULE, [run, [reopen, Wd, T, N, M]]}
-                    || Wd <- ?WD_TIMERS,
-                       T <- ?TRANSPORTS,
-                       N <- [0,1,2],
-                       M <- ['DWR', 'DWA', other]]).
+    [] = run([[reopen, T, Wd, N, M]
+              || Wd <- ?WD_TIMERS,       %% watchdog_timer value
+                 T <- [listen, connect], %% watchdog to test
+                 N <- [0,1,2],           %% DWR's to answer before ignoring
+                 M <- ['DWR', 'DWA', 'RAA']]). %% how to induce failback
 
-reopen(Wd, Type, N, What) ->
-    Ref = make_ref(),
+reopen(Type, Wd, N, M) ->
+    Server = start_service(),
+    Client = start_service(),
 
-    %% The maker of transport processes.
-    TPid = start({N, Wd, What, Ref}),
+    %% The peer to the transport whose watchdog is tested is given a
+    %% long watchdog timeout so that it doesn't send DWR of its own.
+    {Node, Peer} = {{[], Wd}, {[{module, ?MODULE}], ?WD(?PEER_WD)}},
 
-    %% Act like diameter_service and start the watchdog process, which
-    %% in turn starts a peer_fsm process, which in turn starts a
-    %% transport process by way of start/3. Messages received by the
-    %% testcase are those sent by diameter_watchdog to the service
-    %% process (= process starting the watchdog).
-    WPid1 = watchdog(Type, Ref, TPid, Wd),
+    {{LH,LW},{CH,CW}} = case Type of
+                            listen  -> {Node, Peer};
+                            connect -> {Peer, Node}
+                        end,
 
-    %% Low/high watchdog timeouts.
-    WdL = jitter(Wd, -2000),
-    WdH = jitter(Wd, 2000),
+    LO = [{transport_module, diameter_tcp},
+          {transport_config, LH ++ [{ip, ?ADDR}, {port, 0}]},
+          {watchdog_timer, LW}],
+
+    {ok, LRef} = diameter:add_transport(Server, {listen, LO}),
+
+    [LP] = ?util:lport(tcp, LRef, 20),
+
+    CO = [{transport_module, diameter_tcp},
+          {transport_config, CH ++ [{ip, ?ADDR}, {port, 0},
+                                    {raddr, ?ADDR}, {rport, LP}]},
+          {watchdog_timer, CW}],
+
+    %% Use a temporary process to ensure the connecting transport is
+    %% added only once events from the listening transport are
+    %% subscribed to.
+    Pid = spawn(fun() -> receive _ -> ok end end),
+
+    [] = run([[reopen, Type, T, LRef, Pid, Wd, N, M]
+              || T <- [{listen, Server}, {connect, Client, CO}]]).
+
+%% start_service/1
+
+start_service() ->
+    Name = hostname(),
+    ok = diameter:start_service(Name, [{monitor, self()} | ?SERVICE(Name)]),
+    Name.
+
+%% reopen/7
 
+reopen(Type, {listen = T, SvcName}, Ref, Pid, Wd, N, M) ->
+    diameter:subscribe(SvcName),
+    Pid ! ok,
+    recv(Type, T, SvcName, Ref, Wd, N, M);
+
+reopen(Type, {connect = T, SvcName, Opts}, _, Pid, Wd, N, M) ->
+    diameter:subscribe(SvcName),
+    MRef = erlang:monitor(process, Pid),
+    receive {'DOWN', MRef, process, _, _} -> ok end,
+    {ok, Ref} = diameter:add_transport(SvcName, {T, Opts}),
+    recv(Type, T, SvcName, Ref, Wd, N, M).
+
+%% recv/7
+
+%% The watchdog to be tested.
+recv(Type, Type, _SvcName, Ref, Wd, N, M) ->
     %% Connection should come up immediately as a consequence of
     %% starting the watchdog process. In the accepting case this
     %% results in a new watchdog on a transport waiting for a new
     %% connection.
-    ?RECV({connection_up, WPid1, _}, 1000),
 
-    WPid2 = case Type of
-                connect ->
-                    WPid1;
-                accept ->
-                    watchdog(Type, Ref, TPid, Wd)
-            end,
+    ?EVENT({watchdog, Ref, _, {initial, okay}, _}, 2000),
+    ?EVENT({up, Ref, _, _, #diameter_packet{}}, 0),
+
+    %% Low/high watchdog timeouts.
+    WdL = jitter(Wd, -2000),
+    WdH = jitter(Wd, 2000),
 
     %%   OKAY          Timer expires &      Failover()
     %%                 Pending              SetWatchdog()        SUSPECT
     %%
-    %% Since our transport is replying to N DWR's before becoming
-    %% silent, we should go down after N+2 watchdog_timer expirations:
-    %% that is, after the first unanswered DWR. Knowing the min/max
-    %% watchdog timeout values gives the time interval in which the
-    %% down message is expected.
-    ?RECV({connection_down, WPid1}, N+2, WdL, WdH),
+    %% The peer replies to N DWR's before becoming silent, we should
+    %% go down after N+2 watchdog_timer expirations: that is, after
+    %% the first unanswered DWR. Knowing the min/max watchdog timeout
+    %% values gives the time interval in which the event is expected.
+
+    ?EVENT({watchdog, Ref, _, {okay, suspect}, _}, N+2, WdL, WdH),
+    ?EVENT({down, Ref, _, _}, 0),
 
     %%   SUSPECT       Receive DWA          Pending = FALSE
     %%                                      Failback()
@@ -188,9 +231,11 @@ reopen(Wd, Type, N, What) ->
     %%   SUSPECT       Receive non-DWA      Failback()
     %%                                      SetWatchdog()        OKAY
     %%
-    %% The transport receives a message before the expiry of another
-    %% watchdog to induce failback.
-    ?RECV({connection_up, WPid1}, WdH),
+    %% The peer sends a message before the expiry of another watchdog
+    %% to induce failback.
+
+    ?EVENT({watchdog, Ref, _, {suspect, okay}, _}, WdH + 2000),
+    ?EVENT({up, Ref, _, _}, 0),
 
     %%   OKAY          Timer expires &      SendWatchdog()
     %%                 !Pending             SetWatchdog()
@@ -199,30 +244,35 @@ reopen(Wd, Type, N, What) ->
     %%   OKAY          Timer expires &      Failover()
     %%                 Pending              SetWatchdog()        SUSPECT
     %%
-    %% The transport is still not responding to watchdogs so the
-    %% connection should go back down after either one or two watchdog
-    %% expiries, depending on whether or not DWA restored the connection.
-    F = choose(What == 'DWA', 2, 1),
-    ?RECV({connection_down, WPid1}, F, WdL, WdH),
+    %% The peer is now ignoring all watchdogs so the connection goes
+    %% back down after either one or two watchdog expiries, depending
+    %% on whether or not DWA restored the connection.
+
+    F = choose(M == 'DWA', 2, 1),
+    ?EVENT({watchdog, Ref, _, {okay, suspect}, _}, F, WdL, WdH),
+    ?EVENT({down, Ref, _, _}, 0),
 
     %%   SUSPECT       Timer expires        CloseConnection()
     %%                                      SetWatchdog()        DOWN
     %%
+    %% Non-response brings the connection down after another timeout.
+
+    ?EVENT({watchdog, Ref, _, {suspect, down}, _}, 1, WdL, WdH),
+
     %%   DOWN          Timer expires        AttemptOpen()
     %%                                      SetWatchdog()        DOWN
     %%
-    %% Our transport tells us when the fake connection is
-    %% reestablished, which should happen after another couple of
-    %% watchdog expiries, the first bringing the watchdog to state
-    %% DOWN, the second triggering an attempt to reopen the
-    %% connection.
-    ?RECV({reopen, Ref}, 2, WdL, WdH),
-
     %%   DOWN          Connection up        NumDWA = 0
     %%                                      SendWatchdog()
     %%                                      SetWatchdog()
     %%                                      Pending = TRUE       REOPEN
     %%
+    %% The connection is reestablished after another timeout.
+
+    recv_reopen(Type, Ref, WdL, WdH),
+
+    %%   REOPEN        Receive non-DWA      Throwaway()          REOPEN
+    %%
     %%   REOPEN        Receive DWA &        Pending = FALSE
     %%                 NumDWA < 2           NumDWA++             REOPEN
     %%
@@ -230,312 +280,259 @@ reopen(Wd, Type, N, What) ->
     %%                 NumDWA == 2          NumDWA++
     %%                                      Failback()           OKAY
     %%
-    %% Now the watchdog should require three received DWA's before
-    %% taking the connection back up. The first DWR is sent directly
-    %% after capabilities exchange so it should take no more than two
-    %% watchdog expiries.
-    ?RECV({connection_up, WPid2, _}, 2, WdL, WdH).
+    %%   REOPEN        Timer expires &      SendWatchdog()
+    %%                 !Pending             SetWatchdog()
+    %%                                      Pending = TRUE       REOPEN
+    %%
+    %% An exchange of 3 watchdogs (the first directly after
+    %% capabilities exchange) brings the connection back up.
 
-%% ===========================================================================
+    ?EVENT({watchdog, Ref, _, {reopen, okay}, _}, 2, WdL, WdH),
+    ?EVENT({up, Ref, _, _, #diameter_packet{}}, 0),
 
-%% Start the fake transport process. From diameter's point of view
-%% it's started when diameter calls start/3. We start it before this
-%% happens since we use the same fake transport each time diameter
-%% calls start/3. The process lives and dies with the test case.
-start(Config) ->
-    Pid = self(),
-    spawn(fun() -> loop(init(Pid, Config)) end).
-
-%% Transport start from diameter. This may be called multiple times
-%% depending on the testcase.
-start({Type, _Ref}, #diameter_service{}, Pid) ->
-    Ref = make_ref(),
-    MRef = erlang:monitor(process, Pid),
-    Pid ! {start, self(), Type, Ref},
-    {Ref, TPid} = receive
-                      {Ref, _} = T ->
-                          T;
-                      {'DOWN', MRef, process, _, _} = T ->
-                          T
-                  end,
-    erlang:demonitor(MRef, [flush]),
-    {ok, TPid}.
+    %% Non-response brings it down again.
 
-%% id/1
+    ?EVENT({watchdog, Ref, _, {okay, suspect}, _}, 2, WdL, WdH),
+    ?EVENT({down, Ref, _, _}, 0),
+    ?EVENT({watchdog, Ref, _, {suspect, down}, _}, 1, WdL, WdH),
 
-id(T) ->
-    T.
+    %% Reestablish after another watchdog.
 
-%% ===========================================================================
+    recv_reopen(Type, Ref, WdL, WdH),
 
-choose(true, X, _)  -> X;
-choose(false, _, X) -> X.
+    %%   REOPEN        Timer expires &      NumDWA = -1
+    %%                 Pending &            SetWatchdog()
+    %%                 NumDWA >= 0                               REOPEN
+    %%
+    %%   REOPEN        Timer expires &      CloseConnection()
+    %%                 Pending &            SetWatchdog()
+    %%                 NumDWA < 0                                DOWN
+    %%
+    %% Peer is now ignoring all watchdogs go down again after 2
+    %% timeouts.
 
-%% run/1
-%%
-%% A more useful badmatch in case of failure.
+    ?EVENT({watchdog, Ref, _, {reopen, down}, _}, 2, WdL, WdH);
 
-run([F|A]) ->
-    ok = try
-             apply(?MODULE, F, A),
-             ok
-         catch
-             E:R ->
-                 {A, E, R, erlang:get_stacktrace()}
-         end.
+%% The misbehaving peer.
+recv(_, Type, SvcName, Ref, Wd, N, M) ->
+    %% First transport process.
+    ?EVENT({watchdog, Ref, _, {initial, okay}, _}, 1000),
+    ?EVENT({up, Ref, _, _, #diameter_packet{}}, 0),
+    reg(Type, Ref, SvcName, {SvcName, {Wd,N,M}}),
+    ?EVENT({watchdog, Ref, _, {okay, down}, _}, infinity),
 
-%% now_diff/2
+    %% Second transport process.
+    ?EVENT({watchdog, Ref, _, {_, reopen}, _}, infinity),
+    reg(Type, Ref, SvcName, 3),
+    ?EVENT({watchdog, Ref, _, {_, down}, _}, infinity),
 
-now_diff(T1, T2) ->
-    timer:now_diff(T2, T1).
+    %% Third transport process.
+    ?EVENT({watchdog, Ref, _, {_, reopen}, _}, infinity),
+    reg(Type, Ref, SvcName, 0),
+    ?EVENT({watchdog, Ref, _, {_, down}, _}, infinity),
 
-%% jitter/2
+    ok.
 
-jitter(?WD(T), _) ->
-    T;
-jitter(T,D) ->
-    T+D.
+%% recv_reopen/4
 
-%% watchdog/4
-%%
-%% Fake the call from diameter_service. The watchdog process will send
-%% messages to the calling "service" process so our tests are that the
-%% watchdog responds as expected.
-
-watchdog(Type, Ref, TPid, Wd) ->
-    Opts = [{transport_module, ?MODULE},
-            {transport_config, TPid},
-            {watchdog_timer, Wd}],
-    {_MRef, Pid} = diameter_watchdog:start({Type, Ref},
-                                           {false, Opts, false, ?SERVICE}),
-    Pid.
+recv_reopen(connect, Ref, WdL, WdH) ->
+    ?EVENT({watchdog, Ref, _, {_, reopen}, _}, 1, WdL, WdH),
+    ?EVENT({reconnect, Ref, _}, 0);
 
-%% ===========================================================================
+recv_reopen(listen, Ref, _, _) ->
+    ?EVENT({watchdog, Ref, _, {_, reopen}, _}, 1, ?PEER_WD).
 
-%% Transport process implmentation. Fakes reception of messages by
-%% sending fakes to the parent (peer fsm) process that called start/3.
-
--record(transport,
-        {type,    %% connect | accept | manager
-         parent,  %% pid() of peer_fsm/ervice process
-         open = false,  %% done with capabilities exchange?
-         config}).%% testcase-specific config
-
-%% init/2
-
-%% Testcase starting the manager.
-init(SvcPid, {_,_,_,_} = Config) ->
-    putr(peer, [{'Origin-Host', hostname() ++ ".utan.com"},
-                {'Origin-Realm', "utan.com"}]),
-    #transport{type = manager,
-               parent = monitor(SvcPid),
-               config = Config};
-
-%% Manager starting a transport.
-init(_, {Type, ParentPid, SvcPid, TwinPid, Peer, {N,_,_,_} = Config}) ->
-    putr(peer, Peer),
-    putr(service, SvcPid),
-    putr(count, init(Type, ParentPid, TwinPid, N)),%% number of DWR's to answer
-    #transport{type = Type,
-               parent = monitor(ParentPid),
-               config = Config}.
-
-init(Type, ParentPid, undefined, N) ->
-    connected(ParentPid, Type),
-    N;
-init(_, _, TPid, _) ->
-    monitor(TPid),
-    3.
-
-monitor(Pid) ->
-    erlang:monitor(process, Pid),
-    Pid.
+%% reg/4
+%%
+%% Lookup the pid of the transport process and publish a term for
+%% send/2 to lookup.
+reg(Type, Ref, SvcName, T) ->
+    TPid = tpid(Type, Ref, diameter:service_info(SvcName, transport)),
+    true = diameter_reg:add_new({?MODULE, TPid, T}).
+    
+%% tpid/3
+
+tpid(connect, Ref, [[{ref, Ref},
+                     {type, connect},
+                     {options, _},
+                     {watchdog, _},
+                     {peer, _},
+                     {apps, _},
+                     {caps, _},
+                     {port, [{owner, TPid} | _]}
+                     | _]]) ->
+    TPid;
+
+tpid(listen, Ref, [[{ref, Ref},
+                    {type, listen},
+                    {options, _},
+                    {accept, As}
+                    | _]]) ->
+    [[{watchdog, _},
+      {peer, _},
+      {apps, _},
+      {caps, _},
+      {port, [{owner, TPid} | _]}
+      | _]]
+        = lists:filter(fun([{watchdog, {_,_,S}} | _]) ->
+                               S == okay orelse S == reopen 
+                       end,
+                       As),
+    TPid.
 
-%% Generate a unique hostname for the faked peer.
-hostname() ->
-    lists:flatten(io_lib:format("~p-~p-~p", tuple_to_list(now()))).
+%% ===========================================================================
 
-%% loop/1
-
-loop(S) ->
-    loop(msg(receive T -> T end, S)).
-
-msg(T,S) ->
-    case transition(T,S) of
-        ok ->
-            S;
-        #transport{} = NS ->
-            NS;
-        {stop, Reason} ->
-            x(Reason)
-    end.
-
-x(Reason) ->
-    exit(Reason).
-
-%% transition/2
-
-%% Manager is being asked for a new transport process.
-transition({start, Pid, Type, Ref}, #transport{type = manager,
-                                               parent = SvcPid,
-                                               config = Config}) ->
-    TPid = start({Type, Pid, SvcPid, getr(transport), getr(peer), Config}),
-    Pid ! {Ref, TPid},
-    putr(transport, TPid),
+listen(PortNr, Opts) ->
+    gen_tcp:listen(PortNr, Opts).
+
+accept(LSock) ->
+    gen_tcp:accept(LSock).
+
+connect(Addr, Port, Opts) ->
+    gen_tcp:connect(Addr, Port, Opts).
+
+setopts(Sock, Opts) ->
+    inet:setopts(Sock, Opts).
+
+send(Sock, Bin) ->
+    send(getr(config), Sock, Bin).
+
+%% send/3
+
+%% First outgoing message from a new transport process is CER/CEA.
+%% Remaining outgoing messages are either DWR or DWA.
+send(undefined, Sock, Bin) ->
+    putr(config, init),
+    gen_tcp:send(Sock, Bin);
+
+%% Outgoing DWR: fake reception of DWA. Use the fact that AVP values
+%% are ignored. This is to ensure that the peer's watchdog state
+%% transitions are only induced by responses to messages it sends.
+send(_, Sock, <<_:32, 1:1, _:7, 280:24, _:32, EId:32, HId:32, _/binary>>) ->
+    Pkt = #diameter_packet{header = #diameter_header{version = 1,
+                                                     end_to_end_id = EId,
+                                                     hop_by_hop_id = HId},
+                           msg = ['DWA', {'Result-Code', 2001},
+                                         {'Origin-Host', "XXX"},
+                                         {'Origin-Realm', ?REALM}]},
+    #diameter_packet{bin = Bin} = diameter_codec:encode(?BASE, Pkt),
+    self() ! {tcp, Sock, Bin},
     ok;
 
-%% Peer fsm or testcase process has died.
-transition({'DOWN', _, process, Pid, _} = T, #transport{parent = Pid}) ->
-    {stop, T};
-
-%% Twin transport process has gone down. In the connect case, the
-%% transport isn't started until this happens in the first place so
-%% connect immediately. In the accept case, fake the peer reconnecting
-%% only after another watchdog expiry.
-transition({'DOWN', _, process, _, _}, #transport{type = Type,
-                                                  config = {_, Wd, _, _}}) ->
-    Tmo = case Type of
-              connect ->
-                  0;
-              accept ->
-                  ?ONE_WD(Wd)
-          end,
-    erlang:send_after(Tmo, self(), reconnect),
+%% First outgoing DWA.
+send(init, Sock, Bin) ->
+    [{{?MODULE, _, T}, _}] = diameter_reg:wait({?MODULE, self(), '_'}),
+    putr(config, T),
+    send(Sock, Bin);
+
+%% First transport process.
+send({SvcName, {_,_,_} = T}, Sock, Bin) ->
+    [{'Origin-Host', _} = OH, {'Origin-Realm', _} = OR | _]
+        = ?SERVICE(SvcName),
+    putr(origin, [OH, OR]),
+    putr(config, T),
+    send(Sock, Bin);
+    
+%% Discard DWA, failback after another timeout in the peer.
+send({Wd, 0 = No, Msg}, Sock, Bin) ->
+    Origin = getr(origin),
+    spawn(fun() -> failback(?ONE_WD(Wd), Msg, Sock, Bin, Origin) end),
+    putr(config, No),
     ok;
 
-transition(reconnect, #transport{type = Type,
-                                 parent = Pid,
-                                 config = {_,_,_,Ref}}) ->
-    getr(service) ! {reopen, Ref},
-    connected(Pid, Type),
-    ok;
+%% Send DWA while we're in the mood (aka 0 < N).
+send({Wd, N, Msg}, Sock, Bin) ->
+    putr(config, {Wd, N-1, Msg}),
+    gen_tcp:send(Sock, Bin);
 
-%% Peer fsm process is sending CER: fake the peer's CEA.
-transition(?TMSG({send, Bin}), #transport{type = connect,
-                                          open = false,
-                                          parent = Pid}
-                               = S) ->
-    {Code, Flags, _} = ?BASE:msg_header('CER'),
-    <<_:32, Flags:8, Code:24, _:96, _/binary>> = Bin,
-    Hdr = make_header(Bin),
-    recv(Pid, {Hdr, make_cea()}),
-    S#transport{open = true};
-
-%% Peer fsm process is sending CEA.
-transition(?TMSG({send, Bin}), #transport{type = accept,
-                                          open = false}
-                               = S) ->
-    {Code, Flags, _} = ?BASE:msg_header('CEA'),
-    <<_:32, Flags:8, Code:24, _:96, _/binary>> = Bin,
-    S#transport{open = true};
-
-%% Watchdog is sending DWR or DWA.
-transition(?TMSG({send, Bin}), #transport{open = true} = S) ->
-    {Code, _, _} = ?BASE:msg_header('DWR'),
-    {Code, _, _} = ?BASE:msg_header('DWA'),
-    <<_:32, R:1, 0:7, Code:24, _:96, _/binary>> = Bin,
-    Hdr = make_header(Bin),
-    dwa(1 == R, S, Hdr),
+%% Discard DWA.
+send(0, _Sock, _Bin) ->
     ok;
 
-%% We're telling ourselves to fake a received message.
-transition({recv, Msg}, #transport{parent = Pid}) ->
-    recv(Pid, Msg),
-    ok;
+%% Send DWA.
+send(N, Sock, <<_:32, 0:1, _:7, 280:24, _/binary>> = Bin) ->
+    putr(config, N-1),
+    gen_tcp:send(Sock, Bin).
 
-%% We're telling ourselves to receive a message to induce failback.
-transition(failback = T, #transport{parent = Pid}) ->
-    recv(Pid, eraser(T)),
-    ok.
+failback(Tmo, Msg, Sock, Bin, Origin) ->
+    timer:sleep(Tmo),
+    ok = gen_tcp:send(Sock, msg(Msg, Bin, Origin)).
 
-make_header(Bin) ->
-    #diameter_header{end_to_end_id = E,
-                     hop_by_hop_id = H}
-        = diameter_codec:decode_header(Bin),
-    #diameter_header{end_to_end_id = E,
-                     hop_by_hop_id = H}.
-
-recv(Pid, Msg) ->
-    Pid ! ?TMSG({recv, encode(Msg)}).
-
-%% Replace the end-to-end/hop-by-hop identifiers with those from an
-%% incoming request to which we're constructing a reply.
-encode({Hdr, [_|_] = Msg}) ->
-    #diameter_header{hop_by_hop_id = HBH,
-                     end_to_end_id = E2E}
-        = Hdr,
-    #diameter_packet{bin = Bin} = diameter_codec:encode(?BASE, Msg),
-    <<H:12/binary, _:64, T/binary>> = Bin,
-    <<H/binary, HBH:32, E2E:32, T/binary>>;
-
-encode([_|_] = Msg) ->
-    #diameter_packet{bin = Bin} = diameter_codec:encode(?BASE, Msg),
+%% msg/2
+
+msg('DWA', Bin, _Origin) ->
+    Bin;
+msg(Msg, _Bin, Origin) ->
+    #diameter_packet{bin = Bin}
+        = diameter_codec:encode(?BASE, msg(Msg, Origin)),
     Bin.
 
-connected(Pid, connect) ->
-    Pid ! ?TMSG({self(), connected, make_ref()});
-connected(Pid, accept) ->
-    Pid ! ?TMSG({self(), connected}),
-    recv(Pid, make_cer()).
+msg('DWR' = M, T) ->
+    [M | T];
 
-make_cer() ->
-    ['CER' | getr(peer)] ++ [{'Host-IP-Address', [?REMOTEHOST]},
-                             {'Vendor-Id', 1028},
-                             {'Product-Name', "Utan"},
-                             {'Auth-Application-Id', [?APPL_ID]}].
+msg('RAA', T) ->
+    ['RAA', {'Session-Id', diameter:session_id("abc")},
+            {'Result-Code', 2001}
+          | T].
+%% An unexpected answer is discarded after passing through the
+%% watchdog state machine.
 
-make_cea() ->
-    ['CER' | Rest] = make_cer(),
-    ['CEA', {'Result-Code', ?SUCCESS} | Rest].
+%% ===========================================================================
 
-make_dwr() ->
-    ['DWR' | getr(peer)].
+peer_up(_SvcName, _Peer, S) ->
+    S.
 
-make_dwa() ->
-    ['DWR' | Rest] = make_dwr(),
-    ['DWA', {'Result-Code', ?SUCCESS} | Rest].
+peer_down(_SvcName, _Peer, S) ->
+    S.
 
-dwa(false, _, _) ->  %% outgoing was DWA ...
-    ok;
-dwa(true, S, Hdr) -> %% ... or DWR
-    dwa(getr(count), Hdr, S);
-
-%% React to the DWR only after another watchdog expiry. We shouldn't
-%% get another DWR while the answer is pending.
-dwa(0, Hdr, #transport{config = {_, Wd, What, _}}) ->
-    erlang:send_after(?ONE_WD(Wd), self(), failback),
-    putr(failback, make_msg(What, Hdr)),
-    eraser(count);
-
-dwa(undefined, _, _) ->
-    undefined = getr(failback),  %% ensure this is after failback
-    ok;
+%% ===========================================================================
 
-%% Reply with DWA.
-dwa(N, Hdr, #transport{parent = Pid}) ->
-    putr(count, N-1),
-    recv(Pid, {Hdr, make_dwa()}).
+choose(true, X, _)  -> X;
+choose(false, _, X) -> X.
 
-%% Answer to received DWR.
-make_msg('DWA', Hdr) ->
-    {Hdr, make_dwa()};
+%% id/1
+%%
+%% Jitter callback.
 
-%% DWR from peer.
-make_msg('DWR', _) ->
-    make_dwr();
+id(T) ->
+    T.
 
-%% An unexpected answer is discarded after passing through the
-%% watchdog state machine.
-make_msg(other, _) ->
-    ['RAA', {'Session-Id', diameter:session_id("abc")},
-            {'Result-Code', 2001}
-          | getr(peer)].
+%% run/1
+%%
+%% A more useful badmatch in case of failure.
+
+run(Fs) ->
+    ?util:run([{?MODULE, [run1, F]} || F <- Fs]).
+
+run1([F|A]) ->
+    ok = try
+             apply(?MODULE, F, A),
+             ok
+         catch
+             E:R ->
+                 S = erlang:get_stacktrace(),
+                 io:format("~p~n", [{A, E, R, S}]),
+                 S
+         end.
+
+%% now_diff/2
+
+now_diff(T1, T2) ->
+    timer:now_diff(T2, T1).
+
+%% jitter/2
+
+jitter(?WD(T), _) ->
+    T;
+jitter(T,D) ->
+    T+D.
+
+%% Generate a unique hostname for the faked peer.
+hostname() ->
+    lists:flatten(io_lib:format("~p-~p-~p", tuple_to_list(now()))).
 
 putr(Key, Val) ->
     put({?MODULE, Key}, Val).
 
 getr(Key) ->
     get({?MODULE, Key}).
-
-eraser(Key) ->
-    erase({?MODULE, Key}).
diff --git a/lib/diameter/test/modules.mk b/lib/diameter/test/modules.mk
index 7f163536fb..5898e125ae 100644
--- a/lib/diameter/test/modules.mk
+++ b/lib/diameter/test/modules.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2011. All Rights Reserved.
+# Copyright Ericsson AB 2010-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -39,7 +39,8 @@ MODULES = \
 	diameter_traffic_SUITE \
 	diameter_relay_SUITE \
 	diameter_tls_SUITE \
-	diameter_failover_SUITE
+	diameter_failover_SUITE \
+	diameter_dpr_SUITE
 
 HRL_FILES = \
 	diameter_ct.hrl
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index f6dc786417..c9f74ffcec 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2011. All Rights Reserved.
+# Copyright Ericsson AB 2010-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.1
+DIAMETER_VSN = 1.3
 PRE_VSN      =
 APP_VSN      = "$(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)"
 
diff --git a/lib/edoc/doc/src/Makefile b/lib/edoc/doc/src/Makefile
index b933094464..1f92d36f12 100644
--- a/lib/edoc/doc/src/Makefile
+++ b/lib/edoc/doc/src/Makefile
@@ -124,13 +124,13 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/edoc/doc/src/notes.xml b/lib/edoc/doc/src/notes.xml
index a74a19bc05..472b3bfc34 100644
--- a/lib/edoc/doc/src/notes.xml
+++ b/lib/edoc/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2011</year>
+      <year>2007</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,25 @@
   <p>This document describes the changes made to the EDoc
     application.</p>
 
+<section><title>Edoc 0.7.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    List behaviour callbacks in Edoc when using -callback
+	    attribute. (Thanks to Magnus Henoch.)</p>
+          <p>
+	    Added special case for file names under Windows. (Thanks
+	    to Beads Land-Trujillo.)</p>
+          <p>
+	    Own Id: OTP-10174</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Edoc 0.7.9.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/edoc/include/Makefile b/lib/edoc/include/Makefile
index 5b2ad38c9d..cf2e051632 100644
--- a/lib/edoc/include/Makefile
+++ b/lib/edoc/include/Makefile
@@ -49,8 +49,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec:
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(INCLUDE_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(INCLUDE_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
 
diff --git a/lib/edoc/priv/Makefile b/lib/edoc/priv/Makefile
index 13225e6d1a..73c42c05eb 100644
--- a/lib/edoc/priv/Makefile
+++ b/lib/edoc/priv/Makefile
@@ -45,9 +45,9 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(PRIV_FILES) $(RELSYSDIR)/priv
-	$(INSTALL_SCRIPT) $(GEN_SCRIPT) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(PRIV_FILES) "$(RELSYSDIR)/priv"
+	$(INSTALL_SCRIPT) $(GEN_SCRIPT) "$(RELSYSDIR)/priv"
 
 
 release_docs_spec:
diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile
index fcb0b61292..72354ac711 100644
--- a/lib/edoc/src/Makefile
+++ b/lib/edoc/src/Makefile
@@ -85,10 +85,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) $(RELSYSDIR)/src
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) "$(RELSYSDIR)/src"
 
 release_docs_spec:
 
diff --git a/lib/edoc/src/edoc_data.erl b/lib/edoc/src/edoc_data.erl
index aad0b14371..624f9177a2 100644
--- a/lib/edoc/src/edoc_data.erl
+++ b/lib/edoc/src/edoc_data.erl
@@ -167,7 +167,10 @@ callbacks(Es, Module, Env, Opts) ->
     case lists:any(fun (#entry{name = {behaviour_info, 1}}) -> true;
 		       (_) -> false
 		   end,
-		   Es) of
+		   Es)
+	orelse
+	lists:keymember(callback, 1, Module#module.attributes)
+    of
 	true ->
 	    try (Module#module.name):behaviour_info(callbacks) of
 		Fs ->
diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl
index 7fd8358add..90fb8a679c 100644
--- a/lib/edoc/src/edoc_lib.erl
+++ b/lib/edoc/src/edoc_lib.erl
@@ -469,6 +469,10 @@ uri_get("ftp:" ++ Path) ->
 uri_get("//" ++ Path) ->
     Msg = io_lib:format("cannot access network-path: '//~s'.", [Path]),
     {error, Msg};
+uri_get([C, $:, $/ | _]=Path) when C >= $A, C =< $Z; C >= $a, C =< $z ->
+    uri_get_file(Path);  % special case for Windows
+uri_get([C, $:, $\ | _]=Path) when C >= $A, C =< $Z; C >= $a, C =< $z ->
+    uri_get_file(Path);  % special case for Windows
 uri_get(URI) ->
     case is_relative_uri(URI) of
 	true ->
diff --git a/lib/edoc/src/edoc_parser.yrl b/lib/edoc/src/edoc_parser.yrl
index 4d6428f75b..d7c1b1c045 100644
--- a/lib/edoc/src/edoc_parser.yrl
+++ b/lib/edoc/src/edoc_parser.yrl
@@ -100,9 +100,7 @@ ptype -> '[' utype ',' '...' ']' : #t_nonempty_list{type = '$2'}.
 ptype -> utype_list:
 	if length(element(1, '$1')) == 1 ->
 		%% there must be exactly one utype in the list
-		hd(element(1, '$1'));
-                %% Replace last line when releasing next major release:
-                %% #t_paren{type = hd(element(1, '$1'))};
+                #t_paren{type = hd(element(1, '$1'))};
 	   length(element(1, '$1')) == 0 ->
 		return_error(element(2, '$1'), "syntax error before: ')'");
 	   true ->
diff --git a/lib/edoc/test/Makefile b/lib/edoc/test/Makefile
index 2dbdb77eff..2033e003b3 100644
--- a/lib/edoc/test/Makefile
+++ b/lib/edoc/test/Makefile
@@ -57,10 +57,10 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) edoc.spec edoc.cover $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) edoc.spec edoc.cover "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk
index b8f33894f1..2f403212c8 100644
--- a/lib/edoc/vsn.mk
+++ b/lib/edoc/vsn.mk
@@ -1 +1 @@
-EDOC_VSN = 0.7.9.1
+EDOC_VSN = 0.7.10
diff --git a/lib/eldap/.gitignore b/lib/eldap/.gitignore
index 5585418186..d3dd8228d5 100644
--- a/lib/eldap/.gitignore
+++ b/lib/eldap/.gitignore
@@ -1,4 +1,4 @@
 *.beam
 *.asn1db
-src/ELDAPv3.hrl
-src/ELDAPv3.erl
+ebin/ELDAPv3.hrl
+ebin/ELDAPv3.erl
diff --git a/lib/eldap/doc/src/Makefile b/lib/eldap/doc/src/Makefile
index 4c827319b4..a4827793f4 100644
--- a/lib/eldap/doc/src/Makefile
+++ b/lib/eldap/doc/src/Makefile
@@ -99,16 +99,16 @@ clean clean_docs clean_tex:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-#       $(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-#	$(INSTALL_DATA) $(MAN6DIR)/* $(RELEASE_PATH)/man/man6
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+#       $(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+#	$(INSTALL_DATA) $(MAN6DIR)/* "$(RELEASE_PATH)/man/man6"
 
 
 release_spec:
diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile
index 4ddb8082d7..46fb805bcc 100644
--- a/lib/eldap/src/Makefile
+++ b/lib/eldap/src/Makefile
@@ -88,7 +88,7 @@ $(TARGET_FILES): $(HRL_FILES)
 # Special Build Targets
 # ----------------------------------------------------
 $(ASN1_HRL): ../asn1/$(ASN1_FILES)
-	$(ERLC) -o $(EBIN) -bber_bin +optimize +nif $(ERL_COMPILE_FLAGS) ../asn1/ELDAPv3.asn1
+	$(ERLC) -o $(EBIN) -bber $(ERL_COMPILE_FLAGS) ../asn1/ELDAPv3.asn1
 
 # ----------------------------------------------------
 # Release Target
@@ -96,14 +96,14 @@ $(ASN1_HRL): ../asn1/$(ASN1_FILES)
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/asn1
-	$(INSTALL_DATA) ../asn1/$(ASN1_FILES) $(RELSYSDIR)/asn1
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
+	$(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
 
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl
index 699dfc8791..b3249d4f56 100644
--- a/lib/eldap/src/eldap.erl
+++ b/lib/eldap/src/eldap.erl
@@ -700,20 +700,22 @@ recv_response(S, Data) ->
 		Error     -> throw(Error)
 	    end;
 	{error,Reason} ->
-	    throw({gen_tcp_error, Reason});
-	Error ->
-	    throw(Error)
+	    throw({gen_tcp_error, Reason})
     end.
 
 %%% Sanity check of received packet
 check_tag(Data) ->
-    case asn1rt_ber_bin:decode_tag(l2b(Data)) of
-	{_Tag, Data1, _Rb} ->
-	    case asn1rt_ber_bin:decode_length(l2b(Data1)) of
-		{{_Len, _Data2}, _Rb2} -> ok;
-		_ -> throw({error,decoded_tag_length})
-	    end;
-	_ -> throw({error,decoded_tag})
+    try
+	{_Tag, Data1, _Rb} = asn1rt_ber_bin:decode_tag(l2b(Data)),
+	try
+	    {{_Len, _Data2}, _Rb2} = asn1rt_ber_bin:decode_length(l2b(Data1)),
+	    ok
+	catch
+	    _ -> throw({error,decoded_tag_length})
+	end
+    catch
+	_ ->
+	    throw({error, decoded_tag})
     end.
 
 %%% Check for expected kind of reply
diff --git a/lib/eldap/test/Makefile b/lib/eldap/test/Makefile
index a17d4f56b2..3c5810eece 100644
--- a/lib/eldap/test/Makefile
+++ b/lib/eldap/test/Makefile
@@ -50,7 +50,7 @@ RELSYSDIR = $(RELEASE_PATH)/eldap_test
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += $(INCLUDES)
+ERL_COMPILE_FLAGS += $(INCLUDES) -pa $(ERL_TOP)/lib/eldap/ebin
 
 EBIN = .
 
@@ -75,9 +75,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SPEC_FILES) $(ERL_FILES) $(COVER_FILE) $(HRL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-#	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SPEC_FILES) $(ERL_FILES) $(COVER_FILE) $(HRL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+#	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 release_docs_spec:
diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk
index c9d6e4e324..4d05d3d1e3 100644
--- a/lib/eldap/vsn.mk
+++ b/lib/eldap/vsn.mk
@@ -1 +1 @@
-ELDAP_VSN = 1.0
+ELDAP_VSN = 1.0.1
diff --git a/lib/erl_docgen/doc/src/Makefile b/lib/erl_docgen/doc/src/Makefile
index ff50c12895..8d8dd0dd55 100644
--- a/lib/erl_docgen/doc/src/Makefile
+++ b/lib/erl_docgen/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2011-2011. All Rights Reserved.
+# Copyright Ericsson AB 2011-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -124,13 +124,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6DIR)/* $(RELEASE_PATH)/man/man6
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6DIR)/* "$(RELEASE_PATH)/man/man6"
 
 release_spec:
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index 8ca11b1cf5..9775909d76 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,7 +30,38 @@
   </header>
   <p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
 
-  <section><title>Erl_Docgen 0.3.1</title>
+  <section><title>Erl_Docgen 0.3.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> A possibility to configure erl_docgen so it can
+	    generate documentation for other products than
+	    Erlang/OTP. </p>
+          <p>
+	    Own Id: OTP-9040</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 0.3.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> A bug regarding spaces in C function prototypes has
+	    been fixed. (Thanks to Richard O'Keefe.) </p>
+          <p>
+	    Own Id: OTP-10138</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 0.3.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/erl_docgen/priv/bin/Makefile b/lib/erl_docgen/priv/bin/Makefile
index 95ad36216a..d6d0ad2260 100644
--- a/lib/erl_docgen/priv/bin/Makefile
+++ b/lib/erl_docgen/priv/bin/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2009-2010. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -64,8 +64,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
-	$(INSTALL_SCRIPT) $(ESCRIPT_FILES) $(RELSYSDIR)/priv/bin
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
+	$(INSTALL_SCRIPT) $(ESCRIPT_FILES) "$(RELSYSDIR)/priv/bin"
 
 release_docs_spec:
 
diff --git a/lib/erl_docgen/priv/css/Makefile b/lib/erl_docgen/priv/css/Makefile
index 81124fb111..24abc4fa9c 100644
--- a/lib/erl_docgen/priv/css/Makefile
+++ b/lib/erl_docgen/priv/css/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2009. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -64,13 +64,13 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/css
-	$(INSTALL_DATA) $(CSS_FILES) $(RELSYSDIR)/priv/css
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/css"
+	$(INSTALL_DATA) $(CSS_FILES) "$(RELSYSDIR)/priv/css"
 
 
 release_docs_spec:
-	$(INSTALL_DIR) $(RELEASE_PATH)/doc
-	$(INSTALL_DATA) $(CSS_FILES) ../nyi.html $(RELEASE_PATH)/doc
+	$(INSTALL_DIR) "$(RELEASE_PATH)/doc"
+	$(INSTALL_DATA) $(CSS_FILES) ../nyi.html "$(RELEASE_PATH)/doc"
 
 release_tests_spec:
 
diff --git a/lib/erl_docgen/priv/dtd/Makefile b/lib/erl_docgen/priv/dtd/Makefile
index 65c68fcca7..4538b7f8e6 100644
--- a/lib/erl_docgen/priv/dtd/Makefile
+++ b/lib/erl_docgen/priv/dtd/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2009-2011. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -89,8 +89,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/dtd
-	$(INSTALL_DATA) $(DTD_FILES)  $(ENT_FILES) $(RELSYSDIR)/priv/dtd
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/dtd"
+	$(INSTALL_DATA) $(DTD_FILES)  $(ENT_FILES) "$(RELSYSDIR)/priv/dtd"
 
 
 release_docs_spec:
diff --git a/lib/erl_docgen/priv/dtd_html_entities/Makefile b/lib/erl_docgen/priv/dtd_html_entities/Makefile
index d57302bd1b..f8a10973b2 100644
--- a/lib/erl_docgen/priv/dtd_html_entities/Makefile
+++ b/lib/erl_docgen/priv/dtd_html_entities/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2009. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -63,8 +63,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/dtd_html_entities
-	$(INSTALL_DATA) $(ENTITY_FILES) $(RELSYSDIR)/priv/dtd_html_entities
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/dtd_html_entities"
+	$(INSTALL_DATA) $(ENTITY_FILES) "$(RELSYSDIR)/priv/dtd_html_entities"
 
 
 release_docs_spec:
diff --git a/lib/erl_docgen/priv/dtd_man_entities/Makefile b/lib/erl_docgen/priv/dtd_man_entities/Makefile
index 5651d8bc29..da4998dcbc 100644
--- a/lib/erl_docgen/priv/dtd_man_entities/Makefile
+++ b/lib/erl_docgen/priv/dtd_man_entities/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2009. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -63,8 +63,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/dtd_man_entities
-	$(INSTALL_DATA) $(ENTITY_FILES) $(RELSYSDIR)/priv/dtd_man_entities
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/dtd_man_entities"
+	$(INSTALL_DATA) $(ENTITY_FILES) "$(RELSYSDIR)/priv/dtd_man_entities"
 
 
 release_docs_spec:
diff --git a/lib/erl_docgen/priv/images/Makefile b/lib/erl_docgen/priv/images/Makefile
index 8b858fefb3..61016e927c 100644
--- a/lib/erl_docgen/priv/images/Makefile
+++ b/lib/erl_docgen/priv/images/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2009. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -66,13 +66,13 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/images
-	$(INSTALL_DATA) $(GIF_FILES) $(PNG_FILES) $(RELSYSDIR)/priv/images
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/images"
+	$(INSTALL_DATA) $(GIF_FILES) $(PNG_FILES) "$(RELSYSDIR)/priv/images"
 
 
 release_docs_spec:
-	$(INSTALL_DIR) $(RELEASE_PATH)/doc
-	$(INSTALL_DATA) $(PNG_FILES) $(RELEASE_PATH)/doc
+	$(INSTALL_DIR) "$(RELEASE_PATH)/doc"
+	$(INSTALL_DATA) $(PNG_FILES) "$(RELEASE_PATH)/doc"
 
 release_tests_spec:
 
diff --git a/lib/erl_docgen/priv/js/flipmenu/Makefile b/lib/erl_docgen/priv/js/flipmenu/Makefile
index 65c5c91f35..7933752532 100644
--- a/lib/erl_docgen/priv/js/flipmenu/Makefile
+++ b/lib/erl_docgen/priv/js/flipmenu/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2009. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -68,13 +68,13 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/js/flipmenu
-	$(INSTALL_DATA) $(JS_FILES) $(GIF_FILES) $(RELSYSDIR)/priv/js/flipmenu
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/js/flipmenu"
+	$(INSTALL_DATA) $(JS_FILES) $(GIF_FILES) "$(RELSYSDIR)/priv/js/flipmenu"
 
 
 release_docs_spec:
-	$(INSTALL_DIR) $(RELEASE_PATH)/doc/js/flipmenu
-	$(INSTALL_DATA) $(JS_FILES) $(GIF_FILES) $(RELEASE_PATH)/doc/js/flipmenu
+	$(INSTALL_DIR) "$(RELEASE_PATH)/doc/js/flipmenu"
+	$(INSTALL_DATA) $(JS_FILES) $(GIF_FILES) "$(RELEASE_PATH)/doc/js/flipmenu"
 
 release_tests_spec:
 
diff --git a/lib/erl_docgen/priv/xsl/Makefile b/lib/erl_docgen/priv/xsl/Makefile
index 92a53b8c0b..58589672b8 100644
--- a/lib/erl_docgen/priv/xsl/Makefile
+++ b/lib/erl_docgen/priv/xsl/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2009. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -42,7 +42,8 @@ XSL_FILES = \
 	db_pdf_params.xsl \
 	db_html.xsl \
 	db_html_params.xsl \
-	db_man.xsl
+	db_man.xsl \
+	db_eix.xsl
 
 
 # ----------------------------------------------------
@@ -68,8 +69,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/xsl
-	$(INSTALL_DATA) $(XSL_FILES) $(RELSYSDIR)/priv/xsl
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/xsl"
+	$(INSTALL_DATA) $(XSL_FILES) "$(RELSYSDIR)/priv/xsl"
 
 
 release_docs_spec:
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index 7cf5465f90..ab5f24c406 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -578,8 +578,22 @@
     <xsl:param name="curModule"/>
     <html>
       <head>
-        <link rel="stylesheet" href="{$topdocdir}/otp_doc.css" type="text/css"/>
-        <title>Erlang -- <xsl:value-of select="header/title"/></title>
+        <xsl:choose>
+          <xsl:when test="string-length($stylesheet) > 0">
+            <link rel="stylesheet" href="{$topdocdir}/{$stylesheet}" type="text/css"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <link rel="stylesheet" href="{$topdocdir}/otp_doc.css" type="text/css"/>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:choose>
+          <xsl:when test="string-length($winprefix) > 0">
+            <title><xsl:value-of select="$winprefix"/> -- <xsl:value-of select="header/title"/></title>
+          </xsl:when>
+          <xsl:otherwise>
+            <title>Erlang -- <xsl:value-of select="header/title"/></title>
+          </xsl:otherwise>
+        </xsl:choose>
       </head>
       <body bgcolor="white" text="#000000" link="#0000ff" vlink="#ff00ff" alink="#ff0000">
 
@@ -719,7 +733,14 @@
 
 
   <xsl:template name="menu_top">
-    <img alt="Erlang logo" src="{$topdocdir}/erlang-logo.png"/>
+    <xsl:choose>
+      <xsl:when test="string-length($logo) > 0">
+        <img alt="Erlang logo" src="{$topdocdir}/{$logo}"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <img alt="Erlang logo" src="{$topdocdir}/erlang-logo.png"/>
+      </xsl:otherwise>
+    </xsl:choose>
     <br/>
     <small>
       <xsl:if test="boolean(/book/parts/part)">
@@ -731,7 +752,14 @@
       <xsl:if test="boolean(/book/releasenotes)">
         <a href="release_notes.html">Release Notes</a><br/>
       </xsl:if>
-      <a href="{$pdfdir}/{$appname}-{$appver}.pdf">PDF</a><br/>
+      <xsl:choose>
+	<xsl:when test="string-length($pdfname) > 0">
+	  <a href="{$pdfdir}/{$pdfname}.pdf">PDF</a><br/>
+	</xsl:when>
+	<xsl:otherwise>
+	  <a href="{$pdfdir}/{$appname}-{$appver}.pdf">PDF</a><br/>
+	</xsl:otherwise>
+      </xsl:choose>
       <a href="{$topdocdir}/index.html">Top</a>
     </small>
   </xsl:template>
@@ -1817,7 +1845,14 @@
 
     <xsl:choose>
       <xsl:when test="ancestor::cref">
-        <a name="{substring-before(nametext, '(')}"><span class="bold_code"><xsl:value-of select="ret"/><xsl:text> </xsl:text><xsl:value-of select="nametext"/></span></a><br/>
+        <a name="{substring-before(nametext, '(')}">
+          <span class="bold_code">
+            <xsl:value-of select="ret"/>
+            <xsl:call-template name="maybe-space-after-ret">
+              <xsl:with-param name="s" select="ret"/>
+            </xsl:call-template>
+            <xsl:value-of select="nametext"/>
+          </span></a><br/>
       </xsl:when>
       <xsl:when test="ancestor::erlref">
         <xsl:variable name="fname">
@@ -1845,6 +1880,18 @@
 
   </xsl:template>
 
+  <xsl:template name="maybe-space-after-ret">
+    <xsl:param name="s"/>
+    <xsl:variable name="last_char"
+	          select="substring($s, string-length($s), 1)"/>
+    <xsl:choose>
+      <xsl:when test="$last_char != '*'">
+        <xsl:text> </xsl:text>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+
   <!-- Type -->
   <xsl:template match="type">
     <xsl:param name="partnum"/>
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index 5234ba6bd0..33808859c7 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -3,7 +3,7 @@
      #
      # %CopyrightBegin%
      #
-     # Copyright Ericsson AB 2009-2011. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2012. All Rights Reserved.
      #
      # The contents of this file are subject to the Erlang Public License,
      # Version 1.1, (the "License"); you may not use this file except in
@@ -758,10 +758,32 @@
 
   <xsl:template name="name">
     <xsl:text>&#10;.B&#10;</xsl:text>
-    <xsl:apply-templates/>
+    <xsl:choose>
+      <xsl:when test="ancestor::cref">
+        <xsl:value-of select="ret"/>
+        <xsl:call-template name="maybe-space-after-ret">
+          <xsl:with-param name="s" select="ret"/>
+        </xsl:call-template>
+        <xsl:value-of select="nametext"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates/>
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:text>&#10;.br</xsl:text>
   </xsl:template>
 
+  <xsl:template name="maybe-space-after-ret">
+    <xsl:param name="s"/>
+    <xsl:variable name="last_char"
+	          select="substring($s, string-length($s), 1)"/>
+    <xsl:choose>
+      <xsl:when test="$last_char != '*'">
+        <xsl:text> </xsl:text>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
 
   <!-- Type -->
   <xsl:template match="type">
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index 4ed4fa14c4..7de5af2a49 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -3,7 +3,7 @@
      #
      # %CopyrightBegin%
      #
-     # Copyright Ericsson AB 2009-2011. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2012. All Rights Reserved.
      #
      # The contents of this file are subject to the Erlang Public License,
      # Version 1.1, (the "License"); you may not use this file except in
@@ -650,7 +650,7 @@
 
       <fo:flow flow-name="xsl-region-body">
         <fo:block xsl:use-attribute-sets="cover.logo">
-          <fo:external-graphic src="{$docgen}/priv/images/erlang-logo.gif"/>
+          <fo:external-graphic src="{$logo}"/>
         </fo:block>
         <fo:block xsl:use-attribute-sets="cover.title" id="cover-page">
           <xsl:apply-templates/>
@@ -1424,7 +1424,13 @@
     <xsl:param name="partnum"/>
     <xsl:choose>
       <xsl:when test="ancestor::cref">
-        <fo:block id="{generate-id(nametext)}"><xsl:value-of select="ret"/><xsl:text></xsl:text><xsl:value-of select="nametext"/></fo:block>
+        <fo:block id="{generate-id(nametext)}">
+          <xsl:value-of select="ret"/>
+          <xsl:call-template name="maybe-space-after-ret">
+            <xsl:with-param name="s" select="ret"/>
+          </xsl:call-template>
+          <xsl:value-of select="nametext"/>
+        </fo:block>
       </xsl:when>
       <xsl:otherwise>
         <fo:block id="{generate-id(.)}"><xsl:value-of select="."/></fo:block>
@@ -1432,6 +1438,16 @@
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template name="maybe-space-after-ret">
+    <xsl:param name="s"/>
+    <xsl:variable name="last_char"
+	          select="substring($s, string-length($s), 1)"/>
+    <xsl:choose>
+      <xsl:when test="$last_char != '*'">
+        <xsl:text> </xsl:text>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
 
   <!-- Type -->
   <xsl:template match="type">
@@ -1564,7 +1580,7 @@
     </xsl:variable>
 
     <fo:block xsl:use-attribute-sets="image">
-      <fo:external-graphic content-width="60%" src="{@file}"/>
+      <fo:external-graphic content-width="scale-down-to-fit" inline-progression-dimension.maximum="100%" src="{@file}"/>
 
       <xsl:apply-templates>
         <xsl:with-param name="chapnum" select="$chapnum"/>
diff --git a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
index 4d9c08d0c3..4e61f1f476 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
@@ -87,7 +87,7 @@
   <xsl:attribute-set name="cover.title">
     <xsl:attribute name="border-before-style">solid</xsl:attribute>
     <xsl:attribute name="border-before-width">10pt</xsl:attribute>
-    <xsl:attribute name="border-color">#960003</xsl:attribute>
+    <xsl:attribute name="border-color"><xsl:value-of select="$pdfcolor"/></xsl:attribute>
     <xsl:attribute name="font-size">2.3em</xsl:attribute>
     <xsl:attribute name="padding-before">0.5em</xsl:attribute>
     <xsl:attribute name="text-align">end</xsl:attribute>
@@ -101,7 +101,7 @@
   <xsl:attribute-set name="cover.inner.copyright">
     <xsl:attribute name="border-before-style">solid</xsl:attribute>
     <xsl:attribute name="border-before-width">1pt</xsl:attribute>
-    <xsl:attribute name="border-color">#960003</xsl:attribute>
+    <xsl:attribute name="border-color"><xsl:value-of select="$pdfcolor"/></xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
     <xsl:attribute name="padding-before">0.5em</xsl:attribute>
     <xsl:attribute name="space-before">200mm</xsl:attribute>
@@ -160,7 +160,7 @@
   <xsl:attribute-set name="h1">
     <xsl:attribute name="border-after-style">solid</xsl:attribute>
     <xsl:attribute name="border-after-width">1pt</xsl:attribute>
-    <xsl:attribute name="border-color">#960003</xsl:attribute>
+    <xsl:attribute name="border-color"><xsl:value-of select="$pdfcolor"/></xsl:attribute>
     <xsl:attribute name="break-before">page</xsl:attribute>
     <xsl:attribute name="font-family">sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1.83em</xsl:attribute>
@@ -226,7 +226,7 @@
   <xsl:attribute-set name="page-header">
     <xsl:attribute name="border-after-style">solid</xsl:attribute>
     <xsl:attribute name="border-after-width">2pt</xsl:attribute>
-    <xsl:attribute name="border-color">#960003</xsl:attribute>
+    <xsl:attribute name="border-color"><xsl:value-of select="$pdfcolor"/></xsl:attribute>
     <xsl:attribute name="font-family">sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">0.9em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile
index cbaf6e4627..6c8b438b25 100644
--- a/lib/erl_docgen/src/Makefile
+++ b/lib/erl_docgen/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2011. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -89,10 +89,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
index 20daae8215..cbaa93a15d 100644
--- a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
@@ -338,7 +338,7 @@ otp_xmlify_e(#xmlElement{name=code} = E) ->    % 4)
     end;
 otp_xmlify_e(#xmlElement{name=Tag} = E)        % 5a
   when Tag==h1; Tag==h2; Tag==h3; Tag==h4; Tag==h5 ->
-    Content = text_only(E#xmlElement.content),
+    Content = text_and_a_name_only(E#xmlElement.content),
     [E#xmlElement{name=b, content=Content}];
 otp_xmlify_e(#xmlElement{name=Tag} = E)        % 5b-c)
   when Tag==center;
@@ -1161,6 +1161,18 @@ get_text(#xmlElement{content=[#xmlText{value=Text}]}) ->
 get_text(#xmlElement{content=[E]}) ->
     get_text(E).
 
+%% text_and_name_only(Es) -> Ts
+text_and_a_name_only([#xmlElement{
+		       name = a, 
+		       attributes = [#xmlAttribute{name=name}]} = Name|Es]) ->
+    [Name|text_and_a_name_only(Es)];
+text_and_a_name_only([#xmlElement{content = Content}|Es]) ->
+    text_and_a_name_only(Content) ++ text_and_a_name_only(Es);
+text_and_a_name_only([#xmlText{} = E |Es]) ->
+    [E | text_and_a_name_only(Es)];
+text_and_a_name_only([]) ->
+    [].
+
 %% text_only(Es) -> Ts
 %% Takes a list of xmlElement and xmlText and return a lists of xmlText.
 text_only([#xmlElement{content = Content}|Es]) ->
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index bf10591f34..2599dc0ff7 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1,2 +1,2 @@
-ERL_DOCGEN_VSN = 0.3.1
+ERL_DOCGEN_VSN = 0.3.3
 
diff --git a/lib/erl_interface/aclocal.m4 b/lib/erl_interface/aclocal.m4
index 339a15a2bb..9578cd35c4 100644
--- a/lib/erl_interface/aclocal.m4
+++ b/lib/erl_interface/aclocal.m4
@@ -1,7 +1,7 @@
 dnl
 dnl %CopyrightBegin%
 dnl
-dnl Copyright Ericsson AB 1998-2011. All Rights Reserved.
+dnl Copyright Ericsson AB 1998-2012. All Rights Reserved.
 dnl
 dnl The contents of this file are subject to the Erlang Public License,
 dnl Version 1.1, (the "License"); you may not use this file except in
@@ -59,6 +59,7 @@ AC_ARG_VAR(erl_xcomp_isysroot, [Absolute cross system root include path (only us
 
 dnl Cross compilation variables
 AC_ARG_VAR(erl_xcomp_bigendian, [big endian system: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_double_middle_endian, [double-middle-endian system: yes|no (only used when cross compiling)])
 AC_ARG_VAR(erl_xcomp_linux_clock_gettime_correction, [clock_gettime() can be used for time correction: yes|no (only used when cross compiling)])
 AC_ARG_VAR(erl_xcomp_linux_nptl, [have Native POSIX Thread Library: yes|no (only used when cross compiling)])
 AC_ARG_VAR(erl_xcomp_linux_usable_sigusrx, [SIGUSR1 and SIGUSR2 can be used: yes|no (only used when cross compiling)])
@@ -606,6 +607,103 @@ ifelse([$5], , , [$5
 fi
 ])
 
+dnl ----------------------------------------------------------------------
+dnl
+dnl AC_DOUBLE_MIDDLE_ENDIAN
+dnl
+dnl Checks whether doubles are represented in "middle-endian" format.
+dnl Sets ac_cv_double_middle_endian={no,yes,unknown} accordingly,
+dnl as well as DOUBLE_MIDDLE_ENDIAN.
+dnl
+dnl
+
+AC_DEFUN([AC_C_DOUBLE_MIDDLE_ENDIAN],
+[AC_CACHE_CHECK(whether double word ordering is middle-endian, ac_cv_c_double_middle_endian,
+[# It does not; compile a test program.
+AC_RUN_IFELSE(
+[AC_LANG_SOURCE([[#include <stdlib.h>
+
+int
+main(void)
+{
+  int i = 0;
+  int zero = 0;
+  int bigendian;
+  int zero_index = 0;
+
+  union
+  {
+    long int l;
+    char c[sizeof (long int)];
+  } u;
+
+  /* we'll use the one with 32-bit words */
+  union
+  {
+    double d;
+    unsigned int c[2];
+  } vint;
+
+  union
+  {
+    double d;
+    unsigned long c[2];
+  } vlong;
+
+  union
+  {
+    double d;
+    unsigned short c[2];
+  } vshort;
+
+
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  u.l = 1;
+  bigendian = (u.c[sizeof (long int) - 1] == 1);
+
+  zero_index = bigendian ? 1 : 0;
+
+  vint.d = 1.0;
+  vlong.d = 1.0;
+  vshort.d = 1.0;
+
+  if (sizeof(unsigned int) == 4)
+    {
+      if (vint.c[zero_index] != 0)
+	zero = 1;
+    }
+  else if (sizeof(unsigned long) == 4)
+    {
+      if (vlong.c[zero_index] != 0)
+	zero = 1;
+    }
+  else if (sizeof(unsigned short) == 4)
+    {
+      if (vshort.c[zero_index] != 0)
+	zero = 1;
+    }
+
+  exit (zero);
+}
+]])],
+	      [ac_cv_c_double_middle_endian=no],
+	      [ac_cv_c_double_middle_endian=yes],
+	      [ac_cv_c_double_middle=unknown])])
+case $ac_cv_c_double_middle_endian in
+  yes)
+    m4_default([$1],
+      [AC_DEFINE([DOUBLE_MIDDLE_ENDIAN], 1,
+	[Define to 1 if your processor stores the words in a double in
+	 middle-endian format (like some ARMs).])]) ;;
+  no)
+    $2 ;;
+  *)
+    m4_default([$3],
+      [AC_MSG_WARN([unknown double endianness
+presetting ac_cv_c_double_middle_endian=no (or yes) will help])]) ;;
+esac
+])# AC_C_DOUBLE_MIDDLE_ENDIAN
+
 
 dnl ----------------------------------------------------------------------
 dnl
@@ -642,11 +740,16 @@ dnl Try to find POSIX threads
 dnl The usual pthread lib...
     AC_CHECK_LIB(pthread, pthread_create, THR_LIBS="-lpthread")
 
-dnl FreeBSD has pthreads in special c library, c_r...
+dnl Very old versions of FreeBSD have pthreads in special c library, c_r...
     if test "x$THR_LIBS" = "x"; then
 	AC_CHECK_LIB(c_r, pthread_create, THR_LIBS="-lc_r")
     fi
 
+dnl QNX has pthreads in standard C library
+    if test "x$THR_LIBS" = "x"; then
+	AC_CHECK_FUNC(pthread_create, THR_LIBS="none_needed")
+    fi
+
 dnl On ofs1 the '-pthread' switch should be used
     if test "x$THR_LIBS" = "x"; then
 	AC_MSG_CHECKING([if the '-pthread' switch can be used])
@@ -667,6 +770,9 @@ dnl On ofs1 the '-pthread' switch should be used
     if test "x$THR_LIBS" != "x"; then
 	THR_DEFS="$THR_DEFS -D_THREAD_SAFE -D_REENTRANT -DPOSIX_THREADS"
 	THR_LIB_NAME=pthread
+	if test "x$THR_LIBS" = "xnone_needed"; then
+	    THR_LIBS=
+	fi
 	case $host_os in
 	    solaris*)
 		THR_DEFS="$THR_DEFS -D_POSIX_PTHREAD_SEMANTICS" ;;
@@ -1337,6 +1443,14 @@ if test "$ac_cv_c_bigendian" = "yes"; then
     AC_DEFINE(ETHR_BIGENDIAN, 1, [Define if bigendian])
 fi
 
+case X$erl_xcomp_double_middle_endian in
+    X) ;;
+    Xyes|Xno|Xunknown) ac_cv_c_double_middle_endian=$erl_xcomp_double_middle_endian;;
+    *) AC_MSG_ERROR([Bad erl_xcomp_double_middle_endian value: $erl_xcomp_double_middle_endian]);;
+esac
+
+AC_C_DOUBLE_MIDDLE_ENDIAN
+
 AC_ARG_ENABLE(native-ethr-impls,
 	      AS_HELP_STRING([--disable-native-ethr-impls],
                              [disable native ethread implementations]),
diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in
index c958f80065..97f1cff345 100644
--- a/lib/erl_interface/configure.in
+++ b/lib/erl_interface/configure.in
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -79,7 +79,7 @@ AC_ARG_ENABLE(threads,
     no) threads_disabled=yes ;;
     *)  threads_disabled=no ;;
   esac ],
-[ threads_disabled=no ])
+[ threads_disabled=maybe ])
 
 dnl ----------------------------------------------------------------------
 dnl Checks for programs
@@ -237,12 +237,16 @@ AC_SUBST(THR_DEFS)
 AC_SUBST(EI_THREADS)
 
 case "$threads_disabled" in
-    no)
+    no|maybe)
 	LM_CHECK_THR_LIB
 
 	case "$THR_LIB_NAME" in
 	    "")
 	        EI_THREADS="false"
+		# Fail if --enable-threads given and no threads found
+		if test "x$threads_disabled" = "xno"; then
+		    AC_MSG_ERROR(No threads support found)
+		fi
 	        ;;
 	    win32_threads)
 		EI_THREADS="true"	
diff --git a/lib/erl_interface/doc/src/Makefile b/lib/erl_interface/doc/src/Makefile
index e05b647cb2..b8e638ed24 100644
--- a/lib/erl_interface/doc/src/Makefile
+++ b/lib/erl_interface/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1998-2009. All Rights Reserved.
+# Copyright Ericsson AB 1998-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -113,16 +113,16 @@ clean clean_docs clean_tex:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DATA) $(MAN1_FILES) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DATA) $(MAN1_FILES) "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
 
 
 release_spec:
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 48ac0be22d..f0a9b336ff 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,6 +30,41 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.7.9</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Teach lib/erl_interface/configure.in to look for
+	    pthreads support in libc (where it can be found on
+	    QNX)</p> <p>A minor tweak such that this configure
+	    *fails* if you pass --enable-threads and no pthreads
+	    support can be found.</p> (Thanks to Per Hedeland)
+          <p>
+	    Own Id: OTP-10581</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.7.8</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Detect when middle endian doubles are used by a platform
+	    and account for it when decoding floats. (Thanks to Mike
+	    Sperber)</p>
+          <p>
+	    Own Id: OTP-10209</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.7.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
index d6b0ca1f16..cb41391fe9 100644
--- a/lib/erl_interface/src/Makefile.in
+++ b/lib/erl_interface/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -843,32 +843,32 @@ EXTRA = \
 	$(TARGET)/eidefs.mk
 
 release: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/lib
-	$(INSTALL_DIR) $(RELSYSDIR)/bin
-	$(INSTALL_DIR) $(RELSYSDIR)/src/auxdir
-	$(INSTALL_DIR) $(RELSYSDIR)/src/connect
-	$(INSTALL_DIR) $(RELSYSDIR)/src/decode
-	$(INSTALL_DIR) $(RELSYSDIR)/src/encode
-	$(INSTALL_DIR) $(RELSYSDIR)/src/epmd
-	$(INSTALL_DIR) $(RELSYSDIR)/src/legacy
-	$(INSTALL_DIR) $(RELSYSDIR)/src/misc
-	$(INSTALL_DIR) $(RELSYSDIR)/src/prog
-	$(INSTALL_DIR) $(RELSYSDIR)/src/registry
-	$(INSTALL_DATA) $(HEADERS)     $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(OBJ_TARGETS) $(RELSYSDIR)/lib
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/lib"
+	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/auxdir"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/connect"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/decode"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/encode"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/epmd"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/legacy"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/prog"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/registry"
+	$(INSTALL_DATA) $(HEADERS)     "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(OBJ_TARGETS) "$(RELSYSDIR)/lib"
 ifneq ($(EXE_TARGETS),)
-	$(INSTALL_PROGRAM) $(EXE_TARGETS) $(RELSYSDIR)/bin
-endif
-	$(INSTALL_DATA) $(EXTRA)        $(RELSYSDIR)/src
-	$(INSTALL_DATA) connect/*.[ch]  $(RELSYSDIR)/src/connect
-	$(INSTALL_DATA) decode/*.[ch]   $(RELSYSDIR)/src/decode
-	$(INSTALL_DATA) encode/*.[ch]   $(RELSYSDIR)/src/encode
-	$(INSTALL_DATA) epmd/*.[ch]     $(RELSYSDIR)/src/epmd
-	$(INSTALL_DATA) misc/*.[ch]     $(RELSYSDIR)/src/misc
-	$(INSTALL_DATA) registry/*.[ch] $(RELSYSDIR)/src/registry
-	$(INSTALL_DATA) legacy/*.[ch]   $(RELSYSDIR)/src/legacy
-	$(INSTALL_DATA) prog/*.[ch]     $(RELSYSDIR)/src/prog
+	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
+endif
+	$(INSTALL_DATA) $(EXTRA)        "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) connect/*.[ch]  "$(RELSYSDIR)/src/connect"
+	$(INSTALL_DATA) decode/*.[ch]   "$(RELSYSDIR)/src/decode"
+	$(INSTALL_DATA) encode/*.[ch]   "$(RELSYSDIR)/src/encode"
+	$(INSTALL_DATA) epmd/*.[ch]     "$(RELSYSDIR)/src/epmd"
+	$(INSTALL_DATA) misc/*.[ch]     "$(RELSYSDIR)/src/misc"
+	$(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry"
+	$(INSTALL_DATA) legacy/*.[ch]   "$(RELSYSDIR)/src/legacy"
+	$(INSTALL_DATA) prog/*.[ch]     "$(RELSYSDIR)/src/prog"
 
 release_docs:
 
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c
index ba8f8fbce3..79d259b92d 100644
--- a/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -186,11 +186,11 @@ static int verify_dns_configuration(void)
  * advance:  increment buf by n bytes, reduce len by same amount .
  */
 #if defined SIZEOF_VOID_P
-#define ALIGNBYTES (SIZEOF_VOID_P - 1)
+#define EI_ALIGNBYTES (SIZEOF_VOID_P - 1)
 #else
-#define ALIGNBYTES (sizeof(void*) - 1)
+#define EI_ALIGNBYTES (sizeof(void*) - 1)
 #endif
-#define align_buf(buf,len) for (;(((unsigned)buf) & ALIGNBYTES); (buf)++, len--)
+#define align_buf(buf,len) for (;(((unsigned)buf) & EI_ALIGNBYTES); (buf)++, len--)
 #define advance_buf(buf,len,n) ((buf)+=(n),(len)-=(n))
 
 /* "and now the tricky part..." */
@@ -282,6 +282,8 @@ static int copy_hostent(struct hostent *dest, const struct hostent *src, char *b
   return 0;
 }
 
+#undef EI_ALIGNBYTES
+
 /* This function is a pseudo-reentrant version of gethostbyname(). It
  * uses locks to serialize the call to the regular (non-reentrant)
  * gethostbyname() and then copies the data into the user-provided
diff --git a/lib/erl_interface/test/Makefile b/lib/erl_interface/test/Makefile
index 4faf89c0d6..2b85dfc571 100644
--- a/lib/erl_interface/test/Makefile
+++ b/lib/erl_interface/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -71,9 +71,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec:
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SPEC_FILES) $(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SPEC_FILES) $(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/erl_interface/test/all_SUITE_data/Makefile.src b/lib/erl_interface/test/all_SUITE_data/Makefile.src
index 70652e47c5..d2f57c8149 100644
--- a/lib/erl_interface/test/all_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/all_SUITE_data/Makefile.src
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2011. All Rights Reserved.
+# Copyright Ericsson AB 2003-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -32,7 +32,7 @@ all: $(ALL_OBJS)
 
 $(EI_COMMON_OBJS): gccifier@exe@
 
-@IFEQ@ (@erl_interface_cross_compile@, true)
+@IFEQ@ (@cross@, yes)
 gccifier@exe@:
 	$(CP) gccifier.sh gccifier@exe@
 	$(CHMOD) a+x gccifier@exe@
diff --git a/lib/erl_interface/test/all_SUITE_data/gccifier.c b/lib/erl_interface/test/all_SUITE_data/gccifier.c
index 9f556fc4ed..7e4ffc7281 100644
--- a/lib/erl_interface/test/all_SUITE_data/gccifier.c
+++ b/lib/erl_interface/test/all_SUITE_data/gccifier.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2004-2012. All Rights Reserved.
  * 
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -16,7 +16,6 @@
  * 
  * %CopyrightEnd%
  *
-
  */
 
 /*
@@ -74,17 +73,23 @@ save_arg(args_t *args, char *arg1, ...)
 	    args->vec = (char **) (args->no
 				   ? realloc((void *) args->vec,
 					     (sizeof(char *)
-					      *(args->no + ARGS_INCR + 1)))
+					      *(args->no + ARGS_INCR + 2)))
 				   : malloc((sizeof(char *)
-					     *(args->no + ARGS_INCR + 1))));
+					     *(args->no + ARGS_INCR + 2))));
 	    if (!args->vec)
 		enomem();
 	    args->no += ARGS_INCR;
 	}
+	if (carg == arg1) {
+	  args->vec[args->ix++] = "\"";
+	  args->chars++;
+	}
 	args->vec[args->ix++] = carg;
 	args->chars += strlen(carg);
 	carg = va_arg(argp, char *);
     }
+    args->vec[args->ix++] = "\"";
+    args->chars++;
     args->vec[args->ix++] = " ";
     args->chars++;
     va_end(argp);
@@ -232,6 +237,9 @@ main(int argc, char *argv[])
 	    CHECK_FIRST_LINK_ARG;
 	    save_arg(&link_args, "-libpath:", arg, NULL);
 	}
+	else if (strcmp("-link",arg) == 0) {
+	  CHECK_FIRST_LINK_ARG;
+	}
 #endif /* #ifdef __WIN32__ */
 	else if (is_prefix("-l", &arg)) {
 	    CHECK_FIRST_LINK_ARG;
diff --git a/lib/erl_interface/test/all_SUITE_data/init_tc.erl b/lib/erl_interface/test/all_SUITE_data/init_tc.erl
index 7a599994fc..7e370c566a 100644
--- a/lib/erl_interface/test/all_SUITE_data/init_tc.erl
+++ b/lib/erl_interface/test/all_SUITE_data/init_tc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -48,8 +48,7 @@ run1(Name) ->
 generate(TcName, Cases) ->
     Hrl = TcName ++ "_cases.hrl",
     {ok, HrlFile} = file:open(Hrl, write),
-    {ok, Dir} = file:get_cwd(),
-    generate_hrl(Cases, HrlFile, {filename:join(Dir, TcName), 0}),
+    generate_hrl(Cases, HrlFile, {TcName, 0}),
     file:close(HrlFile),
     C = TcName ++ "_decl.c",
     {ok, CFile} = file:open(C, write),
@@ -57,7 +56,7 @@ generate(TcName, Cases) ->
     file:close(CFile).
 
 generate_hrl([Case|Rest], File, {Name, Number}) ->
-    io:format(File, "-define(~s, {\"~s\", ~w}).~n", [Case, Name, Number]),
+    io:format(File, "-define(~s, {filename:join(proplists:get_value(data_dir,Config),\"~s\"), ~w}).~n", [Case, Name, Number]),
     generate_hrl(Rest, File, {Name, Number+1});
 generate_hrl([], _, _) ->
     ok.
diff --git a/lib/erl_interface/test/ei_tmo_SUITE.erl b/lib/erl_interface/test/ei_tmo_SUITE.erl
index 7ff8c08280..c33beecbe9 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE.erl
+++ b/lib/erl_interface/test/ei_tmo_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -88,12 +88,12 @@ ei_recv_tmo(doc) ->
 ei_recv_tmo(suite) ->
     [];
 ei_recv_tmo(Config) when is_list(Config) ->
-    ?line do_one_recv(c_node_recv_tmo_1),
-    ?line do_one_recv_failure(c_node_recv_tmo_2),
+    ?line do_one_recv(Config,c_node_recv_tmo_1),
+    ?line do_one_recv_failure(Config,c_node_recv_tmo_2),
     ok.
 
 
-do_one_recv(CNode) ->
+do_one_recv(Config,CNode) ->
     ?line {_,Host} = split(node()),
     ?line P1 = runner:start(?recv_tmo),
     ?line runner:send_term(P1,{CNode,
@@ -107,7 +107,7 @@ do_one_recv(CNode) ->
     ?line {term, Term1} = runner:get_term(P1, 10000),
     ?line runner:recv_eot(P1).
     
-do_one_recv_failure(CNode) ->
+do_one_recv_failure(Config,CNode) ->
     ?line P1 = runner:start(?recv_tmo),
     ?line runner:send_term(P1,{CNode,
 			       erlang:get_cookie(),
@@ -128,14 +128,14 @@ ei_send_tmo(Config) when is_list(Config) ->
     %dbg:p(self()),
     VxSim = ?config(vxsim, Config),
     ?line register(ei_send_tmo_1,self()),
-    ?line do_one_send(self(),c_node_send_tmo_1),
-    ?line do_one_send(ei_send_tmo_1,c_node_send_tmo_2),
-    ?line do_one_send_failure(self(),cccc1,c_nod_send_tmo_3,VxSim),
-    ?line do_one_send_failure(ei_send_tmo_1,cccc2,c_nod_send_tmo_4,VxSim),
+    ?line do_one_send(Config,self(),c_node_send_tmo_1),
+    ?line do_one_send(Config,ei_send_tmo_1,c_node_send_tmo_2),
+    ?line do_one_send_failure(Config,self(),cccc1,c_nod_send_tmo_3,VxSim),
+    ?line do_one_send_failure(Config,ei_send_tmo_1,cccc2,c_nod_send_tmo_4,VxSim),
     ok.
     
 
-do_one_send(From,CNode) ->
+do_one_send(Config,From,CNode) ->
     ?line {_,Host} = split(node()),
     ?line P1 = runner:start(?send_tmo),
     ?line runner:send_term(P1,{CNode,
@@ -155,7 +155,7 @@ do_one_send(From,CNode) ->
     ?line {term, 0} = runner:get_term(P1, 10000),
     ?line runner:recv_eot(P1).
 
-do_one_send_failure(From,FakeName,CName,VxSim) ->
+do_one_send_failure(Config,From,FakeName,CName,VxSim) ->
     ?line {_,Host} = split(node()),
     ?line OurName = join(FakeName,Host),
     ?line Node = join(CName,Host),
diff --git a/lib/erl_interface/test/erl_match_SUITE.erl b/lib/erl_interface/test/erl_match_SUITE.erl
index e019fecca8..2cf4fafe82 100644
--- a/lib/erl_interface/test/erl_match_SUITE.erl
+++ b/lib/erl_interface/test/erl_match_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -29,7 +29,7 @@
 	 bind/1, integers/1, floats/1, binaries/1, strings/1]).
 
 %% For interactive running of matcher.
--export([start_matcher/0, erl_match/3]).
+-export([start_matcher/1, erl_match/3]).
 
 %% This test suite tests the erl_match() function.
 
@@ -57,7 +57,7 @@ end_per_group(_GroupName, Config) ->
 
 atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
-    ?line P = start_matcher(),
+    ?line P = start_matcher(Config),
 
     ?line eq(P, '', ''),
     ?line eq(P, a, a),
@@ -74,7 +74,7 @@ atoms(Config) when is_list(Config) ->
 
 lists(suite) -> [];
 lists(Config) when is_list(Config) ->
-    ?line P = start_matcher(),
+    ?line P = start_matcher(Config),
     ?line eq(P, [], []),
 
     ?line ne(P, [], [a]),
@@ -101,7 +101,7 @@ lists(Config) when is_list(Config) ->
 
 tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
-    ?line P = start_matcher(),
+    ?line P = start_matcher(Config),
 
     ?line ne(P, {}, {a, b}),
     ?line ne(P, {a, b}, {}),
@@ -129,7 +129,7 @@ tuples(Config) when is_list(Config) ->
 
 references(suite) -> [];
 references(Config) when is_list(Config) ->
-    ?line P = start_matcher(),
+    ?line P = start_matcher(Config),
     ?line Ref1 = make_ref(),
     ?line Ref2 = make_ref(),
     
@@ -144,7 +144,7 @@ references(Config) when is_list(Config) ->
 
 pids(suite) -> [];
 pids(Config) when is_list(Config) ->
-    ?line P = start_matcher(),
+    ?line P = start_matcher(Config),
     ?line Pid1 = c:pid(0,1,2),
     ?line Pid2 = c:pid(0,1,3),
     
@@ -163,8 +163,8 @@ ports(Config) when is_list(Config) ->
 	vxworks ->
 	    {skipped,"not on vxworks, pucko"};
 	_ ->
-	    ?line P = start_matcher(),
-	    ?line P2 = start_matcher(),
+	    ?line P = start_matcher(Config),
+	    ?line P2 = start_matcher(Config),
     
 	    ?line eq(P, P, P),
 	    ?line ne(P, P, P2),
@@ -176,7 +176,7 @@ ports(Config) when is_list(Config) ->
 
 integers(suite) -> [];
 integers(Config) when is_list(Config) ->
-    ?line P = start_matcher(),
+    ?line P = start_matcher(Config),
     ?line I1 = 123,
     ?line I2 = 12345,
     ?line I3 = -123,
@@ -195,7 +195,7 @@ integers(Config) when is_list(Config) ->
 
 floats(suite) -> [];
 floats(Config) when is_list(Config) ->
-    ?line P = start_matcher(),
+    ?line P = start_matcher(Config),
     ?line F1 = 3.1414,
     ?line F2 = 3.1415,
     ?line F3 = 3.1416,
@@ -218,7 +218,7 @@ floats(Config) when is_list(Config) ->
 
 binaries(suite) -> [];
 binaries(Config) when is_list(Config) ->
-    ?line P = start_matcher(),
+    ?line P = start_matcher(Config),
     ?line Bin1 = term_to_binary({kalle, 146015, {kungsgatan, 23}}),
     ?line Bin2 = term_to_binary(sune),
     ?line Bin3 = list_to_binary("sune"),
@@ -237,7 +237,7 @@ binaries(Config) when is_list(Config) ->
 
 strings(suite) -> [];
 strings(Config) when is_list(Config) ->
-    ?line P = start_matcher(),
+    ?line P = start_matcher(Config),
 
     ?line S1 = "string",
     ?line S2 = "streng",
@@ -254,7 +254,7 @@ strings(Config) when is_list(Config) ->
 
 bind(suite) -> [];
 bind(Config) when is_list(Config) ->
-    ?line P = start_bind(),
+    ?line P = start_bind(Config),
     ?line S = "[X,Y,Z]",
     ?line L1 = [301,302,302],
     ?line L2 = [65,66,67],
@@ -265,7 +265,7 @@ bind(Config) when is_list(Config) ->
     ?line runner:finish(P),
     ok.
 
-start_bind() ->
+start_bind(Config) ->
     runner:start(?erl_match_bind).
 
 bind_ok(Port, Bind, Term) ->
@@ -287,7 +287,7 @@ erl_bind(Port, Pattern, Term) ->
 
 
 
-start_matcher() ->
+start_matcher(Config) ->
     runner:start(?erl_match_server).
 
 eq(Port, Pattern, Term) ->
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 0e249d2483..1718f38069 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1 +1 @@
-EI_VSN = 3.7.7
+EI_VSN = 3.7.9
diff --git a/lib/et/doc/src/Makefile b/lib/et/doc/src/Makefile
index 6bb8164e91..249d45fa52 100644
--- a/lib/et/doc/src/Makefile
+++ b/lib/et/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2002-2010. All Rights Reserved.
+# Copyright Ericsson AB 2002-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -97,14 +97,14 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/et/doc/src/et_intro.xml b/lib/et/doc/src/et_intro.xml
index 0c5fb14d55..f90a6d2b5c 100644
--- a/lib/et/doc/src/et_intro.xml
+++ b/lib/et/doc/src/et_intro.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -40,8 +40,8 @@
   ports or files.</p>
 
   <section>
-    <title>Scope and Purpose</title>'
-    
+    <title>Scope and Purpose</title>
+
     <p>This manual describes the <c>Event Tracer (ET)</c> application,
     as a component of the Erlang/Open Telecom Platform development
     environment. It is assumed that the reader is familiar with the
diff --git a/lib/et/doc/src/notes.xml b/lib/et/doc/src/notes.xml
index 42790e0cdf..0b1f3eddce 100644
--- a/lib/et/doc/src/notes.xml
+++ b/lib/et/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2011</year>
+      <year>2002</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -36,6 +36,21 @@
   one section in this document. The title of each section is the
   version number of <c>Event Tracer (ET)</c>.</p>
 
+<section><title>ET 1.4.4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix typo in ET doc (Thanks to Ricardo Catalinas Jim�nez)</p>
+          <p>
+	    Own Id: OTP-10119</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>ET 1.4.4.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/et/examples/Makefile b/lib/et/examples/Makefile
index 67a6536fdf..3edbebc2e4 100644
--- a/lib/et/examples/Makefile
+++ b/lib/et/examples/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2002-2010. All Rights Reserved.
+# Copyright Ericsson AB 2002-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -73,8 +73,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(ERL_FILES) $(DATA_FILES) $(HRL_FILES) $(RELSYSDIR)/examples
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(ERL_FILES) $(DATA_FILES) $(HRL_FILES) "$(RELSYSDIR)/examples"
 
 release_docs_spec:
 
diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile
index bb6632ee91..c68a3f4efd 100644
--- a/lib/et/src/Makefile
+++ b/lib/et/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2000-2010. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -104,14 +104,14 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 
 
 release_docs_spec:
diff --git a/lib/et/src/et_wx_contents_viewer.erl b/lib/et/src/et_wx_contents_viewer.erl
index 86f46f25d0..b559da8807 100644
--- a/lib/et/src/et_wx_contents_viewer.erl
+++ b/lib/et/src/et_wx_contents_viewer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -245,12 +245,7 @@ handle_event(#wx{id = Id,
         Data when is_record(Data, filter) ->
             F = Data,
             ChildState= S#state{active_filter = F#filter.name},
-            case wx_object:start_link(?MODULE, [ChildState], []) of
-                {ok, Pid} when S#state.parent_pid =/= self() ->
-		    unlink(Pid);
-                _ ->
-                    ignore
-            end;
+            wx_object:start_link(?MODULE, [ChildState], []);
         {hide, Actors} ->
             send_viewer_event(S, {delete_actors, Actors});
         {show, Actors} ->
@@ -356,12 +351,7 @@ handle_event(#wx{event = #wxKey{rawCode = KeyCode}}, S) ->
             case lists:keysearch(?DEFAULT_FILTER_NAME, #filter.name, S#state.filters) of
                 {value, F} when is_record(F, filter) ->
                     ChildState= S#state{active_filter = F#filter.name},
-                    case wx_object:start_link(?MODULE, [ChildState], []) of
-                        {ok, Pid} when S#state.parent_pid =/= self() ->
-                            unlink(Pid);
-                        _ ->
-                            ignore
-                    end;
+                    wx_object:start_link(?MODULE, [ChildState], []);
                 false ->
                     ignore
             end,
@@ -370,12 +360,7 @@ handle_event(#wx{event = #wxKey{rawCode = KeyCode}}, S) ->
             case catch lists:nth(Int-$0, S#state.filters) of
                 F when is_record(F, filter) ->
                     ChildState= S#state{active_filter = F#filter.name},
-                    case wx_object:start_link(?MODULE, [ChildState], []) of
-                        {ok, Pid} when S#state.parent_pid =/= self() ->
-                            unlink(Pid);
-                        _ ->
-                            ignore
-                    end;
+                    wx_object:start_link(?MODULE, [ChildState], []);
                 {'EXIT', _} ->
                     ignore
             end,
diff --git a/lib/et/test/Makefile b/lib/et/test/Makefile
index e10a2a1587..3817079b5f 100644
--- a/lib/et/test/Makefile
+++ b/lib/et/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2009-2011. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -70,12 +70,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) et.spec et.cover $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
-	$(INSTALL_SCRIPT) ett $(RELSYSDIR)
-	$(INSTALL_DATA) $(INSTALL_PROGS) $(RELSYSDIR)
-#	chmod -R u+w $(RELSYSDIR)
-#	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) et.spec et.cover $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_SCRIPT) ett "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(INSTALL_PROGS) "$(RELSYSDIR)"
+#	chmod -R u+w "$(RELSYSDIR)"
+#	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
 
diff --git a/lib/et/vsn.mk b/lib/et/vsn.mk
index 090d43d52f..167c9d9594 100644
--- a/lib/et/vsn.mk
+++ b/lib/et/vsn.mk
@@ -1 +1 @@
-ET_VSN  = 1.4.4.1
+ET_VSN  = 1.4.4.2
diff --git a/lib/eunit/doc/overview.edoc b/lib/eunit/doc/overview.edoc
index ad449cb6fc..b4af31ae6a 100644
--- a/lib/eunit/doc/overview.edoc
+++ b/lib/eunit/doc/overview.edoc
@@ -723,8 +723,12 @@ A <em>simple test object</em> is one of the following:
 ```fun some_function/0'''
 ```fun some_module:some_function/0'''
   </li>
-  <li>A pair of atoms `{ModuleName, FunctionName}', referring to the
-      function `ModuleName:FunctionName/0'</li>
+  <li>A tuple `{test, ModuleName, FunctionName}', where `ModuleName' and
+      `FunctionName' are atoms, referring to the function
+      `ModuleName:FunctionName/0'</li>
+  <li>(Obsolete) A pair of atoms `{ModuleName, FunctionName}', equivalent to
+      `{test, ModuleName, FunctionName}' if nothing else matches first. This
+      might be removed in a future version.</li>
   <li>A pair `{LineNumber, SimpleTest}', where `LineNumber' is a
       nonnegative integer and `SimpleTest' is another simple test
       object. `LineNumber' should indicate the source line of the test.
diff --git a/lib/eunit/doc/src/Makefile b/lib/eunit/doc/src/Makefile
index 2cdc579275..cbcd4c1507 100644
--- a/lib/eunit/doc/src/Makefile
+++ b/lib/eunit/doc/src/Makefile
@@ -157,14 +157,14 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 
 release_spec:
diff --git a/lib/eunit/doc/src/notes.xml b/lib/eunit/doc/src/notes.xml
index 34e8a47e3d..b797be0ccb 100644
--- a/lib/eunit/doc/src/notes.xml
+++ b/lib/eunit/doc/src/notes.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,38 @@
   </header>
   <p>This document describes the changes made to the EUnit application.</p>
 
+<section><title>Eunit 2.2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    New option 'no_tty' to silent the default tty report.</p>
+          <p>
+	    Recognize the new stacktrace format introduced in R15,
+	    adding location information. (Thanks to Klas Johansson.)</p>
+          <p>
+	    Improve layout of error messages, printing the stack
+	    trace before the error term.</p>
+          <p>
+	    Heuristically detect and report bad return values from
+	    generators and instantiators. E.g., "ok" will not be
+	    interpreted as a module name, and a warning will be
+	    printed.</p>
+          <p>
+	    New test representation {test,M,F} for completeness along
+	    with {generator,M,F}. Tuples {M,F} are deprecated.</p>
+          <p>
+	    Use UTF-8 as encoding in Surefire output files. (Thanks
+	    to Lukas Larsson.)</p>
+          <p>
+	    Own Id: OTP-10173</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eunit 2.2.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/eunit/examples/Makefile b/lib/eunit/examples/Makefile
index 48ec2ebf2b..cfa0a7a645 100644
--- a/lib/eunit/examples/Makefile
+++ b/lib/eunit/examples/Makefile
@@ -49,8 +49,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec:
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples"
 
 release_docs_spec:
 
diff --git a/lib/eunit/include/eunit.hrl b/lib/eunit/include/eunit.hrl
index db68d8ae60..fba840c3bd 100644
--- a/lib/eunit/include/eunit.hrl
+++ b/lib/eunit/include/eunit.hrl
@@ -25,11 +25,12 @@
 %% will become undefined. NODEBUG also implies NOASSERT, unless testing
 %% is enabled.
 %%
-%% If including this file causes TEST to be defined, then NOASSERT will
-%% be undefined, even if it was previously defined and even if NODEBUG
-%% is defined. If both ASSERT and NOASSERT are defined before the file
-%% is included, then ASSERT takes precedence, and NOASSERT will become
-%% undefined regardless of TEST.
+%% Defining NOASSERT disables asserts. NODEBUG implies NOASSERT unless
+%% testing is enabled. If including this file causes TEST to be defined,
+%% then NOASSERT will be undefined, even if it was previously defined and
+%% even if NODEBUG is defined. If both ASSERT and NOASSERT are defined
+%% before the file is included, then ASSERT takes precedence, and NOASSERT
+%% will become undefined regardless of TEST.
 %% 
 %% After including this file, EUNIT will be defined if and only if TEST
 %% is defined.
@@ -127,9 +128,9 @@
 				       current_function)))).
 -endif.
 
--ifdef(NOASSERT).
 %% The plain assert macro should be defined to do nothing if this file
 %% is included when debugging/testing is turned off.
+-ifdef(NOASSERT).
 -ifndef(assert).
 -define(assert(BoolExpr),ok).
 -endif.
diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
index bec2fdbe0b..0a2e71cf7b 100644
--- a/lib/eunit/src/Makefile
+++ b/lib/eunit/src/Makefile
@@ -28,6 +28,9 @@ ERL_COMPILE_FLAGS += -pa $(EBIN) -I$(INCLUDE) +warn_unused_vars +nowarn_shadow_v
 
 PARSE_TRANSFORM = eunit_autoexport.erl
 
+BEHAVIOUR_SOURCES= \
+	eunit_listener.erl
+
 SOURCES= \
 	eunit_striptests.erl \
 	eunit.erl \
@@ -40,13 +43,16 @@ SOURCES= \
 	eunit_data.erl \
 	eunit_tty.erl \
 	eunit_surefire.erl \
-	eunit_listener.erl
 
 INCLUDE_FILES = eunit.hrl
 
 PARSE_TRANSFORM_BIN = $(PARSE_TRANSFORM:%.erl=$(EBIN)/%.$(EMULATOR))
 
-OBJECTS=$(SOURCES:%.erl=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
+TARGET_FILES= $(SOURCES:%.erl=$(EBIN)/%.$(EMULATOR))
+
+BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_SOURCES:%.erl=$(EBIN)/%.$(EMULATOR))
+
+OBJECTS= $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
 INCLUDE_DELIVERABLES = $(INCLUDE_FILES:%=$(INCLUDE)/%)
 
@@ -62,6 +68,8 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 # Targets
 # ----------------------------------------------------
 
+$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
+
 debug opt: $(PARSE_TRANSFORM_BIN) $(OBJECTS)
 
 docs:
@@ -107,12 +115,12 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
 
diff --git a/lib/eunit/src/eunit.app.src b/lib/eunit/src/eunit.app.src
index 5e16dfa2ce..431abac98b 100644
--- a/lib/eunit/src/eunit.app.src
+++ b/lib/eunit/src/eunit.app.src
@@ -14,7 +14,6 @@
 	     eunit_striptests,
 	     eunit_surefire,
 	     eunit_test,
-	     eunit_tests,
 	     eunit_tty]},
   {registered,[]},
   {applications, [kernel,stdlib]},
diff --git a/lib/eunit/src/eunit.erl b/lib/eunit/src/eunit.erl
index 95857e83c8..51846d73b3 100644
--- a/lib/eunit/src/eunit.erl
+++ b/lib/eunit/src/eunit.erl
@@ -139,7 +139,7 @@ test(Tests, Options) ->
 %% @private
 %% @doc See {@link test/2}.
 test(Server, Tests, Options) ->
-    Listeners = [eunit_tty:start(Options) | listeners(Options)],
+    Listeners = listeners(Options),
     Serial = eunit_serial:start(Listeners),
     case eunit_server:start_test(Server, Serial, Tests, Options) of
 	{ok, Reference} -> test_run(Reference, Listeners);
@@ -194,7 +194,10 @@ submit(Server, T, Options) ->
     eunit_server:start_test(Server, Dummy, T, Options).
 
 listeners(Options) ->
-    Ps = start_listeners(proplists:get_all_values(report, Options)),
+    %% note that eunit_tty must always run, because it sends the final
+    %% {result,...} message that the test_run() function is waiting for
+    Ls = [{eunit_tty, Options} | proplists:get_all_values(report, Options)],
+    Ps = start_listeners(Ls),
     %% the event_log option is for debugging, to view the raw events
     case proplists:get_value(event_log, Options) of
 	undefined ->
diff --git a/lib/eunit/src/eunit_data.erl b/lib/eunit/src/eunit_data.erl
index 392d378a0e..0350f9bf6e 100644
--- a/lib/eunit/src/eunit_data.erl
+++ b/lib/eunit/src/eunit_data.erl
@@ -83,6 +83,7 @@
 %% SimpleTest = TestFunction | {Line::integer(), SimpleTest}
 %%
 %% TestFunction = () -> any()
+%%              | {test, M::moduleName(), F::functionName()}
 %%              | {M::moduleName(), F::functionName()}.
 %%
 %% AbstractTestFunction = (X::any()) -> any()
@@ -95,7 +96,6 @@
 %%
 %% @type moduleName() = atom()
 %% @type functionName() = atom()
-%% @type arity() = integer()
 %% @type appName() = atom()
 %% @type fileName() = string()
 
@@ -156,8 +156,9 @@ iter_prev(#iter{prev = [T | Ts]} = I) ->
 %% @spec (tests()) -> none | {testItem(), tests()}
 %% @type testItem() = #test{} | #group{}
 %% @throws {bad_test, term()}
-%%       | {generator_failed, exception()}
-%%       | {no_such_function, eunit_lib:mfa()}
+%%       | {generator_failed, {{M::atom(),F::atom(),A::integer()},
+%%                             exception()}}
+%%       | {no_such_function, mfa()}
 %%       | {module_not_found, moduleName()}
 %%       | {application_not_found, appName()}
 %%       | {file_read_error, {Reason::atom(), Message::string(),
@@ -221,17 +222,27 @@ parse({foreachx, P, S1, C1, Ps} = T)
 	[] ->
 	    {data, []}
     end;
-parse({generator, F} = T) when is_function(F) ->
+parse({generator, F}) when is_function(F) ->
+    {module, M} = erlang:fun_info(F, module),
+    {name, N} = erlang:fun_info(F, name),
+    {arity, A} = erlang:fun_info(F, arity),
+    parse({generator, F, {M,N,A}});
+parse({generator, F, {M,N,A}} = T)
+  when is_function(F), is_atom(M), is_atom(N), is_integer(A) ->
     check_arity(F, 0, T),
     %% use run_testfun/1 to handle wrapper exceptions
     case eunit_test:run_testfun(F) of
 	{ok, T1} ->
+            case eunit_lib:is_not_test(T1) of
+                true -> throw({bad_generator, {{M,N,A}, T1}});
+                false -> ok
+            end,
 	    {data, T1};
 	{error, {Class, Reason, Trace}} ->
-	    throw({generator_failed, {Class, Reason, Trace}})
+	    throw({generator_failed, {{M,N,A}, {Class, Reason, Trace}}})
     end;
 parse({generator, M, F}) when is_atom(M), is_atom(F) ->
-    parse({generator, eunit_test:function_wrapper(M, F)});
+    parse({generator, eunit_test:mf_wrapper(M, F), {M,F,0}});
 parse({inorder, T}) ->
     group(#group{tests = T, order = inorder});
 parse({inparallel, T}) ->
@@ -421,8 +432,11 @@ parse_simple(F) ->
 parse_function(F) when is_function(F) ->
     check_arity(F, 0, F),
     #test{f = F, location = eunit_lib:fun_parent(F)};
-parse_function({M,F}) when is_atom(M), is_atom(F) ->
-    #test{f = eunit_test:function_wrapper(M, F), location = {M, F, 0}};
+parse_function({test, M, F}) when is_atom(M), is_atom(F) ->
+    #test{f = eunit_test:mf_wrapper(M, F), location = {M, F, 0}};
+parse_function({M, F}) when is_atom(M), is_atom(F) ->
+    %% {M,F} is now considered obsolete; use {test,M,F} instead
+    parse_function({test, M, F});
 parse_function(F) ->
     bad_test(F).
 
@@ -580,7 +594,7 @@ testfuns(Es, M, TestSuffix, GeneratorSuffix) ->
 		  N = atom_to_list(F),
 		  case lists:suffix(TestSuffix, N) of
 		      true ->
-			  [{M,F} | Fs];
+			  [{test, M, F} | Fs];
 		      false ->
 			  case lists:suffix(GeneratorSuffix, N) of
 			      true ->
@@ -723,6 +737,7 @@ data_test_() ->
     Tests = [T,T,T],
     [?_assertMatch(ok, eunit:test(T)),
      ?_assertMatch(error, eunit:test(Fail)),
+     ?_assertMatch(ok, eunit:test({test, ?MODULE, trivial_test})),
      ?_assertMatch(ok, eunit:test({generator, fun () -> Tests end})),
      ?_assertMatch(ok, eunit:test({generator, fun generator/0})),
      ?_assertMatch(ok, eunit:test({generator, ?MODULE, generator_exported_})),
@@ -740,6 +755,12 @@ data_test_() ->
      %%?_test({foreach, Setup, [T, T, T]})
     ].
 
+trivial_test() ->
+    ok.
+
+trivial_generator_test_() ->
+    [?_test(ok)].
+
 lazy_test_() ->
     {spawn, [?_test(undefined = put(count, 0)),
 	     lazy_gen(7),
diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl
index 1c41e229c5..ea9e944d7e 100644
--- a/lib/eunit/src/eunit_lib.erl
+++ b/lib/eunit/src/eunit_lib.erl
@@ -30,7 +30,8 @@
 -export([dlist_next/1, uniq/1, fun_parent/1, is_string/1, command/1,
 	 command/2, command/3, trie_new/0, trie_store/2, trie_match/2,
 	 split_node/1, consult_file/1, list_dir/1, format_exit_term/1,
-	 format_exception/1, format_exception/2, format_error/1]).
+	 format_exception/1, format_exception/2, format_error/1,
+         is_not_test/1]).
 
 
 %% Type definitions for describing exceptions
@@ -39,13 +40,10 @@
 %%
 %% @type exceptionClass() = error | exit | throw
 %%
-%% @type stackTrace() = [{moduleName(), functionName(),
-%%			  arity() | argList()}]
+%% @type stackTrace() = [{moduleName(), functionName(), arity() | argList()}]
 %%
 %% @type moduleName() = atom()
 %% @type functionName() = atom()
-%% @type arity() = integer()
-%% @type mfa() = {moduleName(), functionName(), arity()}
 %% @type argList() = [term()]
 %% @type fileName() = string()
 
@@ -59,8 +57,9 @@ format_exception({Class,Term,Trace}, Depth)
   when is_atom(Class), is_list(Trace) ->
     case is_stacktrace(Trace) of
 	true ->
-	    io_lib:format("~w:~P\n~s",
-			  [Class, Term, Depth, format_stacktrace(Trace)]);
+	    io_lib:format("~s**~w:~s",
+			  [format_stacktrace(Trace), Class,
+                           format_term(Term, Depth)]);
 	false ->
 	    format_term(Term, Depth)
     end;
@@ -86,6 +85,12 @@ analyze_exit_term(Term) ->
 
 is_stacktrace([]) ->
     true;
+is_stacktrace([{M,F,A,L}|Fs])
+  when is_atom(M), is_atom(F), is_integer(A), is_list(L) ->
+    is_stacktrace(Fs);
+is_stacktrace([{M,F,As,L}|Fs])
+  when is_atom(M), is_atom(F), is_list(As), is_list(L) ->
+    is_stacktrace(Fs);
 is_stacktrace([{M,F,A}|Fs]) when is_atom(M), is_atom(F), is_integer(A) ->
     is_stacktrace(Fs);
 is_stacktrace([{M,F,As}|Fs]) when is_atom(M), is_atom(F), is_list(As) ->
@@ -96,10 +101,11 @@ is_stacktrace(_) ->
 format_stacktrace(Trace) ->
     format_stacktrace(Trace, "in function", "in call from").
 
-format_stacktrace([{M,F,A}|Fs], Pre, Pre1) when is_integer(A) ->
-    [io_lib:fwrite("  ~s ~w:~w/~w\n", [Pre, M, F, A])
+format_stacktrace([{M,F,A,L}|Fs], Pre, Pre1) when is_integer(A) ->
+    [io_lib:fwrite("~s ~w:~w/~w~s\n",
+                   [Pre, M, F, A, format_stacktrace_location(L)])
      | format_stacktrace(Fs, Pre1, Pre1)];
-format_stacktrace([{M,F,As}|Fs], Pre, Pre1) when is_list(As) ->
+format_stacktrace([{M,F,As,L}|Fs], Pre, Pre1) when is_list(As) ->
     A = length(As),
     C = case is_op(M,F,A) of
 	    true when A =:= 1 ->
@@ -112,12 +118,23 @@ format_stacktrace([{M,F,As}|Fs], Pre, Pre1) when is_list(As) ->
 	    false ->
 		io_lib:fwrite("~w(~s)", [F,format_arglist(As)])
 	end,
-    [io_lib:fwrite("  ~s ~w:~w/~w\n    called as ~s\n",
-		   [Pre,M,F,A,C])
+    [io_lib:fwrite("~s ~w:~w/~w~s\n  called as ~s\n",
+		   [Pre,M,F,A,format_stacktrace_location(L),C])
      | format_stacktrace(Fs,Pre1,Pre1)];
+format_stacktrace([{M,F,As}|Fs], Pre, Pre1) ->
+    format_stacktrace([{M,F,As,[]}|Fs], Pre, Pre1);
 format_stacktrace([],_Pre,_Pre1) ->
     "".
 
+format_stacktrace_location(Location) ->
+    File = proplists:get_value(file, Location),
+    Line = proplists:get_value(line, Location),
+    if File =/= undefined, Line =/= undefined ->
+            io_lib:format(" (~s, line ~w)", [File, Line]);
+       true ->
+            ""
+    end.
+
 format_arg(A) ->
     io_lib:format("~P",[A,15]).
 
@@ -139,9 +156,13 @@ is_op(_M, _F, _A) ->
 
 format_error({bad_test, Term}) ->
     error_msg("bad test descriptor", "~P", [Term, 15]);
-format_error({generator_failed, Exception}) ->
-    error_msg("test generator failed", "~s",
-	      [format_exception(Exception)]);
+format_error({bad_generator, {{M,F,A}, Term}}) ->
+    error_msg(io_lib:format("result from generator ~w:~w/~w is not a test",
+                            [M,F,A]),
+              "~P", [Term, 15]);
+format_error({generator_failed, {{M,F,A}, Exception}}) ->
+    error_msg(io_lib:format("test generator ~w:~w/~w failed",[M,F,A]),
+              "~s", [format_exception(Exception)]);
 format_error({no_such_function, {M,F,A}})
   when is_atom(M), is_atom(F), is_integer(A) ->
     error_msg(io_lib:format("no such function: ~w:~w/~w", [M,F,A]),
@@ -158,14 +179,55 @@ format_error({setup_failed, Exception}) ->
 format_error({cleanup_failed, Exception}) ->
     error_msg("context cleanup failed", "~s",
 	      [format_exception(Exception)]);
+format_error({{bad_instantiator, {{M,F,A}, Term}}, _DummyException}) ->
+    error_msg(io_lib:format("result from instantiator ~w:~w/~w is not a test",
+                            [M,F,A]),
+              "~P", [Term, 15]);
 format_error({instantiation_failed, Exception}) ->
     error_msg("instantiation of subtests failed", "~s",
 	      [format_exception(Exception)]).
 
 error_msg(Title, Fmt, Args) ->
-    Msg = io_lib:format("::"++Fmt, Args),    % gets indentation right
+    Msg = io_lib:format("**"++Fmt, Args),    % gets indentation right
     io_lib:fwrite("*** ~s ***\n~s\n\n", [Title, Msg]).
 
+-ifdef(TEST).
+format_exception_test_() ->
+    [?_assertMatch(
+        "\nymmud:rorre"++_,
+        lists:reverse(lists:flatten(
+          format_exception(try erlang:error(dummy)
+                           catch C:R -> {C, R, erlang:get_stacktrace()}
+                           end)))),
+     ?_assertMatch(
+        "\nymmud:rorre"++_,
+        lists:reverse(lists:flatten(
+          format_exception(try erlang:error(dummy, [a])
+                           catch C:R -> {C, R, erlang:get_stacktrace()}
+                           end))))].
+-endif.
+
+%% ---------------------------------------------------------------------
+%% detect common return values that are definitely not tests
+
+is_not_test(T) ->
+    case T of
+        ok -> true;
+        error -> true;
+        true -> true;
+        false -> true;
+        undefined -> true;
+        {ok, _} -> true;
+        {error, _} -> true;
+        {'EXIT', _} -> true;
+        N when is_number(N) -> true;
+        [N|_] when is_number(N) -> true;
+        X when is_binary(X) -> true;
+        X when is_pid(X) -> true;
+        X when is_port(X) -> true;
+        X when is_reference(X) -> true;
+        _ -> false
+    end.
 
 %% ---------------------------------------------------------------------
 %% Deep list iterator; accepts improper lists/sublists, and also accepts
diff --git a/lib/eunit/src/eunit_surefire.erl b/lib/eunit/src/eunit_surefire.erl
index 2a6cbca14d..46b8c8b503 100644
--- a/lib/eunit/src/eunit_surefire.erl
+++ b/lib/eunit/src/eunit_surefire.erl
@@ -156,9 +156,33 @@ handle_end(test, Data, St) ->
     St#state{testsuites=store_suite(NewTestSuite, TestSuites)}.
 
 %% Cancel group does not give information on the individual cancelled test case
-%% We ignore this event
-handle_cancel(group, _Data, St) ->
-    St;
+%% We ignore this event...
+handle_cancel(group, Data, St) ->
+    %% ...except when it tells us that a fixture setup or cleanup failed.
+    case proplists:get_value(reason, Data) of
+        {abort, {SomethingFailed, Exception}}
+          when SomethingFailed =:= setup_failed;
+               SomethingFailed =:= cleanup_failed ->
+            [GroupId|_] = proplists:get_value(id, Data),
+            TestSuites = St#state.testsuites,
+            TestSuite = lookup_suite_by_group_id(GroupId, TestSuites),
+
+            %% We don't have any proper name.  Let's give all the
+            %% clues that we have.
+            Name = case SomethingFailed of
+                       setup_failed -> "fixture setup ";
+                       cleanup_failed -> "fixture cleanup "
+                   end
+                ++ io_lib:format("~p", [proplists:get_value(id, Data)]),
+            Desc = format_desc(proplists:get_value(desc, Data)),
+            TestCase = #testcase{
+              name = Name, description = Desc,
+              time = 0, output = <<>>},
+            NewTestSuite = add_testcase_to_testsuite({error, Exception}, TestCase, TestSuite),
+            St#state{testsuites=store_suite(NewTestSuite, TestSuites)};
+        _ ->
+            St
+    end;
 handle_cancel(test, Data, St) ->
     %% Retrieve existing test suite:
     [GroupId|_] = proplists:get_value(id, Data),
@@ -232,7 +256,7 @@ write_reports(TestSuites, XmlDir) ->
 
 write_report(#testsuite{name = Name} = TestSuite, XmlDir) ->
     Filename = filename:join(XmlDir, lists:flatten(["TEST-", escape_suitename(Name)], ".xml")),
-    case file:open(Filename, [write, raw]) of
+    case file:open(Filename, [write,{encoding,utf8}]) of
         {ok, FileDescriptor} ->
             try
                 write_report_to(TestSuite, FileDescriptor)
diff --git a/lib/eunit/src/eunit_test.erl b/lib/eunit/src/eunit_test.erl
index bca49ae626..9cf40a738d 100644
--- a/lib/eunit/src/eunit_test.erl
+++ b/lib/eunit/src/eunit_test.erl
@@ -21,8 +21,7 @@
 
 -module(eunit_test).
 
--export([run_testfun/1, function_wrapper/2, enter_context/4,
-	 multi_setup/1]).
+-export([run_testfun/1, mf_wrapper/2, enter_context/4, multi_setup/1]).
 
 
 -include("eunit.hrl").
@@ -43,8 +42,12 @@ get_stacktrace(Ts) ->
 
 prune_trace([{eunit_data, _, _} | Rest], Tail) ->
     prune_trace(Rest, Tail);
+prune_trace([{eunit_data, _, _, _} | Rest], Tail) ->
+    prune_trace(Rest, Tail);
 prune_trace([{?MODULE, _, _} | _Rest], Tail) ->
     Tail;
+prune_trace([{?MODULE, _, _, _} | _Rest], Tail) ->
+    Tail;
 prune_trace([T | Ts], Tail) ->
     [T | prune_trace(Ts, Tail)];
 prune_trace([], Tail) ->
@@ -258,7 +261,7 @@ macro_test_() ->
 %% @type wrapperError() = {no_such_function, mfa()}
 %%                      | {module_not_found, moduleName()}
 
-function_wrapper(M, F) ->
+mf_wrapper(M, F) ->
     fun () ->
  	    try M:F()
  	    catch
@@ -289,12 +292,12 @@ fail(Term) ->
 wrapper_test_() ->
     {"error handling in function wrapper",
      [?_assertException(throw, {module_not_found, eunit_nonexisting},
-  			run_testfun(function_wrapper(eunit_nonexisting,test))),
+  			run_testfun(mf_wrapper(eunit_nonexisting,test))),
       ?_assertException(throw,
   			{no_such_function, {?MODULE,nonexisting_test,0}},
-  			run_testfun(function_wrapper(?MODULE,nonexisting_test))),
+  			run_testfun(mf_wrapper(?MODULE,nonexisting_test))),
       ?_test({error, {error, undef, _T}}
-  	     = run_testfun(function_wrapper(?MODULE,wrapper_test_exported_)))
+  	     = run_testfun(mf_wrapper(?MODULE,wrapper_test_exported_)))
      ]}.
 
 %% this must be exported (done automatically by the autoexport transform)
@@ -319,6 +322,17 @@ enter_context(Setup, Cleanup, Instantiate, Callback) ->
 	R ->
 	    try Instantiate(R) of
 		T ->
+                    case eunit_lib:is_not_test(T) of
+                        true ->
+                            catch throw(error),  % generate a stack trace
+                            {module,M} = erlang:fun_info(Instantiate, module),
+                            {name,N} = erlang:fun_info(Instantiate, name),
+                            {arity,A} = erlang:fun_info(Instantiate, arity),
+                            context_error({bad_instantiator, {{M,N,A},T}},
+                                          error, badarg);
+                        false ->
+                            ok
+                    end,
 		    try Callback(T)  %% call back to client code
 		    after
 			%% Always run cleanup; client may be an idiot
diff --git a/lib/eunit/src/eunit_tty.erl b/lib/eunit/src/eunit_tty.erl
index e3e7b710b2..f21b2da3d3 100644
--- a/lib/eunit/src/eunit_tty.erl
+++ b/lib/eunit/src/eunit_tty.erl
@@ -44,6 +44,7 @@ start(Options) ->
 
 init(Options) ->
     St = #state{verbose = proplists:get_bool(verbose, Options)},
+    put(no_tty, proplists:get_bool(no_tty, Options)),
     receive
 	{start, _Reference} ->
 	    if St#state.verbose -> print_header();
@@ -59,30 +60,30 @@ terminate({ok, Data}, St) ->
     Cancel = proplists:get_value(cancel, Data, 0),
     if Fail =:= 0, Skip =:= 0, Cancel =:= 0 ->
 	    if Pass =:= 0 ->
-		    io:fwrite("  There were no tests to run.\n");
+		    fwrite("  There were no tests to run.\n");
 	       true ->
 		    if St#state.verbose -> print_bar();
 		       true -> ok
 		    end,
 		    if Pass =:= 1 ->
-			    io:fwrite("  Test passed.\n");
+			    fwrite("  Test passed.\n");
 		       true ->
-			    io:fwrite("  All ~w tests passed.\n", [Pass])
+			    fwrite("  All ~w tests passed.\n", [Pass])
 		    end
 	    end,
 	    sync_end(ok);
        true ->
 	    print_bar(),
-	    io:fwrite("  Failed: ~w.  Skipped: ~w.  Passed: ~w.\n",
-		      [Fail, Skip, Pass]),
+	    fwrite("  Failed: ~w.  Skipped: ~w.  Passed: ~w.\n",
+                   [Fail, Skip, Pass]),
 	    if Cancel =/= 0 ->
-		    io:fwrite("One or more tests were cancelled.\n");
+		    fwrite("One or more tests were cancelled.\n");
 	       true -> ok
 	    end,
 	    sync_end(error)
     end;
 terminate({error, Reason}, _St) ->
-    io:fwrite("Internal error: ~P.\n", [Reason, 25]),
+    fwrite("Internal error: ~P.\n", [Reason, 25]),
     sync_end(error).
 
 sync_end(Result) ->
@@ -93,10 +94,10 @@ sync_end(Result) ->
     end.
 
 print_header() ->
-    io:fwrite("======================== EUnit ========================\n").
+    fwrite("======================== EUnit ========================\n").
 
 print_bar() ->
-    io:fwrite("=======================================================\n").
+    fwrite("=======================================================\n").
 
 
 handle_begin(group, Data, St) ->
@@ -170,18 +171,18 @@ handle_cancel(test, Data, St) ->
 
 
 indent(N) when is_integer(N), N >= 1 ->
-    io:put_chars(lists:duplicate(N * 2, $\s));
+    fwrite(lists:duplicate(N * 2, $\s));
 indent(_N) ->
     ok.
 
 print_group_start(I, Desc) ->
     indent(I),
-    io:fwrite("~s\n", [Desc]).
+    fwrite("~s\n", [Desc]).
 
 print_group_end(I, Time) ->
     if Time > 0 ->
 	    indent(I),
-	    io:fwrite("[done in ~.3f s]\n", [Time/1000]);
+	    fwrite("[done in ~.3f s]\n", [Time/1000]);
        true ->
 	    ok
     end.
@@ -198,9 +199,9 @@ print_test_begin(I, Data) ->
 	end,
     case proplists:get_value(source, Data) of
 	{Module, Name, _Arity} ->
-	    io:fwrite("~s:~s ~s~s...", [Module, L, Name, D]);
+	    fwrite("~s:~s ~s~s...", [Module, L, Name, D]);
 	_ ->
-	    io:fwrite("~s~s...", [L, D])
+	    fwrite("~s~s...", [L, D])
     end.
 
 print_test_end(Data) ->
@@ -208,36 +209,35 @@ print_test_end(Data) ->
     T = if Time > 0 -> io_lib:fwrite("[~.3f s] ", [Time/1000]);
 	   true -> ""
 	end,
-    io:fwrite("~sok\n", [T]).
+    fwrite("~sok\n", [T]).
 
 print_test_error({error, Exception}, Data) ->
     Output = proplists:get_value(output, Data),
-    io:fwrite("*failed*\n::~s",
-	      [eunit_lib:format_exception(Exception)]),
+    fwrite("*failed*\n~s", [eunit_lib:format_exception(Exception)]),
     case Output of
 	<<>> ->
-	    io:put_chars("\n\n");
+	    fwrite("\n\n");
 	<<Text:800/binary, _:1/binary, _/binary>> ->
-	    io:fwrite("  output:<<\"~s\">>...\n\n", [Text]);
+	    fwrite("  output:<<\"~s\">>...\n\n", [Text]);
 	_ ->
-	    io:fwrite("  output:<<\"~s\">>\n\n", [Output])
+	    fwrite("  output:<<\"~s\">>\n\n", [Output])
     end;
 print_test_error({skipped, Reason}, _) ->
-    io:fwrite("*did not run*\n::~s\n", [format_skipped(Reason)]).
+    fwrite("*did not run*\n::~s\n", [format_skipped(Reason)]).
 
 format_skipped({module_not_found, M}) ->
-    io_lib:format("missing module: ~w", [M]);
+    io_lib:fwrite("missing module: ~w", [M]);
 format_skipped({no_such_function, {M,F,A}}) ->
-    io_lib:format("no such function: ~w:~w/~w", [M,F,A]).    
+    io_lib:fwrite("no such function: ~w:~w/~w", [M,F,A]).
 
 print_test_cancel(Reason) ->
-    io:fwrite(format_cancel(Reason)).
+    fwrite(format_cancel(Reason)).
 
 print_group_cancel(_I, {blame, _}) ->
     ok;
 print_group_cancel(I, Reason) ->
     indent(I),
-    io:fwrite(format_cancel(Reason)).
+    fwrite(format_cancel(Reason)).
 
 format_cancel(undefined) ->
     "*skipped*\n";
@@ -253,3 +253,12 @@ format_cancel({exit, Reason}) ->
 		  [Reason, 15]);
 format_cancel({abort, Reason}) ->
     eunit_lib:format_error(Reason).
+
+fwrite(String) ->
+    fwrite(String, []).
+
+fwrite(String, Args) ->
+    case get(no_tty) of
+        false -> io:fwrite(String, Args);
+        true -> ok
+    end.
diff --git a/lib/eunit/test/Makefile b/lib/eunit/test/Makefile
index a2d276f619..e4ddf4e42c 100644
--- a/lib/eunit/test/Makefile
+++ b/lib/eunit/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2009-2010. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -74,9 +74,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) eunit.spec $(EMAKEFILE) \
 		$(COVERFILE) $(ERL_FILES) \
-		$(RELSYSDIR)
+		"$(RELSYSDIR)"
 
 release_docs_spec:
diff --git a/lib/eunit/vsn.mk b/lib/eunit/vsn.mk
index 445c070e96..174d197117 100644
--- a/lib/eunit/vsn.mk
+++ b/lib/eunit/vsn.mk
@@ -1 +1 @@
-EUNIT_VSN = 2.2.2
+EUNIT_VSN = 2.2.3
diff --git a/lib/gs/contribs/bonk/Makefile b/lib/gs/contribs/bonk/Makefile
index be096824dd..a630deaf24 100644
--- a/lib/gs/contribs/bonk/Makefile
+++ b/lib/gs/contribs/bonk/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -94,14 +94,14 @@ $(EBIN)/$(TOOLNAME).tool: $(TOOLNAME).tool
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/bonk/bitmaps
-	$(INSTALL_DATA) $(BITMAPS) $(TOOLBOX_FILES) $(RELSYSDIR)/bonk/bitmaps
-	$(INSTALL_DIR) $(RELSYSDIR)/bonk/sounds
-	$(INSTALL_DATA) $(SOUNDS) $(RELSYSDIR)/bonk/sounds
-	$(INSTALL_DIR) $(RELSYSDIR)/bonk
-	$(INSTALL_DATA) $(ERL_FILES) $(EXTRA_FILES) $(RELSYSDIR)/bonk
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/bonk/bitmaps"
+	$(INSTALL_DATA) $(BITMAPS) $(TOOLBOX_FILES) "$(RELSYSDIR)/bonk/bitmaps"
+	$(INSTALL_DIR) "$(RELSYSDIR)/bonk/sounds"
+	$(INSTALL_DATA) $(SOUNDS) "$(RELSYSDIR)/bonk/sounds"
+	$(INSTALL_DIR) "$(RELSYSDIR)/bonk"
+	$(INSTALL_DATA) $(ERL_FILES) $(EXTRA_FILES) "$(RELSYSDIR)/bonk"
 
 
 release_docs_spec:
diff --git a/lib/gs/contribs/cols/Makefile b/lib/gs/contribs/cols/Makefile
index 75ca75ffc0..3af91e1dae 100644
--- a/lib/gs/contribs/cols/Makefile
+++ b/lib/gs/contribs/cols/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -91,12 +91,12 @@ $(EBIN)/help.gif: help.gif
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/cols/bitmaps
-	$(INSTALL_DATA) $(BITMAPS) $(TOOLBOX_FILES) $(RELSYSDIR)/cols/bitmaps
-	$(INSTALL_DIR) $(RELSYSDIR)/cols
-	$(INSTALL_DATA) $(ERL_FILES) $(EXTRA_FILES) $(RELSYSDIR)/cols
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/cols/bitmaps"
+	$(INSTALL_DATA) $(BITMAPS) $(TOOLBOX_FILES) "$(RELSYSDIR)/cols/bitmaps"
+	$(INSTALL_DIR) "$(RELSYSDIR)/cols"
+	$(INSTALL_DATA) $(ERL_FILES) $(EXTRA_FILES) "$(RELSYSDIR)/cols"
 
 release_docs_spec:
 
diff --git a/lib/gs/contribs/mandel/Makefile b/lib/gs/contribs/mandel/Makefile
index 61a7a612e0..5f0b047955 100644
--- a/lib/gs/contribs/mandel/Makefile
+++ b/lib/gs/contribs/mandel/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -90,11 +90,11 @@ $(EBIN)/help.gif: help.gif
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/mandel/bitmaps
-	$(INSTALL_DATA) $(BITMAPS) $(TOOLBOX_FILES) $(RELSYSDIR)/mandel/bitmaps
-	$(INSTALL_DIR) $(RELSYSDIR)/mandel
-	$(INSTALL_DATA) $(ERL_FILES) $(EXTRA_FILES) $(RELSYSDIR)/mandel
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/mandel/bitmaps"
+	$(INSTALL_DATA) $(BITMAPS) $(TOOLBOX_FILES) "$(RELSYSDIR)/mandel/bitmaps"
+	$(INSTALL_DIR) "$(RELSYSDIR)/mandel"
+	$(INSTALL_DATA) $(ERL_FILES) $(EXTRA_FILES) "$(RELSYSDIR)/mandel"
 
 release_docs_spec:
diff --git a/lib/gs/contribs/othello/Makefile b/lib/gs/contribs/othello/Makefile
index b81b35fb55..5f37d164f5 100644
--- a/lib/gs/contribs/othello/Makefile
+++ b/lib/gs/contribs/othello/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -89,12 +89,12 @@ $(EBIN)/$(TOOLNAME).tool: $(TOOLNAME).tool
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/othello
-	$(INSTALL_DATA) $(ERL_FILES) $(EXTRA_FILES) $(RELSYSDIR)/othello
-	$(INSTALL_DIR) $(RELSYSDIR)/othello/priv
-	$(INSTALL_DATA) $(BITMAPS) $(TOOLBOX_FILES) $(RELSYSDIR)/othello/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/othello"
+	$(INSTALL_DATA) $(ERL_FILES) $(EXTRA_FILES) "$(RELSYSDIR)/othello"
+	$(INSTALL_DIR) "$(RELSYSDIR)/othello/priv"
+	$(INSTALL_DATA) $(BITMAPS) $(TOOLBOX_FILES) "$(RELSYSDIR)/othello/priv"
 
 release_docs_spec:
 
diff --git a/lib/gs/doc/src/Makefile b/lib/gs/doc/src/Makefile
index 192dd67a52..bfc5e4c317 100644
--- a/lib/gs/doc/src/Makefile
+++ b/lib/gs/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -144,13 +144,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR)  $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE)  $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	(/bin/cp -rf  $(HTMLDIR) $(RELSYSDIR)/doc)
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+	$(INSTALL_DIR)  "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE)  "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	(/bin/cp -rf  $(HTMLDIR) "$(RELSYSDIR)/doc")
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 
 release_spec:
diff --git a/lib/gs/doc/src/notes.xml b/lib/gs/doc/src/notes.xml
index d1b74ecfb1..69b1e90ba5 100644
--- a/lib/gs/doc/src/notes.xml
+++ b/lib/gs/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/examples/Makefile b/lib/gs/examples/Makefile
index 10b166b207..ee77990191 100644
--- a/lib/gs/examples/Makefile
+++ b/lib/gs/examples/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -87,9 +87,9 @@ clean:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
 
 release_docs_spec:
diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile
index 43b530295b..4b7a4523b9 100644
--- a/lib/gs/src/Makefile
+++ b/lib/gs/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2011. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -107,13 +107,13 @@ $(GSTK_GENERIC_TARGET): gstk_generic.hrl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DATA) $(APP_SRC) $(ERL_FILES) $(HRL_FILES) $(GEN_HRL_FILES) \
-		$(GSTK_GENERIC) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/bitmap
-	$(INSTALL_DATA) $(IMAGES) $(RELSYSDIR)/priv/bitmap
+		$(GSTK_GENERIC) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap"
+	$(INSTALL_DATA) $(IMAGES) "$(RELSYSDIR)/priv/bitmap"
 
 
 release_docs_spec:
diff --git a/lib/gs/src/gstk_generic.erl b/lib/gs/src/gstk_generic.erl
index 10cb890013..9b0efd07c1 100644
--- a/lib/gs/src/gstk_generic.erl
+++ b/lib/gs/src/gstk_generic.erl
@@ -323,7 +323,7 @@ handle_external_opt_call([Opt|Options],Gstkid,TkW,DB,ExtraArg,ExtRes,S,P,C) ->
     end.
 
 handle_external_read(Res) ->
-    case Res of 
+    _ = case Res of 
 	{bad_result,{Objtype,Reason,Option}} ->
 	    {error,{Objtype,Reason,Option}};
 	_ -> ok
diff --git a/lib/gs/tcl/Makefile.in b/lib/gs/tcl/Makefile.in
index dce34a4baa..c22a7037e8 100644
--- a/lib/gs/tcl/Makefile.in
+++ b/lib/gs/tcl/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2002-2009. All Rights Reserved.
+# Copyright Ericsson AB 2002-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -74,10 +74,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec:
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(TCL_FILES) $(EXTRA_FILES) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(TCL_FILES) $(EXTRA_FILES) "$(RELSYSDIR)/priv"
 ifneq ($(TCL_TAR),)
-	gzip -dc $(TCL_TAR) | (cd $(RELSYSDIR)/priv && tar -xf -)
+	gzip -dc $(TCL_TAR) | (cd "$(RELSYSDIR)/priv" && tar -xf -)
 endif
 
 release_docs_spec:
diff --git a/lib/hipe/amd64/Makefile b/lib/hipe/amd64/Makefile
index 15291e9bbe..50cd024d72 100644
--- a/lib/hipe/amd64/Makefile
+++ b/lib/hipe/amd64/Makefile
@@ -105,8 +105,8 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/arm/Makefile b/lib/hipe/arm/Makefile
index a64f133679..651b82f1ed 100644
--- a/lib/hipe/arm/Makefile
+++ b/lib/hipe/arm/Makefile
@@ -106,8 +106,8 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile
index 14e68f5233..506e993ff4 100644
--- a/lib/hipe/cerl/Makefile
+++ b/lib/hipe/cerl/Makefile
@@ -42,7 +42,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/hipe-$(VSN)
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
-MODULES = cerl_cconv cerl_closurean cerl_hipeify cerl_hybrid_transform \
+MODULES = cerl_cconv cerl_closurean cerl_hipeify \
 	  cerl_lib cerl_messagean cerl_pmatch cerl_prettypr cerl_to_icode \
 	  cerl_typean erl_bif_types erl_types 
 
@@ -100,10 +100,10 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/cerl
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/cerl
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/cerl"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/cerl"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/cerl/cerl_hybrid_transform.erl b/lib/hipe/cerl/cerl_hybrid_transform.erl
deleted file mode 100644
index b248b0ccd0..0000000000
--- a/lib/hipe/cerl/cerl_hybrid_transform.erl
+++ /dev/null
@@ -1,153 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
--module(cerl_hybrid_transform).
-
-%% Use compile option `{core_transform, cerl_hybrid_transform}' to
-%% insert this as a compilation pass.
-
--export([transform/2, core_transform/2]).
-
--spec core_transform(cerl:cerl(), [term()]) -> cerl:cerl().
-
-core_transform(Code, Opts) ->
-    cerl:to_records(transform(cerl:from_records(Code), Opts)).
-
--spec transform(cerl:cerl(), [term()]) -> cerl:cerl().
-
-transform(Code, _Opts) ->
-    Code0 = cerl_trees:map(fun unfold_literal/1, Code),
-    {Code1, _} = cerl_trees:label(Code0),
-    io:fwrite("Running hybrid heap analysis..."),
-    {T1,_} = statistics(runtime),
-    {Code2, _, Vars} = cerl_messagean:annotate(Code1),
-    {T2,_} = statistics(runtime),
-    io:fwrite("(~w ms), transform...", [T2 - T1]),
-    Code3 = rewrite(Code2, Vars),
-    io:fwrite("done.\n"),
-    cerl_trees:map(fun fold_literal/1, Code3).
-
-unfold_literal(T) ->
-    cerl:unfold_literal(T).
-
-fold_literal(T) ->
-    cerl:fold_literal(T).
-
-%% If escape-annotated:
-%% {...} => hybrid:tuple([...])
-%% [H | T] => hybrid:cons(H, T)
-%%
-%% Wrapper for args to hybrid:cons/hybrid:tuple that may need copying:
-%% hybrid:copy(A)
-
-rewrite(Node, Vars) ->
-    case cerl:type(Node) of
-	tuple ->
-	    Es = rewrite_list(cerl:tuple_es(Node), Vars),
-	    case is_escaping(Node) of
-		false ->
-		    cerl:update_c_tuple(Node, Es);
-		true ->
-		    Es1 = wrap(Es, Node, Vars),
-		    cerl:update_c_call(Node,
-				       cerl:abstract(hybrid),
-				       cerl:abstract(tuple),
-				       [cerl:make_list(Es1)])
-%%% 		    cerl:update_c_call(Node, cerl:abstract(hybrid),
-%%% 				       cerl:abstract(tuple), Es1)
-	    end;
-	cons ->
-	    H = rewrite(cerl:cons_hd(Node), Vars),
-	    T = rewrite(cerl:cons_tl(Node), Vars),
-	    case is_escaping(Node) of
-		false ->
-		    cerl:update_c_cons(Node, H, T);
-		true ->
-		    Es = wrap([H, T], Node, Vars),
-		    cerl:update_c_call(Node,
-				       cerl:abstract(hybrid),
-				       cerl:abstract(cons),
-				       Es)
-	    end;
-%%% 	call ->
-%%% 	    M = rewrite(cerl:call_module(Node)),
-%%% 	    F = rewrite(cerl:call_name(Node)),
-%%% 	    As = rewrite_list(cerl:call_args(Node)),
-%%% 	    case cerl:is_c_atom(M) andalso cerl:is_c_atom(F) of
-%%% 		true ->
-%%% 		    case {cerl:atom_val(M), cerl:atom_val(F), length(As)} of
-%%% 			{erlang, '!', 2} ->
-%%% 			    cerl:update_c_call(Node,
-%%% 					       cerl:abstract(hipe_bifs),
-%%% 					       cerl:abstract(send),
-%%% 					       [cerl:make_list(As)]);
-%%% 			_ ->
-%%% 			    cerl:update_c_call(Node, M, F, As)
-%%% 		    end;
-%%% 		false ->
-%%% 		    cerl:update_c_call(Node, M, F, As)
-%%% 	    end;
-	clause ->
-	    B = rewrite(cerl:clause_body(Node), Vars),
-	    cerl:update_c_clause(Node, cerl:clause_pats(Node),
-				 cerl:clause_guard(Node), B);
-	primop ->
-	    case cerl:atom_val(cerl:primop_name(Node)) of
-		match_fail ->
-		    Node;
-		_ ->
-		    As = rewrite_list(cerl:primop_args(Node), Vars),
-		    cerl:update_c_primop(Node, cerl:primop_name(Node), As)
-	    end;
-	_T ->
-	    case cerl:subtrees(Node) of
-		[] ->
-		    Node;
-		Gs ->
-		    cerl:update_tree(Node, [rewrite_list(Ns, Vars)
-					    || Ns <- Gs])
-	    end
-    end.
-
-rewrite_list([N | Ns], Vars) ->
-    [rewrite(N, Vars) | rewrite_list(Ns, Vars)];
-rewrite_list([], _) ->
-    [].
-
-is_escaping(T) ->
-    lists:member(escapes, cerl:get_ann(T)).
-
-wrap(Es, Node, Vars) ->
-    L = cerl_trees:get_label(Node),
-    Xs = dict:fetch(L, Vars),
-    wrap(Es, Xs).
-
-wrap([E | Es], [{S, _} | Xs]) ->
-    case ordsets:is_element(unsafe, S) of
-%%  case cerl:type(E) =/= literal of
-	true ->
-	    [cerl:c_call(cerl:abstract(hybrid),
-			 cerl:abstract(copy),
-			 [E])
-	     | wrap(Es, Xs)];
-	false ->
-	    [E | wrap(Es, Xs)]
-    end;
-wrap([], _) ->
-    [].
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index 645ec71c3c..98d65abba1 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -45,11 +45,9 @@
 		    t_atom_vals/1,
 		    t_binary/0,
 		    t_bitstr/0,
-		    t_bitstrlist/0,
 		    t_boolean/0,
 		    t_byte/0,
 		    t_char/0,
-		    t_charlist/0,
 		    t_cons/0,
 		    t_cons/2,
 		    t_cons_hd/1,
@@ -72,8 +70,6 @@
 		    t_non_neg_integer/0,
 		    t_pos_integer/0,
 		    t_integers/1,
-		    t_iodata/0,
-		    t_iolist/0,
 		    t_is_any/1,
 		    t_is_atom/1,
 		    t_is_binary/1,
@@ -85,7 +81,6 @@
 		    t_is_fun/1,
 		    t_is_integer/1,
 		    t_is_integer/1,
-		    t_is_list/1,
 		    t_is_nil/1,
 		    t_is_none/1,
 		    t_is_none_or_unit/1,
@@ -118,14 +113,11 @@
 		    t_subtract/2,
 		    t_sup/1,
 		    t_sup/2,
-		    t_tid/0,
-		    t_timeout/0,
 		    t_tuple/0,
 		    t_tuple/1,
 		    t_tuple_args/1,
 		    t_tuple_size/1,
-		    t_tuple_subtypes/1,
-		    t_unicode_string/0
+		    t_tuple_subtypes/1
 		   ]).
 
 -ifdef(DO_ERL_BIF_TYPES_TEST).
@@ -144,111 +136,14 @@ type(M, F, A) ->
 
 -spec type(atom(), atom(), arity(), [erl_types:erl_type()]) -> erl_types:erl_type().
 
-%%-- binary -------------------------------------------------------------------
-type(binary, at, 2, Xs) ->
-  strict(arg_types(binary, at, 2), Xs, fun(_) -> t_integer() end);
-type(binary, bin_to_list, Arity, Xs) when 1 =< Arity, Arity =< 3 ->
-  strict(arg_types(binary, bin_to_list, Arity), Xs,
-	 fun(_) -> t_list(t_integer()) end);
-type(binary, compile_pattern, 1, Xs) ->
-  strict(arg_types(binary, compile_pattern, 1), Xs,
-	 fun(_) -> t_binary_compiled_pattern() end);
-type(binary, copy, Arity, Xs)  when Arity =:= 1; Arity =:= 2 ->
-  strict(arg_types(binary, copy, Arity), Xs,
-	 fun(_) -> t_binary() end);
-type(binary, decode_unsigned, Arity, Xs)  when Arity =:= 1; Arity =:= 2 ->
-  strict(arg_types(binary, decode_unsigned, Arity), Xs,
-	 fun(_) -> t_non_neg_integer() end);
-type(binary, encode_unsigned, Arity, Xs)  when Arity =:= 1; Arity =:= 2 ->
-  strict(arg_types(binary, encode_unsigned, Arity), Xs,
-	 fun(_) -> t_binary() end);
-type(binary, first, 1, Xs) ->
-  strict(arg_types(binary, first, 1), Xs, fun(_) -> t_non_neg_integer() end);
-type(binary, last, 1, Xs) ->
-  strict(arg_types(binary, last, 1), Xs, fun(_) -> t_non_neg_integer() end);
-type(binary, list_to_bin, 1, Xs) ->
-  type(erlang, list_to_binary, 1, Xs);
-type(binary, longest_common_prefix, 1, Xs) ->
-  strict(arg_types(binary, longest_common_prefix, 1), Xs,
-	 fun(_) -> t_integer() end);
-type(binary, longest_common_suffix, 1, Xs) ->
-  strict(arg_types(binary, longest_common_suffix, 1), Xs,
-	 fun(_) -> t_integer() end);
-type(binary, match, Arity, Xs) when Arity =:= 2; Arity =:= 3 ->
-  strict(arg_types(binary, match, Arity), Xs,
-	 fun(_) ->
-	     t_sup(t_atom('nomatch'), t_binary_canonical_part())
-	 end);
-type(binary, matches, Arity, Xs) when Arity =:= 2; Arity =:= 3 ->
-  strict(arg_types(binary, matches, Arity), Xs,
-	 fun(_) -> t_list(t_binary_canonical_part()) end);
-type(binary, part, 2, Xs) ->
-  type(erlang, binary_part, 2, Xs);
-type(binary, part, 3, Xs) ->
-  type(erlang, binary_part, 3, Xs);
-type(binary, referenced_byte_size, 1, Xs) ->
-  strict(arg_types(binary, referenced_byte_size, 1), Xs,
-	 fun(_) -> t_non_neg_integer() end);
-%%-- code ---------------------------------------------------------------------
-type(code, get_chunk, 2, Xs) ->
-  strict(arg_types(code, get_chunk, 2), Xs,
-	 fun (_) -> t_sup(t_binary(), t_atom('undefined')) end);
-type(code, is_module_native, 1, Xs) ->
-  strict(arg_types(code, is_module_native, 1), Xs,
-	 fun (_) -> t_sup(t_boolean(), t_atom('undefined')) end);
-type(code, module_md5, 1, Xs) ->
-  strict(arg_types(code, module_md5, 1), Xs,
-	 fun (_) -> t_sup(t_binary(), t_atom('undefined')) end);
-type(code, make_stub_module, 3, Xs) ->
-  strict(arg_types(code, make_stub_module, 3), Xs, fun ([Mod,_,_]) -> Mod end);
-type(code, rehash, 0, _) ->
-  t_atom('ok');
-%%-- erl_ddll -----------------------------------------------------------------
-type(erl_ddll, demonitor, 1, Xs) ->
-  type(erlang, demonitor, 1, Xs);
-type(erl_ddll, format_error_int, 1, Xs) ->
-  strict(arg_types(erl_ddll, format_error_int, 1), Xs,
-	 fun (_) -> t_string() end);
-type(erl_ddll, info, 2, Xs) ->
-  strict(arg_types(erl_ddll, info, 2), Xs, fun (_) -> t_atom() end);
-type(erl_ddll, loaded_drivers, 0, _) ->
-  t_tuple([t_atom('ok'), t_list(t_string())]);
-type(erl_ddll, monitor, 2, Xs) -> % return type is the same, though args are not
-  type(erlang, monitor, 2, Xs);
-type(erl_ddll, try_load, 3, Xs) ->
-  strict(arg_types(erl_ddll, try_load, 3), Xs,
-	 fun (_) ->
-	     t_sup([t_tuple([t_atom('ok'), t_atom('already_loaded')]),
-		    t_tuple([t_atom('ok'), t_atom('loaded')]),
-		    t_tuple([t_atom('ok'),
-			     t_atom('pending_driver'), t_reference()]),
-		    t_tuple([t_atom('error'), t_atom('inconsistent')]),
-		    t_tuple([t_atom('error'), t_atom('permanent')])])
-	 end);
-type(erl_ddll, try_unload, 2, Xs) ->
-  strict(arg_types(erl_ddll, try_unload, 2), Xs,
-	 fun (_) ->
-	     t_sup([t_tuple([t_atom('ok'), t_atom('pending_process')]),
-		    t_tuple([t_atom('ok'), t_atom('unloaded')]),
-		    t_tuple([t_atom('ok'), t_atom('pending_driver')]),
-		    t_tuple([t_atom('ok'),
-			     t_atom('pending_driver'), t_reference()]),
-		    t_tuple([t_atom('error'), t_atom('permanent')]),
-		    t_tuple([t_atom('error'), t_atom('not_loaded')]),
-		    t_tuple([t_atom('error'),
-			     t_atom('not_loaded_by_this_process')])])
-	 end);
 %%-- erlang -------------------------------------------------------------------
 type(erlang, halt, 0, _) -> t_none();
 type(erlang, halt, 1, _) -> t_none();
 type(erlang, halt, 2, _) -> t_none();
 type(erlang, exit, 1, _) -> t_none();
-%% Note that exit/2 sends an exit signal to another process.
-type(erlang, exit, 2, _) -> t_atom('true');
 type(erlang, error, 1, _) -> t_none();
 type(erlang, error, 2, _) -> t_none();
 type(erlang, throw, 1, _) -> t_none();
-type(erlang, hibernate, 3, _) -> t_none();
 type(erlang, '==', 2, Xs = [X1, X2]) ->
   case t_is_atom(X1) andalso t_is_atom(X2) of
     true -> type(erlang, '=:=', 2, Xs);
@@ -600,20 +495,12 @@ type(erlang, 'bnot', 1, Xs) ->
 	       {ok, T} -> T
 	     end
 	 end);
-%% This returns (-X)-1, so it often gives a negative result.
-%%  strict(arg_types(erlang, 'bnot', 1), Xs, fun (_) -> t_integer() end);
+%% Guard bif, needs to be here.
 type(erlang, abs, 1, Xs) ->
   strict(arg_types(erlang, abs, 1), Xs, fun ([X]) -> X end);
-type(erlang, adler32, 1, Xs) ->
-  strict(arg_types(erlang, adler32, 1), Xs, fun (_) -> t_adler32() end);
-type(erlang, adler32, 2, Xs) ->
-  strict(arg_types(erlang, adler32, 2), Xs, fun (_) -> t_adler32() end);
-type(erlang, adler32_combine, 3, Xs) ->
-  strict(arg_types(erlang, adler32_combine, 3), Xs,
-	 fun (_) -> t_adler32() end);
+%% This returns (-X)-1, so it often gives a negative result.
+%%  strict(arg_types(erlang, 'bnot', 1), Xs, fun (_) -> t_integer() end);
 type(erlang, append, 2, Xs) -> type(erlang, '++', 2, Xs); % alias
-type(erlang, append_element, 2, Xs) ->
-  strict(arg_types(erlang, append_element, 2), Xs, fun (_) -> t_tuple() end);
 type(erlang, apply, 2, Xs) ->
   Fun = fun ([X, _Y]) -> 
 	    case t_is_fun(X) of
@@ -626,111 +513,24 @@ type(erlang, apply, 2, Xs) ->
   strict(arg_types(erlang, apply, 2), Xs, Fun);
 type(erlang, apply, 3, Xs) ->
   strict(arg_types(erlang, apply, 3), Xs, fun (_) -> t_any() end);
-type(erlang, atom_to_binary, 2, Xs) ->
-  strict(arg_types(erlang, atom_to_binary, 2), Xs, fun (_) -> t_binary() end);
-type(erlang, atom_to_list, 1, Xs) ->
-  strict(arg_types(erlang, atom_to_list, 1), Xs, fun (_) -> t_string() end);
+%% Guard bif, needs to be here.
 type(erlang, binary_part, 2, Xs) ->
   strict(arg_types(erlang, binary_part, 2), Xs, fun (_) -> t_binary() end);
+%% Guard bif, needs to be here.
 type(erlang, binary_part, 3, Xs) ->
   strict(arg_types(erlang, binary_part, 3), Xs, fun (_) -> t_binary() end);
-type(erlang, binary_to_atom, 2, Xs) ->
-  strict(arg_types(erlang, binary_to_atom, 2), Xs, fun (_) -> t_atom() end);
-type(erlang, binary_to_existing_atom, 2, Xs) ->
-  type(erlang, binary_to_atom, 2, Xs);
-type(erlang, binary_to_list, 1, Xs) ->
-  strict(arg_types(erlang, binary_to_list, 1), Xs,
-	 fun (_) -> t_list(t_byte()) end);
-type(erlang, binary_to_list, 3, Xs) ->
-  strict(arg_types(erlang, binary_to_list, 3), Xs,
-	 fun (_) -> t_list(t_byte()) end);
-type(erlang, binary_to_term, 1, Xs) ->
-  strict(arg_types(erlang, binary_to_term, 1), Xs, fun (_) -> t_any() end);
-type(erlang, binary_to_term, 2, Xs) ->
-  strict(arg_types(erlang, binary_to_term, 2), Xs, fun (_) -> t_any() end);
-type(erlang, bitsize, 1, Xs) ->	% XXX: TAKE OUT
-  type(erlang, bit_size, 1, Xs);
+%% Guard bif, needs to be here.
 type(erlang, bit_size, 1, Xs) ->
   strict(arg_types(erlang, bit_size, 1), Xs,
 	 fun (_) -> t_non_neg_integer() end);
-type(erlang, bitstr_to_list, 1, Xs) ->	% XXX: TAKE OUT
-  type(erlang, bitstring_to_list, 1, Xs);
-type(erlang, bitstring_to_list, 1, Xs) ->
-  strict(arg_types(erlang, bitstring_to_list, 1), Xs,
-	 fun (_) -> t_list(t_sup(t_byte(), t_bitstr())) end);
-type(erlang, bump_reductions, 1, Xs) ->
-  strict(arg_types(erlang, bump_reductions, 1), Xs,
-	 fun (_) -> t_atom('true') end);
+%% Guard bif, needs to be here.
 type(erlang, byte_size, 1, Xs) ->
   strict(arg_types(erlang, byte_size, 1), Xs,
 	 fun (_) -> t_non_neg_integer() end);
-type(erlang, call_on_load_function, 1, Xs) ->
-  %% Internal BIF used by on_load.
-  strict(arg_types(erlang, call_on_load_function, 1), Xs,
-	 fun (_) -> t_any() end);
-type(erlang, cancel_timer, 1, Xs) ->
-  strict(arg_types(erlang, cancel_timer, 1), Xs,
-	 fun (_) -> t_sup(t_integer(), t_atom('false')) end);
-type(erlang, check_old_code, 1, Xs) ->
-  strict(arg_types(erlang, check_old_code, 1), Xs,
-	 fun (_) -> t_boolean() end);
-type(erlang, check_process_code, 2, Xs) ->
-  strict(arg_types(erlang, check_process_code, 2), Xs,
-	 fun (_) -> t_boolean() end);
-type(erlang, crc32, 1, Xs) ->
-  strict(arg_types(erlang, crc32, 1), Xs, fun (_) -> t_crc32() end);
-type(erlang, crc32, 2, Xs) ->
-  strict(arg_types(erlang, crc32, 2), Xs, fun (_) -> t_crc32() end);
-type(erlang, crc32_combine, 3, Xs) ->
-  strict(arg_types(erlang, crc32_combine, 3), Xs, fun (_) -> t_crc32() end);
-type(erlang, date, 0, _) ->
-  t_date();
-type(erlang, decode_packet, 3, Xs) ->
-  strict(arg_types(erlang, decode_packet, 3), Xs,
-	 fun (_) ->
-	     t_sup([t_tuple([t_atom('ok'), t_packet(), t_binary()]),
-		    t_tuple([t_atom('more'), t_sup([t_non_neg_integer(),
-						    t_atom('undefined')])]),
-		    t_tuple([t_atom('error'), t_any()])])
-	 end);
-type(erlang, delete_module, 1, Xs) ->
-  strict(arg_types(erlang, delete_module, 1), Xs,
- 	 fun (_) -> t_sup(t_atom('true'), t_atom('undefined')) end);
-type(erlang, demonitor, 1, Xs) ->
-  strict(arg_types(erlang, demonitor, 1), Xs, fun (_) -> t_atom('true') end);
-%% TODO: overapproximation -- boolean only if 'info' is part of arg2 otherwise 'true'
-type(erlang, demonitor, 2, Xs) ->
-  strict(arg_types(erlang, demonitor, 2), Xs, fun (_) -> t_boolean() end);
 type(erlang, disconnect_node, 1, Xs) ->
   strict(arg_types(erlang, disconnect_node, 1), Xs, fun (_) -> t_sup([t_boolean(), t_atom('ignored')]) end);
-type(erlang, display, 1, _) -> t_atom('true');
-type(erlang, display_string, 1, Xs) ->
-  strict(arg_types(erlang, display_string, 1), Xs, fun(_) -> t_atom('true') end);
-type(erlang, display_nl, 0, _) ->
-  t_atom('true');
-type(erlang, dist_exit, 3, Xs) ->
-  strict(arg_types(erlang, dist_exit, 3), Xs, fun (_) -> t_atom('true') end);
-type(erlang, dt_append_vm_tag_data, 1, Xs) ->
-  strict(arg_types(erlang, dt_append_vm_tag_data, 1), 
-	 Xs, 
-	 fun(_) -> t_iodata() end);
-type(erlang, dt_get_tag, 0, _) ->
-  t_sup(t_binary(), t_atom('undefined'));
-type(erlang, dt_get_tag_data, 0, _) ->
-  t_sup(t_binary(), t_atom('undefined'));
-type(erlang, dt_prepend_vm_tag_data, 1, Xs) ->
-  strict(arg_types(erlang, dt_prepend_vm_tag_data, 1), 
-	 Xs, 
-	 fun(_) -> t_iodata() end);
-type(erlang, dt_put_tag, 1, Xs) ->
-  strict(arg_types(erlang, dt_put_tag, 1), Xs, 
-	 fun(_) -> t_sup(t_binary(), t_atom('undefined')) end);
-type(erlang, dt_restore_tag, 1, Xs) ->
-  strict(arg_types(erlang, dt_restore_tag, 1), Xs, fun(_) -> t_atom('true') end);
-type(erlang, dt_spread_tag, 1, Xs) ->
-  strict(arg_types(erlang, dt_spread_tag, 1), Xs, 
-	 fun(_) -> t_sup(t_tuple([t_non_neg_integer(), t_sup(t_binary(), t_nil())]),
-			 t_atom('true')) end);
+%% Guard bif, needs to be here.
+%% Also much more expressive than anything you could write in a spec...
 type(erlang, element, 2, Xs) ->
   strict(arg_types(erlang, element, 2), Xs,
 	 fun ([X1, X2]) ->
@@ -754,95 +554,22 @@ type(erlang, element, 2, Xs) ->
 		 t_sup([type(erlang, element, 2, [X1, Y]) || Y <- Ts])
 	     end
 	 end);
-type(erlang, erase, 0, _) -> t_any();
-type(erlang, erase, 1, _) -> t_any();
-type(erlang, external_size, 1, _) -> t_integer();
-type(erlang, external_size, 2, _) -> t_integer();
-type(erlang, finish_after_on_load, 2, Xs) ->
-  %% Internal BIF used by on_load.
-  strict(arg_types(erlang, finish_after_on_load, 2), Xs,
-	 fun (_) -> t_atom('true') end);
+%% Guard bif, needs to be here.
 type(erlang, float, 1, Xs) ->
   strict(arg_types(erlang, float, 1), Xs, fun (_) -> t_float() end);
-type(erlang, float_to_list, 1, Xs) ->
-  strict(arg_types(erlang, float_to_list, 1), Xs, fun (_) -> t_string() end);
-type(erlang, function_exported, 3, Xs) ->
-  strict(arg_types(erlang, function_exported, 3), Xs,
-	 fun (_) -> t_boolean() end);
 type(erlang, fun_info, 1, Xs) ->
   strict(arg_types(erlang, fun_info, 1), Xs,
 	 fun (_) -> t_list(t_tuple([t_atom(), t_any()])) end);
-type(erlang, fun_info, 2, Xs) ->
-  strict(arg_types(erlang, fun_info, 2), Xs,
-	 fun (_) -> t_tuple([t_atom(), t_any()]) end);
-type(erlang, fun_to_list, 1, Xs) ->
-  strict(arg_types(erlang, fun_to_list, 1), Xs, fun (_) -> t_string() end);
-type(erlang, garbage_collect, 0, _) -> t_atom('true');
-type(erlang, garbage_collect, 1, Xs) ->
-  strict(arg_types(erlang, garbage_collect, 1), Xs, fun (_) -> t_boolean() end);
-type(erlang, garbage_collect_message_area, 0, _) ->
-  t_boolean();
-type(erlang, get, 0, _) -> t_list(t_tuple(2));
-type(erlang, get, 1, _) -> t_any();          % | t_atom('undefined')
 type(erlang, get_cookie, 0, _) -> t_atom();  % | t_atom('nocookie')
-type(erlang, get_keys, 1, _) -> t_list();
-type(erlang, get_module_info, 1, Xs) ->
-  strict(arg_types(erlang, get_module_info, 1), Xs,
-	 fun (_) ->
-	     t_list(t_tuple([t_atom(), t_list(t_tuple([t_atom(), t_any()]))]))
-	 end);
-type(erlang, get_module_info, 2, Xs) ->
-  T_module_info_2_returns =
-    t_sup([t_atom(),
-	   t_list(t_tuple([t_atom(), t_any()])),
-	   t_list(t_tuple([t_atom(), t_arity(), t_integer()]))]),
-  strict(arg_types(erlang, get_module_info, 2), Xs,
-	 fun ([Module, Item]) ->
-	     case t_is_atom(Item) of
-	       true -> 
-		 case t_atom_vals(Item) of
-		   ['module'] -> t_inf(t_atom(), Module);
-		   ['imports'] -> t_nil();
-		   ['exports'] -> t_list(t_tuple([t_atom(), t_arity()]));
-		   ['functions'] -> t_list(t_tuple([t_atom(), t_arity()]));
-		   ['attributes'] -> t_list(t_tuple([t_atom(), t_any()]));
-		   ['compile'] -> t_list(t_tuple([t_atom(), t_any()]));
-		   ['native_addresses'] -> % [{FunName, Arity, Address}]
-		     t_list(t_tuple([t_atom(), t_arity(), t_integer()]));
-		   List when is_list(List) ->
-		     T_module_info_2_returns;
-		   unknown ->
-		     T_module_info_2_returns
-		 end;
-	       false ->
-		 T_module_info_2_returns
-	     end
-	 end);
-type(erlang, get_stacktrace, 0, _) ->
-  t_list(t_tuple([t_atom(), t_atom(), t_sup([t_arity(), t_list()]),
-		  t_list()]));
-type(erlang, group_leader, 0, _) -> t_pid();
-type(erlang, group_leader, 2, Xs) ->
-  strict(arg_types(erlang, group_leader, 2), Xs,
-	 fun (_) -> t_atom('true') end);
-type(erlang, hash, 2, Xs) ->
-  strict(arg_types(erlang, hash, 2), Xs, fun (_) -> t_integer() end);
+%% Guard bif, needs to be here.
 type(erlang, hd, 1, Xs) ->
   strict(arg_types(erlang, hd, 1), Xs, fun ([X]) -> t_cons_hd(X) end);
-type(erlang, integer_to_list, 1, Xs) ->
-  strict(arg_types(erlang, integer_to_list, 1), Xs,
-	 fun (_) -> t_string() end);
 type(erlang, integer_to_list, 2, Xs) ->
   strict(arg_types(erlang, integer_to_list, 2), Xs,
 	 fun (_) -> t_string() end);
 type(erlang, info, 1, Xs) -> type(erlang, system_info, 1, Xs); % alias
-type(erlang, iolist_size, 1, Xs) ->
-  strict(arg_types(erlang, iolist_size, 1), Xs,
-	 fun (_) -> t_non_neg_integer() end);
-type(erlang, iolist_to_binary, 1, Xs) ->
-  strict(arg_types(erlang, iolist_to_binary, 1), Xs,
-	 fun (_) -> t_binary() end);
-type(erlang, is_alive, 0, _) -> t_boolean();
+%% All type tests are guard BIF's and may be implemented in ways that
+%% cannot be expressed in a type spec, why they are kept in erl_bif_types.
 type(erlang, is_atom, 1, Xs) ->   
   Fun = fun (X) -> check_guard(X, fun (Y) -> t_is_atom(Y) end, t_atom()) end,
   strict(arg_types(erlang, is_atom, 1), Xs, Fun);
@@ -851,8 +578,6 @@ type(erlang, is_binary, 1, Xs) ->
 	    check_guard(X, fun (Y) -> t_is_binary(Y) end, t_binary())
 	end,
   strict(arg_types(erlang, is_binary, 1), Xs, Fun);
-type(erlang, is_bitstr, 1, Xs) ->	% XXX: TAKE OUT
-  type(erlang, is_bitstring, 1, Xs);
 type(erlang, is_bitstring, 1, Xs) ->
   Fun = fun (X) ->
 	    check_guard(X, fun (Y) -> t_is_bitstr(Y) end, t_bitstr())
@@ -863,8 +588,6 @@ type(erlang, is_boolean, 1, Xs) ->
 	    check_guard(X, fun (Y) -> t_is_boolean(Y) end, t_boolean())
 	end,
   strict(arg_types(erlang, is_boolean, 1), Xs, Fun);
-type(erlang, is_builtin, 3, Xs) ->
-  strict(arg_types(erlang, is_builtin, 3), Xs, fun (_) -> t_boolean() end);
 type(erlang, is_float, 1, Xs) ->
   Fun = fun (X) ->
 	    check_guard(X, fun (Y) -> t_is_float(Y) end, t_float())
@@ -909,9 +632,6 @@ type(erlang, is_pid, 1, Xs) ->
 type(erlang, is_port, 1, Xs) ->
   Fun = fun (X) -> check_guard(X, fun (Y) -> t_is_port(Y) end, t_port()) end,
   strict(arg_types(erlang, is_port, 1), Xs, Fun);
-type(erlang, is_process_alive, 1, Xs) ->
-  strict(arg_types(erlang, is_process_alive, 1), Xs,
-	 fun (_) -> t_boolean() end);
 type(erlang, is_record, 2, Xs) ->
   Fun = fun ([X, Y]) ->
 	    case t_is_tuple(X) of
@@ -1013,68 +733,12 @@ type(erlang, is_tuple, 1, Xs) ->
 	    check_guard(X, fun (Y) -> t_is_tuple(Y) end, t_tuple())
 	end,
   strict(arg_types(erlang, is_tuple, 1), Xs, Fun);
+%% Guard bif, needs to be here.
 type(erlang, length, 1, Xs) ->
   strict(arg_types(erlang, length, 1), Xs, fun (_) -> t_non_neg_fixnum() end);
-type(erlang, link, 1, Xs) ->
-  strict(arg_types(erlang, link, 1), Xs, fun (_) -> t_atom('true') end);
-type(erlang, list_to_atom, 1, Xs) ->
-  strict(arg_types(erlang, list_to_atom, 1), Xs, fun (_) -> t_atom() end);
-type(erlang, list_to_binary, 1, Xs) ->
-  strict(arg_types(erlang, list_to_binary, 1), Xs,
-	 fun (_) -> t_binary() end);
-type(erlang, list_to_bitstr, 1, Xs) ->
-  type(erlang, list_to_bitstring, 1, Xs);
-type(erlang, list_to_bitstring, 1, Xs) ->
-  strict(arg_types(erlang, list_to_bitstring, 1), Xs,
-	 fun (_) -> t_bitstr() end);
-type(erlang, list_to_existing_atom, 1, Xs) ->
-  strict(arg_types(erlang, list_to_existing_atom, 1), Xs,
-	 fun (_) -> t_atom() end);
-type(erlang, list_to_float, 1, Xs) ->
-  strict(arg_types(erlang, list_to_float, 1), Xs, fun (_) -> t_float() end);
-type(erlang, list_to_integer, 1, Xs) ->
-  strict(arg_types(erlang, list_to_integer, 1), Xs,
-	 fun (_) -> t_integer() end);
 type(erlang, list_to_integer, 2, Xs) ->
   strict(arg_types(erlang, list_to_integer, 2), Xs,
 	 fun (_) -> t_integer() end);
-type(erlang, list_to_pid, 1, Xs) ->
-  strict(arg_types(erlang, list_to_pid, 1), Xs, fun (_) -> t_pid() end);
-type(erlang, list_to_tuple, 1, Xs) ->
-  strict(arg_types(erlang, list_to_tuple, 1), Xs, fun (_) -> t_tuple() end);
-type(erlang, load_module, 2, Xs) ->
-  strict(arg_types(erlang, load_module, 2), Xs,
-	 fun ([Mod,_Bin]) -> t_code_load_return(Mod) end);
-type(erlang, load_nif, 2, Xs) ->
-  strict(arg_types(erlang, load_nif, 2), Xs,
-	 fun (_) ->
-	     Reason = t_atoms(['load_failed', 'bad_lib', 'load',
-			       'reload', 'upgrade', 'old_code']),
-	     RsnPair = t_tuple([Reason, t_string()]),
-	     t_sup(t_atom('ok'), t_tuple([t_atom('error'), RsnPair]))
-	 end);
-type(erlang, loaded, 0, _) ->
-  t_list(t_atom());
-type(erlang, localtime, 0, Xs) ->
-  type(erlang, universaltime, 0, Xs);    % same
-type(erlang, localtime_to_universaltime, 1, Xs) ->
-  type(erlang, universaltime_to_localtime, 1, Xs);    % same
-type(erlang, localtime_to_universaltime, 2, Xs) ->
-  strict(arg_types(erlang, localtime_to_universaltime, 2), Xs, % typecheck
-	 fun ([X,_]) -> type(erlang, localtime_to_universaltime, 1, [X]) end);
-type(erlang, make_fun, 3, Xs) ->
-  strict(arg_types(erlang, make_fun, 3), Xs, 
-	 fun ([_, _, Arity]) -> 
-	     case t_number_vals(Arity) of
-	       [N] ->
-		 case is_integer(N) andalso 0 =< N andalso N =< 255 of
-		   true -> t_fun(N, t_any());
-		   false -> t_none()
-		 end;
-	       _Other -> t_fun()
-	     end
-	 end);
-type(erlang, make_ref, 0, _) -> t_reference();
 type(erlang, make_tuple, 2, Xs) ->
   strict(arg_types(erlang, make_tuple, 2), Xs,
 	 fun ([Int, _]) ->
@@ -1091,297 +755,22 @@ type(erlang, make_tuple, 3, Xs) ->
 	       _Other -> t_tuple()
 	     end
 	 end);
-type(erlang, match_spec_test, 3, Xs) ->
-  strict(arg_types(erlang, match_spec_test, 3), Xs,
-	 fun (_) -> t_sup(t_tuple([t_atom('ok'),
-				   t_any(), % it can be any term
-				   t_list(t_atom('return_trace')),
-				   t_match_spec_test_errors()]),
-			  t_tuple([t_atom('error'),
-				   t_match_spec_test_errors()])) end);
-type(erlang, md5, 1, Xs) ->
-  strict(arg_types(erlang, md5, 1), Xs, fun (_) -> t_binary() end);
-type(erlang, md5_final, 1, Xs) ->
-  strict(arg_types(erlang, md5_final, 1), Xs, fun (_) -> t_binary() end);
-type(erlang, md5_init, 0, _) -> t_binary();
-type(erlang, md5_update, 2, Xs) ->
-  strict(arg_types(erlang, md5_update, 2), Xs, fun (_) -> t_binary() end);
 type(erlang, memory, 0, _) -> t_list(t_tuple([t_atom(), t_non_neg_fixnum()]));
-type(erlang, memory, 1, Xs) ->
-  strict(arg_types(erlang, memory, 1), Xs,
-	 fun ([Type]) ->
-	     case t_is_atom(Type) of
-	       true -> t_non_neg_fixnum();
-	       false ->
-	         case t_is_list(Type) of
-		   true -> t_list(t_tuple([t_atom(), t_non_neg_fixnum()]));
-		   false ->
-		     t_sup(t_non_neg_fixnum(),
-		   	   t_list(t_tuple([t_atom(), t_non_neg_fixnum()])))
-		 end
-	     end
-	 end);
-type(erlang, module_loaded, 1, Xs) ->
-  strict(arg_types(erlang, module_loaded, 1), Xs, fun (_) -> t_boolean() end);
-type(erlang, monitor, 2, Xs) ->
-  strict(arg_types(erlang, monitor, 2), Xs, fun (_) -> t_reference() end);
-type(erlang, monitor_node, 2, Xs) ->
-  strict(arg_types(erlang, monitor_node, 2), Xs,
-	 fun (_) -> t_atom('true') end);
-type(erlang, monitor_node, 3, Xs) ->
-  strict(arg_types(erlang, monitor_node, 3), Xs,
-	 fun (_) -> t_atom('true') end);
 type(erlang, nif_error, 1, _) ->
   t_any();   % this BIF and the next one are stubs for NIFs and never return
 type(erlang, nif_error, 2, Xs) ->
   strict(arg_types(erlang, nif_error, 2), Xs, fun (_) -> t_any() end);
+%% Guard bif, needs to be here.
 type(erlang, node, 0, _) -> t_node();
+%% Guard bif, needs to be here.
 type(erlang, node, 1, Xs) ->
   strict(arg_types(erlang, node, 1), Xs, fun (_) -> t_node() end);
 type(erlang, nodes, 0, _) -> t_list(t_node());
-type(erlang, nodes, 1, Xs) ->
-  strict(arg_types(erlang, nodes, 1), Xs, fun (_) -> t_list(t_node()) end);
-type(erlang, now, 0, _) ->
-  t_timestamp();
-type(erlang, open_port, 2, Xs) ->
-  strict(arg_types(erlang, open_port, 2), Xs, fun (_) -> t_port() end);
-type(erlang, phash, 2, Xs) ->
-  strict(arg_types(erlang, phash, 2), Xs, fun (_) -> t_pos_integer() end);
-type(erlang, phash2, 1, Xs) ->
-  strict(arg_types(erlang, phash2, 1), Xs, fun (_) -> t_non_neg_integer() end);
-type(erlang, phash2, 2, Xs) ->
-  strict(arg_types(erlang, phash2, 2), Xs, fun (_) -> t_non_neg_integer() end);
-type(erlang, pid_to_list, 1, Xs) ->
-  strict(arg_types(erlang, pid_to_list, 1), Xs, fun (_) -> t_string() end);
-type(erts_internal, port_call, 3, Xs) ->
-  strict(arg_types(erts_internal, port_call, 3), Xs,
-	fun (_) -> t_sup([t_atom('badarg'), t_reference(), t_tuple(['ok', t_any()])]) end);
-type(erts_internal, port_close, 1, Xs) ->
-  strict(arg_types(erts_internal, port_close, 1), Xs,
-	 fun (_) -> t_sup([t_atom('badarg'), t_atom('true'), t_reference()]) end);
-type(erts_internal, port_command, 3, Xs) ->
-  strict(arg_types(erts_internal, port_command, 3), Xs,
-	 fun (_) -> t_sup([t_atom('badarg'), t_boolean(), t_reference()]) end);
-type(erts_internal, port_connect, 2, Xs) ->
-  strict(arg_types(erts_internal, port_connect, 2), Xs,
-	 fun (_) -> t_sup([t_atom('badarg'), t_atom('true'), t_reference()]) end);
-type(erts_internal, port_control, 3, Xs) ->
-  strict(arg_types(erts_internal, port_control, 3), Xs,
-	 fun (_) -> t_sup([t_atom('badarg'), t_reference(), t_string(), t_binary()]) end);
-type(erts_internal, port_get_data, 1, Xs) ->
-  strict(arg_types(erts_internal, port_get_data, 1), Xs,
-	fun (_) -> t_sup([t_atom('badarg'), t_reference(), t_tuple(['ok', t_any()])]) end);
-type(erts_internal, port_info, 1, Xs) ->
-    [_, PossibleItems] =arg_types(erts_internal, port_info, 2),
-  strict(arg_types(erts_internal, port_info, 1), Xs,
-	 fun (_) -> t_sup([t_atom('badarg'), t_atom('undefined'), t_reference(), t_list(t_tuple([PossibleItems, t_any()]))]) end);
-type(erts_internal, port_info, 2, Xs) ->
-  strict(arg_types(erts_internal, port_info, 2), Xs,
-	 fun ([_Port, Item]) ->
-	     t_sup([t_atom('undefined'),
-		    t_atom('badarg'),
-		    t_reference(),
-		    case t_atom_vals(Item) of
-		     ['connected'] -> t_tuple([Item, t_pid()]);
-		     ['id'] -> t_tuple([Item, t_integer()]);
-		     ['input'] -> t_tuple([Item, t_integer()]);
-		     ['links'] -> t_tuple([Item, t_list(t_pid())]);
-		     ['name'] -> t_tuple([Item, t_string()]);
-		     ['output'] -> t_tuple([Item, t_integer()]);
-		     ['registered_name'] -> t_sup(t_tuple([Item, t_atom()]), t_nil());
-		     ['monitors'] -> t_tuple([Item, t_list(t_tuple([t_atom('process'), t_pid()]))]);
-		     ['memory'] -> t_tuple([Item, t_integer()]);
-		     ['queue_size'] -> t_tuple([Item, t_integer()]);
-		     ['locking'] -> t_tuple([Item, t_sup([t_atom('false'), t_atom('port_level'), t_atom('driver_level')])]);
-		     ['parallelism'] -> t_tuple([Item, t_boolean()]);
-		     List when is_list(List) ->
-		       t_tuple([t_sup([t_atom(A) || A <- List]),
-				t_sup([t_atom(), t_integer(),
-				       t_pid(), t_list(t_pid()),
-				       t_string()])]);
-		     unknown ->
-		       [_, PosItem] = arg_types(erts_internal, port_info, 2),
-		       t_tuple([PosItem,
-				t_sup([t_atom(), t_integer(),
-				       t_pid(), t_list(t_pid()),
-				       t_string()])])		       
-		   end])
-	 end);
-type(erlang, port_to_list, 1, Xs) ->
-  strict(arg_types(erlang, port_to_list, 1), Xs, fun (_) -> t_string() end);
-type(erlang, ports, 0, _) -> t_list(t_port());
-type(erts_internal, port_set_data, 2, Xs) ->
-  strict(arg_types(erts_internal, port_set_data, 2), Xs,
-	 fun (_) -> t_sup([t_atom('badarg'), t_atom('true'), t_reference()]) end);
-type(erlang, pre_loaded, 0, _) -> t_list(t_atom());
-type(erlang, process_display, 2, _) -> t_atom('true');
-type(erlang, process_flag, 2, Xs) ->
-  T_process_flag_returns = t_sup([t_boolean(), t_atom(), t_non_neg_integer()]),
-  strict(arg_types(erlang, process_flag, 2), Xs,
-	 fun ([Flag, _Option]) ->
-	     case t_is_atom(Flag) of
-	       true ->
-		 case t_atom_vals(Flag) of
-		   ['error_handler'] -> t_atom();
-		   ['min_heap_size'] -> t_non_neg_integer();
-                   ['min_bin_vheap_size'] -> t_non_neg_integer();
-		   ['scheduler'] -> t_non_neg_integer();
-		   ['monitor_nodes'] -> t_boolean();
-		   ['priority'] -> t_process_priority_level();
-		   ['save_calls'] -> t_non_neg_integer();
-		   ['trap_exit'] -> t_boolean();
-                   ['sensitive'] -> t_boolean();
-		   List when is_list(List) ->
-		     T_process_flag_returns;
-		   unknown ->
-		     T_process_flag_returns
-		 end;
-	       false -> % XXX: over-approximation if Flag is tuple
-		 T_process_flag_returns
-	     end
-	 end);
-type(erlang, process_flag, 3, Xs) ->
-  strict(arg_types(erlang, process_flag, 3), Xs,
-	 fun (_) -> t_non_neg_integer() end);
-type(erlang, process_info, 1, Xs) ->
-  strict(arg_types(erlang, process_info, 1), Xs,
-	 fun (_) ->
-	     t_sup(t_list(t_tuple([t_pinfo(), t_any()])),
-		   t_atom('undefined'))
-	 end);
-type(erlang, process_info, 2, Xs) ->
-  %% we define all normal return values: the return when the process exists
-  %% t_nil() is the return for 'registered_name'; perhaps for more
-  T_process_info_2_normal_returns =
-    t_sup([t_tuple([t_pinfo_item(), t_any()]), t_nil()]),
-  strict(arg_types(erlang, process_info, 2), Xs,
-	 fun ([_Pid, InfoItem]) ->
-	     Ret = case t_is_atom(InfoItem) of
-		     true ->
-		       case t_atom_vals(InfoItem) of
-			 ['backtrace'] -> t_tuple([InfoItem, t_binary()]);
-			 ['current_function'] -> t_tuple([InfoItem, t_mfa()]);
-			 ['dictionary'] -> t_tuple([InfoItem, t_list()]);
-			 ['error_handler'] -> t_tuple([InfoItem, t_atom()]);
-			 ['garbage_collection'] ->
-			   t_tuple([InfoItem, t_list()]);
-			 ['group_leader'] -> t_tuple([InfoItem, t_pid()]);
-			 ['heap_size'] ->
-			   t_tuple([InfoItem, t_non_neg_integer()]);
-			 ['initial_call'] -> t_tuple([InfoItem, t_mfa()]);
-			 ['last_calls'] ->
-			   t_tuple([InfoItem,
-				    t_sup(t_atom('false'), t_list())]);
-			 ['links'] -> t_tuple([InfoItem, t_list(t_pid())]);
-			 ['memory'] ->
-			   t_tuple([InfoItem, t_non_neg_integer()]);
-			 ['message_binary'] -> t_tuple([InfoItem,  t_list()]);
-			 ['message_queue_len'] ->
-			   t_tuple([InfoItem, t_non_neg_integer()]);
-			 ['messages'] -> t_tuple([InfoItem, t_list()]);
-			 ['monitored_by'] ->
-			   t_tuple([InfoItem,  t_list(t_pid())]);
-			 ['monitors'] ->
-			   t_tuple([InfoItem, 
-				    t_list(t_sup(t_tuple([t_atom('process'),
-							  t_pid()]),
-						 t_tuple([t_atom('process'),
-							  t_tuple([t_atom(),
-								   t_atom()])])))]);
-			 ['priority'] ->
-			   t_tuple([InfoItem, t_process_priority_level()]);
-			 ['reductions'] ->
-			   t_tuple([InfoItem, t_non_neg_integer()]);
-			 ['registered_name'] ->
-			   t_sup(t_tuple([InfoItem, t_atom()]), t_nil());
-			 ['sequential_trace_token'] ->
-			   t_tuple([InfoItem, t_any()]); %% Underspecified
-			 ['stack_size'] ->
-			   t_tuple([InfoItem, t_non_neg_integer()]);
-			 ['status'] ->
-			   t_tuple([InfoItem, t_process_status()]);
-			 ['suspending'] ->
-			   t_tuple([InfoItem,
-				    t_list(t_tuple([t_pid(),
-						    t_non_neg_integer(),
-						    t_non_neg_integer()]))]);
-			 ['total_heap_size'] ->
-			   t_tuple([InfoItem, t_non_neg_integer()]);
-			 ['trap_exit'] ->
-			   t_tuple([InfoItem, t_boolean()]);
-			 List when is_list(List) ->
-			   T_process_info_2_normal_returns;
-			 unknown ->
-			   T_process_info_2_normal_returns
-		       end;
-		     false ->
-		       case t_is_list(InfoItem) of
-			 true ->
-			   t_list(t_tuple([t_pinfo_item(), t_any()]));
-			 false ->
-			   t_sup(T_process_info_2_normal_returns,
-				 t_list(t_tuple([t_pinfo_item(), t_any()])))
-		       end
-		   end,
-	       t_sup([Ret, t_atom('undefined')])
-	 end);
-type(erlang, processes, 0, _) -> t_list(t_pid());
-type(erlang, purge_module, 1, Xs) ->
-  strict(arg_types(erlang, purge_module, 1), Xs,
-	 fun (_) -> t_atom('true') end);
-type(erlang, put, 2, Xs) ->
-  strict(arg_types(erlang, put, 2), Xs, fun (_) -> t_any() end);
-type(erlang, raise, 3, _) -> t_none();
-type(erlang, read_timer, 1, Xs) ->
-  strict(arg_types(erlang, read_timer, 1), Xs,
-	 fun (_) -> t_sup(t_non_neg_integer(), t_atom('false')) end);
-type(erlang, ref_to_list, 1, Xs) ->
-  strict(arg_types(erlang, ref_to_list, 1), Xs, fun (_) -> t_string() end);
-type(erlang, register, 2, Xs) ->
-  strict(arg_types(erlang, register, 2), Xs, fun (_) -> t_atom('true') end);
-type(erlang, registered, 0, _) -> t_list(t_atom());
-type(erlang, resume_process, 1, Xs) ->
-  strict(arg_types(erlang, resume_process, 1), Xs,
-	 fun (_) -> t_any() end); %% TODO: overapproximation -- fix this
+%% Guard bif, needs to be here.
 type(erlang, round, 1, Xs) ->
   strict(arg_types(erlang, round, 1), Xs, fun (_) -> t_integer() end);
-type(erlang, posixtime_to_universaltime, 1, Xs) ->
-  strict(arg_types(erlang, posixtime_to_universaltime, 1), Xs, 
-	 fun(_) ->  t_tuple([t_date(), t_time()]) end);
+%% Guard bif, needs to be here.
 type(erlang, self, 0, _) -> t_pid();
-type(erlang, send, 2, Xs) -> type(erlang, '!', 2, Xs);  % alias
-type(erlang, send, 3, Xs) ->
-  strict(arg_types(erlang, send, 3), Xs,
-	 fun (_) -> t_sup(t_atom('ok'), t_sendoptions()) end);
-type(erlang, send_after, 3, Xs) ->
-  strict(arg_types(erlang, send_after, 3), Xs, fun (_) -> t_reference() end);
-type(erlang, seq_trace, 2, Xs) ->
-  strict(arg_types(erlang, seq_trace, 2), Xs,
-	 fun (_) -> t_sup(t_seq_trace_info_returns(), t_tuple(5)) end);
-type(erlang, seq_trace_info, 1, Xs) ->
-  strict(arg_types(erlang, seq_trace_info, 1), Xs,
-	 fun ([Item]) ->
-	     case t_atom_vals(Item) of
-	       ['label'] ->
-		 t_sup(t_tuple([Item, t_non_neg_integer()]), t_nil());
-	       ['serial'] -> 
-		 t_sup(t_tuple([Item, t_tuple([t_non_neg_integer(),
-					       t_non_neg_integer()])]),
-		       t_nil());
-	       ['send'] -> t_tuple([Item, t_boolean()]);
-	       ['receive'] -> t_tuple([Item, t_boolean()]);
-	       ['print'] -> t_tuple([Item, t_boolean()]);
-	       ['timestamp'] -> t_tuple([Item, t_boolean()]);
-	       List when is_list(List) ->
-		 t_seq_trace_info_returns();
-	       unknown ->
-		 t_seq_trace_info_returns()
-	     end
-	 end);
-type(erlang, seq_trace_print, 1, Xs) ->
-  strict(arg_types(erlang, seq_trace_print, 1), Xs, fun (_) -> t_boolean() end);
-type(erlang, seq_trace_print, 2, Xs) ->
-  strict(arg_types(erlang, seq_trace_print, 2), Xs, fun (_) -> t_boolean() end);
 type(erlang, set_cookie, 2, Xs) ->
   strict(arg_types(erlang, set_cookie, 2), Xs, fun (_) -> t_atom('true') end);
 type(erlang, setelement, 3, Xs) ->
@@ -1415,144 +804,22 @@ type(erlang, setelement, 3, Xs) ->
 		 t_sup([type(erlang, setelement, 3, [X1, Y, X3]) || Y <- Ts])
 	     end
 	 end);
-type(erlang, setnode, 2, Xs) ->
-  strict(arg_types(erlang, setnode, 2), Xs, fun (_) -> t_atom('true') end);
-type(erlang, setnode, 3, Xs) ->
-  strict(arg_types(erlang, setnode, 3), Xs, fun (_) -> t_atom('true') end);
+%% Guard bif, needs to be here.
 type(erlang, size, 1, Xs) ->
   strict(arg_types(erlang, size, 1), Xs, fun (_) -> t_non_neg_integer() end);
 type(erlang, spawn, 1, Xs) ->
   strict(arg_types(erlang, spawn, 1), Xs, fun (_) -> t_pid() end);
 type(erlang, spawn, 2, Xs) ->
   strict(arg_types(erlang, spawn, 2), Xs, fun (_) -> t_pid() end);
-type(erlang, spawn, 3, Xs) ->
-  strict(arg_types(erlang, spawn, 3), Xs, fun (_) -> t_pid() end);
 type(erlang, spawn, 4, Xs) ->
   strict(arg_types(erlang, spawn, 4), Xs, fun (_) -> t_pid() end);
 type(erlang, spawn_link, 1, Xs) -> type(erlang, spawn, 1, Xs);  % same
 type(erlang, spawn_link, 2, Xs) -> type(erlang, spawn, 2, Xs);  % same
-type(erlang, spawn_link, 3, Xs) -> type(erlang, spawn, 3, Xs);  % same
 type(erlang, spawn_link, 4, Xs) -> type(erlang, spawn, 4, Xs);  % same
-type(erlang, spawn_opt, 1, Xs) ->
-  strict(arg_types(erlang, spawn_opt, 1), Xs, 
-	 fun ([Tuple]) ->
-	     Fun = fun (TS) ->
-		       [_, _, _, List] = t_tuple_args(TS),
-		       t_spawn_opt_return(List)
-		   end,
-	     t_sup([Fun(TS) || TS <- t_tuple_subtypes(Tuple)])
-	 end);
-type(erlang, spawn_opt, 2, Xs) -> 
-  strict(arg_types(erlang, spawn_opt, 2), Xs, 
-	 fun ([_, List]) -> t_spawn_opt_return(List) end);
-type(erlang, spawn_opt, 3, Xs) -> 
-  strict(arg_types(erlang, spawn_opt, 3), Xs, 
-	 fun ([_, _, List]) -> t_spawn_opt_return(List) end);
-type(erlang, spawn_opt, 4, Xs) -> 
-  strict(arg_types(erlang, spawn_opt, 4), Xs, 
-	 fun ([_, _, _, List]) -> t_spawn_opt_return(List) end);
-type(erlang, split_binary, 2, Xs) ->
-  strict(arg_types(erlang, split_binary, 2), Xs,
-	 fun (_) -> t_tuple([t_binary(), t_binary()]) end);
-type(erlang, start_timer, 3, Xs) ->
-  strict(arg_types(erlang, start_timer, 3), Xs, fun (_) -> t_reference() end);
-type(erlang, statistics, 1, Xs) ->
-  strict(arg_types(erlang, statistics, 1), Xs,
-	 fun ([Type]) ->
-	     T_statistics_1 = t_sup([t_non_neg_integer(),
-				     t_tuple([t_non_neg_integer(),
-					      t_non_neg_integer()]),
-				     %% When called with the argument 'io'.
-				     t_tuple([t_tuple([t_atom('input'),
-						       t_non_neg_integer()]),
-					      t_tuple([t_atom('output'),
-						       t_non_neg_integer()])]),
-				     t_tuple([t_non_neg_integer(),
-					      t_non_neg_integer(),
-					      t_non_neg_integer()])]),
-	     case t_atom_vals(Type) of
-	       ['context_switches'] ->
-		 t_tuple([t_non_neg_integer(), t_integer(0)]);
-	       ['exact_reductions'] ->
-		 t_tuple([t_non_neg_integer(), t_non_neg_integer()]);
-	       ['garbage_collection'] ->
-		 t_tuple([t_non_neg_integer(),
-			  t_non_neg_integer(),
-			  t_integer(0)]);
-	       ['io'] ->
-		 t_tuple([t_tuple([t_atom('input'),  t_non_neg_integer()]),
-			  t_tuple([t_atom('output'), t_non_neg_integer()])]);
-	       ['reductions'] ->
-		 t_tuple([t_non_neg_integer(), t_non_neg_integer()]);
-	       ['run_queue'] ->
-		 t_non_neg_integer();
-	       ['runtime'] ->
-		 t_tuple([t_non_neg_integer(), t_integer(0)]);
-	       ['wall_clock'] ->
-		 t_tuple([t_non_neg_integer(), t_integer(0)]);
-	       List when is_list(List) ->
-		 T_statistics_1;
-	       unknown ->
-		 T_statistics_1
-	     end
-	 end);
 type(erlang, subtract, 2, Xs) -> type(erlang, '--', 2, Xs); % alias
 type(erlang, suspend_process, 1, Xs) ->
   strict(arg_types(erlang, suspend_process, 1), Xs,
 	 fun (_) -> t_atom('true') end);
-type(erlang, suspend_process, 2, Xs) ->
-  strict(arg_types(erlang, suspend_process, 2), Xs,
-	 fun (_) -> t_boolean() end);
-type(erlang, system_flag, 2, Xs) ->
-  strict(arg_types(erlang, system_flag, 2), Xs,
-	 fun ([Flag,_Value]) ->
-	     %% this provides an overapproximation of all return values 
-	     T_system_flag_2 = t_sup([t_boolean(),
-				      t_integer(),
-				      t_sequential_tracer(),
-				      t_system_cpu_topology(),
-				      t_system_multi_scheduling()]),
-	     case t_is_atom(Flag) of
-	       true ->
-	         case t_atom_vals(Flag) of
-		   ['backtrace_depth'] ->
-		     t_non_neg_fixnum();
-		   ['cpu_topology'] ->
-		     t_system_cpu_topology();
-		   ['debug_flags'] ->
-		     t_atom('true');
-		   ['display_items'] ->
-		     t_non_neg_fixnum();
-		   ['fullsweep_after'] ->
-		     t_non_neg_fixnum();
-		   ['min_heap_size'] ->
-		     t_non_neg_fixnum();
-		   ['min_bin_vheap_size'] ->
-		     t_non_neg_fixnum();
-		   ['multi_scheduling'] ->
-		     t_system_multi_scheduling();
-		   ['schedulers_online'] ->
-		     t_pos_fixnum();
-		   ['scheduler_bind_type'] ->
-		     t_scheduler_bind_type_results();
-		   ['sequential_tracer'] ->
-		     t_sequential_tracer();
-		   ['trace_control_word'] ->
-		     t_integer();
-		   List when is_list(List) ->
-		     T_system_flag_2;
-		   unknown ->
-		     T_system_flag_2
-		 end;
-	       false ->
-	       	 case t_is_integer(Flag) of	% SHOULD BE: t_is_fixnum
-		   true ->
-		     t_atom('true');
-		   false ->
-		     T_system_flag_2
-		 end
-	     end
-	 end);
 type(erlang, system_info, 1, Xs) ->
   strict(arg_types(erlang, system_info, 1), Xs,
 	 fun ([Type]) ->
@@ -1572,12 +839,8 @@ type(erlang, system_info, 1, Xs) ->
 			      t_list(t_tuple([t_atom(),
 					      t_list(t_tuple([t_atom(),
 							      t_any()]))]))]);
-		   ['build_type'] ->
-                     t_system_build_type_return();
 		   ['break_ignored'] ->
 		     t_boolean();
-                   ['c_compiler_used'] ->
-                     t_tuple([t_atom(), t_any()]);
 		   ['cpu_topology'] ->
 		     t_system_cpu_topology();
 		   ['compat_rel'] ->
@@ -1589,9 +852,7 @@ type(erlang, system_info, 1, Xs) ->
 		   ['dist'] ->
 		     t_binary();
 		   ['dist_ctrl'] ->
-		     t_list(t_tuple([t_atom(), t_sup([t_pid(), t_port])]));
-                   ['driver_version'] ->
-                     t_string();
+		     t_list(t_tuple([t_atom(), t_sup([t_pid(), t_port()])]));
 		   %% elib_malloc is intentionally not included,
 		   %% because it scheduled for removal in R15.
 		   ['endian'] ->
@@ -1600,14 +861,10 @@ type(erlang, system_info, 1, Xs) ->
 		     t_tuple([t_atom('fullsweep_after'), t_non_neg_integer()]);
 		   ['garbage_collection'] ->
 		     t_list();
-		   ['global_heaps_size'] ->
-		     t_non_neg_integer();
 		   ['heap_sizes'] ->
 		     t_list(t_integer());
 		   ['heap_type'] ->
-		     t_sup([t_atom('private'),
-                            t_atom('shared'),
-                            t_atom('hybrid')]);
+		     t_atom('private');
 		   ['hipe_architecture'] ->
 		     t_atoms(['amd64', 'arm', 'powerpc', 'ppc64',
 			      'undefined', 'ultrasparc', 'x86']);
@@ -1615,27 +872,18 @@ type(erlang, system_info, 1, Xs) ->
 		     t_binary();
 		   ['internal_cpu_topology'] -> %% Undocumented internal feature
 		     t_internal_cpu_topology();
-                   ['kernel_poll'] ->
-                     t_boolean();
 		   ['loaded'] ->
 		     t_binary();
 		   ['logical_processors'] ->
 		     t_non_neg_fixnum();
 		   ['machine'] ->
 		     t_string();
-                   ['min_heap_size'] ->
-                     t_tuple([t_atom('min_heap_size'),
-                              t_non_neg_integer()]);
-                   ['min_bin_vheap_size'] ->
-                     t_tuple([t_atom('min_bin_vheap_size'),
-                              t_non_neg_integer()]);
 		   ['multi_scheduling'] ->
 		     t_system_multi_scheduling();
 		   ['multi_scheduling_blockers'] ->
 		     t_list(t_pid());
 		   ['os_type'] ->
 		     t_tuple([t_sup([t_atom('unix'),
-				     t_atom('vxworks'),
 				     t_atom('win32')]),
 			      t_atom()]);
 		   ['os_version'] ->
@@ -1680,8 +928,6 @@ type(erlang, system_info, 1, Xs) ->
 		     t_non_neg_fixnum();
 		   ['trace_control_word'] ->
 		     t_integer();
-                   ['update_cpu_info'] ->
-                     t_sup([t_atom('changed'), t_atom('unchanged')]);
 		   ['version'] ->
 		     t_string();
 		   ['wordsize'] ->
@@ -1695,56 +941,13 @@ type(erlang, system_info, 1, Xs) ->
 		 t_any() %% overapproximation as the return value might change
 	     end
 	 end);
-type(erlang, system_monitor, 0, Xs) ->
-  strict(arg_types(erlang, system_monitor, 0), Xs,
-	 fun (_) -> t_system_monitor_settings() end);
-type(erlang, system_monitor, 1, Xs) ->
-  strict(arg_types(erlang, system_monitor, 1), Xs,
-	 fun (_) -> t_system_monitor_settings() end);
-type(erlang, system_monitor, 2, Xs) ->
-  strict(arg_types(erlang, system_monitor, 2), Xs,
-	 fun (_) -> t_system_monitor_settings() end);
-type(erlang, system_profile, 0, _) ->
-  t_system_profile_return();
-type(erlang, system_profile, 2, Xs) ->
-  strict(arg_types(erlang, system_profile, 2), Xs,
-	 fun (_) -> t_system_profile_return() end); 
-type(erlang, term_to_binary, 1, Xs) ->
-  strict(arg_types(erlang, term_to_binary, 1), Xs, fun (_) -> t_binary() end);
-type(erlang, term_to_binary, 2, Xs) ->
-  strict(arg_types(erlang, term_to_binary, 2), Xs, fun (_) -> t_binary() end);
-type(erlang, time, 0, _) ->
-  t_tuple([t_non_neg_integer(), t_non_neg_integer(), t_non_neg_integer()]);
+%% Guard bif, needs to be here.
 type(erlang, tl, 1, Xs) ->
   strict(arg_types(erlang, tl, 1), Xs, fun ([X]) -> t_cons_tl(X) end);
-type(erlang, trace, 3, Xs) ->
-  strict(arg_types(erlang, trace, 3), Xs, fun (_) -> t_integer() end);
-type(erlang, trace_delivered, 1, Xs) ->
-  strict(arg_types(erlang, trace_delivered, 1), Xs,
-	 fun (_) -> t_reference() end);
-type(erlang, trace_info, 2, Xs) ->
-  strict(arg_types(erlang, trace_info, 2), Xs,
-	 fun (_) ->
-	     t_tuple([t_atom(),
-		      t_sup([%% the following is info about a PID
-			     t_list(t_atom()), t_pid(), t_port(),
-			     %% the following is info about a func
-			     t_atom('global'), t_atom('local'),
-			     t_atom('false'), t_atom('true'),
-			     t_list(), t_pid(), t_port(),
-			     t_integer(),
-			     t_list(t_tuple([t_atom(), t_any()])),
-			     %% and this is the 'not found' value
-			     t_atom('undefined')])])
-	 end);
-type(erlang, trace_pattern, 2, Xs) ->
-  strict(arg_types(erlang, trace_pattern, 2), Xs,
-	 fun (_) -> t_non_neg_fixnum() end); %% num of MFAs that match pattern
-type(erlang, trace_pattern, 3, Xs) ->
-  strict(arg_types(erlang, trace_pattern, 3), Xs,
-	 fun (_) -> t_non_neg_fixnum() end); %% num of MFAs that match pattern
+%% Guard bif, needs to be here.
 type(erlang, trunc, 1, Xs) ->
   strict(arg_types(erlang, trunc, 1), Xs, fun (_) -> t_integer() end);
+%% Guard bif, needs to be here.
 type(erlang, tuple_size, 1, Xs) ->
   strict(arg_types(erlang, tuple_size, 1), Xs, fun (_) -> t_non_neg_integer() end);
 type(erlang, tuple_to_list, 1, Xs) ->
@@ -1767,266 +970,10 @@ type(erlang, tuple_to_list, 1, Xs) ->
 		 end
 	     end
 	 end);
-type(erlang, universaltime, 0, _) ->
-  t_tuple([t_date(), t_time()]);
-type(erlang, universaltime_to_localtime, 1, Xs) ->
-  strict(arg_types(erlang, universaltime_to_localtime, 1), Xs,
-	 fun ([T]) -> T end);
-type(erlang, universaltime_to_posixtime, 1, Xs) ->
-  strict(arg_types(erlang, universaltime_to_posixtime,1), Xs,
-	 fun(_) -> t_integer() end);
-type(erlang, unlink, 1, Xs) ->
-  strict(arg_types(erlang, unlink, 1), Xs, fun (_) -> t_atom('true') end);
-type(erlang, unregister, 1, Xs) ->
-  strict(arg_types(erlang, unregister, 1), Xs, fun (_) -> t_atom('true') end);
-type(erlang, whereis, 1, Xs) ->
-  strict(arg_types(erlang, whereis, 1), Xs,
-	 fun (_) -> t_sup([t_pid(), t_port(), t_atom('undefined')]) end);
 type(erlang, yield, 0, _) -> t_atom('true');
-%%-- erl_prim_loader ----------------------------------------------------------
-type(erl_prim_loader, get_file, 1, Xs) ->
-  strict(arg_types(erl_prim_loader, get_file, 1), Xs,
-	 fun (_) ->
-	     t_sup(t_tuple([t_atom('ok'), t_binary(), t_string()]),
-		   t_atom('error'))
-	 end);
-type(erl_prim_loader, get_path, 0, _) ->
-  t_tuple([t_atom('ok'), t_list(t_string())]);
-type(erl_prim_loader, set_path, 1, Xs) ->
-  strict(arg_types(erl_prim_loader, set_path, 1), Xs,
-	 fun (_) -> t_atom('ok') end);
-%%-- error_logger -------------------------------------------------------------
-type(error_logger, warning_map, 0, _) ->
-  t_sup([t_atom('info'), t_atom('warning'), t_atom('error')]);
-%%-- erts_debug ---------------------------------------------------------------
-type(erts_debug, breakpoint, 2, Xs) ->
-  strict(arg_types(erts_debug, breakpoint, 2), Xs, fun (_) -> t_fixnum() end);
-type(erts_debug, disassemble, 1, Xs) ->
-  strict(arg_types(erts_debug, disassemble, 1), Xs,
-	 fun (_) -> t_sup([t_atom('false'),
-			   t_atom('undef'),
-			   t_tuple([t_integer(), t_binary(), t_mfa()])]) end);
-type(erts_debug, display, 1, _) ->
-  t_string();
-type(erts_debug, dist_ext_to_term, 2, Xs) ->
-  strict(arg_types(erts_debug, dist_ext_to_term, 2), Xs,
-	 fun (_) -> t_any() end);
-type(erts_debug, dump_monitors, 1, Xs) ->
-  strict(arg_types(erts_debug, dump_monitors, 1), Xs,
-	 fun(_) -> t_atom('true') end);
-type(erts_debug, dump_links, 1, Xs) ->
-  strict(arg_types(erts_debug, dump_links, 1), Xs,
-	 fun(_) -> t_atom('true') end);
-type(erts_debug, flat_size, 1, Xs) ->
-  strict(arg_types(erts_debug, flat_size, 1), Xs, fun (_) -> t_integer() end);
-type(erts_debug, get_internal_state, 1, _) ->
-  t_any();
-type(erts_debug, instructions, 0, _) ->
-  t_list(t_list(t_byte()));
-type(erts_debug, lock_counters, 1, Xs) ->
-  strict(arg_types(erts_debug, lock_counters, 1), Xs,
-	 fun ([Arg]) ->
-	     case t_is_atom(Arg) of
-	       true ->
-		 case t_atom_vals(Arg) of
-		   ['enabled'] -> t_boolean();
-		   ['info'] -> t_any();
-		   ['clear'] -> t_atom(ok);
-		   _ -> t_sup([t_boolean(), t_any(), t_atom('ok')])
-		 end;
-	       false ->
-		 case t_is_tuple(Arg) of
-		   true -> t_boolean();
-		   false -> t_sup([t_boolean(), t_any(), t_atom('ok')])
-		 end
-	     end
-	 end);
-type(erts_debug, same, 2, Xs) ->
-  strict(arg_types(erts_debug, same, 2), Xs, fun (_) -> t_boolean() end);
-type(erts_debug, set_internal_state, 2, _) ->
-  t_any();
 %%-- ets ----------------------------------------------------------------------
-type(ets, all, 0, _) ->
-  t_list(t_tab());
-type(ets, delete, 1, Xs) ->
-  strict(arg_types(ets, delete, 1), Xs, fun (_) -> t_atom('true') end);
-type(ets, delete, 2, Xs) ->
-  strict(arg_types(ets, delete, 2), Xs, fun (_) -> t_atom('true') end);
-type(ets, delete_all_objects, 1, Xs) ->
-  strict(arg_types(ets, delete_all_objects, 1), Xs,
-	 fun (_) -> t_atom('true') end);
-type(ets, delete_object, 2, Xs) ->
-  strict(arg_types(ets, delete_object, 2), Xs, fun (_) -> t_atom('true') end);
-type(ets, first, 1, Xs) ->
-  strict(arg_types(ets, first, 1), Xs, fun (_) -> t_any() end);
-type(ets, give_away, 3, Xs) ->
-  strict(arg_types(ets, give_away, 3), Xs, fun (_) -> t_atom('true') end);
-type(ets, info, 1, Xs) ->
-  strict(arg_types(ets, info, 1), Xs,
-	 fun (_) ->
-	     t_sup(t_list(t_tuple([t_ets_info_items(), t_any()])),
-		   t_atom('undefined'))
-	 end);
-type(ets, info, 2, Xs) ->
-  strict(arg_types(ets, info, 2), Xs, fun (_) -> t_any() end);
-type(ets, insert, 2, Xs) ->
-  strict(arg_types(ets, insert, 2), Xs, fun (_) -> t_atom('true') end);
-type(ets, insert_new, 2, Xs) ->
-  strict(arg_types(ets, insert_new, 2), Xs, fun (_) -> t_boolean() end);
-type(ets, is_compiled_ms, 1, Xs) ->
-  strict(arg_types(ets, is_compiled_ms, 1), Xs, fun (_) -> t_boolean() end);
-type(ets, last, 1, Xs) ->
-  type(ets, first, 1, Xs);
-type(ets, lookup, 2, Xs) ->
-  strict(arg_types(ets, lookup, 2), Xs, fun (_) -> t_list(t_tuple()) end);
-type(ets, lookup_element, 3, Xs) ->
-  strict(arg_types(ets, lookup_element, 3), Xs, fun (_) -> t_any() end);
-type(ets, match, 1, Xs) ->
-  strict(arg_types(ets, match, 1), Xs, fun (_) -> t_matchres() end);
-type(ets, match, 2, Xs) ->
-  strict(arg_types(ets, match, 2), Xs, fun (_) -> t_list() end);
-type(ets, match, 3, Xs) ->
-  strict(arg_types(ets, match, 3), Xs, fun (_) -> t_matchres() end);
-type(ets, match_object, 1, Xs) -> type(ets, match, 1, Xs);
-type(ets, match_object, 2, Xs) -> type(ets, match, 2, Xs);
-type(ets, match_object, 3, Xs) -> type(ets, match, 3, Xs);
-type(ets, match_spec_compile, 1, Xs) ->
-  strict(arg_types(ets, match_spec_compile, 1), Xs, fun (_) -> t_any() end);
-type(ets, match_spec_run_r, 3, Xs) ->
-  strict(arg_types(ets, match_spec_run_r, 3), Xs, fun (_) -> t_list() end);
-type(ets, member, 2, Xs) ->
-  strict(arg_types(ets, member, 2), Xs, fun (_) -> t_boolean() end);
-type(ets, new, 2, Xs) ->
-  strict(arg_types(ets, new, 2), Xs, fun (_) -> t_tab() end);
-type(ets, next, 2, Xs) ->
-  strict(arg_types(ets, next, 2), Xs,
-	 %% t_any below stands for:  term() | '$end_of_table'
-	 fun (_) -> t_any() end);
-type(ets, prev, 2, Xs) -> type(ets, next, 2, Xs);
 type(ets, rename, 2, Xs) ->
   strict(arg_types(ets, rename, 2), Xs, fun ([_, Name]) -> Name end);
-type(ets, safe_fixtable, 2, Xs) ->
-  strict(arg_types(ets, safe_fixtable, 2), Xs, fun (_) -> t_atom('true') end);
-type(ets, select, 1, Xs) ->
-  strict(arg_types(ets, select, 1), Xs, fun (_) -> t_matchres() end);
-type(ets, select, 2, Xs) ->
-  strict(arg_types(ets, select, 2), Xs, fun (_) -> t_list() end);
-type(ets, select, 3, Xs) ->
-  strict(arg_types(ets, select, 3), Xs, fun (_) -> t_matchres() end);
-type(ets, select_count, 2, Xs) ->
-  strict(arg_types(ets, select_count, 2), Xs,
-	 fun (_) -> t_non_neg_fixnum() end);
-type(ets, select_delete, 2, Xs) ->
-  strict(arg_types(ets, select_delete, 2), Xs,
-	 fun (_) -> t_non_neg_fixnum() end);
-type(ets, select_reverse, 1, Xs) -> type(ets, select, 1, Xs);
-type(ets, select_reverse, 2, Xs) -> type(ets, select, 2, Xs);
-type(ets, select_reverse, 3, Xs) -> type(ets, select, 3, Xs);
-type(ets, setopts, 2, Xs) ->
-  strict(arg_types(ets, setopts, 2), Xs, fun (_) -> t_atom('true') end);
-type(ets, slot, 2, Xs) ->
-  strict(arg_types(ets, slot, 2), Xs,
-	 fun (_) -> t_sup(t_list(t_tuple()), t_atom('$end_of_table')) end);
-type(ets, update_counter, 3, Xs) ->
-  strict(arg_types(ets, update_counter, 3), Xs,
-	 fun ([_, _, Op]) ->
-	     case t_is_integer(Op) of
-	       true -> t_integer();
-	       false ->
-		 case t_is_tuple(Op) of
-		   true -> t_integer();
-		   false ->
-		     case t_is_list(Op) of
-		       true -> t_list(t_integer());
-		       false ->
-			 case t_is_nil(Op) of
-			   true -> t_nil();
-			   false -> t_sup([t_integer(), t_list(t_integer())])
-			 end
-		     end
-		 end
-	     end
-	 end);
-type(ets, update_element, 3, Xs) ->
-  strict(arg_types(ets, update_element, 3), Xs, fun (_) -> t_boolean() end);
-%%-- file ---------------------------------------------------------------------
-type(file, native_name_encoding, 0, _) ->
-  t_file_encoding();
-%%-- prim_file ----------------------------------------------------------------
-type(prim_file, internal_name2native, 1, Xs) ->
-  strict(arg_types(prim_file, internal_name2native, 1), Xs,  
-	 fun (_) -> t_binary() end);
-type(prim_file, internal_native2name, 1, Xs) ->
-  strict(arg_types(prim_file, internal_native2name, 1), Xs,  
-	 fun (_) -> t_prim_file_name() end);
-type(prim_file, internal_normalize_utf8, 1, Xs) ->
-  strict(arg_types(prim_file, internal_normalize_utf8, 1), Xs,  
-	 fun (_) -> t_unicode_string() end);
-%%-- gen_tcp ------------------------------------------------------------------
-%% NOTE: All type information for this module added to avoid loss of precision
-type(gen_tcp, accept, 1, Xs) ->
-  strict(arg_types(gen_tcp, accept, 1), Xs, fun (_) -> t_gen_tcp_accept() end);
-type(gen_tcp, accept, 2, Xs) ->
-  strict(arg_types(gen_tcp, accept, 2), Xs, fun (_) -> t_gen_tcp_accept() end);
-type(gen_tcp, connect, 3, Xs) ->
-  strict(arg_types(gen_tcp, connect, 3), Xs,
-	 fun (_) ->
-	     t_sup(t_tuple([t_atom('ok'), t_socket()]),
-		   t_tuple([t_atom('error'), t_inet_posix_error()]))
-	 end);
-type(gen_tcp, connect, 4, Xs) ->
-  strict(arg_types(gen_tcp, connect, 4), Xs,
-	 fun (_) ->
-	     t_sup(t_tuple([t_atom('ok'), t_socket()]),
-		   t_tuple([t_atom('error'), t_inet_posix_error()]))
-	 end);
-type(gen_tcp, listen, 2, Xs) ->
-  strict(arg_types(gen_tcp, listen, 2), Xs,
-	 fun (_) ->
-	     t_sup(t_tuple([t_atom('ok'), t_socket()]),
-		   t_tuple([t_atom('error'), t_inet_posix_error()]))
-	 end);
-type(gen_tcp, recv, 2, Xs) ->
-  strict(arg_types(gen_tcp, recv, 2), Xs, fun (_) -> t_gen_tcp_recv() end);
-type(gen_tcp, recv, 3, Xs) ->
-  strict(arg_types(gen_tcp, recv, 3), Xs, fun (_) -> t_gen_tcp_recv() end);
-type(gen_tcp, send, 2, Xs) ->
-  strict(arg_types(gen_tcp, send, 2), Xs,
-	 fun (_) ->
-	     t_sup(t_atom('ok'),
-		   t_tuple([t_atom('error'), t_inet_posix_error()]))
-	 end);
-type(gen_tcp, shutdown, 2, Xs) ->
-  strict(arg_types(gen_tcp, shutdown, 2), Xs,
-	 fun (_) ->
-	     t_sup(t_atom('ok'),
-		   t_tuple([t_atom('error'), t_inet_posix_error()]))
-	 end);
-%%-- gen_udp ------------------------------------------------------------------
-%% NOTE: All type information for this module added to avoid loss of precision
-type(gen_udp, open, 1, Xs) ->
-  strict(arg_types(gen_udp, open, 1), Xs,
-	 fun (_) ->
-	     t_sup(t_tuple([t_atom('ok'), t_socket()]),
-		   t_tuple([t_atom('error'), t_inet_posix_error()]))
-	 end);
-type(gen_udp, open, 2, Xs) ->
-  strict(arg_types(gen_udp, open, 2), Xs,
-	 fun (_) ->
-	     t_sup(t_tuple([t_atom('ok'), t_socket()]),
-		   t_tuple([t_atom('error'), t_inet_posix_error()]))
-	 end);
-type(gen_udp, recv, 2, Xs) ->
-  strict(arg_types(gen_udp, recv, 2), Xs, fun (_) -> t_gen_udp_recv() end);
-type(gen_udp, recv, 3, Xs) ->
-  strict(arg_types(gen_udp, recv, 3), Xs, fun (_) -> t_gen_udp_recv() end);
-type(gen_udp, send, 4, Xs) ->
-  strict(arg_types(gen_udp, send, 4), Xs,
-	 fun (_) ->
-	     t_sup(t_atom('ok'),
-		   t_tuple([t_atom('error'), t_sup(t_atom('not_owner'),
-						   t_inet_posix_error())]))
-	 end);
 %%-- hipe_bifs ----------------------------------------------------------------
 type(hipe_bifs, add_ref, 2, Xs) ->
   strict(arg_types(hipe_bifs, add_ref, 2), Xs, fun (_) -> t_nil() end);
@@ -2149,26 +1096,6 @@ type(hipe_bifs, write_u32, 2, Xs) ->
   strict(arg_types(hipe_bifs, write_u32, 2), Xs, fun (_) -> t_nil() end);
 type(hipe_bifs, write_u64, 2, Xs) ->
   strict(arg_types(hipe_bifs, write_u64, 2), Xs, fun (_) -> t_nil() end);
-%%-- io -----------------------------------------------------------------------
-type(io, format, 1, Xs) ->
-  strict(arg_types(io, format, 1), Xs, fun (_) -> t_atom('ok') end);
-type(io, format, 2, Xs) ->
-  strict(arg_types(io, format, 2), Xs, fun (_) -> t_atom('ok') end);
-type(io, format, 3, Xs) ->
-  strict(arg_types(io, format, 3), Xs, fun (_) -> t_atom('ok') end);
-type(io, fwrite, 1, Xs) -> type(io, format, 1, Xs); % same
-type(io, fwrite, 2, Xs) -> type(io, format, 2, Xs); % same
-type(io, fwrite, 3, Xs) -> type(io, format, 3, Xs); % same
-type(io, put_chars, 1, Xs) ->
-  strict(arg_types(io, put_chars, 1), Xs, fun (_) -> t_atom('ok') end);
-type(io, put_chars, 2, Xs) ->
-  strict(arg_types(io, put_chars, 2), Xs, fun (_) -> t_atom('ok') end);
-%%-- io_lib -------------------------------------------------------------------
-type(io_lib, format, 2, Xs) ->
-  strict(arg_types(io_lib, format, 2), Xs,
-	 %% t_list() because the character list might be arbitrarily nested
-	 fun (_) -> t_list(t_sup(t_char(), t_list())) end);
-type(io_lib, fwrite, 2, Xs) -> type(io_lib, format, 2, Xs); % same
 %%-- lists --------------------------------------------------------------------
 type(lists, all, 2, Xs) ->
   strict(arg_types(lists, all, 2), Xs, 
@@ -2538,8 +1465,6 @@ type(lists, merge, 2, Xs) ->
 		 end
 	     end
 	 end);
-%% type(lists, merge, 3, Xs) ->
-%% type(lists, merge3, 3, Xs) ->
 type(lists, min, 1, Xs) ->
   strict(arg_types(lists, min, 1), Xs, fun ([L]) -> t_list_elements(L) end);
 type(lists, nth, 2, Xs) ->
@@ -2576,10 +1501,6 @@ type(lists, reverse, 1, Xs) ->
   strict(arg_types(lists, reverse, 1), Xs, fun ([X]) -> X end);
 type(lists, reverse, 2, Xs) ->
   type(erlang, '++', 2, Xs);    % reverse-onto is just like append
-type(lists, seq, 2, Xs) ->
-  strict(arg_types(lists, seq, 2), Xs, fun (_) -> t_list(t_integer()) end);
-type(lists, seq, 3, Xs) ->
-  strict(arg_types(lists, seq, 3), Xs, fun (_) -> t_list(t_integer()) end);
 type(lists, sort, 1, Xs) ->
   strict(arg_types(lists, sort, 1), Xs, fun ([X]) -> X end);
 type(lists, sort, 2, Xs) ->
@@ -2686,95 +1607,7 @@ type(lists, zipwith, 3, Xs) ->
 type(lists, zipwith3, 4, Xs) ->
   strict(arg_types(lists, zipwith3, 4), Xs,
 	 fun ([F,_As,_Bs,_Cs]) -> t_sup(t_list(t_fun_range(F)), t_nil()) end);
-%%-- math ---------------------------------------------------------------------
-type(math, acos, 1, Xs) ->
-  strict(arg_types(math, acos, 1), Xs, fun (_) -> t_float() end);
-type(math, acosh, 1, Xs) ->
-  strict(arg_types(math, acosh, 1), Xs, fun (_) -> t_float() end);
-type(math, asin, 1, Xs) ->
-  strict(arg_types(math, asin, 1), Xs, fun (_) -> t_float() end);
-type(math, asinh, 1, Xs) ->
-  strict(arg_types(math, asinh, 1), Xs, fun (_) -> t_float() end);
-type(math, atan, 1, Xs) ->
-  strict(arg_types(math, atan, 1), Xs, fun (_) -> t_float() end);
-type(math, atan2, 2, Xs) ->
-  strict(arg_types(math, atan2, 2), Xs, fun (_) -> t_float() end);
-type(math, atanh, 1, Xs) ->
-  strict(arg_types(math, atanh, 1), Xs, fun (_) -> t_float() end);
-type(math, cos, 1, Xs) ->
-  strict(arg_types(math, cos, 1), Xs, fun (_) -> t_float() end);
-type(math, cosh, 1, Xs) ->
-  strict(arg_types(math, cosh, 1), Xs, fun (_) -> t_float() end);
-type(math, erf, 1, Xs) ->
-  strict(arg_types(math, erf, 1), Xs, fun (_) -> t_float() end);
-type(math, erfc, 1, Xs) ->
-  strict(arg_types(math, erfc, 1), Xs, fun (_) -> t_float() end);
-type(math, exp, 1, Xs) ->
-  strict(arg_types(math, exp, 1), Xs, fun (_) -> t_float() end);
-type(math, log, 1, Xs) ->
-  strict(arg_types(math, log, 1), Xs, fun (_) -> t_float() end);
-type(math, log10, 1, Xs) ->
-  strict(arg_types(math, log10, 1), Xs, fun (_) -> t_float() end);
-type(math, pi, 0, _) -> t_float();
-type(math, pow, 2, Xs) ->
-  strict(arg_types(math, pow, 2), Xs, fun (_) -> t_float() end);
-type(math, sin, 1, Xs) ->
-  strict(arg_types(math, sin, 1), Xs, fun (_) -> t_float() end);
-type(math, sinh, 1, Xs) ->
-  strict(arg_types(math, sinh, 1), Xs, fun (_) -> t_float() end);
-type(math, sqrt, 1, Xs) ->
-  strict(arg_types(math, sqrt, 1), Xs, fun (_) -> t_float() end);
-type(math, tan, 1, Xs) ->
-  strict(arg_types(math, tan, 1), Xs, fun (_) -> t_float() end);
-type(math, tanh, 1, Xs) ->
-  strict(arg_types(math, tanh, 1), Xs, fun (_) -> t_float() end);
-%%-- net_kernel ---------------------------------------------------------------
-type(net_kernel, dflag_unicode_io, 1, Xs) ->
-  strict(arg_types(net_kernel, dflag_unicode_io, 1), Xs, 
-	 fun (_) -> t_boolean() end); 
-%%-- ordsets ------------------------------------------------------------------
-type(ordsets, filter, 2, Xs) ->
-  type(lists, filter, 2, Xs);
-type(ordsets, fold, 3, Xs) ->
-  type(lists, foldl, 3, Xs);
-%%-- os -----------------------------------------------------------------------
-type(os, getenv, 0, _) -> t_list(t_string());
-type(os, getenv, 1, Xs) ->
-  strict(arg_types(os, getenv, 1), Xs,
-	 fun (_) -> t_sup(t_string(), t_atom('false')) end);
-type(os, getpid, 0, _) -> t_string();
-type(os, putenv, 2, Xs) ->
-  strict(arg_types(os, putenv, 2), Xs, fun (_) -> t_atom('true') end);
-type(os, timestamp, 0, _) ->
-  t_timestamp();
-%%-- re -----------------------------------------------------------------------
-type(re, compile, 1, Xs) ->
-  strict(arg_types(re, compile, 1), Xs,
-	 fun (_) ->
-	     t_sup(t_tuple([t_atom('ok'), t_re_MP()]),
-		   t_tuple([t_atom('error'), t_re_ErrorSpec()]))
-	 end);
-type(re, compile, 2, Xs) ->
-  strict(arg_types(re, compile, 2), Xs,
-	 fun (_) ->
-	     t_sup(t_tuple([t_atom('ok'), t_re_MP()]),
-		   t_tuple([t_atom('error'), t_re_ErrorSpec()]))
-	 end);
-type(re, run, 2, Xs) ->
-  strict(arg_types(re, run, 2), Xs,
-	 fun (_) ->
-	     t_sup([t_tuple([t_atom('match'), t_re_Captured()]),
-		    t_atom('nomatch'),
-		    t_tuple([t_atom('error'), t_re_ErrorSpec()])])
-	 end);
-type(re, run, 3, Xs) ->
-  strict(arg_types(re, run, 3), Xs,
-	 fun (_) ->
-	     t_sup([t_tuple([t_atom('match'), t_re_Captured()]),
-		    t_atom('match'),
-		    t_atom('nomatch'),
-		    t_tuple([t_atom('error'), t_re_ErrorSpec()])])
-	 end);
+
 %%-- string -------------------------------------------------------------------
 type(string, chars, 2, Xs) ->  % NOTE: added to avoid loss of information
   strict(arg_types(string, chars, 2), Xs, fun (_) -> t_string() end);
@@ -2793,41 +1626,6 @@ type(string, chars, 3, Xs) ->  % NOTE: added to avoid loss of information
 		 end
 	     end
 	 end);
-type(string, concat, 2, Xs) -> % NOTE: added to avoid loss of information
-  strict(arg_types(string, concat, 2), Xs, fun (_) -> t_string() end);
-type(string, equal, 2, Xs) ->  % NOTE: added to avoid loss of information
-  strict(arg_types(string, equal, 2), Xs, fun (_) -> t_boolean() end);
-type(string, to_float, 1, Xs) ->
-  strict(arg_types(string, to_float, 1), Xs,
-	 fun (_) -> t_sup(t_tuple([t_float(), t_string()]),
-			  t_tuple([t_atom('error'),
-				   t_sup(t_atom('no_float'),
-					 t_atom('not_a_list'))]))
-	 end);
-type(string, to_integer, 1, Xs) ->
-  strict(arg_types(string, to_integer, 1), Xs,
-	 fun (_) -> t_sup(t_tuple([t_integer(), t_string()]),
-			  t_tuple([t_atom('error'),
-				   t_sup(t_atom('no_integer'),
-					 t_atom('not_a_list'))]))
-	 end);
-%%-- unicode ------------------------------------------------------------------
-type(unicode, characters_to_binary, 2, Xs) ->
-  strict(arg_types(unicode, characters_to_binary, 2), Xs,
-	 fun (_) -> 
-	     t_sup([t_binary(),
-		    t_tuple([t_atom('error'), t_binary(), t_ML()]),
-		    t_tuple([t_atom('incomplete'), t_binary(), t_ML()])])
-		    end);
-type(unicode, characters_to_list, 2, Xs) ->
-  strict(arg_types(unicode, characters_to_list, 2), Xs,
-	 fun (_) ->
-	     t_sup([t_string(),
-		    t_tuple([t_atom('error'), t_string(), t_ML()]),
-		    t_tuple([t_atom('incomplete'), t_string(), t_ML()])])
-	 end);
-type(unicode, bin_is_7bit, 1, Xs) ->
-  strict(arg_types(unicode, bin_is_7bit, 1), Xs, fun (_) -> t_boolean() end);
 
 %%-----------------------------------------------------------------------------
 type(M, F, A, Xs) when is_atom(M), is_atom(F),
@@ -3282,107 +2080,6 @@ key_comparisons_fail(X0, KeyPos, TupleList) ->
 
 -spec arg_types(atom(), atom(), arity()) -> [erl_types:erl_type()] | 'unknown'.
 
-%%------- binary --------------------------------------------------------------
-arg_types(binary, at, 2) ->
-  [t_binary(), t_non_neg_integer()];
-arg_types(binary, bin_to_list, 1) ->
-  [t_binary()];
-arg_types(binary, bin_to_list, 2) ->
-  [t_binary(), t_binary_part()];
-arg_types(binary, bin_to_list, 3) ->
-  [t_binary(), t_integer(), t_non_neg_integer()];
-arg_types(binary, compile_pattern, 1) ->
-  [t_sup(t_binary(), t_list(t_binary()))];
-arg_types(binary, copy, 1) ->
-  [t_binary()];
-arg_types(binary, copy, 2) ->
-  [t_binary(), t_non_neg_integer()];
-arg_types(binary, decode_unsigned, 1) ->
-  [t_binary()];
-arg_types(binary, decode_unsigned, 2) ->
-  [t_binary(), t_endian()];
-arg_types(binary, encode_unsigned, 1) ->
-  [t_non_neg_integer()];
-arg_types(binary, encode_unsigned, 2) ->
-  [t_non_neg_integer(), t_endian()];
-arg_types(binary, first, 1) ->
-  [t_binary()];
-arg_types(binary, last, 1) ->
-  [t_binary()];
-arg_types(binary, list_to_bin, 1) ->
-  arg_types(erlang, list_to_binary, 1);
-arg_types(binary, longest_common_prefix, 1) ->
-  [t_list(t_binary())];
-arg_types(binary, longest_common_suffix, 1) ->
-  [t_list(t_binary())];
-arg_types(binary, match, 2) ->
-  [t_binary(), t_binary_pattern()];
-arg_types(binary, match, 3) ->
-  [t_binary(), t_binary_pattern(), t_binary_options()];
-arg_types(binary, matches, 2) ->
-  [t_binary(), t_binary_pattern()];
-arg_types(binary, matches, 3) ->
-  [t_binary(), t_binary_pattern(), t_binary_options()];
-arg_types(binary, part, 2) ->
-  arg_types(erlang, binary_part, 2);
-arg_types(binary, part, 3) ->
-  arg_types(erlang, binary_part, 3);
-arg_types(binary, referenced_byte_size, 1) ->
-  [t_binary()];
-%%------- code ----------------------------------------------------------------
-arg_types(code, get_chunk, 2) ->
-  [t_binary(), t_string()];
-arg_types(code, is_module_native, 1) ->
-  [t_atom()];
-arg_types(code, module_md5, 1) ->
-  [t_binary()];
-arg_types(code, make_stub_module, 3) ->
-  [t_atom(), t_binary(), t_tuple([t_list(), t_list()])];
-arg_types(code, rehash, 0) ->
-  [];
-%%------- erl_ddll ------------------------------------------------------------
-arg_types(erl_ddll, demonitor, 1) ->
-  arg_types(erlang, demonitor, 1);
-arg_types(erl_ddll, format_error_int, 1) ->
-  [t_sup([t_atom('inconsistent'),
-	  t_atom('linked_in_driver'),
-	  t_atom('permanent'),
-	  t_atom('not_loaded'),
-	  t_atom('not_loaded_by_this_process'),
-	  t_atom('not_pending'),
-	  t_atom('already_loaded'),
-	  t_atom('unloading')])];
-arg_types(erl_ddll, info, 2) ->
-  [t_sup([t_atom(), t_string()]),
-   t_sup([t_atom('awaiting_load'),
-	  t_atom('awaiting_unload'),
-	  t_atom('driver_options'),
-	  t_atom('linked_in_driver'),
-	  t_atom('permanent'),
-	  t_atom('port_count'),
-	  t_atom('processes')])];
-arg_types(erl_ddll, loaded_drivers, 0) ->
-  [];
-arg_types(erl_ddll, monitor, 2) ->
-  [t_atom('driver'),
-   t_tuple([t_atom(), t_sup([t_atom('loaded'), t_atom('unloaded')])])];
-arg_types(erl_ddll, try_load, 3) ->
-  [t_sup([t_atom(), t_string(), t_nonempty_list(t_sup([t_atom(), t_string()]))]),
-   t_sup([t_atom(), t_string()]),
-   t_list(t_sup([t_tuple([t_atom('driver_options'),
-			  t_list(t_atom('kill_ports'))]),
-		 t_tuple([t_atom('monitor'),
-			  t_sup([t_atom('pending_driver'),
-				 t_atom('pending')])]),
-		 t_tuple([t_atom('reload'),
-			  t_sup([t_atom('pending_driver'),
-				 t_atom('pending')])])]))];
-arg_types(erl_ddll, try_unload, 2) ->
-  [t_sup([t_atom(), t_string(), t_nonempty_list(t_sup([t_atom(), t_string()]))]),
-   t_list(t_sup([t_atom('kill_ports'),
-		 t_tuple([t_atom('monitor'),
-			  t_sup([t_atom('pending_driver'),
-				 t_atom('pending')])])]))];
 %%------- erlang --------------------------------------------------------------
 arg_types(erlang, '!', 2) ->
   Pid = t_sup([t_pid(), t_port(), t_atom(),
@@ -3444,18 +2141,11 @@ arg_types(erlang, 'bsl', 2) ->
   [t_integer(), t_integer()];
 arg_types(erlang, 'bnot', 1) ->
   [t_integer()];
+%% Guard bif, needs to be here.
 arg_types(erlang, abs, 1) ->
   [t_number()];
-arg_types(erlang, adler32, 1) ->
-  [t_iodata()];
-arg_types(erlang, adler32, 2) ->
-  [t_adler32(), t_iodata()];
-arg_types(erlang, adler32_combine, 3) ->
-  [t_adler32(), t_adler32(), t_non_neg_integer()];
 arg_types(erlang, append, 2) ->
   arg_types(erlang, '++', 2);
-arg_types(erlang, append_element, 2) ->
-  [t_tuple(), t_any()];
 arg_types(erlang, apply, 2) ->
   [t_sup(t_tuple([t_module(),
 		  t_atom()]),
@@ -3463,179 +2153,58 @@ arg_types(erlang, apply, 2) ->
    t_list()];
 arg_types(erlang, apply, 3) ->
   [t_sup(t_atom(), t_tuple()), t_atom(), t_list()];
-arg_types(erlang, atom_to_binary, 2) ->
-  [t_atom(), t_encoding_a2b()];
-arg_types(erlang, atom_to_list, 1) ->
-  [t_atom()];
+%% Guard bif, needs to be here.
 arg_types(erlang, binary_part, 2) ->
   [t_binary(), t_tuple([t_non_neg_integer(), t_integer()])];
+%% Guard bif, needs to be here.
 arg_types(erlang, binary_part, 3) ->
   [t_binary(), t_non_neg_integer(), t_integer()];
-arg_types(erlang, binary_to_atom, 2) ->
-  [t_binary(), t_encoding_a2b()];
-arg_types(erlang, binary_to_existing_atom, 2) ->
-  arg_types(erlang, binary_to_atom, 2);
-arg_types(erlang, binary_to_list, 1) ->
-  [t_binary()];
-arg_types(erlang, binary_to_list, 3) ->
-  [t_binary(), t_pos_integer(), t_pos_integer()]; % I want fixnum, but cannot
-arg_types(erlang, binary_to_term, 1) ->
-  [t_binary()];
-arg_types(erlang, binary_to_term, 2) ->
-  [t_binary(), t_list(t_atom('safe'))];
-arg_types(erlang, bitsize, 1) ->	% XXX: TAKE OUT
-  arg_types(erlang, bit_size, 1);
+%% Guard bif, needs to be here.
 arg_types(erlang, bit_size, 1) ->
   [t_bitstr()];
-arg_types(erlang, bitstr_to_list, 1) ->	% XXX: TAKE OUT
-  arg_types(erlang, bitstring_to_list, 1);
-arg_types(erlang, bitstring_to_list, 1) ->
-  [t_bitstr()];
-arg_types(erlang, bump_reductions, 1) ->
-  [t_pos_fixnum()];
+%% Guard bif, needs to be here.
 arg_types(erlang, byte_size, 1) ->
   [t_binary()];
-arg_types(erlang, call_on_load_function, 1) ->
-  [t_atom()];
-arg_types(erlang, cancel_timer, 1) ->
-  [t_reference()];
-arg_types(erlang, check_old_code, 1) ->
-  [t_atom()];
-arg_types(erlang, check_process_code, 2) ->
-  [t_pid(), t_atom()];
-arg_types(erlang, crc32, 1) ->
-  [t_iodata()];
-arg_types(erlang, crc32, 2) ->
-  [t_crc32(), t_iodata()];
-arg_types(erlang, crc32_combine, 3) ->
-  [t_crc32(), t_crc32(), t_non_neg_integer()];
-arg_types(erlang, date, 0) ->
-  [];
-arg_types(erlang, decode_packet, 3) ->
-  [t_decode_packet_type(), t_binary(), t_list(t_decode_packet_option())];
-arg_types(erlang, delete_module, 1) ->
-  [t_atom()];
-arg_types(erlang, demonitor, 1) ->
-  [t_reference()];
-arg_types(erlang, demonitor, 2) ->
-  [t_reference(), t_list(t_atoms(['flush', 'info']))];
 arg_types(erlang, disconnect_node, 1) ->
   [t_node()];
-arg_types(erlang, display, 1) ->
-  [t_any()];
-arg_types(erlang, display_nl, 0) ->
-  [];
-arg_types(erlang, display_string, 1) ->
-  [t_string()];
-arg_types(erlang, dist_exit, 3) ->
-  [t_pid(), t_dist_exit(), t_sup(t_pid(), t_port())];
-arg_types(erlang, dt_append_vm_tag_data, 1) ->
-  [t_iodata()];
-arg_types(erlang, dt_get_tag, 0) ->
-  [];
-arg_types(erlang, dt_get_tag_data, 0) ->
-  [];
-arg_types(erlang, dt_prepend_vm_tag_data, 1) ->
-  [t_iodata()];
-arg_types(erlang, dt_put_tag, 1) ->
-  [t_sup(t_binary(), t_atom('undefined'))];
-arg_types(erlang, dt_restore_tag, 1) ->
-  [t_sup(t_tuple([t_non_neg_integer(), t_sup(t_binary(), t_nil())]), t_atom('true'))];
-arg_types(erlang, dt_spread_tag, 1) ->
-  [t_boolean()];
-arg_types(erlang, element, 2) ->
-  [t_pos_fixnum(), t_tuple()];
-arg_types(erlang, erase, 0) ->
+arg_types(erlang, halt, 0) ->
   [];
-arg_types(erlang, erase, 1) ->
-  [t_any()];
+arg_types(erlang, halt, 1) ->
+  [t_sup([t_non_neg_fixnum(), t_atom('abort'), t_string()])];
+arg_types(erlang, halt, 2) ->
+  [t_sup([t_non_neg_fixnum(), t_atom('abort'), t_string()]),
+   t_list(t_tuple([t_atom('flush'), t_boolean()]))];
 arg_types(erlang, error, 1) ->
   [t_any()];
 arg_types(erlang, error, 2) ->
   [t_any(), t_list()];
 arg_types(erlang, exit, 1) ->
   [t_any()];
-arg_types(erlang, exit, 2) ->
-  [t_sup(t_pid(), t_port()), t_any()];
-arg_types(erlang, external_size, 1) ->
-  [t_any()]; % takes any term as input
-arg_types(erlang, external_size, 2) ->
-  [t_any(), t_list()]; % takes any term as input and a list of options
-arg_types(erlang, finish_after_on_load, 2) ->
-  [t_atom(), t_boolean()];
+%% Guard bif, needs to be here.
+arg_types(erlang, element, 2) ->
+  [t_pos_fixnum(), t_tuple()];
+%% Guard bif, needs to be here.
 arg_types(erlang, float, 1) ->
   [t_number()];
-arg_types(erlang, float_to_list, 1) ->
-  [t_float()];
-arg_types(erlang, function_exported, 3) ->
-  [t_atom(), t_atom(), t_arity()];
 arg_types(erlang, fun_info, 1) ->
   [t_fun()];
-arg_types(erlang, fun_info, 2) ->
-  [t_fun(), t_atom()];
-arg_types(erlang, fun_to_list, 1) ->
-  [t_fun()];
-arg_types(erlang, garbage_collect, 0) ->
-  [];
-arg_types(erlang, garbage_collect, 1) ->
-  [t_pid()];
-arg_types(erlang, garbage_collect_message_area, 0) ->
-  [];
-arg_types(erlang, get, 0) ->
-  [];
-arg_types(erlang, get, 1) ->
-  [t_any()];
 arg_types(erlang, get_cookie, 0) ->
   [];
-arg_types(erlang, get_keys, 1) ->
-  [t_any()];
-arg_types(erlang, get_stacktrace, 0) ->
-  [];
-arg_types(erlang, get_module_info, 1) ->
-  [t_atom()];
-arg_types(erlang, get_module_info, 2) ->
-  [t_atom(), t_module_info_2()];
-arg_types(erlang, group_leader, 0) ->
-  [];
-arg_types(erlang, group_leader, 2) ->
-  [t_pid(), t_pid()];
-arg_types(erlang, halt, 0) ->
-  [];
-arg_types(erlang, halt, 1) ->
-  [t_sup([t_non_neg_fixnum(), t_atom('abort'), t_string()])];
-arg_types(erlang, halt, 2) ->
-  [t_sup([t_non_neg_fixnum(), t_atom('abort'), t_string()]),
-   t_list(t_tuple([t_atom('flush'), t_boolean()]))];
-arg_types(erlang, hash, 2) ->
-  [t_any(), t_integer()];
+%% Guard bif, needs to be here.
 arg_types(erlang, hd, 1) ->
   [t_cons()];
-arg_types(erlang, hibernate, 3) ->
-  [t_atom(), t_atom(), t_list()];
 arg_types(erlang, info, 1) ->
   arg_types(erlang, system_info, 1); % alias
-arg_types(erlang, iolist_to_binary, 1) ->
-  [t_sup(t_iolist(), t_binary())];
-arg_types(erlang, iolist_size, 1) ->
-  [t_sup(t_iolist(), t_binary())];
-arg_types(erlang, integer_to_list, 1) ->
-  [t_integer()];
 arg_types(erlang, integer_to_list, 2) ->
   [t_integer(), t_from_range(2, 36)];
-arg_types(erlang, is_alive, 0) ->
-  [];
 arg_types(erlang, is_atom, 1) ->
   [t_any()];
 arg_types(erlang, is_binary, 1) ->
   [t_any()];
-arg_types(erlang, is_bitstr, 1) ->	% XXX: TAKE OUT
-  arg_types(erlang, is_bitstring, 1);
 arg_types(erlang, is_bitstring, 1) ->
   [t_any()];
 arg_types(erlang, is_boolean, 1) ->
   [t_any()];
-arg_types(erlang, is_builtin, 3) ->
-  [t_atom(), t_atom(), t_arity()];
 arg_types(erlang, is_float, 1) ->
   [t_any()];
 arg_types(erlang, is_function, 1) ->
@@ -3652,8 +2221,6 @@ arg_types(erlang, is_pid, 1) ->
   [t_any()];
 arg_types(erlang, is_port, 1) ->
   [t_any()];
-arg_types(erlang, is_process_alive, 1) ->
-  [t_pid()];
 arg_types(erlang, is_record, 2) ->
   [t_any(), t_atom()];
 arg_types(erlang, is_record, 3) ->
@@ -3662,546 +2229,81 @@ arg_types(erlang, is_reference, 1) ->
   [t_any()];
 arg_types(erlang, is_tuple, 1) ->
   [t_any()];
+%% Guard bif, needs to be here.
 arg_types(erlang, length, 1) ->
   [t_list()];
-arg_types(erlang, link, 1) ->
-  [t_sup(t_pid(), t_port())];
-arg_types(erlang, list_to_atom, 1) ->
-  [t_string()];
-arg_types(erlang, list_to_binary, 1) ->
-  [t_iolist()];
-arg_types(erlang, list_to_bitstr, 1) ->	% XXX: TAKE OUT
-  arg_types(erlang, list_to_bitstring, 1);
-arg_types(erlang, list_to_bitstring, 1) ->
-  [t_bitstrlist()];
-arg_types(erlang, list_to_existing_atom, 1) ->
-  [t_string()];
-arg_types(erlang, list_to_float, 1) ->
-  [t_list(t_byte())];
-arg_types(erlang, list_to_integer, 1) ->
-  [t_list(t_byte())];
 arg_types(erlang, list_to_integer, 2) ->
   [t_list(t_byte()), t_from_range(2, 36)];
-arg_types(erlang, list_to_pid, 1) ->
-  [t_string()];
-arg_types(erlang, list_to_tuple, 1) ->
-  [t_list()];
-arg_types(erlang, load_module, 2) ->
-  [t_atom(), t_binary()];
-arg_types(erlang, load_nif, 2) ->
-  [t_string(), t_any()];
-arg_types(erlang, loaded, 0) ->
-  [];
-arg_types(erlang, localtime, 0) ->
-  [];
-arg_types(erlang, localtime_to_universaltime, 1) ->
-  [t_tuple([t_date(), t_time()])];
-arg_types(erlang, localtime_to_universaltime, 2) ->
-  arg_types(erlang, localtime_to_universaltime, 1) ++
-    [t_sup(t_boolean(), t_atom('undefined'))];
-arg_types(erlang, make_fun, 3) ->
-  [t_atom(), t_atom(), t_arity()];
-arg_types(erlang, make_ref, 0) ->
-  [];
 arg_types(erlang, make_tuple, 2) ->
   [t_non_neg_fixnum(), t_any()];  % the value 0 is OK as first argument
 arg_types(erlang, make_tuple, 3) ->
   [t_non_neg_fixnum(), t_any(), t_list(t_tuple([t_pos_integer(), t_any()]))];
-arg_types(erlang, match_spec_test, 3) ->
-  [t_sup(t_list(), t_tuple()),
-   t_any(),
-   t_sup(t_atom('table'), t_atom('trace'))];
-arg_types(erlang, md5, 1) ->
-  [t_sup(t_iolist(), t_binary())];
-arg_types(erlang, md5_final, 1) ->
-  [t_binary()];
-arg_types(erlang, md5_init, 0) ->
-  [];
-arg_types(erlang, md5_update, 2) ->
-  [t_binary(), t_sup(t_iolist(), t_binary())];
 arg_types(erlang, memory, 0) ->
   [];
-arg_types(erlang, memory, 1) ->
-  Arg = t_atoms(['total', 'processes', 'processes_used', 'system',
-		 'atom', 'atom_used', 'binary', 'code', 'ets',
-		 'maximum']),
-  [t_sup(Arg, t_list(Arg))];
-arg_types(erlang, module_loaded, 1) ->
-  [t_atom()];
-arg_types(erlang, monitor, 2) ->
-  [t_atom(), t_sup([t_pid(), t_atom(), t_tuple([t_atom(), t_node()])])];
-arg_types(erlang, monitor_node, 2) ->
-  [t_node(), t_boolean()];
-arg_types(erlang, monitor_node, 3) ->
-  [t_node(), t_boolean(), t_list(t_atom('allow_passive_connect'))];
 arg_types(erlang, nif_error, 1) ->
   [t_any()];
 arg_types(erlang, nif_error, 2) ->
   [t_any(), t_list()];
+%% Guard bif, needs to be here.
 arg_types(erlang, node, 0) ->
   [];
+%% Guard bif, needs to be here.
 arg_types(erlang, node, 1) ->
   [t_identifier()];
 arg_types(erlang, nodes, 0) ->
   [];
-arg_types(erlang, nodes, 1) ->
-  NodesArg = t_atoms(['visible', 'hidden', 'connected', 'this', 'known']),
-  [t_sup(NodesArg, t_list(NodesArg))];
-arg_types(erlang, now, 0) ->
-  [];
-arg_types(erlang, open_port, 2) ->
-  ArgT = t_sup(t_unicode_string(), t_binary()),
-  [t_sup(t_atom(), t_sup([t_tuple([t_atom('spawn'), t_string()]),
-			  t_tuple([t_atom('spawn_driver'), t_string()]),
-			  t_tuple([t_atom('spawn_executable'), ArgT]),
-			  t_tuple([t_atom('fd'), t_integer(), t_integer()])])),
-   t_list(t_sup(t_sup([t_atom('stream'),
-		       t_atom('exit_status'),
-		       t_atom('use_stdio'),
-		       t_atom('nouse_stdio'),
-		       t_atom('stderr_to_stdout'),
-		       t_atom('in'),
-		       t_atom('out'),
-		       t_atom('binary'),
-		       t_atom('eof'),
-		       t_atom('hide')]),
-		t_sup([t_tuple([t_atom('packet'), t_integer()]),
-		       t_tuple([t_atom('line'), t_integer()]),
-		       t_tuple([t_atom('cd'), t_string()]),
-		       t_tuple([t_atom('env'), t_list(t_tuple(2))]), % XXX: More
-		       t_tuple([t_atom('args'), t_list(ArgT)]),
-		       t_tuple([t_atom('arg0'), ArgT]),
-		       t_tuple([t_atom('parallelism'), t_boolean()])])))];
-arg_types(erlang, phash, 2) ->
-  [t_any(), t_pos_integer()];
-arg_types(erlang, phash2, 1) ->
-  [t_any()];
-arg_types(erlang, phash2, 2) ->
-  [t_any(), t_pos_integer()];
-arg_types(erlang, pid_to_list, 1) ->
-  [t_pid()];
-arg_types(erts_internal, port_call, 3) ->
-  [t_sup(t_port(), t_atom()), t_integer(), t_any()];
-arg_types(erts_internal, port_close, 1) ->
-  [t_sup(t_port(), t_atom())];
-arg_types(erts_internal, port_command, 3) ->
-  [t_sup(t_port(), t_atom()),
-   t_sup(t_iolist(), t_binary()),
-   t_list(t_atoms(['force', 'nosuspend']))];
-arg_types(erts_internal, port_connect, 2) ->
-  [t_sup(t_port(), t_atom()), t_pid()];
-arg_types(erts_internal, port_control, 3) ->
-  [t_sup(t_port(), t_atom()), t_integer(), t_sup(t_iolist(), t_binary())];
-arg_types(erts_internal, port_get_data, 1) ->
-  [t_sup(t_port(), t_atom())];
-arg_types(erts_internal, port_info, 1) ->
-  [t_sup(t_port(), t_atom())];
-arg_types(erts_internal, port_info, 2) ->
-  [t_sup(t_port(), t_atom()),
-   t_atoms(['registered_name', 'id', 'connected',
-	    'links', 'name', 'input', 'output',
-	    'monitors', 'memory', 'queue_size', 'locking', 'parallelism'])];
-arg_types(erlang, port_to_list, 1) ->
-  [t_port()];
-arg_types(erlang, ports, 0) ->
-  [];
-arg_types(erts_internal, port_set_data, 2) ->
-  [t_sup(t_port(), t_atom()), t_any()];
-arg_types(erlang, pre_loaded, 0) ->
-  [];
-arg_types(erlang, process_display, 2) ->
-  [t_pid(), t_atom('backtrace')];
-arg_types(erlang, process_flag, 2) ->
-  [t_sup([t_atom('trap_exit'),
-          t_atom('error_handler'),
-	  t_atom('min_heap_size'),
-          t_atom('min_bin_vheap_size'),
-          t_atom('priority'),
-          t_atom('save_calls'),
-          t_atom('sensitive'),
-	  t_atom('scheduler'),                             % undocumented
-	  t_atom('monitor_nodes'), 			  % undocumented
-	  t_tuple([t_atom('monitor_nodes'), t_list()])]), % undocumented
-   t_sup([t_boolean(), t_atom(), t_non_neg_integer()])];
-arg_types(erlang, process_flag, 3) ->
-  [t_pid(), t_atom('save_calls'), t_non_neg_integer()];
-arg_types(erlang, process_info, 1) ->
-  [t_pid()];
-arg_types(erlang, process_info, 2) ->
-  [t_pid(), t_pinfo()];
-arg_types(erlang, processes, 0) ->
-  [];
-arg_types(erlang, purge_module, 1) ->
-  [t_atom()];
-arg_types(erlang, put, 2) ->
-  [t_any(), t_any()];
-arg_types(erlang, raise, 3) ->
-  OldStyleType = t_list(t_tuple([t_atom(), t_atom(),
-				 t_sup([t_arity(), t_list()])])),
-  NewStyleType = type(erlang, get_stacktrace, 0, []),
-  [t_raise_errorclass(), t_any(), t_sup(OldStyleType, NewStyleType)];
-arg_types(erlang, read_timer, 1) ->
-  [t_reference()];
-arg_types(erlang, ref_to_list, 1) ->
-  [t_reference()];
-arg_types(erlang, register, 2) ->
-  [t_atom(), t_sup(t_port(), t_pid())];
-arg_types(erlang, registered, 0) ->
-  [];
-arg_types(erlang, resume_process, 1) ->
-  [t_pid()]; % intended for debugging only
+%% Guard bif, needs to be here.
 arg_types(erlang, round, 1) ->
   [t_number()];
-arg_types(erlang, posixtime_to_universaltime, 1) ->
-  [t_integer()];
+%% Guard bif, needs to be here.
 arg_types(erlang, self, 0) ->
   [];
-arg_types(erlang, send, 2) ->
-  arg_types(erlang, '!', 2);  % alias
-arg_types(erlang, send, 3) ->
-  arg_types(erlang, send, 2) ++ [t_list(t_sendoptions())];
-arg_types(erlang, send_after, 3) ->
-  [t_non_neg_integer(), t_sup(t_pid(), t_atom()), t_any()];
-arg_types(erlang, seq_trace, 2) ->
-  [t_atom(), t_sup([t_boolean(), t_tuple([t_fixnum(), t_fixnum()]), t_fixnum(), t_nil()])];
-arg_types(erlang, seq_trace_info, 1) ->
-  [t_seq_trace_info()];
-arg_types(erlang, seq_trace_print, 1) ->
-  [t_any()];
-arg_types(erlang, seq_trace_print, 2) ->
-  [t_sup(t_atom(), t_fixnum()), t_any()];
 arg_types(erlang, set_cookie, 2) ->
   [t_node(), t_atom()];
 arg_types(erlang, setelement, 3) ->
   [t_pos_integer(), t_tuple(), t_any()];
-arg_types(erlang, setnode, 2) ->
-  [t_atom(), t_integer()];
-arg_types(erlang, setnode, 3) ->
-  [t_atom(), t_port(), t_tuple(4)];
+%% Guard bif, needs to be here.
 arg_types(erlang, size, 1) ->
   [t_sup(t_tuple(), t_binary())];
 arg_types(erlang, spawn, 1) -> %% TODO: Tuple?
   [t_fun()];
 arg_types(erlang, spawn, 2) -> %% TODO: Tuple?
   [t_node(), t_fun()];
-arg_types(erlang, spawn, 3) -> %% TODO: Tuple?
-  [t_atom(), t_atom(), t_list()];
 arg_types(erlang, spawn, 4) -> %% TODO: Tuple?
   [t_node(), t_atom(), t_atom(), t_list()];
 arg_types(erlang, spawn_link, 1) ->
   arg_types(erlang, spawn, 1);  % same
 arg_types(erlang, spawn_link, 2) ->
   arg_types(erlang, spawn, 2);  % same
-arg_types(erlang, spawn_link, 3) ->
-  arg_types(erlang, spawn, 3);  % same
 arg_types(erlang, spawn_link, 4) ->
   arg_types(erlang, spawn, 4);  % same
-arg_types(erlang, spawn_opt, 1) ->
-  [t_tuple([t_atom(), t_atom(), t_list(), t_list(t_spawn_options())])];
-arg_types(erlang, spawn_opt, 2) ->
-  [t_fun(), t_list(t_spawn_options())];
-arg_types(erlang, spawn_opt, 3) ->
-  [t_atom(), t_fun(), t_list(t_spawn_options())];
-arg_types(erlang, spawn_opt, 4) ->
-  [t_node(), t_atom(), t_list(), t_list(t_spawn_options())];
-arg_types(erlang, split_binary, 2) ->
-  [t_binary(), t_non_neg_integer()];
-arg_types(erlang, start_timer, 3) ->
-  [t_non_neg_integer(), t_sup(t_pid(), t_atom()), t_any()];
-arg_types(erlang, statistics, 1) ->
-  [t_sup([t_atom('context_switches'),
-	  t_atom('exact_reductions'),
-	  t_atom('garbage_collection'),
-	  t_atom('io'),
-	  t_atom('reductions'),
-	  t_atom('run_queue'),
-	  t_atom('runtime'),
-	  t_atom('wall_clock')])];
 arg_types(erlang, subtract, 2) ->
   arg_types(erlang, '--', 2);
 arg_types(erlang, suspend_process, 1) ->
   [t_pid()];
-arg_types(erlang, suspend_process, 2) ->
-  [t_pid(), t_list(t_sup([t_atom('unless_suspending'),
-			  t_atom('asynchronous')]))];
-arg_types(erlang, system_flag, 2) ->
-  [t_sup([t_atom('backtrace_depth'),
-	  t_atom('cpu_topology'),
-	  t_atom('debug_flags'),	% undocumented
-	  t_atom('display_items'),	% undocumented
-	  t_atom('fullsweep_after'),
-	  t_atom('min_heap_size'),
-	  t_atom('min_bin_vheap_size'),
-	  t_atom('multi_scheduling'),
-	  t_atom('schedulers_online'),
-	  t_atom('scheduler_bind_type'),
-	  %% Undocumented; used to implement (the documented) seq_trace module.
-	  t_atom('sequential_tracer'),
-	  t_atom('trace_control_word'),
-	  %% 'internal_cpu_topology' is an undocumented internal feature.
-	  t_atom('internal_cpu_topology'),
-	  t_integer()]),
-   t_sup([t_integer(),
-	  %% 'cpu_topology'
-	  t_system_cpu_topology(),
-	  %% 'scheduler_bind_type'
-	  t_scheduler_bind_type_args(),
-	  %% Undocumented: the following is for 'debug_flags' that
-	  %% takes any erlang term as flags and currently ignores it.
-	  %% t_any(),	% commented out since it destroys the type signature
-	  %%
-	  %% Again undocumented; the following are for 'sequential_tracer'
-	  t_sequential_tracer(),
-	  %% The following two are for 'multi_scheduling'
-	  t_atom('block'),
-	  t_atom('unblock'),
-	  %% The following is for 'internal_cpu_topology'
-	  t_internal_cpu_topology()])];
 arg_types(erlang, system_info, 1) ->
   [t_sup([t_atom(),                     % documented
 	  t_tuple([t_atom(), t_any()]), % documented
 	  t_tuple([t_atom(), t_atom(), t_any()]),
 	  t_tuple([t_atom(allocator_sizes), t_reference(), t_any()])])];
-arg_types(erlang, system_monitor, 0) ->
-  [];
-arg_types(erlang, system_monitor, 1) ->
-  [t_system_monitor_settings()];
-arg_types(erlang, system_monitor, 2) ->
-  [t_pid(), t_system_monitor_options()];
-arg_types(erlang, system_profile, 0) ->
-  [];
-arg_types(erlang, system_profile, 2) ->
-  [t_sup([t_pid(), t_port(), t_atom('undefined')]),
-   t_system_profile_options()];
-arg_types(erlang, term_to_binary, 1) ->
-  [t_any()];
-arg_types(erlang, term_to_binary, 2) ->
-  [t_any(), t_list(t_sup([t_atom('compressed'),
-			  t_tuple([t_atom('compressed'), t_from_range(0, 9)]),
-			  t_tuple([t_atom('minor_version'), t_integers([0, 1])])]))];
 arg_types(erlang, throw, 1) ->
   [t_any()];
-arg_types(erlang, time, 0) ->
-  [];
+%% Guard bif, needs to be here.
 arg_types(erlang, tl, 1) ->
   [t_cons()];
-arg_types(erlang, trace, 3) ->
-  [t_sup(t_pid(), t_sup([t_atom('existing'), t_atom('new'), t_atom('all')])),
-   t_boolean(),
-   t_list(t_sup(t_atom(), t_tuple(2)))];
-arg_types(erlang, trace_delivered, 1) ->
-  [t_sup(t_pid(), t_atom('all'))];
-arg_types(erlang, trace_info, 2) ->
-  [t_sup([%% the following two get info about a PID
-	  t_pid(), t_atom('new'),
-	  %% while the following two get info about a func
-	  t_mfa(), t_atom('on_load')]),
-   t_sup([%% the following are items about a PID
-	  t_atom('flags'), t_atom('tracer'),
-	  %% while the following are items about a func
-	  t_atom('traced'), t_atom('match_spec'), t_atom('meta'),
-	  t_atom('meta_match_spec'), t_atom('call_count'),
-	  t_atom('call_time'), t_atom('all')])];
-arg_types(erlang, trace_pattern, 2) ->
-  [t_sup(t_tuple([t_atom(), t_atom(), t_sup(t_arity(), t_atom('_'))]),
-	 t_atom('on_load')),
-   t_sup([t_boolean(), t_list(), t_atom('restart'), t_atom('pause')])];
-arg_types(erlang, trace_pattern, 3) ->
-  arg_types(erlang, trace_pattern, 2) ++
-    [t_list(t_sup([t_atom('global'), t_atom('local'),
-		   t_atom('meta'), t_tuple([t_atom('meta'), t_pid()]),
-		   t_atom('call_count'), t_atom('call_time')]))];
+%% Guard bif, needs to be here.
 arg_types(erlang, trunc, 1) ->
   [t_number()];
+%% Guard bif, needs to be here.
 arg_types(erlang, tuple_size, 1) ->
   [t_tuple()];
 arg_types(erlang, tuple_to_list, 1) ->
   [t_tuple()];
-arg_types(erlang, universaltime, 0) ->
-  [];
-arg_types(erlang, universaltime_to_localtime, 1) ->
-  [t_tuple([t_date(), t_time()])];
-arg_types(erlang, universaltime_to_posixtime, 1) ->
-  [t_tuple([t_date(), t_time()])];
-arg_types(erlang, unlink, 1) ->
-  [t_sup(t_pid(), t_port())];
-arg_types(erlang, unregister, 1) ->
-  [t_atom()];
-arg_types(erlang, whereis, 1) ->
-  [t_atom()];
 arg_types(erlang, yield, 0) ->
   [];
-%%------- erl_prim_loader -----------------------------------------------------
-arg_types(erl_prim_loader, get_file, 1) ->
-  [t_sup(t_atom(), t_string())];
-arg_types(erl_prim_loader, get_path, 0) ->
-  [];
-arg_types(erl_prim_loader, set_path, 1) ->
-  [t_list(t_string())];
-%%------- error_logger --------------------------------------------------------
-arg_types(error_logger, warning_map, 0) ->
-  [];
-%%------- erts_debug ----------------------------------------------------------
-arg_types(erts_debug, breakpoint, 2) ->
-  [t_tuple([t_atom(), t_atom(), t_sup(t_integer(), t_atom('_'))]), t_boolean()];
-arg_types(erts_debug, disassemble, 1) ->
-  [t_sup(t_mfa(), t_integer())];
-arg_types(erts_debug, display, 1) ->
-  [t_any()];
-arg_types(erts_debug, dist_ext_to_term, 2) ->
-  [t_tuple(), t_binary()];
-arg_types(erts_debug, dump_monitors, 1) ->
-  [t_sup([t_pid(),t_atom()])];
-arg_types(erts_debug, dump_links, 1) ->
-  [t_sup([t_pid(),t_atom(),t_port()])];
-arg_types(erts_debug, flat_size, 1) ->
-  [t_any()];
-arg_types(erts_debug, get_internal_state, 1) ->
-  [t_any()];
-arg_types(erts_debug, instructions, 0) ->
-  [];
-arg_types(erts_debug, lock_counters, 1) ->
-  [t_sup([t_atom(enabled),
-	  t_atom(info),
-	  t_atom(clear),
-	  t_tuple([t_atom(copy_save), t_boolean()]),
-	  t_tuple([t_atom(process_locks), t_boolean()])])];
-arg_types(erts_debug, same, 2) ->
-  [t_any(), t_any()];
-arg_types(erts_debug, set_internal_state, 2) ->
-  [t_any(), t_any()];
 %%------- ets -----------------------------------------------------------------
-arg_types(ets, all, 0) ->
-  [];
-arg_types(ets, delete, 1) ->
-  [t_tab()];
-arg_types(ets, delete, 2) ->
-  [t_tab(), t_any()];
-arg_types(ets, delete_all_objects, 1) ->
-  [t_tab()];
-arg_types(ets, delete_object, 2) ->
-  [t_tab(), t_tuple()];
-arg_types(ets, first, 1) ->
-  [t_tab()];
-arg_types(ets, give_away, 3) ->
-  [t_tab(), t_pid(), t_any()];
-arg_types(ets, info, 1) ->
-  [t_tab()];
-arg_types(ets, info, 2) ->
-  [t_tab(), t_ets_info_items()];
-arg_types(ets, insert, 2) ->
-  [t_tab(), t_sup(t_tuple(), t_list(t_tuple()))];
-arg_types(ets, insert_new, 2) ->
-  [t_tab(), t_sup(t_tuple(), t_list(t_tuple()))];
-arg_types(ets, is_compiled_ms, 1) ->
-  [t_any()];
-arg_types(ets, last, 1) ->
-  arg_types(ets, first, 1);
-arg_types(ets, lookup, 2) ->
-  [t_tab(), t_any()];
-arg_types(ets, lookup_element, 3) ->
-  [t_tab(), t_any(), t_pos_fixnum()];
-arg_types(ets, match, 1) ->
-  [t_any()];
-arg_types(ets, match, 2) ->
-  [t_tab(), t_match_pattern()];
-arg_types(ets, match, 3) ->
-  [t_tab(), t_match_pattern(), t_pos_fixnum()];
-arg_types(ets, match_object, 1) ->
-  arg_types(ets, match, 1);
-arg_types(ets, match_object, 2) ->
-  arg_types(ets, match, 2);
-arg_types(ets, match_object, 3) ->
-  arg_types(ets, match, 3);
-arg_types(ets, match_spec_compile, 1) ->
-  [t_matchspecs()];
-arg_types(ets, match_spec_run_r, 3) ->
-  [t_list(t_tuple()),t_matchspecs(), t_list()];
-arg_types(ets, member, 2) ->
-  [t_tab(), t_any()];
-arg_types(ets, new, 2) ->
-  [t_atom(), t_ets_new_options()];
-arg_types(ets, next, 2) ->
-  [t_tab(), t_any()];
-arg_types(ets, prev, 2) ->
-  [t_tab(), t_any()];
 arg_types(ets, rename, 2) ->
   [t_atom(), t_atom()];
-arg_types(ets, safe_fixtable, 2) ->
-  [t_tab(), t_boolean()];
-arg_types(ets, select, 1) ->
-  [t_any()];
-arg_types(ets, select, 2) ->
-  [t_tab(), t_matchspecs()];
-arg_types(ets, select, 3) ->
-  [t_tab(), t_matchspecs(), t_pos_fixnum()];
-arg_types(ets, select_count, 2) ->
-  [t_tab(), t_matchspecs()];
-arg_types(ets, select_delete, 2) ->
-  [t_tab(), t_matchspecs()];
-arg_types(ets, select_reverse, 1) ->
-  arg_types(ets, select, 1);
-arg_types(ets, select_reverse, 2) ->
-  arg_types(ets, select, 2);
-arg_types(ets, select_reverse, 3) ->
-  arg_types(ets, select, 3);
-arg_types(ets, slot, 2) ->
-  [t_tab(), t_non_neg_fixnum()]; % 2nd arg can be 0
-arg_types(ets, setopts, 2) ->
-  Opt = t_sup([t_tuple([t_atom('heir'), t_pid(), t_any()]),
-	       t_tuple([t_atom('heir'), t_atom('none')]),
-	       t_tuple([t_atom('protection'),
-			t_sup([t_atom('protected'),
-			       t_atom('private'),
-			       t_atom('public')])])]),
-  [t_tab(), t_sup(Opt, t_list(Opt))];
-arg_types(ets, update_counter, 3) ->
-  Int = t_integer(),
-  UpdateOp = t_sup(t_tuple([Int, Int]), t_tuple([Int, Int, Int, Int])),
-  [t_tab(), t_any(), t_sup([UpdateOp, t_list(UpdateOp), Int])];
-arg_types(ets, update_element, 3) ->
-  PosValue = t_tuple([t_integer(), t_any()]),
-  [t_tab(), t_any(), t_sup(PosValue, t_list(PosValue))];
-%%------- file ----------------------------------------------------------------
-arg_types(file, native_name_encoding, 0) ->
-  [];
-%%-- prim_file ----------------------------------------------------------------
-arg_types(prim_file, internal_name2native, 1) ->
-  [t_prim_file_name()];
-arg_types(prim_file, internal_native2name, 1) ->
-  [t_binary()];
-arg_types(prim_file, internal_normalize_utf8, 1) ->
-  [t_binary()];
-%%------- gen_tcp -------------------------------------------------------------
-arg_types(gen_tcp, accept, 1) ->
-  [t_socket()];
-arg_types(gen_tcp, accept, 2) ->
-  [t_socket(), t_timeout()];
-arg_types(gen_tcp, connect, 3) ->
-  [t_gen_tcp_address(), t_gen_tcp_port(), t_list(t_gen_tcp_connect_option())];
-arg_types(gen_tcp, connect, 4) ->
-  arg_types(gen_tcp, connect, 3) ++ [t_timeout()];
-arg_types(gen_tcp, listen, 2) ->
-  [t_gen_tcp_port(), t_list(t_gen_tcp_listen_option())];
-arg_types(gen_tcp, recv, 2) ->
-  [t_socket(), t_non_neg_integer()];
-arg_types(gen_tcp, recv, 3) ->
-  arg_types(gen_tcp, recv, 2) ++ [t_timeout()];
-arg_types(gen_tcp, send, 2) ->
-  [t_socket(), t_packet()];
-arg_types(gen_tcp, shutdown, 2) ->
-  [t_socket(), t_sup([t_atom('read'), t_atom('write'), t_atom('read_write')])];
-%%------- gen_udp -------------------------------------------------------------
-arg_types(gen_udp, open, 1) ->
-  [t_gen_tcp_port()];
-arg_types(gen_udp, open, 2) ->
-  [t_gen_tcp_port(), t_list(t_gen_udp_connect_option())];
-arg_types(gen_udp, recv, 2) ->
-  arg_types(gen_tcp, recv, 2);
-arg_types(gen_udp, recv, 3) ->
-  arg_types(gen_tcp, recv, 3);
-arg_types(gen_udp, send, 4) ->
-  [t_socket(), t_gen_tcp_address(), t_gen_tcp_port(), t_packet()];
 %%------- hipe_bifs -----------------------------------------------------------
 arg_types(hipe_bifs, add_ref, 2) ->
   [t_mfa(), t_tuple([t_mfa(),
@@ -4248,7 +2350,7 @@ arg_types(hipe_bifs, check_crc, 1) ->
 arg_types(hipe_bifs, enter_code, 2) ->
   [t_binary(), t_sup(t_nil(), t_tuple())];
 arg_types(hipe_bifs, enter_sdesc, 1) ->
-  [t_tuple([t_integer(), t_integer(), t_integer(), t_integer(), t_integer()])];
+  [t_tuple([t_integer(), t_integer(), t_integer(), t_integer(), t_integer(), t_mfa()])];
 arg_types(hipe_bifs, find_na_or_make_stub, 2) ->
   [t_mfa(), t_boolean()];
 arg_types(hipe_bifs, fun_to_address, 1) ->
@@ -4282,7 +2384,7 @@ arg_types(hipe_bifs, ref_get, 1) ->
 arg_types(hipe_bifs, ref_set, 2) ->
   [t_hiperef(), t_immediate()];
 arg_types(hipe_bifs, remove_refs_from, 1) ->
-  [t_mfa()];
+  [t_sup([t_mfa(), t_atom('all')])];
 arg_types(hipe_bifs, set_funinfo_native_address, 3) ->
   arg_types(hipe_bifs, set_native_address, 3);
 arg_types(hipe_bifs, set_native_address, 3) ->
@@ -4299,28 +2401,6 @@ arg_types(hipe_bifs, write_u32, 2) ->
   [t_integer(), t_integer()];
 arg_types(hipe_bifs, write_u64, 2) ->
   [t_integer(), t_integer()];
-%%------- io ------------------------------------------------------------------
-arg_types(io, format, 1) ->
-  [t_io_format_string()];
-arg_types(io, format, 2) ->
-  [t_io_format_string(), t_list()];
-arg_types(io, format, 3) ->
-  [t_io_device(), t_io_format_string(), t_list()];
-arg_types(io, fwrite, 1) ->
-  arg_types(io, format, 1);
-arg_types(io, fwrite, 2) ->
-  arg_types(io, format, 2);
-arg_types(io, fwrite, 3) ->
-  arg_types(io, format, 3);
-arg_types(io, put_chars, 1) ->
-  [t_iodata()];
-arg_types(io, put_chars, 2) ->
-  [t_io_device(), t_iodata()];
-%%------- io_lib --------------------------------------------------------------
-arg_types(io_lib, format, 2) ->
-  arg_types(io, format, 2);
-arg_types(io_lib, fwrite, 2) ->
-  arg_types(io_lib, format, 2);
 %%------- lists ---------------------------------------------------------------
 arg_types(lists, all, 2) ->
   [t_fun([t_any()], t_boolean()), t_list()];
@@ -4392,10 +2472,6 @@ arg_types(lists, reverse, 1) ->
   [t_list()];
 arg_types(lists, reverse, 2) ->
   [t_list(), t_any()];
-arg_types(lists, seq, 2) ->
-  [t_integer(), t_integer()];
-arg_types(lists, seq, 3) ->
-  [t_integer(), t_integer(), t_integer()];
 arg_types(lists, sort, 1) ->
   [t_list()];
 arg_types(lists, sort, 2) ->
@@ -4424,97 +2500,12 @@ arg_types(lists, zipwith, 3) ->
   [t_fun([t_any(), t_any()], t_any()), t_list(), t_list()];
 arg_types(lists, zipwith3, 4) ->
   [t_fun([t_any(), t_any(), t_any()], t_any()), t_list(), t_list(), t_list()];
-%%------- math ----------------------------------------------------------------
-arg_types(math, acos, 1) ->
-  [t_number()];
-arg_types(math, acosh, 1) ->
-  [t_number()];
-arg_types(math, asin, 1) ->
-  [t_number()];
-arg_types(math, asinh, 1) ->
-  [t_number()];
-arg_types(math, atan, 1) ->
-  [t_number()];
-arg_types(math, atan2, 2) ->
-  [t_number(), t_number()];
-arg_types(math, atanh, 1) ->
-  [t_number()];
-arg_types(math, cos, 1) ->
-  [t_number()];
-arg_types(math, cosh, 1) ->
-  [t_number()];
-arg_types(math, erf, 1) ->
-  [t_number()];
-arg_types(math, erfc, 1) ->
-  [t_number()];
-arg_types(math, exp, 1) ->
-  [t_number()];
-arg_types(math, log, 1) ->
-  [t_number()];
-arg_types(math, log10, 1) ->
-  [t_number()];
-arg_types(math, pi, 0) ->
-  [];
-arg_types(math, pow, 2) ->
-  [t_number(), t_number()];
-arg_types(math, sin, 1) ->
-  [t_number()];
-arg_types(math, sinh, 1) ->
-  [t_number()];
-arg_types(math, sqrt, 1) ->
-  [t_number()];
-arg_types(math, tan, 1) ->
-  [t_number()];
-arg_types(math, tanh, 1) ->
-  [t_number()];
-%%-- net_kernel ---------------------------------------------------------------
-arg_types(net_kernel, dflag_unicode_io, 1) ->
-  [t_pid()];
-%%------- ordsets -------------------------------------------------------------
-arg_types(ordsets, filter, 2) ->
-  arg_types(lists, filter, 2);
-arg_types(ordsets, fold, 3) ->
-  arg_types(lists, foldl, 3);
-%%------- os ------------------------------------------------------------------
-arg_types(os, getenv, 0) ->
-  [];
-arg_types(os, getenv, 1) ->
-  [t_string()];
-arg_types(os, getpid, 0) ->
-  [];
-arg_types(os, putenv, 2) ->
-  [t_string(), t_string()];
-arg_types(os, timestamp, 0) ->
-  [];
-%%-- re -----------------------------------------------------------------------
-arg_types(re, compile, 1) ->
-  [t_iodata()];
-arg_types(re, compile, 2) ->
-  [t_sup(t_iodata(), t_charlist()), t_list(t_re_compile_option())];
-arg_types(re, run, 2) ->
-  [t_sup(t_iodata(), t_charlist()), t_re_RE()];
-arg_types(re, run, 3) ->
-  [t_sup(t_iodata(), t_charlist()), t_re_RE(), t_list(t_re_run_option())];
+
 %%------- string --------------------------------------------------------------
 arg_types(string, chars, 2) ->
   [t_char(), t_non_neg_integer()];
 arg_types(string, chars, 3) ->
   [t_char(), t_non_neg_integer(), t_any()];
-arg_types(string, concat, 2) ->
-  [t_string(), t_string()];
-arg_types(string, equal, 2) ->
-  [t_string(), t_string()];
-arg_types(string, to_float, 1) ->
-  [t_string()];
-arg_types(string, to_integer, 1) ->
-  [t_string()];
-%%------- unicode -------------------------------------------------------------
-arg_types(unicode, characters_to_binary, 2) ->
-  [t_ML(), t_encoding()];
-arg_types(unicode, characters_to_list, 2) ->
-  [t_ML(), t_encoding()];
-arg_types(unicode, bin_is_7bit, 1) ->
-  [t_binary()];
 %%-----------------------------------------------------------------------------
 arg_types(M, F, A) when is_atom(M), is_atom(F),
 			is_integer(A), 0 =< A, A =< 255 ->
@@ -4574,245 +2565,22 @@ check_fun_application(Fun, Args) ->
 
 
 %% =====================================================================
-%% These are basic types that should probably be moved to erl_types
-%% =====================================================================
-
-t_socket() -> t_port(). % alias
-
-t_ip_address() ->
-  T_int16 = t_from_range(0,  16#FFFF),
-  t_sup(t_tuple([t_byte(), t_byte(), t_byte(), t_byte()]),
-	t_tuple([T_int16, T_int16, T_int16, T_int16,
-		 T_int16, T_int16, T_int16, T_int16])).
-
-%% =====================================================================
 %% Some basic types used in various parts of the system
 %% =====================================================================
 
-t_date() ->
-  t_tuple([t_pos_fixnum(), t_pos_fixnum(), t_pos_fixnum()]).
-
-t_time() ->
-  t_tuple([t_non_neg_fixnum(), t_non_neg_fixnum(), t_non_neg_fixnum()]).
-
-t_timestamp() ->
-  t_tuple([t_non_neg_fixnum(), t_non_neg_fixnum(), t_non_neg_fixnum()]).
-
-t_packet() ->
-  t_sup([t_binary(), t_iolist(), t_httppacket()]).
-
-t_httppacket() ->
-  t_sup([t_HttpRequest(), t_HttpResponse(),
-	 t_HttpHeader(), t_atom('http_eoh'), t_HttpError()]).
-
 t_endian() ->
   t_sup(t_atom('big'), t_atom('little')).
 
 %% =====================================================================
-%% HTTP types documented in R12B-4
-%% =====================================================================
-
-t_HttpRequest() ->
-  t_tuple([t_atom('http_request'), t_HttpMethod(), t_HttpUri(), t_HttpVersion()]).
-
-t_HttpResponse() ->
-   t_tuple([t_atom('http_response'), t_HttpVersion(), t_integer(), t_HttpString()]).
-
-t_HttpHeader() ->
-  t_tuple([t_atom('http_header'), t_integer(), t_HttpField(), t_any(), t_HttpString()]).
-
-t_HttpError() ->
-  t_tuple([t_atom('http_error'), t_HttpString()]).
-
-t_HttpMethod() ->
-  t_sup(t_HttpMethodAtom(), t_HttpString()).
-
-t_HttpMethodAtom() ->
-  t_atoms(['OPTIONS', 'GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'TRACE']).
-
-t_HttpUri() ->
-  t_sup([t_atom('*'),
-	 t_tuple([t_atom('absoluteURI'),
-		  t_sup(t_atom('http'), t_atom('https')),
-		  t_HttpString(),
-		  t_sup(t_non_neg_integer(), t_atom('undefined')),
-		  t_HttpString()]),
-	 t_tuple([t_atom('scheme'), t_HttpString(), t_HttpString()]),
-	 t_tuple([t_atom('abs_path'), t_HttpString()]),
-	 t_HttpString()]).
-
-t_HttpVersion() ->
-  t_tuple([t_non_neg_integer(), t_non_neg_integer()]).
-
-t_HttpField() ->
-  t_sup(t_HttpFieldAtom(), t_HttpString()).
-
-t_HttpFieldAtom() ->
-  t_atoms(['Cache-Control', 'Connection', 'Date', 'Pragma', 'Transfer-Encoding',
-	   'Upgrade', 'Via', 'Accept', 'Accept-Charset', 'Accept-Encoding',
-	   'Accept-Language', 'Authorization', 'From', 'Host',
-	   'If-Modified-Since', 'If-Match', 'If-None-Match', 'If-Range',
-	   'If-Unmodified-Since', 'Max-Forwards', 'Proxy-Authorization',
-	   'Range', 'Referer', 'User-Agent', 'Age', 'Location',
-	   'Proxy-Authenticate', 'Public', 'Retry-After', 'Server', 'Vary',
-	   'Warning', 'Www-Authenticate', 'Allow', 'Content-Base',
-	   'Content-Encoding', 'Content-Language', 'Content-Length',
-	   'Content-Location', 'Content-Md5', 'Content-Range', 'Content-Type',
-	   'Etag', 'Expires', 'Last-Modified', 'Accept-Ranges',
-	   'Set-Cookie', 'Set-Cookie2', 'X-Forwarded-For', 'Cookie',
-	   'Keep-Alive', 'Proxy-Connection']).
-
-t_HttpString() ->
-  t_sup(t_string(), t_binary()).
-
-%% =====================================================================
-%% These are used for the built-in functions of 'binary'
-%% =====================================================================
-
-t_binary_part() ->
-  t_tuple([t_non_neg_integer(), t_integer()]).
-
-t_binary_canonical_part() ->
-  t_tuple([t_non_neg_integer(), t_non_neg_integer()]).
-
-t_binary_pattern() ->
-  t_sup([t_binary(),
-	 t_list(t_binary()),
-	 t_binary_compiled_pattern()]).
-
-t_binary_compiled_pattern() ->
-  t_tuple([t_sup(t_atom('bm'), t_atom('ac')), t_binary()]).
-
-t_binary_options() ->
-  t_list(t_tuple([t_atom('scope'), t_binary_part()])).
-
-%% =====================================================================
-%% These are used for the built-in functions of 'code'
-%% =====================================================================
-
-t_code_load_return(Mod) ->
-  t_sup(t_tuple([t_atom('module'), case t_is_atom(Mod) of
-				     true -> Mod;
-				     false -> t_atom()
-				   end]),
-	t_tuple([t_atom('error'), t_code_load_error_rsn()])).
-
-t_code_load_error_rsn() ->	% also used in erlang:load_module/2
-  t_sup([t_atom('badfile'),
-	 t_atom('nofile'),
-	 t_atom('not_purged'),
-	 t_atom('native_code'),
-	 t_atom('on_load'),
-	 t_atom('sticky_directory')]).	% only for the 'code' functions
-
-%% =====================================================================
 %% These are used for the built-in functions of 'erlang'
 %% =====================================================================
 
-t_adler32() ->
-  t_non_neg_integer().
-
 t_crc32() ->
   t_non_neg_integer().
 
-t_decode_packet_option() ->
-  t_sup([t_tuple([t_atom('packet_size'), t_non_neg_integer()]),
-	 t_tuple([t_atom('line_length'), t_non_neg_integer()])]).
-
-t_decode_packet_type() ->
-  t_sup([t_inet_setoption_packettype(), t_atom('httph'), t_atom('httph_bin')]).
-
-t_dist_exit() ->
-  t_sup([t_atom('kill'), t_atom('noconnection'), t_atom('normal')]).
-
-t_match_spec_test_errors() ->
-  t_list(t_sup(t_tuple([t_atom('error'), t_string()]),
-	       t_tuple([t_atom('warning'), t_string()]))).
-
-t_module_info_2() ->
- t_sup([t_atom('module'),
-	t_atom('imports'),
-	t_atom('exports'),
-	t_atom('functions'),
-	t_atom('attributes'),
-	t_atom('compile'),
-	t_atom('native_addresses')]).
-
-t_pinfo() ->
-  t_sup([t_pinfo_item(), t_list(t_pinfo_item())]).
-
-t_pinfo_item() ->
-  t_sup([t_atom('backtrace'),
-	 t_atom('current_function'),
-	 t_atom('dictionary'),
-	 t_atom('error_handler'),
-	 t_atom('garbage_collection'),
-	 t_atom('group_leader'),
-	 t_atom('heap_size'),
-	 t_atom('initial_call'),
-	 t_atom('last_calls'),
-	 t_atom('links'),
-	 t_atom('memory'),
-	 t_atom('message_binary'),     % for hybrid heap only
-	 t_atom('message_queue_len'),
-	 t_atom('messages'),
-	 t_atom('monitored_by'),
-	 t_atom('monitors'),
-	 t_atom('priority'),
-	 t_atom('reductions'),
-	 t_atom('registered_name'),
-	 t_atom('sequential_trace_token'),
-	 t_atom('stack_size'),
-	 t_atom('status'),
-	 t_atom('suspending'),
-	 t_atom('total_heap_size'),
-	 t_atom('trap_exit')]).
-
-t_process_priority_level() ->
-  t_sup([t_atom('max'), t_atom('high'), t_atom('normal'), t_atom('low')]).
-
-t_process_status() ->
-  t_sup([t_atom('exiting'), t_atom('garbage_collecting'),
-	 t_atom('runnable'), t_atom('running'),
-	 t_atom('suspended'), t_atom('waiting')]).
-
-t_raise_errorclass() ->
-  t_sup([t_atom('error'), t_atom('exit'), t_atom('throw')]).
-
-t_sendoptions() ->
-  t_sup(t_atom('noconnect'), t_atom('nosuspend')).
-
-t_seq_trace_info() ->
-  t_sup([t_atom('send'),
-	 t_atom('receive'),
-	 t_atom('print'),
-	 t_atom('timestamp'),
-	 t_atom('label'),
-	 t_atom('serial')]).
-
-%% XXX: Better if we also maintain correspondencies between infos and values
-t_seq_trace_info_returns() ->
-  Values = t_sup([t_non_neg_integer(), t_boolean(),
-		  t_tuple([t_non_neg_integer(), t_non_neg_integer()])]),
-  t_sup(t_tuple([t_seq_trace_info(), Values]), t_nil()).
-
 t_sequential_tracer() ->
   t_sup([t_atom('false'), t_pid(), t_port()]).
 
-t_spawn_options() ->
-  t_sup([t_atom('link'),
-	 t_atom('monitor'),
-	 t_tuple([t_atom('priority'), t_process_priority_level()]),
-	 t_tuple([t_atom('min_heap_size'), t_fixnum()]),
-	 t_tuple([t_atom('min_bin_vheap_size'), t_fixnum()]),
-	 t_tuple([t_atom('fullsweep_after'), t_fixnum()])]).
-
-t_spawn_opt_return(List) ->
-  case t_is_none(t_inf(t_list(t_atom('monitor')), List)) of
-    true -> t_pid();
-    false -> t_sup(t_pid(), t_tuple([t_pid(), t_reference()]))
-  end.
-
 t_system_cpu_topology() ->
   t_sup(t_atom('undefined'), t_system_cpu_topology_level_entry_list()).
 
@@ -4849,17 +2617,6 @@ t_internal_cpu_topology() -> %% Internal undocumented type
 			t_non_neg_fixnum()])),
 	t_atom('undefined')).
 
-t_scheduler_bind_type_args() ->
-  t_sup([t_atom('default_bind'),
-	 t_atom('no_node_processor_spread'),
-	 t_atom('no_node_thread_spread'),
-	 t_atom('no_spread'),
-	 t_atom('processor_spread'),
-	 t_atom('spread'),
-	 t_atom('thread_spread'),
-	 t_atom('thread_no_node_processor_spread'),
-	 t_atom('unbound')]).
-  
 t_scheduler_bind_type_results() ->
   t_sup([t_atom('no_node_processor_spread'),
 	 t_atom('no_node_thread_spread'),
@@ -4870,160 +2627,9 @@ t_scheduler_bind_type_results() ->
 	 t_atom('thread_no_node_processor_spread'),
 	 t_atom('unbound')]).
 
-t_system_monitor_settings() ->
-  t_sup([t_atom('undefined'),
-	 t_tuple([t_pid(), t_system_monitor_options()])]).
-
-t_system_monitor_options() ->
-  t_list(t_sup([t_atom('busy_port'),
-		t_atom('busy_dist_port'),
-		t_tuple([t_atom('long_gc'), t_integer()]),
-		t_tuple([t_atom('large_heap'), t_integer()])])).
-
 t_system_multi_scheduling() ->
   t_sup([t_atom('blocked'), t_atom('disabled'), t_atom('enabled')]).
 
-t_system_profile_options() ->
-  t_list(t_sup([t_atom('exclusive'),
-		t_atom('runnable_ports'),
-		t_atom('runnable_procs'),
-		t_atom('scheduler')])).
-
-t_system_profile_return() ->
-  t_sup(t_atom('undefined'),
-	t_tuple([t_sup(t_pid(), t_port()), t_system_profile_options()])).
-
-t_system_build_type_return() ->
-  t_sup([t_atom('opt'),
-         t_atom('debug'),
-         t_atom('purify'),
-         t_atom('quantify'),
-         t_atom('purecov'),
-         t_atom('gcov'),
-         t_atom('valgrind'),
-         t_atom('gprof'),
-         t_atom('lcnt')]).
-
-%% =====================================================================
-%% These are used for the built-in functions of 'ets'
-%% =====================================================================
-
-t_tab() ->
-  t_sup(t_tid(), t_atom()).
-
-t_match_pattern() ->
-  t_sup(t_atom(), t_tuple()).
-
-t_matchspecs() ->
-  t_list(t_tuple([t_match_pattern(), t_list(), t_list()])).
-
-t_matchres() ->
-  t_sup(t_tuple([t_list(), t_any()]), t_atom('$end_of_table')).
-
-%% From the 'ets' documentation
-%%-----------------------------
-%%   Option = Type | Access | named_table | {keypos,Pos}
-%%          | {heir,pid(),HeirData} | {heir,none} | Tweaks
-%%     Type = set | ordered_set | bag | duplicate_bag
-%%   Access = public | protected | private
-%%   Tweaks = {write_concurrency,boolean()}
-%%          | {read_concurrency,boolean()} | compressed
-%%      Pos = integer()
-%% HeirData = term()
-t_ets_new_options() ->
-  t_list(t_sup([t_atom('set'),
-		t_atom('ordered_set'),
-		t_atom('bag'),
-		t_atom('duplicate_bag'),
-		t_atom('public'),
-		t_atom('protected'),
-		t_atom('private'),
-		t_atom('named_table'),
-		t_tuple([t_atom('keypos'), t_integer()]),
-		t_tuple([t_atom('heir'), t_pid(), t_any()]),
-		t_tuple([t_atom('heir'), t_atom('none')]),
-		t_tuple([t_atom('write_concurrency'), t_boolean()]),
-		t_tuple([t_atom('read_concurrency'), t_boolean()]),
-		t_atom('compressed')])).
-
-t_ets_info_items() ->
-  t_sup([t_atom('fixed'),
-	 t_atom('safe_fixed'),
-	 t_atom('keypos'),
-	 t_atom('memory'),
-	 t_atom('name'),
-	 t_atom('named_table'),
-	 t_atom('node'),
-	 t_atom('owner'),
-	 t_atom('protection'),
-	 t_atom('size'),
-	 t_atom('compressed'),
-	 t_atom('heir'),
-	 t_atom('stats'),
-	 t_atom('type')]).
-
-%% =====================================================================
-%% These are used for the built-in functions of 'gen_tcp'
-%% =====================================================================
-
-t_gen_tcp_accept() ->
-  t_sup(t_tuple([t_atom('ok'), t_socket()]),
-	t_tuple([t_atom('error'), t_sup([t_atom('closed'),
-					 t_atom('timeout'),
-					 t_inet_posix_error()])])).
-
-t_gen_tcp_address() ->
-  t_sup([t_string(), t_atom(), t_ip_address()]).
-
-t_gen_tcp_port() ->
-  t_from_range(0, 16#FFFF).
-
-t_gen_tcp_connect_option() ->
-  t_sup([t_atom('list'),
-	 t_atom('binary'),
-	 t_tuple([t_atom('ip'), t_ip_address()]),
-	 t_tuple([t_atom('port'), t_gen_tcp_port()]),
-	 t_tuple([t_atom('fd'), t_integer()]),
-	 t_atom('inet6'),
-	 t_atom('inet'),
-	 t_inet_setoption()]).
-
-t_gen_tcp_listen_option() ->
-  t_sup([t_atom('list'),
-	 t_atom('binary'),
-	 t_tuple([t_atom('backlog'), t_non_neg_integer()]),
-	 t_tuple([t_atom('ip'), t_ip_address()]),
-	 t_tuple([t_atom('fd'), t_integer()]),
-	 t_atom('inet6'),
-	 t_atom('inet'),
-	 t_inet_setoption()]).
-
-t_gen_tcp_recv() ->
-  t_sup(t_tuple([t_atom('ok'), t_packet()]),
-	t_tuple([t_atom('error'), t_sup([t_atom('closed'),
-					 t_inet_posix_error()])])).
-
-%% =====================================================================
-%% These are used for the built-in functions of 'gen_udp'
-%% =====================================================================
-
-t_gen_udp_connect_option() ->
-  t_sup([t_atom('list'),
-	 t_atom('binary'),
-	 t_tuple([t_atom('ip'), t_ip_address()]),
-	 t_tuple([t_atom('fd'), t_integer()]),
-	 t_atom('inet6'),
-	 t_atom('inet'),
-	 t_inet_setoption()]).
-
-t_gen_udp_recv() ->
-  t_sup(t_tuple([t_atom('ok'),
-		 t_tuple([t_ip_address(),
-			  t_gen_tcp_port(),
-			  t_packet()])]),
-	t_tuple([t_atom('error'),
-		 t_sup(t_atom('not_owner'), t_inet_posix_error())])).
-
 %% =====================================================================
 %% These are used for the built-in functions of 'hipe_bifs'
 %% =====================================================================
@@ -5056,131 +2662,6 @@ t_insn_type() ->
 	 t_atom('closure')]).
 
 %% =====================================================================
-%% These are used for the built-in functions of 'inet'
-%% =====================================================================
-
-t_inet_setoption() ->
-  t_sup([%% first the 2-tuple options
-	 t_tuple([t_atom('active'), t_sup(t_boolean(), t_atom('once'))]),
-	 t_tuple([t_atom('broadcast'), t_boolean()]),
-	 t_tuple([t_atom('delay_send'), t_boolean()]),
-	 t_tuple([t_atom('dontroute'), t_boolean()]),
-	 t_tuple([t_atom('exit_on_close'), t_boolean()]),
-	 t_tuple([t_atom('header'), t_non_neg_integer()]),
-	 t_tuple([t_atom('keepalive'), t_boolean()]),
-	 t_tuple([t_atom('nodelay'), t_boolean()]),
-	 t_tuple([t_atom('packet'), t_inet_setoption_packettype()]),
-	 t_tuple([t_atom('packet_size'), t_non_neg_integer()]),
-	 t_tuple([t_atom('read_packets'), t_non_neg_integer()]),
-	 t_tuple([t_atom('recbuf'), t_non_neg_integer()]),
-	 t_tuple([t_atom('reuseaddr'), t_boolean()]),
-	 t_tuple([t_atom('send_timeout'), t_non_neg_integer()]),
-	 t_tuple([t_atom('sndbuf'), t_non_neg_integer()]),
-	 t_tuple([t_atom('priority'), t_non_neg_integer()]),
-	 t_tuple([t_atom('tos'), t_non_neg_integer()]),
-	 %% and a 4-tuple option
-	 t_tuple([t_atom('raw'),
-		  t_non_neg_integer(),	% protocol level
-		  t_non_neg_integer(),	% option number
-		  t_binary()])]).	% actual option value
-
-t_inet_setoption_packettype() ->
-  t_sup([t_atom('raw'),
-	 t_integers([0,1,2,4]),
-	 t_atom('asn1'), t_atom('cdr'), t_atom('sunrm'),
-	 t_atom('fcgi'), t_atom('tpkt'), t_atom('line'),
-	 t_atom('http'),
-	 t_atom('http_bin')]).	%% but t_atom('httph') is not needed
-
-t_inet_posix_error() ->
-  t_atom().  %% XXX: Very underspecified
-
-%% =====================================================================
-%% These are used for the built-in functions of 'io'
-%% =====================================================================
-
-t_io_device() ->
-  t_sup(t_atom(), t_pid()).
-
-%% The documentation in R11B-4 reads
-%%	Format ::= atom() | string() | binary()
-%% but the Format can also be a (deep) list, hence the type below
-t_io_format_string() ->
-  t_sup([t_atom(), t_list(), t_binary()]).
-
-%% =====================================================================
-%% These are used for the built-in functions of 're'; the functions
-%% whose last name component starts with a capital letter are types
-%% =====================================================================
-
-t_re_MP() ->  %% it's supposed to be an opaque data type
-  t_tuple([t_atom('re_pattern'), t_integer(), t_integer(), t_binary()]).
-
-t_re_RE() ->
-  t_sup([t_re_MP(), t_iodata(), t_charlist()]).
-
-t_re_compile_option() ->
-  t_sup([t_atoms(['unicode', 'anchored', 'caseless', 'dollar_endonly',
-		  'dotall', 'extended', 'firstline', 'multiline',
-		  'no_auto_capture', 'dupnames', 'ungreedy']),
-	 t_tuple([t_atom('newline'), t_re_NLSpec()]),
-	 t_atoms(['bsr_anycrlf', 'bsr_unicode'])]).
-
-t_re_run_option() ->
-  t_sup([t_atoms(['anchored', 'global', 'notbol', 'noteol', 'notempty']),
-	 t_tuple([t_atom('offset'), t_integer()]),
-	 t_tuple([t_atom('newline'), t_re_NLSpec()]),
-	 t_tuple([t_atom('capture'), t_re_ValueSpec()]),
-	 t_tuple([t_atom('capture'), t_re_ValueSpec(), t_re_Type()]),
-	 t_re_compile_option()]).
-
-t_re_ErrorSpec() ->
-  t_tuple([t_string(), t_non_neg_integer()]).
-
-t_re_Type() ->
-  t_atoms(['index', 'list', 'binary']).
-
-t_re_NLSpec() ->
-  t_atoms(['cr', 'crlf', 'lf', 'anycrlf', 'any']).
-
-t_re_ValueSpec() ->
-  t_sup(t_atoms(['all', 'all_but_first', 'first', 'none']), t_re_ValueList()).
-
-t_re_ValueList() ->
-  t_list(t_sup([t_integer(), t_string(), t_atom()])).
-
-t_re_Captured() ->
-  t_list(t_sup(t_re_CapturedData(), t_list(t_re_CapturedData()))).
-
-t_re_CapturedData() ->
-  t_sup([t_tuple([t_integer(), t_integer()]), t_string(), t_binary()]).
-
-%% =====================================================================
-%% These are used for the built-in functions of 'prim_file'
-%% =====================================================================
-
-t_prim_file_name() ->
-   t_sup(t_unicode_string(), t_binary()).
-
-%% =====================================================================
-%% These are used for the built-in functions of 'unicode'
-%% =====================================================================
-
-t_ML() ->     % a binary or a possibly deep list of integers or binaries
-  t_sup(t_list(t_sup([t_integer(), t_binary(), t_list()])), t_binary()).
-
-t_encoding() ->
-  t_sup([t_atoms(['latin1', 'unicode', 'utf8', 'utf16', 'utf32']),
-	 t_tuple([t_atom('utf16'), t_endian()]),
-	 t_tuple([t_atom('utf32'), t_endian()])]).
-
-t_file_encoding() ->
-  t_atoms(['latin1', 'utf8']).
-
-t_encoding_a2b() -> % for the 2nd arg of atom_to_binary/2 and binary_to_atom/2
-  t_atoms(['latin1', 'unicode', 'utf8']).
-
-%% =====================================================================
 %% Some testing code for ranges below
 %% =====================================================================
 
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index ceec31742e..bc7ea17077 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -275,8 +275,8 @@
 
 -type tag()  :: ?atom_tag | ?binary_tag | ?function_tag | ?identifier_tag
               | ?list_tag | ?matchstate_tag | ?nil_tag | ?number_tag
-              | ?opaque_tag | ?product_tag | ?tuple_tag | ?tuple_set_tag
-              | ?union_tag | ?var_tag.
+              | ?opaque_tag | ?product_tag | ?remote_tag
+              | ?tuple_tag | ?tuple_set_tag | ?union_tag | ?var_tag.
 
 -define(float_qual,     float).
 -define(integer_qual,   integer).
@@ -687,8 +687,8 @@ t_solve_remote(?tuple(Types, _Arity, _Tag), ET, R, C)  ->
   {RL, RR} = list_solve_remote(Types, ET, R, C),
   {t_tuple(RL), RR};
 t_solve_remote(?tuple_set(Set), ET, R, C) ->
-  {NewSet, RR} = tuples_solve_remote(Set, ET, R, C),
-  {?tuple_set(NewSet), RR};
+  {NewTuples, RR} = tuples_solve_remote(Set, ET, R, C),
+  {t_sup(NewTuples), RR};
 t_solve_remote(?remote(Set), ET, R, C) ->
   RemoteList = ordsets:to_list(Set),
   {RL, RR} = list_solve_remote_type(RemoteList, ET, R, C),
@@ -788,10 +788,10 @@ opaques_solve_remote([#opaque{struct = Struct} = Remote|Tail], ET, R, C) ->
 
 tuples_solve_remote([], _ET, _R, _C) ->
   {[], []};
-tuples_solve_remote([{Sz, Tuples}|Tail], ET, R, C) ->
+tuples_solve_remote([{_Sz, Tuples}|Tail], ET, R, C) ->
   {RL, RR1} = list_solve_remote(Tuples, ET, R, C),
   {LSzTpls, RR2} = tuples_solve_remote(Tail, ET, R, C),
-  {[{Sz, RL}|LSzTpls], RR1 ++ RR2}.
+  {RL ++ LSzTpls, RR1 ++ RR2}.
 
 %%-----------------------------------------------------------------------------
 %% Unit type. Signals non termination.
@@ -2318,10 +2318,14 @@ t_inf(?product(_), _, _Mode) ->
   ?none;
 t_inf(_, ?product(_), _Mode) ->
   ?none;
-t_inf(?tuple(?any, ?any, ?any), ?tuple(_, _, _) = T, _Mode) -> T;
-t_inf(?tuple(_, _, _) = T, ?tuple(?any, ?any, ?any), _Mode) -> T;
-t_inf(?tuple(?any, ?any, ?any), ?tuple_set(_) = T, _Mode) -> T;
-t_inf(?tuple_set(_) = T, ?tuple(?any, ?any, ?any), _Mode) -> T;
+t_inf(?tuple(?any, ?any, ?any), ?tuple(_, _, _) = T, _Mode) ->
+  subst_all_vars_to_any(T);
+t_inf(?tuple(_, _, _) = T, ?tuple(?any, ?any, ?any), _Mode) ->
+  subst_all_vars_to_any(T);
+t_inf(?tuple(?any, ?any, ?any), ?tuple_set(_) = T, _Mode) ->
+  subst_all_vars_to_any(T);
+t_inf(?tuple_set(_) = T, ?tuple(?any, ?any, ?any), _Mode) ->
+  subst_all_vars_to_any(T);
 t_inf(?tuple(Elements1, Arity, _Tag1), ?tuple(Elements2, Arity, _Tag2), Mode) ->
   case t_inf_lists_strict(Elements1, Elements2, Mode) of
     bottom -> ?none;
@@ -2555,8 +2559,8 @@ t_subst_dict(?list(Contents, Termination, Size), Dict) ->
 	?nil -> ?list(NewContents, ?nil, Size);
 	?any -> ?list(NewContents, ?any, Size);
 	Other ->
-	  ?list(NewContents, NewTermination, _) = t_cons(NewContents, Other),
-	  ?list(NewContents, NewTermination, Size)
+	  ?list(NewContents2, NewTermination, _) = t_cons(NewContents, Other),
+	  ?list(NewContents2, NewTermination, Size)
       end
   end;
 t_subst_dict(?function(Domain, Range), Dict) ->
@@ -2597,8 +2601,8 @@ t_subst_aux(?list(Contents, Termination, Size), VarMap) ->
 	?nil -> ?list(NewContents, ?nil, Size);
 	?any -> ?list(NewContents, ?any, Size);
 	Other ->
-	  ?list(NewContents, NewTermination, _) = t_cons(NewContents, Other),
-	  ?list(NewContents, NewTermination, Size)
+	  ?list(NewContents2, NewTermination, _) = t_cons(NewContents, Other),
+	  ?list(NewContents2, NewTermination, Size)
       end
   end;
 t_subst_aux(?function(Domain, Range), VarMap) ->
@@ -3186,8 +3190,8 @@ t_abstract_records(?list(Contents, Termination, Size), RecDict) ->
 	?nil -> ?list(NewContents, ?nil, Size);
 	?any -> ?list(NewContents, ?any, Size);
 	Other ->
-	  ?list(NewContents, NewTermination, _) = t_cons(NewContents, Other),
-	  ?list(NewContents, NewTermination, Size)
+	  ?list(NewContents2, NewTermination, _) = t_cons(NewContents, Other),
+	  ?list(NewContents2, NewTermination, Size)
       end
   end;
 t_abstract_records(?function(Domain, Range), RecDict) ->
diff --git a/lib/hipe/doc/src/Makefile b/lib/hipe/doc/src/Makefile
index a9cd583ff4..fbfd4ca327 100644
--- a/lib/hipe/doc/src/Makefile
+++ b/lib/hipe/doc/src/Makefile
@@ -106,12 +106,12 @@ realclean: clean
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
 
 
 release_spec:
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index ed8cf0b8d3..cfd22a9d8d 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2011</year>
+      <year>2006</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,6 +30,66 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
+<section><title>Hipe 3.9.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A faulty spec for process_info/2 could cause false
+	    dialyzer warnings. The spec is corrected.</p>
+          <p>
+	    Own Id: OTP-10584</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Hipe 3.9.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Correct handling of type names in contracts. Fix
+	    crash related to contract checking. Do not rewrite
+	    unchanged PLT. </p>
+          <p>
+	    Own Id: OTP-10083</p>
+        </item>
+        <item>
+          <p>
+	    Changes in comments and minor code cleanups</p>
+          <p>
+	    Thanks to Kostis Sagonas.</p>
+          <p>
+	    Own Id: OTP-10230</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Remove all code, documentation, options and diagnostic
+	    functions which were related to the experimental hybrid
+	    heap implementation.</p>
+          <p>
+	    Own Id: OTP-10105</p>
+        </item>
+        <item>
+	    <p> Bugs in <c>erl_types:t_inf()</c> (HiPE) and in
+	    <c>dialyzer_dataflow</c> (Dialyzer) have been fixed. </p>
+          <p>
+	    Own Id: OTP-10191</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Hipe 3.9.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile
index 1a531fdfe5..75e156b542 100644
--- a/lib/hipe/flow/Makefile
+++ b/lib/hipe/flow/Makefile
@@ -100,10 +100,10 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/flow
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) $(RELSYSDIR)/flow
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/flow"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile
index 0d940d4b28..0f2d6db39b 100644
--- a/lib/hipe/icode/Makefile
+++ b/lib/hipe/icode/Makefile
@@ -118,10 +118,10 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/icode
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/icode
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/icode"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/icode"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/icode/hipe_beam_to_icode.erl b/lib/hipe/icode/hipe_beam_to_icode.erl
index a44171b2f5..81249c958e 100644
--- a/lib/hipe/icode/hipe_beam_to_icode.erl
+++ b/lib/hipe/icode/hipe_beam_to_icode.erl
@@ -41,6 +41,9 @@
 %%
 %%-ifndef(DEBUG).
 %%-define(DEBUG,6).
+%% Choose one of two tracing methods
+%%-define(DEBUG_BIF_CALL_TRACE,true).
+%%-define(IO_FORMAT_CALL_TRACE,true).
 %%-endif.
 
 -include("../main/hipe.hrl").
@@ -51,8 +54,27 @@
 -define(no_debug_msg(Str,Xs),ok).
 %%-define(no_debug_msg(Str,Xs),msg(Str,Xs)).
 
--define(mk_debugcode(MFA, Env, Code),
-	case MFA of
+-ifdef(DEBUG_BIF_CALL_TRACE).
+
+%% Use BIF hipe_bifs_debug_native_called_2 to trace function calls
+mk_debug_calltrace({_M,_F,A}=MFA, Env, Code) ->
+    MFAVar = mk_var(new),
+    Ignore = mk_var(new),    
+    MkMfa = hipe_icode:mk_move(MFAVar,hipe_icode:mk_const(MFA)),
+    Args = [mk_var({x,I-1}) || I <- lists:seq(1,A)],
+    ArgTup = mk_var(new),
+    MkArgTup = hipe_icode:mk_primop([ArgTup], mktuple, Args),
+    Call = hipe_icode:mk_primop([Ignore], debug_native_called,
+				[MFAVar,ArgTup]),
+    {[MkMfa,MkArgTup,Call | Code], Env}.
+
+-endif.
+
+-ifdef(IO_FORMAT_CALL_TRACE).
+
+%% Use io:format to trace function calls
+mk_debug_calltrace(MFA, Env, Code) ->
+    case MFA of
 	  {io,_,_} ->
 	    %% We do not want to loop infinitely if we are compiling
 	    %% the module io.
@@ -69,15 +91,16 @@
 	    Call =
 	      hipe_icode:mk_call([Ignore],io,format,[StringVar,MFAVar],remote),
 	    {[MkMfa,MkString,Call | Code], Env}
-	end).
+    end.
+-endif.
+
 
 %%-----------------------------------------------------------------------
-%% Exported types
+%% Types
 %%-----------------------------------------------------------------------
 
 -type hipe_beam_to_icode_ret() :: [{mfa(),#icode{}}].
 
-
 %%-----------------------------------------------------------------------
 %% Internal data structures
 %%-----------------------------------------------------------------------
@@ -127,7 +150,7 @@ trans_mfa_code(M,F,A, FunBeamCode, ClosureInfo) ->
   MFA = {M,F,A},
   %% Debug code
   ?IF_DEBUG_LEVEL(5,
-		  {Code3,_Env3} = ?mk_debugcode(MFA, Env2, Code2),
+		  {Code3,_Env3} = mk_debug_calltrace(MFA, Env1, Code2),
 		  {Code3,_Env3} = {Code2,Env1}),
   %% For stack optimization
   Leafness = leafness(Code3),
@@ -315,19 +338,19 @@ trans_fun([{call_ext_last,_N,{extfunc,M,F,A},_}|Instructions], Env) ->
 %%--- bif0 ---
 trans_fun([{bif,BifName,nofail,[],Reg}|Instructions], Env) ->
   BifInst = trans_bif0(BifName,Reg),
-  [hipe_icode:mk_comment({bif0,BifName}),BifInst|trans_fun(Instructions,Env)];
+  [BifInst|trans_fun(Instructions,Env)];
 %%--- bif1 ---
 trans_fun([{bif,BifName,{f,Lbl},[_] = Args,Reg}|Instructions], Env) ->
   {BifInsts,Env1} = trans_bif(1,BifName,Lbl,Args,Reg,Env),
-  [hipe_icode:mk_comment({bif1,BifName})|BifInsts] ++ trans_fun(Instructions,Env1);
+  BifInsts ++ trans_fun(Instructions,Env1);
 %%--- bif2 ---
 trans_fun([{bif,BifName,{f,Lbl},[_,_] = Args,Reg}|Instructions], Env) ->
   {BifInsts,Env1} = trans_bif(2,BifName,Lbl,Args,Reg,Env),
-  [hipe_icode:mk_comment({bif2,BifName})|BifInsts] ++ trans_fun(Instructions,Env1);
+  BifInsts ++ trans_fun(Instructions,Env1);
 %%--- bif3 ---
 trans_fun([{bif,BifName,{f,Lbl},[_,_,_] = Args,Reg}|Instructions], Env) ->
   {BifInsts,Env1} = trans_bif(3,BifName,Lbl,Args,Reg,Env),
-  [hipe_icode:mk_comment({bif3,BifName})|BifInsts] ++ trans_fun(Instructions,Env1);
+  BifInsts ++ trans_fun(Instructions,Env1);
 %%--- allocate
 trans_fun([{allocate,StackSlots,_}|Instructions], Env) ->
   trans_allocate(StackSlots) ++ trans_fun(Instructions,Env);
@@ -816,7 +839,7 @@ trans_fun([{test,bs_test_tail2,{f,Lbl},[Ms,Numbits]}| Instructions], Env) ->
   trans_op_call({hipe_bs_primop,{bs_test_tail,Numbits}}, 
 		Lbl, [MsVar], [], Env, Instructions);
 %%--------------------------------------------------------------------
-%% New bit syntax instructions added in February 2004 (R10B).
+%% bit syntax instructions added in February 2004 (R10B).
 %%--------------------------------------------------------------------
 trans_fun([{bs_init2,{f,Lbl},Size,_Words,_LiveRegs,{field_flags,Flags0},X}|
 	   Instructions], Env) ->
@@ -1031,7 +1054,7 @@ trans_fun([{arithfbif,fnegate,Lab,[SrcR],DestR}|Instructions], Env) ->
       trans_fun([{arithbif,'-',Lab,[{float,0.0},SrcR],DestR}|Instructions], Env)
   end;
 %%--------------------------------------------------------------------
-%% New apply instructions added in April 2004 (R10B).
+%% apply instructions added in April 2004 (R10B).
 %%--------------------------------------------------------------------
 trans_fun([{apply,Arity}|Instructions], Env) ->
   BeamArgs = extract_fun_args(Arity+2), %% +2 is for M and F
@@ -1047,21 +1070,21 @@ trans_fun([{apply_last,Arity,_N}|Instructions], Env) -> % N is StackAdjustment?
    hipe_icode:mk_enter_primop(#apply_N{arity=Arity}, [M,F|Args])
    | trans_fun(Instructions,Env)];
 %%--------------------------------------------------------------------
-%% New test instruction added in April 2004 (R10B).
+%% test for boolean added in April 2004 (R10B).
 %%--------------------------------------------------------------------
 %%--- is_boolean ---
 trans_fun([{test,is_boolean,{f,Lbl},[Arg]}|Instructions], Env) ->
   {Code,Env1} = trans_type_test(boolean,Lbl,Arg,Env),
   [Code | trans_fun(Instructions,Env1)];
 %%--------------------------------------------------------------------
-%% New test instruction added in June 2005 for R11
+%% test for function with specific arity added in June 2005 (R11).
 %%--------------------------------------------------------------------
 %%--- is_function2 ---
 trans_fun([{test,is_function2,{f,Lbl},[Arg,Arity]}|Instructions], Env) ->
   {Code,Env1} = trans_type_test2(function2,Lbl,Arg,Arity,Env),
   [Code | trans_fun(Instructions,Env1)];
 %%--------------------------------------------------------------------
-%% New garbage-collecting BIFs added in January 2006 for R11B.
+%% garbage collecting BIFs added in January 2006 (R11B).
 %%--------------------------------------------------------------------
 trans_fun([{gc_bif,'-',Fail,_Live,[SrcR],DstR}|Instructions], Env) ->
   %% Unary minus. Change this to binary minus.
@@ -1079,21 +1102,21 @@ trans_fun([{gc_bif,Name,Fail,_Live,SrcRs,DstR}|Instructions], Env) ->
       trans_fun([{bif,Name,Fail,SrcRs,DstR}|Instructions], Env)
   end;
 %%--------------------------------------------------------------------
-%% New test instruction added in July 2007 for R12.
+%% test for bitstream added in July 2007 (R12).
 %%--------------------------------------------------------------------
 %%--- is_bitstr ---
 trans_fun([{test,is_bitstr,{f,Lbl},[Arg]}|Instructions], Env) ->
   {Code,Env1} = trans_type_test(bitstr, Lbl, Arg, Env),
   [Code | trans_fun(Instructions, Env1)];
 %%--------------------------------------------------------------------
-%% New stack triming instruction added in October 2007 for R12.
+%% stack triming instruction added in October 2007 (R12).
 %%--------------------------------------------------------------------
 trans_fun([{trim,N,NY}|Instructions], Env) ->
   %% trim away N registers leaving NY registers
   Moves = trans_trim(N, NY),
   Moves ++ trans_fun(Instructions, Env);
 %%--------------------------------------------------------------------
-%% New line/1 instruction in R15.
+%% line instruction added in Fall 2012 (R15).
 %%--------------------------------------------------------------------
 trans_fun([{line,_}|Instructions], Env) ->
   trans_fun(Instructions,Env);
@@ -1297,7 +1320,7 @@ trans_bin([{bs_put_integer,{f,Lbl},Size,Unit,{field_flags,Flags0},Source}|
   SrcInstrs ++ trans_bin_call({hipe_bs_primop, Name}, 
 			     Lbl, [Src|Args], [Offset], Base, Offset, Env2, Instructions);
 %%----------------------------------------------------------------
-%% New binary construction instructions added in R12B-5 (Fall 2008).
+%% binary construction instructions added in Fall 2008 (R12B-5).
 %%----------------------------------------------------------------
 trans_bin([{bs_put_utf8,{f,Lbl},_FF,A3}|Instructions], Base, Offset, Env) ->
   Src = trans_arg(A3),
@@ -1348,7 +1371,7 @@ trans_bs_get_or_skip_utf32(Lbl, Ms, Flags0, X, Instructions, Env) ->
 		      Lbl, [Dst,MsVar], [MsVar], Env1, Instructions).
 
 %%-----------------------------------------------------------------------
-%% trans_arith(Op, SrcVars, Des, Lab, Env) -> { Icode, NewEnv }
+%% trans_arith(Op, SrcVars, Des, Lab, Env) -> {Icode, NewEnv}
 %%     A failure label of type {f,0} means in a body.
 %%     A failure label of type {f,L} where L>0 means in a guard.
 %%        Within a guard a failure should branch to the next guard and
@@ -1454,7 +1477,7 @@ clone_dst(Dest) ->
 
 
 %%-----------------------------------------------------------------------
-%% trans_type_test(Test, Lbl, Arg, Env) -> { Icode, NewEnv }
+%% trans_type_test(Test, Lbl, Arg, Env) -> {Icode, NewEnv}
 %%     Handles all unary type tests like is_integer etc. 
 %%-----------------------------------------------------------------------
 
@@ -1466,7 +1489,7 @@ trans_type_test(Test, Lbl, Arg, Env) ->
   {[Move,I,True],Env1}.
 
 %%
-%% This handles binary type tests. Currently, the only such is the new
+%% This handles binary type tests. Currently, the only such is the
 %% is_function/2 BIF.
 %%
 trans_type_test2(function2, Lbl, Arg, Arity, Env) ->
@@ -1479,7 +1502,7 @@ trans_type_test2(function2, Lbl, Arg, Arity, Env) ->
 
 %%-----------------------------------------------------------------------
 %% trans_puts(Code, Environment) -> 
-%%            { Movs, Code, Vars, NewEnv }
+%%            {Movs, Code, Vars, NewEnv}
 %%-----------------------------------------------------------------------
 
 trans_puts(Code, Env) ->
diff --git a/lib/hipe/icode/hipe_icode.hrl b/lib/hipe/icode/hipe_icode.hrl
index 65deaf6d7c..d76eebf78d 100644
--- a/lib/hipe/icode/hipe_icode.hrl
+++ b/lib/hipe/icode/hipe_icode.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -64,9 +64,9 @@
 -type icode_if_op()  :: '>' | '<' | '>=' | '=<' | '=:=' | '=/=' | '==' | '/='
                       | 'fixnum_eq' | 'fixnum_neq' | 'fixnum_lt'
                       | 'fixnum_le' | 'fixnum_ge' | 'fixnum_gt' 
-                      | 'suspend_msg_timeout'.
+                      | 'op_exact_eqeq_2' | 'suspend_msg_timeout'.
 
--type icode_type_test()	:: 'atom' | 'bignum' | 'binary' | 'bitrst' | 'boolean'
+-type icode_type_test()	:: 'atom' | 'bignum' | 'binary' | 'bitstr' | 'boolean'
                          | 'cons' | 'constant' | 'fixnum' | 'float'
                          | 'function' | 'function2' | 'integer' | 'list' | 'nil'
                          | 'number' | 'pid' | 'port' | 'reference' | 'tuple'
@@ -88,7 +88,7 @@
 -type icode_call_type()   :: 'local' | 'primop' | 'remote'.
 -type icode_exit_class()  :: 'error' | 'exit' | 'rethrow' | 'throw'.
 
--type icode_comment_text() :: atom() | string() | {atom(), term()}.
+-type icode_comment_text() :: atom() | string().
 
 -type icode_info() :: [{'arg_types', [erl_types:erl_type()]}].
 
diff --git a/lib/hipe/icode/hipe_icode_primops.erl b/lib/hipe/icode/hipe_icode_primops.erl
index a413531c07..b0113fc556 100644
--- a/lib/hipe/icode/hipe_icode_primops.erl
+++ b/lib/hipe/icode/hipe_icode_primops.erl
@@ -137,7 +137,8 @@ is_safe({hipe_bs_primop, {bs_private_append, _, _}}) -> false;
 is_safe({hipe_bs_primop, bs_init_writable}) -> true;
 is_safe(#mkfun{}) -> true;
 is_safe(#unsafe_element{}) -> true;
-is_safe(#unsafe_update_element{}) -> true.
+is_safe(#unsafe_update_element{}) -> true;
+is_safe(debug_native_called) -> false.
 
 
 -spec fails(icode_funcall()) -> boolean().
@@ -237,6 +238,7 @@ fails({hipe_bs_primop, bs_init_writable}) -> true;
 fails(#mkfun{}) -> false;
 fails(#unsafe_element{}) -> false;
 fails(#unsafe_update_element{}) -> false;
+fails(debug_native_called) -> false;
 %% Apparently, we are calling fails/1 for all MFAs which are compiled.
 %% This is weird and we should restructure the compiler to avoid
 %% calling fails/1 for things that are not primops.
@@ -721,6 +723,8 @@ type(Primop, Args) ->
       erl_types:t_any();
     redtest ->
       erl_types:t_any();
+    debug_native_called ->
+      erl_types:t_any();
     {M, F, A} ->
       erl_bif_types:type(M, F, A, Args)
   end.
@@ -893,6 +897,8 @@ type(Primop) ->
       erl_types:t_any();
     redtest ->
       erl_types:t_any();
+    debug_native_called ->
+      erl_types:t_any();
     {M, F, A} ->
       erl_bif_types:type(M, F, A)
   end.
diff --git a/lib/hipe/icode/hipe_icode_type.erl b/lib/hipe/icode/hipe_icode_type.erl
index f98d859822..046949d2f2 100644
--- a/lib/hipe/icode/hipe_icode_type.erl
+++ b/lib/hipe/icode/hipe_icode_type.erl
@@ -79,13 +79,13 @@
 -import(erl_types, [number_min/1, number_max/1,
 		    t_any/0, t_atom/1, t_atom/0, t_atom_vals/1,
 		    t_binary/0, t_bitstr/0, t_bitstr_base/1, t_bitstr_unit/1, 
-		    t_boolean/0, t_cons/0, t_constant/0,
+		    t_boolean/0, t_cons/0,
 		    t_float/0, t_from_term/1, t_from_range/2,
 		    t_fun/0, t_fun/1, t_fun/2, t_fun_args/1, t_fun_arity/1, 
 		    t_inf/2, t_inf_lists/2, t_integer/0,
 		    t_integer/1, t_is_atom/1, t_is_any/1,
 		    t_is_binary/1, t_is_bitstr/1, t_is_bitwidth/1, t_is_boolean/1,
-		    t_is_fixnum/1, t_is_cons/1, t_is_constant/1,
+		    t_is_fixnum/1, t_is_cons/1,
 		    t_is_maybe_improper_list/1, t_is_equal/2, t_is_float/1,
 		    t_is_fun/1, t_is_integer/1, t_is_non_neg_integer/1, 
 		    t_is_number/1, t_is_matchstate/1,
@@ -587,7 +587,6 @@ do_type(I, Info, Var) ->
   TrueLab = hipe_icode:type_true_label(I),
   FalseLab = hipe_icode:type_false_label(I),
   None = t_none(),
-  
   case lookup(Var, Info) of
     None ->
       [{TrueLab, Info}, {FalseLab, Info}];
@@ -1699,7 +1698,6 @@ lookup_list0([H|T], Info, Acc) ->
 lookup_list0([], _, Acc) ->
   lists:reverse(Acc).
 
-
 %% safe_lookup treats anything that is neither in the map nor a
 %% constant as t_any(). Use this during transformations.
 
diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile
index fc8923db6c..673431a175 100644
--- a/lib/hipe/main/Makefile
+++ b/lib/hipe/main/Makefile
@@ -115,10 +115,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DATA) ../vsn.mk $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/main
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/main
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/main"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/main"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
diff --git a/lib/hipe/main/hipe.app.src b/lib/hipe/main/hipe.app.src
index d38b9ea7b1..7db4db8a57 100644
--- a/lib/hipe/main/hipe.app.src
+++ b/lib/hipe/main/hipe.app.src
@@ -24,7 +24,6 @@
   {modules, [cerl_cconv,
 	     cerl_closurean,
 	     cerl_hipeify,
-	     cerl_hybrid_transform,
 	     cerl_lib,
 	     cerl_messagean,
 	     cerl_pmatch,
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index c73db872ac..b2789978a4 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -482,12 +482,7 @@ compile(Name, File, Opts0) when is_atom(Name) ->
 
 compile_core(Name, Core0, File, Opts) ->
   Core = cerl:from_records(Core0),
-  Core1 = case (erlang:system_info(heap_type) =:= hybrid)
-	    andalso proplists:get_bool(hybrid, Opts) of
-	    true -> cerl_hybrid_transform:transform(Core, Opts);
-	    false -> Core
-	  end,
-  compile(Name, Core1, File, Opts).
+  compile(Name, Core, File, Opts).
 
 %% @spec compile(Name, Core, File, options()) ->
 %%           {ok, {Target, Binary}} | {error, Reason}
diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile
index 98a69d62c7..16166f552c 100644
--- a/lib/hipe/misc/Makefile
+++ b/lib/hipe/misc/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2001-2010. All Rights Reserved.
+# Copyright Ericsson AB 2001-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -100,10 +100,10 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/misc
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/misc
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/misc"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/misc"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/opt/Makefile b/lib/hipe/opt/Makefile
index 426afd8052..a21c543574 100644
--- a/lib/hipe/opt/Makefile
+++ b/lib/hipe/opt/Makefile
@@ -97,8 +97,8 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/ppc/Makefile b/lib/hipe/ppc/Makefile
index c4b0c3ba9d..8bd2a8226c 100644
--- a/lib/hipe/ppc/Makefile
+++ b/lib/hipe/ppc/Makefile
@@ -108,8 +108,8 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/regalloc/Makefile b/lib/hipe/regalloc/Makefile
index d33f641640..d4be79ea85 100644
--- a/lib/hipe/regalloc/Makefile
+++ b/lib/hipe/regalloc/Makefile
@@ -112,8 +112,8 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
index 30026831b7..426d1bd3ee 100644
--- a/lib/hipe/rtl/Makefile
+++ b/lib/hipe/rtl/Makefile
@@ -103,10 +103,10 @@ realclean: clean
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/rtl
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/rtl
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/rtl"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/rtl"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/rtl/hipe_rtl_primops.erl b/lib/hipe/rtl/hipe_rtl_primops.erl
index 5f273d8251..53aaa72aa6 100644
--- a/lib/hipe/rtl/hipe_rtl_primops.erl
+++ b/lib/hipe/rtl/hipe_rtl_primops.erl
@@ -396,6 +396,8 @@ gen_primop({Op,Dst,Args,Cont,Fail}, IsGuard, ConstTab) ->
 	      [Dst1]->
 		hipe_tagscheme:unsafe_tag_float(Dst1, Arg)
 	    end;
+	  debug_native_called -> 
+	    [hipe_rtl:mk_call(Dst, Op, Args, Cont, Fail, not_remote)];
 
 	  %% Only names listed above are accepted! MFA:s are not primops!
 	  _ ->
diff --git a/lib/hipe/sparc/Makefile b/lib/hipe/sparc/Makefile
index e9e9d54e0c..eb40117691 100644
--- a/lib/hipe/sparc/Makefile
+++ b/lib/hipe/sparc/Makefile
@@ -108,8 +108,8 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/sparc/hipe_rtl_to_sparc.erl b/lib/hipe/sparc/hipe_rtl_to_sparc.erl
index df5e2b0077..dc001f865e 100644
--- a/lib/hipe/sparc/hipe_rtl_to_sparc.erl
+++ b/lib/hipe/sparc/hipe_rtl_to_sparc.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -19,6 +19,7 @@
 %%
 
 -module(hipe_rtl_to_sparc).
+
 -export([translate/1]).
 
 -include("../rtl/hipe_rtl.hrl").
@@ -142,8 +143,7 @@ mk_fload_rr(Base1, Base2, Dst) ->
 mk_fload_ii(Base1, Base2, Dst) ->
   io:format("~w: RTL fload with two immediates\n", [?MODULE]),
   Tmp = new_untagged_temp(),
-  mk_set(Base1, Tmp,
-	 mk_fload_ri(Tmp, Base2, Dst)).
+  mk_set(Base1, Tmp, mk_fload_ri(Tmp, Base2, Dst)).
 
 mk_fload_ri(Base, Disp, Dst) ->
   hipe_sparc:mk_fload(Base, Disp, Dst, 'new').
@@ -239,8 +239,7 @@ mk_alu_ii(XAluOp, Src1, Src2, Dst) ->
   io:format("~w: ALU with two immediates (~w ~w ~w ~w)\n",
 	    [?MODULE, XAluOp, Src1, Src2, Dst]),
   Tmp = new_untagged_temp(),
-  mk_set(Src1, Tmp,
-	 mk_alu_ri(XAluOp, Tmp, Src2, Dst)).
+  mk_set(Src1, Tmp, mk_alu_ri(XAluOp, Tmp, Src2, Dst)).
 
 mk_alu_ir(XAluOp, Src1, Src2, Dst) ->
   case xaluop_commutes(XAluOp) of
@@ -249,8 +248,7 @@ mk_alu_ir(XAluOp, Src1, Src2, Dst) ->
        true};
     _ ->
       Tmp = new_untagged_temp(),
-      {mk_set(Src1, Tmp,
-	      mk_alu_rs(XAluOp, Tmp, Src2, Dst)),
+      {mk_set(Src1, Tmp, mk_alu_rs(XAluOp, Tmp, Src2, Dst)),
        false}
   end.
 
@@ -274,8 +272,7 @@ mk_arith_ri(XAluOp, Src1, Src2, Dst) when is_integer(Src2) ->
       mk_alu_rs(XAluOp, Src1, hipe_sparc:mk_simm13(Src2), Dst);
      true ->
       Tmp = new_untagged_temp(),
-      mk_set(Src2, Tmp,
-	     mk_alu_rs(XAluOp, Src1, Tmp, Dst))
+      mk_set(Src2, Tmp, mk_alu_rs(XAluOp, Src1, Tmp, Dst))
   end.
 
 mk_alu_rs(XAluOp, Src1, Src2, Dst) ->
@@ -623,8 +620,7 @@ mk_move(Src, Dst, Tail) ->
 conv_return(I, Map, Data) ->
   %% TODO: multiple-value returns
   {[Arg], Map0} = conv_src_list(hipe_rtl:return_varlist(I), Map),
-  I2 = mk_move(Arg, hipe_sparc:mk_rv(),
-	       [hipe_sparc:mk_pseudo_ret()]),
+  I2 = mk_move(Arg, hipe_sparc:mk_rv(), [hipe_sparc:mk_pseudo_ret()]),
   {I2, Map0, Data}.
 
 conv_store(I, Map, Data) ->
@@ -648,8 +644,7 @@ mk_store(StOp, Src, Base1, Base2) ->
       mk_store2(StOp, Src, Base1, Base2);
     _ ->
       Tmp = new_untagged_temp(),
-      mk_set(Src, Tmp,
-	     mk_store2(StOp, Tmp, Base1, Base2))
+      mk_set(Src, Tmp, mk_store2(StOp, Tmp, Base1, Base2))
   end.
 
 mk_store2(StOp, Src, Base1, Base2) ->
@@ -674,8 +669,7 @@ conv_switch(I, Map, Data) ->
       [] ->
 	hipe_consttab:insert_block(Data, word, LMap);
       SortOrder ->
-	hipe_consttab:insert_sorted_block(
-	  Data, word, LMap, SortOrder)
+	hipe_consttab:insert_sorted_block(Data, word, LMap, SortOrder)
     end,
   %% no immediates allowed here
   {IndexR, Map1} = conv_dst(hipe_rtl:switch_src(I), Map),
@@ -722,7 +716,7 @@ conv_aluop(RtlAluOp) ->
 
 xaluop_commutes(XAluOp) ->
   case XAluOp of
-    'cmp' -> true;
+    %% 'cmp' -> true;
     'cmpcc' -> true;
     'add' -> true;
     'addcc' -> true;
@@ -739,16 +733,16 @@ xaluop_commutes(XAluOp) ->
     'sll' -> false;
     'srl' -> false;
     'sra' -> false;
-    'sllx' -> false;
-    'srlx' -> false;
-    'srax' -> false;
+    %% 'sllx' -> false;
+    %% 'srlx' -> false;
+    %% 'srax' -> false;
     'ldsb' -> true;
     'ldsh' -> true;
-    'ldsw' -> true;
+    %% 'ldsw' -> true;
     'ldub' -> true;
     'lduh' -> true;
-    'lduw' -> true;
-    'ldx' -> true
+    'lduw' -> true
+    %% 'ldx' -> true
   end.
 
 %%% Check if an extended SPARC AluOp is a shift.
diff --git a/lib/hipe/tools/Makefile b/lib/hipe/tools/Makefile
index f90d3c9f70..3ce8ad5dd7 100644
--- a/lib/hipe/tools/Makefile
+++ b/lib/hipe/tools/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2002-2011. All Rights Reserved.
+# Copyright Ericsson AB 2002-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -96,8 +96,8 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile
index 2f17eee7f3..a5ee232057 100644
--- a/lib/hipe/util/Makefile
+++ b/lib/hipe/util/Makefile
@@ -103,10 +103,10 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/util
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/util
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/util"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/util"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index e296997466..f3e2e695b5 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.9.1
+HIPE_VSN = 3.9.3
diff --git a/lib/hipe/x86/Makefile b/lib/hipe/x86/Makefile
index f92e7eeec1..3602949944 100644
--- a/lib/hipe/x86/Makefile
+++ b/lib/hipe/x86/Makefile
@@ -116,8 +116,8 @@ $(DOCS)/%.html:%.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
index 5e034c47c6..de46eadb3b 100644
--- a/lib/ic/c_src/Makefile.in
+++ b/lib/ic/c_src/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1998-2011. All Rights Reserved.
+# Copyright Ericsson AB 1998-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -140,12 +140,12 @@ $(OBJDIR)/%.o: %.c
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/c_src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
-	$(INSTALL_DATA) ic.c ic_tmo.c $(RELSYSDIR)/c_src
-	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(LIBRARY) $(RELSYSDIR)/priv/lib
+	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+	$(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src"
+	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib"
 
 release_docs_spec:
 
diff --git a/lib/ic/doc/src/Makefile b/lib/ic/doc/src/Makefile
index 208f16e441..af76cdeaaa 100644
--- a/lib/ic/doc/src/Makefile
+++ b/lib/ic/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1998-2011. All Rights Reserved.
+# Copyright Ericsson AB 1998-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -220,12 +220,12 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	(/bin/cp -rf  $(HTMLDIR) $(RELSYSDIR)/doc)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	(/bin/cp -rf  $(HTMLDIR) "$(RELSYSDIR)/doc")
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/ic/doc/src/ic_clib.xml b/lib/ic/doc/src/ic_clib.xml
index b557c4b5f6..ebeaabae91 100644
--- a/lib/ic/doc/src/ic_clib.xml
+++ b/lib/ic/doc/src/ic_clib.xml
@@ -4,7 +4,7 @@
 <cref>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -41,7 +41,7 @@
   </section>
   <funcs>
     <func>
-      <name><ret>CORBA_Environment*</ret><nametext>CORBA_Environment_alloc(int inbufsz, int outbufsz)</nametext></name>
+      <name><ret>CORBA_Environment *</ret><nametext>CORBA_Environment_alloc(int inbufsz, int outbufsz)</nametext></name>
       <fsummary>Allocate environment data.</fsummary>
       <desc>
         <p>This function is used to allocate and initiate the
@@ -79,14 +79,14 @@
       </desc>
     </func>
     <func>
-      <name><ret>CORBA_char*</ret><nametext>CORBA_string_alloc(CORBA_unsigned_long len)</nametext></name>
+      <name><ret>CORBA_char *</ret><nametext>CORBA_string_alloc(CORBA_unsigned_long len)</nametext></name>
       <fsummary>Allocate a string.</fsummary>
       <desc>
         <p>Allocates a (simple) CORBA character string of length <c>len + 1</c>.</p>
       </desc>
     </func>
     <func>
-      <name><ret>CORBA_wchar*</ret><nametext>CORBA_wstring_alloc(CORBA_unsigned_long len)</nametext></name>
+      <name><ret>CORBA_wchar *</ret><nametext>CORBA_wstring_alloc(CORBA_unsigned_long len)</nametext></name>
       <fsummary>Allocate a wide string.</fsummary>
       <desc>
         <p>Allocates a CORBA wide string of length <c>len + 1</c>.</p>
@@ -101,7 +101,7 @@
   </section>
   <funcs>
     <func>
-      <name><ret>CORBA_char*</ret><nametext>CORBA_exception_id(CORBA_Environment *env)</nametext></name>
+      <name><ret>CORBA_char *</ret><nametext>CORBA_exception_id(CORBA_Environment *env)</nametext></name>
       <fsummary>Get exception identity.</fsummary>
       <desc>
         <p>Returns the exception identity if an exception is set, otherwise
@@ -109,7 +109,7 @@
       </desc>
     </func>
     <func>
-      <name><ret>void*</ret><nametext>CORBA_exception_value(CORBA_Environment *env)</nametext></name>
+      <name><ret>void *</ret><nametext>CORBA_exception_value(CORBA_Environment *env)</nametext></name>
       <fsummary>Get exception value.</fsummary>
       <desc>
         <p>Returns the exception value, if an exception is set, otherwise
@@ -160,7 +160,7 @@
       </desc>
     </func>
     <func>
-      <name><ret>oe_map_t*</ret><nametext>oe_merge_maps(oe_map_t *maps, int size)</nametext></name>
+      <name><ret>oe_map_t *</ret><nametext>oe_merge_maps(oe_map_t *maps, int size)</nametext></name>
       <fsummary>Merge an array of server maps to one single map.</fsummary>
       <desc>
         <p>Merge an array of server maps to one single map.</p>
diff --git a/lib/ic/doc/src/notes.xml b/lib/ic/doc/src/notes.xml
index eac932fc06..3ac35aa0e5 100644
--- a/lib/ic/doc/src/notes.xml
+++ b/lib/ic/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1998</year><year>2011</year>
+      <year>1998</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,7 +30,29 @@
     <file>notes.xml</file>
   </header>
 
-   <section><title>IC 4.2.30</title>
+   <section><title>IC 4.2.31</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bug where the ic pre-processor would ignore
+	    whitespace quoting.</p>
+          <p>
+	    Own Id: OTP-10109</p>
+        </item>
+        <item>
+	    <p> A bug regarding spaces in C function prototypes has
+	    been fixed. (Thanks to Richard O'Keefe.) </p>
+          <p>
+	    Own Id: OTP-10138</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>IC 4.2.30</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/ic/examples/pre_post_condition/Makefile b/lib/ic/examples/pre_post_condition/Makefile
index 8f85babb1a..d18f81fec9 100644
--- a/lib/ic/examples/pre_post_condition/Makefile
+++ b/lib/ic/examples/pre_post_condition/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -124,8 +124,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/pre_post_condition
-	$(INSTALL_DATA) $(ERL_FILES) $(IDL_FILES) $(TXT_FILES) $(RELSYSDIR)/examples/pre_post_condition
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/pre_post_condition"
+	$(INSTALL_DATA) $(ERL_FILES) $(IDL_FILES) $(TXT_FILES) "$(RELSYSDIR)/examples/pre_post_condition"
 
 
 release_docs_spec:
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
index f730749ccb..cf4c353f3f 100644
--- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2009. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -109,10 +109,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/java_src/com/ericsson/otp/ic
-	$(INSTALL_DATA) $(JAVA_FILES) $(RELSYSDIR)/java_src/com/ericsson/otp/ic
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
+	$(INSTALL_DATA) $(JAVA_FILES) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile
index 5dac304e32..280d86a8a4 100644
--- a/lib/ic/src/Makefile
+++ b/lib/ic/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1998-2009. All Rights Reserved.
+# Copyright Ericsson AB 1998-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -196,23 +196,23 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/c-client
-	$(INSTALL_DATA) $(CCL_EX_FILES) $(RELSYSDIR)/examples/c-client	
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/c-server
-	$(INSTALL_DATA) $(CSRV_EX_FILES) $(RELSYSDIR)/examples/c-server	
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/erl-plain
-	$(INSTALL_DATA) $(EPL_EX_FILES) $(RELSYSDIR)/examples/erl-plain
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/erl-genserv
-	$(INSTALL_DATA) $(ESRV_EX_FILES) $(RELSYSDIR)/examples/erl-genserv	
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/java-client-server
-	$(INSTALL_DATA) $(JAVA_EX_FILES) $(RELSYSDIR)/examples/java-client-server
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/all-against-all
-	$(INSTALL_DATA) $(MIXED_EX_FILES) $(RELSYSDIR)/examples/all-against-all
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client"
+	$(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-server"
+	$(INSTALL_DATA) $(CSRV_EX_FILES) "$(RELSYSDIR)/examples/c-server"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/erl-plain"
+	$(INSTALL_DATA) $(EPL_EX_FILES) "$(RELSYSDIR)/examples/erl-plain"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/erl-genserv"
+	$(INSTALL_DATA) $(ESRV_EX_FILES) "$(RELSYSDIR)/examples/erl-genserv"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/java-client-server"
+	$(INSTALL_DATA) $(JAVA_EX_FILES) "$(RELSYSDIR)/examples/java-client-server"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/all-against-all"
+	$(INSTALL_DATA) $(MIXED_EX_FILES) "$(RELSYSDIR)/examples/all-against-all"
 
 release_docs_spec:
 
diff --git a/lib/ic/src/ic.erl b/lib/ic/src/ic.erl
index 50fad921c4..c0742cf7bd 100644
--- a/lib/ic/src/ic.erl
+++ b/lib/ic/src/ic.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -250,7 +250,7 @@ make_erl_options(Opts) ->
     Optimize = Opts#options.optimize,
     PreProc = 
 	lists:flatten(
-	  lists:map(fun(D) -> io_lib:format("-I~s ", [ic_util:to_list(D)]) end, 
+	  lists:map(fun(D) -> io_lib:format("-I\"~s\" ", [ic_util:to_list(D)]) end,
 		    Includes1)++
 	  lists:map(
 	    fun ({Name, Value}) ->
diff --git a/lib/ic/src/ic_pp.erl b/lib/ic/src/ic_pp.erl
index 8b53473caa..54701f7438 100644
--- a/lib/ic/src/ic_pp.erl
+++ b/lib/ic/src/ic_pp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1894,23 +1894,37 @@ include_dir(Flags) when is_list(Flags)->
 include_dir(_Flags) ->
     [].
     
-include_dir(Flags,IncDir) ->
+include_dir(Flags,IncDirs) ->
     case string:str(Flags,"-I") of
 	0 ->
-	    lists:reverse(IncDir);
+	    lists:reverse(IncDirs);
 	X ->
-	    Rem2 = string:sub_string(Flags, X+2),
-	    Rem = string:strip(Rem2, left),
-	    Y = string:str(Rem," "),
-	    case string:str(Rem," ") of
-		0 ->
-		    lists:reverse([string:sub_string(Rem, Y+1)|IncDir]);
-		Y ->
-		    include_dir(string:sub_string(Rem, Y+1), 
-				[string:sub_string(Rem,1,Y-1)|IncDir])
-	    end
+	    {NewDir, RemainingFlags} =
+		gobble_inc_dir(string:sub_string(Flags, X+2),nq,[]),
+	    include_dir(RemainingFlags, [NewDir|IncDirs])
     end.
 
+% nq = not-quoted, q = quoted.
+% Possible strange scenarios:
+%  /usr/test\ ing/
+%  "/usr/test ing/"
+%  /usr/test\"ing/
+%  "/usr/test\"ing/"
+gobble_inc_dir([],nq,Acc) ->
+    % Only accept nq here, if we end up here in q mode the user has missed a "
+    {lists:reverse(Acc),[]};
+gobble_inc_dir([$\\,$"|R],Q,Acc) ->
+    gobble_inc_dir(R,Q,[$"|Acc]);
+gobble_inc_dir([$"|R],nq,Acc) ->
+    gobble_inc_dir(R,q,Acc);
+gobble_inc_dir([$"|R],q,Acc) ->
+    gobble_inc_dir(R,nq,Acc);
+gobble_inc_dir([$\\,$ |R],nq,Acc) ->
+    gobble_inc_dir(R,nq,[$ |Acc]);
+gobble_inc_dir([$ |R],nq,Acc) ->
+    {lists:reverse(Acc),R};
+gobble_inc_dir([C|R],Q,Acc) ->
+    gobble_inc_dir(R,Q,[C|Acc]).
 
 
 %%===============================================================
@@ -1954,7 +1968,6 @@ find_inc_file2(FileName, [D|Rem]) ->
 	      _ ->
 		  D++"/"
 	  end,
-
     case catch file:read_file_info(Dir++FileName) of
 	{ok, _} ->
 	    {ok, Dir++FileName};
diff --git a/lib/ic/test/Makefile b/lib/ic/test/Makefile
index 1d90a1bc17..54ac186c16 100644
--- a/lib/ic/test/Makefile
+++ b/lib/ic/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1998-2011. All Rights Reserved.
+# Copyright Ericsson AB 1998-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -239,39 +239,39 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/ic_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/ic_register_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/ic_pragma_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/ic_pp_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/ic_be_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/c_client_erl_server_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/c_client_erl_server_proto_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/c_client_erl_server_proto_tmo_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/erl_client_c_server_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/erl_client_c_server_proto_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/java_client_erl_server_SUITE_data
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ic_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ic_register_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ic_pragma_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ic_pp_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ic_be_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/c_client_erl_server_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/c_client_erl_server_proto_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/c_client_erl_server_proto_tmo_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/erl_client_c_server_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/erl_client_c_server_proto_SUITE_data"
+	$(INSTALL_DIR) "$(RELSYSDIR)/java_client_erl_server_SUITE_data"
 	$(INSTALL_DATA) $(IDL_FILES)  ic.cover $(TEST_SPEC_FILE) $(ERL_FILES) \
-		$(RELSYSDIR)
-	$(INSTALL_DATA) $(COMPILER_TEST_FILES) $(RELSYSDIR)/ic_SUITE_data
+		"$(RELSYSDIR)"
+	$(INSTALL_DATA) $(COMPILER_TEST_FILES) "$(RELSYSDIR)/ic_SUITE_data"
 	$(INSTALL_DATA) $(COMPILER_TEST_FILES2) \
-		$(RELSYSDIR)/ic_register_SUITE_data
+		"$(RELSYSDIR)/ic_register_SUITE_data"
 	$(INSTALL_DATA) $(COMPILER_TEST_FILES3) \
-		$(RELSYSDIR)/ic_pragma_SUITE_data
+		"$(RELSYSDIR)/ic_pragma_SUITE_data"
 	$(INSTALL_DATA) $(COMPILER_TEST_FILES4) \
-		$(RELSYSDIR)/ic_be_SUITE_data	
+		"$(RELSYSDIR)/ic_be_SUITE_data"
 	$(INSTALL_DATA) $(PREPROCESSOR_TEST_FILES) \
-		$(RELSYSDIR)/ic_pp_SUITE_data	
+		"$(RELSYSDIR)/ic_pp_SUITE_data"
 	$(INSTALL_DATA) $(C_CLIENT_ERL_SERVER_TEST_FILES) \
-		$(RELSYSDIR)/c_client_erl_server_SUITE_data	
+		"$(RELSYSDIR)/c_client_erl_server_SUITE_data"
 	$(INSTALL_DATA) $(C_CLIENT_ERL_SERVER_PROTO_TEST_FILES) \
-		$(RELSYSDIR)/c_client_erl_server_proto_SUITE_data	
+		"$(RELSYSDIR)/c_client_erl_server_proto_SUITE_data"
 	$(INSTALL_DATA) $(C_CLIENT_ERL_SERVER_PROTO_TMO_TEST_FILES) \
-		$(RELSYSDIR)/c_client_erl_server_proto_tmo_SUITE_data	
+		"$(RELSYSDIR)/c_client_erl_server_proto_tmo_SUITE_data"
 	$(INSTALL_DATA) $(ERL_CLIENT_C_SERVER_TEST_FILES) \
-		$(RELSYSDIR)/erl_client_c_server_SUITE_data	
+		"$(RELSYSDIR)/erl_client_c_server_SUITE_data"
 	$(INSTALL_DATA) $(ERL_CLIENT_C_SERVER_PROTO_TEST_FILES) \
-		$(RELSYSDIR)/erl_client_c_server_proto_SUITE_data	
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
+		"$(RELSYSDIR)/erl_client_c_server_proto_SUITE_data"
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(JAVA_CLIENT_ERL_SERVER_TEST_FILES) \
-		$(RELSYSDIR)/java_client_erl_server_SUITE_data
+		"$(RELSYSDIR)/java_client_erl_server_SUITE_data"
diff --git a/lib/ic/test/java_client_erl_server_SUITE.erl b/lib/ic/test/java_client_erl_server_SUITE.erl
index 407c3d2d44..9e49305c3c 100644
--- a/lib/ic/test/java_client_erl_server_SUITE.erl
+++ b/lib/ic/test/java_client_erl_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -62,9 +62,14 @@ init_per_suite(Config) when is_list(Config) ->
     case case code:priv_dir(jinterface) of
 	     {error,bad_name} -> 
 		 false;
-	     P -> 
-		 filelib:is_dir(P) 
-	 end 
+	     P ->
+		 case filelib:wildcard(filename:join(P, "*.jar")) of
+		     [_|_] ->
+			 true;
+		     [] ->
+			 false
+		 end
+	 end
 	of
 	true -> 
 	    case find_executable(["java"]) of
@@ -249,7 +254,7 @@ marshal_any_2(Config) when is_list(Config) ->
 
 
 java(Java, Dir, ClassAndArgs) ->
-    cmd(Java++" -classpath "++classpath(Dir)++" "++ClassAndArgs).
+    cmd(Java++" -classpath \""++classpath(Dir)++"\" "++ClassAndArgs).
 
 java(Java, Dir, Class, Args) ->
     java(Java, Dir, Class++" "++to_string(Args)).
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
index c106261efd..3143ab427b 100644
--- a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
+++ b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
@@ -66,8 +66,11 @@ CLASS_FILES = $(JAVA_FILES:.java=.class)
 ERL_FILES = $(GEN_ERL_FILES) m_i_impl.erl
 EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
-
+@IFEQ@ (@jinterface_classpath@,)
+all:
+@ELSE@
 all: $(CLASS_FILES) $(EBINS)
+@ENDIF@
 
 $(GEN_ERL_FILES) $(GEN_HRL_FILES):  java_erl_test.built_erl
 $(GEN_JAVA_FILES): java_erl_test.built_java
diff --git a/lib/ic/vsn.mk b/lib/ic/vsn.mk
index fc1475974e..0dbf5a1f52 100644
--- a/lib/ic/vsn.mk
+++ b/lib/ic/vsn.mk
@@ -1 +1 @@
-IC_VSN = 4.2.30
+IC_VSN = 4.2.31
diff --git a/lib/inets/doc/src/Makefile b/lib/inets/doc/src/Makefile
index b3a98fd6d5..1a8e1c7ca8 100644
--- a/lib/inets/doc/src/Makefile
+++ b/lib/inets/doc/src/Makefile
@@ -140,13 +140,13 @@ clean_man:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(HTMLDIR)/* $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(HTMLDIR)/* "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index 70c845bade..741f2abaef 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -43,8 +43,12 @@
 	cookies and other options that can be applied to more than one
 	request. </p>
 
-      <p>If the scheme
-	https is used the ssl application needs to be started.</p>
+	<p>If the scheme https is used the ssl application needs to be
+	started. When https links needs to go through a proxy the
+	CONNECT method extension to HTTP-1.1 is used to establish a
+	tunnel and then the connection is upgraded to TLS,
+	however "TLS upgrade" according to RFC 2817 is not
+	supported.</p>
 
       <p>Also note that pipelining will only be used if the pipeline
       timeout is set, otherwise persistent connections without
@@ -449,7 +453,8 @@ apply(Module, Function, [ReplyInfo | Args])
       <type>
         <v>Options = [Option]</v>
         <v>Option = {proxy,                 {Proxy, NoProxy}} | 
-                    {max_sessions,          MaxSessions} |
+                    {https_proxy,           {Proxy, NoProxy}} | 
+	            {max_sessions,          MaxSessions} |
 	            {max_keep_alive_length, MaxKeepAlive} | 
                     {keep_alive_timeout,    KeepAliveTimeout} |
 	            {max_pipeline_length,   MaxPipeline} |  
@@ -460,86 +465,94 @@ apply(Module, Function, [ReplyInfo | Args])
                     {port,                  Port} | 
                     {socket_opts,           socket_opts()} | 
                     {verbose,               VerboseMode} </v>
+		    
         <v>Proxy = {Hostname, Port}</v>
         <v>Hostname = string() </v>
         <d>ex: "localhost" or "foo.bar.se"</d>
         <v>Port = integer()</v>
         <d>ex: 8080 </d>
-        <v>socket_opts() = [socket_opt()]</v>
-        <d>The options are appended to the socket options used by the 
-          client. </d>
-        <d>These are the default values when a new request handler
-          is started (for the initial connect). They are passed directly 
-          to the underlying transport (gen_tcp or ssl) <em>without</em> 
-          verification! </d>
         <v>NoProxy = [NoProxyDesc]</v>
         <v>NoProxyDesc = DomainDesc | HostName | IPDesc</v>
         <v>DomainDesc = "*.Domain"</v>
         <d>ex: "*.ericsson.se"</d>
         <v>IpDesc = string()</v>
         <d>ex: "134.138" or "[FEDC:BA98" (all IP-addresses starting with 134.138 or FEDC:BA98), "66.35.250.150" or "[2010:836B:4179::836B:4179]" (a complete IP-address).</d>
-        <v>MaxSessions = integer() </v>
+
+	<d>proxy defaults to {undefined, []} e.i. no proxy is configured and https_proxy defaults to
+	the value of proxy.</d>
+	
+	<v>MaxSessions = integer() </v>
         <d>Default is <c>2</c>.
-          Maximum number of persistent connections to a host.</d>
+	Maximum number of persistent connections to a host.</d>
 	<v>MaxKeepAlive = integer() </v>
-        <d>Default is <c>5</c>.
-          Maximum number of outstanding requests on the same connection to 
-          a host.</d>
-        <v>KeepAliveTimeout = integer() </v>
-        <d>Default is <c>120000</c> (= 2 min).
-          If a persistent connection is idle longer than the 
-          <c>keep_alive_timeout</c> the client will close the connection.
-          The server may also have such a time out but you should
-          not count on it!</d>
+	<d>Default is <c>5</c>.
+	Maximum number of outstanding requests on the same connection to 
+	a host.</d>
+	<v>KeepAliveTimeout = integer() </v>
+	<d>Default is <c>120000</c> (= 2 min).
+	If a persistent connection is idle longer than the 
+	<c>keep_alive_timeout</c> in milliseconds, 
+	the client will close the connection.
+	The server may also have such a time out but you should
+	not count on it!</d>
 	<v>MaxPipeline = integer() </v>
-        <d>Default is <c>2</c>.
-          Maximum number of outstanding requests on a pipelined connection to a host.</d>
-        <v>PipelineTimeout = integer() </v>
-        <d>Default is <c>0</c>,
-          which will result in pipelining not being used. 
-          If a persistent connection is idle longer than the 
-          <c>pipeline_timeout</c> the client will close the connection. </d>
+	<d>Default is <c>2</c>.
+	Maximum number of outstanding requests on a pipelined connection 
+	to a host.</d>
+	<v>PipelineTimeout = integer() </v>
+	<d>Default is <c>0</c>,
+	which will result in pipelining not being used. 
+	If a persistent connection is idle longer than the 
+	<c>pipeline_timeout</c> in milliseconds, 
+	the client will close the connection. </d>
         <v>CookieMode = enabled | disabled | verify </v>
         <d>Default is <c>disabled</c>.
-          If Cookies are enabled all valid cookies will automatically be 
-          saved in the client manager's cookie database. 
-          If the option <c>verify</c> is used the function <c>store_cookies/2</c>
-          has to be called for the cookies to be saved.</d>
-        <v>IpFamily = inet | inet6 | inet6fb4 </v>
-        <d>By default <c>inet</c>.
-          When it is set to <c>inet6fb4</c> you can use both ipv4 and ipv6. 
-          It first tries <c>inet6</c> and if that does not works falls back to <c>inet</c>. 
-          The option is here to provide a workaround for buggy ipv6 stacks to ensure that 
-          ipv4 will always work.</d>
+	If Cookies are enabled all valid cookies will automatically be 
+	saved in the client manager's cookie database. 
+	If the option <c>verify</c> is used the function <c>store_cookies/2</c>
+	has to be called for the cookies to be saved.</d>
+	<v>IpFamily = inet | inet6 | inet6fb4 </v>
+	<d>By default <c>inet</c>.
+	When it is set to <c>inet6fb4</c> you can use both ipv4 and ipv6. 
+	It first tries <c>inet6</c> and if that does not works falls back to <c>inet</c>. 
+	The option is here to provide a workaround for buggy ipv6 stacks to ensure that 
+	ipv4 will always work.</d>
 	<v>IpAddress = ip_address() </v>
-        <d>If the host has several network interfaces, this option specifies which one to use. 
-          See <seealso marker="kernel:gen_tcp#connect">gen_tcp:connect/3,4</seealso> for more info. </d>
+	<d>If the host has several network interfaces, this option specifies which one to use. 
+	See <seealso marker="kernel:gen_tcp#connect">gen_tcp:connect/3,4</seealso> for more info. </d>
 	<v>Port = integer() </v>
-        <d>Specify which local port number to use. 
-          See <seealso marker="kernel:gen_tcp#connect">gen_tcp:connect/3,4</seealso> for more info. </d>
-        <v>VerboseMode = false | verbose | debug | trace </v>
-        <d>Default is <c>false</c>.
-          This option is used to switch on (or off) 
-          different levels of erlang trace on the client. 
-          It is a debug feature.</d>
+	<d>Specify which local port number to use. 
+	See <seealso marker="kernel:gen_tcp#connect">gen_tcp:connect/3,4</seealso> for more info. </d>
+	<v>socket_opts() = [socket_opt()]</v>
+	<d>The options are appended to the socket options used by the 
+	client. </d>
+	<d>These are the default values when a new request handler
+	is started (for the initial connect). They are passed directly 
+          to the underlying transport (gen_tcp or ssl) <em>without</em> 
+	verification! </d>
+	<v>VerboseMode = false | verbose | debug | trace </v>
+	<d>Default is <c>false</c>.
+	This option is used to switch on (or off) 
+	different levels of erlang trace on the client. 
+	It is a debug feature.</d>
 	<v>Profile = profile() | pid() (when started <c>stand_alone</c>)</v>
       </type>
       <desc>
-        <p>Sets options to be used for subsequent requests.</p>
-        <note>
-          <p>If possible the client will keep its connections
-            alive and use persistent connections
-	    with  or without pipeline depending on configuration
-	    and current circumstances. The HTTP/1.1 specification does not
-            provide a guideline for how many requests would be
-            ideal to be sent on a persistent connection,
-	    this very much depends on the
-            application. Note that a very long queue of requests may cause a
-            user perceived delay as earlier requests may take a long time
-            to complete. The HTTP/1.1 specification does suggest a
-            limit of 2 persistent connections per server, which is the
-            default value of the <c>max_sessions</c> option. </p>
-        </note>
+	<p>Sets options to be used for subsequent requests.</p>
+	<note>
+	  <p>If possible the client will keep its connections
+	  alive and use persistent connections
+	  with  or without pipeline depending on configuration
+	  and current circumstances. The HTTP/1.1 specification does not
+	  provide a guideline for how many requests would be
+	  ideal to be sent on a persistent connection,
+	  this very much depends on the
+	  application. Note that a very long queue of requests may cause a
+	  user perceived delay as earlier requests may take a long time
+	  to complete. The HTTP/1.1 specification does suggest a
+	  limit of 2 persistent connections per server, which is the
+	  default value of the <c>max_sessions</c> option. </p>
+	</note>
 
         <marker id="get_options"></marker>
       </desc>
@@ -551,7 +564,8 @@ apply(Module, Function, [ReplyInfo | Args])
       <fsummary>Gets the currently used options.</fsummary>
       <type>
         <v>OptionItems = all | [option_item()]</v>
-	<v>option_item() = proxy | 
+	<v>option_item() = proxy |
+	                   https_proxy
                            max_sessions | 
 			   keep_alive_timeout | 
 	                   max_keep_alive_length | 
@@ -648,6 +662,8 @@ apply(Module, Function, [ReplyInfo | Args])
         <p>Resets (clears) the cookie database for the specified 
 	<c>Profile</c>. If no profile is specified the default profile 
 	will be used. </p>
+
+        <marker id="which_cookies"></marker>
       </desc>
     </func>
 
@@ -667,6 +683,42 @@ apply(Module, Function, [ReplyInfo | Args])
         <p>This function produces a list of the entire cookie database.
 	It is intended for debugging/testing purposes. 
 	If no profile is specified the default profile will be used. </p>
+
+        <marker id="which_sessions"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>which_sessions() -> session_info()</name>
+      <name>which_sessions(Profile) -> session_info()</name>
+      <fsummary>Produces a slightly processed dump of the sessions database.</fsummary>
+      <type>
+	<v>Profile = profile() | pid() (when started <c>stand_alone</c>)</v>
+	<v>session_info() = {GoodSessions, BadSessions, NonSessions}</v>
+	<v>GoodSessions = session()</v>
+	<v>BadSessions = tuple()</v>
+	<v>NonSessions = term()</v>
+      </type>
+      <desc>
+        <p>This function produces a slightly processed dump of the session 
+	database. It is intended for debugging. 
+	If no profile is specified the default profile will be used. </p>
+
+        <marker id="info"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>info() -> list()</name>
+      <name>info(Profile) -> list()</name>
+      <fsummary>Produces a list of miscelleneous info</fsummary>
+      <type>
+	<v>Profile = profile() | pid() (when started <c>stand_alone</c>)</v>
+      </type>
+      <desc>
+        <p>This function produces a list of miscelleneous info. 
+	It is intended for debugging. 
+	If no profile is specified the default profile will be used. </p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index 7e21229fcf..3fced5dfcd 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -178,7 +178,13 @@
         <p>Note that this option is only used when the option 
 	<c>socket_type</c> has the value <c>ip_comm</c>. </p>
       </item>
-
+      <marker id="prop_minimum_bytes_per_second"></marker>
+      <tag>{minimum_bytes_per_second, integer()}</tag>
+      <item>
+	<p>If given, sets a minimum bytes per second value for connections.</p>
+	<p>If the value is not reached, the socket will close for that connection.</p>
+	<p>The option is good for reducing the risk of "slow dos" attacks.</p>
+      </item>
     </taglist>
 
     <marker id="props_api_modules"></marker>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index dfdeb4016c..e0d6ae3454 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-
+      
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-
+      
     </legalnotice>
     
     <title>Inets Release Notes</title>
@@ -32,16 +32,113 @@
     <file>notes.xml</file>
   </header>
   
-
-  <section><title>Inets 5.9</title>
+  
+  <section><title>Inets 5.9.2</title>
 
     <section><title>Improvements and New Features</title>
-<!--
-    <p>-</p>
--->
+      <list>
+        <item>
+          <p>
+	    Minimum bytes per second</p>
+          <p>
+	    New option to http server, {minimum_bytes_per_second,
+	    integer()}, for a connection, if it is not reached the
+	    socket will close for that specific connection. Can be
+	    used to prevent hanging requests from faulty clients.</p>
+          <p>
+	    Own Id: OTP-10392</p>
+        </item>
+      </list>
+    </section>
+
+</section>
 
+<section>
+    <title>Inets 5.9.1</title>
+  
+    <section>
+      <title>Improvements and New Features</title>
+      <!--
+	  <p>-</p>
+      -->
+      
       <list>
         <item>
+          <p>Better handling of errorI(s) during update of the session 
+	  database. </p>
+	  <p>Also added and updated some debugging functions 
+	  <seealso marker="httpc#which_sessions">which_sessions/10,1</seealso>
+	  and 
+	  <seealso marker="httpc#info">info/0</seealso>. </p>
+	  <p>Own Id: OTP-10093</p>
+          <p>Aux Id: Seq 12062</p>
+        </item>
+
+	<item>
+	  <p>Removed R14B compatible version of (inets-service and
+	  tftp) behaviour definition. </p>
+	  <p>Own Id: OTP-10095</p>
+	</item>
+	
+	<item>
+	  <p>[httpc] Documentation of KeepAlive and Pipeline timeout 
+	  options have been improved. </p>
+	  <p>Own Id: OTP-10114</p>
+	</item>
+      </list>
+      
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <!--
+      <p>-</p>
+      -->
+	  
+      <list>
+        <item>
+          <p>[httpc] Cancel request does not work due to incorrect 
+	  handler table creation (wrong keypos). </p>
+	  <p>Vyacheslav Vorobyov</p>
+	  <p>Own Id: OTP-10092</p>
+        </item>
+
+      </list>
+
+    </section>
+    
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+	
+    <!--
+	<list>
+	<item>
+	<p>[httpc|httpd] The old ssl implementation (based on OpenSSL), 
+	has been deprecated. The config option that specified usage of 
+	this version of the ssl app, <c>ossl</c>, has been removed. </p>
+	<p>Own Id: OTP-9522</p>
+	</item>
+	
+	</list>
+    -->
+	
+    </section>
+    
+  </section> <!-- 5.9.1 -->
+  
+  
+  <section>
+    <title>Inets 5.9</title>
+    
+    <section>
+      <title>Improvements and New Features</title>
+      <!--
+	  <p>-</p>
+      -->
+      
+      <list>
+	<item>
           <p>[httpd] Make the server header configurable with new config
 	  option 
 	  <seealso marker="httpd#prop_server_tokens">server_tokens</seealso>.
@@ -102,11 +199,11 @@
 
     </section>
 
+<!--
     <section>
       <title>Incompatibilities</title>
       <p>-</p>
 
-<!--
       <list>
         <item>
           <p>[httpc|httpd] The old ssl implementation (based on OpenSSL), 
@@ -116,9 +213,9 @@
         </item>
 
       </list>
--->
 
     </section>
+-->
 
   </section> <!-- 5.9 -->
 
@@ -285,31 +382,6 @@
 
     </section>
 
-    <section>
-      <title>Incompatibilities</title>
-<!--
-      <p>-</p>
--->
-
-      <list>
-        <item>
-          <p>[httpc] Deprecated interface module <c>http</c> has been removed. 
-	  It has (long) been replaced by http client interface module 
-	  <seealso marker="httpc#">httpc</seealso>. </p>
-	  <p>Own Id: OTP-9359</p>
-        </item>
-
-        <item>
-          <p>[httpc|httpd] The old ssl implementation (based on OpenSSL), 
-	  has been deprecated. The config option that specified usage of 
-	  this version of the ssl app, <c>ossl</c>, has been removed. </p>
-	  <p>Own Id: OTP-9522</p>
-        </item>
-
-      </list>
-
-    </section>
-
     <section><title>Fixed Bugs and Malfunctions</title>
 <!--
     <p>-</p>
@@ -332,6 +404,24 @@
       </list>
     </section>
   
+<!--
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+      <list>
+        <item>
+          <p>[httpc] Deprecated interface module <c>http</c> has been removed. 
+	  It has (long) been replaced by http client interface module 
+	  <seealso marker="httpc#">httpc</seealso>. </p>
+	  <p>Own Id: OTP-9359</p>
+        </item>
+
+      </list>
+
+    </section>
+-->
+
   </section> <!-- 5.7.2 -->
 
 
diff --git a/lib/inets/examples/httpd_load_test/Makefile b/lib/inets/examples/httpd_load_test/Makefile
index 1cc61ad8ae..abd2d8c35d 100644
--- a/lib/inets/examples/httpd_load_test/Makefile
+++ b/lib/inets/examples/httpd_load_test/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010. All Rights Reserved.
+# Copyright Ericsson AB 2010-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -34,7 +34,7 @@ VSN=$(INETS_VSN)
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR         = $(RELEASE_PATH)/lib/inets-$(VSN)
-EXAMPLE_RELSYSDIR = $(RELSYSDIR)/examples
+EXAMPLE_RELSYSDIR = "$(RELSYSDIR)/examples"
 HDLT_RELSYSDIR    = $(EXAMPLE_RELSYSDIR)/httpd_load_test
 
 
diff --git a/lib/inets/examples/server_root/Makefile b/lib/inets/examples/server_root/Makefile
index d7a3231068..7a0ee78ecf 100644
--- a/lib/inets/examples/server_root/Makefile
+++ b/lib/inets/examples/server_root/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2010. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -174,36 +174,36 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/auth
-	$(INSTALL_DATA) $(AUTH_FILES) $(RELSYSDIR)/examples/server_root/auth
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/cgi-bin
-	$(INSTALL_SCRIPT) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/conf
-	$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/examples/server_root/conf
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/open
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/auth"
+	$(INSTALL_DATA) $(AUTH_FILES) "$(RELSYSDIR)/examples/server_root/auth"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/cgi-bin"
+	$(INSTALL_SCRIPT) $(CGI_FILES) "$(RELSYSDIR)/examples/server_root/cgi-bin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/conf"
+	$(INSTALL_DATA) $(CONF_FILES) "$(RELSYSDIR)/examples/server_root/conf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/htdocs/open"
 	$(INSTALL_DATA) $(OPEN_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/open
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
+		"$(RELSYSDIR)/examples/server_root/htdocs/open"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/htdocs/mnesia_open"
 	$(INSTALL_DATA) $(MNESIA_OPEN_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/misc
+		"$(RELSYSDIR)/examples/server_root/htdocs/mnesia_open"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/htdocs/misc"
 	$(INSTALL_DATA) $(MISC_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/misc
+		"$(RELSYSDIR)/examples/server_root/htdocs/misc"
 	$(INSTALL_DIR)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/secret/top_secret
+		"$(RELSYSDIR)/examples/server_root/htdocs/secret/top_secret"
 	$(INSTALL_DIR)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret/top_secret
+		"$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret/top_secret"
 	$(INSTALL_DATA) $(SECRET_FILES)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/secret
+		"$(RELSYSDIR)/examples/server_root/htdocs/secret"
 	$(INSTALL_DATA) $(MNESIA_SECRET_FILES)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs
-	$(INSTALL_DATA) $(HTDOCS_FILES) $(RELSYSDIR)/examples/server_root/htdocs
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/icons
-	$(INSTALL_DATA) $(ICON_FILES) $(RELSYSDIR)/examples/server_root/icons
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/ssl
-	$(INSTALL_DATA) $(SSL_FILES) $(RELSYSDIR)/examples/server_root/ssl
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/logs
+		"$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/htdocs"
+	$(INSTALL_DATA) $(HTDOCS_FILES) "$(RELSYSDIR)/examples/server_root/htdocs"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/icons"
+	$(INSTALL_DATA) $(ICON_FILES) "$(RELSYSDIR)/examples/server_root/icons"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/ssl"
+	$(INSTALL_DATA) $(SSL_FILES) "$(RELSYSDIR)/examples/server_root/ssl"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/server_root/logs"
 
 release_docs_spec:
 
diff --git a/lib/inets/priv/Makefile b/lib/inets/priv/Makefile
index 85da409e55..acca20f076 100644
--- a/lib/inets/priv/Makefile
+++ b/lib/inets/priv/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -57,8 +57,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
-	$(INSTALL_SCRIPT) $(EXECUTABLES) $(RELSYSDIR)/priv/bin
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
+	$(INSTALL_SCRIPT) $(EXECUTABLES) "$(RELSYSDIR)/priv/bin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile
index 19b93870df..2c3d2b6d13 100644
--- a/lib/inets/src/ftp/Makefile
+++ b/lib/inets/src/ftp/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2005-2010. All Rights Reserved.
+# Copyright Ericsson AB 2005-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -88,11 +88,11 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/ftp
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/ftp
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/ftp"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/ftp"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile
index d490e59929..f0d4ce139e 100644
--- a/lib/inets/src/http_client/Makefile
+++ b/lib/inets/src/http_client/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2005-2011. All Rights Reserved.
+# Copyright Ericsson AB 2005-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -89,11 +89,11 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_client
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_client
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_client"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_client"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index f4802fb96d..ede649a5a9 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -39,6 +39,7 @@
 	 cookie_header/1, cookie_header/2, cookie_header/3, 
 	 which_cookies/0, which_cookies/1, 
 	 reset_cookies/0, reset_cookies/1, 
+	 which_sessions/0, which_sessions/1, 
 	 stream_next/1,
 	 default_profile/0, 
 	 profile_name/1, profile_name/2,
@@ -267,6 +268,7 @@ set_option(Key, Value, Profile) ->
 %%   Reason - term()
 %% Description: Retrieves the current options. 
 %%-------------------------------------------------------------------------
+
 get_options() ->
     record_info(fields, options).
 
@@ -373,8 +375,6 @@ cookie_header(Url, Opts, Profile)
 	    {error, {not_started, Profile}}
     end.
     
-    
-
 
 %%--------------------------------------------------------------------------
 %% which_cookies() -> [cookie()]
@@ -398,6 +398,28 @@ which_cookies(Profile) ->
 
 
 %%--------------------------------------------------------------------------
+%% which_sessions() -> {GoodSession, BadSessions, NonSessions}
+%% which_sessions(Profile) -> {GoodSession, BadSessions, NonSessions}
+%%               
+%% Description: Debug function, dumping the sessions database, sorted 
+%%              into three groups (Good-, Bad- and Non-sessions).
+%%-------------------------------------------------------------------------
+which_sessions() ->
+    which_sessions(default_profile()).
+
+which_sessions(Profile) ->
+    ?hcrt("which sessions", [{profile, Profile}]),
+    try 
+	begin
+	    httpc_manager:which_sessions(profile_name(Profile))
+	end
+    catch 
+	exit:{noproc, _} ->
+	    {[], [], []}
+    end.
+
+
+%%--------------------------------------------------------------------------
 %% info() -> list()
 %% info(Profile) -> list()
 %%               
@@ -895,6 +917,10 @@ validate_options([{proxy, Proxy} = Opt| Tail], Acc) ->
     validate_proxy(Proxy),
     validate_options(Tail, [Opt | Acc]);
 
+validate_options([{https_proxy, Proxy} = Opt| Tail], Acc) ->
+    validate_https_proxy(Proxy),
+    validate_options(Tail, [Opt | Acc]);
+
 validate_options([{max_sessions, Value} = Opt| Tail], Acc) ->
     validate_max_sessions(Value),
     validate_options(Tail, [Opt | Acc]);
@@ -957,6 +983,14 @@ validate_proxy({{ProxyHost, ProxyPort}, NoProxy} = Proxy)
 validate_proxy(BadProxy) ->
     bad_option(proxy, BadProxy).
 
+validate_https_proxy({{ProxyHost, ProxyPort}, NoProxy} = Proxy) 
+  when is_list(ProxyHost) andalso 
+       is_integer(ProxyPort) andalso 
+       is_list(NoProxy) ->
+    Proxy;
+validate_https_proxy(BadProxy) ->
+    bad_option(https_proxy, BadProxy).
+
 validate_max_sessions(Value) when is_integer(Value) andalso (Value >= 0) ->
     Value;
 validate_max_sessions(BadValue) ->
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index b8c34bd99b..784a9c0019 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -29,44 +29,44 @@
 %%--------------------------------------------------------------------
 %% Internal Application API
 -export([
-	 start_link/4,
-	 %% connect_and_send/2,
-	 send/2, 
-	 cancel/3,
-	 stream/3, 
-	 stream_next/1,
-	 info/1
-	]).
+         start_link/4,
+         %% connect_and_send/2,
+         send/2, 
+         cancel/3,
+         stream/3, 
+         stream_next/1,
+         info/1
+        ]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
+         terminate/2, code_change/3]).
 
 -record(timers, 
-	{
-	  request_timers = [], % [ref()]
-	  queue_timer          % ref()
-	 }).
+        {
+          request_timers = [], % [ref()]
+          queue_timer          % ref()
+         }).
 
 -record(state, 
-	{
-	  request,                   % #request{}
-	  session,                   % #session{}
-	  status_line,               % {Version, StatusCode, ReasonPharse}
-	  headers,                   % #http_response_h{}
-	  body,                      % binary()
-	  mfa,                       % {Moduel, Function, Args}
-	  pipeline = queue:new(),    % queue() 
-	  keep_alive = queue:new(),  % queue() 
-	  status,   % undefined | new | pipeline | keep_alive | close | ssl_tunnel
-	  canceled = [],	     % [RequestId]
-	  max_header_size = nolimit, % nolimit | integer() 
-	  max_body_size = nolimit,   % nolimit | integer()
-	  options,                   % #options{}
-	  timers = #timers{},        % #timers{}
-	  profile_name,              % atom() - id of httpc_manager process.
-	  once                       % send | undefined 
-	 }).
+        {
+          request,                   % #request{}
+          session,                   % #session{}
+          status_line,               % {Version, StatusCode, ReasonPharse}
+          headers,                   % #http_response_h{}
+          body,                      % binary()
+          mfa,                       % {Module, Function, Args}
+          pipeline = queue:new(),    % queue() 
+          keep_alive = queue:new(),  % queue() 
+          status,   % undefined | new | pipeline | keep_alive | close | {ssl_tunnel, Request}
+          canceled = [],             % [RequestId]
+          max_header_size = nolimit, % nolimit | integer() 
+          max_body_size = nolimit,   % nolimit | integer()
+          options,                   % #options{}
+          timers = #timers{},        % #timers{}
+          profile_name,              % atom() - id of httpc_manager process.
+          once                       % send | undefined 
+         }).
 
 
 %%====================================================================
@@ -75,8 +75,8 @@
 %%--------------------------------------------------------------------
 %% Function: start_link(Request, Options, ProfileName) -> {ok, Pid}
 %%
-%%	Request = #request{}
-%%	Options =  #options{} 
+%%      Request = #request{}
+%%      Options =  #options{} 
 %%      ProfileName = atom() - id of httpc manager process
 %%
 %% Description: Starts a http-request handler process. Intended to be
@@ -96,11 +96,11 @@
 
 start_link(Parent, Request, Options, ProfileName) ->
     {ok, proc_lib:start_link(?MODULE, init, [[Parent, Request, Options,
-					      ProfileName]])}.
+                                              ProfileName]])}.
 
 %%--------------------------------------------------------------------
 %% Function: send(Request, Pid) -> ok 
-%%	Request = #request{}
+%%      Request = #request{}
 %%      Pid = pid() - the pid of the http-request handler process.
 %%
 %% Description: Uses this handlers session to send a request. Intended
@@ -112,7 +112,7 @@ send(Request, Pid) ->
 
 %%--------------------------------------------------------------------
 %% Function: cancel(RequestId, Pid) -> ok
-%%	RequestId = ref()
+%%      RequestId = ref()
 %%      Pid = pid() -  the pid of the http-request handler process.
 %%
 %% Description: Cancels a request. Intended to be called by the httpc
@@ -142,12 +142,16 @@ stream_next(Pid) ->
 %%     Used for debugging and testing
 %%--------------------------------------------------------------------
 info(Pid) ->
-    call(info, Pid).
-
+    try 
+	call(info, Pid)
+    catch
+	_:_ ->
+	    []
+    end.
 
 %%--------------------------------------------------------------------
 %% Function: stream(BodyPart, Request, Code) -> _
-%%	BodyPart = binary()
+%%      BodyPart = binary()
 %%      Request = #request{}
 %%      Code = integer()
 %%
@@ -167,7 +171,7 @@ stream(BodyPart, #request{stream = Self} = Request, Code)
        ((Self =:= self) orelse (Self =:= {self, once})) ->
     ?hcrt("stream - self", [{stream, Self}, {code, Code}]),
     httpc_response:send(Request#request.from, 
-			{Request#request.id, stream, BodyPart}),
+                        {Request#request.id, stream, BodyPart}),
     {<<>>, Request};
 
 %% Stream to file
@@ -177,11 +181,11 @@ stream(BodyPart, #request{stream = Filename} = Request, Code)
   when ((Code =:= 200) orelse (Code =:= 206)) andalso is_list(Filename) -> 
     ?hcrt("stream - filename", [{stream, Filename}, {code, Code}]),
     case file:open(Filename, [write, raw, append, delayed_write]) of
-	{ok, Fd} ->
-	    ?hcrt("stream - file open ok", [{fd, Fd}]),
-	    stream(BodyPart, Request#request{stream = Fd}, 200);
-	{error, Reason} ->
-	    exit({stream_to_file_failed, Reason})
+        {ok, Fd} ->
+            ?hcrt("stream - file open ok", [{fd, Fd}]),
+            stream(BodyPart, Request#request{stream = Fd}, 200);
+        {error, Reason} ->
+            exit({stream_to_file_failed, Reason})
     end;
 
 %% Stream to file
@@ -189,10 +193,10 @@ stream(BodyPart, #request{stream = Fd} = Request, Code)
   when ((Code =:= 200) orelse (Code =:= 206)) -> 
     ?hcrt("stream to file", [{stream, Fd}, {code, Code}]),
     case file:write(Fd, BodyPart) of
-	ok ->
-	    {<<>>, Request};
-	{error, Reason} ->
-	    exit({stream_to_file_failed, Reason})
+        ok ->
+            {<<>>, Request};
+        {error, Reason} ->
+            exit({stream_to_file_failed, Reason})
     end;
 
 stream(BodyPart, Request,_) -> % only 200 and 206 responses can be streamed
@@ -208,7 +212,7 @@ stream(BodyPart, Request,_) -> % only 200 and 206 responses can be streamed
 %% Function: init([Options, ProfileName]) -> {ok, State} | 
 %%                       {ok, State, Timeout} | ignore | {stop, Reason}
 %%
-%%	Options =  #options{} 
+%%      Options =  #options{} 
 %%      ProfileName = atom() - id of httpc manager process
 %%
 %% Description: Initiates the httpc_handler process 
@@ -224,20 +228,19 @@ init([Parent, Request, Options, ProfileName]) ->
     %% Do not let initial tcp-connection block the manager-process
     proc_lib:init_ack(Parent, self()),
     handle_verbose(Options#options.verbose),
-    Address = handle_proxy(Request#request.address, Options#options.proxy),
+    ProxyOptions = handle_proxy_options(Request#request.scheme, Options),
+    Address = handle_proxy(Request#request.address, ProxyOptions),
     {ok, State} =
-	case {Address /= Request#request.address, Request#request.scheme} of
-	    {true, https} ->
-		Error = https_through_proxy_is_not_currently_supported,
-		self() ! {init_error,
-			  Error, httpc_response:error(Request, Error)},
-		{ok, #state{request = Request, options = Options,
-			    status = ssl_tunnel}};
-	    {_, _} ->
-		connect_and_send_first_request(Address, Request,
-				   #state{options = Options,
-					  profile_name = ProfileName})
-	end,
+        case {Address /= Request#request.address, Request#request.scheme} of
+            {true, https} ->
+                connect_and_send_upgrade_request(Address, Request,
+                                                 #state{options = Options,
+                                                        profile_name = ProfileName});
+            {_, _} ->
+                connect_and_send_first_request(Address, Request,
+                                   #state{options = Options,
+                                          profile_name = ProfileName})
+        end,
     gen_server:enter_loop(?MODULE, [], State).
 
 %%--------------------------------------------------------------------
@@ -250,139 +253,139 @@ init([Parent, Request, Options, ProfileName]) ->
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
 handle_call(#request{address = Addr} = Request, _, 
-	    #state{status  = Status,
-		   session = #session{type = pipeline} = Session,
-		   timers  = Timers,
-		   options = #options{proxy = Proxy} = _Options, 
-		   profile_name = ProfileName} = State) 
+            #state{status  = Status,
+                   session = #session{type = pipeline} = Session,
+                   timers  = Timers,
+                   options = #options{proxy = Proxy} = _Options, 
+                   profile_name = ProfileName} = State) 
   when Status =/= undefined ->
 
     ?hcrv("new request on a pipeline session", 
-	  [{request, Request}, 
-	   {profile, ProfileName}, 
-	   {status,  Status}, 
-	   {timers,  Timers}]),
+          [{request, Request}, 
+           {profile, ProfileName}, 
+           {status,  Status}, 
+           {timers,  Timers}]),
 
     Address = handle_proxy(Addr, Proxy),
 
     case httpc_request:send(Address, Session, Request) of
         ok ->
 
-	    ?hcrd("request sent", []),
+            ?hcrd("request sent", []),
 
-	    %% Activate the request time out for the new request
-	    NewState = 
-		activate_request_timeout(State#state{request = Request}),
+            %% Activate the request time out for the new request
+            NewState = 
+                activate_request_timeout(State#state{request = Request}),
 
-	    ClientClose = 
-		httpc_request:is_client_closing(Request#request.headers),
+            ClientClose = 
+                httpc_request:is_client_closing(Request#request.headers),
 
             case State#state.request of
                 #request{} -> %% Old request not yet finished
-		    ?hcrd("old request still not finished", []),
-		    %% Make sure to use the new value of timers in state
-		    NewTimers   = NewState#state.timers,
+                    ?hcrd("old request still not finished", []),
+                    %% Make sure to use the new value of timers in state
+                    NewTimers   = NewState#state.timers,
                     NewPipeline = queue:in(Request, State#state.pipeline),
-		    NewSession  = 
-			Session#session{queue_length = 
-					%% Queue + current
-					queue:len(NewPipeline) + 1,
-					client_close = ClientClose},
-		    insert_session(NewSession, ProfileName),
-		    ?hcrd("session updated", []),
+                    NewSession  = 
+                        Session#session{queue_length = 
+                                        %% Queue + current
+                                        queue:len(NewPipeline) + 1,
+                                        client_close = ClientClose},
+                    insert_session(NewSession, ProfileName),
+                    ?hcrd("session updated", []),
                     {reply, ok, State#state{pipeline = NewPipeline,
-					    session  = NewSession,
-					    timers   = NewTimers}};
-		undefined ->
-		    %% Note: tcp-message receiving has already been
-		    %% activated by handle_pipeline/2. 
-		    ?hcrd("no current request", []),
-		    cancel_timer(Timers#timers.queue_timer, 
-				 timeout_queue),
-		    NewSession = 
-			Session#session{queue_length = 1,
-					client_close = ClientClose},
-		    httpc_manager:insert_session(NewSession, ProfileName),
-		    Relaxed = 
-			(Request#request.settings)#http_options.relaxed, 
-		    MFA = {httpc_response, parse, 
-			   [State#state.max_header_size, Relaxed]}, 
-		    NewTimers = Timers#timers{queue_timer = undefined}, 
-		    ?hcrd("session created", []),
-		    {reply, ok, NewState#state{request = Request,
-					       session = NewSession,
-					       mfa     = MFA,
-					       timers  = NewTimers}}
-	    end;
-	{error, Reason} ->
-	    ?hcri("failed sending request", [{reason, Reason}]),
-	    {reply, {pipeline_failed, Reason}, State}
+                                            session  = NewSession,
+                                            timers   = NewTimers}};
+                undefined ->
+                    %% Note: tcp-message receiving has already been
+                    %% activated by handle_pipeline/2. 
+                    ?hcrd("no current request", []),
+                    cancel_timer(Timers#timers.queue_timer, 
+                                 timeout_queue),
+                    NewSession = 
+                        Session#session{queue_length = 1,
+                                        client_close = ClientClose},
+                    httpc_manager:insert_session(NewSession, ProfileName),
+                    Relaxed = 
+                        (Request#request.settings)#http_options.relaxed, 
+                    MFA = {httpc_response, parse, 
+                           [State#state.max_header_size, Relaxed]}, 
+                    NewTimers = Timers#timers{queue_timer = undefined}, 
+                    ?hcrd("session created", []),
+                    {reply, ok, NewState#state{request = Request,
+                                               session = NewSession,
+                                               mfa     = MFA,
+                                               timers  = NewTimers}}
+            end;
+        {error, Reason} ->
+            ?hcri("failed sending request", [{reason, Reason}]),
+            {reply, {pipeline_failed, Reason}, State}
     end;
 
 handle_call(#request{address = Addr} = Request, _, 
-	    #state{status  = Status,
-		   session = #session{type = keep_alive} = Session,
-		   timers  = Timers,
-		   options = #options{proxy = Proxy} = _Options,
-		   profile_name = ProfileName} = State) 
+            #state{status  = Status,
+                   session = #session{type = keep_alive} = Session,
+                   timers  = Timers,
+                   options = #options{proxy = Proxy} = _Options,
+                   profile_name = ProfileName} = State) 
   when Status =/= undefined ->
     
     ?hcrv("new request on a keep-alive session", 
-	  [{request, Request}, 
-	   {profile, ProfileName}, 
-	   {status,  Status}]),
+          [{request, Request}, 
+           {profile, ProfileName}, 
+           {status,  Status}]),
 
     Address = handle_proxy(Addr, Proxy),
     case httpc_request:send(Address, Session, Request) of
-	ok ->
+        ok ->
 
-	    ?hcrd("request sent", []),
+            ?hcrd("request sent", []),
 
-	    %% Activate the request time out for the new request
-	    NewState = 
-		activate_request_timeout(State#state{request = Request}),
+            %% Activate the request time out for the new request
+            NewState = 
+                activate_request_timeout(State#state{request = Request}),
 
-	    ClientClose = 
-		httpc_request:is_client_closing(Request#request.headers),
+            ClientClose = 
+                httpc_request:is_client_closing(Request#request.headers),
 
-	    case State#state.request of
-		#request{} -> %% Old request not yet finished
-		    %% Make sure to use the new value of timers in state
-		    ?hcrd("old request still not finished", []),
-		    NewTimers    = NewState#state.timers,
+            case State#state.request of
+                #request{} -> %% Old request not yet finished
+                    %% Make sure to use the new value of timers in state
+                    ?hcrd("old request still not finished", []),
+                    NewTimers    = NewState#state.timers,
                     NewKeepAlive = queue:in(Request, State#state.keep_alive),
-		    NewSession   = 
-			Session#session{queue_length = 
-					%% Queue + current
-					queue:len(NewKeepAlive) + 1,
-					client_close = ClientClose},
-		    insert_session(NewSession, ProfileName),
-		    ?hcrd("session updated", []),
+                    NewSession   = 
+                        Session#session{queue_length = 
+                                        %% Queue + current
+                                        queue:len(NewKeepAlive) + 1,
+                                        client_close = ClientClose},
+                    insert_session(NewSession, ProfileName),
+                    ?hcrd("session updated", []),
                     {reply, ok, State#state{keep_alive = NewKeepAlive,
-					    session    = NewSession,
-					    timers     = NewTimers}};
-		undefined ->
-		    %% Note: tcp-message reciving has already been
-		    %% activated by handle_pipeline/2. 
-		    ?hcrd("no current request", []),
-		    cancel_timer(Timers#timers.queue_timer, 
-				 timeout_queue),
-		    NewSession = 
-			Session#session{queue_length = 1,
-					client_close = ClientClose},
-		    insert_session(NewSession, ProfileName),
-		    Relaxed = 
-			(Request#request.settings)#http_options.relaxed,
-		    MFA = {httpc_response, parse,
-			   [State#state.max_header_size, Relaxed]}, 
-		    {reply, ok, NewState#state{request = Request,
-					       session = NewSession, 
-					       mfa     = MFA}}
-	    end;
+                                            session    = NewSession,
+                                            timers     = NewTimers}};
+                undefined ->
+                    %% Note: tcp-message reciving has already been
+                    %% activated by handle_pipeline/2. 
+                    ?hcrd("no current request", []),
+                    cancel_timer(Timers#timers.queue_timer, 
+                                 timeout_queue),
+                    NewSession = 
+                        Session#session{queue_length = 1,
+                                        client_close = ClientClose},
+                    insert_session(NewSession, ProfileName),
+                    Relaxed = 
+                        (Request#request.settings)#http_options.relaxed,
+                    MFA = {httpc_response, parse,
+                           [State#state.max_header_size, Relaxed]}, 
+                    {reply, ok, NewState#state{request = Request,
+                                               session = NewSession, 
+                                               mfa     = MFA}}
+            end;
 
-	{error, Reason} ->
-	    ?hcri("failed sending request", [{reason, Reason}]),
-	    {reply, {request_failed, Reason}, State}
+        {error, Reason} ->
+            ?hcri("failed sending request", [{reason, Reason}]),
+            {reply, {request_failed, Reason}, State}
     end;
 
 
@@ -411,25 +414,25 @@ handle_call(info, _, State) ->
 %% request as if it was never issued as in this case the request will
 %% not have been sent. 
 handle_cast({cancel, RequestId, From},
-	    #state{request      = #request{id = RequestId} = Request,
-		   profile_name = ProfileName,
-		   canceled     = Canceled} = State) ->
+            #state{request      = #request{id = RequestId} = Request,
+                   profile_name = ProfileName,
+                   canceled     = Canceled} = State) ->
     ?hcrv("cancel current request", [{request_id, RequestId}, 
-				     {profile,    ProfileName},
-				     {canceled,   Canceled}]),
+                                     {profile,    ProfileName},
+                                     {canceled,   Canceled}]),
     httpc_manager:request_canceled(RequestId, ProfileName, From),
     ?hcrv("canceled", []),
     {stop, normal, 
      State#state{canceled = [RequestId | Canceled],
-		 request  = Request#request{from = answer_sent}}};
+                 request  = Request#request{from = answer_sent}}};
 handle_cast({cancel, RequestId, From},
-	    #state{profile_name = ProfileName,
-		   request      = #request{id = CurrId},
-		   canceled     = Canceled} = State) ->
+            #state{profile_name = ProfileName,
+                   request      = #request{id = CurrId},
+                   canceled     = Canceled} = State) ->
     ?hcrv("cancel", [{request_id, RequestId},
-		     {curr_req_id, CurrId},
-		     {profile, ProfileName},
-		     {canceled,   Canceled}]),
+                     {curr_req_id, CurrId},
+                     {profile, ProfileName},
+                     {canceled,   Canceled}]),
     httpc_manager:request_canceled(RequestId, ProfileName, From),
     ?hcrv("canceled", []),
     {noreply, State#state{canceled = [RequestId | Canceled]}};
@@ -446,94 +449,94 @@ handle_cast(stream_next, #state{session = Session} = State) ->
 %% Description: Handling all non call/cast messages
 %%--------------------------------------------------------------------
 handle_info({Proto, _Socket, Data}, 
-	    #state{mfa = {Module, Function, Args}, 
-		   request = #request{method = Method, 
-				      stream = Stream} = Request, 
-		   session = Session, 
-		   status_line = StatusLine} = State) 
+            #state{mfa = {Module, Function, Args}, 
+                   request = #request{method = Method, 
+                                      stream = Stream} = Request, 
+                   session = Session, 
+                   status_line = StatusLine} = State) 
   when (Proto =:= tcp) orelse 
        (Proto =:= ssl) orelse 
        (Proto =:= httpc_handler) ->
 
     ?hcri("received data", [{proto,       Proto}, 
-			    {module,      Module}, 
-			    {function,    Function}, 
-			    {method,      Method}, 
-			    {stream,      Stream}, 
-			    {session,     Session}, 
-			    {status_line, StatusLine}]),
+                            {module,      Module}, 
+                            {function,    Function}, 
+                            {method,      Method}, 
+                            {stream,      Stream}, 
+                            {session,     Session}, 
+                            {status_line, StatusLine}]),
 
     FinalResult = 
-	try Module:Function([Data | Args]) of
-	    {ok, Result} ->
-		?hcrd("data processed - ok", []),
-		handle_http_msg(Result, State); 
-	    {_, whole_body, _} when Method =:= head ->
-		?hcrd("data processed - whole body", []),
-		handle_response(State#state{body = <<>>}); 
-	    {Module, whole_body, [Body, Length]} ->
-		?hcrd("data processed - whole body", [{length, Length}]),
-		{_, Code, _} = StatusLine,
-		{NewBody, NewRequest} = stream(Body, Request, Code),
-		%% When we stream we will not keep the already
-		%% streamed data, that would be a waste of memory.
-		NewLength = 
-		    case Stream of
-			none ->   
-			    Length;
-			_ ->
-			    Length - size(Body)			    
-		    end,
-		
-		NewState = next_body_chunk(State),
-		NewMFA   = {Module, whole_body, [NewBody, NewLength]}, 
-		{noreply, NewState#state{mfa     = NewMFA,
-					 request = NewRequest}};
-	    NewMFA ->
-		?hcrd("data processed - new mfa", []),
-		activate_once(Session),
-		{noreply, State#state{mfa = NewMFA}}
-	catch
-	    exit:_Exit ->
-		?hcrd("data processing exit", [{exit, _Exit}]),
-		ClientReason = {could_not_parse_as_http, Data}, 
-		ClientErrMsg = httpc_response:error(Request, ClientReason),
-		NewState     = answer_request(Request, ClientErrMsg, State),
-		{stop, normal, NewState};
-	    error:_Error ->    
-		?hcrd("data processing error", [{error, _Error}]),
-		ClientReason = {could_not_parse_as_http, Data}, 
-		ClientErrMsg = httpc_response:error(Request, ClientReason),
-		NewState     = answer_request(Request, ClientErrMsg, State),   
-		{stop, normal, NewState}
-	
-	end,
+        try Module:Function([Data | Args]) of
+            {ok, Result} ->
+                ?hcrd("data processed - ok", []),
+                handle_http_msg(Result, State); 
+            {_, whole_body, _} when Method =:= head ->
+                ?hcrd("data processed - whole body", []),
+                handle_response(State#state{body = <<>>}); 
+            {Module, whole_body, [Body, Length]} ->
+                ?hcrd("data processed - whole body", [{length, Length}]),
+                {_, Code, _} = StatusLine,
+                {NewBody, NewRequest} = stream(Body, Request, Code),
+                %% When we stream we will not keep the already
+                %% streamed data, that would be a waste of memory.
+                NewLength = 
+                    case Stream of
+                        none ->   
+                            Length;
+                        _ ->
+                            Length - size(Body)                     
+                    end,
+                
+                NewState = next_body_chunk(State),
+                NewMFA   = {Module, whole_body, [NewBody, NewLength]}, 
+                {noreply, NewState#state{mfa     = NewMFA,
+                                         request = NewRequest}};
+            NewMFA ->
+                ?hcrd("data processed - new mfa", []),
+                activate_once(Session),
+                {noreply, State#state{mfa = NewMFA}}
+        catch
+            exit:_Exit ->
+                ?hcrd("data processing exit", [{exit, _Exit}]),
+                ClientReason = {could_not_parse_as_http, Data}, 
+                ClientErrMsg = httpc_response:error(Request, ClientReason),
+                NewState     = answer_request(Request, ClientErrMsg, State),
+                {stop, normal, NewState};
+            error:_Error ->    
+                ?hcrd("data processing error", [{error, _Error}]),
+                ClientReason = {could_not_parse_as_http, Data}, 
+                ClientErrMsg = httpc_response:error(Request, ClientReason),
+                NewState     = answer_request(Request, ClientErrMsg, State),   
+                {stop, normal, NewState}
+        
+        end,
     ?hcri("data processed", [{final_result, FinalResult}]),
     FinalResult;
 
 
 handle_info({Proto, Socket, Data}, 
-	    #state{mfa          = MFA, 
-		   request      = Request, 
-		   session      = Session, 
-		   status       = Status,
-		   status_line  = StatusLine, 
-		   profile_name = Profile} = State) 
+            #state{mfa          = MFA, 
+                   request      = Request, 
+                   session      = Session, 
+                   status       = Status,
+                   status_line  = StatusLine, 
+                   profile_name = Profile} = State) 
   when (Proto =:= tcp) orelse 
        (Proto =:= ssl) orelse 
        (Proto =:= httpc_handler) ->
 
     error_logger:warning_msg("Received unexpected ~p data on ~p"
-			     "~n   Data:       ~p"
-			     "~n   MFA:        ~p"
-			     "~n   Request:    ~p"
-			     "~n   Session:    ~p"
-			     "~n   Status:     ~p"
-			     "~n   StatusLine: ~p"
-			     "~n   Profile:    ~p"
-			     "~n", 
-			     [Proto, Socket, Data, MFA, 
-			      Request, Session, Status, StatusLine, Profile]),
+                             "~n   Data:       ~p"
+                             "~n   MFA:        ~p"
+                             "~n   Request:    ~p"
+                             "~n   Session:    ~p"
+                             "~n   Status:     ~p"
+                             "~n   StatusLine: ~p"
+                             "~n   Profile:    ~p"
+                             "~n", 
+                             [Proto, Socket, Data, MFA, 
+                              Request, Session, Status, StatusLine, Profile]),
 
     {noreply, State};
 
@@ -572,45 +575,45 @@ handle_info({ssl_error, _, _} = Reason, State) ->
 %% Internally, to a request handling process, a request timeout is
 %% seen as a canceled request.
 handle_info({timeout, RequestId}, 
-	    #state{request      = #request{id = RequestId} = Request,
-		   canceled     = Canceled,
-		   profile_name = ProfileName} = State) ->
+            #state{request      = #request{id = RequestId} = Request,
+                   canceled     = Canceled,
+                   profile_name = ProfileName} = State) ->
     ?hcri("timeout of current request", [{id, RequestId}]),
     httpc_response:send(Request#request.from, 
-			httpc_response:error(Request, timeout)),
+                        httpc_response:error(Request, timeout)),
     httpc_manager:request_done(RequestId, ProfileName),
     ?hcrv("response (timeout) sent - now terminate", []),
     {stop, normal, 
      State#state{request  = Request#request{from = answer_sent},
-		 canceled = [RequestId | Canceled]}};
+                 canceled = [RequestId | Canceled]}};
 
 handle_info({timeout, RequestId}, 
-	    #state{canceled     = Canceled,
-		   profile_name = ProfileName} = State) ->
+            #state{canceled     = Canceled,
+                   profile_name = ProfileName} = State) ->
     ?hcri("timeout", [{id, RequestId}]),
     Filter = 
-	fun(#request{id = Id, from = From} = Request) when Id =:= RequestId ->
-		?hcrv("found request", [{id, Id}, {from, From}]),
-		%% Notify the owner
-		httpc_response:send(From, 
-				    httpc_response:error(Request, timeout)),
-		httpc_manager:request_done(RequestId, ProfileName),
-		?hcrv("response (timeout) sent", []),
-		[Request#request{from = answer_sent}];
-	   (_) ->
-		true
-	end,
+        fun(#request{id = Id, from = From} = Request) when Id =:= RequestId ->
+                ?hcrv("found request", [{id, Id}, {from, From}]),
+                %% Notify the owner
+                httpc_response:send(From, 
+                                    httpc_response:error(Request, timeout)),
+                httpc_manager:request_done(RequestId, ProfileName),
+                ?hcrv("response (timeout) sent", []),
+                [Request#request{from = answer_sent}];
+           (_) ->
+                true
+        end,
     case State#state.status of
-	pipeline ->
-	    ?hcrd("pipeline", []),
-	    Pipeline = queue:filter(Filter, State#state.pipeline),
-	    {noreply, State#state{canceled = [RequestId | Canceled],
-				  pipeline = Pipeline}};
-	keep_alive ->
-	    ?hcrd("keep_alive", []),
-	    KeepAlive = queue:filter(Filter, State#state.keep_alive),
-	    {noreply, State#state{canceled   = [RequestId | Canceled],
-				  keep_alive = KeepAlive}}
+        pipeline ->
+            ?hcrd("pipeline", []),
+            Pipeline = queue:filter(Filter, State#state.pipeline),
+            {noreply, State#state{canceled = [RequestId | Canceled],
+                                  pipeline = Pipeline}};
+        keep_alive ->
+            ?hcrd("keep_alive", []),
+            KeepAlive = queue:filter(Filter, State#state.keep_alive),
+            {noreply, State#state{canceled   = [RequestId | Canceled],
+                                  keep_alive = KeepAlive}}
     end;
 
 handle_info(timeout_queue, State = #state{request = undefined}) ->
@@ -619,11 +622,11 @@ handle_info(timeout_queue, State = #state{request = undefined}) ->
 %% Timing was such as the pipeline_timout was not canceled!
 handle_info(timeout_queue, #state{timers = Timers} = State) ->
     {noreply, State#state{timers = 
-			  Timers#timers{queue_timer = undefined}}};
+                          Timers#timers{queue_timer = undefined}}};
 
 %% Setting up the connection to the server somehow failed. 
 handle_info({init_error, Tag, ClientErrMsg},
-	    State = #state{request = Request}) ->
+            State = #state{request = Request}) ->
     ?hcrv("init error", [{tag, Tag}, {client_error, ClientErrMsg}]),
     NewState = answer_request(Request, ClientErrMsg, State),
     {stop, normal, NewState};
@@ -647,21 +650,21 @@ handle_info({'EXIT', _, _}, State) ->
 
 %% Init error there is no socket to be closed.
 terminate(normal, 
-	  #state{request = Request, 
-		 session = {send_failed, AReason} = Reason} = State) ->
+          #state{request = Request, 
+                 session = {send_failed, AReason} = Reason} = State) ->
     ?hcrd("terminate", [{send_reason, AReason}, {request, Request}]),
     maybe_send_answer(Request, 
-		      httpc_response:error(Request, Reason), 
-		      State),
+                      httpc_response:error(Request, Reason), 
+                      State),
     ok; 
 
 terminate(normal, 
-	  #state{request = Request, 
-		 session = {connect_failed, AReason} = Reason} = State) ->
+          #state{request = Request, 
+                 session = {connect_failed, AReason} = Reason} = State) ->
     ?hcrd("terminate", [{connect_reason, AReason}, {request, Request}]),
     maybe_send_answer(Request, 
-		      httpc_response:error(Request, Reason), 
-		      State),
+                      httpc_response:error(Request, Reason), 
+                      State),
     ok; 
 
 terminate(normal, #state{session = undefined}) ->
@@ -670,21 +673,21 @@ terminate(normal, #state{session = undefined}) ->
 %% Init error sending, no session information has been setup but
 %% there is a socket that needs closing.
 terminate(normal, 
-	  #state{session = #session{id = undefined} = Session}) ->  
+          #state{session = #session{id = undefined} = Session}) ->  
     close_socket(Session);
 
 %% Socket closed remotely
 terminate(normal, 
-	  #state{session = #session{socket      = {remote_close, Socket},
-				    socket_type = SocketType, 
-				    id          = Id}, 
-		 profile_name = ProfileName,
-		 request      = Request,
-		 timers       = Timers,
-		 pipeline     = Pipeline,
-		 keep_alive   = KeepAlive} = State) ->  
+          #state{session = #session{socket      = {remote_close, Socket},
+                                    socket_type = SocketType, 
+                                    id          = Id}, 
+                 profile_name = ProfileName,
+                 request      = Request,
+                 timers       = Timers,
+                 pipeline     = Pipeline,
+                 keep_alive   = KeepAlive} = State) ->  
     ?hcrt("terminate(normal) - remote close", 
-	  [{id, Id}, {profile, ProfileName}]),
+          [{id, Id}, {profile, ProfileName}]),
 
     %% Clobber session
     (catch httpc_manager:delete_session(Id, ProfileName)),
@@ -702,15 +705,15 @@ terminate(normal,
     http_transport:close(SocketType, Socket);
 
 terminate(Reason, #state{session = #session{id          = Id,
-					    socket      = Socket, 
-					    socket_type = SocketType},
-		    request      = undefined,
-		    profile_name = ProfileName,
-		    timers       = Timers,
-		    pipeline     = Pipeline,
-		    keep_alive   = KeepAlive} = State) -> 
+                                            socket      = Socket, 
+                                            socket_type = SocketType},
+                    request      = undefined,
+                    profile_name = ProfileName,
+                    timers       = Timers,
+                    pipeline     = Pipeline,
+                    keep_alive   = KeepAlive} = State) -> 
     ?hcrt("terminate", 
-	  [{id, Id}, {profile, ProfileName}, {reason, Reason}]),
+          [{id, Id}, {profile, ProfileName}, {reason, Reason}]),
 
     %% Clobber session
     (catch httpc_manager:delete_session(Id, ProfileName)),
@@ -728,16 +731,16 @@ terminate(Reason, #state{request = undefined}) ->
 terminate(Reason, #state{request = Request} = State) -> 
     ?hcrd("terminate", [{reason, Reason}, {request, Request}]),
     NewState = maybe_send_answer(Request, 
-				 httpc_response:error(Request, Reason), 
-				 State),
+                                 httpc_response:error(Request, Reason), 
+                                 State),
     terminate(Reason, NewState#state{request = undefined}).
 
 maybe_retry_queue(Q, State) ->
     case queue:is_empty(Q) of 
-	false ->
-	    retry_pipeline(queue:to_list(Q), State);
-	true ->
-	    ok
+        false ->
+            retry_pipeline(queue:to_list(Q), State);
+        true ->
+            ok
     end.
     
 maybe_send_answer(#request{from = answer_sent}, _Reason, State) ->
@@ -761,44 +764,44 @@ deliver_answer(Request) ->
 %%--------------------------------------------------------------------
 
 code_change(_, 
-	    #state{session      = OldSession, 
-		   profile_name = ProfileName} = State, 
-	    upgrade_from_pre_5_8_1) ->
+            #state{session      = OldSession, 
+                   profile_name = ProfileName} = State, 
+            upgrade_from_pre_5_8_1) ->
     case OldSession of
-	{session, 
-	 Id, ClientClose, Scheme, Socket, SocketType, QueueLen, Type} ->
-	    NewSession = #session{id           = Id, 
-				  client_close = ClientClose, 
-				  scheme       = Scheme, 
-				  socket       = Socket, 
-				  socket_type  = SocketType,
-				  queue_length = QueueLen, 
-				  type         = Type}, 
-	    insert_session(NewSession, ProfileName), 
-	    {ok, State#state{session = NewSession}};
-	_ -> 
-	    {ok, State}
+        {session, 
+         Id, ClientClose, Scheme, Socket, SocketType, QueueLen, Type} ->
+            NewSession = #session{id           = Id, 
+                                  client_close = ClientClose, 
+                                  scheme       = Scheme, 
+                                  socket       = Socket, 
+                                  socket_type  = SocketType,
+                                  queue_length = QueueLen, 
+                                  type         = Type}, 
+            insert_session(NewSession, ProfileName), 
+            {ok, State#state{session = NewSession}};
+        _ -> 
+            {ok, State}
     end;
 
 code_change(_, 
-	    #state{session      = OldSession, 
-		   profile_name = ProfileName} = State, 
-	    downgrade_to_pre_5_8_1) ->
+            #state{session      = OldSession, 
+                   profile_name = ProfileName} = State, 
+            downgrade_to_pre_5_8_1) ->
     case OldSession of
-	#session{id           = Id, 
-		 client_close = ClientClose, 
-		 scheme       = Scheme, 
-		 socket       = Socket, 
-		 socket_type  = SocketType,
-		 queue_length = QueueLen, 
-		 type         = Type} ->
-	    NewSession = {session, 
-			  Id, ClientClose, Scheme, Socket, SocketType, 
-			  QueueLen, Type},
-	    insert_session(NewSession, ProfileName), 
-	    {ok, State#state{session = NewSession}};
-	_ -> 
-	    {ok, State}
+        #session{id           = Id, 
+                 client_close = ClientClose, 
+                 scheme       = Scheme, 
+                 socket       = Socket, 
+                 socket_type  = SocketType,
+                 queue_length = QueueLen, 
+                 type         = Type} ->
+            NewSession = {session, 
+                          Id, ClientClose, Scheme, Socket, SocketType, 
+                          QueueLen, Type},
+            insert_session(NewSession, ProfileName), 
+            {ok, State#state{session = NewSession}};
+        _ -> 
+            {ok, State}
     end;
 
 code_change(_, State, _) ->
@@ -806,22 +809,22 @@ code_change(_, State, _) ->
 
 
 %% new_http_options({http_options, TimeOut, AutoRedirect, SslOpts,
-%% 		  Auth, Relaxed}) ->
+%%                Auth, Relaxed}) ->
 %%     {http_options, "HTTP/1.1", TimeOut, AutoRedirect, SslOpts,
 %%      Auth, Relaxed}.
 
 %% old_http_options({http_options, _, TimeOut, AutoRedirect,
-%% 		  SslOpts, Auth, Relaxed}) ->
+%%                SslOpts, Auth, Relaxed}) ->
 %%     {http_options, TimeOut, AutoRedirect, SslOpts, Auth, Relaxed}.
 
 %% new_queue(Queue, Fun) ->
 %%     List = queue:to_list(Queue),
 %%     NewList = 
-%% 	lists:map(fun(Request) ->
-%% 			  Settings = 
-%% 			      Fun(Request#request.settings),
-%% 			  Request#request{settings = Settings}
-%% 		  end, List),
+%%      lists:map(fun(Request) ->
+%%                        Settings = 
+%%                            Fun(Request#request.settings),
+%%                        Request#request{settings = Settings}
+%%                end, List),
 %%     queue:from_list(NewList).
     
 
@@ -830,97 +833,121 @@ code_change(_, State, _) ->
 %%%--------------------------------------------------------------------
 
 connect(SocketType, ToAddress, 
-	#options{ipfamily    = IpFamily,
-		 ip          = FromAddress,
-		 port        = FromPort,
-		 socket_opts = Opts0}, Timeout) ->
+        #options{ipfamily    = IpFamily,
+                 ip          = FromAddress,
+                 port        = FromPort,
+                 socket_opts = Opts0}, Timeout) ->
     Opts1 = 
-	case FromPort of
-	    default ->
-		Opts0;
-	    _ ->
-		[{port, FromPort} | Opts0]
-	end,
+        case FromPort of
+            default ->
+                Opts0;
+            _ ->
+                [{port, FromPort} | Opts0]
+        end,
     Opts2 = 
-	case FromAddress of
-	    default ->
-		Opts1;
-	    _ ->
-		[{ip, FromAddress} | Opts1]
-	end,
+        case FromAddress of
+            default ->
+                Opts1;
+            _ ->
+                [{ip, FromAddress} | Opts1]
+        end,
     case IpFamily of
-	inet6fb4 ->
-	    Opts3 = [inet6 | Opts2],
-	    case http_transport:connect(SocketType, 
-					ToAddress, Opts3, Timeout) of
-		{error, Reason6} ->
-		    Opts4 = [inet | Opts2], 
-		    case http_transport:connect(SocketType, 
-						ToAddress, Opts4, Timeout) of
-			{error, Reason4} ->
-			    {error, {failed_connect, 
-				     [{to_address, ToAddress}, 
-				      {inet6, Opts3, Reason6}, 
-				      {inet,  Opts4, Reason4}]}};
-			OK ->
-			    OK
-		    end;
-		OK ->
-		    OK
-	    end;
-	_ ->
-	    Opts3 = [IpFamily | Opts2], 
-	    case http_transport:connect(SocketType, ToAddress, Opts3, Timeout) of
-		{error, Reason} ->
-		    {error, {failed_connect, [{to_address, ToAddress}, 
-					      {IpFamily, Opts3, Reason}]}};
-		Else ->
-		    Else
-	    end
+        inet6fb4 ->
+            Opts3 = [inet6 | Opts2],
+            case http_transport:connect(SocketType, 
+                                        ToAddress, Opts3, Timeout) of
+                {error, Reason6} ->
+                    Opts4 = [inet | Opts2], 
+                    case http_transport:connect(SocketType, 
+                                                ToAddress, Opts4, Timeout) of
+                        {error, Reason4} ->
+                            {error, {failed_connect, 
+                                     [{to_address, ToAddress}, 
+                                      {inet6, Opts3, Reason6}, 
+                                      {inet,  Opts4, Reason4}]}};
+                        OK ->
+                            OK
+                    end;
+                OK ->
+                    OK
+            end;
+        _ ->
+            Opts3 = [IpFamily | Opts2], 
+            case http_transport:connect(SocketType, ToAddress, Opts3, Timeout) of
+                {error, Reason} ->
+                    {error, {failed_connect, [{to_address, ToAddress}, 
+                                              {IpFamily, Opts3, Reason}]}};
+                Else ->
+                    Else
+            end
     end.
 
 connect_and_send_first_request(Address, Request, #state{options = Options} = State) ->
     SocketType  = socket_type(Request),
     ConnTimeout = (Request#request.settings)#http_options.connect_timeout,
     ?hcri("connect",
-	  [{address, Address}, {request, Request}, {options, Options}]),
+          [{address, Address}, {request, Request}, {options, Options}]),
     case connect(SocketType, Address, Options, ConnTimeout) of
-	{ok, Socket} ->
-	    ClientClose =
-			httpc_request:is_client_closing(
-			  Request#request.headers),
+        {ok, Socket} ->
+            ClientClose =
+                        httpc_request:is_client_closing(
+                          Request#request.headers),
+            SessionType = httpc_manager:session_type(Options),
+            SocketType  = socket_type(Request),
+            Session = #session{id = {Request#request.address, self()},
+                               scheme = Request#request.scheme,
+                               socket = Socket,
+                               socket_type = SocketType,
+                               client_close = ClientClose,
+                               type = SessionType},
+            ?hcri("connected - now send first request", [{socket, Socket}]),
+
+            case httpc_request:send(Address, Session, Request) of
+                ok ->
+                    ?hcri("first request sent", []),
+                    TmpState = State#state{request = Request,
+                                           session = Session,
+                                           mfa = init_mfa(Request, State),
+                                           status_line =
+                                           init_status_line(Request),
+                                           headers = undefined,
+                                           body = undefined,
+                                           status = new},
+                    http_transport:setopts(SocketType,
+                                           Socket, [{active, once}]),
+                    NewState = activate_request_timeout(TmpState),
+                    {ok, NewState};
+                {error, Reason} ->
+                    self() ! {init_error, error_sending,
+                              httpc_response:error(Request, Reason)},
+                    {ok, State#state{request = Request,
+                                     session =
+                                         #session{socket = Socket}}}
+            end;
+        {error, Reason} ->
+            self() ! {init_error, error_connecting,
+                      httpc_response:error(Request, Reason)},
+            {ok, State#state{request = Request}}
+    end.
+
+connect_and_send_upgrade_request(Address, Request, #state{options = Options} = State) ->
+    ConnTimeout = (Request#request.settings)#http_options.connect_timeout,
+    SocketType = ip_comm,
+    case connect(SocketType, Address, Options, ConnTimeout) of
+        {ok, Socket} ->
 	    SessionType = httpc_manager:session_type(Options),
-	    SocketType  = socket_type(Request),
-	    Session = #session{id = {Request#request.address, self()},
-			       scheme = Request#request.scheme,
-			       socket = Socket,
+	    Session = #session{socket = Socket, 
 			       socket_type = SocketType,
-			       client_close = ClientClose,
+			       id = {Request#request.address, self()},
+                               scheme = http,
+                               client_close = false,
 			       type = SessionType},
-	    ?hcri("connected - now send first request", [{socket, Socket}]),
-
-	    case httpc_request:send(Address, Session, Request) of
-		ok ->
-		    ?hcri("first request sent", []),
-		    TmpState = State#state{request = Request,
-					   session = Session,
-					   mfa = init_mfa(Request, State),
-					   status_line =
-					   init_status_line(Request),
-					   headers = undefined,
-					   body = undefined,
-					   status = new},
-		    http_transport:setopts(SocketType,
-					   Socket, [{active, once}]),
-		    NewState = activate_request_timeout(TmpState),
-		    {ok, NewState};
-		{error, Reason} ->
-		    self() ! {init_error, error_sending,
-			      httpc_response:error(Request, Reason)},
-		    {ok, State#state{request = Request,
-				     session =
-					 #session{socket = Socket}}}
-	    end;
+	    ErrorHandler = 
+		fun(ERequest, EState, EReason) ->
+			self() ! {init_error, error_sending,
+				  httpc_response:error(ERequest, EReason)},
+			{ok, EState#state{request = ERequest}} end,
+	    tls_tunnel(Address, Request, State#state{session = Session}, ErrorHandler);
 	{error, Reason} ->
 	    self() ! {init_error, error_connecting,
 		      httpc_response:error(Request, Reason)},
@@ -1024,15 +1051,25 @@ handle_http_msg(Body, #state{status_line = {_,Code, _}} = State) ->
     {NewBody, NewRequest} = stream(Body, State#state.request, Code),
     handle_response(State#state{body = NewBody, request = NewRequest}).
 
-handle_http_body(<<>>, State = #state{status_line = {_,304, _}}) ->
+handle_http_body(_, #state{status = {ssl_tunnel, _},
+			   status_line = {_,200, _}} = State) ->
+    tls_upgrade(State);  
+
+handle_http_body(_, #state{status = {ssl_tunnel, Request},
+			   status_line = StatusLine} = State) ->
+    ClientErrMsg = httpc_response:error(Request,{could_no_establish_ssh_tunnel, StatusLine}),
+    NewState     = answer_request(Request, ClientErrMsg, State),
+    {stop, normal, NewState};
+
+handle_http_body(<<>>, #state{status_line = {_,304, _}} = State) ->
     ?hcrt("handle_http_body - 304", []),
     handle_response(State#state{body = <<>>});
 
-handle_http_body(<<>>, State = #state{status_line = {_,204, _}}) ->
+handle_http_body(<<>>, #state{status_line = {_,204, _}} = State) ->
     ?hcrt("handle_http_body - 204", []),
     handle_response(State#state{body = <<>>});
 
-handle_http_body(<<>>, State = #state{request = #request{method = head}}) ->
+handle_http_body(<<>>, #state{request = #request{method = head}} = State) ->
     ?hcrt("handle_http_body - head", []),
     handle_response(State#state{body = <<>>});
 
@@ -1119,7 +1156,7 @@ handle_response(#state{request      = Request,
 			      {session,     Session}, 
 			      {status_line, StatusLine}]),
 
-    handle_cookies(Headers, Request, Options, ProfileName),
+    handle_cookies(Headers, Request, Options, httpc_manager), %% FOO profile_name
     case httpc_response:result({StatusLine, Headers, Body}, Request) of
 	%% 100-continue
 	continue -> 
@@ -1503,6 +1540,12 @@ retry_pipeline([Request | PipeLine],
 	end,
     retry_pipeline(PipeLine, NewState).
 
+handle_proxy_options(https, #options{https_proxy = {HttpsProxy, _} = HttpsProxyOpt}) when 
+      HttpsProxy =/= undefined ->
+    HttpsProxyOpt;
+handle_proxy_options(_, #options{proxy = Proxy}) ->
+    Proxy.
+
 %%% Check to see if the given {Host,Port} tuple is in the NoProxyList
 %%% Returns an eventually updated {Host,Port} tuple, with the proxy address
 handle_proxy(HostPort = {Host, _Port}, {Proxy, NoProxy}) ->
@@ -1696,6 +1739,96 @@ send_raw(SocketType, Socket, ProcessBody, Acc) ->
             end
     end.
 
+tls_tunnel(Address, Request, #state{session = #session{socket = Socket, 
+						       socket_type = SocketType} = Session} = State, 
+	   ErrorHandler) ->
+    UpgradeRequest = tls_tunnel_request(Request), 
+    case httpc_request:send(Address, Session, UpgradeRequest) of
+	ok -> 
+	    TmpState = State#state{request = UpgradeRequest,
+				   %%  session = Session,
+				   mfa = init_mfa(UpgradeRequest, State),
+				   status_line =
+				       init_status_line(UpgradeRequest),
+				   headers = undefined,
+				   body = undefined},
+	    http_transport:setopts(SocketType,
+				   Socket, [{active, once}]),
+	    NewState = activate_request_timeout(TmpState),
+	    {ok, NewState#state{status = {ssl_tunnel, Request}}};
+	{error, Reason} ->
+	   ErrorHandler(Request, State, Reason)
+    end.
+
+tls_tunnel_request(#request{headers = Headers, 
+			     settings = Options,
+			     address =  {Host, Port}= Adress,
+			     ipv6_host_with_brackets = IPV6}) ->
+    
+    URI = Host ++":" ++ integer_to_list(Port),
+    
+    #request{
+       id =  make_ref(),
+       from = self(),
+       scheme = http, %% Use tcp-first and then upgrade!
+       address = Adress,
+       path = URI,
+       pquery  = "",
+       method = connect,
+       headers = #http_request_h{host = host_header(Headers, URI),
+				 te = "",
+				 pragma = "no-cache",
+				 other = [{"Proxy-Connection", " Keep-Alive"}]},
+       settings = Options,
+       abs_uri = URI,
+       stream = false,
+       userinfo = "",
+       headers_as_is = [],
+       started  = http_util:timestamp(),
+       ipv6_host_with_brackets = IPV6       
+      }.
+
+host_header(#http_request_h{host = Host}, _) ->
+    Host;
+
+%% Handles header_as_is
+host_header(_, URI) ->
+    {ok, {_, _, Host, _, _, _}} =  http_uri:parse(URI),
+    Host.
+
+tls_upgrade(#state{status = 
+		       {ssl_tunnel, 
+			#request{settings = 
+				     #http_options{ssl = {_, TLSOptions} = SocketType}} = Request},
+		   session = #session{socket = TCPSocket} = Session0,
+		   options = Options} = State) ->
+
+    case ssl:connect(TCPSocket, TLSOptions) of
+	{ok, TLSSocket} ->
+	    Address = Request#request.address,
+	    ClientClose = httpc_request:is_client_closing(Request#request.headers),
+	    SessionType = httpc_manager:session_type(Options),
+	    Session = Session0#session{
+			scheme = https,
+			socket = TLSSocket, 
+			socket_type = SocketType,
+			type = SessionType,
+			client_close = ClientClose},
+	    httpc_request:send(Address, Session, Request), 
+	    http_transport:setopts(SocketType, TLSSocket, [{active, once}]),
+	    NewState = State#state{session = Session,
+				   request = Request,
+				   mfa = init_mfa(Request, State),
+				   status_line =
+				       init_status_line(Request),
+				   headers = undefined,
+				   body = undefined,
+				   status = new
+				  },
+	    {noreply, activate_request_timeout(NewState)};
+	{error, _Reason} ->
+	    {stop, normal, State#state{request = Request}}
+    end.
 
 %% ---------------------------------------------------------------------
 %% Session wrappers
@@ -1713,7 +1846,32 @@ update_session(ProfileName, #session{id = SessionId} = Session, Pos, Value) ->
     catch
 	error:undef -> % This could happen during code upgrade
 	    Session2 = erlang:setelement(Pos, Session, Value),
-	    insert_session(Session2, ProfileName)
+	    insert_session(Session2, ProfileName);
+	  T:E ->
+            error_logger:error_msg("Failed updating session: "
+                                   "~n   ProfileName: ~p"
+                                   "~n   SessionId:   ~p"
+                                   "~n   Pos:         ~p"
+                                   "~n   Value:       ~p"
+                                   "~nwhen"
+                                   "~n   Session (db) info: ~p"
+                                   "~n   Session (db):      ~p"
+                                   "~n   Session (record):  ~p"
+                                   "~n   T: ~p"
+                                   "~n   E: ~p", 
+                                   [ProfileName, SessionId, Pos, Value, 
+                                    (catch httpc_manager:which_session_info(ProfileName)), 
+                                    Session, 
+                                    (catch httpc_manager:lookup_session(ProfileName, SessionId)), 
+                                    T, E]),
+            exit({failed_updating_session, 
+                  [{profile,    ProfileName}, 
+                   {session_id, SessionId}, 
+                   {pos,        Pos}, 
+                   {value,      Value}, 
+                   {etype,      T}, 
+                   {error,      E}, 
+                   {stacktrace, erlang:get_stacktrace()}]})	    
     end.
 
 
diff --git a/lib/inets/src/http_client/httpc_internal.hrl b/lib/inets/src/http_client/httpc_internal.hrl
index 8af752546c..30e2742e9d 100644
--- a/lib/inets/src/http_client/httpc_internal.hrl
+++ b/lib/inets/src/http_client/httpc_internal.hrl
@@ -37,6 +37,7 @@
 -define(HTTP_MAX_REDIRECTS,      4).
 -define(HTTP_KEEP_ALIVE_TIMEOUT, 120000).
 -define(HTTP_KEEP_ALIVE_LENGTH,  5).
+-define(TLS_UPGRADE_TOKEN, "TLS/1.0").
 
 %%% HTTP Client per request settings
 -record(http_options,
@@ -72,6 +73,7 @@
 -record(options, 
 	{
 	 proxy = {undefined, []}, % {{ProxyHost, ProxyPort}, [NoProxy]},
+	 https_proxy = {undefined, []}, % {{ProxyHost, ProxyPort}, [NoProxy]}
 	 %% 0 means persistent connections are used without pipelining
 	 pipeline_timeout      = ?HTTP_PIPELINE_TIMEOUT, 
 	 max_pipeline_length   = ?HTTP_PIPELINE_LENGTH,
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl
index b225b43214..c45dcab802 100644
--- a/lib/inets/src/http_client/httpc_manager.erl
+++ b/lib/inets/src/http_client/httpc_manager.erl
@@ -34,8 +34,11 @@
 	 retry_request/2, 
 	 redirect_request/2,
 	 insert_session/2, 
+	 lookup_session/2, 
 	 update_session/4, 
 	 delete_session/2, 
+	 which_sessions/1, 
+	 which_session_info/1, 
 	 set_options/2, 
 	 get_options/2, 
 	 store_cookies/3,
@@ -59,17 +62,9 @@
 	  options = #options{}
 	 }).
 
--record(handler_info, 
-	{
-	  id,      % Id of the request:          request_id()
-	  starter, % Pid of the handler starter process (temp): pid()
-	  handler, % Pid of the handler process: pid()
-	  from,    % From for the request:  from()
-	  state    % State of the handler: initiating | started | operational | canceled
-	 }).
-
 -define(DELAY, 500).
 
+
 %%====================================================================
 %% Internal Application API
 %%====================================================================
@@ -195,13 +190,28 @@ insert_session(Session, ProfileName) ->
 
 
 %%--------------------------------------------------------------------
+%% Function: lookup_session(SessionId, ProfileName) -> _
+%%      SessionId - term()
+%%      ProfileName - atom()
+%%
+%% Description: Looks up a session record in the httpc manager
+%% table <ProfileName>__session_db. 
+%%--------------------------------------------------------------------
+
+lookup_session(SessionId, ProfileName) ->
+    SessionDbName = session_db_name(ProfileName), 
+    ?hcrt("lookup session", [{session_id, SessionId}, {profile, ProfileName}]),
+    ets:lookup(SessionDbName, SessionId).
+
+
+%%--------------------------------------------------------------------
 %% Function: update_session(ProfileName, SessionId, Pos, Value) -> _
 %%	Session - #session{}
 %%      ProfileName - atom()
 %%
 %% Description: Update, only one field (Pos) of the session record
 %%              identified by the SessionId, the session information 
-%%              of the httpc manager table <ProfileName>_session_db. 
+%%              of the httpc manager table <ProfileName>__session_db. 
 %%              Intended to be called by the httpc request handler process.
 %%--------------------------------------------------------------------
 
@@ -216,12 +226,12 @@ update_session(ProfileName, SessionId, Pos, Value) ->
 
 
 %%--------------------------------------------------------------------
-%% Function: delete_session(SessionId, ProfileName) -> _
+%% Function: delete_session(SessionId, ProfileName) -> void()
 %%	SessionId -  {{Host, Port}, HandlerPid}
 %%      ProfileName - atom()
 %% 
 %% Description: Deletes session information from the httpc manager
-%% table httpc_manager_session_db_<Profile>. Intended to be called by
+%% table <ProfileName>__session_db. Intended to be called by
 %% the httpc request handler process.
 %%--------------------------------------------------------------------
 
@@ -232,6 +242,57 @@ delete_session(SessionId, ProfileName) ->
 
 
 %%--------------------------------------------------------------------
+%% Function: which sessions(ProfileName) -> SessionsInfo
+%%      ProfileName - atom()
+%%      SessionsInfo - {GoodSessions, BadSessions, NonSessions}
+%%      GoodSessions - [#session{}]
+%%      BadSessions  - [tuple()]
+%%      NonSessions  - [term()]
+%%
+%% Description: Produces a list of all sessions in the session db.
+%% Used for debugging and since that is the intent, there is some
+%% checking and transforming done, which produces the results.
+%%--------------------------------------------------------------------
+
+which_sessions(ProfileName) ->
+    ?hcrt("which_sessions", [{profile, ProfileName}]),
+    SessionDbName = session_db_name(ProfileName), 
+    which_sessions2(SessionDbName).
+
+which_sessions2(SessionDbName) ->
+    Sessions     = which_sessions_order(ets:tab2list(SessionDbName)),
+    GoodSessions = [GoodSession || {good_session, GoodSession} <- Sessions],
+    BadSessions  = [BadSession  || {bad_session,  BadSession}  <- Sessions],
+    NonSessions  = [NonSession  || {non_session,  NonSession}  <- Sessions],
+    {lists:keysort(#session.id, GoodSessions), 
+     lists:keysort(#session.id, BadSessions), 
+     lists:sort(NonSessions)}.
+
+which_sessions_order([]) ->
+    [];
+which_sessions_order([Session|Sessions]) when is_record(Session, session) ->
+    [{good_session, Session} | which_sessions_order(Sessions)];
+which_sessions_order([BadSession|Sessions]) 
+  when is_tuple(BadSession) andalso 
+       (element(1, BadSession) =:= session) ->
+    [{bad_session, BadSession} | which_sessions_order(Sessions)];
+which_sessions_order([NonSession|Sessions]) ->
+    [{non_session, NonSession} | which_sessions_order(Sessions)].
+
+
+%%--------------------------------------------------------------------
+%% Function: which session_info(ProfileName) -> list()
+%%
+%% Description: Produces a ets table info list of the sessions table
+%%--------------------------------------------------------------------
+
+which_session_info(ProfileName) ->
+    SessionDbName = session_db_name(ProfileName), 
+    ?hcrt("which_session_info", [{profile, ProfileName}]),
+    ets:info(SessionDbName).
+
+
+%%--------------------------------------------------------------------
 %% Function: set_options(Options, ProfileName) -> ok
 %%
 %%	Options = [Option]
@@ -379,8 +440,7 @@ do_init(ProfileName, CookiesDir) ->
     %% Create handler db
     ?hcrt("create handler/request db", []),
     HandlerDbName = handler_db_name(ProfileName), 
-    ets:new(HandlerDbName, 
-	    [protected, set, named_table, {keypos, #handler_info.id}]),
+    ets:new(HandlerDbName, [protected, set, named_table, {keypos, 1}]),
 
     %% Cookie DB
     ?hcrt("create cookie db", []),
@@ -414,9 +474,10 @@ handle_call({request, Request}, _, State) ->
 	    {stop, Error, httpc_response:error(Request, Error), State}
     end;
 
-handle_call({cancel_request, RequestId}, From, State) ->
+handle_call({cancel_request, RequestId}, From, 
+	    #state{handler_db = HandlerDb} = State) ->
     ?hcri("cancel_request", [{request_id, RequestId}]),
-    case ets:lookup(State#state.handler_db, RequestId) of
+    case ets:lookup(HandlerDb, RequestId) of
 	[] ->
 	    %% The request has allready compleated make sure
 	    %% it is deliverd to the client process queue so
@@ -428,9 +489,9 @@ handle_call({cancel_request, RequestId}, From, State) ->
 	    {noreply, State};
 	[{_, Pid, _}] ->
 	    httpc_handler:cancel(RequestId, Pid, From),
-	    {noreply, State#state{cancel = 
-				  [{RequestId, Pid, From} |
-				   State#state.cancel]}}
+	    {noreply, 
+	     State#state{cancel = 
+			 [{RequestId, Pid, From} | State#state.cancel]}}
     end;
 
 handle_call(reset_cookies, _, #state{cookie_db = CookieDb} = State) ->
@@ -457,8 +518,8 @@ handle_call({which_cookies, Url, Options}, _,
 
 handle_call({get_options, OptionItems}, _, #state{options = Options} = State) ->
     ?hcrv("get options", [{option_items, OptionItems}]),
-    Reply = [{OptionItem, get_option(OptionItem, Options)} || OptionItem <- 
-								  OptionItems], 
+    Reply = [{OptionItem, get_option(OptionItem, Options)} || 
+		OptionItem <- OptionItems], 
     {reply, Reply, State};
 
 handle_call(info, _, State) ->
@@ -516,6 +577,7 @@ handle_cast({set_options, Options}, State = #state{options = OldOptions}) ->
     ?hcrv("set options", [{options, Options}, {old_options, OldOptions}]),
     NewOptions = 
 	#options{proxy                 = get_proxy(Options, OldOptions),
+		 https_proxy           = get_https_proxy(Options, OldOptions),
 		 pipeline_timeout      = get_pipeline_timeout(Options, OldOptions), 
 		 max_pipeline_length   = get_max_pipeline_length(Options, OldOptions), 
 		 max_keep_alive_length = get_max_keep_alive_length(Options, OldOptions), 
@@ -645,7 +707,7 @@ code_change(_,
 code_change(_, State, _) ->
     {ok, State}.
 
-%% This function is to catch everything that calls through the cracks...
+%% This function is used to catch everything that falls through the cracks...
 update_session_table(SessionDB, Transform) ->
     ets:safe_fixtable(SessionDB, true),
     update_session_table(SessionDB, ets:first(SessionDB), Transform),
@@ -673,39 +735,42 @@ update_session_table(SessionDB, Key, Transform) ->
 %%--------------------------------------------------------------------
 
 get_manager_info(#state{handler_db = HDB, 
-			cookie_db  = CDB} = _State) ->
+			session_db = SDB, 
+			cookie_db  = CDB, 
+			options    = Options} = _State) ->
     HandlerInfo = get_handler_info(HDB),
+    SessionInfo = which_sessions2(SDB), 
+    OptionsInfo = 
+	[{Item, get_option(Item, Options)} || 
+		  Item <- record_info(fields, options)], 
     CookieInfo  = httpc_cookie:which_cookies(CDB),
-    [{handlers, HandlerInfo}, {cookies, CookieInfo}].
+    [{handlers, HandlerInfo}, 
+     {sessions, SessionInfo}, 
+     {options,  OptionsInfo}, 
+     {cookies,  CookieInfo}].
+
+sort_handlers(Unsorted) ->
+    sort_handlers2(lists:keysort(1, Unsorted)).
+
+sort_handlers2([]) ->
+    [];
+sort_handlers2([{HandlerPid, RequestId}|L]) ->
+    {Handler, Rest} = sort_handlers2(HandlerPid, [RequestId], L),
+    [Handler | sort_handlers2(Rest)].
+
+sort_handlers2(HandlerPid, Reqs, []) ->
+    {{HandlerPid, lists:sort(Reqs)}, []};
+sort_handlers2(HandlerPid, Reqs, [{HandlerPid, ReqId}|Rest]) ->
+    sort_handlers2(HandlerPid, [ReqId|Reqs], Rest);
+sort_handlers2(HandlerPid1, Reqs, [{HandlerPid2, _}|_] = Rest) 
+  when HandlerPid1 =/= HandlerPid2 ->
+    {{HandlerPid1, lists:sort(Reqs)}, Rest}.
 
 get_handler_info(Tab) ->
-    Pattern = #handler_info{handler = '$1',
-			    state   = '$2', 
-			    _ = '_'},
-    Handlers1 = [{Pid, State} || [Pid, State] <- ets:match(Tab, Pattern)],
-    F = fun({Pid, State} = Elem, Acc) when State =/= canceled -> 
-		case lists:keymember(Pid, 1, Acc) of
-		    true ->
-			Acc;
-		    false ->
-			[Elem | Acc]
-		end;
-	   (_, Acc) ->
-		Acc
-	end,
-    Handlers2 = lists:foldl(F, [], Handlers1),
-    Handlers3 = [{Pid, State, 
-		  case (catch httpc_handler:info(Pid)) of
-		      {'EXIT', _} -> 
-			  %% Why would this crash? 
-			  %% Only if the process has died, but we don't 
-			  %% know about it?
-			  [];
-		      Else ->
-			  Else
-		  end} || 
-		    {Pid, State} <- Handlers2],
-    Handlers3.
+    Pattern   = {'$2', '$1', '_'},
+    Handlers1 = [{Pid, Id} || [Pid, Id] <- ets:match(Tab, Pattern)],
+    Handlers2 = sort_handlers(Handlers1), 
+    [{Pid, Reqs, httpc_handler:info(Pid)} || {Pid, Reqs} <- Handlers2].
 
 handle_request(#request{settings = 
 			#http_options{version = "HTTP/0.9"}} = Request,
@@ -758,19 +823,21 @@ handle_request(Request, State = #state{options = Options}) ->
     {reply, {ok, NewRequest#request.id}, State}.
 
 
-start_handler(Request, State) ->
+start_handler(#request{id   = Id, 
+		       from = From} = Request, 
+	      #state{profile_name = ProfileName, 
+		     handler_db   = HandlerDb, 
+		     options      = Options}) ->
     {ok, Pid} =
 	case is_inets_manager() of
 	    true ->
 		httpc_handler_sup:start_child([whereis(httpc_handler_sup),
-					       Request, State#state.options,
-					       State#state.profile_name]);
+					       Request, Options, ProfileName]);
 	    false ->
-		httpc_handler:start_link(self(), Request, State#state.options,
-					 State#state.profile_name)
+		httpc_handler:start_link(self(), Request, Options, ProfileName)
 	end,
-    ets:insert(State#state.handler_db, {Request#request.id,
-					Pid, Request#request.from}),
+    HandlerInfo = {Id, Pid, From}, 
+    ets:insert(HandlerDb, HandlerInfo), 
     erlang:monitor(process, Pid).
 
 
@@ -827,12 +894,14 @@ select_session(Candidates, Max) ->
 	    {ok, HandlerPid}
     end.
 
-pipeline_or_keep_alive(Request, HandlerPid, State) ->
+pipeline_or_keep_alive(#request{id   = Id, 
+				from = From} = Request, 
+		       HandlerPid, 
+		       #state{handler_db = HandlerDb} = State) ->
     case (catch httpc_handler:send(Request, HandlerPid)) of
 	ok ->
-	    ets:insert(State#state.handler_db, {Request#request.id,
-						HandlerPid,
-						Request#request.from});
+	    HandlerInfo = {Id, HandlerPid, From}, 
+	    ets:insert(HandlerDb, HandlerInfo);
 	_  -> % timeout pipelining failed
 	    start_handler(Request, State)
     end.
@@ -920,6 +989,8 @@ cast(ProfileName, Msg) ->
 
 get_option(proxy, #options{proxy = Proxy}) ->
     Proxy;
+get_option(https_proxy, #options{https_proxy = Proxy}) ->
+    Proxy;
 get_option(pipeline_timeout, #options{pipeline_timeout = Timeout}) ->
     Timeout;
 get_option(max_pipeline_length, #options{max_pipeline_length = Length}) ->
@@ -946,6 +1017,9 @@ get_option(socket_opts, #options{socket_opts = SocketOpts}) ->
 get_proxy(Opts, #options{proxy = Default}) ->
     proplists:get_value(proxy, Opts, Default).
 
+get_https_proxy(Opts, #options{https_proxy = Default}) ->
+    proplists:get_value(https_proxy, Opts, Default).
+
 get_pipeline_timeout(Opts, #options{pipeline_timeout = Default}) ->
     proplists:get_value(pipeline_timeout, Opts, Default).
 
diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile
index aaf3cfb995..51167b34fa 100644
--- a/lib/inets/src/http_lib/Makefile
+++ b/lib/inets/src/http_lib/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2005-2010. All Rights Reserved.
+# Copyright Ericsson AB 2005-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -87,11 +87,11 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_lib
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_lib
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_lib"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_lib"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
index 60bb0d2527..67555d5f1c 100644
--- a/lib/inets/src/http_server/Makefile
+++ b/lib/inets/src/http_server/Makefile
@@ -123,11 +123,11 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_server
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_server
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_server"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index b575d7331b..a97bbd9b25 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -483,7 +483,7 @@ validate_properties(Properties) ->
     case mandatory_properties(Properties) of
 	ok -> 
 	    %% Second, check that property dependency are ok
-	    {ok, validate_properties2(Properties)};
+	    {ok, check_minimum_bytes_per_second(validate_properties2(Properties))};
 	Error ->
 	    throw(Error)
     end.
@@ -522,7 +522,18 @@ validate_properties2(Properties) ->
 		    throw(Error)
 	    end
     end.
-
+check_minimum_bytes_per_second(Properties) ->
+    case proplists:get_value(minimum_bytes_per_second, Properties, false) of
+	false ->
+	    Properties;
+	Nr ->
+	    case is_integer(Nr) of
+		false ->
+		    throw({error, {minimum_bytes_per_second, is_not_integer}});
+		_ ->
+		    Properties
+	    end
+    end.
 mandatory_properties(ConfigList) ->
     a_must(ConfigList, [server_name, port, server_root, document_root]).
 
@@ -829,9 +840,7 @@ os_info(Info) ->
 	{OsFamily, _OsName} when Info =:= partial ->
 	    lists:flatten(io_lib:format("(~w)", [OsFamily]));
 	{OsFamily, OsName} ->
-	    lists:flatten(io_lib:format("(~w/~w)", [OsFamily, OsName]));
-	OsFamily ->
-	    lists:flatten(io_lib:format("(~w)", [OsFamily]))
+	    lists:flatten(io_lib:format("(~w/~w)", [OsFamily, OsName]))
     end.
 
 otp_release() ->
diff --git a/lib/inets/src/http_server/httpd_log.erl b/lib/inets/src/http_server/httpd_log.erl
index 60ab326a20..a34435e0e8 100644
--- a/lib/inets/src/http_server/httpd_log.erl
+++ b/lib/inets/src/http_server/httpd_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -36,8 +36,8 @@
 		   AuthUser   :: string(), 
 		   Date       :: string(), 
 		   StatusCode :: pos_integer(),
-		   Size       :: pos_integer() | string()) ->
-    {Log :: atom() | pid(), Entry :: string()}.
+		   Size       :: 0 | pos_integer() | string()) ->
+			  {Log :: atom() | pid(), Entry :: string()} | term() .
 
 access_entry(Log, NoLog, Info, RFC931, AuthUser, Date, StatusCode, SizeStr) 
   when is_list(SizeStr) ->
@@ -69,7 +69,7 @@ access_entry(Log, NoLog,
 		  Info   :: #mod{},
 		  Date   :: string(), 
 		  Reason :: term()) ->
-    {Log :: atom() | pid(), Entry :: string()}.
+			 {Log :: atom() | pid(), Entry :: string()} | term().
 
 error_entry(Log, NoLog, 
 	    #mod{config_db   = ConfigDB,
@@ -87,7 +87,7 @@ error_entry(Log, NoLog,
 			 ConfigDB :: term(),
 			 Date     :: string(), 
 			 ErrroStr :: string()) ->
-    {Log :: atom() | pid(), Entry :: string()}.
+    {Log :: atom() | pid(), Entry :: string()} | term().
 
 error_report_entry(Log, NoLog, ConfigDb, Date, ErrorStr) ->
     MakeEntry = fun() -> io_lib:format("[~s], ~s~n", [Date, ErrorStr]) end,
@@ -99,7 +99,7 @@ error_report_entry(Log, NoLog, ConfigDb, Date, ErrorStr) ->
 		     ConfigDB :: term(),
 		     Date     :: string(), 
 		     Reason   :: term()) ->
-    {Log :: atom() | pid(), Entry :: string()}.
+    {Log :: atom() | pid(), Entry :: string()} | term().
 
 security_entry(Log, NoLog, #mod{config_db = ConfigDB}, Date, Reason) ->
     MakeEntry = fun() -> io_lib:format("[~s] ~s~n", [Date, Reason]) end,
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl
index b62c10bbc7..0f47d785ef 100644
--- a/lib/inets/src/http_server/httpd_request_handler.erl
+++ b/lib/inets/src/http_server/httpd_request_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -44,7 +44,9 @@
 		timeout,  %% infinity | integer() > 0
 		timer,     %% ref() - Request timer
 		headers,  %% #http_request_h{}
-		body      %% binary()
+		body,      %% binary()
+		data,      %% The total data received in bits, checked after 10s
+		byte_limit  %% Bit limit per second before kick out
 	       }).
 
 %%====================================================================
@@ -98,7 +100,6 @@ init([Manager, ConfigDB, AcceptTimeout]) ->
 	  [{socket_type, SocketType}, {socket, Socket}]),
 
     TimeOut = httpd_util:lookup(ConfigDB, keep_alive_timeout, 150000),
-
     Then = erlang:now(),
     
     ?hdrd("negotiate", []),
@@ -139,12 +140,11 @@ continue_init(Manager, ConfigDB, SocketType, Socket, TimeOut) ->
 		   mfa                    = MFA},
     
     ?hdrt("activate request timeout", []),
-    NewState = activate_request_timeout(State),
     
     ?hdrt("set socket options (binary, packet & active)", []),
     http_transport:setopts(SocketType, Socket, 
 			   [binary, {packet, 0}, {active, once}]),
-
+    NewState =  data_receive_counter(activate_request_timeout(State), httpd_util:lookup(ConfigDB, minimum_bytes_per_second, false)),
     ?hdrt("init done", []),
     gen_server:enter_loop(?MODULE, [], NewState).
 
@@ -205,16 +205,25 @@ handle_info({Proto, Socket, Data},
     ?hdrd("received data", 
 	  [{data, Data}, {proto, Proto}, 
 	   {socket, Socket}, {socket_type, SockType}, {mfa, MFA}]),
-
+    
 %%     case (catch Module:Function([Data | Args])) of
     PROCESSED = (catch Module:Function([Data | Args])),
-    
+    NewDataSize = case State#state.byte_limit of
+		      undefined ->
+			  undefined;
+		      _ ->
+			  State#state.data + byte_size(Data)
+		  end,
     ?hdrt("data processed", [{processing_result, PROCESSED}]),
-
     case PROCESSED of
         {ok, Result} ->
 	    ?hdrd("data processed", [{result, Result}]),
-	    NewState = cancel_request_timeout(State),
+	    NewState = case NewDataSize of
+			   undefined ->
+			       cancel_request_timeout(State);
+			   _ ->
+			       set_new_data_size(cancel_request_timeout(State), NewDataSize)
+		       end,
             handle_http_msg(Result, NewState); 
 
 	{error, {uri_too_long, MaxSize}, Version} ->
@@ -239,7 +248,12 @@ handle_info({Proto, Socket, Data},
 	NewMFA ->
 	    ?hdrd("data processed - reactivate socket", [{new_mfa, NewMFA}]),
 	    http_transport:setopts(SockType, Socket, [{active, once}]),
-            {noreply, State#state{mfa = NewMFA}}
+	    case NewDataSize of
+		undefined ->
+		    {noreply, State#state{mfa = NewMFA}};
+		_ ->
+		    {noreply, State#state{mfa = NewMFA, data = NewDataSize}}
+	    end
     end;
 
 %% Error cases
@@ -263,7 +277,22 @@ handle_info(timeout, #state{mod = ModData} = State) ->
     error_log("The client did not send the whole request before the "
 	      "server side timeout", ModData),
     {stop, normal, State#state{response_sent = true}};
-
+handle_info(check_data_first, #state{data = Data, byte_limit = Byte_Limit} = State) ->
+    case Data >= (Byte_Limit*3) of 
+	true ->
+	    erlang:send_after(1000, self(), check_data),
+	    {noreply, State#state{data = 0}};
+	_ ->
+	    {stop, normal, State#state{response_sent = true}}
+    end;
+handle_info(check_data, #state{data = Data, byte_limit = Byte_Limit} = State) ->
+    case Data >= Byte_Limit of 
+	true ->
+	    erlang:send_after(1000, self(), check_data),
+	    {noreply, State#state{data = 0}};
+	_ ->
+	    {stop, normal, State#state{response_sent = true}}
+    end;
 %% Default case
 handle_info(Info, #state{mod = ModData} = State) ->
     Error = lists:flatten(
@@ -311,6 +340,8 @@ code_change(_OldVsn, State, _Extra) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
+set_new_data_size(State, NewData) ->
+    State#state{data = NewData}.
 await_socket_ownership_transfer(AcceptTimeout) ->
     receive
 	{socket_ownership_transfered, SocketType, Socket} ->
@@ -603,7 +634,14 @@ activate_request_timeout(#state{timeout = Time} = State) ->
     ?hdrt("activate request timeout", [{time, Time}]),    
     Ref = erlang:send_after(Time, self(), timeout),
     State#state{timer = Ref}.
-
+data_receive_counter(State, Byte_limit) ->
+    case Byte_limit of
+	false ->
+	    State#state{data = 0};
+	Nr ->
+	    erlang:send_after(3000, self(), check_data_first),
+	    State#state{data = 0, byte_limit = Nr}
+    end.
 cancel_request_timeout(#state{timer = undefined} = State) ->
     State;
 cancel_request_timeout(#state{timer = Timer} = State) ->
diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
index 6da6a1d79f..7d68145287 100644
--- a/lib/inets/src/inets_app/Makefile
+++ b/lib/inets/src/inets_app/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2005-2011. All Rights Reserved.
+# Copyright Ericsson AB 2005-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -111,13 +111,13 @@ $(APPUP_TARGET): $(APPUP_SRC) ../../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/inets_app
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/inets_app
-	$(INSTALL_DIR)  $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/inets_app"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/inets_app"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index c7029f7b31..ffd0ed622f 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,14 +18,32 @@
 
 {"%VSN%",
  [
+  {"5.9.1", 
+   [
+    {load_module, httpd_request_handler, soft_purge, soft_purge, []}
+   ]
+  },
+  {"5.9", 
+   [
+    {load_module, httpd_request_handler, soft_purge, soft_purge, []},
+    {load_module, tftp,          soft_purge, soft_purge, [inets_service]}, 
+    {load_module, inets_service, soft_purge, soft_purge, []}, 
+    {load_module, httpc,         soft_purge, soft_purge, [httpc_manager]}, 
+    {update,      httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]},
+    {update,      httpc_manager, soft, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"5.8.1", 
    [
+    {load_module, httpd_request_handler, soft_purge, soft_purge, []},
+    {load_module, tftp,          soft_purge, soft_purge, [inets_service]}, 
+    {load_module, inets_service, soft_purge, soft_purge, []}, 
+
     {load_module, http_uri,      soft_purge, soft_purge, []}, 
     {load_module, httpc_response, soft_purge, soft_purge, [http_uri]}, 
 
     {load_module, httpc,         soft_purge, soft_purge, 
      [http_uri, httpc_manager]}, 
-    {update,      httpc_manager, soft, soft_purge, soft_purge, [http_uri]},
 
     {load_module, inets_app, soft_purge, soft_purge, [inets_sup]}, 
     {update,      inets_sup,     soft, soft_purge, soft_purge, []},
@@ -35,36 +53,15 @@
     {load_module, httpd_script_env, soft_purge, soft_purge, []}, 
 
     {load_module, inets,         soft_purge, soft_purge, [inets_trace]},
-    {update,      httpc_handler, soft, soft_purge, soft_purge, []},
+    {update,      httpc_manager, soft, soft_purge, soft_purge, [http_uri]},
+    {update,      httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]},
     {update,      httpd_sup,     soft, soft_purge, soft_purge, []},
     {add_module,  inets_trace}
    ]
   }, 
-  {"5.8",
+  {"5.8", 
    [
-    {load_module, http_uri,      soft_purge, soft_purge, []}, 
-    {load_module, httpc_response, soft_purge, soft_purge, [http_uri]}, 
-
-    {load_module, httpc, soft_purge, soft_purge, 
-     [http_uri, httpc_manager]}, 
-
-    {load_module, inets_app, soft_purge, soft_purge, [inets_sup]}, 
-    {update,      inets_sup,     soft, soft_purge, soft_purge, []},
-
-    {load_module, inets, soft_purge, soft_purge, [inets_trace]},
-
-    {load_module, httpd_conf, soft_purge, soft_purge, []}, 
-    {load_module, httpd_response, soft_purge, soft_purge, []}, 
-    {load_module, httpd_script_env, soft_purge, soft_purge, []}, 
-
-    {load_module, ftp, soft_purge, soft_purge, []}, 
-    {update, httpc_handler, {advanced, upgrade_from_pre_5_8_1}, 
-     soft_purge, soft_purge, []}, 
-    {update, httpc_manager, {advanced, upgrade_from_pre_5_8_1}, 
-     soft_purge, soft_purge, [http_uri, httpc_handler]},
-    {update,      httpd_sup, soft, soft_purge, soft_purge, []},
-
-    {add_module,  inets_trace}
+    {restart_application, inets}
    ]
   }, 
   {"5.7.2", 
@@ -74,14 +71,32 @@
   }
  ],
  [
+  {"5.9.1", 
+   [
+    {load_module, httpd_request_handler, soft_purge, soft_purge, []}
+   ]
+  },
+  {"5.9", 
+   [
+    {load_module, httpd_request_handler, soft_purge, soft_purge, []},
+    {load_module, tftp,          soft_purge, soft_purge, [inets_service]}, 
+    {load_module, inets_service, soft_purge, soft_purge, []}, 
+    {load_module, httpc,         soft_purge, soft_purge, [httpc_manager]}, 
+    {update,      httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]},
+    {update,      httpc_manager, soft, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"5.8.1",
    [
+    {load_module, httpd_request_handler, soft_purge, soft_purge, []},
+    {load_module, tftp,          soft_purge, soft_purge, [inets_service]}, 
+    {load_module, inets_service, soft_purge, soft_purge, []}, 
+
     {load_module, http_uri,      soft_purge, soft_purge, []}, 
     {load_module, httpc_response, soft_purge, soft_purge, [http_uri]}, 
 
     {load_module, httpc,         soft_purge, soft_purge, 
      [http_uri, httpc_manager]}, 
-    {update,      httpc_manager, soft, soft_purge, soft_purge, [http_uri]},
 
     {load_module, inets_app, soft_purge, soft_purge, [inets_sup]}, 
     {update,      inets_sup,     soft, soft_purge, soft_purge, []},
@@ -91,36 +106,15 @@
     {load_module, httpd_script_env, soft_purge, soft_purge, []}, 
 
     {load_module, inets,         soft_purge, soft_purge, []},
-    {update,      httpc_handler, soft, soft_purge, soft_purge, []},
+    {update,      httpc_manager, soft, soft_purge, soft_purge, [http_uri]},
+    {update,      httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]},
     {update,      httpd_sup,     soft, soft_purge, soft_purge, []},
     {remove,      {inets_trace, soft_purge, brutal_purge}}
    ]
   }, 
   {"5.8",
    [
-    {load_module, http_uri,      soft_purge, soft_purge, []}, 
-    {load_module, httpc_response, soft_purge, soft_purge, [http_uri]}, 
-
-    {load_module, httpc,         soft_purge, soft_purge, 
-     [http_uri, httpc_manager]}, 
-
-    {load_module, inets_app, soft_purge, soft_purge, [inets_sup]}, 
-    {update,      inets_sup,     soft, soft_purge, soft_purge, []},
-
-    {load_module, inets, soft_purge, soft_purge, []},
-
-    {load_module, httpd_conf, soft_purge, soft_purge, []}, 
-    {load_module, httpd_response, soft_purge, soft_purge, []}, 
-    {load_module, httpd_script_env, soft_purge, soft_purge, []}, 
-
-    {load_module, ftp, soft_purge, soft_purge, []}, 
-    {update, httpc_handler, {advanced, upgrade_from_pre_5_8_1}, 
-     soft_purge, soft_purge, []}, 
-    {update, httpc_manager, {advanced, upgrade_from_pre_5_8_1}, 
-     soft_purge, soft_purge, [http_uri, httpc_handler]},
-    {update,      httpd_sup, soft, soft_purge, soft_purge, []},
-
-    {remove,      {inets_trace, soft_purge, brutal_purge}}
+    {restart_application, inets}
    ]
   }, 
   {"5.7.2", 
diff --git a/lib/inets/src/inets_app/inets.erl b/lib/inets/src/inets_app/inets.erl
index f33e0abe27..ed8082534f 100644
--- a/lib/inets/src/inets_app/inets.erl
+++ b/lib/inets/src/inets_app/inets.erl
@@ -274,13 +274,8 @@ sys_info() ->
 
 os_info() ->
     V = os:version(),
-    case os:type() of
-        {OsFam, OsName} ->
-            [{fam, OsFam}, {name, OsName}, {ver, V}];
-        OsFam ->
-            [{fam, OsFam}, {ver, V}]
-    end.
-
+    {OsFam, OsName} = os:type(),
+    [{fam, OsFam}, {name, OsName}, {ver, V}].
 
 print_mods_info(Versions) ->
     case key1search(mod_info, Versions) of
diff --git a/lib/inets/src/inets_app/inets.mk b/lib/inets/src/inets_app/inets.mk
index d24cc0aea3..adef32dc19 100644
--- a/lib/inets/src/inets_app/inets.mk
+++ b/lib/inets/src/inets_app/inets.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2011. All Rights Reserved.
+# Copyright Ericsson AB 2010-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -33,10 +33,6 @@ ifeq ($(WARN_UNUSED_WARS), true)
 ERL_COMPILE_FLAGS += +warn_unused_vars
 endif
 
-ifeq ($(shell erl -noshell -eval 'io:format("~4s", [erlang:system_info(otp_release)])' -s init stop), R14B)
-INETS_ERL_COMPILE_FLAGS += -D'OTP-R14B-COMPILER'
-endif
-
 INETS_APP_VSN_COMPILE_FLAGS = \
 	+'{parse_transform,sys_pre_attributes}' \
 	+'{attribute,insert,app_vsn,$(APP_VSN)}'
diff --git a/lib/inets/src/inets_app/inets_service.erl b/lib/inets/src/inets_app/inets_service.erl
index a057a51e2c..d17fdfe13e 100644
--- a/lib/inets/src/inets_app/inets_service.erl
+++ b/lib/inets/src/inets_app/inets_service.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -20,20 +20,6 @@
 
 -module(inets_service).
 
--ifdef('OTP-R14B-COMPILER').
-
--export([behaviour_info/1]).
-
-behaviour_info(callbacks) ->
-        [{start_standalone,         1}, 
-	 {start_service,            1},
-	 {stop_service,             1},
-	 {services,                 0},
-	 {service_info,             1}];
-behaviour_info(_) ->
-        undefined.
-
--else.
 
 %% Starts service stand-alone
 %% start_standalone(Config) ->  % {ok, Pid} | {error, Reason}
@@ -83,4 +69,3 @@ behaviour_info(_) ->
 -callback service_info(Service :: term()) ->
     {ok, [{Property :: term(), Value :: term()}]} | {error, Reason :: term()}.
 
--endif.
diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile
index 759b70c8e4..b368b12462 100644
--- a/lib/inets/src/tftp/Makefile
+++ b/lib/inets/src/tftp/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2005-2010. All Rights Reserved.
+# Copyright Ericsson AB 2005-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -39,8 +39,10 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
+BEHAVIOUR_MODULES= \
+	tftp
+
 MODULES = \
-	tftp \
 	tftp_binary \
 	tftp_engine \
 	tftp_file \
@@ -50,10 +52,13 @@ MODULES = \
 
 HRL_FILES = tftp.hrl
 
-ERL_FILES = $(MODULES:%=%.erl)
+ERL_FILES= \
+	$(MODULES:%=%.erl) \
+	$(BEHAVIOUR_MODULES:%=%.erl)
 
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
+BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 # ----------------------------------------------------
 # FLAGS
@@ -72,10 +77,12 @@ ERL_COMPILE_FLAGS += \
 # Targets
 # ----------------------------------------------------
 
+$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
+
 debug opt: $(TARGET_FILES)
 
 clean:
-	rm -f $(TARGET_FILES)
+	rm -f $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES)
 	rm -f core
 
 docs:
@@ -86,11 +93,11 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/tftp
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/tftp
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/tftp"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/tftp"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/tftp/tftp.erl b/lib/inets/src/tftp/tftp.erl
index 0d7ae1a89e..1621add246 100644
--- a/lib/inets/src/tftp/tftp.erl
+++ b/lib/inets/src/tftp/tftp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -224,20 +224,6 @@
 	 service_info/1
 	]).
 
--ifdef('OTP-R14B-COMPILER').
-
--export([behaviour_info/1]).
-
-behaviour_info(callbacks) ->
-    [{prepare, 6}, 
-     {open,    6}, 
-     {read,    1}, 
-     {write,   2}, 
-     {abort,   3}];
-behaviour_info(_) ->
-    undefined.
-
--else.
 
 -type peer() :: {PeerType :: inet | inet6,
 		 PeerHost :: inet:ip_address(),
@@ -280,8 +266,6 @@ behaviour_info(_) ->
 
 -callback abort(Code :: error_code(), string(), State :: term()) -> 'ok'.
 
--endif.
-
 -include("tftp.hrl").
 
 
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile
index 87ca60e4b3..0ca99e8692 100644
--- a/lib/inets/test/Makefile
+++ b/lib/inets/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -149,6 +149,7 @@ INETS_ROOT = ../../inets
 
 MODULES =                 		\
 	inets_test_lib    		\
+	erl_make_certs                  \
 	ftp_SUITE 	  		\
 	ftp_format_SUITE  		\
 	ftp_solaris8_sparc_test		\
@@ -169,6 +170,7 @@ MODULES =                 		\
 	http_format_SUITE 		\
 	httpc_SUITE	  		\
 	httpc_cookie_SUITE		\
+	httpc_proxy_SUITE		\
 	httpd_SUITE       		\
 	httpd_basic_SUITE		\
 	httpd_mod 	  		\
@@ -213,7 +215,7 @@ INETS_FILES = inets.config $(INETS_SPECS)
 
 INETS_DATADIRS = inets_SUITE_data inets_sup_SUITE_data 
 HTTPD_DATADIRS = httpd_test_data httpd_SUITE_data
-HTTPC_DATADIRS = httpc_SUITE_data
+HTTPC_DATADIRS = httpc_SUITE_data httpc_proxy_SUITE_data
 FTP_DATADIRS   = ftp_SUITE_data  
 
 DATADIRS     = $(INETS_DATADIRS) $(HTTPD_DATADIRS) $(HTTPC_DATADIRS) $(FTP_DATADIRS)
@@ -234,7 +236,7 @@ endif
 # Release directory specification
 # ----------------------------------------------------
 
-RELTESTSYSDIR        = $(RELEASE_PATH)/inets_test
+RELTESTSYSDIR        = "$(RELEASE_PATH)/inets_test"
 RELTESTSYSALLDATADIR = $(RELTESTSYSDIR)/all_SUITE_data
 RELTESTSYSBINDIR     = $(RELTESTSYSALLDATADIR)/bin
 
@@ -284,9 +286,9 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/test
-	$(INSTALL_DATA) $(HRL_FILES)   $(ERL_FILES) $(RELSYSDIR)/test
-	$(INSTALL_DATA) $(INETS_FILES) $(RELSYSDIR)/test
+	$(INSTALL_DIR)  "$(RELSYSDIR)/test"
+	$(INSTALL_DATA) $(HRL_FILES)   $(ERL_FILES) "$(RELSYSDIR)/test"
+	$(INSTALL_DATA) $(INETS_FILES) "$(RELSYSDIR)/test"
 	@for d in $(DATADIRS); do \
             echo "installing data dir $$d"; \
             if test -f $$d/TAR.exclude; then \
@@ -299,9 +301,9 @@ release_spec: opt
                 find $$d -name 'erl_crash.dump' >> $$d/TAR.exclude2; \
                 find $$d -name 'core'           >> $$d/TAR.exclude2; \
                 find $$d -name '.cmake.state'   >> $$d/TAR.exclude2; \
-                tar cfX - $$d/TAR.exclude2 $$d | (cd $(RELSYSDIR)/test; tar xf -); \
+                tar cfX - $$d/TAR.exclude2 $$d | (cd "$(RELSYSDIR)/test"; tar xf -); \
             else \
-                tar cf - $$d | (cd $(RELSYSDIR)/test; tar xf -); \
+                tar cf - $$d | (cd "$(RELSYSDIR)/test"; tar xf -); \
             fi; \
         done
 
@@ -330,8 +332,8 @@ info:
 	@echo "INETS_SPECS       = $(INETS_SPECS)"
 	@echo "INETS_FILES       = $(INETS_FILES)"
 	@echo ""
-	@echo "RELEASE_PATH      = $(RELEASE_PATH)"
-	@echo "RELSYSDIR         = $(RELSYSDIR)"
+	@echo "RELEASE_PATH      = "$(RELEASE_PATH)""
+	@echo "RELSYSDIR         = "$(RELSYSDIR)""
 	@echo "RELTESTSYSDIR     = $(RELTESTSYSDIR)"
 	@echo "RELTESTSYSALLDATADIR = $(RELTESTSYSALLDATADIR)"
 	@echo "RELTESTSYSBINDIR     = $(RELTESTSYSBINDIR)"
diff --git a/lib/inets/test/erl_make_certs.erl b/lib/inets/test/erl_make_certs.erl
new file mode 100644
index 0000000000..d6bdd05d01
--- /dev/null
+++ b/lib/inets/test/erl_make_certs.erl
@@ -0,0 +1,429 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%% Create test certificates
+
+-module(erl_make_certs).
+-include_lib("public_key/include/public_key.hrl").
+
+-export([make_cert/1, gen_rsa/1, verify_signature/3, write_pem/3]).
+-compile(export_all).
+
+%%--------------------------------------------------------------------
+%% @doc  Create and return a der encoded certificate
+%%   Option                                         Default
+%%   -------------------------------------------------------
+%%   digest                                         sha1
+%%   validity                                       {date(), date() + week()}
+%%   version                                        3
+%%   subject                                        [] list of the following content
+%%      {name,  Name}
+%%      {email, Email} 
+%%      {city,  City}
+%%      {state, State}
+%%      {org, Org}
+%%      {org_unit, OrgUnit}
+%%      {country, Country} 
+%%      {serial, Serial}
+%%      {title, Title}
+%%      {dnQualifer, DnQ}
+%%   issuer = {Issuer, IssuerKey}                   true (i.e. a ca cert is created) 
+%%                                                  (obs IssuerKey migth be {Key, Password}
+%%   key = KeyFile|KeyBin|rsa|dsa                   Subject PublicKey rsa or dsa generates key
+%%   
+%%
+%%   (OBS: The generated keys are for testing only)
+%% @spec ([{::atom(), ::term()}]) -> {Cert::binary(), Key::binary()}
+%% @end
+%%--------------------------------------------------------------------
+
+make_cert(Opts) ->
+    SubjectPrivateKey = get_key(Opts),
+    {TBSCert, IssuerKey} = make_tbs(SubjectPrivateKey, Opts),
+    Cert = public_key:pkix_sign(TBSCert, IssuerKey),
+    true = verify_signature(Cert, IssuerKey, undef), %% verify that the keys where ok
+    {Cert, encode_key(SubjectPrivateKey)}.
+
+%%--------------------------------------------------------------------
+%% @doc Writes pem files in Dir with FileName ++ ".pem" and FileName ++ "_key.pem"
+%% @spec (::string(), ::string(), {Cert,Key}) -> ok
+%% @end
+%%--------------------------------------------------------------------
+write_pem(Dir, FileName, {Cert, Key = {_,_,not_encrypted}}) when is_binary(Cert) ->
+    ok = der_to_pem(filename:join(Dir, FileName ++ ".pem"),
+			       [{'Certificate', Cert, not_encrypted}]),
+    ok = der_to_pem(filename:join(Dir, FileName ++ "_key.pem"), [Key]).
+
+%%--------------------------------------------------------------------
+%% @doc Creates a rsa key (OBS: for testing only)
+%%   the size are in bytes
+%% @spec (::integer()) -> {::atom(), ::binary(), ::opaque()}
+%% @end
+%%--------------------------------------------------------------------
+gen_rsa(Size) when is_integer(Size) ->
+    Key = gen_rsa2(Size),
+    {Key, encode_key(Key)}.
+
+%%--------------------------------------------------------------------
+%% @doc Creates a dsa key (OBS: for testing only)
+%%   the sizes are in bytes
+%% @spec (::integer()) -> {::atom(), ::binary(), ::opaque()}
+%% @end
+%%--------------------------------------------------------------------
+gen_dsa(LSize,NSize) when is_integer(LSize), is_integer(NSize) ->
+    Key = gen_dsa2(LSize, NSize),
+    {Key, encode_key(Key)}.
+
+%%--------------------------------------------------------------------
+%% @doc Verifies cert signatures
+%% @spec (::binary(), ::tuple()) -> ::boolean()
+%% @end
+%%--------------------------------------------------------------------
+verify_signature(DerEncodedCert, DerKey, _KeyParams) ->
+    Key = decode_key(DerKey),
+    case Key of 
+	#'RSAPrivateKey'{modulus=Mod, publicExponent=Exp} ->
+	    public_key:pkix_verify(DerEncodedCert, 
+				   #'RSAPublicKey'{modulus=Mod, publicExponent=Exp});
+	#'DSAPrivateKey'{p=P, q=Q, g=G, y=Y} ->
+	    public_key:pkix_verify(DerEncodedCert, {Y, #'Dss-Parms'{p=P, q=Q, g=G}})
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%% Implementation %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+get_key(Opts) ->
+    case proplists:get_value(key, Opts) of
+	undefined -> make_key(rsa, Opts);
+	rsa ->       make_key(rsa, Opts);
+	dsa ->       make_key(dsa, Opts);
+	Key ->
+	    Password = proplists:get_value(password, Opts, no_passwd),
+	    decode_key(Key, Password)
+    end.
+
+decode_key({Key, Pw}) ->
+    decode_key(Key, Pw);
+decode_key(Key) ->
+    decode_key(Key, no_passwd).
+    
+
+decode_key(#'RSAPublicKey'{} = Key,_) ->
+    Key;
+decode_key(#'RSAPrivateKey'{} = Key,_) ->
+    Key;
+decode_key(#'DSAPrivateKey'{} = Key,_) ->
+    Key;
+decode_key(PemEntry = {_,_,_}, Pw) ->
+    public_key:pem_entry_decode(PemEntry, Pw);
+decode_key(PemBin, Pw) ->
+    [KeyInfo] = public_key:pem_decode(PemBin),
+    decode_key(KeyInfo, Pw).
+
+encode_key(Key = #'RSAPrivateKey'{}) ->
+    {ok, Der} = 'OTP-PUB-KEY':encode('RSAPrivateKey', Key),
+    {'RSAPrivateKey', Der, not_encrypted};
+encode_key(Key = #'DSAPrivateKey'{}) ->
+    {ok, Der} = 'OTP-PUB-KEY':encode('DSAPrivateKey', Key),
+    {'DSAPrivateKey', Der, not_encrypted}.
+
+make_tbs(SubjectKey, Opts) ->    
+    Version = list_to_atom("v"++integer_to_list(proplists:get_value(version, Opts, 3))),
+
+    IssuerProp = proplists:get_value(issuer, Opts, true),
+    {Issuer, IssuerKey}  = issuer(IssuerProp, Opts, SubjectKey),
+
+    {Algo, Parameters} = sign_algorithm(IssuerKey, Opts),
+    
+    SignAlgo = #'SignatureAlgorithm'{algorithm  = Algo,
+				     parameters = Parameters},    
+    Subject = case IssuerProp of
+		  true -> %% Is a Root Ca
+		      Issuer;
+		  _ ->
+		      subject(proplists:get_value(subject, Opts),false)
+	      end,
+
+    {#'OTPTBSCertificate'{serialNumber = trunc(random:uniform()*100000000)*10000 + 1,
+			  signature    = SignAlgo,
+			  issuer       = Issuer,
+			  validity     = validity(Opts),
+			  subject      = Subject,
+			  subjectPublicKeyInfo = publickey(SubjectKey),
+			  version      = Version,
+			  extensions   = extensions(Opts)
+			 }, IssuerKey}.
+
+issuer(true, Opts, SubjectKey) ->
+    %% Self signed
+    {subject(proplists:get_value(subject, Opts), true), SubjectKey};
+issuer({Issuer, IssuerKey}, _Opts, _SubjectKey) when is_binary(Issuer) ->
+    {issuer_der(Issuer), decode_key(IssuerKey)};
+issuer({File, IssuerKey}, _Opts, _SubjectKey) when is_list(File) ->
+    {ok, [{cert, Cert, _}|_]} = pem_to_der(File),
+    {issuer_der(Cert), decode_key(IssuerKey)}.
+
+issuer_der(Issuer) ->
+    Decoded = public_key:pkix_decode_cert(Issuer, otp),
+    #'OTPCertificate'{tbsCertificate=Tbs} = Decoded,
+    #'OTPTBSCertificate'{subject=Subject} = Tbs,
+    Subject.
+
+subject(undefined, IsRootCA) ->
+    User = if IsRootCA -> "RootCA"; true -> user() end,
+    Opts = [{email, User ++ "@erlang.org"},
+	    {name, User},
+	    {city, "Stockholm"},
+	    {country, "SE"},
+	    {org, "erlang"},
+	    {org_unit, "testing dep"}],
+    subject(Opts);
+subject(Opts, _) ->
+    subject(Opts).
+
+user() ->
+    case os:getenv("USER") of
+	false ->
+	    "test_user";
+	User ->
+	    User
+    end.
+
+subject(SubjectOpts) when is_list(SubjectOpts) ->
+    Encode = fun(Opt) ->
+		     {Type,Value} = subject_enc(Opt),
+		     [#'AttributeTypeAndValue'{type=Type, value=Value}]
+	     end,
+    {rdnSequence, [Encode(Opt) || Opt <- SubjectOpts]}.
+
+%% Fill in the blanks
+subject_enc({name,  Name}) ->       {?'id-at-commonName', {printableString, Name}};
+subject_enc({email, Email}) ->      {?'id-emailAddress', Email};
+subject_enc({city,  City}) ->       {?'id-at-localityName', {printableString, City}};
+subject_enc({state, State}) ->      {?'id-at-stateOrProvinceName', {printableString, State}};
+subject_enc({org, Org}) ->          {?'id-at-organizationName', {printableString, Org}};
+subject_enc({org_unit, OrgUnit}) -> {?'id-at-organizationalUnitName', {printableString, OrgUnit}};
+subject_enc({country, Country}) ->  {?'id-at-countryName', Country};
+subject_enc({serial, Serial}) ->    {?'id-at-serialNumber', Serial};
+subject_enc({title, Title}) ->      {?'id-at-title', {printableString, Title}};
+subject_enc({dnQualifer, DnQ}) ->   {?'id-at-dnQualifier', DnQ};
+subject_enc(Other) ->               Other.
+
+
+extensions(Opts) ->
+    case proplists:get_value(extensions, Opts, []) of
+	false -> 
+	    asn1_NOVALUE;
+	Exts  -> 
+	    lists:flatten([extension(Ext) || Ext <- default_extensions(Exts)])
+    end.
+
+default_extensions(Exts) ->
+    Def = [{key_usage,undefined}, 
+	   {subject_altname, undefined},
+	   {issuer_altname, undefined},
+	   {basic_constraints, default},
+	   {name_constraints, undefined},
+	   {policy_constraints, undefined},
+	   {ext_key_usage, undefined},
+	   {inhibit_any, undefined},
+	   {auth_key_id, undefined},
+	   {subject_key_id, undefined},
+	   {policy_mapping, undefined}],
+    Filter = fun({Key, _}, D) -> lists:keydelete(Key, 1, D) end,
+    Exts ++ lists:foldl(Filter, Def, Exts).
+       	
+extension({_, undefined}) -> [];
+extension({basic_constraints, Data}) ->
+    case Data of
+	default ->
+	    #'Extension'{extnID = ?'id-ce-basicConstraints',
+			 extnValue = #'BasicConstraints'{cA=true},
+			 critical=true};
+	false -> 
+	    [];
+	Len when is_integer(Len) ->
+	    #'Extension'{extnID = ?'id-ce-basicConstraints',
+			 extnValue = #'BasicConstraints'{cA=true, pathLenConstraint=Len},
+			 critical=true};
+	_ ->
+	    #'Extension'{extnID = ?'id-ce-basicConstraints',
+			 extnValue = Data}
+    end;
+extension({Id, Data, Critical}) ->
+    #'Extension'{extnID = Id, extnValue = Data, critical = Critical}.
+
+
+publickey(#'RSAPrivateKey'{modulus=N, publicExponent=E}) ->
+    Public = #'RSAPublicKey'{modulus=N, publicExponent=E},
+    Algo = #'PublicKeyAlgorithm'{algorithm= ?rsaEncryption, parameters='NULL'},
+    #'OTPSubjectPublicKeyInfo'{algorithm = Algo,
+			       subjectPublicKey = Public};
+publickey(#'DSAPrivateKey'{p=P, q=Q, g=G, y=Y}) ->
+    Algo = #'PublicKeyAlgorithm'{algorithm= ?'id-dsa', 
+				 parameters={params, #'Dss-Parms'{p=P, q=Q, g=G}}},
+    #'OTPSubjectPublicKeyInfo'{algorithm = Algo, subjectPublicKey = Y}.
+
+validity(Opts) ->
+    DefFrom0 = calendar:gregorian_days_to_date(calendar:date_to_gregorian_days(date())-1),
+    DefTo0   = calendar:gregorian_days_to_date(calendar:date_to_gregorian_days(date())+7),
+    {DefFrom, DefTo} = proplists:get_value(validity, Opts, {DefFrom0, DefTo0}),
+    Format = fun({Y,M,D}) -> lists:flatten(io_lib:format("~w~2..0w~2..0w000000Z",[Y,M,D])) end,
+    #'Validity'{notBefore={generalTime, Format(DefFrom)},
+		notAfter ={generalTime, Format(DefTo)}}.
+
+sign_algorithm(#'RSAPrivateKey'{}, Opts) ->
+    Type = case proplists:get_value(digest, Opts, sha1) of
+	       sha1 ->   ?'sha1WithRSAEncryption';
+	       sha512 -> ?'sha512WithRSAEncryption';
+	       sha384 -> ?'sha384WithRSAEncryption';
+	       sha256 -> ?'sha256WithRSAEncryption';
+	       md5    -> ?'md5WithRSAEncryption';
+	       md2    -> ?'md2WithRSAEncryption'
+	   end,
+    {Type, 'NULL'};
+sign_algorithm(#'DSAPrivateKey'{p=P, q=Q, g=G}, _Opts) ->
+    {?'id-dsa-with-sha1', {params,#'Dss-Parms'{p=P, q=Q, g=G}}}.
+
+make_key(rsa, _Opts) ->
+    %% (OBS: for testing only)
+    gen_rsa2(64);
+make_key(dsa, _Opts) ->
+    gen_dsa2(128, 20).  %% Bytes i.e. {1024, 160} 
+    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% RSA key generation  (OBS: for testing only)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-define(SMALL_PRIMES, [65537,97,89,83,79,73,71,67,61,59,53,
+		       47,43,41,37,31,29,23,19,17,13,11,7,5,3]).
+
+gen_rsa2(Size) ->
+    P = prime(Size),
+    Q = prime(Size),
+    N = P*Q,
+    Tot = (P - 1) * (Q - 1),
+    [E|_] = lists:dropwhile(fun(Candidate) -> (Tot rem Candidate) == 0 end, ?SMALL_PRIMES),
+    {D1,D2} = extended_gcd(E, Tot),
+    D = erlang:max(D1,D2),
+    case D < E of
+	true ->
+	    gen_rsa2(Size);
+	false ->
+	    {Co1,Co2} = extended_gcd(Q, P),
+	    Co = erlang:max(Co1,Co2),
+	    #'RSAPrivateKey'{version = 'two-prime',
+			     modulus = N,
+			     publicExponent  = E,
+			     privateExponent = D, 
+			     prime1 = P, 
+			     prime2 = Q, 
+			     exponent1 = D rem (P-1), 
+			     exponent2 = D rem (Q-1), 
+			     coefficient = Co
+			    }
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% DSA key generation  (OBS: for testing only)
+%% See http://en.wikipedia.org/wiki/Digital_Signature_Algorithm
+%% and the fips_186-3.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+gen_dsa2(LSize, NSize) ->
+    Q  = prime(NSize),  %% Choose N-bit prime Q
+    X0 = prime(LSize),
+    P0 = prime((LSize div 2) +1),
+    
+    %% Choose L-bit prime modulus P such that p–1 is a multiple of q.
+    case dsa_search(X0 div (2*Q*P0), P0, Q, 1000) of
+	error -> 
+	    gen_dsa2(LSize, NSize);
+	P ->	    
+	    G = crypto:mod_exp(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
+	    %%                 such that This may be done by setting g = h^(p–1)/q mod p, commonly h=2 is used.
+	    
+	    X = prime(20),               %% Choose x by some random method, where 0 < x < q.
+	    Y = crypto:mod_exp(G, X, P), %% Calculate y = g^x mod p.
+	    
+	    #'DSAPrivateKey'{version=0, p=P, q=Q, g=G, y=Y, x=X}
+    end.
+    
+%% See fips_186-3.pdf
+dsa_search(T, P0, Q, Iter) when Iter > 0 ->
+    P = 2*T*Q*P0 + 1,
+    case is_prime(crypto:mpint(P), 50) of
+	true -> P;
+	false -> dsa_search(T+1, P0, Q, Iter-1)
+    end;
+dsa_search(_,_,_,_) -> 
+    error.
+
+
+%%%%%%% Crypto Math %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+prime(ByteSize) ->
+    Rand = odd_rand(ByteSize),
+    crypto:erlint(prime_odd(Rand, 0)).
+
+prime_odd(Rand, N) ->
+    case is_prime(Rand, 50) of
+	true -> 
+	    Rand;
+	false -> 
+	    NotPrime = crypto:erlint(Rand),
+	    prime_odd(crypto:mpint(NotPrime+2), N+1)
+    end.
+
+%% see http://en.wikipedia.org/wiki/Fermat_primality_test
+is_prime(_, 0) -> true;
+is_prime(Candidate, Test) -> 
+    CoPrime = odd_rand(<<0,0,0,4, 10000:32>>, Candidate),
+    case crypto:mod_exp(CoPrime, Candidate, Candidate) of
+	CoPrime -> is_prime(Candidate, Test-1);
+	_       -> false
+    end.
+
+odd_rand(Size) ->
+    Min = 1 bsl (Size*8-1),
+    Max = (1 bsl (Size*8))-1,
+    odd_rand(crypto:mpint(Min), crypto:mpint(Max)).
+
+odd_rand(Min,Max) ->
+    Rand = <<Sz:32, _/binary>> = crypto:rand_uniform(Min,Max),
+    BitSkip = (Sz+4)*8-1,
+    case Rand of
+	Odd  = <<_:BitSkip,  1:1>> -> Odd;
+	Even = <<_:BitSkip,  0:1>> -> 
+	    crypto:mpint(crypto:erlint(Even)+1)
+    end.
+
+extended_gcd(A, B) ->
+    case A rem B of
+	0 ->
+	    {0, 1};
+	N ->
+	    {X, Y} = extended_gcd(B, N),
+	    {Y, X-Y*(A div B)}
+    end.
+
+pem_to_der(File) ->
+    {ok, PemBin} = file:read_file(File),
+    public_key:pem_decode(PemBin).
+
+der_to_pem(File, Entries) ->
+    PemBin = public_key:pem_encode(Entries),
+    file:write_file(File, PemBin).
diff --git a/lib/inets/test/ftp_suite_lib.erl b/lib/inets/test/ftp_suite_lib.erl
index ffb58c91b6..211c9b5bee 100644
--- a/lib/inets/test/ftp_suite_lib.erl
+++ b/lib/inets/test/ftp_suite_lib.erl
@@ -206,7 +206,6 @@ init_per_testcase(Case, Config)
 
 init_per_testcase(Case, Config)  ->
     put(ftp_testcase, Case), 
-    inets:enable_trace(max, io, ftpc),
     do_init_per_testcase(Case, Config).
 
 do_init_per_testcase(Case, Config)  
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index a116edef77..644b01120c 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -34,9 +34,6 @@
 -compile(export_all).
 
 %% Test server specific exports
--define(PROXY_URL, "http://www.erlang.org").
--define(PROXY, "www-proxy.ericsson.se").
--define(PROXY_PORT, 8080).
 -define(IP_PORT, 8998).
 -define(SSL_PORT, 8999).
 -define(NOT_IN_USE_PORT, 8997).
@@ -91,7 +88,6 @@ all() ->
      options,
      headers_as_is, 
      selecting_session, 
-     {group, proxy}, 
      {group, ssl}, 
      {group, stream}, 
      {group, ipv6}, 
@@ -101,18 +97,6 @@ all() ->
 
 groups() -> 
     [
-     {proxy,   [], [proxy_options, 
-		    proxy_head, 
-		    proxy_get, 
-		    proxy_trace,
-		    proxy_post, 
-		    proxy_put, 
-		    proxy_delete, 
-		    proxy_auth,
-		    proxy_headers, 
-		    proxy_emulate_lower_versions,
-		    proxy_page_does_not_exist,
-		    proxy_https_not_supported]}, 
      {ssl,     [], [ssl_head, 
 		    essl_head, 
 		    ssl_get, 
@@ -120,13 +104,11 @@ groups() ->
 		    ssl_trace, 
 		    essl_trace]}, 
      {stream,  [], [http_stream,
-		    http_stream_once, 
-		    proxy_stream]}, 
+		    http_stream_once]},
      {tickets, [], [hexed_query_otp_6191, 
 		    empty_body_otp_6243,
 		    empty_response_header_otp_6830,
 		    transfer_encoding_otp_6807, 
-		    proxy_not_modified_otp_6821,
 		    no_content_204_otp_6982, 
 		    missing_CR_otp_7304,
 		    {group, otp_7883}, 
@@ -287,66 +269,6 @@ init_per_testcase(Case, Timeout, Config) ->
 		init_per_testcase_ssl(essl, PrivDir, SslConfFile, 
 				      [{watchdog, Dog} | TmpConfig]);
 
-	    "proxy_" ++ Rest ->
-		io:format("init_per_testcase -> Rest: ~p~n", [Rest]),
-		case Rest of			       
-		    "https_not_supported" ->	
-			tsp("init_per_testcase -> [proxy case] start inets"),
-			inets:start(),
-			tsp("init_per_testcase -> "
-			    "[proxy case] start crypto, public_key and ssl"),
-			try ?ENSURE_STARTED([crypto, public_key, ssl]) of
-			    ok ->
-				[{watchdog, Dog} | TmpConfig]
-			catch 
-			    throw:{error, {failed_starting, App, _}} ->
-				SkipString = 
-				    "Could not start " ++ atom_to_list(App),
-				skip(SkipString);
-			      _:X ->
-				SkipString = 
-				    lists:flatten(
-				      io_lib:format("Failed starting apps: ~p", [X])), 
-				skip(SkipString)
-			end;
-
-		    _ ->
-			%% We use erlang.org for the proxy tests 
-			%% and after the switch to erlang-web, many
-			%% of the test cases no longer work (erlang.org
-			%% previously run on Apache). 
-			%% Until we have had time to update inets
-			%% (and updated erlang.org to use that inets) 
-			%% and the test cases, we simply skip the 
-			%% problematic test cases. 
-			%% This is not ideal, but I am busy....
-			case is_proxy_available(?PROXY, ?PROXY_PORT) of
-			    true ->
-				BadCases = 
-				    [
-				     "delete", 
-				     "get", 
-				     "head", 
-				     "not_modified_otp_6821", 
-				     "options", 
-				     "page_does_not_exist", 
-				     "post", 
-				     "put", 
-				     "stream"
-				    ],
-				case lists:member(Rest, BadCases) of
-				    true ->
-					[skip("TC and server not compatible") | 
-					 TmpConfig];
-				    false ->
-					inets:start(),
-					[{watchdog, Dog} | TmpConfig]
-				end;
-			    false ->
-				[skip("proxy not responding") | TmpConfig]
-			end
-		end;
-
 	    "ipv6_" ++ _Rest ->
 		%% Ensure needed apps (crypto, public_key and ssl) are started
 		try ?ENSURE_STARTED([crypto, public_key, ssl]) of
@@ -415,14 +337,6 @@ init_per_testcase(Case, Timeout, Config) ->
     %% so this value will be overwritten (see "ipv6_" below).
     %% </IPv6>
 
-    %% This will fail for the ipv6_ - cases (but that is ok)
-    ProxyExceptions = ["localhost", ?IPV6_LOCAL_HOST], 
-    tsp("init_per_testcase -> Options before proxy set: ~n~p", 
-	[httpc:get_options(all)]),
-    ok = httpc:set_options([{proxy, {{?PROXY, ?PROXY_PORT}, ProxyExceptions}}]),
-    tsp("init_per_testcase -> Options after proxy set: ~n~p", 
-	[httpc:get_options(all)]),
-    inets:enable_trace(max, io, httpc),
     %% inets:enable_trace(max, io, all),
     %% snmp:set_trace([gen_tcp]),
     tsp("init_per_testcase(~w) -> done when"
@@ -466,7 +380,6 @@ end_per_testcase(http_save_to_file = Case, Config) ->
 end_per_testcase(Case, Config) ->
     io:format(user, "~n~n*** END ~w:~w ***~n~n", 
 	      [?MODULE, Case]),
-    dbg:stop(), % ?
     case atom_to_list(Case) of
 	"ipv6_" ++ _Rest ->
 	    tsp("end_per_testcase(~w) -> stop ssl", [Case]),
@@ -761,119 +674,161 @@ http_inets_pipe(Config) when is_list(Config) ->
 
 
 test_pipeline(URL) ->
-     p("test_pipeline -> entry with"
-       "~n   URL: ~p", [URL]),
-
-     httpc:set_options([{pipeline_timeout, 50000}]),
-
-     p("test_pipeline -> issue (async) request 1"),
-     {ok, RequestId1} =
+    p("test_pipeline -> entry with"
+      "~n   URL: ~p", [URL]),
+    
+    httpc:set_options([{pipeline_timeout, 50000}]),
+    
+    p("test_pipeline -> issue (async) request 1"
+      "~n   when profile info: ~p", [httpc:info()]),
+    {ok, RequestIdA1} =
 	httpc:request(get, {URL, []}, [], [{sync, false}]),
-     test_server:format("RequestId1: ~p~n", [RequestId1]),
-     p("test_pipeline -> RequestId1: ~p", [RequestId1]),
-
-     %% Make sure pipeline is initiated
-     p("test_pipeline -> sleep some", []),
-     test_server:sleep(4000),
-
-     p("test_pipeline -> issue (async) request 2"),
-     {ok, RequestId2} =
+    tsp("RequestIdA1: ~p", [RequestIdA1]),
+    p("test_pipeline -> RequestIdA1: ~p"
+      "~n   when profile info: ~p", [RequestIdA1, httpc:info()]),
+    
+    %% Make sure pipeline is initiated
+    p("test_pipeline -> sleep some", []),
+    test_server:sleep(4000),
+    
+    p("test_pipeline -> issue (async) request A2, A3 and A4"
+      "~n   when profile info: ~p", [httpc:info()]),
+    {ok, RequestIdA2} =
 	httpc:request(get, {URL, []}, [], [{sync, false}]),
-     tsp("RequestId2: ~p", [RequestId2]),
-     p("test_pipeline -> RequestId2: ~p", [RequestId2]),
-
-     p("test_pipeline -> issue (sync) request 3"),
-     {ok, {{_,200,_}, [_ | _], [_ | _]}} =
+    {ok, RequestIdA3} =
+	httpc:request(get, {URL, []}, [], [{sync, false}]),
+    {ok, RequestIdA4} =
+	httpc:request(get, {URL, []}, [], [{sync, false}]),
+    tsp("RequestIdAs => A2: ~p, A3: ~p and A4: ~p", 
+	[RequestIdA2, RequestIdA3, RequestIdA4]),
+    p("test_pipeline -> RequestIds => A2: ~p, A3: ~p and A4: ~p"
+      "~n   when profile info: ~p", 
+      [RequestIdA2, RequestIdA3, RequestIdA4, httpc:info()]),
+    
+    p("test_pipeline -> issue (sync) request 3"),
+    {ok, {{_,200,_}, [_ | _], [_ | _]}} =
 	httpc:request(get, {URL, []}, [], []),
+    
+    p("test_pipeline -> expect reply for (async) request A1, A2, A3 and A4"
+      "~n   when profile info: ~p", [httpc:info()]),
+    pipeline_await_async_reply([{RequestIdA1, a1, 200}, 
+				{RequestIdA2, a2, 200}, 
+				{RequestIdA3, a3, 200}, 
+				{RequestIdA4, a4, 200}], ?MINS(1)),
 
-    p("test_pipeline -> expect reply for (async) request 1 or 2"),
-    receive
-	{http, {RequestId1, {{_, 200, _}, _, _}}} ->
-	    p("test_pipeline -> received reply for (async) request 1 - now wait for 2"),
-	    receive
-		{http, {RequestId2, {{_, 200, _}, _, _}}} ->
-		    p("test_pipeline -> received reply for (async) request 2"),
-		    ok;
-		{http, Msg1} ->
-		    tsf(Msg1)
-	    end;
-	{http, {RequestId2, {{_, 200, _}, _, _}}} ->
-	    io:format("test_pipeline -> received reply for (async) request 2 - now wait for 1"),
-	    receive
-		{http, {RequestId1, {{_, 200, _}, _, _}}} ->
-		    io:format("test_pipeline -> received reply for (async) request 1"),
-		    ok;
-		{http, Msg2} ->
-		    tsf(Msg2)
-	    end;
-	{http, Msg3} ->
-	    tsf(Msg3)
-    after 60000 ->
-	    receive Any1 ->
-		    tsp("received crap after timeout: ~n   ~p", [Any1]),
-		    tsf({error, {timeout, Any1}})
-	    end
-    end,
-
-     p("test_pipeline -> sleep some"),
-     test_server:sleep(4000),
-
-     p("test_pipeline -> issue (async) request 4"),
-     {ok, RequestId3} =
+    p("test_pipeline -> sleep some"
+      "~n   when profile info: ~p", [httpc:info()]),
+    test_server:sleep(4000),
+    
+    p("test_pipeline -> issue (async) request B1, B2, B3 and B4"
+      "~n   when profile info: ~p", [httpc:info()]),
+    {ok, RequestIdB1} =
 	httpc:request(get, {URL, []}, [], [{sync, false}]),
-     tsp("RequestId3: ~p", [RequestId3]),
-     p("test_pipeline -> RequestId3: ~p", [RequestId3]),
-
-     p("test_pipeline -> issue (async) request 5"),
-     {ok, RequestId4} =
+    {ok, RequestIdB2} =
 	httpc:request(get, {URL, []}, [], [{sync, false}]),
-     tsp("RequestId4: ~p~n", [RequestId4]),
-     p("test_pipeline -> RequestId4: ~p", [RequestId4]),
-
-     p("test_pipeline -> cancel (async) request 4"),
-     ok = httpc:cancel_request(RequestId3),
-
-     p("test_pipeline -> expect *no* reply for cancelled (async) request 4 (for 3 secs)"),
-     receive
-	 {http, {RequestId3, _}} ->
-	     tsf(http_cancel_request_failed)
-     after 3000 ->
-	     ok
-     end,
-
-     p("test_pipeline -> expect reply for (async) request 4"),
-     Body =
-	receive
-	    {http, {RequestId4, {{_, 200, _}, _, BinBody4}}} = Res ->
-		p("test_pipeline -> received reply for (async) request 5"),
-		tsp("Receive : ~p", [Res]),
-		BinBody4;
-	    {http, Msg4} ->
-		tsf(Msg4)
-	after 60000 ->
-		receive Any2 ->
-			tsp("received crap after timeout: ~n   ~p", [Any2]),
-			tsf({error, {timeout, Any2}})
-		end
-	end,
+    {ok, RequestIdB3} =
+	httpc:request(get, {URL, []}, [], [{sync, false}]),
+    {ok, RequestIdB4} =
+	httpc:request(get, {URL, []}, [], [{sync, false}]),
+    tsp("RequestIdBs => B1: ~p, B2: ~p, B3: ~p and B4: ~p", 
+	[RequestIdB1, RequestIdB2, RequestIdB3, RequestIdB4]),
+    p("test_pipeline -> RequestIdBs => B1: ~p, B2: ~p, B3: ~p and B4: ~p"
+      "~n   when profile info: ~p", 
+      [RequestIdB1, RequestIdB2, RequestIdB3, RequestIdB4, httpc:info()]),
+    
+    p("test_pipeline -> cancel (async) request B2"
+      "~n   when profile info: ~p", [httpc:info()]),
+    ok = httpc:cancel_request(RequestIdB2),
+    
+    p("test_pipeline -> "
+      "expect *no* reply for cancelled (async) request B2 (for 3 secs)"
+      "~n   when profile info: ~p", [httpc:info()]),
+    receive
+	{http, {RequestIdB2, _}} ->
+	    tsf(http_cancel_request_failed)
+    after 3000 ->
+	    ok
+    end,
+    
+    p("test_pipeline -> expect reply for (async) request B1, B3 and B4"
+      "~n   when profile info: ~p", [httpc:info()]),
+    Bodies = pipeline_await_async_reply([{RequestIdB1, b1, 200}, 
+					 {RequestIdB3, b3, 200}, 
+					 {RequestIdB4, b4, 200}], ?MINS(1)),
+    [{b1, Body}|_] = Bodies, 
 
-    p("test_pipeline -> check reply for (async) request 5"),
+    p("test_pipeline -> check reply for (async) request B1"
+      "~n   when profile info: ~p", [httpc:info()]),
     inets_test_lib:check_body(binary_to_list(Body)),
-
-    p("test_pipeline -> ensure no unexpected incomming"),
+    
+    p("test_pipeline -> ensure no unexpected incomming"
+      "~n   when profile info: ~p", [httpc:info()]),
     receive
 	{http, Any} ->
 	    tsf({unexpected_message, Any})
     after 500 ->
 	    ok
     end,
-
-    p("test_pipeline -> done"),
+    
+    p("test_pipeline -> done"
+      "~n   when profile info: ~p", [httpc:info()]),
     ok.
 
+pipeline_await_async_reply(ReqIds, Timeout) ->
+    pipeline_await_async_reply(ReqIds, Timeout, []).
+
+pipeline_await_async_reply([], _, Acc) ->
+    lists:keysort(1, Acc);
+pipeline_await_async_reply(ReqIds, Timeout, Acc) when Timeout > 0 ->
+    T1 = inets_test_lib:timestamp(), 
+    p("pipeline_await_async_reply -> await replies"
+      "~n   ReqIds:  ~p"
+      "~n   Timeout: ~p", [ReqIds, Timeout]),
+    receive
+	{http, {RequestId, {{_, Status, _}, _, Body}}} ->
+	    p("pipeline_await_async_reply -> received reply for"
+	      "~n   RequestId: ~p"
+	      "~n   Status:    ~p", [RequestId, Status]),
+	    case lists:keysearch(RequestId, 1, ReqIds) of
+		{value, {RequestId, N, Status}} ->
+		    p("pipeline_await_async_reply -> "
+		      "found expected request ~w", [N]),
+		    ReqIds2 = lists:keydelete(RequestId, 1, ReqIds),
+		    NewTimeout = Timeout - (inets_test_lib:timestamp()-T1), 
+		    pipeline_await_async_reply(ReqIds2, NewTimeout, 
+					      [{N, Body} | Acc]);
+		{value, {RequestId, N, WrongStatus}} ->
+		    p("pipeline_await_async_reply -> "
+		      "found request ~w with wrong status", [N]),
+		    tsf({reply_with_unexpected_status, 
+			 {RequestId, N, WrongStatus}});
+		false ->
+		    tsf({unexpected_reply, {RequestId, Status}})
+	    end;
+	{http, Msg} ->
+	    tsf({unexpected_reply, Msg})
+    after Timeout ->
+	    receive 
+		Any ->
+		    tsp("pipeline_await_async_reply -> "
+			"received unknown data after timeout: "
+			"~n   ~p", [Any]),
+		    tsf({timeout, {unknown, Any}})
+	    end
+    end;
+pipeline_await_async_reply(ReqIds, _, Acc) ->
+    tsp("pipeline_await_async_reply -> "
+	"timeout: "
+	"~n   ~p"
+	"~nwhen"
+	"~n   ~p", [ReqIds, Acc]),
+    tsf({timeout, ReqIds, Acc}).
+    
+
+    
 %%-------------------------------------------------------------------------
 http_trace(doc) ->
-    ["Perform a TRACE request that goes through a proxy."];
+    ["Perform a TRACE request."];
 http_trace(suite) ->
     [];
 http_trace(Config) when is_list(Config) ->
@@ -1512,260 +1467,6 @@ http_cookie(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-proxy_options(doc) ->
-    ["Perform a OPTIONS request that goes through a proxy."];
-proxy_options(suite) ->
-    [];
-proxy_options(Config) when is_list(Config) ->
-    %% As of 2011-03-24, erlang.org (which is used as server) 
-    %% does no longer run Apache, but instead runs inets, which 
-    %% do not implement "options".
-    case ?config(skip, Config) of 
-        undefined ->
-	    case httpc:request(options, {?PROXY_URL, []}, [], []) of
-		{ok, {{_,200,_}, Headers, _}} ->
-		    case lists:keysearch("allow", 1, Headers) of
-			{value, {"allow", _}} ->
-			    ok;
-			_ ->
-			    tsf(http_options_request_failed)
-		    end;
-		Unexpected ->
-		    tsf({unexpected_result, Unexpected})
-	    end;
-	Reason ->
-	    skip(Reason)
-    end.
-
-
-%%-------------------------------------------------------------------------
-proxy_head(doc) ->
-     ["Perform a HEAD request that goes through a proxy."];
-proxy_head(suite) ->
-    [];
-proxy_head(Config) when is_list(Config) ->
-    %% As of 2011-03-24, erlang.org (which is used as server) 
-    %% does no longer run Apache, but instead runs inets.
-    case ?config(skip, Config) of 
-	undefined ->
-	    case httpc:request(head, {?PROXY_URL, []}, [], []) of
-		{ok, {{_,200, _}, [_ | _], []}} ->
-		    ok;
-		Unexpected ->
-		    tsf({unexpected_result, Unexpected})
-	    end;
-	Reason ->
-	    skip(Reason)
-    end.
-
-
-%%-------------------------------------------------------------------------
-proxy_get(doc) ->
-    ["Perform a GET request that goes through a proxy."];
-proxy_get(suite) ->
-    [];
-proxy_get(Config) when is_list(Config) ->
-    case ?config(skip, Config) of 
-	undefined ->
-	    case httpc:request(get, {?PROXY_URL, []}, [], []) of
-		{ok, {{_,200,_}, [_ | _], Body = [_ | _]}} ->
-		    inets_test_lib:check_body(Body);
-		Unexpected ->
-		    tsf({unexpected_result, Unexpected})
-	    end;
-	Reason ->
-	    skip(Reason)
-    end.
-
-%%-------------------------------------------------------------------------
-proxy_emulate_lower_versions(doc) ->
-    ["Perform requests as 0.9 and 1.0 clients."];
-proxy_emulate_lower_versions(suite) ->
-    [];
-proxy_emulate_lower_versions(Config) when is_list(Config) ->
-    case ?config(skip, Config) of 
-	undefined ->
-	    Result09 = pelv_get("HTTP/0.9"), 
-	    case Result09 of
-		{ok, [_| _] = Body0} ->
-		    inets_test_lib:check_body(Body0),
-		    ok;
-		_ ->
-		    tsf({unexpected_result, "HTTP/0.9", Result09})
-	    end,
-	    
-	    %% We do not check the version here as many servers
-	    %% do not behave according to the rfc and send
-	    %% 1.1 in its response.
-	    Result10 = pelv_get("HTTP/1.0"), 
-	    case Result10 of
-		{ok,{{_, 200, _}, [_ | _], Body1 = [_ | _]}} ->
-		    inets_test_lib:check_body(Body1),
-		    ok;
-		_ ->
-		    tsf({unexpected_result, "HTTP/1.0", Result10})
-	    end,
-
-	    Result11 = pelv_get("HTTP/1.1"), 
-	    case Result11 of
-		{ok, {{"HTTP/1.1", 200, _}, [_ | _], Body2 = [_ | _]}} ->
-		    inets_test_lib:check_body(Body2);
-		_ ->
-		    tsf({unexpected_result, "HTTP/1.1", Result11})
-	    end;
-		
-	Reason ->
-	    skip(Reason)
-    end.
-
-pelv_get(Version) ->
-    httpc:request(get, {?PROXY_URL, []}, [{version, Version}], []).
-
-
-%%-------------------------------------------------------------------------
-proxy_trace(doc) ->
-    ["Perform a TRACE request that goes through a proxy."];
-proxy_trace(suite) ->
-    [];
-proxy_trace(Config) when is_list(Config) ->
-    %%{ok, {{_,200,_}, [_ | _], "TRACE " ++ _}} =
-    %%	httpc:request(trace, {?PROXY_URL, []}, [], []),
-    skip("HTTP TRACE is no longer allowed on the ?PROXY_URL server due "
-	 "to security reasons").
-
-
-%%-------------------------------------------------------------------------
-proxy_post(doc) ->
-    ["Perform a POST request that goes through a proxy. Note the server"
-     " will reject the request this is a test of the sending of the"
-     " request."];
-proxy_post(suite) ->
-    [];
-proxy_post(Config) when is_list(Config) ->
-    %% As of 2011-03-24, erlang.org (which is used as server) 
-    %% does no longer run Apache, but instead runs inets.
-    case ?config(skip, Config) of 
-	undefined ->
-	    case httpc:request(post, {?PROXY_URL, [], 
-				     "text/plain", "foobar"}, [],[]) of
-		{ok, {{_,405,_}, [_ | _], [_ | _]}} ->
-		    ok;
-		Unexpected ->
-		    tsf({unexpected_result, Unexpected})
-	    end;
-	Reason ->
-	    skip(Reason)
-    end.
-
-
-%%-------------------------------------------------------------------------
-proxy_put(doc) ->
-    ["Perform a PUT request that goes through a proxy. Note the server"
-     " will reject the request this is a test of the sending of the"
-     " request."];
-proxy_put(suite) ->
-    [];
-proxy_put(Config) when is_list(Config) ->
-    %% As of 2011-03-24, erlang.org (which is used as server) 
-    %% does no longer run Apache, but instead runs inets.
-    case ?config(skip, Config) of 
-	undefined -> 
-	    case httpc:request(put, {"http://www.erlang.org/foobar.html", [], 
-				    "html", "<html> <body><h1> foo </h1>" 
-				    "<p>bar</p> </body></html>"}, [], []) of
-		{ok, {{_,405,_}, [_ | _], [_ | _]}} ->
-		    ok;
-		Unexpected ->
-		    tsf({unexpected_result, Unexpected})
-	    end;
-	Reason ->
-	    skip(Reason)
-    end.
-
-
-%%-------------------------------------------------------------------------
-proxy_delete(doc) ->
-    ["Perform a DELETE request that goes through a proxy. Note the server"
-     " will reject the request this is a test of the sending of the"
-     " request. But as the file does not exist the return code will"
-     " be 404 not found."];
-proxy_delete(suite) ->
-    [];
-proxy_delete(Config) when is_list(Config) ->
-    %% As of 2011-03-24, erlang.org (which is used as server) 
-    %% does no longer run Apache, but instead runs inets.
-    case ?config(skip, Config) of 
-	undefined -> 
-	    URL = ?PROXY_URL ++ "/foobar.html",
-	    case httpc:request(delete, {URL, []}, [], []) of
-		{ok, {{_,404,_}, [_ | _], [_ | _]}} ->
-		    ok;
-		Unexpected ->
-		    tsf({unexpected_result, Unexpected})
-	    end;
-	Reason ->
-	    skip(Reason)
-    end.
-
-
-%%-------------------------------------------------------------------------
-proxy_headers(doc) ->
-    ["Use as many request headers as possible"];
-proxy_headers(suite) ->
-    [];
-proxy_headers(Config) when is_list(Config) ->
-    case ?config(skip, Config) of 
-	undefined ->
-	    {ok, {{_,200,_}, [_ | _], [_ | _]}} 
-		= httpc:request(get, {?PROXY_URL,
-				     [
-				      {"Accept",
-				       "text/*, text/html,"
-				       " text/html;level=1,"
-				       " */*"}, 
-				      {"Accept-Charset", 
-				       "iso-8859-5, unicode-1-1;"
-				       "q=0.8"},
-				      {"Accept-Encoding", "*"},
-				      {"Accept-Language", 
-				       "sv, en-gb;q=0.8,"
-				       " en;q=0.7"},
-				      {"User-Agent", "inets"},
-				      {"Max-Forwards","5"},
-				      {"Referer", 
-				       "http://otp.ericsson.se:8000"
-				       "/product/internal"}
-			     ]}, [], []),
-	    ok;
-	Reason ->
-	    skip(Reason)
-    end.
-
-
-%%-------------------------------------------------------------------------
-proxy_auth(doc) ->
-    ["Test the code for sending of proxy authorization."];
-proxy_auth(suite) ->
-    [];
-proxy_auth(Config) when is_list(Config) ->
-    %% Our proxy seems to ignore the header, however our proxy
-    %% does not requirer an auth header, but we want to know
-    %% atleast the code for sending the header does not crash!
-    case ?config(skip, Config) of 
-	undefined ->	    
-	    case httpc:request(get, {?PROXY_URL, []}, 
-			      [{proxy_auth, {"foo", "bar"}}], []) of
-		{ok, {{_,200, _}, [_ | _], [_|_]}} ->
-		    ok;
-		Unexpected ->
-		    tsf({unexpected_result, Unexpected})
-	    end;
-	Reason ->
-	    skip(Reason)
-    end.  
-
-
-%%-------------------------------------------------------------------------
 http_server_does_not_exist(doc) ->
     ["Test that we get an error message back when the server "
      "does note exist."];
@@ -1793,39 +1494,6 @@ page_does_not_exist(Config) when is_list(Config) ->
 
 
 %%-------------------------------------------------------------------------
-proxy_page_does_not_exist(doc) ->
-    ["Test that we get a 404 when the page is not found."];
-proxy_page_does_not_exist(suite) ->
-    [];
-proxy_page_does_not_exist(Config) when is_list(Config) ->
-    case ?config(skip, Config) of 
-	undefined ->
-	    URL = ?PROXY_URL ++ "/doesnotexist.html",
-	    {ok, {{_,404,_}, [_ | _], [_ | _]}} = 
-		httpc:request(get, {URL, []}, [], []),
-	    ok;
-	Reason ->
-	    skip(Reason)
-    end.
-
-
-%%-------------------------------------------------------------------------
-
-proxy_https_not_supported(doc) ->
-    [];
-proxy_https_not_supported(suite) ->
-    [];
-proxy_https_not_supported(Config) when is_list(Config) ->
-    Result = httpc:request(get, {"https://login.yahoo.com", []}, [], []),
-    case Result of
-	{error, https_through_proxy_is_not_currently_supported} ->
-	    ok;
-	_ ->
-	    tsf({unexpected_reason, Result})
-    end.
-
-
-%%-------------------------------------------------------------------------
 
 http_stream(doc) ->
     ["Test the option stream for asynchrony requests"];
@@ -1926,36 +1594,6 @@ once(URL) ->
 
 
 %%-------------------------------------------------------------------------
-proxy_stream(doc) ->
-    ["Test the option stream for asynchrony requests"];
-proxy_stream(suite) ->
-    [];
-proxy_stream(Config) when is_list(Config) ->
-    case ?config(skip, Config) of 
-	undefined ->
-	    {ok, {{_,200,_}, [_ | _], Body}} = 
-		httpc:request(get, {?PROXY_URL, []}, [], []),
-	    
-	    {ok, RequestId} =
-		httpc:request(get, {?PROXY_URL, []}, [], 
-			     [{sync, false}, {stream, self}]),
-	    
-	    receive 
-		{http, {RequestId, stream_start, _Headers}} ->
-		    ok;
-		{http, Msg} ->
-		    tsf(Msg)
-	    end,
-	    
-	    StreamedBody = receive_streamed_body(RequestId, <<>>),
-	    
-	    Body == binary_to_list(StreamedBody);
-	Reason ->
-	    skip(Reason)
-    end.
-
-
-%%-------------------------------------------------------------------------
 parse_url(doc) ->
     ["Test that an url is parsed correctly"];
 parse_url(suite) ->
@@ -2547,21 +2185,6 @@ transfer_encoding_otp_6807(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-proxy_not_modified_otp_6821(doc) ->
-    ["If unmodified no body should be returned"];
-proxy_not_modified_otp_6821(suite) ->
-    [];
-proxy_not_modified_otp_6821(Config) when is_list(Config) ->
-    case ?config(skip, Config) of 
-	undefined ->
-	    provocate_not_modified_bug(?PROXY_URL);
-	Reason ->
-	    skip(Reason)
-    end.
-
-
-%%-------------------------------------------------------------------------
-
 empty_response_header_otp_6830(doc) ->
     ["Test the case that the HTTP server does not send any headers"];
 empty_response_header_otp_6830(suite) ->
@@ -3368,15 +2991,6 @@ create_config(FileName, ComType, Port, PrivDir, ServerRoot, DocRoot,
 cline(List) ->
     lists:flatten([List, "\r\n"]).
 
-is_proxy_available(Proxy, Port) ->
-    case gen_tcp:connect(Proxy, Port, []) of
-	{ok, Socket} ->
-	    gen_tcp:close(Socket),
-	    true;
-	_ ->
-	    false
-    end.
-
 receive_streamed_body(RequestId, Body) ->
     receive 
 	{http, {RequestId, stream, BinBodyPart}} ->
@@ -3870,42 +3484,6 @@ content_length(["content-length:" ++ Value | _]) ->
 content_length([_Head | Tail]) ->
    content_length(Tail).
 
-provocate_not_modified_bug(Url) ->
-    Timeout = 15000, %% 15s should be plenty
-
-    {ok, {{_, 200, _}, ReplyHeaders, _Body}} =
-	httpc:request(get, {Url, []}, [{timeout, Timeout}], []),
-    Etag = pick_header(ReplyHeaders, "ETag"),
-    Last = pick_header(ReplyHeaders, "last-modified"),
-    
-    case httpc:request(get, {Url, [{"If-None-Match", Etag},
-				  {"If-Modified-Since", Last}]},
-		      [{timeout, 15000}],
-		      []) of
-	{ok, {{_, 304, _}, _, _}} -> %% The expected reply
-	    page_unchanged;
-	{ok, {{_, 200, _}, _, _}} -> 
-	    %% If the page has changed since the	
-	    %% last request we retry to
-	    %% trigger the bug
-	    provocate_not_modified_bug(Url);
-	{error, timeout} ->
-	    %% Not what we expected. Tcpdump can be used to
-	    %% verify that we receive the complete http-reply
-	    %% but still time out.
-	    incorrect_result
-    end.
-
-pick_header(Headers, Name) ->
-    case lists:keysearch(string:to_lower(Name), 1,
-			 [{string:to_lower(X), Y} || {X, Y} <- Headers]) of
-	false ->
-	    [];
-	{value, {_Key, Val}} ->
-	    Val
-    end.
-
-
 %% -------------------------------------------------------------------------
 
 simple_request_and_verify(Config, 
diff --git a/lib/inets/test/httpc_cookie_SUITE.erl b/lib/inets/test/httpc_cookie_SUITE.erl
index 93dbc270c5..3862bf7a20 100644
--- a/lib/inets/test/httpc_cookie_SUITE.erl
+++ b/lib/inets/test/httpc_cookie_SUITE.erl
@@ -276,8 +276,6 @@ secure_cookie(Config) when is_list(Config) ->
     tsp("secure_cookie -> entry with"
 	"~n   Config: ~p", [Config]),
     
-    inets:enable_trace(max, io, httpc),
-
     %% httpc:reset_cookies(), 
 
     tsp("secure_cookie -> Cookies 1: ~p", [httpc:which_cookies()]),
@@ -309,7 +307,6 @@ secure_cookie(Config) when is_list(Config) ->
 
     tsp("secure_cookie -> Cookies 4: ~p", [httpc:which_cookies()]),
 
-    inets:disable_trace(),
     tsp("secure_cookie -> done"),
     ok.
     
diff --git a/lib/inets/test/httpc_proxy_SUITE.erl b/lib/inets/test/httpc_proxy_SUITE.erl
new file mode 100644
index 0000000000..84db39e76b
--- /dev/null
+++ b/lib/inets/test/httpc_proxy_SUITE.erl
@@ -0,0 +1,575 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%% 
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%% 
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+%% 
+%% ts:run(inets, httpc_proxy_SUITE, [batch]).
+%% ct:run("../inets_test", httpc_proxy_SUITE).
+%%
+
+-module(httpc_proxy_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+
+-include_lib("kernel/include/file.hrl").
+-include("inets_test_lib.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-define(LOCAL_PROXY_SCRIPT, "server_proxy.sh").
+-define(p(F, A), % Debug printout
+	begin
+	    io:format(
+	      "~w ~w: " ++ begin F end,
+	      [self(),?MODULE] ++ begin A end)
+	end).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [{group,local_proxy},
+     {group,local_proxy_https}].
+
+groups() -> 
+    [{local_proxy,[],
+      [http_emulate_lower_versions
+       |local_proxy_cases()]},
+     {local_proxy_https,[],
+      local_proxy_cases()}].
+
+%% internal functions
+
+local_proxy_cases() ->
+    [http_head,
+     http_get,
+     http_options,
+     http_trace,
+     http_post,
+     http_put,
+     http_delete,
+     http_headers,
+     http_proxy_auth,
+     http_doesnotexist,
+     http_stream,
+     http_not_modified_otp_6821].
+
+%%--------------------------------------------------------------------
+
+init_per_suite(Config0) ->
+    case init_apps([crypto,public_key], Config0) of
+	Config when is_list(Config) ->
+	    make_cert_files(dsa, "server-", Config),
+	    Config;
+	Other ->
+	    Other
+    end.
+
+end_per_suite(_Config) ->
+    [app_stop(App) || App <- r(suite_apps())],
+    ok.
+
+%% internal functions
+
+suite_apps() ->
+    [crypto,public_key].
+    
+%%--------------------------------------------------------------------
+
+init_per_group(local_proxy, Config) ->
+    init_local_proxy([{protocol,http}|Config]);
+init_per_group(local_proxy_https, Config) ->
+    init_local_proxy([{protocol,https}|Config]).
+
+end_per_group(Group, Config)
+  when
+      Group =:= local_proxy;
+      Group =:= local_proxy_https ->
+    rcmd_local_proxy(["stop"], Config),
+    Config;
+end_per_group(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+
+init_per_testcase(Case, Config0) ->
+    ct:timetrap({seconds,30}),
+    Apps = apps(Case, Config0),
+    case init_apps(Apps, Config0) of
+	Config when is_list(Config) ->
+	    case app_start(inets, Config) of
+		ok ->
+		    Config;
+		Error ->
+		    [app_stop(N) || N <- [inets|r(Apps)]],
+		    ct:fail({could_not_init_inets,Error})
+	    end;
+	E3 ->
+	    E3
+    end.
+
+end_per_testcase(_Case, Config) ->
+    app_stop(inets),
+    Config.
+
+%% internal functions
+
+apps(_Case, Config) ->
+    case ?config(protocol, Config) of
+	https ->
+	    [ssl];
+	_ ->
+	    []
+    end.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+http_head(doc) ->
+    ["Test http/https HEAD request."];
+http_head(Config) when is_list(Config) ->
+    Method = head,
+    URL = url("/index.html", Config),
+    Request = {URL,[]},
+    HttpOpts = [],
+    Opts = [],
+    {ok,{{_,200,_},[_|_],[]}} =
+	httpc:request(Method, Request, HttpOpts, Opts),
+    ok.
+
+%%--------------------------------------------------------------------
+
+http_get(doc) ->
+    ["Test http/https GET request."];
+http_get(Config) when is_list(Config) ->
+    Method = get,
+    URL = url("/index.html", Config),
+    Request = {URL,[]},
+    Timeout = timer:seconds(1),
+    ConnTimeout = Timeout + timer:seconds(1),
+
+    HttpOpts1 = [{timeout,Timeout},{connect_timeout,ConnTimeout}],
+    Opts1 = [],
+    {ok,{{_,200,_},[_|_],[_|_]=B1}} =
+	httpc:request(Method, Request, HttpOpts1, Opts1),
+    inets_test_lib:check_body(B1),
+
+    HttpOpts2 = [],
+    Opts2 = [{body_format,binary}],
+    {ok,{{_,200,_},[_|_],B2}} =
+	httpc:request(Method, Request, HttpOpts2, Opts2),
+    inets_test_lib:check_body(binary_to_list(B2)).
+
+%%--------------------------------------------------------------------
+
+http_options(doc) ->
+    ["Perform an OPTIONS request."];
+http_options(Config) when is_list(Config) ->
+    Method = options,
+    URL = url("/index.html", Config),
+    Request = {URL,[]},
+    HttpOpts = [],
+    Opts = [],
+    {ok,{{_,200,_},Headers,_}} =
+	httpc:request(Method, Request, HttpOpts, Opts),
+    {value,_} = lists:keysearch("allow", 1, Headers),
+    ok.
+
+%%--------------------------------------------------------------------
+
+http_trace(doc) ->
+    ["Perform a TRACE request."];
+http_trace(Config) when is_list(Config) ->
+    Method = trace,
+    URL = url("/index.html", Config),
+    Request = {URL,[]},
+    HttpOpts = [],
+    Opts = [],
+    {ok,{{_,200,_},[_|_],"TRACE "++_}} =
+	httpc:request(Method, Request, HttpOpts, Opts),
+    ok.
+
+%%--------------------------------------------------------------------
+
+http_post(doc) ->
+    ["Perform a POST request that goes through a proxy. When the "
+     "request goes to an ordinary file it seems the POST data "
+     "is ignored."];
+http_post(Config) when is_list(Config) ->
+    Method = post,
+    URL = url("/index.html", Config),
+    Request = {URL,[],"text/plain","foobar"},
+    HttpOpts = [],
+    Opts = [],
+    {ok,{{_,200,_},[_|_],[_|_]}} =
+	httpc:request(Method, Request, HttpOpts, Opts),
+    ok.
+
+%%--------------------------------------------------------------------
+
+http_put(doc) ->
+    ["Perform a PUT request. The server will not allow it "
+     "but we only test sending the request."];
+http_put(Config) when is_list(Config) ->
+    Method = put,
+    URL = url("/put.html", Config),
+    Content =
+	"<html><body> <h1>foo</h1> <p>bar</p> </body></html>",
+    Request = {URL,[],"html",Content},
+    HttpOpts = [],
+    Opts = [],
+    {ok,{{_,405,_},[_|_],[_|_]}} =
+	httpc:request(Method, Request, HttpOpts, Opts),
+    ok.
+
+%%--------------------------------------------------------------------
+
+http_delete(doc) ->
+    ["Perform a DELETE request that goes through a proxy. Note the server "
+     "will reject the request with a 405 Method Not Allowed,"
+     "but this is just a test of sending the request."];
+http_delete(Config) when is_list(Config) ->
+    Method = delete,
+    URL = url("/delete.html", Config),
+    Request = {URL,[]},
+    HttpOpts = [],
+    Opts = [],
+    {ok,{{_,405,_},[_|_],[_|_]}} =
+	httpc:request(Method, Request, HttpOpts, Opts),
+    ok.
+
+%%--------------------------------------------------------------------
+
+http_headers(doc) ->
+    ["Use as many request headers as possible"];
+http_headers(Config) when is_list(Config) ->
+    Method = get,
+    URL = url("/index.html", Config),
+    Headers =
+	[{"Accept",
+	  "text/*, text/html, text/html;level=1, */*"},
+	 {"Accept-Charset",
+	  "iso-8859-5, unicode-1-1;q=0.8"},
+	 {"Accept-Encoding", "*"},
+	 {"Accept-Language",
+	  "sv, en-gb;q=0.8, en;q=0.7"},
+	 {"User-Agent", "inets"},
+	 {"Max-Forwards","5"},
+	 {"Referer",
+	  "http://otp.ericsson.se:8000/product/internal"}],
+    Request = {URL,Headers},
+    HttpOpts = [],
+    Opts = [],
+    {ok,{{_,200,_},[_|_],[_|_]}} =
+	httpc:request(Method, Request, HttpOpts, Opts),
+    ok.
+
+%%--------------------------------------------------------------------
+
+http_proxy_auth(doc) ->
+    ["Test the code for sending of proxy authorization."];
+http_proxy_auth(Config) when is_list(Config) ->
+    %% Our proxy seems to ignore the header, however our proxy
+    %% does not requirer an auth header, but we want to know
+    %% atleast the code for sending the header does not crash!
+    Method = get,
+    URL = url("/index.html", Config),
+    Request = {URL,[]},
+    HttpOpts = [{proxy_auth,{"foo","bar"}}],
+    Opts = [],
+    {ok,{{_,200,_},[_|_],[_|_]}} =
+	httpc:request(Method, Request, HttpOpts, Opts),
+    ok.
+
+%%--------------------------------------------------------------------
+
+http_doesnotexist(doc) ->
+    ["Test that we get a 404 when the page is not found."];
+http_doesnotexist(Config) when is_list(Config) ->
+    Method = get,
+    URL = url("/doesnotexist.html", Config),
+    Request = {URL,[]},
+    HttpOpts = [{proxy_auth,{"foo","bar"}}],
+    Opts = [],
+    {ok,{{_,404,_},[_|_],[_|_]}} =
+	httpc:request(Method, Request, HttpOpts, Opts),
+    ok.
+
+%%--------------------------------------------------------------------
+
+http_stream(doc) ->
+    ["Test the option stream for asynchronous requests"];
+http_stream(Config) when is_list(Config) ->
+    Method = get,
+    URL = url("/index.html", Config),
+    Request = {URL,[]},
+    HttpOpts = [],
+
+    Opts1 = [{body_format,binary}],
+    {ok,{{_,200,_},[_|_],Body}} =
+	httpc:request(Method, Request, HttpOpts, Opts1),
+
+    Opts2 = [{sync,false},{stream,self}],
+    {ok,RequestId} =
+	httpc:request(Method, Request, HttpOpts, Opts2),
+    receive
+	{http,{RequestId,stream_start,[_|_]}} ->
+	    ok
+    end,
+    case http_stream(RequestId, <<>>) of
+	Body -> ok
+    end.
+    %% StreamedBody = http_stream(RequestId, <<>>),
+    %% Body =:= StreamedBody,
+    %% ok.
+
+http_stream(RequestId, Body) ->
+    receive
+	{http,{RequestId,stream,Bin}} ->
+	    http_stream(RequestId, <<Body/binary,Bin/binary>>);
+	{http,{RequestId,stream_end,_Headers}} ->
+	    Body
+    end.
+
+%%--------------------------------------------------------------------
+
+http_emulate_lower_versions(doc) ->
+    ["Perform requests as 0.9 and 1.0 clients."];
+http_emulate_lower_versions(Config) when is_list(Config) ->
+    Method = get,
+    URL = url("/index.html", Config),
+    Request = {URL,[]},
+    Opts = [],
+
+    HttpOpts1 = [{version,"HTTP/0.9"}],
+    {ok,[_|_]=B1} =
+	httpc:request(Method, Request, HttpOpts1, Opts),
+    inets_test_lib:check_body(B1),
+
+    HttpOpts2 = [{version,"HTTP/1.0"}],
+    {ok,{{_,200,_},[_|_],[_|_]=B2}} =
+	httpc:request(Method, Request, HttpOpts2, Opts),
+    inets_test_lib:check_body(B2),
+
+    HttpOpts3 = [{version,"HTTP/1.1"}],
+    {ok,{{_,200,_},[_|_],[_|_]=B3}} =
+	httpc:request(Method, Request, HttpOpts3, Opts),
+    inets_test_lib:check_body(B3),
+
+    ok.
+
+%%--------------------------------------------------------------------
+http_not_modified_otp_6821(doc) ->
+    ["If unmodified no body should be returned"];
+http_not_modified_otp_6821(Config) when is_list(Config) ->
+    Method = get,
+    URL = url("/index.html", Config),
+    Opts = [],
+
+    Request1 = {URL,[]},
+    HttpOpts1 = [],
+    {ok,{{_,200,_},ReplyHeaders,[_|_]}} =
+	 httpc:request(Method, Request1, HttpOpts1, Opts),
+     ETag = header_value("etag", ReplyHeaders),
+     LastModified = header_value("last-modified", ReplyHeaders),
+
+     Request2 =
+	 {URL,
+	  [{"If-None-Match",ETag},
+	   {"If-Modified-Since",LastModified}]},
+     HttpOpts2 = [{timeout,15000}], % Limit wait for bug result
+     {ok,{{_,304,_},_,[]}} = % Page Unchanged
+	 httpc:request(Method, Request2, HttpOpts2, Opts),
+
+     ok.
+
+header_value(Name, [{HeaderName,HeaderValue}|Headers]) ->
+    case string:to_lower(HeaderName) of
+	Name ->
+	    HeaderValue;
+	_ ->
+	    header_value(Name, Headers)
+    end.
+
+%%--------------------------------------------------------------------
+%% Internal Functions ------------------------------------------------
+%%--------------------------------------------------------------------
+
+init_apps([], Config) ->
+    Config;
+init_apps([App|Apps], Config) ->
+    case app_start(App, Config) of
+	ok ->
+	    init_apps(Apps, Config);
+	Error ->
+	    Msg =
+		lists:flatten(
+		  io_lib:format(
+		    "Could not start ~p due to ~p.~n",
+		    [App, Error])),
+	    {skip,Msg}
+    end.
+
+app_start(App, Config) ->
+    try
+	case App of
+	    crypto ->
+		crypto:stop(),
+		ok = crypto:start();
+	    inets ->
+		application:stop(App),
+		ok = application:start(App),
+		case ?config(proxy, Config) of
+		    undefined -> ok;
+		    {_,ProxySpec} ->
+			ok = httpc:set_options([{proxy,ProxySpec}])
+		end;
+	    _ ->
+		application:stop(App),
+		ok = application:start(App)
+	end
+    catch
+	Class:Reason ->
+	    {exception,Class,Reason}
+    end.
+
+app_stop(App) ->
+    application:stop(App).
+
+make_cert_files(Alg, Prefix, Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    CaInfo = {CaCert,_} = erl_make_certs:make_cert([{key,Alg}]),
+    {Cert,CertKey} = erl_make_certs:make_cert([{key,Alg},{issuer,CaInfo}]),
+    CaCertFile = filename:join(PrivDir, Prefix++"cacerts.pem"),
+    CertFile = filename:join(PrivDir, Prefix++"cert.pem"),
+    KeyFile = filename:join(PrivDir, Prefix++"key.pem"),
+    der_to_pem(CaCertFile, [{'Certificate', CaCert, not_encrypted}]),
+    der_to_pem(CertFile, [{'Certificate', Cert, not_encrypted}]),
+    der_to_pem(KeyFile, [CertKey]),
+    ok.
+
+der_to_pem(File, Entries) ->
+    PemBin = public_key:pem_encode(Entries),
+    file:write_file(File, PemBin).
+
+
+
+url(AbsPath, Config) ->
+    Protocol = ?config(protocol, Config),
+    {ServerName,ServerPort} = ?config(Protocol, Config),
+    atom_to_list(Protocol) ++ "://" ++
+	ServerName ++ ":" ++ integer_to_list(ServerPort) ++
+	AbsPath.
+
+%%--------------------------------------------------------------------
+
+init_local_proxy(Config) ->
+    case os:type() of
+	{unix,_} ->
+	    case rcmd_local_proxy(["start"], Config) of
+		{0,[":STARTED:"++String]} ->
+		    init_local_proxy_string(String, Config);
+		{_,[":SKIP:"++_|_]}=Reason ->
+		    {skip,Reason};
+		Error ->
+		    rcmd_local_proxy(["stop"], Config),
+		    ct:fail({local_proxy_start_failed,Error})
+	    end;
+	_ ->
+	    {skip,"Platform can not run local proxy start script"}
+    end.
+
+init_local_proxy_string(String, Config) ->
+    {Proxy,Server} = split($|, String),
+    {ProxyName,ProxyPort} = split($:, Proxy),
+    {ServerName,ServerPorts} = split($:, Server),
+    {ServerHttpPort,ServerHttpsPort} = split($:, ServerPorts),
+    [{proxy,{local,{{ProxyName,list_to_integer(ProxyPort)},[]}}},
+     {http,{ServerName,list_to_integer(ServerHttpPort)}},
+     {https,{ServerName,list_to_integer(ServerHttpsPort)}}
+     |Config].
+
+rcmd_local_proxy(Args, Config) ->
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+    Script = filename:join(DataDir, ?LOCAL_PROXY_SCRIPT),
+    rcmd(Script, Args, [{cd,PrivDir}]).
+
+rcmd(Cmd, Args, Opts) ->
+    Port =
+	erlang:open_port(
+	  {spawn_executable,Cmd},
+	  [{args,Args},{line,80},exit_status,eof,hide|Opts]),
+    rcmd_loop(Port, [], [], undefined, false).
+
+rcmd_loop(Port, Lines, Buf, Exit, EOF) ->
+    receive
+	{Port,{data,{Flag,Line}}} ->
+	    case Flag of
+		noeol ->
+		    rcmd_loop(Port, Lines, r(Line, Buf), Exit, EOF);
+		eol ->
+		    rcmd_loop(Port, [r(Buf, Line)|Lines], [], Exit, EOF)
+	    end;
+	{Port,{exit_status,Status}} when Exit =:= undefined ->
+	    case EOF of
+		true ->
+		    rcmd_close(Port, Lines, Buf, Status);
+		false ->
+		    rcmd_loop(Port, Lines, Buf, Status, EOF)
+	    end;
+	{Port,eof} when EOF =:= false ->
+	    case Exit of
+		undefined ->
+		    rcmd_loop(Port, Lines, Buf, Exit, true);
+		Status ->
+		    rcmd_close(Port, Lines, Buf, Status)
+	    end;
+	{Port,_}=Unexpected ->
+	    ct:fail({unexpected_from_port,Unexpected})
+    end.
+
+rcmd_close(Port, Lines, Buf, Status) ->
+    catch port_close(Port),
+    case Buf of
+	[] ->
+	    {Status,Lines};
+	_ ->
+	    {Status,[r(Buf)|Lines]}
+    end.
+
+%%--------------------------------------------------------------------
+
+%% Split on first match of X in Ys, do not include X in neither part
+split(X, Ys) ->
+    split(X, Ys, []).
+%%
+split(X, [X|Ys], Rs) ->
+    {r(Rs),Ys};
+split(X, [Y|Ys], Rs) ->
+    split(X, Ys, [Y|Rs]).
+
+r(L) -> lists:reverse(L).
+r(L, R) -> lists:reverse(L, R).
diff --git a/lib/inets/test/httpc_proxy_SUITE_data/apache2/apache2.conf b/lib/inets/test/httpc_proxy_SUITE_data/apache2/apache2.conf
new file mode 100644
index 0000000000..37af88c510
--- /dev/null
+++ b/lib/inets/test/httpc_proxy_SUITE_data/apache2/apache2.conf
@@ -0,0 +1,87 @@
+## Simple Apache 2 configuration file for daily test very local http server
+##
+## %CopyrightBegin%
+##
+## Copyright Ericsson AB 2012. All Rights Reserved.
+##
+## The contents of this file are subject to the Erlang Public License,
+## Version 1.1, (the "License"); you may not use this file except in
+## compliance with the License. You should have received a copy of the
+## Erlang Public License along with this software. If not, it can be
+## retrieved online at http://www.erlang.org/.
+##
+## Software distributed under the License is distributed on an "AS IS"
+## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+## the License for the specific language governing rights and limitations
+## under the License.
+##
+## %CopyrightEnd%
+##
+## Author: Raimo Niskanen, Erlang/OTP
+#
+LockFile ${APACHE_LOCK_DIR}/accept.lock
+PidFile ${APACHE_PID_FILE}
+
+Timeout 300
+
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
+
+DefaultType text/plain
+HostnameLookups Off
+ErrorLog ${APACHE_LOG_DIR}/error.log
+LogLevel warn
+
+Include ${APACHE_MODS_DIR}/*.load
+Include ${APACHE_MODS_DIR}/*.conf
+
+Listen ${APACHE_HTTP_PORT} http
+
+<IfModule mod_ssl.c>
+	Listen ${APACHE_HTTPS_PORT} https
+	SSLMutex file:${APACHE_LOCK_DIR}/ssl_mutex
+</IfModule>
+
+#<IfModule mod_gnutls.c>
+#	Listen 8443
+#</IfModule>
+
+#LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+#LogFormat "%h %l %u %t \"%r\" %>s %O" common
+#LogFormat "%{Referer}i -> %U" referer
+#LogFormat "%{User-agent}i" agent
+
+CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+<Directory />
+	AllowOverride None
+	Order Deny,Allow
+	Deny from all
+</Directory>
+
+ServerTokens Minimal
+ServerSignature Off
+KeepAlive On
+KeepAliveTimeout 5
+
+ServerName ${APACHE_SERVER_NAME}
+ServerAdmin webmaster@${APACHE_SERVER_NAME}
+DocumentRoot ${APACHE_DOCROOT}
+<Directory ${APACHE_DOCROOT}>
+	Options Indexes FollowSymLinks MultiViews
+	AllowOverride None
+	Order allow,deny
+	Allow from all
+</Directory>
+
+<VirtualHost *:${APACHE_HTTP_PORT}>
+</VirtualHost>
+
+<IfModule mod_ssl.c>
+	<VirtualHost *:${APACHE_HTTPS_PORT}>
+		SSLCertificateFile ${APACHE_CERTS_DIR}/server-cert.pem
+		SSLCertificateKeyFile ${APACHE_CERTS_DIR}/server-key.pem
+		SSLEngine on
+	</VirtualHost>
+</IfModule>
diff --git a/lib/inets/test/httpc_proxy_SUITE_data/apache2/htdocs/index.html b/lib/inets/test/httpc_proxy_SUITE_data/apache2/htdocs/index.html
new file mode 100644
index 0000000000..1c70d95348
--- /dev/null
+++ b/lib/inets/test/httpc_proxy_SUITE_data/apache2/htdocs/index.html
@@ -0,0 +1,4 @@
+<html><body><h1>It works!</h1>
+<p>This is the default web page for this server.</p>
+<p>The web server software is running but no content has been added, yet.</p>
+</body></html>
diff --git a/lib/inets/test/httpc_proxy_SUITE_data/server_proxy.sh b/lib/inets/test/httpc_proxy_SUITE_data/server_proxy.sh
new file mode 100755
index 0000000000..4b05ea63ef
--- /dev/null
+++ b/lib/inets/test/httpc_proxy_SUITE_data/server_proxy.sh
@@ -0,0 +1,198 @@
+#! /bin/sh
+##
+## Command file to handle external webserver and proxy
+## apache2 and tinyproxy.
+##
+## %CopyrightBegin%
+##
+## Copyright Ericsson AB 2012. All Rights Reserved.
+##
+## The contents of this file are subject to the Erlang Public License,
+## Version 1.1, (the "License"); you may not use this file except in
+## compliance with the License. You should have received a copy of the
+## Erlang Public License along with this software. If not, it can be
+## retrieved online at http://www.erlang.org/.
+##
+## Software distributed under the License is distributed on an "AS IS"
+## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+## the License for the specific language governing rights and limitations
+## under the License.
+##
+## %CopyrightEnd%
+##
+## Author: Raimo Niskanen, Erlang/OTP
+#
+
+PATH=/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/sbin:/usr/sbin
+SHELL=/bin/sh
+unset CDPATH ENV BASH_ENV
+IFS='
+	 '
+
+APACHE_MODS_AVAILABLE_DIR="/etc/apache2/mods-available"
+MODS="authz_host.load mime.conf mime.load ssl.conf ssl.load"
+
+APACHE_HTTP_PORT=8080
+APACHE_HTTPS_PORT=8443
+APACHE_SERVER_NAME=localhost
+export APACHE_HTTP_PORT APACHE_HTTPS_PORT APACHE_SERVER_NAME
+
+PROXY_SERVER_NAME=localhost
+PROXY_PORT=8000
+export PROXY_SERVER_NAME PROXY_PORT
+
+# All stdout goes to the calling erlang port, therefore
+# these helpers push all side info to stderr.
+status () { echo "$@"; }
+info () { echo "$@" 1>&2; }
+die () { REASON="$?"; status "$@"; exit "$REASON"; }
+cmd () { "$@" 1>&2; }
+silent () { "$@" 1>/dev/null 2>&1; }
+
+wait_for_pidfile () {
+    PIDFILE="${1:?Missing argument: PidFile}"
+    for t in 1 1 1 2 2 3 3 3 4; do
+	PID="`head -1 "$1" 2>/dev/null`" && [ :"$PID" != : ] && break
+	sleep $t
+    done
+    [ :"$PID" = : ] && die ":ERROR:No or empty PidFile: $1"
+    info "Started $PIDFILE[$PID]."
+}
+
+kill_and_wait () {
+    PID_FILE="${1:?Missing argument: PidFile}"
+    if [ -f "$PID_FILE" ]; then
+	PID="`head -1 "$PID_FILE" 2>/dev/null`"
+	[ :"$PID" = : ] && \
+	    info "Empty Pid file: $1"
+	info "Stopping $1 [$PID]..."
+	shift
+	case :"${1:?Missing argument: kill command}" in
+	    :kill)
+		[ :"$PID" = : ] || cmd kill "$PID";;
+	    :*)
+		cmd "$@";;
+	esac
+	wait "$PID"
+	for t in 1 1 1 2; do
+	    sleep $t
+	    [ -e "$PID_FILE" ] || break
+	done
+	silent rm "$PID_FILE"
+    else
+	info "No pid file: $1"
+    fi
+}
+
+
+PRIV_DIR="`pwd`"
+DATA_DIR="`dirname "$0"`"
+DATA_DIR="`cd "$DATA_DIR" && pwd`"
+
+silent type apache2ctl || \
+    die ":SKIP: Can not find apache2ctl."
+silent type tinyproxy || \
+    die ":SKIP: Can not find tinyproxy."
+
+[ -d "$APACHE_MODS_AVAILABLE_DIR" ] || \
+    die ":SKIP:Can not locate modules dir $APACHE_MODS_AVAILABLE_DIR."
+
+silent mkdir apache2 tinyproxy
+cd apache2 || \
+    die ":ERROR:Can not cd to apache2"
+CWD="`pwd`"
+(cd ../tinyproxy) || \
+    die ":ERROR:Can not cd to ../tinyproxy"
+
+unset APACHE_HTTPD APACHE_LYNX APACHE_STATUSURL
+
+## apache2ctl envvars variables
+APACHE_CONFDIR="$DATA_DIR/apache2"
+[ -f "$APACHE_CONFDIR"/apache2.conf ] || \
+    die ":SKIP:No config file: $APACHE_CONFDIR/apache2.conf."
+APACHE_RUN_USER=`id | sed 's/^uid=[0-9]\{1,\}(\([^)]*\)).*/\1/'`
+APACHE_RUN_GROUP=`id | sed 's/.*[ 	]gid=[0-9]\{1,\}(\([^)]*\)).*/\1/'`
+APACHE_RUN_DIR="$CWD/run"
+APACHE_PID_FILE="$APACHE_RUN_DIR/pid"
+APACHE_LOCK_DIR="$CWD/lock"
+APACHE_LOG_DIR="$CWD/log"
+export APACHE_CONFDIR APACHE_RUN_USER APACHE_RUN_GROUP
+export APACHE_RUN_DIR APACHE_PID_FILE
+export APACHE_LOCK_DIR APACHE_LOG_DIR
+silent cmd mkdir "$APACHE_CONFDIR"
+silent cmd mkdir "$APACHE_RUN_DIR" "$APACHE_LOCK_DIR" "$APACHE_LOG_DIR"
+
+## Our apache2.conf additional variables
+APACHE_MODS_DIR="$CWD/mods"
+APACHE_DOCROOT="$APACHE_CONFDIR/htdocs"
+APACHE_CERTS_DIR="$PRIV_DIR"
+export APACHE_MODS_DIR APACHE_DOCROOT APACHE_CERTS_DIR
+[ -d "$APACHE_MODS_DIR" ] || {
+    cmd mkdir "$APACHE_MODS_DIR"
+    for MOD in $MODS; do
+	cmd ln -s "$APACHE_MODS_AVAILABLE_DIR/$MOD" "$APACHE_MODS_DIR" || {
+	    die ":ERROR:ln of apache 2 module $MOD failed"
+	}
+    done
+}
+
+case :"${1:?}" in
+
+    :start)
+	info "Starting apache2..."
+	cmd apache2ctl start
+	[ $? = 0 ] || \
+	    die ":ERROR: apache2 did not start."
+	wait_for_pidfile "$APACHE_PID_FILE"
+	
+	info "Starting tinyproxy..."
+	cmd cd ../tinyproxy || \
+	    die ":ERROR:Can not cd to `pwd`/../tinyproxy"
+	cat >tinyproxy.conf <<EOF
+Port $PROXY_PORT
+
+Listen 127.0.0.1
+BindSame yes
+Timeout 600
+
+DefaultErrorFile "default.html"
+Logfile "tinyproxy.log"
+PidFile "tinyproxy.pid"
+
+MaxClients 100
+MinSpareServers 2
+MaxSpareServers 8
+StartServers 2
+MaxRequestsPerChild 0
+
+ViaProxyName "tinyproxy"
+
+ConnectPort $APACHE_HTTPS_PORT
+EOF
+	(tinyproxy -d -c tinyproxy.conf 1>/dev/null 2>&1 </dev/null &)&
+	wait_for_pidfile tinyproxy.pid
+	
+	status ":STARTED:$PROXY_SERVER_NAME:$PROXY_PORT|\
+$APACHE_SERVER_NAME:$APACHE_HTTP_PORT:$APACHE_HTTPS_PORT"
+	exit 0
+	;;
+
+    :stop)
+	kill_and_wait ../tinyproxy/tinyproxy.pid kill
+	kill_and_wait "$APACHE_PID_FILE" apache2ctl stop
+
+	status ":STOPPED:"
+	exit 0
+	;;
+
+    :apache2ctl)
+	shift
+	cmd apache2ctl ${1+"$@"}
+	exit
+	;;
+
+    :*)
+	(exit 1); die ":ERROR: I do not know of command '$1'."
+	;;
+
+esac
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 41e4188e5f..592469a12f 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -530,24 +530,10 @@ init_per_testcase3(Case, Config) ->
     application:stop(inets),
     application:stop(ssl),
     cleanup_mnesia(),
-
-    %% Set trace level
-    case lists:reverse(atom_to_list(Case)) of
-	"tset_emit" ++ _Rest -> % test-cases ending with time_test
-	    tsp("init_per_testcase3(~w) -> disabling trace", [Case]),
-	    inets:disable_trace();
-	_ ->
-	    tsp("init_per_testcase3(~w) -> enabling trace", [Case]),
-	    %% TraceLevel = 70, 
-	    TraceLevel = max, 
-	    TraceDest  = io, 
-	    inets:enable_trace(TraceLevel, TraceDest, httpd)
-    end,
-	    
+ 
     %% Start initialization
     tsp("init_per_testcase3(~w) -> start init", [Case]),
-    
-
+ 
     Dog = test_server:timetrap(inets_test_lib:minutes(10)),
     NewConfig = lists:keydelete(watchdog, 1, Config),
     TcTopDir = ?config(tc_top_dir, Config),
@@ -762,14 +748,9 @@ ip_mod_cgi(doc) ->
 ip_mod_cgi(suite) ->
     [];
 ip_mod_cgi(Config) when is_list(Config) ->
-    case test_server:os_type() of
-	vxworks ->
-	    {skip, cgi_not_supported_on_vxwoks};
-	_ ->
-	    httpd_mod:cgi(ip_comm, ?IP_PORT, 
-			  ?config(host, Config), ?config(node, Config)),
-	    ok
-    end.
+    httpd_mod:cgi(ip_comm, ?IP_PORT, 
+	?config(host, Config), ?config(node, Config)),
+    ok.
 %%-------------------------------------------------------------------------
 ip_mod_esi(doc) ->
     ["Module test: mod_esi"];
@@ -1275,16 +1256,11 @@ essl_mod_cgi(Config) when is_list(Config) ->
     ssl_mod_cgi(essl, Config).
 
 ssl_mod_cgi(Tag, Config) ->
-    case test_server:os_type() of
-	vxworks ->
-	    {skip, cgi_not_supported_on_vxwoks};
-	_ ->
-	    httpd_mod:cgi(Tag, 
-			  ?SSL_PORT, 
-			  ?config(host, Config), 
-			  ?config(node, Config)),
-	    ok
-    end.
+    httpd_mod:cgi(Tag, 
+	?SSL_PORT, 
+	?config(host, Config), 
+	?config(node, Config)),
+    ok.
 
 
 %%-------------------------------------------------------------------------
@@ -2698,11 +2674,6 @@ dos_hostname_request(Host) ->
 get_nof_clients(Mode, Load) ->
     get_nof_clients(test_server:os_type(), Mode, Load).
 
-get_nof_clients(vxworks, _,       light)  -> 1;
-get_nof_clients(vxworks, ip_comm, medium) -> 3;
-get_nof_clients(vxworks, ssl,     medium) -> 3;
-get_nof_clients(vxworks, ip_comm, heavy)  -> 5;
-get_nof_clients(vxworks, ssl,     heavy)  -> 5;
 get_nof_clients(_,       ip_comm, light)  -> 5;
 get_nof_clients(_,       ssl,     light)  -> 2;
 get_nof_clients(_,       ip_comm, medium) -> 10;
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index 7a476ea14a..523cf9d38c 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -34,7 +34,8 @@ all() ->
     [
      uri_too_long_414, 
      header_too_long_413, 
-     escaped_url_in_error_body
+     escaped_url_in_error_body,
+     slowdose
     ].
 
 groups() -> 
@@ -278,7 +279,18 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
     inets:stop(httpd, Pid),
     tsp("escaped_url_in_error_body -> done"),    
     ok.
-
+slowdose(doc) ->
+    ["Testing minimum bytes per second option"];
+slowdose(Config) when is_list(Config) ->
+    HttpdConf =   ?config(httpd_conf, Config),
+    {ok, Pid} = inets:start(httpd, [{port, 0}, {minimum_bytes_per_second, 200}|HttpdConf]),
+    Info = httpd:info(Pid),
+    Port = proplists:get_value(port, Info),
+    {ok, Socket} = gen_tcp:connect("localhost", Port, []),
+    receive
+    after 6000 ->
+	    {error, closed} = gen_tcp:send(Socket, "Hey")
+    end.
 find_URL_path([]) ->
     "";
 find_URL_path(["URL", URL | _]) ->
diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl
index cb1214b7fb..387263ce58 100644
--- a/lib/inets/test/httpd_mod.erl
+++ b/lib/inets/test/httpd_mod.erl
@@ -82,19 +82,23 @@ actions(Type, Port, Host, Node) ->
 				       [{statuscode, 200},
 				        {version, "HTTP/1.0"}]).
 
+
 %%-------------------------------------------------------------------------
 security(ServerRoot, Type, Port, Host, Node) ->
-    %% io:format(user, "~w:security -> entry with"
-    %% 	      "~n   ServerRoot: ~p"
-    %% 	      "~n   Type:       ~p"
-    %% 	      "~n   Port:       ~p"
-    %% 	      "~n   Host:       ~p"
-    %% 	      "~n   Node:       ~p"
-    %% 	      "~n", [?MODULE, ServerRoot, Type, Port, Host, Node]),
-    
-%%     io:format(user, "~w:security -> register~n", [?MODULE]), 
+    tsp("security -> "
+	"entry with"
+	"~n   ServerRoot: ~p"
+	"~n   Type:       ~p"
+	"~n   Port:       ~p"
+	"~n   Host:       ~p"
+	"~n   Node:       ~p", [ServerRoot, Type, Port, Host, Node]),
+
+    tsp("security -> "
+	"register - receive security events"),
     global:register_name(mod_security_test, self()),   % Receive events
 
+    tsp("security -> "
+	"sleep"), 
     test_server:sleep(5000),
 
     OpenDir = filename:join([ServerRoot, "htdocs", "open"]),
@@ -102,133 +106,240 @@ security(ServerRoot, Type, Port, Host, Node) ->
     %% Test blocking / unblocking of users.
 
     %% /open, require user one Aladdin
-%%     io:format(user, "~w:security -> remove user~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"remove all existing users"), 
     remove_users(Node, ServerRoot, Host, Port, "open"),
 
-%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"auth request for nonex user 'one' - expect 401"), 
     auth_request(Type, Host, Port, Node, "/open/", "one", "onePassword", 
 		 [{statuscode, 401}]),
-%%     io:format(user, "~w:security -> await fail security event~n", [?MODULE]), 
+
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"await fail security event"), 
     receive_security_event({event, auth_fail, Port, OpenDir,
 			    [{user, "one"}, {password, "onePassword"}]},
 			   Node, Port),
     
-%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"auth request for nonex user 'two' - expect 401"), 
     auth_request(Type,Host,Port,Node,"/open/", "two", "twoPassword",
 		 [{statuscode, 401}]),
-%%     io:format(user, "~w:security -> await fail security event~n", [?MODULE]), 
+    
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"await fail security event"), 
     receive_security_event({event, auth_fail, Port, OpenDir,
 			    [{user, "two"}, {password, "twoPassword"}]},
 			   Node, Port),
 
-%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"auth request for nonex user 'Alladin' - expect 401"), 
     auth_request(Type, Host, Port, Node,"/open/", "Aladdin", 
 		 "AladdinPassword", [{statuscode, 401}]),
-%%     io:format(user, "~w:security -> await fail security event~n", [?MODULE]), 
+
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"await fail security event"), 
     receive_security_event({event, auth_fail, Port, OpenDir,
 			    [{user, "Aladdin"},
 			     {password, "AladdinPassword"}]},
 			   Node, Port),
 
-%%     io:format(user, "~w:security -> add users~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"add user 'one'"), 
     add_user(Node, ServerRoot, Port, "open", "one", "onePassword", []),
+
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"add user 'two'"), 
     add_user(Node, ServerRoot, Port, "open", "two", "twoPassword", []),
 
-%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"auth request 1 for user 'one' with wrong password - expect 401"), 
     auth_request(Type, Host, Port, Node,"/open/", "one", "WrongPassword", 
 		 [{statuscode, 401}]),
-%%     io:format(user, "~w:security -> await fail security event~n", [?MODULE]), 
+
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"await fail security event"), 
     receive_security_event({event, auth_fail, Port, OpenDir,
 			    [{user, "one"}, {password, "WrongPassword"}]},
 			   Node, Port),
  
-%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"auth request 2 for user 'one' with wrong password - expect 401"), 
     auth_request(Type, Host, Port, Node,"/open/", "one", "WrongPassword", 
 		 [{statuscode, 401}]),
-%%     io:format(user, "~w:security -> await fail security event~n", [?MODULE]), 
+
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"await fail security event"), 
     receive_security_event({event, auth_fail, Port, OpenDir,
 			    [{user, "one"}, {password, "WrongPassword"}]},
 			   Node, Port),
     
-%%     io:format(user, "~w:security -> await block security event~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"await block security event (two failed attempts)"), 
     receive_security_event({event, user_block, Port, OpenDir,
 			    [{user, "one"}]}, Node, Port),
     
-%%     io:format(user, "~w:security -> unregister~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"unregister - no more security events"), 
     global:unregister_name(mod_security_test),   % No more events.
 
-%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"auth request for user 'one' with wrong password - expect 401"), 
     auth_request(Type, Host, Port, Node,"/open/", "one", "WrongPassword", 
 		 [{statuscode, 401}]),
-%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"auth request for user 'one' with correct password - expect 403"), 
     auth_request(Type, Host, Port, Node,"/open/", "one", "onePassword",
 		 [{statuscode, 403}]),
 
     %% User "one" should be blocked now..
-    %% [{"one",_, Port, OpenDir,_}] = list_blocked_users(Node,Port),
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"list blocked users - 'one' should be the only one"), 
     case list_blocked_users(Node, Port) of
 	[{"one",_, Port, OpenDir,_}] ->
 	    ok;
 	Blocked ->
-	    %% io:format(user, "~w:security -> Blocked: ~p"
-	    %% 	      "~n", [?MODULE, Blocked]),
+	    tsp(" *** unexpected blocked users ***"
+	      "~n     Blocked: ~p", [Blocked]),
 	    exit({unexpected_blocked, Blocked})
     end,
-	    
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
-    [{"one",_, Port, OpenDir,_}] = list_blocked_users(Node,Port,OpenDir),
 
-%%     io:format(user, "~w:security -> unblock user~n", [?MODULE]), 
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"list users blocked for dir '~p' - "
+	"user 'one' should be the only one", [OpenDir]),
+    [{"one",_, Port, OpenDir,_}] = list_blocked_users(Node, Port, OpenDir),
+
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"unblock user 'one' for dir '~p'", [OpenDir]), 
     true = unblock_user(Node, "one", Port, OpenDir),
-    %% User "one" should not be blocked any more..
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
+    %% User "one" should not be blocked any more.
+
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"ensure user 'one' is no longer blocked"), 
     [] = list_blocked_users(Node, Port),
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
-    [] = list_blocked_users(Node, Port, OpenDir),
-%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
+
+
+    tsp("security -> "
+	"blocking and unblocking of users - "
+	"auth request for user 'one' with correct password - expect 200"), 
     auth_request(Type, Host, Port, Node,"/open/", "one", "onePassword", 
 		 [{statuscode, 200}]),
 
+
+
     %% Test list_auth_users & auth_timeout
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
+
+    tsp("security -> "
+	"list-auth-users and auth-timeout - "
+	"list auth users - expect user 'one'"), 
     ["one"] = list_auth_users(Node, Port),
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
-    ["one"] = list_auth_users(Node, Port, OpenDir),
-%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
+
+    tsp("security -> "
+	"list-auth-users and auth-timeout - "
+	"auth request for user 'two' with wrong password - expect 401"), 
     auth_request(Type, Host, Port, Node,"/open/", "two", "onePassword", 
 		 [{statuscode, 401}]),
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
+
+    tsp("security -> "
+	"list-auth-users and auth-timeout - "
+	"list auth users - expect user 'one'"),
     ["one"] = list_auth_users(Node, Port),
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
+
+    tsp("security -> "
+	"list-auth-users and auth-timeout - "
+	"list auth users for dir '~p' - expect user 'one'", [OpenDir]), 
     ["one"] = list_auth_users(Node, Port, OpenDir),
-%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
+
+    tsp("security -> "
+	"list-auth-users and auth-timeout - "
+	"auth request for user 'two' with correct password - expect 401"), 
     auth_request(Type, Host, Port, Node,"/open/", "two", "twoPassword", 
 		 [{statuscode, 401}]),
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
+
+    tsp("security -> "
+	"list-auth-users and auth-timeout - "
+	"list auth users - expect user 'one'"), 
     ["one"] = list_auth_users(Node, Port),
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
+
+    tsp("security -> "
+	"list-auth-users and auth-timeout - "
+	"list auth users for dir '~p' - expect user 'one'", [OpenDir]), 
     ["one"] = list_auth_users(Node, Port, OpenDir),
+
     %% Wait for successful auth to timeout.
+    tsp("security -> "
+	"list-auth-users and auth-timeout - "
+	"wait for successful auth to timeout"), 
     test_server:sleep(?AUTH_TIMEOUT*1001),  
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
+
+    tsp("security -> "
+	"list-auth-users and auth-timeout - "
+	"list auth users - expect none"), 
     [] = list_auth_users(Node, Port),
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
+
+    tsp("security -> "
+	"list-auth-users and auth-timeout - "
+	"list auth users for dir '~p'~n - expect none", [OpenDir]), 
     [] = list_auth_users(Node, Port, OpenDir),
+
     %% "two" is blocked.
-%%     io:format(user, "~w:security -> unblock user~n", [?MODULE]), 
+
+    tsp("security -> "
+	"list-auth-users and auth-timeout - "
+	"unblock user 'two' for dir '~p'", [OpenDir]), 
     true = unblock_user(Node, "two", Port, OpenDir),
+
+
     %% Test explicit blocking. Block user 'two'.
-%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
+
+    tsp("security -> "
+	"explicit blocking - list blocked users - should be none"), 
     [] = list_blocked_users(Node,Port,OpenDir),
-%%     io:format(user, "~w:security -> block user~n", [?MODULE]), 
+
+    tsp("security -> "
+	"explicit blocking - "
+	"block user 'two' for dir '~p'", [OpenDir]), 
     true = block_user(Node, "two", Port, OpenDir, 10),
-%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
+
+    tsp("security -> "
+	"explicit blocking - "
+	"auth request for user 'two' with correct password - expect 401"), 
     auth_request(Type, Host, Port, Node,"/open/", "two", "twoPassword", 
-		 [{statuscode, 401}]).
+		 [{statuscode, 401}]),
+    tsp("security -> "
+	"done").
+
 
 %%-------------------------------------------------------------------------
 auth(Type, Port, Host, Node) ->
+    tsp("auth -> "
+	"entry with"
+	"~n   Type:       ~p"
+	"~n   Port:       ~p"
+	"~n   Host:       ~p"
+	"~n   Node:       ~p", [Type, Port, Host, Node]),
+
     %% Authentication required!
     ok = httpd_test_lib:verify_request(Type,Host,Port,Node, 
 				       "GET /open/ HTTP/1.0\r\n\r\n",
@@ -913,13 +1024,11 @@ list_users(Node, Root, _Host, Port, Dir) ->
 
 
 receive_security_event(Event, Node, Port) ->
-    %% io:format(user, "~w:receive_security_event -> entry with"
-    %% 	      "~n   Event: ~p"
-    %% 	      "~n   Node:  ~p"
-    %% 	      "~n   Port:  ~p"
-    %% 	      "~n", [?MODULE, Event, Node, Port]),
+    tsp("receive_security_event -> await ~w event", [element(2, Event)]),
     receive 
 	Event ->
+	    tsp("receive_security_event -> "
+		"received expected ~w event", [element(2, Event)]),
 	    ok;
 	{'EXIT', _, _} ->
 	    receive_security_event(Event, Node, Port)
@@ -1027,8 +1136,14 @@ check_lists_members1(L1,L2) ->
     {error,{lists_not_equal,L1,L2}}.
 
 
-%% tsp(F) ->
-%%     inets_test_lib:tsp(F).
+%% p(F) ->
+%%     p(F, []).
+
+%% p(F, A) ->
+%%     io:format(user, "~w:" ++ F ++ "~n", [?MODULE|A]).
+
+tsp(F) ->
+    inets_test_lib:tsp(F).
 tsp(F, A) ->
     inets_test_lib:tsp(F, A).
 
diff --git a/lib/inets/test/inets.spec.vxworks b/lib/inets/test/inets.spec.vxworks
deleted file mode 100644
index 6886299226..0000000000
--- a/lib/inets/test/inets.spec.vxworks
+++ /dev/null
@@ -1,5 +0,0 @@
-{topcase, {dir, "../inets_test"}}.
-{skip, {inets_SUITE, ip_mod_cgi, "Requires processes"}}.
-{skip, {inets_SUITE, ip_mod_all_modules, "Requires processes"}}.
-{skip, {inets_SUITE, ssl, "Requires SSL"}}.
-
diff --git a/lib/inets/test/inets_SUITE.erl b/lib/inets/test/inets_SUITE.erl
index 6fa0f44d77..069c68fa1e 100644
--- a/lib/inets/test/inets_SUITE.erl
+++ b/lib/inets/test/inets_SUITE.erl
@@ -363,8 +363,6 @@ start_ftpc(suite) ->
     [];
 start_ftpc(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
-    inets:disable_trace(),
-    inets:enable_trace(max, io, ftpc), 
     ok = inets:start(),
     try
 	begin
@@ -393,16 +391,13 @@ start_ftpc(Config) when is_list(Config) ->
 			    tsf(stand_alone_not_shutdown)
 		    end,
 		    ok = inets:stop(),
-		    inets:disable_trace(),
 		    ok;
 		_ ->
-		    inets:disable_trace(),
 		    {skip, "Unable to reach selected FTP server " ++ FtpdHost}
 	    end
 	end
     catch
 	throw:{error, not_found} ->
-	    inets:disable_trace(),
 	    {skip, "No available FTP servers"}
     end.
 	    
@@ -462,8 +457,6 @@ httpd_reload(Config) when is_list(Config) ->
 		 {document_root, PrivDir}, 
 		 {bind_address,  "localhost"}],
 
-    inets:enable_trace(max, io),
-
     i("httpd_reload -> start inets"),
 
     ok = inets:start(),
diff --git a/lib/inets/test/inets_app_test.erl b/lib/inets/test/inets_app_test.erl
index db2218f3b6..eabfa69f7c 100644
--- a/lib/inets/test/inets_app_test.erl
+++ b/lib/inets/test/inets_app_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -35,6 +35,15 @@
 init_per_testcase(undef_funcs, Config) ->
     NewConfig = lists:keydelete(watchdog, 1, Config),
     Dog = test_server:timetrap(inets_test_lib:minutes(10)),
+
+    %% We need to check if there is a point to run this test.
+    %% On some platforms, crypto will not build, which in turn
+    %% causes ssl to not build (at this time, this will
+    %% change in the future).
+    %% So, we first check if we can start crypto, and if not,
+    %% we skip this test case!
+    ?ENSURE_STARTED(crypto),
+
     [{watchdog, Dog}| NewConfig];
 init_per_testcase(_, Config) ->
     Config.
@@ -240,13 +249,6 @@ undef_funcs(suite) ->
 undef_funcs(doc) ->
     [];
 undef_funcs(Config) when is_list(Config) ->
-    %% We need to check if there is a point to run this test.
-    %% On some platforms, crypto will not build, which in turn
-    %% causes ssl to not build (at this time, this will
-    %% change in the future).
-    %% So, we first check if we can start crypto, and if not, 
-    %% we skip this test case!
-    ?ENSURE_STARTED(crypto), 
     App            = inets,
     AppFile        = key1search(app_file, Config),
     Mods           = key1search(modules, AppFile),
diff --git a/lib/inets/test/inets_sup_SUITE.erl b/lib/inets/test/inets_sup_SUITE.erl
index 1d262a2739..65f0f0e09a 100644
--- a/lib/inets/test/inets_sup_SUITE.erl
+++ b/lib/inets/test/inets_sup_SUITE.erl
@@ -226,8 +226,6 @@ ftpc_worker(doc) ->
 ftpc_worker(suite) ->
     [];
 ftpc_worker(Config) when is_list(Config) ->
-    inets:disable_trace(),
-    inets:enable_trace(max, io, ftpc), 
     [] = supervisor:which_children(ftp_sup),
     try
 	begin
@@ -239,20 +237,16 @@ ftpc_worker(Config) when is_list(Config) ->
 			    inets:stop(ftpc, Pid), 
 			    test_server:sleep(5000),
 			    [] = supervisor:which_children(ftp_sup),
-			    inets:disable_trace(),
 			    ok;
 			Children ->
-			    inets:disable_trace(),
 			    exit({unexpected_children, Children})
 		    end;
 		_ ->
-		    inets:disable_trace(),
 		    {skip, "Unable to reach test FTP server"}
 	    end
 	end
     catch
 	throw:{error, not_found} ->
-	    inets:disable_trace(),
 	    {skip, "No available FTP servers"}
     end.
 
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index c94be796cd..0f8671b682 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -31,6 +31,7 @@
 	 send/3, close/2]).
 -export([copy_file/3, copy_files/2, copy_dirs/2, del_dirs/1]).
 -export([info/4, log/4, debug/4, print/4]).
+-export([timestamp/0, formated_timestamp/0]).
 -export([tsp/1, tsp/2, tsf/1, tss/1]).
 -export([check_body/1]).
 -export([millis/0, millis_diff/2, hours/1, minutes/1, seconds/1, sleep/1]).
@@ -530,34 +531,27 @@ connect(ip_comm, Host, Port, Opts, Type) ->
 	"~n   Opts: ~p"
 	"~n   Type: ~p", [Host, Port, Opts, Type]),
     
-    case gen_tcp:connect(Host, Port, Opts) of
+    case gen_tcp:connect(Host, Port, Opts, timer:seconds(10)) of
 	{ok, Socket} ->
 	    tsp("connect success"),
 	    {ok, Socket};
 
-	{error, nxdomain} when Type =:= inet6 ->
-	    tsp("connect error nxdomain when"
-		"~n   Opts: ~p", [Opts]),
-	    connect(ip_comm, Host, Port, Opts -- [inet6], inet);
-	{error, eafnosupport} when Type =:= inet6 ->
-	    tsp("connect error eafnosupport when"
-		"~n   Opts: ~p", [Opts]),
-	    connect(ip_comm, Host, Port, Opts -- [inet6], inet);
-	{error, econnreset} when Type =:= inet6 ->
-	    tsp("connect error econnreset when"
-		"~n   Opts: ~p", [Opts]),
-	    connect(ip_comm, Host, Port, Opts -- [inet6], inet);
-	{error, enetunreach} when Type =:= inet6 ->
-	    tsp("connect error eafnosupport when"
-		"~n   Opts: ~p", [Opts]),
-	    connect(ip_comm, Host, Port, Opts -- [inet6], inet);
-	{error, econnrefused} when Type =:= inet6 ->
-	    tsp("connect error econnrefused when"
-		"~n   Opts: ~p", [Opts]),
+	{error, Reason} when ((Type =:= inet6) andalso 
+			      ((Reason =:= timeout) orelse 
+			       (Reason =:= nxdomain) orelse 
+			       (Reason =:= eafnosupport) orelse 
+			       (Reason =:= econnreset) orelse 
+			       (Reason =:= enetunreach) orelse 
+			       (Reason =:= econnrefused) orelse 
+			       (Reason =:= ehostunreach))) ->
+	    tsp("connect(ip_comm) -> Connect error: "
+		"~n   Reason: ~p"
+		"~n   Type:   ~p"
+		"~n   Opts:   ~p", [Reason, Type, Opts]),
 	    connect(ip_comm, Host, Port, Opts -- [inet6], inet);
 
 	Error ->
-	    tsp("connect(ip_conn) -> Fatal connect error: "
+	    tsp("connect(ip_comm) -> Fatal connect error: "
 		"~n   Error: ~p"
 		"~nwhen"
 		"~n   Host:  ~p"
@@ -642,6 +636,9 @@ tsf(Reason) ->
 tss(Time) ->
     test_server:sleep(Time).
 
+timestamp() ->
+    http_util:timestamp().
+
 formated_timestamp() ->
     format_timestamp( os:timestamp() ).
 
diff --git a/lib/inets/test/rules.mk b/lib/inets/test/rules.mk
index 047c03b267..c4a62a87ed 100644
--- a/lib/inets/test/rules.mk
+++ b/lib/inets/test/rules.mk
@@ -17,17 +17,12 @@ DEFAULT_TARGETS =  opt debug instr release release_docs clean docs
 #	Erlang language section
 # ----------------------------------------------------
 EMULATOR = beam
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-# VxWorks object files should be compressed.
-# Other object files should have debug_info.
-ERL_COMPILE_FLAGS += +compressed
-else
+
 ifdef BOOTSTRAP
 ERL_COMPILE_FLAGS += +slim
 else
 ERL_COMPILE_FLAGS += +debug_info
 endif
-endif
 ERLC_WFLAGS = -W
 ERLC = erlc $(ERLC_WFLAGS) $(ERLC_FLAGS)
 ERL.beam =  erl.beam -boot start_clean
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 488947c3a1..0c7cb5e7c2 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 5.9
+INETS_VSN   = 5.9.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
 
diff --git a/lib/inviso/AUTHORS b/lib/inviso/AUTHORS
deleted file mode 100644
index fc5040fe92..0000000000
--- a/lib/inviso/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Original Authors and Contributors:
-
-Lennart Ohman
-
diff --git a/lib/inviso/doc/pdf/.gitignore b/lib/inviso/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/inviso/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/inviso/doc/src/Makefile b/lib/inviso/doc/src/Makefile
deleted file mode 100644
index 1b184ed78b..0000000000
--- a/lib/inviso/doc/src/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-# ``The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved via the world wide web at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-# AB. All Rights Reserved.''
-# 
-#     $Id$
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(INVISO_VSN)
-APPLICATION=inviso
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = \
-	inviso.xml \
-	inviso_as_lib.xml \
-	inviso_lfm.xml \
-	inviso_lfm_tpfreader.xml \
-	inviso_rt.xml \
-	inviso_rt_meta.xml
-
-XML_PART_FILES = part.xml part_notes.xml
-XML_CHAPTER_FILES = inviso_chapter.xml notes.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = \
-	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
-	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES)
-
-GIF_FILES = \
-	inviso_users_guide_pic1.gif
-
-# ----------------------------------------------------
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS 
-# ----------------------------------------------------
-XML_FLAGS += 
-DVIPS_FLAGS += 
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-docs: pdf html man
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-debug opt: 
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-
-release_spec:
-
-
-
-
diff --git a/lib/inviso/doc/src/book.xml b/lib/inviso/doc/src/book.xml
deleted file mode 100644
index c258f33ff7..0000000000
--- a/lib/inviso/doc/src/book.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>2006</year><year>2009</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
-    
-    </legalnotice>
-
-    <title>Inviso</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>Inviso</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-  </preamble>
-  <parts lift="no">
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
-
diff --git a/lib/inviso/doc/src/fascicules.xml b/lib/inviso/doc/src/fascicules.xml
deleted file mode 100644
index 0678195e07..0000000000
--- a/lib/inviso/doc/src/fascicules.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE fascicules SYSTEM "fascicules.dtd">
-
-<fascicules>
-  <fascicule file="part" href="part_frame.html" entry="no">
-    User's Guide
-  </fascicule>
-  <fascicule file="ref_man" href="ref_man_frame.html" entry="yes">
-    Reference Manual
-  </fascicule>
-  <fascicule file="part_notes" href="part_notes_frame.html" entry="no">
-    Release Notes
-  </fascicule>
-  <fascicule file="" href="../../../../doc/print.html" entry="no">
-    Off-Print
-  </fascicule>
-</fascicules>
-
diff --git a/lib/inviso/doc/src/inviso.xml b/lib/inviso/doc/src/inviso.xml
deleted file mode 100644
index c0e2e8f0de..0000000000
--- a/lib/inviso/doc/src/inviso.xml
+++ /dev/null
@@ -1,693 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2006</year><year>2011</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
-    
-    </legalnotice>
-
-    <title>inviso</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>inviso</module>
-  <modulesummary>Main API Module to the Inviso Tracer</modulesummary>
-  <description>
-    <warning>
-      <p>The <c>inviso</c> application is deprecated and will be
-      removed in the R16 release.</p>
-    </warning>
-    <p>With the <c>inviso</c> API runtime components can be started and tracing managed across a network of distributed Erlang nodes, using a control component also started with <c>inviso</c> API functions.</p>
-    <p>Inviso can be used both in a distributed environment and in a non-distributed. API functions not taking a list of nodes as argument works on all started runtime components. If it is the non-distributed case, that is the local runtime component. The API functions taking a list of nodes as argument, or as part of one of the arguments, can not be used in a non-distributed environment. Return values named <c>NodeResult</c> refers to return values from a single Erlang node, and will therefore be the return in the non-distributed environment.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>start() -> {ok,pid()} | {error,Reason}</name>
-      <name>start(Options) -> {ok,pid()} | {error,Reason}</name>
-      <fsummary>Start a control component at the local node</fsummary>
-      <type>
-        <v>Options = [Option]</v>
-      </type>
-      <desc>
-        <p><c>Options</c> may contain both options which will be default options to a runtime component when started, and options to the control component. See <seealso marker="#add_nodes/3">add_nodes/3</seealso> for details on runtime component options. The control component recognizes the following options:</p>
-        <taglist>
-          <tag><c>{subscribe,Pid}</c></tag>
-          <item>
-            <p>Making the process <c>Pid</c> receive Inviso events from the control component.</p>
-            <p>Starts a control component process on the local node. A control component must be started before runtime components can be started manually or otherwise accessed through the <c>inviso</c> API.</p>
-          </item>
-        </taglist>
-      </desc>
-    </func>
-    <func>
-      <name>stop() -> shutdown</name>
-      <fsummary>Stop the control component</fsummary>
-      <desc>
-        <p>Stops the control component. Runtime components are left as is. They will behave according to their dependency values.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_node(RTtag) -> NodeResult | {error,Reason}</name>
-      <name>add_node(RTtag,Options) -> NodeResult | {error,Reason}</name>
-      <fsummary>Starts or adopts a runtime component at the local node</fsummary>
-      <type>
-        <v>RTtag = PreviousRTtag = term()</v>
-        <v>Options = [Option]</v>
-        <v>&nbsp;Option -- see below</v>
-        <v>&nbsp;Option = {dependency,Dep}</v>
-        <v>&nbsp;&nbsp;Dep = int() | infinity</v>
-        <d>The timeout, in milliseconds, before the runtime component will terminate if abandoned by <em>this</em>control component.</d>
-        <v>&nbsp;Option = {overload,Overload} | overload</v>
-        <d>Controls how and how often overload checks shall be performed. Just <c>overload</c>specifies that no loadcheck shall be performed.</d>
-        <v>&nbsp;&nbsp;Overload = Interval | {LoadMF,Interval,InitMFA,RemoveMFA}</v>
-        <v>&nbsp;&nbsp;&nbsp;LoadMF = {Mod,Func} | function()/1</v>
-        <v>&nbsp;&nbsp;&nbsp;Interval = int() | infinity</v>
-        <d>Interval is the time in milliseconds between overload checks.</d>
-        <v>&nbsp;&nbsp;&nbsp;InitMFA = RemoveMFA = {Mod,Func,ArgList} | void</v>
-        <d>When starting up the runtime component or when changing options (see <c>change_options/2</c>) the overload mechanism is initialized with a call to the <c>InitMFA</c>function. It shall return <c>LoadCheckData</c>. Every time a load check is performed, <c>LoadMF</c>is called with <c>LoadCheckData</c>as its only argument. <c>LoadMF</c>shall return <c>ok</c>or <c>{suspend,Reason}</c>. When the runtime component is stopped or made to change options involving changing overload-check, the <c>RemoveMFA</c>function is called. Its return value is discarded.</d>
-        <v>NodeResult = {ok,NAns} | {error,Reason}</v>
-        <v>&nbsp;NAns = new | {adopted,State,Status,PreviousRTtag} | already_added</v>
-        <v>&nbsp;&nbsp;State = new | tracing | idle</v>
-        <v>&nbsp;&nbsp;Status = running | {suspended,SReason}</v>
-      </type>
-      <desc>
-        <p>Starts or tries to connect to an existing runtime component at the local node, regardless if the system is distributed or not. <c>Options</c> will override any default options specified at start-up of the control component.</p>
-        <p>The <c>PreviousRTtag</c> can indicate if the incarnation of the runtime component at the node in question was started by "us" and then can be expected to do tracing according to "our" instructions or not.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_node_if_ref(RTtag) -> NodeResult | {error,{wrong_reference,OtherTag}} | {error,Reason}</name>
-      <name>add_node_if_ref(RTtag,Options) -> NodeResult | {error,{wrong_reference,OtherRef}} | {error,Reason}</name>
-      <fsummary>Start or adopt a runtime component at the local node, provided it has a certain rttag</fsummary>
-      <type>
-        <v>OtherRef = term()</v>
-        <d>rttag of the running incarnation</d>
-      </type>
-      <desc>
-        <p>As <seealso marker="#add_node/1">add_node/1,2</seealso> but will only adopt the runtime component if its rttag is <c>RTtag</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_nodes(Nodes,RTtag) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>add_nodes(Nodes,RTtag,Options) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Start or adopt runtime components at some nodes</fsummary>
-      <type>
-        <v>Nodes = [Node]</v>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-      </type>
-      <desc>
-        <p>As <seealso marker="#add_node/1">add_node/1,2</seealso> but for a distributed environment.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_nodes_if_ref(Nodes,RTtag) -> NodeResult | {error,Reason}</name>
-      <name>add_nodes_if_ref(Nodes,RTtag,Options) -> NodeResult | {error,Reason}</name>
-      <fsummary>Start or adopt runtime components at some nodes, provided they have a certain rttag</fsummary>
-      <type>
-        <v>Nodes = [Node]</v>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-      </type>
-      <desc>
-        <p>As <seealso marker="#add_node_if_ref/1">add_node_if_ref/1,2</seealso> but for a distributed environment.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_nodes() -> {ok,NodeResults} | NodeResult</name>
-      <name>stop_nodes(Nodes) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Stop runtime components</fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Stops runtime component on <c>Nodes</c>. <c>stop_nodes/0</c> will if the control component is running on a distributed node stop all runtime components. And if running on a non distributed node, stop the local and only runtime component.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_all() = {ok,NodeResults} | NodeResult</name>
-      <fsummary>Stop both control and runtime components</fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>A combination of <seealso marker="#stop/0">stop/0</seealso> and <seealso marker="#stop_nodes/0">stop_nodes/0</seealso>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>change_options(Options) -> NodeResult | {ok,NodeResults} | {error,Reason}</name>
-      <name>change_options(Nodes,Options) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Change options for runtime components</fsummary>
-      <type>
-        <v>Nodes = [Node]</v>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Changes the options for one or several runtime components. If for instance overload is redefined, the previous overload will be stopped and the new started. See <seealso marker="#add_node/1">add_node/1</seealso> for details on <c>Options</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>init_tracing(TracerData) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>init_tracing(TracerList) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>init_tracing(Nodes,TracerData) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Initiate tracing</fsummary>
-      <type>
-        <v>TracerData = [{trace,LogTD} [,{ti,TiTD}] }] | LogTD</v>
-        <v>LogTD = {HandlerFun,Data1} | collector | {relayer,CollectingNode} | {ip,IPPortParameters} | {file,FilePortParameters}</v>
-        <v>TiTD = {file,FileName} | {file,FileName,TiSpec} | {relay,Node}</v>
-        <v>&nbsp;TiSpec = {InitMFA,RemoveMF,CleanMF}</v>
-        <v>&nbsp;&nbsp;InitMFA = {Mi,Fi,Argsi}</v>
-        <v>&nbsp;&nbsp;RemoveMF = {Mr,Fr} | void</v>
-        <v>&nbsp;&nbsp;CleanMF = {Mc,Fc}</v>
-        <v>&nbsp;&nbsp;Mi = Fi = Mr = Fr = Mc = Fd = atom()</v>
-        <v>&nbsp;&nbsp;Argsi = [term()]</v>
-        <v>TracerList = [{Node,TracerData}]</v>
-        <v>IPPortParameters = Portno | {Portno,Qsize}</v>
-        <v>&nbsp;Portno = tcp_portno()</v>
-        <v>&nbsp;Qsize = int()</v>
-        <v>FilePortParameters =  {Filename,wrap,Tail,{time,WrapTime},WrapCnt} | {FileName,wrap,Tail,WrapSize,WrapCnt} | {FileName,wrap,Tail,WrapSize} | {FileName,wrap,Tail} | FileName</v>
-        <v>&nbsp;FileName = string()</v>
-        <v>&nbsp;Tail = string() =/= ""</v>
-        <v>&nbsp;WrapTime = WrapCnt = WrapSize = int() >0</v>
-        <v>TracerList = [{Node,TracerData}]</v>
-        <v>Nodes = [Node]</v>
-        <v>HandlerFun = function()/2;</v>
-        <v>&nbsp;HandlerFun(TraceMsg,Data1) -> NewData</v>
-        <v>CollectingNode = pid() | node()</v>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = {ok,LogResults} | {error,NReason}</v>
-        <v>&nbsp;LogResults = [LogResult]</v>
-        <v>&nbsp;&nbsp;LogResult = {trace_log,LogRes} | {ti_log,LogRes}</v>
-        <v>&nbsp;&nbsp;&nbsp;LogRes = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Starts the tracing at the specified nodes, meaning that the runtime components transits from the state <c>new</c> or <c>idle</c> to <c>tracing</c>. For trace messages to be generated, there must of course also be trace pattern and/or trace flags set. Such can not be set before tracing has been initiated with <c>init_tracing/1,2</c>.</p>
-        <p><c>TracerData</c> controls how the runtime component will handle generated trace messages. The <c>trace</c> tag controls how regular trace messages are handled. The <c>ti</c> tag controls if and how trace information will be stored and the meta tracer will be activated. That is if <c>ti</c> is omitted, no meta tracer will be started as part of the runtime component. It is possible to have <c>ti</c> without <c>trace</c>, but most likely not useful.</p>
-        <p>The <c>ip</c> and <c>file</c> trace tracerdata instructions results in using the built in trace ip-port and file-port respectively.  <c>relayer</c> will result in that all regular trace messages are forwarded to a runtime component at the specified node. Using a <c>HandlerFun</c> will result in that every incoming regular trace message is applied to the <c>HandlerFun</c>. <c>collector</c> can be used to use this runtime component to receive relayed trace messages and print them to the shell.
-          </p>
-        <p>The trace information can be configured to either write trace information to a plain trace information file or to relay it to another inviso meta tracer on another node. The inviso meta tracer is capable of matching function calls with their function returns (only if <c>return_trace</c> is activated in the meta trace match specification for the function in question). This is necessary since it may not be possible to decide what to do, if anything shall be done at all, until the return value of the function call is examined.
-          </p>
-        <p>To be able to match calls with returns a state can be saved when detecting a function call in a public loop data structure kept by the inviso meta tracer. The public loop data structure is given as argument to a handler-function called whenever a meta trace message arrives to the inviso meta tracer (both function calls and function returns). The public loop data structure is first initiated by the <c>Mi:Fi</c> function which takes the items in <c>Argsi</c> as arguments. <c>Fi</c> shall return the initial public loop data structure. When meta tracing is stopped, either because tracing is stopped or because tracing is suspended, the <c>Mr:Fr(PublicLoopData)</c> is called to offer a possibility to clean-up. Note that for every function meta-tracing is activated, a public loop data modification function can be specified. That function will prepare the current loop data structure for this particular function.
-          </p>
-        <p>Further there is a risk that function call states becomes abandoned inside the public loop data structure. This will happen if a function call is entered into the public loop data structure, but no function return occurs. To prevent the public loop data structure from growing infinitely the clean function <c>Fc</c> will periodically be called with the public loop data structure as argument. Elements entered into the public loop data structure as a result of a function call must contain a timestamp for the <c>Fc</c> to be able to conclude if it is abandoned or not. <c>Fc</c> shall return a new public loop data structure.
-          </p>
-        <p>When initiating tracing involving trace information without a <c>TiSpec</c>, a default public loop data structure will be initiated to handle locally registered process aliases. The default public loop data structure is a two-tuple where the first element is used by the meta tracing on the BIF <c>register/2</c>. The second element is left for user usage.</p>
-        <p>The default public loop data structure may be extended with more element positions. The first position must be left to the implementation of registered-name translations. If the public loop data structure is changed no longer meeting this requirement, the <seealso marker="#tpm_localnames/0">tpm_localnames/0,1</seealso> and <seealso marker="#tpm_globalnames/0">tpm_globalnames/0,1</seealso> can no longer be used.</p>
-        <p>A wrap files specification is used to limit the disk space consumed by the trace. The trace is written to a limited number of files each with a limited size. The actual filenames are <c>Filename ++ SeqCnt ++ Tail</c>, where <c>SeqCnt</c> counts as a decimal string from 0 to <c>WrapCnt</c> and then around again from 0. When a trace message written to the current file makes it longer than <c>WrapSize</c>, that file is closed, if the number of files in this wrap trace is as many as <c>WrapCnt</c> the oldest file is deleted then a new file is opened to become the current. Thus, when a wrap trace has been stopped, there are at most <c>WrapCnt</c> trace files saved with a size of at least <c>WrapSize</c> (but not much bigger), except for the last file that might even be empty. The default values are <c>WrapSize == 128*1024</c> and <c>WrapCnt == 8</c>.</p>
-        <p>The <c>SeqCnt</c> values in the filenames are all in the range 0 through <c>WrapCnt</c> with a gap in the circular sequence. The gap is needed to find the end of the trace.</p>
-        <p>If the <c>WrapSize</c> is specified as <c>{time,WrapTime}</c>, the current file is closed when it has been open more than <c>WrapTime</c> milliseconds, regardless of it being empty or not.</p>
-        <p>The ip trace driver has a queue of <c>QSize</c> messages waiting to be delivered. If the driver cannot deliver messages as fast as they are produced by the runtime system, they are dropped. The number of dropped messages are indicated in the trace log as separate trace message.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_tracing(Nodes) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>stop_tracing() -> {ok,NodeResults} | NodeResult</name>
-      <fsummary>Stop tracing</fsummary>
-      <type>
-        <v>Nodes = [Node]</v>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = {ok,State} | {error,Reason}</v>
-        <v>&nbsp;State = new | idle</v>
-      </type>
-      <desc>
-        <p>Stops tracing on all or specified <c>Nodes</c>. Flushes the trace buffer if a trace-port is used, closes the trace-port and removes all trace flags and meta-patterns. The nodes are called in parallel.</p>
-        <p>Stopping tracing means going to state <c><![CDATA[idle<c>. If the runtime component was already in state <c>new]]></c>, it will of course remain in state <c>new</c> (then there was no tracing to stop).</p>
-      </desc>
-    </func>
-    <func>
-      <name>clear() -> {ok,NodeResults} | NodeResult</name>
-      <name>clear(Nodes,Options) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>clear(Options) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <fsummary>Stop tracing and remove meta trace patterns</fsummary>
-      <type>
-        <v>Nodes = [Node]</v>
-        <v>Options = [Option]</v>
-        <v>&nbsp;Option = keep_trace_patterns | keep_log_files</v>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>&nbsp;NodeResult = {ok,{new,Status}} | {error,Reason}</v>
-        <v>&nbsp;&nbsp;Status = running | {suspended,SReason}</v>
-      </type>
-      <desc>
-        <p>Stops all tracing including removing meta-trace patterns. Removes all trace patterns. If the node is <c>tracing</c> or <c>idle</c>, trace-logs belonging to the current tracerdata are removed. Hence the node is returned to state <c>new</c>. Note that the node can still be suspended.</p>
-        <p>Various options can make the node keep set trace patterns and log-files. The node still enters the <c>new</c> state.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tp(Nodes,Mod,Func,Arity,MatchSpec,Opts) -> </name>
-      <name>tp(Nodes,Mod,Func,Arity,MatchSpec) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>tp(Mod,Func,Arity,MatchSpec,Opts) -> </name>
-      <name>tp(Mod,Func,Arity,MatchSpec) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>tp(Nodes,PatternList) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>tp(PatternList) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <fsummary>Set global trace patterns</fsummary>
-      <type>
-        <v>Nodes = [Node]</v>
-        <v>Mod = Func = atom() | '_'</v>
-        <v>Arity = int() | '_'</v>
-        <v>MatchSpec = true | false | [] | matchspec()</v>
-        <v>PatternList = [Pattern],</v>
-        <v>&nbsp;Pattern = {Mod,Func,Arity,MatchSpec,Opts}</v>
-        <v>Opts = [Opt]</v>
-        <v>&nbsp;Opt = only_loaded</v>
-        <v>NodeResults = [NodeResult]</v>
-        <v>&nbsp;NodeResult = {ok,[Ans]} | {error,Reason}</v>
-        <v>&nbsp;&nbsp;Ans = int() | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Set trace pattern (global) on specified or all nodes. The integer replied if the call was successfully describes the number of matched functions. The functions without a <c>Nodes</c> argument means all nodes, in a non-distributed environment it means the local node. Using wildcards follows the rules for wildcards of <c>erlang:trace_pattern/3</c>. It is for instance illegal to specify <c>M == '_'</c> while <c>F</c> is not <c>'_'</c>.</p>
-        <p>When calling several nodes, the nodes are called in parallel.</p>
-        <p>The option <c>only_loaded</c> will prevent modules not loaded (yet) into the runtime system to become loaded just as a result of that a trace pattern is requested to be set on it. Otherwise modules are automatically loaded if not already loaded (since the module must be present for a trace pattern to be set on it). The latter does not apply if the wildcard <c>'_'</c> is used as module specification.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpl(Nodes,Mod,Func,Arity,MatchSpec) -> </name>
-      <name>tpl(Nodes,Mod,Func,Arity,MatchSpec,Opts) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>tpl(Mod,Func,Arity,MatchSpec) -> </name>
-      <name>tpl(Mod,Func,Arity,MatchSpec,Opts) -> {ok,NodeResults} | NodeResult| {error,Reason}</name>
-      <name>tpl(Nodes,PatternList) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>tpl(PatternList) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <fsummary>Set local trace patterns</fsummary>
-      <desc>
-        <p>See <seealso marker="#tp/6">tp/N</seealso> function above for details on arguments and return values.</p>
-        <p>Set local trace pattern on specified functions. When calling several nodes, the nodes are called in parallel.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctp(Nodes,Mod,Func,Arity) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>ctp(Mod,Func,Arity) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <fsummary>Clear global trace patterns</fsummary>
-      <desc>
-        <p>See <seealso marker="#tp/6">tp/N</seealso> for argument descriptions.</p>
-        <p>Clear global trace patterns. When calling several nodes, the nodes are called in parallel.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctpl(Nodes,Mod,Func,Arity) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>ctpl(Mod,Funct,Arity) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <fsummary>Clear local trace patterns</fsummary>
-      <desc>
-        <p>See <seealso marker="#tp/6">tp/N</seealso> for argument description.</p>
-        <p>Clear local trace patterns. When calling several nodes, the nodes are called in parallel.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tf(Nodes,PidSpec,FlagList) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>tf(PidSpec,FlagList) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>tf(Nodes,TraceConfList) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>tf(NodeTraceConfList) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>tf(TraceConfList) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <fsummary>Set process trace flags</fsummary>
-      <type>
-        <v>Nodes = [Node]</v>
-        <v>NodeTraceConfList = [{Node,TraceConfList}]</v>
-        <v>TraceConfList = [{PidSpec,FlagList}]</v>
-        <v>FlagList = [Flag]</v>
-        <v>PidSpec = all | new| existing | pid() | locally_registered_name()</v>
-        <v>Flag -- see erlang:trace/3</v>
-        <v>NodeResult = {ok,[Ans]} | {error,Reason}</v>
-        <v>Ans = int() | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Set process trace flags on processes on all or specified nodes. The integer returned if the call was successful describes the matched number of processes. The functions without a <c>Nodes</c> argument means all nodes, in a non-distributed environment it means the local node.
-          </p>
-        <p>There are many combinations which does not make much sense. For instance specifying a certain process identifier at all nodes. Or an empty <c>TraceConfList</c> for all nodes.</p>
-        <p>When calling several nodes, the nodes are called in parallel.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctf(Nodes,PidSpec,FlagList) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>ctf(PidSpec,FlagList) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>ctf(Nodes,TraceConfList) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>ctf(TraceConfList) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <fsummary>Clear process trace flags</fsummary>
-      <desc>
-        <p>See <seealso marker="#tf/3">tf/N</seealso> for arguments and return value description.</p>
-        <p>Clear process trace flags on all or specified nodes. When calling several nodes, the nodes are called in parallel.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctf_all(Nodes) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>ctf_all() -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <fsummary>Clear all process trace flags</fsummary>
-      <type>
-        <v>Nodes = [Node]</v>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Clears all trace flags on all or specified nodes. Just for convenience.</p>
-      </desc>
-    </func>
-    <func>
-      <name>init_tpm(Mod,Func,Arity,CallFunc) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>init_tpm(Nodes,Mod,Func,Arity,CallFunc) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>init_tpm(Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>init_tpm(Nodes,Mod,Func,Arity, InitFunc,CallFunc,ReturnFunc,RemoveFunc) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Initialize meta tracing</fsummary>
-      <type>
-        <v>Mod = Func = atom()</v>
-        <v>Arity = int()</v>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = ok | {error,Reason}</v>
-        <v>InitFunc,RemoveFunc = {Module,Function} | function()/4 | void</v>
-        <v>CallFunc = ReturnFunc = {Module,Function} | function()/3 | void</v>
-      </type>
-      <desc>
-        <p>Initializes <c>Mod:Func/Arity</c> for meta tracing without setting any meta trace patterns. This is necessary if the named match specs will be used (see <seealso marker="#tpm_ms/5">tpm_ms/5,6</seealso>). Otherwise initialization of public loop data can be done at the same time as setting meta trace patterns using <seealso marker="#tpm/8">tpm/8,9</seealso>.</p>
-        <p>Note that we can not use wildcards here (even if it is perfectly legal in Erlang). It also sets the <c>CallFunc</c> and <c>ReturnFunc</c> for the meta traced function. That is the functions which will be called when a function call and a return_trace meta trace message respectively arrives to the inviso meta tracer for <c>Mod:Func/Arity</c>.</p>
-        <p>This function is also available without <c>InitFunc</c> and <c>RemoveFunc</c>. That means that no initialization of the public loop data structure will be done and that <c>CallFunc</c> and <c>ReturnFunc</c> must either use already existing parts of public loop data structure or not use it at all.</p>
-        <p>The <c>InitFunc</c> initializes the already existing public loop data structure for use with <c>Mod:Func/Arity. InitFunc(Mod,Func,Arity,PublLD) -> {ok,NewPublLD,Output}</c> where <c>OutPut</c> can be a binary which will then be written to the trace information file. If it is not a binary, no output will be done. <c>RemoveFunc</c> will be called when the meta tracing is cleared with <seealso marker="#ctpm/3">ctpm/3,4</seealso>. <c>RemoveFunc(Mod,Func,Arity,PublLD) -> {ok,NewPublLD}</c>.</p>
-        <p>See <seealso marker="#tpm/4">tpm/N</seealso> for details on <c>CallFunc</c> and <c>ReturnFunc</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpm(Mod,Func,Arity,MS) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>tpm(Nodes,Mod,Func,Arity,MS) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>tpm(Mod,Func,Arity,MS,CallFunc) -> {ok,NodeResults} | NodeResults | {error,Reason}</name>
-      <name>tpm(Nodes,Mod,Func,Arity,MS,CallFunc) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>tpm(Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) -> {ok,NodeResults} | NodeResults | {error,Reason}</name>
-      <name>tpm(Nodes,Mod,Func,Arity,MS, InitFunc,CallFunc,ReturnFunc,RemoveFunc) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Activate meta tracing</fsummary>
-      <type>
-        <v>Mod = Func = atom()</v>
-        <v>Arity = int()</v>
-        <v>MS = [match_spec()]</v>
-        <v>Nodes = [Node]</v>
-        <v>InitFunc = RemoveFunc = {Module,Function} | function()/4 | void</v>
-        <v>CallFunc = ReturnFunc = {Module,Function} | function()/3 | void</v>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = {ok,1} | {ok,0} | {error,Reason}1</v>
-      </type>
-      <desc>
-        <p>Activates meta-tracing in the inviso_rt_meta tracer. Except when using <c>tpm/6</c>, <c>tpm/8</c> and <c>tpm/9</c> the <c>Mod:Func/Arity</c> must first have been initiated using <seealso marker="#init_tpm/4">init_tpm/N</seealso>. When calling several nodes, the nodes are called in parallel.</p>
-        <p><c>CallFunc</c> will be called every time a meta trace message arrives to the inviso meta tracer because of a call to <c>Func</c>. <c>CallFunc(CallingPid,ActualArgList,PublLD) -> {ok,NewPrivLD,Output}</c> where <c>Output</c> can be a binary or <c>void</c>. If it is a binary it will be written to the trace information file.</p>
-        <p><c>ReturnFunc</c> will be called every time a meta return_trace message arrives to the inviso meta tracer because of a return_trace of a call to <c>Func</c>. <c>ReturnFunc(CallingPid,ReturnValue,PublLD) -> {ok,NewPrivLD,Output}</c>. Further the <c>ReturnFunc</c> must handle the fact that a return_trace message arrives for a call which was never noticed. This because the message queue of the meta tracer may have been emptied.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpm_tracer(Mod,Func,Arity,MS) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>tpm_tracer(Nodes,Mod,Func,Arity,MS) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>tpm_tracer(Mod,Func,Arity,MS,CallFunc) -> {ok,NodeResults} | NodeResults | {error,Reason}</name>
-      <name>tpm_tracer(Nodes,Mod,Func,Arity,MS,CallFunc) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>tpm_tracer(Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) -> {ok,NodeResults} | NodeResults | {error,Reason}</name>
-      <name>tpm_tracer(Nodes,Mod,Func,Arity,MS, InitFunc,CallFunc,ReturnFunc,RemoveFunc) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Activate meta tracing and at the same time append a {tracer,Tracer} process trace flag to the enable list in a match specification <c>trace</c>action term</fsummary>
-      <desc>
-        <p>See tpm/X for details on arguments and return values.</p>
-        <p>Same as tpm/X but all match specs in <c>MS</c> containing a <c>trace</c> action term will have a <c>{tracer,Tracer}</c> appended to its enable-list. <c>Tracer</c> will be the current output for regular trace messages as specified when tracing was initiated. This function is useful when setting a meta trace pattern on a function with the intent that its execution shall turn tracing on for the process executing the match-spec in the meta trace pattern. The reason the <c>tracer</c> process trace flag can not be explicitly written in the action term by the user is that it may be difficult to learn its exact value for a remote node. Further more inviso functions are made to work on several nodes at the same time, requiring different match specs to be set for different nodes.</p>
-        <p>Simple example: We want any process executing the function <c>mymod:init(1234)</c> (with the argument, exactly the integer 1234) to begin function-call tracing. In the example, if the process is found to be one that shall start call tracing, we also first disable <c>all</c> process trace flags to ensure that we have full control over what the process traces. <c>void</c> in the example specifies that the meta-tracer (inviso_rt_meta) will not call any function when meta trace messages for <c>mymod:init/1</c> arrives. There is no need for a <c>CallFunc</c> since the side-effect (start call-tracing) is achieved immediately with the match-spec.</p>
-        <code type="none">
-    inviso:tpm_tracer(mymod,init,1,[{[1234],[],[{trace,[all],[call]}]}],void).        </code>
-        <p>This will internally, by the meta tracer on each Erlang node, be translated to:</p>
-        <code type="none">
-    erlang:trace_pattern({mymod,init,1},[{[1234],[],[{trace,[all],[call,{{tracer,T}}]}]}],[{meta,P}]).
-        </code>
-        <p>Where <c>T</c> is the tracer for regular trace messages (most often a trace-port, but can be the runtime component inviso_rt process), and <c>P</c> is the meta tracer (the inviso_rt_meta process).</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpm_ms(Mod,Func,Arity,MSname,MS) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>tpm_ms(Nodes,Mod,Func,Arity,MSname,MS) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Add match specifications</fsummary>
-      <type>
-        <v>Nodes = [Node]&lt;v> &lt;v>Mod = Func = atom()&lt;v> &lt;v>Arity = int()&lt;v> &lt;v>MSname = term()&lt;v> &lt;v>MS = [match_spec()]&lt;v> &lt;v>NodeResults = [{Node,NodeResult}]&lt;v> &lt;v>NodeResult = {ok,1} | {ok,0} | {error,Reason}&lt;v></v>
-      </type>
-      <desc>
-        <p>This function adds a list of match-specs to the already existing ones. It uses an internal database to keep track of existing match-specs. This set of match specs can hereafter be referred to with the name <c>MSname</c>. If the match-spec does not result in any meta traced functions (for whatever reason), the <c>MS</c> is not saved in the database. The previously known match-specs are not removed. If <c>MSname</c> is already in use as a name referring to a set of match-specs for this particular meta-traced function, the previous set of match-specs are replaced with <c>MS</c>.</p>
-        <p><c>Mod:Func/Arity</c> must previously have been initiated in order for this function to add a match-spec.</p>
-        <p>When calling several nodes, the nodes are called in parallel. <c>{ok,1}</c> indicates success.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpm_ms_tracer(Mod,Func,Arity,MSname,MS) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>tpm_ms_tracer(Nodes,Mod,Func,Arity,MSname,MS) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Add match specifications and at the same time append a {tracer,Tracer} process trace flag to the enable list in a match specification <c>trace</c>action term</fsummary>
-      <desc>
-        <p>See tpm_ms/X for details on arguments and return values, and tpm_tracer/X for explanations about the appending of <c>{tracer,Tracer}</c> process trace flag.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctpm_ms(Mod,Func,Arity,MSname) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>ctpm_ms(Nodes,Mod,Func,Arity,MSname) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Remove a match specification</fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Removes a named match-spec from the meta traced function. Note that it never is a fault to remove a match spec. Not even from a function which is non existent.</p>
-        <p>When calling several nodes, the nodes are called in parallel.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctpm(Mod,Func,Arity) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>ctpm(Nodes,Mod,Func,Arity) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Remove a meta trace pattern</fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Removes the meta trace pattern for the function, means stops generating output for this function. The public loop data structure may be cleared by the previously entered <c>RemoveFunc</c>.</p>
-        <p>When calling several nodes, the nodes are called in parallel.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpm_localnames() -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>tpm_localnames(Nodes) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Set meta trace pattern on <c>register/2</c></fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = {R1,R2}</v>
-        <v>R1 = R2 = {ok,0} | {ok,1} | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Quick version for setting meta-trace patterns on <c>erlang:register/2</c>. It uses a default <c>CallFunc</c> and <c>ReturnFunc</c> in the meta-tracer server. The main purpose of this function is to create ti-log entries for associations between pids and registered name aliases. The implementation uses return_trace to see if the registration was successful or not, before actually making the ti-log alias entry. Further the implementation also meta traces the BIF <c>unregister/1</c>.</p>
-        <p>If both <c>N1</c> and <c>N2</c> is 1, function call was successful. <c>N1</c> and <c>N2</c> represent setting meta trace pattern on <c>register/2</c> and <c>unregister/1</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctpm_localnames() -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>ctpm_localnames(Nodes) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Clear meta trace pattern on <c>register/2</c></fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = {R1,R2}</v>
-        <v>R1 = R2 = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Function for removing previously set patters by <seealso marker="#tpm_localnames/0">tpm_localnames/0</seealso>. The two results <c>R1</c> and <c>R2</c> represents that meta pattern is removed from both <c>register/2</c> and <c>unregister/1</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpm_globalnames() -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>tpm_globalnames(Nodes) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Set meta trace pattern on <c>global:register_name/2</c></fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = {R1,R2}</v>
-        <v>R1 = R2 = {ok,0} | {ok,1} | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Quick version for setting meta-trace patterns capable of learning the association of a pid with a globally registered name (registered using <c>global:register_name</c>). The implementation meta-traces on <c>global:handle_call({register,'_','_','_'},'_','_')</c> and <c>global:delete_global_name/2</c>. The <c>N1</c> and <c>N2</c> represents the success of the two sub-tmp calls.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctpm_globalnames() -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>ctpm_globalnames(Nodes) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Clear meta trace pattern on <c>global:register_name/2</c></fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = {R1,R2} | {error,Reason}</v>
-        <v>R1 = R2 = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Function for removing previously set meta patters by <seealso marker="#tpm_globalnames/0">tpm_globalnames/0,1</seealso>. The two results <c>R1</c> and <c>R2</c> represents that meta pattern are removed from both <c>global:handle_call/3</c> and <c>global:delete_global_name/1</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctp_all() -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>ctp_all(Nodes) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Clear all (global and local) trace patterns</fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Clears all, both global and local trace patterns. Does not clear meta trace patterns. Equivalent to a call to <seealso marker="#ctp/4">ctp/3,4</seealso> and to <seealso marker="#ctpl/4">ctpl/3,4</seealso> with wildcards <c>'_'</c> for all modules, functions and arities.</p>
-      </desc>
-    </func>
-    <func>
-      <name>suspend(SReason) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>suspend(Nodes,SReason) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Suspend runtime components</fsummary>
-      <type>
-        <v>SReason = term()</v>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Suspends the runtime components. <c>SReason</c> will become the suspend-reason replied in for instance a <seealso marker="#get_status/0">get_status/0,1</seealso> call. A runtime component that becomes suspended removes all trace flags and all meta trace patterns. In that way trace output is no longer generated. The task of reactivating a suspended runtime component is outside the scoop of inviso. It can for instance be implemented by a higher layer trace-tool "remembering" all trace flags and meta patterns set.</p>
-      </desc>
-    </func>
-    <func>
-      <name>cancel_suspension() -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>cancel_suspend(Nodes) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Reactivate suspended runtime components</fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Makes the runtime components <c>running</c> again (as opposite to <c>suspended).</c> Since reactivating previous trace flags and meta trace patterns is outside the scoop of inviso, cancelling suspension is simply making it possible to set trace flags and meta trace patterns again.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_status() -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>get_status(Nodes) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Get status of runtime components</fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = {ok,{State,Status}} | {error,Reason}</v>
-        <v>State = new | idle | tracing</v>
-        <v>Status = running | {suspended,SReason}</v>
-        <v>SReason = term()</v>
-      </type>
-      <desc>
-        <p>Finds out the state and status of a runtime component. A runtime component is in state <c>new</c> before it has been initiated to do any tracing the first time. There are clear-functions which can make a runtime component become <c>new</c> again without having to restart. A runtime component becomes <c>idle</c> after tracing is stopped.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_tracerdata() -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>get_tracerdata(Nodes) -> {ok,NodeResults} | {error,Reason}</name>
-      <fsummary>Get tracerdata of runtime components</fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = {ok,NResult} | {error,Reason}</v>
-        <v>NResult = TracerData | no_tracerdata</v>
-      </type>
-      <desc>
-        <p>Returns the current tracerdata of a runtime component. A runtime component in state <c>new</c> can not have tracerdata. An <c>idle</c> runtime component does have tracerdata, the last active tracerdata. <c>TracerData</c> will be a term as specified to <c>init_tracing</c> when tracing was initiated for the runtime component.</p>
-      </desc>
-    </func>
-    <func>
-      <name>list_logs() -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>list_logs(Nodes) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>list_logs(NodeTracerData) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>list_logs(TracerData) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <fsummary>Get log file names associated with tracerdata</fsummary>
-      <type>
-        <v>TracerData -- see init_tracing/1,2</v>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = {ok,FileList} | {ok,no_log} | {error,Reason}</v>
-        <v>&nbsp;FileList = [FileType]</v>
-        <v>&nbsp;&nbsp;FileType = {trace_log,Dir,Files} | {ti_log,Dir,Files}</v>
-        <v>&nbsp;&nbsp;Files = [FileNameWithOutPath]</v>
-      </type>
-      <desc>
-        <p>Returns the actually existing log files associated with <c>TracerData</c>. If a tracerdata is not specified, current tracerdata is used for that particular runtime component. <c>Files</c> will be a list of one or more files should it be a wrap-set. Otherwise the it is a list of only one filename.</p>
-        <p>This function is useful to learn the name and path of all files belonging to a trace. This information can later be used to move those files for merging. Note that since it is possible to ask on other tracerdata than the current, it is possible to learn filenames of previously done traces, under the circumstances that they have not been removed.</p>
-      </desc>
-    </func>
-    <func>
-      <name>fetch_log(LogSpecList,DestDir,Prefix) -> {ok,NodeResults} | {error,not_distributed} | {error,Reason} </name>
-      <name>fetch_log(DestDir,Prefix) -> {ok,NodeResults} | {error,not_distributed} | {error,Reason}</name>
-      <fsummary>Fetch log files to control component node</fsummary>
-      <type>
-        <v>DestDir = string()</v>
-        <v>Prefix = string()</v>
-        <v>LogSpecList = [LogSpec]</v>
-        <v>&nbsp;LogSpec = {Node,FileSpecList} | Node | {Node,TracerData}</v>
-        <v>TracerData = see init_tracing/1,/2</v>
-        <v>FileSpecList = [{trace_log,Dir,FileList},{ti_log,Dir,FileList}] | [{trace_log,Dir,FileList}]</v>
-        <v>&nbsp;FileList = [RemoteFileName]</v>
-        <v>NodeResult = {Conclusion,ResultFileSpec} | no_log | {error,NReason}</v>
-        <v>&nbsp;NReason = own_node | Reason</v>
-        <v>&nbsp;Conclusion = complete | incomplete</v>
-        <v>&nbsp;ResultFileSpec = [{trace_log,FileResults},{ti_log,FileResults}]</v>
-        <v>&nbsp;&nbsp;FileResults = [FileResult]</v>
-        <v>&nbsp;&nbsp;&nbsp;  FileResult = {ok,FileName} | {error,FReason}</v>
-        <v>&nbsp;&nbsp;&nbsp;&nbsp;FReason = {file_open,{posix(),FileName}} | {file_open,{posix(),RemoteFileName}} | {file_open,{posix(),[DestDir,Prefix,RemoteFileName]}} | {file_write,{posix(),FileName}} | {truncated,FileName} | {truncated,{Reason,FileName}}</v>
-        <v>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;posix() = atom()</v>
-      </type>
-      <desc>
-        <p>Copies log files over distributed erlang to the control component node. This function can only be used in a distributed system.</p>
-        <p>The resulting transferred files will have the prefix <c>Prefix</c> and will be located in <c>DestDir</c>. The source files can either be pointed out using a <c>FileListSpec</c> or tracerdata. If no files are explicitly specified, current tracerdata for that node will be used. Note that if source files have the same name (on several nodes) they will overwrite each other at <c>DestDir</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>delete_log(Nodes,TracerData) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>delete_log(NodeSpecList) -> {ok,NodeResults} | {error,Reason}</name>
-      <name>delete_log(Spec) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>delete_log(TracerData) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <name>delete_log() -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <fsummary>Delete log files associated with tracerdata</fsummary>
-      <type>
-        <v>Nodes = [Node]</v>
-        <v>NodeSpecList = [{Node,Spec}]</v>
-        <v>&nbsp;Spec = [AbsPathFileName] | LogSpecs</v>
-        <v>&nbsp;&nbsp;LogSpecs = [LogSpec]</v>
-        <v>&nbsp;&nbsp;&nbsp;LogSpec = {trace_log,Dir,[FileNameWithoutPath]} | {ti_log,Dir,[FileNameWithoutPath]}</v>
-        <v>TracerData -- see init_tracing/1,/2</v>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = {ok,no_log} | {ok,LogInfos} | {ok,FileInfos}</v>
-        <v>&nbsp;LogInfos = [LogInfo]</v>
-        <v>&nbsp;&nbsp;LogInfo = {trace_log,FileInfos} | {ti_log,FileInfos}</v>
-        <v>&nbsp;FileInfos = [FileInfo]</v>
-        <v>&nbsp;&nbsp;FileInfo = {ok,FileName} | {error,Reason} </v>
-      </type>
-      <desc>
-        <p>Deletes listed files or files corresponding to tracerdata. If no tracerdata or list of files are specified in the call, current tracerdata at the runtime components will be used to identify files to delete. All filenames shall be strings.</p>
-        <p><c>FileName</c> can either be an absolute path or just a filename depending on if <c>AbsPathFileName</c> or a <c>LogSpec</c> was used to identify the file.</p>
-      </desc>
-    </func>
-    <func>
-      <name>subscribe() -> ok | {error,Reason}</name>
-      <name>subscribe(Pid) -> ok | {error,Reason}</name>
-      <fsummary>Subscribe to Inviso events</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-      </type>
-      <desc>
-        <p>Adds <c>Pid</c> or <c>self()</c> if using <c>subscribe/0</c> to the inviso-event sending list. Note that it is possible to add a pid several times and that the <c>Pid</c> then will receive multiple copies of inviso-event messages.</p>
-        <p>All events will be sent to all subscribers in the event sending list.</p>
-        <code type="none">
-Event = {inviso_event,ControllerPid,erlang:localtime(),Msg}
-  Msg = {connected, Node, {RTtag, {State,Status}}}
-      | {disconnected, Node, NA}
-      | {state_change,Node,{State,Status}}
-      | {port_down,Node,Reason}
-    Node = node() | local_runtime
-        </code>
-        <p>Subscribing to inviso-event may be necessary for a higher layer trace-tool using inviso to follow the runtime components. <c>local_runtime</c> will be used for a runtime component running in a non-distributed environment.</p>
-      </desc>
-    </func>
-    <func>
-      <name>unsubscribe() -> ok</name>
-      <name>unsubscribe(Pid) -> ok</name>
-      <fsummary>Unsubscribe to Inviso events</fsummary>
-      <desc>
-        <p>Removes <c>Pid</c> (once) from the subscription list.</p>
-      </desc>
-    </func>
-  </funcs>
-</erlref>
-
diff --git a/lib/inviso/doc/src/inviso_as_lib.xml b/lib/inviso/doc/src/inviso_as_lib.xml
deleted file mode 100644
index 1f4961166c..0000000000
--- a/lib/inviso/doc/src/inviso_as_lib.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2006</year>
-      <year>2011</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  The contents of this file are subject to the Erlang Public License,
-  Version 1.1, (the "License"); you may not use this file except in
-  compliance with the License. You should have received a copy of the
-  Erlang Public License along with this software. If not, it can be
-  retrieved online at http://www.erlang.org/.
-
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and limitations
-  under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>inviso_as_lib</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>inviso_as_lib</module>
-  <modulesummary>The Inviso Autostart Utility Library</modulesummary>
-  <description>
-    <p>The purpose of the Inviso autostart utility library is to facilitate the creation and modification of autostart configuration files used by the standard autostart.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>setup_autostart(Node, R, Opts, TracerData, CmdFiles, Bindings, Transl, RTtag) -> ok | {error, Reason}</name>
-      <fsummary>Create an autostart configuration file</fsummary>
-      <type>
-        <v>Node = atom()</v>
-        <v>R = int()</v>
-        <v>Opts -- see inviso:add_nodes/2,3</v>
-        <v>TracerData -- see inviso:init_tracing/1,2</v>
-        <v>CmdFiles = [CmdFile]</v>
-        <v>&nbsp;CmdFile = string()</v>
-        <v>Bindings = [{Var,Val}]</v>
-        <v>&nbsp;Var = atom()</v>
-        <v>&nbsp;Val = term()</v>
-        <v>Transl = [{{M1,F1,Arity}, {M2,F2,{Mt,Ft}}}]</v>
-        <v>&nbsp;M1 = F1 = M2 = F2 = Mt = Ft = atom()</v>
-        <v>&nbsp;Arity = int()</v>
-        <v>RTtag = term()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Creates an autostart configuration file on <c>Node</c>. The name of the file is automatically deducted from consulting the Runtime_Tools configuration parameters at <c>Node</c>.</p>
-        <p><c>R</c> is the number of allowed autostarts remaining.</p>
-        <p><c>Opts</c> is the options which shall be given to the runtime component. See <seealso marker="inviso#add_nodes/2">inviso:add_nodes/2,3</seealso>.</p>
-        <p><c>TracerData</c> is used when initiating tracing on this node. See <seealso marker="inviso#init_tracing/1">inviso:init_tracing/1,2</seealso>.</p>
-        <p><c>CmdFiles</c> points out files containing instructions understood by the <c>inviso_autostart_server</c> implementation of an autostart initiator.</p>
-        <p><c>Bindings</c> is a list of <c>{Var, Val}</c> tuples, where <c>Var</c> is the name of a variable and <c>Val</c> the actual value of the variable.</p>
-        <p><c>Transl</c> means that <c>M1:F1/Arity</c> shall be translated into <c>M2:F2</c>.</p>
-        <p><c>RTtag</c> is the incarnation tag of the runtime component. See See <seealso marker="inviso#add_nodes/2">inviso:add_nodes/2,3</seealso>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_repeat(Node, R) -> ok | {error, Reason}</name>
-      <fsummary>Set the repeat parameter in the autostart file</fsummary>
-      <type>
-        <v>Node = atom()</v>
-        <v>R = int()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Sets the repeat parameter in the autostart file at <c>Node</c> without changing any of its other contents. The autostart configuration file must exist.</p>
-        <p><c>R</c> is the number of allowed autostarts remaining.</p>
-      </desc>
-    </func>
-    <func>
-      <name>inhibit_autostart(Node) -> ok | {error, Reason}</name>
-      <fsummary>Set the repeat parameter in the autostart file to 0</fsummary>
-      <type>
-        <v>Node = atom()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Sets the repeat parameter in the autostart file at <c>Node</c> to 0. Equivalent to <c>set_repeat(Node, 0)</c>.</p>
-      </desc>
-    </func>
-  </funcs>
-</erlref>
-
diff --git a/lib/inviso/doc/src/inviso_chapter.xml b/lib/inviso/doc/src/inviso_chapter.xml
deleted file mode 100644
index b69fb97586..0000000000
--- a/lib/inviso/doc/src/inviso_chapter.xml
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2006</year><year>2011</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
-    
-    </legalnotice>
-
-    <title>Inviso</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>inviso_chapter.xml</file>
-  </header>
-
-  <section>
-    <p><em>inviso</em>: (Latin) to go to see, visit, inspect, look at.</p>
-    <warning>
-      <p>The <c>inviso</c> application is deprecated and will be
-      removed in the R16 release.</p>
-    </warning>
-    <title>Introduction</title>
-    <p>The Inviso trace system consists of one or several runtime components supposed to run on each Erlang node doing tracing and one control component which can run on any node with available processor power. Inviso may also be part of a higher layer trace tool. See the inviso-tool as an example. The implementation is spread out over the Runtime_tools and the Inviso Erlang/OTP applications. Erlang modules necessary to run the runtime component are located in Runtime_tools and therefore assumed to be available on any node. Even though Inviso is introduced with Erlang/OTP R11B the runtime component implementation is done with backward compatibility in mind. Meaning that it is possible to compile and run it on older Erlang/OTP releases.</p>
-    <image file="inviso_users_guide_pic1.gif">
-      <icaption>Inviso Trace System Architecture Overview.</icaption>
-    </image>
-    <p>This document describes the control and runtime components of the Inviso trace system.</p>
-
-    <section>
-      <title>Underlying Mechanisms</title>
-      <p>Inviso is built on Erlang trace BIFs and standard linked in trace-port drivers for efficient trace message logging. This means that Inviso can not co-exist in runtime with any other trace tool using the trace BIFs.</p>
-    </section>
-
-    <section>
-      <title>Trace Recepie</title>
-      <p>This is a short step-by-step description of how tracing using Inviso can be done.</p>
-      <list type="ordered">
-        <item>Start the Inviso control component at any node. Preferably a node that is not participating in the "work" done by your "system". The control component runs independently and normally not linked to any other process. (Prompt 2 in the example below.)</item>
-        <item>Add all Erlang nodes to the inviso control component where you want to trace. This is starting runtime components on all involved Erlang nodes. Can include the node where the control component runs as well. Note that the Runtime_Tools application must be running on the nodes where runtime components shall be started. (Prompt 1 and 3 in the example below.)</item>
-        <item>Initiate tracing on the added nodes. Initiating tracing means "opening" the output to where trace-messages will be written. Most commonly this is a file. Note that it is not actually necessary to initiate the same tracing on all nodes. It might for instance be wise to use different filenames on different nodes. In the example below tracing is initiated on two nodes. The same node as where the shell is running (<c>node()</c>) and at <c>node2@hurin</c>. Further both "regular" tracing (<c>trace</c>) as well as trace information (<c>ti</c>) are specified for both nodes. (Prompt 4 in the example below).</item>
-        <item>If needing pid-to-alias translations, activate meta tracing on the necessary functions. This requires that trace information was specified when initiating tracing. (Prompt 5 in the example below illustrates using pid to locally registered name translations).</item>
-        <item>Set trace-patterns on the functions that shall be traced. (Prompt 6 in the example below).</item>
-        <item>Set process trace flags on necessary processes. Do not forget to use the <c>timestamp</c> flag in order to be able to merge log files together in chronological order. (Prompt 7 in the example below).</item>
-        <item>Run your code. (Prompt 8 in the example below).</item>
-        <item>Stop tracing (opposite of initiate tracing) and clear trace-patterns on the nodes. It is actually not necessary to stop tracing on all nodes at once. Nodes no longer of interest can be made to stop tracing before others. (Prompt 9 in the example below stops tracing. Prompt 13 removes all trace flags and trace patterns. Removing trace flags are really not necessary since those will be removed when the runtime components are stopped. Removing trace patterns may many times be necessary to "return" the node to a "clean" state from a trace perspective. Trace patterns are never automatically cleared by the runtime system unless the Erlang module in question is reloaded.)</item>
-        <item>If necessary fetch the log files from the various nodes. (Prompt 10 in the example blow).</item>
-        <item>Merge and format the log files. (Prompt 12 in the example below).</item>
-        <item>Stop the runtime components. This is important if the Erlang nodes are real "live" systems, and will not necessarily be stopped just because the tracing is completed. (Prompt 14 in the example below).</item>
-      </list>
-      <p>This "recipe" is valid also when tracing in a non-distributed environment. The only difference is that function calls not taking a node-name as argument are used. The runtime component will then of course run on the same node as the control component.</p>
-      <p>Simple example illustrating the above listed recipe. It traces on two nodes, node1 where the control component also runs. And node2 which is a remote node from the control components perspective. The example uses a mixture of API-calls specifying what nodes to trace on and API functions working on all added nodes. This is in this example interchangeable since all to the control component known nodes are participating in the same way.</p>
-      <pre>
-Eshell V5.5  (abort with ^G)
-(node1@hurin)1><input>application:start(runtime_tools).</input>
-ok
-(node1@hurin)2> <input>inviso:start().</input>
-{ok,&lt;0.56.0>}
-(node1@hurin)3> <input>inviso:add_nodes([node(),node2@hurin],mytag).</input>
-{ok,[{'node1@hurin',{ok,new}},
-     {'node2@hurin',{ok,new}}]}
-(node1@hurin)4> <input>inviso:init_tracing( [{node(),[{trace,{file,"tracefile_node1.log"}},{ti,{file,"trace_node1.ti"}}]}, {node2@hurin,[{trace,{file,"tracefile_node2.log"}},{ti,{file,"trace_node2.ti"}}]}]).</input>
-{ok,[{'node1@hurin',{ok,[{trace_log,ok},{ti_log,ok}]}},
-     {'node2@hurin',{ok,[{trace_log,ok},{ti_log,ok}]}}]}
-(node1@hurin)5> <input>inviso:tpm_localnames([node(),node2@hurin]).</input>
-{ok,[{'node1@hurin',{{ok,1},{ok,1}}},
-     {'node2@hurin',{{ok,1},{ok,1}}}]}
-(node1@hurin)6> <input>inviso:tpl([node(),node2@hurin],code,which,'_',[]).</input>
-{ok,[{'node1@hurin',{ok,[2]}},
-     {'node2@hurin',{ok,[2]}}]}
-(node1@hurin)7> <input>inviso:tf(all,[call,timestamp]).</input>
-{ok,[{'node1@hurin',{ok,"/"}},
-     {'node2@hurin',{ok,"-"}}]}
-(node1@hurin)8> <input>code:which(ordset).</input>
-non_existing
-(node1@hurin)9> <input>inviso:stop_tracing().</input>
-{ok,[{'node1@hurin',{ok,idle}},
-     {'node2@hurin',{ok,idle}}]}
-(node1@hurin)10> <input>inviso:fetch_log([node2@hurin],".","aprefix_").</input>
-{ok,[{'node2@hurin',
-         {complete,[{trace_log,[{ok,"aprefix_tracefile_node2.log"}]},
-                    {ti_log,[{ok,"aprefix_trace_node2.ti"}]}]}}]}
-(node1@hurin)11> <input>inviso:list_logs([node()]).</input>
-{ok,[{'node1@hurin',
-         {ok,[{trace_log,".",["tracefile_node1.log"]},
-              {ti_log,".",["trace_node1.ti"]}]}}]}
-(node1@hurin)12> <input>inviso_lfm:merge( [{node(),[{trace_log,["tracefile_node1.log"]}, {ti_log,["trace_node1.ti"]}]}, {node2@hurin,[{trace_log,["aprefix_tracefile_node2.log"]}, {ti_log,["aprefix_trace_node2.ti"]}]}],"theoutfile.txt").</input>
-{ok,15}
-(node1@hurin)13> <input>inviso:clear().</input>
-{ok,[{'node1@hurin',{ok,{new,running}}},
-     {'node2@hurin',{ok,{new,running}}}]}
-(node1@hurin)14> <input>inviso:stop_nodes().</input>
-{ok,[{'node2@hurin',ok},
-     {'node1@hurin',ok}]}
-(node1@hurin)15>       </pre>
-    </section>
-  </section>
-
-  <section>
-    <title>Incarnation runtime tags</title>
-    <p>Incarnation runtime tags are used to identify an incarnation of a runtime component. An incarnation is one "start-up" of a runtime component on a specific Erlang node. The reason why it can sometimes be necessary to examine the incarnation runtime tag is that a user wants to connect, adopt, an already running runtime component. This may be the case if the runtime component has autostarted or because the control component terminated without killing the runtime component. While the user has been out of control of the runtime component it may very well have terminated and been restarted. If it was restarted without the user's knowledge, its incarnation runtime tag has most likely changed. The user can therefore, if the current incarnation runtime tag is not what it is supposed to be, conclude that the runtime component is not "doing" what is expected.</p>
-    <p>The runtime tag is set at runtime component start-up. This is either done when it is started manually by a call to <c>inviso:add_nodes/X</c>, or according to a specification in one of the autostart configuration files.</p>
-  </section>
-
-  <section>
-    <title>Runtime component state and status</title>
-    <p>A runtime component has a state and a status. The possible states are: <c>new</c>, <c>tracing</c> and <c>idle</c>. A runtime component that is <c>tracing</c> has (possibly) open log files. A <c>new</c> runtime component has no current tracer-data. That is it lacks any history of what it has done just recently. An <c>idle</c> runtime component is no longer tracing. It does therefore have current tracer-data that describes what it did do when it was tracing.</p>
-    <p>The status describes if the runtime component is <c>running</c> or suspended. A suspended runtime component may very well be in state <c>tracing</c>. However the point is that it shall not generate any processor load. It will therefore refrain from generating any trace messages.</p>
-  </section>
-
-  <section>
-    <title>The Runtime Meta Tracer</title>
-    <p>Meta tracing is a trace mechanism separate from the regular tracing. It is normally used by a trace-tool to learn about function calls made anywhere in an Erlang node. A typical example is that there is a possibility in Inviso to get pids translated to registered name in the final formatted trace-log (for processes having registered names). This is done by meta-tracing on the BIF <c>register/2</c> to learn about all name/pid associations made.</p>
-    <p>Meta tracing in Inviso is done by the <c>inviso_rt_meta</c> process, which is part of the runtime component if trace-information, ti, is initiated. See <seealso marker="inviso#init_tracing/1">inviso:init_tracing/1</seealso> for details. The runtime meta tracer opens and controls the so called trace information file. Translations can then be done off-line using the associations logged in the trace information file. Currently the only type of trace information file available is a straight binary file. A wrap-file makes no sense since pid-to-name associations made in the beginning will most likely be lost.</p>
-    <p>The runtime meta tracer can also be used to translate pids to own identifiers. The only thing needed is one or several association points in the form of function calls which will only be made if an association is done in the system. The pid and own-identifier must be arguments and/or return values from the same function call.</p>
-    <p>The runtime meta tracer can further more be used to achieve side-effects during tracing, like turning tracing on or off.</p>
-
-    <section>
-      <title>Matching function calls with return values</title>
-      <p>It may sometimes be necessary to wait for a meta traced function to return before it can be decided what to do. This may be due to that one piece of information to make the decision is in the arguments to the function, the other in the return value. This kind of logic can be programmed to be executed by the inviso meta tracer. In order for the inviso meta tracer to "remember" function-call arguments until the function return trace message arrives, a <c>public loop data structure</c> is implemented. The public loop data structure is first created when tracing is initiated (of course only when trace information is specified in the <em>init_tracing</em> call). The public loop data can then later be further initiated each time meta tracing (<c>tpm</c> and <c>tpm_ms</c>) is activated for a certain function.</p>
-      <p>The default public loop data structure is a tuple of size two. The first element in that tuple is used by the predefined meta tracing for capturing locally registered names. The second element is free to use for any other purpose. The elements of the tuple must in the default implementation be lists of tuples. Where each sub-tuple shall represent one waiting call. The last element of that tuple must be a now-stamp (as returned by the BIF <c>now/0</c>). See below for an explanation of the now-stamp. The size of the outer most tuple may be increased as long as the term residing in the first element is left unchanged, and all other elements follow the above described rules.</p>
-      <p>The inviso meta tracer "cleans" the public loop data structure approximately once every minute. The reason for this is that entries in the public loop data structure may become abandoned. If for instance a process crashes while executing the body of a meta traced function, no return value will be generated. Or in other words, receiving the call meta trace-message can have caused information to have been written into the public loop data structure. That entry will be used and removed when the return_trace meta trace-message arrives. But if the meta traced function causes an exception, no return_trace message will come. The function which normally removes the entry is then therefore never called.</p>
-      <p>The default clean-function assumes that every item in the public loop data tuple is a list. Where each list contains tuples where the last element of those tuples are "now-stamps". The default clean-function considers an entry older than 30 seconds to be abandoned.</p>
-    </section>
-
-    <section>
-      <title>Making pid/alias entries in the ti-file</title>
-      <p>When activating meta tracing for a function for the purpose of writing pid-alias associations in the trace information file, a call-func and possibly also a return-func is specified. These functions will be called when a meta trace message arrives to the inviso meta tracer as a result of function calls or returns for this meta traced function. What exactly to write in the trace information file is dictated by the merge mechanism. This since pid-alias translations are done off line when merging log-files. See the chapter on merging and formatting log files for more details.</p>
-      <p>Simple example where the call to the function <c>connection:assoc_id(Pid,Ref)</c> will associated <c>Pid</c> with the id <c>Ref</c>. We will then in a merged log-file see a translation between <c>Pid</c> and <c>Ref</c>. Actually for all future since there is no unalias function meta traced in this example. The inviso meta tracer will receive a meta trace message every time <c>connection:assoc_id/2</c> is called. When that message arrives the meta tracer will call <c>mytrace:call_assoc_id/3</c> which must return <c>{ok,NewPublicLoopData,OutPutBinary}</c>.</p>
-      <code type="none">
-    -module(mytrace).
-
-    call_assoc_id(_CallingPid,[Pid,Ref],PublLoopData) ->
-        {ok,PublLoopData,term_to_binary({Pid,Ref,alias,now()})}.
-      </code>
-      <pre>
-
-(node1@hurin)21> <input>inviso:tpm(connection,assoc_id,2,[], {mytrace,call_assoc_id}).</input>
-{ok,[{'node1@hurin',{ok,1}},
-     {'node2@hurin',{ok,1}}]}
-(node1@hurin)22>      </pre>
-    </section>
-
-    <section>
-      <title>Extending the public loop data structure.</title>
-      <p>It is of course very likely that the public loop data structure must be extended to host all functions where the meta tracer must delay its action until the function in question returns. What is necessary is to create your own public loop data structure at trace initialization. This is done by using the <c>TiSpec</c>. <c>TiSpec={InitMFA,RemoveMF,CleanMF}</c>, where <c>InitMFA</c> creates the structure, <c>RemoveMF</c> removes it (must often not necessary unless a database, file or similar is used as storage instead of a tuple). <c>CleanMF</c> is the function which will be called each every 60 seconds to go over the public loop data structure. Following the below rules, not much programming will be needed, apart from the <c>InitMFA</c>:</p>
-      <list type="bulleted">
-        <item>Make the public loop data structure a tuple of lists, where each list is a list of tuples where the tuples represents one entry.</item>
-        <item>Make the <c>CallFunc</c> (the function called each time a call meta trace message arrives for the function in question) add a tuple to the correct list where the last element of that tuple is a now-stamp.</item>
-        <item>Make sure that the first element in the loop data structure tuple is left alone for the default implementation of the handling of registered names.</item>
-        <item>Use <c>inviso_rt_meta:clean_std_publld/1</c> (which is exported for this purpose) as <c>CleanMF</c>. This function is normally the default clean function, if not using the possibility to in detail initiate the inner workings of the inviso meta tracer.</item>
-      </list>
-      <p>Simple example where tracing is initiated with a public loop data structure having 10 places for nine (the locally registered names is mandatory) different functions to be meta traced. Note that the BIF <c>list_to_tuple/1</c> is used as initialization function. And that the Stdlib function <c>lists:duplicate/2</c> is used to create something for the initialization function to work on.</p>
-      <pre>
-(node1@hurin)4> <input>inviso:init_tracing( [{node2@hurin,[{trace,{file,"tracefile_node2.log"}}, {ti,{file,"trace_node2.ti",{{erlang,list_to_tuple,[lists:duplicate(10,[])]}, void,{inviso_rt_meta,clean_std_publld}}}}]}]).</input>
-{ok,[{'node2@hurin',{ok,[{trace_log,ok},{ti_log,ok}]}}]}
-(node1@hurin)5>       </pre>
-    </section>
-
-    <section>
-      <title>Using the inviso meta tracer to achieve side effects</title>
-      <p>Since meta tracing is independent of regular tracing and catches any function call to a particular function made in any process, it is well suited to be used to turn things on or off during execution. That trick is done by letting the <c>CallFunc</c> and (if used) <c>ReturnFunc</c> do these sideeffects. One must of course remember that the inviso meta tracer is a process amongst all other processes in the system. Meaning that the side effect is not necessarily done exactly when the meta traced function is called. Unless the side effect can be achieved using a match specification action.</p>
-    </section>
-  </section>
-
-  <section>
-    <title>Runtime Component Autostart</title>
-    <p>In order to trace before any user interaction is possible, an autostart mechanism is implemented. The runtime component is started by the top supervisor of the Runtime_Tools application top supervisor. Hence the Runtime_Tools application must be part of the boot script for autostart tracing to work. The Runtime_Tools applications must of course be started before any application that is to be traced. Do note that application startup is not entirely synchronous. Meaning that just because the application controller has begun starting the next application, Runtime_Tools is not necessarily fully up and running.</p>
-    <p>The autostart mechanism is configurable. The runtime component comes with a standard autostart configuration, only missing two text-files to be completely operational.</p>
-
-    <section>
-      <title>Autostart Configuration</title>
-      <p>The autostart is controlled by the Runtime_Tools application configuration parameter <c>inviso_autostart_mod</c>. It must be the name of a module exporting an <c>autostart/1</c> function. The default value is <c>inviso_autostart</c>, a module which is provided with Runtime_Tools. See <seealso marker="#inviso_autostart">below</seealso> for details.</p>
-      <p>An <c>autostart/1</c> function must offer the following:</p>
-      <code type="none">
-autostart(RuntimeToolsArg) = {MFA,Options,Tag} | any()
-      </code>
-      <p><c>RuntimeToolsArgs</c> is the argument <c>Arg</c> provided to the Runtime_Tools application through the application resource file <c>{mod,{Module,Arg}}</c> parameter.</p>
-      <p><c>MFA = {AutoMod,AutoFunc,AutoArgs} | any()</c> controls how tracing will be initiated. Note that initiating tracing is not necessarily the same as starting a runtime component. It is possible to have a runtime component without doing any tracing. The runtime component is started as long as <c>autostart/1</c> returns the proper tuple, and <c>Options</c> does not for instance require a certain non-existing control component. If it is not a proper tuple or there are other faults in the tuple items, the autostart will terminate. Typically will this happen if there is no <c>autostart/1</c> function.</p>
-      <p>If MFA does not properly point out a function possible to call with <c>spawn(AutoMod,AutoFunc,AutoArg)</c>, there will simply be no initialization. (Initialization is done by a separate process spawned by the runtime component during autostart.) It may be worth reminding that <c>AutoMod</c> must be present at the node where the runtime component is supposed to run. Not necessarily the node where the control component usually runs.</p>
-      <p><c>Options</c> is the list of options given to the runtime component. See <c>Options</c> in <seealso marker="inviso#add_nodes/2">inviso:add_nodes/2</seealso>.</p>
-      <p><c>Tag</c> is the runtime component incarnation tag. See <c>Tag</c> in <seealso marker="inviso#add_nodes/2">inviso:add_nodes/2</seealso>.</p>
-    </section>
-
-    <section>
-      <title>The Standard Autostart Implementation</title>
-      <p>As mentioned above, Inviso comes with a complete implementation of autostart sufficient for most situations.</p>
-
-      <section>
-        <marker id="inviso_autostart"></marker>
-        <title>inviso_autostart</title>
-        <p>The default autostart module is <c>inviso_autostart</c>, provided as part of the Runtime_Tools application. Since that name is the default module name, it is not really necessary to set the <c>inviso_autostart_mod</c> configuration parameter for the Runtime_Tools application.</p>
-        <p>Its <c>autostart/1</c> function reads a configuration file pointed out by the Runtime_Tools application configuration parameter <c>inviso_autostart_conf</c>. If the parameter is not present, a default file, <c>inviso_autostart.config</c> in the current working directory, will be consulted.</p>
-        <p>The config file must be an ascii text file with one or more tuples ended with a dot. The following parameters are recognized:</p>
-        <taglist>
-          <tag><c>{repeat,N}</c></tag>
-          <item>
-            <p>Optional parameter where <c>N</c> specifies the maximum remaining autostarts. The autostart functionality will rewrite the configuration decreasing <c>N</c> if present. If <c>N==0</c> the autostart will be terminated.</p>
-          </item>
-          <tag><c>{mfa,{M,F,Args}}</c></tag>
-          <item>
-            <p>Optional parameter controlling how initialization shall be done. The control component will spawn a separate process to do the initializations by doing <c>spawn(M,F,Args)</c>.</p>
-          </item>
-          <tag><c>{options,Options}</c></tag>
-          <item>
-            <p>Optional parameter specifying the options for the runtime component itself. See <c>Options</c> in <seealso marker="inviso#add_nodes/2">inviso:add_nodes/2</seealso>.</p>
-          </item>
-          <tag><c>{tag,Tag}</c></tag>
-          <item>
-            <p>Optional parameter specifying the runtime component tag. If missing the default tag will be <c>default_tag</c>.</p>
-          </item>
-        </taglist>
-        <p>Example:</p>
-        <code type="none">
-{repeat,1}.
-{mfa,{inviso_autostart_server,
-      init,
-      [[{tracerdata,{file,"mylogfile"}},
-        {cmdfiles,["a_trace_case.txt"]},
-        {bindings,[{'M',mymod},{'F','_'},{'Arity','_'}]},
-        {translations,[]}]]}}.
-        </code>
-        <p>The example file results in the start of a runtime component given no specific options. There will only be one autostart since the repeat parameter is set to 1. Tracing will be initiated by the standard initiator (<seealso marker="#autostart_server">inviso_autostart_server</seealso>). The initiator will initiate tracing opening a plain trace-port logfile (<c>"mylogfile"</c>). It will further read the <c>"a_trace_case.txt"</c> file to get instructions on what patterns and flags to set. If there are variables mentioned in the trace-case file <c>"a_trace_case.txt"</c>, it is parameterized, the variables <c>M</c>, <c>F</c> and <c>Arity</c> will get the values according to <c>bindings</c>. There will be no translations done, hence the trace-case file must be written using <c>inviso_rt</c> function calls directly.</p>
-      </section>
-
-      <section>
-        <marker id="autostart_server"></marker>
-        <title>inviso_autostart_server</title>
-        <p>To further facilitate the standard autostart implementation a default initiator is implemented. To use it, simply specify it as mfa in the config file read by the standard autostart module.</p>
-        <p>Its <c>init/1</c> function takes one argument on the form of a list of tuples. The following tuple-parameters are recognized:</p>
-        <taglist>
-          <tag><c>{tracerdata,TracerData}</c></tag>
-          <item>
-            <p>Specifies how tracing is initiated. See <seealso marker="inviso#init_tracing/1">inviso:init_tracing/1</seealso> for details on <c>TracerData</c>.</p>
-          </item>
-          <tag><c>{cmdfiles,ListOfFileNames}</c></tag>
-          <item>
-            <p>Specifies trace-case files which shall be executed to set the patterns and flags of the trace. See the <seealso marker="#trace_cases">Trace Cases</seealso> chapter for more details. The files will be executed in the order specified.</p>
-          </item>
-          <tag><c>{translations,Translations}</c></tag>
-          <item>
-            <p>Optional parameter specifying how functions in trace-case files shall be translated. This is useful since trace-cases can be written for higher-layer Inviso tools, but must during an autostart execute using <c>inviso_rt</c> function calls only.</p>
-            <code type="none">
-Translations=
-  [{{Mod1,Func1,Arity},
-    {Mod2,Func2,{TranslMod,TranslFunc}}},...]
-TranslMod:TranslFunc(ListOfOrigArgs)->
-  ListOfTransformedArgs
-            </code>
-            <p><c>Mod1:Func1/Arity</c> specifies the function that shall be translated into <c>Mod2:Func2/Arity</c>. The actual arguments will be translated with <c>TranslMod:TranslFunc/1</c>. The translation function shall take a list of the actual arguments, and return a list of new arguments. The return-value list may for instance have certain arguments removed, if such are not relevant to the <c>Func2</c> function. (Such arguments must actually be removed since the return-value list from the translation function must have the correct amount of elements corresponding to the arity of <c>Func2</c>.)</p>
-          </item>
-          <tag><c>{bindings,Bindings}</c></tag>
-          <item>
-            <p><c>Bindings=[{Var,Val}]</c>              <br></br>
-<c>Var=atom()</c>, the name of the variable</p>
-            <p>Optional parameter specifying the actual values of variables used in the trace-cases. <c>Bindings</c> is a bindings structure as used by functions in the <c>erl_eval</c> module.</p>
-          </item>
-        </taglist>
-      </section>
-
-      <section>
-        <title>The Standard Autostart Utility Library</title>
-        <p>To facilitate creating the configuration file described above, there are functions in a module named <c>inviso_as_lib</c> which can both create new files according to supplied arguments and update existing configuration files.</p>
-        <p>The node(s) in question must be running since the functionality in the utility library uses distributed Erlang to access the file system.</p>
-      </section>
-    </section>
-  </section>
-
-  <section>
-    <title>The Dependency Property</title>
-    <p>In order to protect real "live" systems from getting a runtime component lingering around without a control component, a dependency property can be specified at runtime component start-up. The property specifies a dependency in milliseconds. Meaning that if the property is set to 0 (zero), the runtime component will terminate immediately if its current control component terminates.</p>
-    <p>If a control component tries to start a runtime component at an Erlang node where there already is a runtime component, the control component will adopt the already existing runtime component if it has no current control component. Otherwise the control component will experience an error, not being able to start a runtime component at that node.</p>
-    <p>It must also be noted that an autostart runtime component is running without control component, at least before any control component adopts it.</p>
-  </section>
-
-  <section>
-    <title>Overload Protection</title>
-    <p>Since Inviso is intended to be used on real "live" systems, it is possible to protect the system against overload, having Inviso suspend tracing should an overload situation occur.</p>
-    <p>What indicates an overload situation must be programmed and configured outside of Inviso. Inviso can initiate an overload protection, call an overload function periodically and clean-up an overload mechanism should it decide to terminate.</p>
-    <p>Internally inside the runtime component, suspending tracing means removing all process trace flags and meta patterns. Reactivating tracing is outside the scoop of Inviso, but can be implemented in a tool using Inviso.</p>
-    <p>Simple example adding a runtime component and making it protect its Erlang node from overload.</p>
-    <pre>
-inviso:add_node(my_rt_tag,
-                [{overload,{{my_ovl,check},
-                            15000,
-                            {my_ovl,start,[my_port_pgm]},
-                            {my_ovl,stop,[my_port_pgm]}}}]).
-    </pre>
-    <p>Immediately when the runtime component is started, it will initiate overload protection by calling <c>my_ovl:start(my_port_pgm)</c>. When tracing (not when in state idle or new), the runtime component will every 15000 milliseconds call <c>my_ovl:check/1</c>. Depending on its return value, the runtime component will either do nothing or suspend tracing. When the runtime component is stopped, <c>my_ovl:stop(my_port_pgm)</c> will be called.</p>
-  </section>
-
-  <section>
-    <title>Merging and Formatting Logfiles</title>
-    <p>If logging trace messages to a logfile has been used (decided when tracing is initiated) the various log files will be located on the different Erlang nodes participating in the trace. The log files must be merged and formatted for the following reasons:</p>
-    <list type="bulleted">
-      <item>The various log files from the different nodes must be merged into one logfile in chronological order (where trace messages from different nodes will be mixed). If only one Erlang node participated in the trace, this step is obviously not necessary.</item>
-      <item>Trace-port log files are on binary format and must in most cases be transformed in some way. This can for instance be to a text-file format or inserted into a database for analysis.</item>
-      <item>Use trace information data to translate process identifiers to aliases, both standard Erlang ones (as registered names) as well as own invented.</item>
-    </list>
-    <p>The first step before any merging can take place is of course to get all log files, including any trace information files to a location where the logfile merger can access them. This can either be done by simply copying the files. However if the file systems on the Erlang nodes are not that easily accessed, there is a <c>fetch_log</c> function implemented in the runtime component. It will transfer log files using distributed Erlang.</p>
-    <p>Inviso comes with two Erlang modules, <c>inviso_lfm</c> and <c>inviso_lfm_tpfreader</c>, implementing a standard log file merger and formatter. The log file merger (<c>inviso_lfm</c>) uses a file reader process (implemented in <c>inviso_lfm_tpfreader</c>) to access log entries in parallel. It is possible to write your own logfile reader. This is necessary since you may have your own trace-log format and/or own trace information log format. The logfile merger can further more be configured to use your own formatter, customizing what to do with a trace message.</p>
-    <p>Trace messages in the log files must of course be time-stamped for the logfile merger to be capable of correctly merging them. This means using the <c>timestamp</c> process trace flag.</p>
-    <p>The standard inviso log-file reader understands the following trace information file entries:</p>
-    <list type="bulleted">
-      <item>
-        <code type="none">
-{Pid,Alias,alias,NowStamp}        </code>
-      </item>
-      <item>
-        <code type="none">
-{Pid,Alias,unalias,NowStamp}        </code>
-      </item>
-    </list>
-    <p>The <c>Pid</c> in an <c>alias</c> entry must always be a proper pid. In an <c>unalias</c> entry it may also be the atom <c>undefined</c>. The latter means that all associations involving <c>Alias</c> shall stop to be valid. The standard inviso log file reader uses the now-stamp to make sure that associations are only used during time periods in the log-file when such are valid.</p>
-  </section>
-
-  <section>
-    <marker id="trace_cases"></marker>
-    <title>Trace Cases</title>
-    <p>The idea behind trace cases is that someone knowledgeable of a certain system component can write a file specifying the trace-patterns and process trace flags necessary to trace on certain items once and for all. Hence a trace case will most likely be a series of calls to functions setting trace patterns and process trace flags.</p>
-    <p>However, the actual Erlang nodes and values of arguments given in the trace function calls can not be static in order for the trace cases to become useful and reusable. A trace case file must therefore be possible to parameterize. Introducing variables that will get their values at the time of trace case execution. It may also be the case that Inviso is used as a component in a higher layer trace tool. Trace cases may therefore be written calling more complex functions than the low level <c>inviso_rt</c> functions which are available to autostart mechanisms. In a matter of fact, the <c>inviso</c> API itself can be considered a higher layer. It addresses multiple nodes at once where the <c>inviso_rt</c> API can only address the local node.</p>
-    <p>This results in that for trace cases to be useful there must be a function call translation mechanism and an execution environment capable of handling variable bindings.</p>
-    <p>A trace-case is a text ascii file consisting of function calls written as they could have been done in the Erlang shell:</p>
-    <code type="none">
-modulename:functionname(arg1,arg3,...).
-    </code>
-    <p>A trace-case may contain any valid function call, including binding new variables which are used later in the trace-case, but:</p>
-    <list type="bulleted">
-      <item>No spawn, send or receive.</item>
-      <item>No apply or similar (including <c>mod:F(Arg1,Arg2)</c>). This because the variable environment is not available during the translation. Only during execution.</item>
-    </list>
-    <p>Example: Trace cases are expected to be written to be executed directly in an Erlang shell (by some utility reading a text file on trace case format) calling <c>inviso</c> functions. The translations must then translate <c>inviso</c> function calls to <c>inviso_rt</c> function calls, since <c>inviso</c> is not available in the Runtime_Tools applications. It can not be assumed that any trace tools outside the Runtime_Tools application is available on the nodes. Luckily (!) the <c>inviso_rt</c> API resembles the <c>inviso</c> API very much, apart from that the <c>inviso_rt</c> API does not take a list of nodes as an argument. Therefore in most situations the only transformation necessary is to change from <c>inviso</c> to <c>inviso_rt</c> and remove the first argument to the function call.</p>
-    <p>Assume that we have the following trace-case file:</p>
-    <code type="none">
-inviso:tpl(Nodes,mymod,'_','_',MS).
-inviso:tf(Nodes,all,[call,timestamp]).
-    </code>
-    <p>For this to work in an autostart the following translation is needed:</p>
-    <code type="none">
-[{{inviso,tpl,5},{inviso_rt,tpl,{erlang,tl}}},
- {{inviso,tf,3},{inviso_rt,tf,{erlang,tl}}}]
-    </code>
-    <p>Since transforming the arguments from <c>inviso</c> calls to <c>inviso_rt</c> calls is simply removing the first argument, there is no need to program any function to do this. The BIF <c>tl/1</c> can be used directly.</p>
-    <p>Further there must be a variable binding for <c>MS</c> when executing the trace-case. It is not necessary to have one for <c>Nodes</c> since that argument is removed from all function calls by the translation.</p>
-  </section>
-</chapter>
-
diff --git a/lib/inviso/doc/src/inviso_lfm.xml b/lib/inviso/doc/src/inviso_lfm.xml
deleted file mode 100644
index 70207d0b58..0000000000
--- a/lib/inviso/doc/src/inviso_lfm.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2006</year>
-      <year>2011</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  The contents of this file are subject to the Erlang Public License,
-  Version 1.1, (the "License"); you may not use this file except in
-  compliance with the License. You should have received a copy of the
-  Erlang Public License along with this software. If not, it can be
-  retrieved online at http://www.erlang.org/.
-
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and limitations
-  under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>inviso_lfm</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>inviso_lfm</module>
-  <modulesummary>An Inviso Off-Line Logfile Merger</modulesummary>
-  <description>
-    <p>Implements an off-line logfile merger, merging binary trace-log files from several nodes together in chronological order. The logfile merger can also do pid-to-alias translations.</p>
-    <p>The logfile merger is supposed to be called from the Erlang shell or a higher layer trace tool. For it to work, all logfiles and trace information files (containing the pid-alias associations) must be located in the file system accessible from this node and organized according to the API description.</p>
-    <p>The logfile merger starts a process, the output process, which in its turn starts one reader process for every node it shall merge logfiles from. Note that the reason for a process for each node is not remote communication, the logfile merger is an off-line utility, it is to sort the logfile entries in chronological order.</p>
-    <p>The logfile merger can be customized both when it comes to the implementation of the reader processes and the output the output process shall generate for every logfile entry.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>merge(Files, OutFile) -></name>
-      <name>merge(Files, WorkHFun, InitHandlerData) -></name>
-      <name>merge(Files, BeginHFun, WorkHFun, EndHFun, InitHandlerData) -> {ok, Count} | {error, Reason}</name>
-      <fsummary>Merge logfiles into one file in chronological order</fsummary>
-      <type>
-        <v>Files = [FileDescription]</v>
-        <v>&nbsp;FileDescription = FileSet | {reader,RMod,RFunc,FileSet}</v>
-        <v>&nbsp;&nbsp;FileSet = {Node,LogFiles} | {Node,[LogFiles]}</v>
-        <v>&nbsp;&nbsp;&nbsp;Node = atom()</v>
-        <v>&nbsp;&nbsp;&nbsp;LogFiles = [{trace_log,[FileName]}] | [{trace_log,[FileName]},{ti_log,TiFileSpec}]</v>
-        <v>&nbsp;&nbsp;&nbsp;&nbsp;TiFileSpec = [string()] - a list of one string.</v>
-        <v>&nbsp;&nbsp;&nbsp;&nbsp;FileName = string()</v>
-        <v>&nbsp;&nbsp;RMod = RFunc = atom()</v>
-        <v>OutFile = string()</v>
-        <v>BeginHFun = fun(InitHandlerData) -> {ok, NewHandlerData} | {error, Reason}</v>
-        <v>WorkHFun = fun(Node, LogEntry, PidMappings, HandlerData) -> {ok, NewHandlerData}</v>
-        <v>&nbsp;LogEntry = tuple()</v>
-        <v>&nbsp;PidMappings = term()</v>
-        <v>EndHFun = fun(HandlerData) -> ok | {error, Reason}</v>
-        <v>Count = int()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Merges the logfiles in <c>Files</c> together into one file in chronological order. The logfile merger consists of an output process and one or several reader processes.</p>
-        <p>Returns <c>{ok, Count}</c> where <c>Count</c> is the total number of log entries processed, if successful.</p>
-        <p>When specifying <c>LogFiles</c>, currently the standard reader-process only supports:</p>
-        <list type="bulleted">
-          <item>one single file</item>
-          <item>a list of wraplog files, following the naming convention <c><![CDATA[<Prefix><Nr><Suffix>]]></c>.</item>
-        </list>
-        <p>Note that (when using the standard reader process) it is possible to give a list of <c>LogFiles</c>. The list must be sorted starting with the oldest. This will cause several trace-logs (from the same node) to be merged together in the same <c>OutFile</c>. The reader process will simply start reading the next file (or wrapset) when the previous is done.</p>
-        <p><c>FileDescription == {reader,RMod,RFunc,FileSet}</c> indicates that <c>spawn(RMod, RFunc, [OutputPid,LogFiles])</c> shall create a reader process.</p>
-        <p>The output process is customized with <c>BeginHFun</c>, <c>WorkHFun</c> and <c>EndHFun</c>. If using <c>merge/2</c> a default output process configuration is used, basically creating a text file and writing the output line by line. <c>BeginHFun</c> is called once before requesting log entries from the reader processes. <c>WorkHFun</c> is called for every log entry (trace message) <c>LogEntry</c>. Here the log entry typically gets written to the output. <c>PidMappings</c> is the translations produced by the reader process. <c>EndHFun</c> is called when all reader processes have terminated.</p>
-        <p>Currently the standard reader can only handle one ti-file (per <c>LogFiles</c>). The current inviso meta tracer is further not capable of wrapping ti-files. (This also because a wrapped ti-log will most likely be worthless since alias associations done in the beginning are erased but still used in the trace-log).</p>
-        <p>The standard reader process is implemented in the module <c>inviso_lfm_tpreader</c> (trace port reader). It understands Erlang linked in trace-port driver generated trace-logs and <c>inviso_rt_meta</c> generated trace information files.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>Writing Your Own Reader Process</title>
-    <p>Writing a reader process is not that difficult. It must:</p>
-    <list type="bulleted">
-      <item>Export an init-like function accepting two arguments, pid of the output process and the <c>LogFiles</c> component. <c>LogFiles</c> is actually only used by the reader processes, making it possible to redefine <c>LogFiles</c> if implementing an own reader process.</item>
-      <item>Respond to <c>{get_next_entry, OutputPid}</c> messages with <c>{next_entry, self(), PidMappings, NowTimeStamp, Term}</c> or <c>{next_entry, self(), {error,Reason}}</c>.</item>
-      <item>Terminate normally when no more log entries are available.</item>
-      <item>Terminate on an incoming EXIT-signal from <c>OutputPid</c>.</item>
-    </list>
-    <p>The reader process must of course understand the format of a logfile written by the runtime component.</p>
-  </section>
-</erlref>
-
diff --git a/lib/inviso/doc/src/inviso_lfm_tpfreader.xml b/lib/inviso/doc/src/inviso_lfm_tpfreader.xml
deleted file mode 100644
index bae40522a3..0000000000
--- a/lib/inviso/doc/src/inviso_lfm_tpfreader.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2006</year>
-      <year>2011</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  The contents of this file are subject to the Erlang Public License,
-  Version 1.1, (the "License"); you may not use this file except in
-  compliance with the License. You should have received a copy of the
-  Erlang Public License along with this software. If not, it can be
-  retrieved online at http://www.erlang.org/.
-
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and limitations
-  under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>inviso_lfm_tpfreader</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>inviso_lfm_tpfreader</module>
-  <modulesummary>Inviso Standard Reader Process to Standard Logfile Merger</modulesummary>
-  <description>
-    <p>Implements the standard reader process to the standard logfile merger <c>inviso_lfm</c>.</p>
-    <p>The reader process reads logfiles belonging to the same set (normally one node) in chronological order and delivers logged trace messages one by one to the output process. Before any trace messages are delivered, the <c>inviso_lfm_tpreader</c> implementation reads the entire trace information file (if in use) and builds a database over pid-to-alias associations.</p>
-    <p>The <c>inviso_lfm_tpreader</c> implementation is capable of considering that an alias may have been used for several processes during different times. An alias may also be in use for several pids at the same time, on purpose. If a process has generated a trace message, all associations between that pid and aliases will be presented as the list <c>PidMappings</c> in the message sent to the output process.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>handle_logfile_sort_wrapset(LogFiles) -> FileList2</name>
-      <fsummary>Sort logfiles in chronological order</fsummary>
-      <type>
-        <v>LogFiles = [{trace_log, FileList}]</v>
-        <v>FileList = FileList2 = [FileName]</v>
-        <v>&nbsp;FileName = string()</v>
-      </type>
-      <desc>
-        <p>Only one <c>{trace_log, FileList}</c> tuple is expected in <c>LogFiles</c>, all other tuples are ignored. <c>FileList</c> must:</p>
-        <list type="bulleted">
-          <item>contain one single file name, or</item>
-          <item>a list of wraplog files, following the naming convention <c><![CDATA[<Prefix><Nr><Suffix>]]></c>.</item>
-        </list>
-        <p>Sorts the files in <c>FileList</c> in chronological order beginning with the oldest. Sorting is only relevant if <c>FileList</c> is a list of wraplogs. The sorting is done on finding the modulo-counter in the filename and not on filesystem timestamps.</p>
-        <p>This function is exported for convenience should an own reader process be implemented.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>The Trace Information File Protocol</title>
-    <p>The format of a trace information file is dictated by the meta tracer process. The <c>inviso_lfm_tpfreader</c> implementation of a reader process understands the following trace information entries. Note that the <c>inviso_rt_meta</c> trace information file is on binary format prefixing every entry with a 4 byte length indicator.</p>
-    <taglist>
-      <tag><c>{Pid, Alias, alias, NowStamp}</c></tag>
-      <item>
-        <p><c>Pid = pid()</c>          <br></br>
-<c>Alias = term()</c>          <br></br>
-<c>NowStamp = term()</c>, but in current implementation as
-          returned from <c>erlang:now/0</c></p>
-        <p>This message indicates that from now on shall <c>Pid</c> be associated with <c>Alias</c>.</p>
-      </item>
-      <tag><c>{MaybePid, Alias, unalias, NowStamp}</c></tag>
-      <item>
-        <p><c>MaybePid = pid() | undefined</c>          <br></br>
-<c>Alias = term()</c>          <br></br>
-<c>NowStamp = term()</c>, see above</p>
-        <p>This message indicates that, if <c>MaybePid</c> is a pid, this pid shall no longer be associated with <c>Alias</c>. If it is <c>undefined</c>, all associations with <c>Alias</c> from now shall be considered invalid.</p>
-        <p>Also note that there are many situations where <c>unalias</c> entries will be missing. For instance if a process terminates without making explicit function calls removing its associations first. This is seldom a problem unless the pid is reused.</p>
-      </item>
-    </taglist>
-  </section>
-</erlref>
-
diff --git a/lib/inviso/doc/src/inviso_rt.xml b/lib/inviso/doc/src/inviso_rt.xml
deleted file mode 100644
index 3a8e77f65c..0000000000
--- a/lib/inviso/doc/src/inviso_rt.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2006</year>
-      <year>2011</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  The contents of this file are subject to the Erlang Public License,
-  Version 1.1, (the "License"); you may not use this file except in
-  compliance with the License. You should have received a copy of the
-  Erlang Public License along with this software. If not, it can be
-  retrieved online at http://www.erlang.org/.
-
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and limitations
-  under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>inviso_rt</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>inviso_rt</module>
-  <modulesummary>Direct API to the Inviso Runtime Component</modulesummary>
-  <description>
-    <p>The <c>inviso_rt</c> API is normally only used when programming autostart scripts or similar mechanisms. The reason is that the runtime component is part of the Runtime_tools application and will therefore always be available. But the regular inviso API is part of the Inviso application not necessarily available on the node doing an autostart. It is of course possible to runt a "lean" tracer only using the runtime component manually (i.e not through autostart). The runtime component shall otherwise be controlled through the control component, which is accessed with the <c>inviso</c> API.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>init_tracing(TracerData) -> NodeResult | {error,Reason}</name>
-      <fsummary>Initiate tracing</fsummary>
-      <desc>
-        <p>See <seealso marker="inviso#init_tracing/2">inviso:init_tracing/2</seealso> for details.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tp(Mod,Func,Arity,MatchSpec,Opts) -></name>
-      <name>tp(Mod,Func,Arity,MatchSpec) -> NodeResult | {error,Reason}</name>
-      <name>tp(PatternList) -> NodeResult | {error,Reason}</name>
-      <fsummary>Set global trace patterns</fsummary>
-      <type>
-        <v>Mod,Func = atom() | '_' | ModRegExp | {DirRegExp,ModRegExp}</v>
-        <v>&nbsp;ModRegExp = regexp_string()</v>
-        <v>&nbsp;DirRegExp = regexp_string()</v>
-        <v>Arity = int() | '_'</v>
-        <v>MatchSpec = true | false | [] | matchspec()</v>
-        <v>PatternList = [Pattern],</v>
-        <v>&nbsp;Pattern = {Mod,Func,Arity,MatchSpec,Opts}</v>
-        <v>Opts = [Opt]</v>
-        <v>&nbsp;Opt = only_loaded</v>
-        <v>NodeResult = {ok,[Ans]} | {error,Reason}</v>
-        <v>&nbsp;&nbsp;Ans = int() | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Set global trace patterns. The integer replied if the call was successfull describes the number of matched functions. Using wildcards follows the rules for wildcards of <c>erlang:trace_pattern</c>. It is for instance illegal to specify <c>M=='_'</c> while <c>F</c> is not <c>'_'</c>.</p>
-        <p>Modules can also be specified using Erlang regular expressions as described in the <c>regexp</c> module. If <c>{DirRegExp,ModRegExp}</c> is used, module selection will further be restricted by that the module must be loaded from a location containing <c>DirRegExp</c> somewhere in the path. This can be used to for instance trace on all modules belonging to a certain application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpl(Mod,Func,Arity,MatchSpec) -></name>
-      <name>tpl(Mod,Func,Arity,MatchSpec,Opts) -> NodeResult | {error,Reason}</name>
-      <name>tpl(PatternList) -> NodeResult | {error,Reason}</name>
-      <fsummary>Set local trace patterns</fsummary>
-      <desc>
-        <p>See <seealso marker="#tp/5">tp/N</seealso> function above for details on arguments and return values.</p>
-        <p>Set local trace pattern on specified functions.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctp(Mod,Func,Arity) -> NodeResult | {error,Reason}</name>
-      <fsummary>Clear global trace patterns</fsummary>
-      <desc>
-        <p>See <seealso marker="#tp/5">tp/N</seealso> for argument descriptions.</p>
-        <p>Clear global trace patterns.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctpl(Mod,Func,Arity) -> NodeResult | {error,Reason}</name>
-      <fsummary>Clear local trace patterns</fsummary>
-      <desc>
-        <p>See <seealso marker="#tp/5">tp/N</seealso> for argument description.</p>
-        <p>Clear local trace patterns.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tf(PidSpec,FlagList) -> NodeResult | {error,Reason}</name>
-      <name>tf(TraceConfList) -> NodeResult | {error,Reason}</name>
-      <fsummary>Set process trace flags</fsummary>
-      <type>
-        <v>TraceConfList = [{PidSpec,FlagList}]</v>
-        <v>FlagList = [Flag]</v>
-        <v>PidSpec = all | new| existing | pid() | locally_registered_name()</v>
-        <v>Flag =  all process trace flags allowed.</v>
-        <v>NodeResult = {ok,[Ans]} | {error,Reason}</v>
-        <v>Ans = int() | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>Set process trace flags. The integer returned if the call was successful describes the matched number of processes.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctf(PidSpec,FlagList) -> NodeResult | {error,Reason}</name>
-      <name>ctf(TraceConfList) -> NodeResult | {error,Reason}</name>
-      <fsummary>Clear process trace flags</fsummary>
-      <desc>
-        <p>See <seealso marker="#tf/2">tf/1,2</seealso> for arguments and return value description.</p>
-        <p>Clear process trace flags.</p>
-      </desc>
-    </func>
-    <func>
-      <name>init_tpm(Mod,Func,Arity,CallFunc) -> NodeResult | {error,Reason}</name>
-      <name>init_tpm(Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc) -> NodeResult | {error,Reason}</name>
-      <fsummary>Initialize meta tracing</fsummary>
-      <type>
-        <v>Mod = Func = atom()</v>
-        <v>Arity = int()</v>
-        <v>NodeResult = ok | {error,Reason}</v>
-        <v>InitFunc = RemoveFunc = {Module,Function} | function()/4 | void</v>
-      </type>
-      <desc>
-        <p>See <seealso marker="inviso#init_tpm/4">inviso:init_tpm/5,7</seealso> for details.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpm(Mod,Func,Arity,MS) -> NodeResult | {error,Reason}</name>
-      <name>tpm(Mod,Func,Arity,MS,CallFunc) -> NodeResults | {error,Reason}</name>
-      <name>tpm(Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) -> NodeResults | {error,Reason}</name>
-      <fsummary>Activate meta tracing</fsummary>
-      <type>
-        <v>Mod = Func = atom() =/= '_'</v>
-        <v>Arity = int()</v>
-        <v>MS = match_spec()</v>
-        <v>InitFunc = CallFunc = ReturnFunc = RemoveFunc = {Module,Function} | function()</v>
-        <v>NodeResult = {ok,1} | {ok,0} | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>See <seealso marker="inviso#tpm/4">inviso:tpm/4,5,8</seealso> for details.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpm_tracer(Mod,Func,Arity,MS) -> NodeResult | {error,Reason}</name>
-      <name>tpm_tracer(Mod,Func,Arity,MS,CallFunc) -> NodeResults | {error,Reason}</name>
-      <name>tpm_tracer(Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) -> NodeResults | {error,Reason}</name>
-      <fsummary>Activate meta tracing</fsummary>
-      <desc>
-        <p>See inviso:tpm_tracer/4,5,8 for details.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpm_ms(Mod,Func,Arity,MSname,MS) ->d NodeResult | {error,Reason}</name>
-      <fsummary>Add match specifications</fsummary>
-      <type>
-        <v>Mod = Func = atom()</v>
-        <v>Arity = int()</v>
-        <v>MSname = term()</v>
-        <v>MatchSpec = [match_spec()]</v>
-        <v>NodeResult = {ok,1} | {ok,0} | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>See <seealso marker="inviso#tpm_ms/5">inviso:tpm_ms/5</seealso> for details.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpm_ms_tracer(Mod,Func,Arity,MSname,MS) ->d NodeResult | {error,Reason}</name>
-      <fsummary>Add match specifications</fsummary>
-      <desc>
-        <p>See inviso:tpm_ms_tracer/5 for details.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctpm_ms(Mod,Func,Arity,MSname) -> NodeResult | {error,Reason}</name>
-      <fsummary>Remove a match specification</fsummary>
-      <type>
-        <v>NodeResult = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>See <seealso marker="inviso#ctpm_ms/4">inviso:ctpm_ms/4</seealso> for details.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctpm(Mod,Func,Arity) -> {ok,NodeResults} | NodeResult | {error,Reason}</name>
-      <fsummary>Remove a meta trace pattern</fsummary>
-      <type>
-        <v>NodeResults = [{Node,NodeResult}]</v>
-        <v>NodeResult = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>See <seealso marker="inviso#ctpm/3">inviso:ctpm/3</seealso> for details.</p>
-      </desc>
-    </func>
-    <func>
-      <name>local_register() ->NodeResult | {error,Reason}</name>
-      <fsummary>Set meta trace pattern on <c>register/2</c></fsummary>
-      <type>
-        <v>NodeResult = {R1,R2}</v>
-        <v>R1 = R2 = {ok,0} | {ok,1} | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>See <seealso marker="inviso#tpm_localnames/0">inviso:tpm_localnames/0</seealso> for details.</p>
-      </desc>
-    </func>
-    <func>
-      <name>remove_local_register() ->NodeResult | {error,Reason}</name>
-      <fsummary>Clear meta trace pattern on <c>register/2</c></fsummary>
-      <type>
-        <v>NodeResult = {R1,R2} | {error,Reason}</v>
-        <v>R1 = R2 = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>See <seealso marker="inviso#ctpm_localnames/0">inviso:ctpm_localnames/0</seealso> for details.</p>
-      </desc>
-    </func>
-    <func>
-      <name>global_register() ->NodeResult | {error,Reason}</name>
-      <fsummary>Set meta trace pattern on <c>global:register_name/2</c></fsummary>
-      <type>
-        <v>NodeResult = {R1,R2} | {error,Reason}</v>
-        <v>R1 = R2 = {ok,0} | {ok,1} | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>See <seealso marker="inviso#tpm_globalnames/0">inviso:tpm_globalnames/0</seealso> for details.</p>
-      </desc>
-    </func>
-    <func>
-      <name>remove_global_register() ->NodeResult | {error,Reason}</name>
-      <fsummary>Clear meta trace pattern on <c>global:register_name/2</c></fsummary>
-      <type>
-        <v>NodeResult = {R1,R2} | {error,Reason}</v>
-        <v>R1 = R2 = ok | {error,Reason}</v>
-      </type>
-      <desc>
-        <p>See <seealso marker="inviso#ctpm_globalnames/0">inviso:ctpm_globalnames/0</seealso> for details.</p>
-      </desc>
-    </func>
-  </funcs>
-</erlref>
-
diff --git a/lib/inviso/doc/src/inviso_rt_meta.xml b/lib/inviso/doc/src/inviso_rt_meta.xml
deleted file mode 100644
index a1e5400ce0..0000000000
--- a/lib/inviso/doc/src/inviso_rt_meta.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2006</year><year>2009</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
-    
-    </legalnotice>
-
-    <title>inviso_rt_meta</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>inviso_rt_meta</module>
-  <modulesummary>Direct API to the Inviso Runtime Component's meta tracer</modulesummary>
-  <description>
-    <p>This module provides a direct API to the inviso meta tracer. These functions are only meant to be used in meta tracing <c>CallFunc</c> and <c>RemoveFunc</c>.</p>
-    <p>It can sometimes be necessary to manipulate meta match-patterns from <c>CallFunc</c>s and <c>RemoveFunc</c>s. The problem then is that call-funcs and remove-funcs are meta trace call-backs executed inside the inviso meta tracer's context. Hence making calls to the regular API's manipulating meta trace-patterns will hang the inviso meta tracer!.</p>
-    <p>To remedy this problem, a number of useful tpm-functions are available in this API. It must be understood that their actions are local to the Erlang node where they are called.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>tpm_ms(Mod,Func,Arity,MSname,MS) -> {ok,0} | {ok,1} | {error,not_initiated}</name>
-      <fsummary>Adds a list of match-specs, associated with the name <c>MSname</c>, to <c>Mod:Func/Arity</c>.</fsummary>
-      <desc>
-        <p>See inviso:tpm_ms/6 for details. Note that this function only effects meta trace-patterns on the Erlang node where the function is called. This also implies that only the local inviso meta tracer's name-database is updated with <c>MSname</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tpm_ms_tracer(Mod,Func,Arity,MSname,MS) -> {ok,0} | {ok,1} | {error,not_initiated}</name>
-      <fsummary>As tpm_ms_tracer/5 but also adds a <c>{tracer,Tracer}</c>trace flag to the enable-list of every <c>trace</c>in <c>MS</c>.</fsummary>
-      <desc>
-        <p>See inviso:tpm_ms_ms/6 for details. Note that this function only effects meta trace-patterns on the Erlang node where the function is called. This also implies that only the local inviso meta tracer's name-database is updated with <c>MSname</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>list_tpm_ms(Mod,Func,Arity) -> [MSname]</name>
-      <fsummary>Returns a list of <c>MSname</c>.</fsummary>
-      <desc>
-        <p>Returns a list of all <c>MSname</c> in use for <c>Mod:Func/Arity</c>. This can be useful instead of having to have an own-implemented database over currently in use meta match-functions for a particular function.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ctpm_ms(Mod,Func,Arity,MSname) -> ok</name>
-      <fsummary>Removes the list of match-specs associated with the <c>MSname</c>from the meta trace-pattern of <c>Mod:Func/Arity</c>.</fsummary>
-      <desc>
-        <p>See inviso:ctpm_ms/5 for details. Note that this function only effects meta trace-patterns on the Erlang node where the function is called. This also implies that only the local inviso meta tracer's name-database is updated with <c>MSname</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_tracer() -> Tracer</name>
-      <fsummary>Returns the pid or port acting as regular tracer.</fsummary>
-      <type>
-        <v>Tracer = pid() | port()</v>
-      </type>
-      <desc>
-        <p>Returns the pid or port acting as the receiver of regular trace messages. This is useful if it is necessary to manipulate meta trace-patterns by hand (using <c>erlang:trace_pattern/3</c>) and the <c>{tracer,Tracer}</c> must be used in one of the match-function bodies.</p>
-      </desc>
-    </func>
-  </funcs>
-</erlref>
-
diff --git a/lib/inviso/doc/src/inviso_users_guide_pic1.gif b/lib/inviso/doc/src/inviso_users_guide_pic1.gif
deleted file mode 100644
index a6da9d37de..0000000000
--- a/lib/inviso/doc/src/inviso_users_guide_pic1.gif
+++ /dev/null
diff --git a/lib/inviso/doc/src/inviso_users_guide_pic1.ps b/lib/inviso/doc/src/inviso_users_guide_pic1.ps
deleted file mode 100644
index fc859cd129..0000000000
--- a/lib/inviso/doc/src/inviso_users_guide_pic1.ps
+++ /dev/null
@@ -1,24489 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0

-%%Title: /clearcase/otp/tools/inviso/doc/src/inviso_users_guide_pic1b.ps

-%%Creator: XV Version 3.10a  Rev: 12/29/94  -  by John Bradley

-%%BoundingBox: -1 161 615 630

-%%Pages: 1

-%%DocumentFonts:

-%%EndComments

-%%EndProlog

-

-%%Page: 1 1

-

-% remember original state

-/origstate save def

-

-% build a temporary dictionary

-20 dict begin

-

-% define string to hold a scanline's worth of data

-/pix 1848 string def

-

-% define space for color conversions

-/grays 616 string def  % space for gray scale line

-/npixls 0 def

-/rgbindx 0 def

-

-% lower left corner

--1 161 translate

-

-% size of image (on paper, in 1/72inch coords)

-616.03200 469.00800 scale

-

-% define 'colorimage' if it isn't defined

-%   ('colortogray' and 'mergeprocs' come from xwd2ps

-%     via xgrab)

-/colorimage where   % do we know about 'colorimage'?

-  { pop }           % yes: pop off the 'dict' returned

-  {                 % no:  define one

-    /colortogray {  % define an RGB->I function

-      /rgbdata exch store    % call input 'rgbdata'

-      rgbdata length 3 idiv

-      /npixls exch store

-      /rgbindx 0 store

-      0 1 npixls 1 sub {

-        grays exch

-        rgbdata rgbindx       get 20 mul    % Red

-        rgbdata rgbindx 1 add get 32 mul    % Green

-        rgbdata rgbindx 2 add get 12 mul    % Blue

-        add add 64 idiv      % I = .5G + .31R + .18B

-        put

-        /rgbindx rgbindx 3 add store

-      } for

-      grays 0 npixls getinterval

-    } bind def

-

-    % Utility procedure for colorimage operator.

-    % This procedure takes two procedures off the

-    % stack and merges them into a single procedure.

-

-    /mergeprocs { % def

-      dup length

-      3 -1 roll

-      dup

-      length

-      dup

-      5 1 roll

-      3 -1 roll

-      add

-      array cvx

-      dup

-      3 -1 roll

-      0 exch

-      putinterval

-      dup

-      4 2 roll

-      putinterval

-    } bind def

-

-    /colorimage { % def

-      pop pop     % remove 'false 3' operands

-      {colortogray} mergeprocs

-      image

-    } bind def

-  } ifelse          % end of 'false' case

-

-

-

-616 469 8			% dimensions of data

-[616 0 0 -469 0 469]		% mapping matrix

-{currentfile pix readhexstring pop}

-false 3 colorimage

-

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffff000000000000

-000000ffffffccccccffffffffffffffffff000000000000ffffffffffffccccccffffff

-000000ffffff000000000000ffffffffffffcccccc000000000000000000000000ffffff

-000000ffffff000000000000ffffffffffffffffff000000000000ffffffccccccffffff

-ffffffffffff000000ffffffffffffffffffccccccffffffffffffffffff000000000000

-000000ffffffccccccffffffffffffffffff000000000000ffffffffffffccccccffffff

-ffffff000000ffffff000000000000ffffffcccccc000000000000ffffffffffffffffff

-ffffff000000cccccc000000000000ffffffffffffffffffffffffffffffcccccc000000

-000000ffffffffffffffffffffffffffffff000000ffffff000000000000ffffffffffff

-ffffffffffff000000000000000000ffffffffffffffffffffffff000000cccccc000000

-000000ffffffffffff000000000000000000000000ffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffff000000ffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffff000000

-000000000000ffffffffffff000000ffffffffffffffffff000000ffffffffffff000000

-000000000000ffffffffffffffffffffffff000000ffffffffffff000000ffffffffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-000000000000000000ffffffffffff000000000000ffffffffffff000000ffffffffffff

-000000000000000000ffffffffffff000000ffffffffffffffffffffffff000000ffffff

-ffffff000000ffffffffffffffffff000000000000000000ffffffffffff000000ffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000000000000000ffffff

-ffffff000000ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffff000000ffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffffffffffffffff000000ffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffffffffff000000ffffffffffff000000ffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffff000000000000000000000000000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffff000000ffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffffffffffffffff000000ffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffffffffff000000ffffffffffff000000ffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffff000000ccccccffffff

-ffffffffffffffffffffffff000000ffffffccccccffffffffffff000000ffffffffffff

-000000ffffffccccccffffff000000ffffffffffffffffff000000ffffffccccccffffff

-000000ffffffffffffffffffffffff000000ccccccffffffffffffffffff000000ffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffff000000ccccccffffff

-ffffffffffffffffffffffff000000ffffffccccccffffffffffff000000ffffffffffff

-ffffff000000ccccccffffffffffff000000ffffffffffffffffff000000ccccccffffff

-ffffff000000ffffffffffffffffffffffff000000ffffffffffff000000ffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffff000000ffffffffffffffffffffffffccccccffffffffffff000000ffffffffffff

-ffffff000000ccccccffffff000000ffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-000000ffffff000000000000000000000000ffffffffffff000000000000ccccccffffff

-ffffff000000ffffff000000000000ffffffccccccffffff000000000000000000000000

-ffffffffffff000000ffffffffffffffffff000000ffffff000000000000ccccccffffff

-000000000000ffffffffffffffffffffffffcccccc000000000000000000ffffffffffff

-ffffffffffffccccccffffffffffffffffff000000000000000000ffffffccccccffffff

-ffffffffffff000000000000ffffffffffffccccccffffffffffff000000ffffff000000

-000000ffffffcccccc000000000000ffffffffffffffffff000000ffffff000000000000

-ffffffffffffffffffffffffffffffffffff000000000000ffffffffffffffffffffffff

-ffffff000000cccccc000000000000ffffffffffffffffffffffff000000000000000000

-ffffffffffffffffffffffff000000ffffff000000000000ffffffffffffffffff000000

-000000000000000000ffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff000000ffffff

-000000ffffffffffffffffffffffffffffff000000ffffffffffff000000ffffffffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000000000ffffffffffff000000ffffffffffffffffffffffff000000ffffff

-ffffff000000ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffff000000ffffff000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-000000000000000000ffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000000000ffffffffffff000000000000000000ffffffffffff000000000000

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffff000000ffffffffffffffffff000000000000000000ffffff

-ffffff000000000000ffffffffffff000000ffffff000000000000000000ffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-000000000000000000ffffffffffff000000ffffffffffff000000ffffffffffffffffff

-000000ffffffffffff000000000000000000ffffffffffff000000ffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000

-000000ffffffffffffffffffffffffffffff000000000000ffffffffffffffffff000000

-000000000000ffffff000000000000000000ffffffffffff000000000000ffffff000000

-000000000000ffffffffffffffffffffffffffffff000000000000ffffffffffffffffff

-ffffff000000000000000000ffffffffffffffffffffffffffffffffffff000000000000

-000000ffffffffffffffffffffffffffffff000000000000ffffffffffffffffffffffff

-000000000000000000ffffff000000000000000000ffffff000000000000000000ffffff

-ffffff000000ffffff000000000000ffffffffffffffffffffffffffffffffffff000000

-000000ffffffffffffffffffffffff000000000000000000ffffff000000000000000000

-ffffffffffff000000000000000000ffffffffffffffffff000000000000000000ffffff

-000000000000000000ffffff000000000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffff000000ffffffffffffffffff000000000000000000000000000000ffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-ffffff000000ffffffffffff000000ffffffffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000000000000000000000

-000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-ffffff000000ffffffffffff000000ffffffffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffff000000ccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-000000ffffffffffffffffffffffff000000ccccccffffffffffff000000ffffffffffff

-ffffff000000ccccccffffffffffff000000ffffffffffffffffff000000ccccccffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffff000000ccccccffffffffffffffffffffffffffffff

-000000ffffffccccccffffffffffff000000ffffffffffffffffff000000ccccccffffff

-ffffff000000ffffffffffffffffff000000ccccccffffff000000ffffffffffffffffff

-ffffff000000ccccccffffff000000ffffffffffffffffffffffff000000ccccccffffff

-ffffff000000ffffffffffffffffff000000ccccccffffff000000ffffffffffffffffff

-ffffffffffffccccccffffff000000ffffffffffffffffff000000ffffffccccccffffff

-000000ffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffff000000000000000000ffffff

-ffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff000000

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffff000000ffffffffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000000000ffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff

-000000ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000ffffffffffffffffffffffff000000000000ffffff000000ffffffffffff

-000000000000000000ffffff000000000000000000ffffffffffff000000000000ffffff

-ffffff000000000000000000ffffff000000000000000000ffffff000000000000000000

-ffffff000000000000000000ffffffffffffffffff000000000000000000ffffffffffff

-ffffffffffffffffffffffffffffffffffff000000000000000000ffffffffffffffffff

-ffffffffffff000000000000ffffffffffffffffffffffff000000000000000000ffffff

-000000000000000000ffffff000000000000000000ffffff000000ffffff000000000000

-ffffffffffffffffffffffffffffffffffff000000000000ffffffffffffffffffffffff

-000000000000000000ffffff000000000000000000ffffffffffff000000000000000000

-ffffffffffffffffff000000000000000000ffffff000000000000000000ffffffffffff

-000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffff000000ffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff000000000000000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffcccccc666666ffffffffffffffffffcccccc999999ccccccffffffffffff

-ffffff666666999999ffffffffffffffffffcccccc666666ffffffffffffffffffcccccc

-999999ccccccffffffffffffffffff666666999999ffffffffffffffffffcccccc666666

-ffffffffffffffffffcccccc999999ccccccffffffffffffffffff666666999999ffffff

-ffffffffffffcccccc666666ffffffffffffffffffcccccc999999ccccccffffffffffff

-ffffff666666999999ffffffffffffffffffcccccc666666ffffffffffffffffffcccccc

-999999999999ffffffffffffffffff999999999999ffffffffffffffffffcccccc666666

-ffffffffffffffffffcccccc999999999999ffffffffffffffffff999999999999ffffff

-ffffffffffffcccccc666666ffffffffffffffffffcccccc999999999999ffffffffffff

-ffffff999999999999ffffffffffffffffffcccccc666666ffffffffffffffffffcccccc

-666666999999ffffffffffffffffff999999999999ffffffffffffffffffcccccc666666

-ffffffffffffffffffcccccc666666999999ffffffffffffffffff999999999999ffffff

-ffffffffffffcccccc666666ffffffffffffffffffcccccc666666999999ffffffffffff

-ffffff999999999999ffffffffffffffffffcccccc666666ffffffffffffffffffcccccc

-666666999999ffffffffffffffffff999999999999ffffffffffffffffffcccccc666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc999999ccccccffffffffffffffffff666666999999ffffff

-ffffffffffff999999666666ffffffffffffffffffcccccc666666ccccccffffffffffff

-ffffff666666999999ffffffffffffffffff999999666666ffffffffffffffffffcccccc

-666666ccccccffffffffffffffffff666666999999ffffffffffffffffff999999666666

-ffffffffffffffffffcccccc666666ccccccffffffffffffffffff666666999999ffffff

-ffffffffffff999999666666ffffffffffffffffffcccccc666666ccccccffffffffffff

-ffffff666666999999ffffffffffffffffffcccccc666666ffffffffffffffffffcccccc

-666666ccccccffffffffffffffffff666666999999ffffffffffffffffffcccccc666666

-ffffffffffffffffffcccccc666666ccccccffffffffffffffffff666666999999ffffff

-ffffffffffffcccccc666666ffffffffffffffffffcccccc666666ccccccffffffffffff

-ffffff666666999999ffffffffffffffffffcccccc666666ffffffffffffffffffcccccc

-666666ccccccffffffffffffffffff666666999999ffffffffffffffffffcccccc666666

-ffffffffffffffffffcccccc999999ccccccffffffffffffffffff666666999999ffffff

-ffffffffffffcccccc666666ffffffffffffffffffcccccc999999ccccccffffffffffff

-ffffff666666999999ffffffffffffffffffcccccc666666ffffffffffffffffffcccccc

-999999ccccccffffffffffffffffff666666999999ffffffffffffffffffcccccc666666

-ffffffffffffffffffcccccc999999ccccccffffffffffffffffff666666999999ffffff

-ffffffffffffcccccc666666ffffffffffffffffffcccccc999999ccccccffffffffffff

-ffffff666666999999ffffffffffffffffffcccccc666666ffffffffffffffffffcccccc

-999999999999ffffffffffffffffff999999999999ffffffffffffffffffcccccc666666

-ffffffffffffffffffcccccc999999999999ffffffffffffffffff999999999999ffffff

-ffffffffffffcccccc666666ffffffffffffffffffcccccc999999999999ffffffffffff

-ffffff999999999999ffffffffffffffffffcccccc666666ffffffffffffffffffcccccc

-666666999999ffffffffffffffffff999999999999ffffffffffffffffffcccccc666666

-ffffffffffffffffffcccccc666666999999ffffffffffffffffff999999999999ffffff

-ffffffffffffcccccc666666ffffffffffffffffffcccccc666666999999ffffffffffff

-ffffff999999999999ffffffffffffffffffcccccc666666ffffffffffffffffffcccccc

-666666999999ffffffffffffffffff999999999999ffffffffffffffffffcccccc666666

-ffffffffffffffffffffffff

-ffffffffffff000000000000666666ffffffffffff666666000000333333ffffffffffff

-999999000000000000ccccccffffffffffff000000000000666666ffffffffffff666666

-000000333333ffffffffffff999999000000000000ccccccffffffffffff000000000000

-666666ffffffffffff666666000000333333ffffffffffff999999000000000000cccccc

-ffffffffffff000000000000666666ffffffffffff666666000000333333ffffffffffff

-999999000000000000ccccccffffffffffff000000000000666666ffffffffffff666666

-000000333333ffffffffffff999999000000000000ccccccffffffffffff000000000000

-666666ffffffffffff666666000000333333ffffffffffff999999000000000000cccccc

-ffffffffffff000000000000666666ffffffffffff666666000000333333ffffffffffff

-999999000000000000ccccccffffffffffff000000000000666666ffffffffffff666666

-000000333333ffffffffffff999999000000000000ccccccffffffffffff000000000000

-666666ffffffffffff666666000000333333ffffffffffff999999000000000000cccccc

-ffffffffffff000000000000666666ffffffffffff666666000000333333ffffffffffff

-999999000000000000ccccccffffffffffff000000000000666666ffffffffffff666666

-000000333333ffffffffffff999999000000000000ccccccffffffffffff000000000000

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333000000333333ffffffffffff999999000000000000ffffff

-ffffffffffff000000000000999999ffffffffffff333333000000333333ffffffffffff

-999999000000000000ffffffffffffffffff000000000000666666ffffffffffff333333

-000000333333ffffffffffff999999000000000000ffffffffffffffffff000000000000

-666666ffffffffffff333333000000333333ffffffffffff999999000000000000ffffff

-ffffffffffff000000000000666666ffffffffffff666666000000333333ffffffffffff

-999999000000000000ccccccffffffffffff000000000000666666ffffffffffff666666

-000000333333ffffffffffff999999000000000000ccccccffffffffffff000000000000

-666666ffffffffffff666666000000333333ffffffffffff999999000000000000cccccc

-ffffffffffff000000000000666666ffffffffffff666666000000333333ffffffffffff

-999999000000000000ccccccffffffffffff000000000000666666ffffffffffff666666

-000000333333ffffffffffff999999000000000000ccccccffffffffffff000000000000

-666666ffffffffffff666666000000333333ffffffffffff999999000000000000cccccc

-ffffffffffff000000000000666666ffffffffffff666666000000333333ffffffffffff

-999999000000000000ccccccffffffffffff000000000000666666ffffffffffff666666

-000000333333ffffffffffff999999000000000000ccccccffffffffffff000000000000

-666666ffffffffffff666666000000333333ffffffffffff999999000000000000cccccc

-ffffffffffff000000000000666666ffffffffffff666666000000333333ffffffffffff

-999999000000000000ccccccffffffffffff000000000000666666ffffffffffff666666

-000000333333ffffffffffff999999000000000000ccccccffffffffffff000000000000

-666666ffffffffffff666666000000333333ffffffffffff999999000000000000cccccc

-ffffffffffff000000000000666666ffffffffffff666666000000333333ffffffffffff

-999999000000000000ccccccffffffffffff000000000000666666ffffffffffff666666

-000000333333ffffffffffff999999000000000000ccccccffffffffffff000000000000

-666666ffffffffffff666666000000333333ffffffffffff999999000000000000cccccc

-ffffffffffff000000000000666666ffffffffffff666666000000333333ffffffffffff

-999999000000000000ccccccffffffffffff000000000000666666ffffffffffff666666

-000000333333ffffffffffff999999000000000000ccccccffffffffffff000000000000

-666666ffffffffffffffffff

-ffffffffffff999999333333ccccccffffffffffffcccccc333333999999ffffffffffff

-ffffff333333666666ffffffffffffffffff999999333333ccccccffffffffffffcccccc

-333333999999ffffffffffffffffff333333666666ffffffffffffffffff999999333333

-ccccccffffffffffffcccccc333333999999ffffffffffffffffff333333666666ffffff

-ffffffffffff999999333333ccccccffffffffffffcccccc333333999999ffffffffffff

-ffffff333333666666ffffffffffffffffff999999333333ccccccffffffffffffcccccc

-333333666666ffffffffffffffffff333333666666ffffffffffffffffff999999333333

-ccccccffffffffffffcccccc333333666666ffffffffffffffffff333333666666ffffff

-ffffffffffff999999333333ccccccffffffffffffcccccc333333666666ffffffffffff

-ffffff333333666666ffffffffffffffffff999999333333ccccccffffffffffffcccccc

-333333666666ffffffffffffffffff333333666666ffffffffffffffffff999999333333

-ccccccffffffffffffcccccc333333666666ffffffffffffffffff333333666666ffffff

-ffffffffffff999999333333ccccccffffffffffffcccccc333333666666ffffffffffff

-ffffff333333666666ffffffffffffffffff999999333333ccccccffffffffffffcccccc

-333333666666ffffffffffffffffff333333666666ffffffffffffffffff999999333333

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333999999ffffffffffffffffff333333666666ffffff

-ffffffffffff666666333333ffffffffffffffffff999999333333999999ffffffffffff

-ffffff333333666666ffffffffffffffffff666666333333ffffffffffffffffff999999

-333333999999ffffffffffffffffff333333666666ffffffffffffffffff666666333333

-ffffffffffffffffff999999333333999999ffffffffffffffffff333333666666ffffff

-ffffffffffff666666333333ffffffffffffffffff999999333333999999ffffffffffff

-ffffff333333666666ffffffffffffffffff999999333333ffffffffffffffffff999999

-333333999999ffffffffffffffffff333333666666ffffffffffffffffff999999333333

-ffffffffffffffffff999999333333999999ffffffffffffffffff333333666666ffffff

-ffffffffffff999999333333ffffffffffffffffff999999333333999999ffffffffffff

-ffffff333333666666ffffffffffffffffff999999333333ffffffffffffffffff999999

-333333999999ffffffffffffffffff333333666666ffffffffffffffffff999999333333

-ccccccffffffffffffcccccc333333999999ffffffffffffffffff333333666666ffffff

-ffffffffffff999999333333ccccccffffffffffffcccccc333333999999ffffffffffff

-ffffff333333666666ffffffffffffffffff999999333333ccccccffffffffffffcccccc

-333333999999ffffffffffffffffff333333666666ffffffffffffffffff999999333333

-ccccccffffffffffffcccccc333333999999ffffffffffffffffff333333666666ffffff

-ffffffffffff999999333333ccccccffffffffffffcccccc333333999999ffffffffffff

-ffffff333333666666ffffffffffffffffff999999333333ccccccffffffffffffcccccc

-333333666666ffffffffffffffffff333333666666ffffffffffffffffff999999333333

-ccccccffffffffffffcccccc333333666666ffffffffffffffffff333333666666ffffff

-ffffffffffff999999333333ccccccffffffffffffcccccc333333666666ffffffffffff

-ffffff333333666666ffffffffffffffffff999999333333ccccccffffffffffffcccccc

-333333666666ffffffffffffffffff333333666666ffffffffffffffffff999999333333

-ccccccffffffffffffcccccc333333666666ffffffffffffffffff333333666666ffffff

-ffffffffffff999999333333ccccccffffffffffffcccccc333333666666ffffffffffff

-ffffff333333666666ffffffffffffffffff999999333333ccccccffffffffffffcccccc

-333333666666ffffffffffffffffff333333666666ffffffffffffffffff999999333333

-ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc333333333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000333333ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc333333333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc999999cccccc666666999999666666999999666666333333

-333333333333333333333333333333333333333333333333333333999999666666999999

-666666999999999999ccccccccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffff000000ffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffcccccc000000ffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffff000000ccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffff000000ffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999666666

-666666000000000000333333666666333333666666666666999999666666999999cccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccc666666999999666666

-999999666666666666333333333333000000333333333333999999999999cccccccccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffff000000

-000000000000000000ffffffffffff000000000000ffffffffffffffffff000000ffffff

-000000000000ffffffffffffffffff000000000000000000000000ffffffffffff000000

-ffffffffffffffffff000000ffffff000000000000ffffffffffff000000000000ffffff

-ffffffffffffffffffffffff000000000000000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000000000000000000000ffffffffffffffffff

-000000000000ffffffffffffffffffffffffffffffffffff000000000000ffffffffffff

-ffffffffffffffffff000000ffffffffffffffffffffffff000000000000000000ffffff

-ffffffffffffffffffffffffffffffffffff000000000000000000ffffffffffffffffff

-000000ffffff000000000000ffffffffffffffffffffffff000000ffffff000000000000

-ffffffffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffffffffff000000000000000000ffffffffffffffffffffffff000000000000000000

-ffffffffffffffffff000000000000000000000000ffffffffffff000000ffffffffffff

-ffffffffffff000000000000ffffffffffffffffffffffffffffff000000ffffff000000

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc666666666666333333000000000000333333666666999999

-999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccccccccc666666666666333333333333

-000000333333333333999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000000000000000ffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffff000000000000000000

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000000000

-ffffffffffff000000000000000000ffffffffffff000000000000ffffffffffff000000

-ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff000000ffffffffffffffffffffffff000000

-ffffffffffff000000ffffffffffffffffffffffff000000ffffffffffff000000ffffff

-ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff000000ffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffff000000ffffff000000

-000000000000ffffffffffff000000ffffffffffff000000000000000000ffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffff000000000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffff000000000000ffffffffffff

-ffffff000000ffffffffffff000000ffffffffffffffffff000000000000000000ffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-999999666666333333333333999999999999ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccccccccc666666333333000000666666999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffffffff000000

-ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000

-ffffffffffffffffff000000000000000000000000000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffffffffff000000

-ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000000000ffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000ffffffffffffffffff000000ffffffffffffffffffffffff000000ffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666000000333333

-666666999999ccccccffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffff999999666666000000333333666666999999

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffff000000ccccccffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffcccccc000000

-ffffffffffffffffff000000ffffffffffffcccccc000000ffffffffffffffffff000000

-ffffffffffffcccccc000000ffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffffcccccc000000ffffffffffff000000ffffffffffffffffffcccccc000000

-ffffffffffffffffff000000ffffffffffffccccccffffff000000000000ffffffffffff

-ffffffffffffccccccffffffffffffffffff000000000000ffffff000000ccccccffffff

-000000ffffffffffffffffffffffff000000ccccccffffff000000ffffffffffffffffff

-ffffff000000ccccccffffffffffff000000ffffffffffffffffff000000ccccccffffff

-ffffff000000ffffffffffffffffffffffffccccccffffffffffff000000000000ffffff

-000000ffffffccccccffffff000000ffffffffffffffffffffffff000000ccccccffffff

-000000ffffffffffffffffffffffff000000ccccccffffffffffff000000ffffffffffff

-ffffff000000ccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999666666000000666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999666666

-000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffffffff000000

-ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000

-ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffffffffff000000

-ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff000000ffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffffffffff000000ffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666000000666666999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666333333333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffff000000ffffffffffff000000000000000000ffffffffffff000000ffffff

-ffffffffffff000000ffffffffffffffffff000000ffffff000000ffffffffffff000000

-ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff000000

-ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff000000ffffff000000ffffffffffff000000

-ffffffffffff000000ffffffffffffffffffffffff000000ffffffffffff000000ffffff

-ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff000000ffffff

-ffffffffffffffffffffffffffffff000000ffffffffffff000000000000ffffffffffff

-000000000000ffffffffffff000000ffffffffffffffffff000000000000ffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffff000000

-000000ffffffffffffffffff000000ffffff000000ffffffffffff000000ffffffffffff

-ffffff000000ffffffffffff000000ffffffffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333666666999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc333333333333999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000000000000000ffffff

-ffffffffffffffffff000000000000ffffff000000ffffffffffff000000000000000000

-ffffff000000000000000000ffffffffffff000000000000ffffffffffff000000000000

-000000ffffff000000000000000000ffffff000000000000000000ffffff000000000000

-000000ffffffffffffffffff000000000000000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff000000000000ffffffffffffffffffffffff

-000000000000ffffffffffffffffffffffffffffffffffff000000000000ffffffffffff

-ffffffffffff000000000000000000ffffffffffff000000000000000000ffffffffffff

-ffffffffffffffffffffffffffffff000000000000000000ffffff000000000000ffffff

-000000ffffff000000000000ffffffffffffffffffffffff000000ffffff000000000000

-ffffffffffffffffffffffff000000000000000000ffffff000000000000000000ffffff

-ffffffffffff000000000000000000ffffffffffffffffff000000000000000000ffffff

-000000000000ffffffffffff000000000000ffffffffffff000000000000000000ffffff

-ffffffffffff000000000000ffffffffffffffffffffffff000000000000000000ffffff

-000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666333333

-666666ffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffcccccc666666000000999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-000000ffffffccccccffffffffffffffffffffffffffffff000000ffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999000000999999cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666333333666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc333333333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999333333666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-000000999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000000000

-000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000ffffffffffffffffffffffffffffff000000000000000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333ccccccccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffff999999333333666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999333333ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-666666ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc333333ccccccffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffcccccc

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff666666999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccccccccccccccccccccc

-ffffffffffffffffffcccccc999999ccccccffffffffffffffffffcccccccccccccccccc

-ccccccccccccccccccccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffccccccffffffffffffffffff

-ffffff999999333333333333333333000000000000000000000000000000000000333333

-ffffffffffffffffffffffff000000ccccccffffffffffffffffff333333000000000000

-000000000000000000000000000000000000000000333333ffffffffffffffffffffffff

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc999999ffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-cccccc999999999999333333ffffffffffffffffffcccccc000000ccccccffffffffffff

-ffffff666666666666666666999999666666cccccc999999ccccccccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccccccccccccccccccccc999999ffffffffffffffffffcccccc

-000000ccccccffffffffffffffffff666666666666666666ccccccccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333ffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666666666333333333333000000000000

-000000000000333333666666ffffffffffffffffffffffff999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999333333333333000000000000000000333333

-666666999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999999999ffffffffffffffffff666666333333333333666666666666cccccccccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999666666

-666666000000000000666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc999999666666333333ccccccffffffffffffffffff

-333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffff999999333333ffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff000000000000000000ffffffffffffffffff000000000000ffffff

-000000000000ffffff000000000000000000ffffff000000000000000000ffffff000000

-000000000000ffffffffffffffffffffffff000000000000000000000000ffffffffffff

-000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000000000000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-999999666666333333000000000000000000333333333333ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffccccccccccccffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333ffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffff000000ffffffffffffffffffffffff000000000000

-ffffffffffff000000ffffff000000ffffffccccccffffff000000ffffffffffffffffff

-ffffff000000ccccccffffffffffff000000ffffffffffffffffffffffffcccccc000000

-ffffffffffffffffff000000ffffffffffffccccccffffffffffffffffffffffffffffff

-000000ffffffccccccffffff000000ffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffff666666999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000000000

-000000333333000000999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000333333666666ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffff000000ffffff

-ffffffffffff000000ffffff000000ffffffffffff000000ffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffff000000000000000000ffffffffffff000000

-ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666333333ffffffffffffffffffcccccccccccccccccc

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc666666333333000000333333666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffff000000ffffff

-ffffffffffff000000ffffffffffff000000ffffff000000ffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffff000000ffffff000000

-ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333ffffffffffffffffffcccccc999999666666333333000000

-666666ffffffffffffffffff999999ccccccffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666333333000000333333999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff000000000000000000000000000000ffffff000000000000000000

-ffffff000000000000000000ffffff000000000000ffffffffffffffffffffffff000000

-000000000000000000000000ffffff000000000000000000000000ffffffffffffffffff

-000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000000000000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999333333999999333333333333000000000000333333666666999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffcccccc333333666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666ffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffff000000000000000000666666666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000000000000000000000000000000000000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffccccccccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff333333ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff333333000000333333ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc333333ccccccffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666000000333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333

-000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff333333999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999333333000000666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc999999ffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333999999

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-666666333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff333333999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc333333999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333666666ffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffcccccc666666333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999333333333333999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666333333333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff666666333333999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-333333666666666666000000000000000000666666ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333000000666666ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666333333ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666333333

-ccccccffffffcccccc000000000000000000000000000000666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc000000333333999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333333333

-999999ffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffff999999333333333333999999ffffff

-ffffffffffffffffff000000000000000000000000000000000000666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff333333000000666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-666666000000999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999333333666666ccccccffffffffffffffffff

-ffffffffffffffffff666666000000000000000000000000666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666333333333333999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666000000666666ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffff999999000000000000000000000000ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666333333333333999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-666666000000666666999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc000000000000999999333333333333ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccccccccc666666333333000000666666

-999999ffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffcccccc999999666666333333000000666666

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ccccccffffffffffff333333333333ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-666666000000333333666666ccccccccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc999999333333333333666666999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999333333333333000000333333333333999999999999cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999cccccc666666666666

-333333000000000000666666666666ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999cccccc666666666666333333

-000000333333666666666666999999666666ccccccccccccccccccccccccccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccccccccccccccc

-cccccc999999999999666666999999333333333333000000666666333333999999999999

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999333333ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999999999666666999999333333333333333333333333333333000000

-000000000000000000000000000000000000000000000000000000333333333333333333

-333333666666666666666666666666ccccccccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-000000999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc000000000000999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333000000ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666000000666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333666666

-cccccc000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999000000333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666333333ffffffffffff

-999999000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333000000

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff666666333333999999ffffffffffffffffff

-333333000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666

-000000999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999000000999999ffffffffffffffffffffffffcccccc

-333333000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff333333999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999333333666666ffffffffffffffffffffffffffffffffffff999999

-666666000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333666666ccccccffffffffffffffffffffffffffffffffffffffffff333333

-cccccc000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666

-000000ccccccffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333666666ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999000000666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333cccccc

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666000000999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333ffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666000000999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666333333999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333000000

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333ccccccffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999333333333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333ffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999000000999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff333333ccccccffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff333333000000999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333ffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666000000666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc666666333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff333333ccccccffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999666666ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffccccccccccccffffffffffffffffff666666999999666666333333

-333333333333333333333333999999ffffffcccccc333333666666999999666666999999

-666666999999666666ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc333333ffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666ffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999999999666666

-666666333333000000000000666666ffffffffffffffffff999999666666999999cccccc

-ccccccccccccccccccccccccffffffffffffffffffcccccc999999666666999999666666

-999999666666999999666666ffffffffffffffffff333333666666666666cccccccccccc

-ffffffffffffffffffffffffffffffffffff999999666666ffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666ffffffffffffffffff333333666666999999

-999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666999999333333333333

-000000333333666666ffffffffffffffffff333333ccccccffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffccccccccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-cccccc666666333333000000666666999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffff999999000000999999ffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333333333

-333333999999ccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffff999999333333666666000000333333333333cccccc

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc999999999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333ccccccffffffffffffcccccc999999333333

-333333000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000

-666666ccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999333333333333666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc333333ffffffffffffffffffffffffffffffffffff

-cccccc000000ffffffffffff999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-000000000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999000000666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666000000666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffff666666000000666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc000000666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000999999ccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffff333333ccccccccccccffffffffffffffffffffffffffffff

-ffffff000000ccccccffffffffffffffffff666666333333333333ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc000000666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc000000333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffff999999000000666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc000000666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc000000333333ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999000000999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffff999999cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc000000ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333333333ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff333333666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999333333999999ffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffff000000000000000000000000

-000000ffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-000000000000ffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333ffffffffffffffffffffffffffffffffffffccccccffffff

-ffffff000000ffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffcccccc000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000ffffff000000ffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffcccccc666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff333333666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-000000000000ffffff000000ffffffffffff000000000000000000ffffffffffffffffff

-000000000000ffffffffffffffffff000000000000ffffffffffffffffffffffffffffff

-000000ffffffffffff000000000000000000ffffffffffff000000000000000000000000

-ffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333666666ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ccccccffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffff000000ffffffffffff

-ffffff000000000000ffffffffffff000000ffffffffffff000000ffffffcccccc000000

-ffffff000000ffffffffffff000000ffffff000000ccccccccccccffffffffffffffffff

-000000999999000000333333333333000000333333000000ffffffffffff333333333333

-666666666666333333999999666666999999666666ccccccffffffffffffffffffffffff

-ffffff000000ccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffff000000999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffcccccc

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffff000000ffffffffffffffffff000000ffffff000000ffffff

-ffffff999999999999000000333333000000000000000000666666ffffffffffffffffff

-999999666666999999ccccccccccccccccccccccccccccccffffffffffffffffffcccccc

-999999666666999999666666999999666666999999666666ffffffffffffffffff333333

-666666000000ccccccccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffff999999

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-000000ffffffffffffffffff000000ffffffffffff000000999999666666666666ffffff

-ffffff333333666666999999999999ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-666666000000333333333333000000333333666666ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-333333000000999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff000000000000000000ffffffffffff

-000000ffffffffffffcccccc000000000000333333000000666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffccccccccccccffffffffffffcccccc666666999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333333333ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffff333333999999

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffff333333333333333333999999ccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffff000000ffffffffffffffffffffffffccccccffffffffffffffffff999999666666

-000000333333333333ccccccffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666000000666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999000000333333ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffff333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc999999333333333333999999ffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999000000666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333333333ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffcccccc333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc999999333333333333666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffccccccccccccffffffffffff999999666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999000000333333ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc333333333333ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffccccccccccccffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666000000666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666000000333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333333333ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffff000000999999ccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffff000000ccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffff666666333333

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333000000ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000666666ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-000000999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffff333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333333333

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffff666666333333ffffffffffffffffffffffffffffffffffffffffff333333999999

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffff999999333333999999ffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-000000000000000000000000000000ffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffff000000000000ffffffffffffffffffffffffccccccffffff

-ffffff333333ffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffcccccc000000999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666333333ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffff000000ffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff333333999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc000000333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffff000000000000ffffff000000ffffffffffff000000000000

-000000ffffffffffffffffff000000000000ffffffffffffffffff000000000000ffffff

-ffffffffffffffffffffffff000000ffffffffffff000000000000000000ffffffffffff

-000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333333333ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-333333333333ccccccffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffccccccffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffff000000ffffffffffffffffff000000000000ffffffffffff000000ffffffffffff

-000000ffffffcccccc000000ffffff000000ffffffffffff000000ffffff000000cccccc

-ccccccffffffffffffffffff000000999999000000333333333333000000333333000000

-ffffffffffff333333333333666666999999666666999999666666999999666666cccccc

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffff000000999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc333333000000ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999000000ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-000000ffffff000000ffffffffffff999999999999000000333333000000000000000000

-666666ffffffffffffffffff999999666666999999cccccccccccccccccccccccccccccc

-ffffffffffffffffffcccccc999999666666999999666666999999666666999999666666

-ffffffffffffffffff333333666666666666ccccccccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999000000999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff666666000000ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff000000

-999999666666666666ffffffffffff333333666666999999999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc666666999999333333333333000000333333666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999000000666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666000000ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000ffffffffffff000000ffffffffffffcccccc000000000000333333000000

-666666999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffccccccccccccffffff

-ffffffcccccc666666999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333333333999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666333333ccccccffffffffffffffffffccccccffffff

-ffffffffffff333333999999ffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffff333333333333333333999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffff999999666666000000333333333333ccccccffffffffffffffffffffffff

-999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999333333999999ffffffffffffffffffffffff

-ffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc999999999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc999999333333333333999999ffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666000000

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc333333333333ccccccffffffffffff

-ffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-333333333333666666ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffccccccccccccffffffffffff

-999999666666999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-000000ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999000000666666cccccc

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666000000666666

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-666666000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-666666999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666cccccc

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffff000000999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffff666666333333333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999000000666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999000000999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666000000666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc333333333333ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999000000333333999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffff666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff333333999999ffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-999999333333999999ffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffff000000000000000000000000000000ffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffff000000000000ffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffcccccc000000999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333000000

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffff000000ffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333000000999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-333333666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999000000333333999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc000000ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffff000000000000ffffff000000

-ffffffffffff000000000000000000ffffffffffffffffff000000000000ffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffff000000ffffffffffff000000

-000000000000ffffffffffff000000000000000000000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff333333333333ccccccffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffccccccffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffff000000ffffffffffffffffff000000000000ffffff

-ffffff000000ffffffffffff000000ffffffcccccc000000ffffff000000ffffffffffff

-000000ffffff000000ffffffffffffffffffffffffffffff000000ffffff000000ffffff

-ffffff000000ffffff000000ffffffffffff000000ffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffff000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-000000ffffffffffffffffff000000ffffff000000ffffffffffffffffffffffff000000

-000000000000ffffffffffffffffffffffffffffffffffff000000000000ffffffffffff

-ffffff000000ffffff000000000000000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc000000ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666000000

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff

-000000ffffffffffff000000ffffffffffff000000ffffffffffff000000ffffff000000

-ffffffffffff000000ffffffffffffffffffffffff000000ffffff000000ffffffffffff

-000000ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-000000ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc333333ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff000000000000000000ffffffffffff000000ffffffffffffffffff

-000000000000000000000000000000ffffff000000000000000000ffffffffffff000000

-000000000000ffffffffffffffffffffffffffffff000000000000000000000000000000

-ffffffffffffffffff000000000000000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-333333333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666333333ccccccffffff

-ffffffffffffccccccffffffffffffffffff333333999999ffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-666666000000000000999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333999999

-ffffffffffffffffffffffffffffffffffff333333ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000000000000000000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666000000333333666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff333333666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333

-333333ccccccffffffffffffffffffcccccc333333ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff666666999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666333333000000666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000666666ccccccffffff999999666666ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff666666999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999333333000000333333ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666ccccccffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffff999999666666ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff666666ffffffffffffffffffcccccc999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff666666999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333ccccccffffffcccccc333333333333

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000000000ffffff000000000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff666666999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000000000000000

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff333333ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333000000000000000000

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffff666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff333333999999ffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffff000000ffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffff000000ccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999000000000000666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc000000000000000000000000000000

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000000000ffffffffffffffffff000000000000000000

-ffffffffffff000000ffffffffffff000000ffffffffffffffffff000000000000ffffff

-ffffff000000000000ffffff000000000000000000ffffffffffff000000000000000000

-ffffff000000000000ffffff000000ffffff000000000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999333333000000000000

-666666ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333000000000000000000000000000000

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff333333999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff000000ffffff000000ffffffffffff000000ffffffffffff000000

-ffffffffffff000000ffffffffffff000000ffffffffffff000000ffffff000000ffffff

-000000ffffff000000ffffffffffff000000ffffffffffff000000ffffffffffff000000

-ffffffffffff000000000000ffffffffffff000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffccccccccccccffffffffffffffffff999999666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-000000000000000000999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc999999333333000000000000000000

-000000ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffffffffff000000ffffffffffffffffff000000

-ffffffffffff000000ffffffffffff000000ffffff000000000000000000ffffff000000

-ffffffffffffffffffffffffffffff000000ffffff000000ffffffffffffffffff000000

-ffffffffffff000000ffffffffffffffffffffffff000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333999999999999666666000000000000000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666000000333333ffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999333333

-000000666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff333333333333ccccccffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffff000000ffffff000000ffffffffffff000000ffffff

-ffffff000000ffffffffffff000000ffffffcccccc000000ffffffffffff000000000000

-ffffffffffff000000ffffff000000ffffffffffff000000ffffffffffff000000ffffff

-ffffff000000ffffffffffffffffff000000cccccc000000ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffff000000000000000000000000000000000000000000000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffccccccffffffffffffffffffcccccc999999ffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999cccccc999999999999666666999999666666999999333333333333

-333333000000333333333333333333333333333333333333666666999999666666999999

-666666cccccc999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000000000000000ffffffffffff000000000000000000ffffffffffff

-ffffff000000000000ffffff000000000000ffffff000000000000000000ffffff000000

-000000000000ffffffffffff000000000000ffffff000000000000000000ffffffffffff

-ffffff000000ffffffffffffffffff000000000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666333333333333000000000000000000000000000000000000666666666666

-ccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccccccccc999999999999333333

-333333000000666666333333666666666666999999666666999999666666cccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccc999999666666999999666666

-666666333333666666333333000000000000666666666666999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-666666333333ccccccffffff666666000000000000000000000000333333333333333333

-000000000000000000333333333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc333333999999999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999333333333333000000333333333333666666666666cccccc

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc999999999999666666333333000000000000

-333333666666666666ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333000000999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-333333ffffffffffffffffffffffffcccccc333333000000000000666666ffffffffffff

-ffffffcccccc999999666666999999ffffffffffffffffffcccccc333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666000000000000000000666666999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-666666000000333333666666ccccccccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc999999999999333333333333666666999999ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000ffffff

-666666333333ccccccffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffcccccc333333

-ccccccffffffffffffffffffffffffffffffcccccc666666000000999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999ffffffffffff

-ffffffffffff000000333333333333999999999999ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccccccccc999999333333000000000000333333666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc999999666666333333000000666666

-999999ffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffcccccc999999333333333333000000666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000333333ffffff

-ffffff999999333333999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffccccccccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc666666666666333333000000000000000000000000666666666666

-ccccccccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffff999999666666333333000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999333333333333666666999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666000000

-666666999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc999999999999666666999999666666666666999999ffffffffffffcccccc333333

-666666333333999999666666999999666666ccccccccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666000000666666ffffff

-ffffffffffffcccccc333333333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc666666666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc999999999999333333333333

-666666000000000000cccccc999999999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-ffffffffffffffffffffffff333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666333333333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999666666000000666666999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccccccccc999999ffffffffffff999999

-000000666666666666999999666666999999999999ffffffffffffffffffcccccccccccc

-999999cccccc666666999999666666999999333333333333666666ffffffffffffcccccc

-999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666000000ccccccffffff

-ffffffffffffffffffffffff999999000000666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff666666333333666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc999999666666ffffffffffffffffffcccccc666666666666

-ccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc666666ffffffffffffffffffffffff999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666333333999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666000000333333333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-666666333333333333333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000000000ccccccffffff

-ffffffffffffffffffffffffffffffffffff666666ccccccffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffcccccc666666000000666666ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffcccccc333333333333

-000000000000000000333333666666999999999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333000000000000

-333333999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999000000666666

-ccccccffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffff333333333333666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666000000666666999999ffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999333333000000333333ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc000000333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666333333666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccccccccc666666666666000000000000000000ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-666666000000000000000000333333666666ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc999999000000999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffccccccffffffffffff

-ffffff999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999000000666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333

-000000666666ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffccccccccccccffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccccccccccccccffffffffffffffffff

-000000999999ffffffffffffffffffccccccccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999666666333333000000ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999000000999999ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333333333ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff333333000000999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666000000000000999999ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999333333333333ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffffffffff666666000000000000666666666666cccccccccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-666666333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999333333333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-666666000000999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff000000000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000666666666666999999ffffffffffffccccccffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffcccccccccccc

-333333333333ccccccffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffcccccc999999666666333333000000666666ccccccffffffffffffffffff

-ffffffffffff333333999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999999999666666333333000000000000

-000000333333666666999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-ccccccffffffffffffffffff666666333333333333999999999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666333333ccccccffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffcccccc000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc000000333333999999ffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffcccccc333333000000999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff000000333333ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-000000000000999999ffffffffffffffffffffffffffffff999999000000333333666666

-ccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666000000

-000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-ffffffffffffffffff333333999999ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffff666666000000333333999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-999999666666666666333333ffffffffffffffffffffffff999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666666666000000000000000000333333666666

-999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999000000666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000

-000000999999ffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-333333333333000000666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333000000000000333333

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccccccccc999999999999333333333333000000666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333000000333333ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc000000ffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999666666333333

-000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff666666000000ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000000000

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999ffffffffffffffffff333333000000333333666666666666

-999999ccccccccccccffffffffffffcccccc666666000000000000000000999999cccccc

-ffffffffffffffffffffffffffffffffffffcccccccccccccccccccccccccccccc666666

-999999ffffffffffffffffff333333333333666666666666ccccccccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666000000666666ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333000000000000333333333333999999ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffcccccc000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff000000000000ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999000000000000999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999999999

-666666333333333333999999333333000000000000000000000000000000000000000000

-000000000000ccccccffffffffffff333333000000333333333333333333333333999999

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333000000333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccccccccc666666666666000000000000000000333333333333999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccccccccffffffffffffffffffffffff

-000000000000333333666666999999ccccccccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333ffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffcccccc666666999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333666666

-ccccccffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffff666666666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc000000333333ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc000000000000999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666000000000000000000999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccccccccc666666666666999999

-ffffffffffffffffffccccccccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc999999999999333333333333000000000000333333666666666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999000000666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999000000000000999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-333333000000000000333333666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333ffffffffffffffffffccccccccccccccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc999999999999333333333333666666ffffff

-ffffffffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999333333ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff000000000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333000000999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999000000000000999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666000000

-000000000000999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff000000ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999000000000000000000

-666666999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666ffffffffffffffffffcccccc666666666666999999999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc333333ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffff000000ffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999000000000000666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333000000000000000000

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-333333000000000000000000333333999999999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333333333000000000000

-000000000000333333666666666666ccccccccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff000000ccccccffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffcccccc333333

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999333333ccccccffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffff000000ffffff000000ffffff000000000000ffffff

-ffffff000000ffffff000000000000000000cccccc000000000000000000ffffffffffff

-000000000000cccccc000000000000000000ffffffffffff000000000000000000ffffff

-000000000000ffffff000000000000000000000000ffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc000000333333ffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc000000000000999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666000000000000000000999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999666666000000333333ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-cccccc999999666666333333333333000000ccccccffffffffffffffffffcccccccccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff666666ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000000000000000000000ffffffffffff000000ffffff

-ffffff000000ffffffffffff000000ffffff000000ffffffffffff000000ffffffffffff

-000000ffffffffffffffffff000000ffffffffffff000000ffffffffffff000000ffffff

-ffffff000000000000ffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666000000666666ffffffffffffffffffffffffffffff

-ffffffffffff999999000000000000999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333000000000000333333666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc000000333333999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffcccccc000000

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffff333333999999

-ffffffffffffffffffcccccc666666999999999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc333333ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffff000000ffffffffffff000000ffffff

-ffffff000000ffffffffffff000000000000ffffffffffffffffff000000ffffffffffff

-ffffff000000ffffffffffff000000ffffff000000ffffffffffffffffff000000ffffff

-ffffff000000ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666000000ccccccffffffffffffffffffffffffffffff

-ffffffcccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666000000000000000000999999ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666000000333333

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-ffffffffffffffffffffffff666666666666ccccccccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666000000000000000000333333333333666666999999

-ccccccccccccffffffffffff666666999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff000000ffffffffffffffffff000000ffffff000000ffffffffffff

-000000ffffffffffff000000ffffff000000ffffffffffff000000ffffffffffff000000

-ffffff000000ffffff000000ffffffffffff000000ffffffffffff000000ffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000000000ccccccffffffffffffffffffffffffffffff

-999999000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-333333000000000000000000666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666

-000000333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666333333000000000000000000666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccccccccc666666666666333333000000

-000000000000cccccccccccc333333ffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffff666666999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666666666ccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffff000000000000000000ffffff000000000000000000000000000000000000

-000000000000cccccc000000000000000000000000000000ffffffffffffcccccc000000

-000000ffffffffffff000000000000ffffff000000000000000000000000000000ffffff

-000000ffffffccccccffffff000000000000ffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc000000333333ffffffffffffffffffffffffffffffcccccc

-000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666000000

-000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc999999333333000000000000

-333333000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffff666666999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999000000666666ffffffffffffffffffffffff999999000000

-000000999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333000000000000333333

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999333333000000999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-333333000000000000ccccccffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333000000999999ffffffffffffffffff999999000000000000

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666000000000000000000999999cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffff666666666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-333333333333666666000000000000999999ffffffffffff999999000000000000666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333000000000000000000666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccccccccffffffffffffffffff999999

-666666999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999333333ffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666ffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffff666666999999ffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000000000000000000000666666999999000000000000999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffff

-ffffffcccccc666666000000000000000000999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333000000000000333333999999999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000000000000000000000000000000000000000999999ffffffffffff

-ffffffffffffffffffffffffffffffffffff999999333333ccccccffffffffffffcccccc

-333333000000000000333333666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666000000000000000000666666999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000000000000000000000000000000000666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc000000000000999999cccccc666666000000

-000000000000999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc999999333333000000333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000

-000000ffffffffffffffffff000000000000ffffff000000000000ffffff000000000000

-000000ffffff000000000000000000ffffff000000000000000000ffffffffffffffffff

-ffffff000000000000000000000000ffffffffffff000000000000000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff000000000000ffffff000000000000

-ffffff000000000000000000000000000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffccccccccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000000000000000000000000000000000000000ccccccffffffffffff

-ffffffffffffffffffffffffcccccc333333000000000000000000000000000000000000

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666000000000000999999ffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666ffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-000000ffffffffffffffffffffffff000000000000ffffffffffff000000ffffff000000

-ffffffffffffcccccc000000ffffffffffffffffffffffff000000ffffffccccccffffff

-000000ffffffffffffffffffffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffffccccccffffffffffffffffffffffffffffff000000000000ccccccffffff

-ffffffffffff000000ffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffff333333999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffff

-ffffffffffffcccccc000000ffffffffffffffffffffffffffffff000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333000000000000000000000000000000000000000000000000ccccccffffff

-ffffffffffffffffffffffff666666000000000000000000000000000000999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc666666000000333333999999ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffff000000

-ffffffffffff000000ffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffff000000000000000000ffffffffffff000000ffffffffffffffffff000000ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999000000000000000000000000000000333333666666ccccccffffffffffff

-ffffffffffffffffff999999000000000000000000000000000000333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666000000000000999999ffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999000000333333999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-000000ffffff000000ffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffff000000ffffff000000ffffffffffffffffff000000ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000000000ffffff000000000000ffffff000000000000

-ffffff000000000000ffffff000000000000000000000000000000ffffffffffffffffff

-000000000000000000000000000000000000ffffffffffff000000000000000000ffffff

-000000000000ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc000000000000333333999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc000000000000000000000000000000000000000000999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666000000333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999666666000000000000333333

-999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000

-000000000000000000ffffff000000000000000000ffffff000000000000000000ffffff

-000000000000ffffffffffffffffffffffff000000000000000000000000000000ffffff

-000000000000000000000000ffffffffffffffffff000000000000000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff000000000000000000000000ffffff

-ffffffffffffffffff000000000000000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffff000000000000ffffff000000

-ffffffffffff000000ffffffffffff000000ffffffffffff000000ffffffffffff000000

-ffffffffffff000000ffffff000000ffffffffffff000000ffffffffffff000000ffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff333333999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccccccccc999999999999666666999999666666333333333333333333333333333333

-333333333333000000333333333333333333333333333333333333333333333333666666

-666666999999333333666666666666666666666666666666666666999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-000000000000000000666666999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333ffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffff666666999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333999999ffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffff000000ffffffffffff000000ffffffcccccc000000

-ffffffffffff000000ffffffffffff000000ccccccffffff000000ffffff000000ffffff

-ffffffffffff000000ffffff000000ffffff000000ffffffffffffffffff000000ffffff

-ffffff000000ffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffcccccc000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc999999999999333333333333000000

-333333333333666666666666999999666666999999cccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc666666

-999999666666666666333333666666000000000000000000666666666666999999cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc999999999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc999999333333333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffff000000ffffffffffff000000ffffff

-ffffff000000ffffffffffff000000ffffffffffff000000ffffffffffff000000ffffff

-ffffff000000ffffff000000ffffffffffff000000ffffffffffff000000ffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666333333000000333333666666666666ccccccccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999999999666666333333

-000000333333666666ccccccccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffccccccffffffffffffffffff999999999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000000000000000000000000000000000000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff666666666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000000000ffffff000000ffffffffffff000000000000

-ffffff000000000000ffffff000000000000ffffff000000000000ffffff000000000000

-000000000000000000000000000000ffffff000000000000000000ffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-666666000000666666999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc999999666666333333666666ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff333333999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333333333

-999999ffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffff999999333333666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffff333333333333ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999000000999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc000000ffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffcccccc333333

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff333333ccccccffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffff999999333333

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999333333ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666000000666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666000000000000333333999999ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333000000

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666000000000000333333999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffffffffffffffffffffff999999000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffcccccc

-666666000000333333999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999666666000000000000333333

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666333333ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-cccccc666666333333ffffffffffffffffffffffffffffff666666666666000000666666

-ccccccffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffcccccc666666333333666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc333333000000333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffff999999666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-666666333333999999ffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffcccccc000000666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff999999

-333333333333999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666000000999999ffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999333333666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999000000ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffcccccc666666333333000000666666666666ccccccccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999999999

-333333000000333333666666999999ffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc999999ffffffffffffffffffccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc333333999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc666666000000999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999333333333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffff999999999999333333333333000000333333333333

-666666666666999999999999ccccccccccccccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-cccccccccccccccccc666666999999333333666666333333000000333333666666666666

-ccccccffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666000000666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccccccccc

-999999999999666666666666333333333333333333000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000333333

-333333333333333333999999666666cccccc999999ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999000000000000

-000000999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff333333666666ccccccffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffff666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-666666000000000000666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666000000666666

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999666666000000666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666000000000000999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666000000333333999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666333333ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-333333000000333333999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666000000666666999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc999999000000333333999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc333333666666ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc666666ffffffffffffffffff999999ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-ccccccffffffffffffcccccc666666999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff666666000000000000999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999333333000000999999

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffff999999333333333333ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999333333000000000000333333

-666666999999999999ffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffcccccc999999999999333333333333000000333333

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999000000333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc999999000000666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-999999666666666666ffffffffffffffffff000000000000000000000000000000000000

-000000000000ffffffffffffffffff333333666666666666ccccccccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666000000666666999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc999999333333333333666666ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffff999999ccccccffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333000000333333999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666000000666666999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999333333

-333333666666ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999333333000000ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333000000000000666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999666666000000333333333333999999

-ccccccffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffff999999666666000000333333666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666000000000000000000000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc999999000000000000333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccccccccc666666

-333333333333999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccccccccc666666333333000000666666999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000000000000000000000000000333333ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666666666ffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666000000333333999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666666666000000000000333333666666666666ccccccccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc999999999999333333333333

-000000333333333333999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666000000000000000000000000000000999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666333333000000

-999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc999999999999333333333333000000

-333333333333999999666666999999999999cccccc999999ccccccccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccccccccccccccc999999

-cccccc666666999999666666666666333333000000333333666666666666cccccccccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666000000000000000000000000ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-cccccc666666333333ffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-000000000000666666ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999000000ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccccccccc666666999999666666666666333333333333333333333333000000000000

-000000000000000000000000000000000000000000000000333333333333333333333333

-333333999999666666999999999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999000000000000000000000000000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999333333000000666666ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333

-333333000000000000ffffffcccccc666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999999999000000999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000666666

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666333333666666cccccc

-ffffff000000000000ffffffffffff999999000000666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-000000000000666666ffffffffffffcccccc999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333

-000000333333999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666000000999999ccccccffffffffffff

-ffffff000000000000ffffffffffffffffffffffff999999333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffff666666999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666000000000000666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999333333333333999999ffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffff999999000000666666

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333000000666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666333333666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333000000333333

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999000000333333666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666

-000000999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999000000666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff333333000000000000ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666333333000000666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333333333999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff333333000000333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffccccccffffff666666999999ffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffff666666999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999333333000000333333999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff666666333333666666ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999000000666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff666666000000000000ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666000000333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc666666000000999999ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff666666000000000000ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000333333999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc999999333333333333999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000666666

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999000000000000ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffff999999ccccccffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff666666000000000000999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-333333666666ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999000000000000999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffffffffffccccccffffffffffffffffffffffffffffff666666999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc999999000000000000333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666000000999999

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999000000666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999000000000000999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333000000

-666666ccccccffffffffffffffffffffffffcccccc333333333333999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc333333000000999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666666666ffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666333333000000666666

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-333333666666ffffffffffff666666333333666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999000000666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333

-000000000000999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666000000999999999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-333333000000666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-cccccc666666333333ffffffffffffffffffffffffffffff666666333333999999ffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffff999999000000999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc999999000000000000333333999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-333333333333999999ffffffffffff333333333333ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000666666

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333

-000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffff666666333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff333333333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc666666000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666333333666666

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666000000

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc000000999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666ffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc666666000000999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000666666

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999000000666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666000000333333

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999ccccccffffffffffffffffffffffffffffff999999666666333333666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc999999333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666ffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc333333333333999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333

-000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999000000333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffcccccc999999

-000000666666999999ccccccffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffcccccc999999333333333333666666ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666000000333333666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666333333666666ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666000000333333999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999000000666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999000000000000999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666333333333333333333999999999999ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccccccccc666666

-666666000000333333666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666333333000000666666999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-666666000000999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666000000000000999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc000000000000999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc999999666666666666333333000000333333333333

-333333999999666666cccccc999999cccccc999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-999999cccccc999999999999666666666666333333333333000000333333333333999999

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999333333000000000000666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999333333333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666000000333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000666666

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc000000000000999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-cccccc666666999999333333666666333333666666000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000333333

-666666333333666666666666999999999999ccccccccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffcccccccccccc333333000000000000

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666333333666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc000000000000666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffcccccc999999

-666666ffffffffffffffffffccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666000000999999ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999000000666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc000000000000666666ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999333333ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333333333999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333000000333333ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffccccccccccccffffffffffffffffffcccccc999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-666666333333666666ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666999999ffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999000000666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000000000333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000000000

-333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666000000

-999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999000000333333999999ffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333000000333333ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-333333000000000000333333666666ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc999999333333333333999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff666666000000000000999999ccccccffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000666666

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-333333000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc666666333333000000333333666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff666666333333666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999000000333333666666

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666666666ffffffffffffffffffffffff

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc666666000000999999ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333

-000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999000000666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666000000

-000000ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333333333999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000000000

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ccccccffffffffffffffffffcccccc666666666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666333333

-666666ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffccccccccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999000000666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999000000000000999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff666666333333000000333333666666999999cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666000000999999cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffff666666333333ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999333333666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc000000000000999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666666666000000000000

-000000666666999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999cccccc999999999999666666999999666666999999666666333333333333333333

-333333333333333333333333333333333333000000333333333333999999666666999999

-999999cccccc999999ccccccccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffccccccffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000666666

-ccccccffffffffffffffffffffffffffffffcccccc000000000000999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-999999333333000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc999999666666666666333333000000000000

-333333333333333333333333666666666666666666666666999999999999999999999999

-999999999999999999333333333333333333999999666666666666666666666666666666

-666666333333333333333333333333000000333333333333999999999999cccccccccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffff666666333333

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333666666ffffffffffffffffffcccccc333333000000666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffcccccc000000999999ffffffcccccc999999

-666666666666333333000000000000333333333333666666666666999999999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999999999000000666666999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc666666999999666666666666333333000000

-000000333333333333999999999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffcccccc666666

-000000333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999cccccc

-999999666666000000666666999999333333000000333333333333333333333333333333

-333333ccccccffffffffffff999999999999666666999999666666999999999999cccccc

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666666666333333333333333333

-666666666666999999cccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccc999999999999666666666666000000333333666666ccccccccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666000000333333999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccccccccffffffffffff999999000000000000333333666666333333

-666666666666cccccc999999333333666666cccccccccccccccccccccccccccccccccccc

-ccccccccccccffffffffffffcccccc666666999999666666999999666666666666333333

-666666000000333333333333999999ffffffffffffccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999666666333333000000333333666666999999999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999666666333333000000000000666666

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc666666000000333333999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999999999666666333333

-000000000000333333999999ffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccccccccccccccffffffffffff999999000000000000333333666666

-666666ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-999999333333333333333333999999999999cccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc999999666666

-666666000000333333666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff666666000000000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffccccccffffffffffffffffff999999666666666666cccccc999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-999999333333000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999000000333333

-666666999999999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999666666000000333333666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999666666000000000000666666ffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffff333333333333666666999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc333333333333666666cccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccc999999666666333333333333999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666333333000000

-666666666666ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc999999333333333333333333

-999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666000000333333999999999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999666666000000666666

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffccccccffffffffffffcccccc666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffff999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666000000999999999999cccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc666666

-333333666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffccccccccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333333333ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333999999ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-333333333333666666cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999999999000000666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff333333000000333333ccccccffffffffffffffffffffffff

-cccccc666666000000333333999999ffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffcccccc333333000000666666ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666333333

-999999cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccc666666333333666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999666666000000666666ccccccffffff666666

-333333666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc999999000000666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc666666666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999333333666666cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999666666000000999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333000000333333666666

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666333333

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-cccccc000000000000999999ffffff999999666666ccccccffffffffffffffffff666666

-ccccccffffffffffffffffff999999999999ffffffffffffffffff999999666666cccccc

-ffffffffffffffffff666666ccccccffffffffffffffffff999999999999ffffffffffff

-ffffff999999666666ccccccffffffffffffffffff666666ccccccffffffffffffffffff

-999999999999ffffffffffffffffff999999666666ccccccffffffffffffffffff666666

-ccccccffffffffffffffffff999999999999ffffffffffffffffff999999666666cccccc

-ffffffffffffffffff666666ccccccffffffffffffffffff999999999999ffffffffffff

-ffffff999999666666ccccccffffffffffffffffff666666ccccccffffffffffffffffff

-999999999999ffffffffffffffffff999999666666ccccccffffffffffffffffff666666

-ccccccffffffffffffffffff999999999999ffffffffffffffffff999999666666cccccc

-ffffffffffffffffff666666ccccccffffffffffffffffff999999999999ffffffffffff

-ffffff999999666666ccccccffffffffffffffffff666666ccccccffffffffffffffffff

-999999999999ffffffffffffffffff999999666666ccccccffffffffffffffffff666666

-ccccccffffffffffffffffff999999999999ffffffffffffffffff999999666666cccccc

-ffffffffffffffffff666666ccccccffffffffffffffffff999999666666ffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff333333666666999999cccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccc333333333333ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666ffffffcccccc666666000000

-333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-cccccc666666333333ffffffcccccc000000000000666666ffffffffffff333333000000

-000000ffffffffffffcccccc000000000000ccccccffffffcccccc000000000000666666

-ffffffffffff333333000000000000ffffffffffffcccccc000000000000ccccccffffff

-cccccc000000000000666666ffffffffffff333333000000000000ffffffffffffcccccc

-000000000000999999ffffffcccccc000000000000666666ffffffffffff333333000000

-000000ffffffffffffcccccc000000000000999999ffffffcccccc000000000000666666

-ffffffffffff333333000000000000ffffffffffffcccccc000000000000999999ffffff

-cccccc000000000000666666ffffffffffff333333000000000000ffffffffffffcccccc

-000000000000999999ffffffffffff333333000000666666ffffffffffff333333000000

-000000ffffffffffffcccccc000000000000999999ffffffffffff333333000000666666

-ffffffffffff333333000000000000ffffffffffffcccccc000000000000999999ffffff

-ffffff333333000000666666ffffffffffff333333000000000000ffffffffffffcccccc

-000000000000999999ffffffffffff333333000000666666ffffffffffff333333000000

-000000ffffffffffffcccccc000000000000999999ffffffffffff333333000000666666

-ffffffffffff333333000000000000ffffffffffffcccccc000000000000999999ffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999000000999999999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999333333999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999000000666666ccccccffffffcccccccccccc

-666666000000ccccccffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffff999999333333666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffff666666333333ccccccffffffffffffcccccc333333

-999999ffffffffffffffffff333333333333ffffffffffffffffff666666333333cccccc

-ffffffffffffcccccc333333999999ffffffffffffffffff333333333333ffffffffffff

-ffffff666666333333ccccccffffffffffffcccccc333333999999ffffffffffffffffff

-333333333333ffffffffffffffffff666666333333ccccccffffffffffffcccccc333333

-999999ffffffffffffffffff333333333333ffffffffffffffffff666666333333cccccc

-ffffffffffffcccccc333333999999ffffffffffffffffff333333333333ffffffffffff

-ffffff666666333333ccccccffffffffffffcccccc333333999999ffffffffffffffffff

-666666333333ffffffffffffffffff666666333333ccccccffffffffffffcccccc333333

-999999ffffffffffffffffff666666333333ffffffffffffffffff666666333333cccccc

-ffffffffffffcccccc333333999999ffffffffffffffffff666666333333ffffffffffff

-ffffff666666333333ccccccffffffffffffcccccc333333999999ffffffffffffffffff

-666666333333ffffffffffffffffff666666333333ccccccffffffffffffcccccc333333

-999999ffffffffffffffffff666666333333ffffffffffffffffff666666333333cccccc

-ffffffffffffcccccc333333999999ffffffffffffffffff666666333333ffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666333333cccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccc999999666666666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333333333ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc666666333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666666666cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999666666

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999333333999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc000000999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff333333999999cccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-999999333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff333333666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999999999333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffff666666999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-666666999999cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccc999999333333ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-666666cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999666666333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccc666666999999ffffffffffffffffff666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffccccccccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999333333ccccccffffffcccccc333333999999ffffff

-ffffffffffff666666666666666666ccccccccccccffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffff666666000000999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff333333666666ffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-666666333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999cccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccc666666999999ffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333333333000000000000000000333333333333999999999999

-cccccc000000000000ffffffffffffffffff999999000000000000666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999333333ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc000000ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccccccccc666666666666333333000000

-000000000000000000ffffffcccccc999999333333000000000000000000333333cccccc

-ffffffffffffffffffffffffffffffffffffcccccc333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666cccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccc666666666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffcccccc000000000000000000000000000000000000000000

-999999ffffffffffffffffffffffffffffff666666666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000999999999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999333333ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffff000000000000000000000000000000000000

-000000999999ffffffffffffffffffffffff666666ffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffcccccc333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333cccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccc333333ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffcccccc000000000000000000000000666666999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000ffffffffffff000000ffffffffffffffffffffffffffffffffffff000000000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999333333999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffff999999000000666666999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999666666cccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccc000000cccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccc000000cccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccc333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-000000ffffffccccccffffff000000ffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-000000ffffffffffffffffffffffffffffffccccccffffffffffffffffffffffff000000

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666666666cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc000000cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999000000

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999666666666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666ccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-000000000000000000000000000000ffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffff000000000000ffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffff000000000000

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffcccccc000000

-000000ffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffff666666ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffff000000000000000000ffffff000000ffffff000000000000

-000000ffffffffffffffffff000000000000000000ffffff000000000000ffffffffffff

-ffffff000000000000ffffffffffff000000000000ffffffffffffffffffffffffffffff

-000000ffffff000000000000ffffff000000000000ffffff000000000000ffffff000000

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999666666cccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccc000000000000000000cccccccccccccccccc

-000000000000cccccc000000000000cccccc000000000000000000cccccc000000000000

-000000cccccc000000000000000000cccccccccccccccccccccccc000000000000000000

-000000cccccccccccc000000000000000000cccccccccccccccccccccccccccccccccccc

-cccccccccccccccccc000000000000cccccc000000000000cccccc000000000000000000

-000000000000cccccccccccccccccccccccccccccccccccccccccc000000000000000000

-cccccc000000cccccccccccccccccccccccc000000000000000000cccccc000000000000

-000000000000000000cccccccccccccccccccccccc000000000000000000cccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccc333333999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffff000000ffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffff000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000000000000000000000ffffffffffff000000000000ffffff000000ffffffffffff

-ffffff000000ffffff000000ffffffffffff000000000000ffffffffffff000000ffffff

-000000ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffff000000ffffffffffff000000000000ffffff000000ffffff000000

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc000000cccccc999999cccccc

-999999000000000000cccccc999999000000999999000000999999cccccc999999000000

-999999cccccc999999cccccc000000cccccc999999cccccc000000cccccc999999cccccc

-999999cccccc000000cccccc999999cccccc000000cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc000000000000999999cccccc999999cccccc000000cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc000000cccccc

-000000cccccc000000cccccc999999000000999999cccccc999999000000999999000000

-999999cccccc999999cccccc999999cccccc000000cccccc999999cccccc000000cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999333333999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffff000000ffffffffffff000000ffffffffffff

-ffffff000000ffffff000000ffffffffffffffffff000000000000000000000000ffffff

-ffffff000000000000ffffffffffff000000000000ffffffffffffffffffffffffffffff

-000000ffffffffffff000000ffffffffffff000000ffffffffffff000000ffffff000000

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333cccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccc000000cccccccccccccccccc

-cccccc000000cccccccccccccccccc000000cccccc000000cccccccccccc000000cccccc

-cccccccccccccccccccccccc000000cccccccccccccccccccccccc000000000000000000

-cccccccccccc000000cccccccccccccccccc000000cccccccccccccccccccccccccccccc

-cccccccccccccccccccccccc000000cccccccccccccccccccccccccccccc000000cccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc000000cccccc

-000000cccccc000000cccccccccccc000000000000000000000000000000cccccc000000

-cccccccccccccccccccccccccccccccccccccccccc000000000000000000000000cccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccc333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffff000000000000ffffff000000ffffffffffff000000000000

-000000ffffffffffffffffff000000000000ffffffffffffffffff000000000000ffffff

-ffffffffffffffffffffffff000000ffffffffffff000000000000000000ffffffffffff

-000000000000000000000000ffffffffffffffffff000000000000000000ffffffffffff

-000000000000ffffff000000000000000000ffffff000000000000ffffffffffff000000

-ffffff000000000000ffffffffffff000000000000ffffff000000000000ffffff000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-000000ffffffffffffffffffffffffffffff000000ffffffffffff000000ffffffffffff

-ffffff000000cccccc000000ffffffffffffffffff000000ffffffffffffccccccffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffffffffffffff

-000000ffffffcccccc000000ffffffffffff000000ffffffffffff000000cccccc000000

-ffffff000000ffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc000000cccccc999999cccccc

-999999000000999999cccccc999999000000999999cccccc000000cccccc000000cccccc

-999999cccccc999999cccccc000000cccccc999999cccccc999999cccccc999999cccccc

-000000cccccc000000cccccc999999cccccc000000cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc000000cccccc999999cccccc999999cccccc000000cccccc

-999999cccccc000000cccccc999999cccccc999999cccccc999999cccccc000000cccccc

-000000cccccc000000cccccc999999000000999999cccccc999999cccccc999999000000

-999999cccccc999999000000999999cccccc000000cccccc999999cccccc000000cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666ffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffff000000ffffffffffffffffff000000000000ffffffffffff000000ffffffffffff

-000000ffffffcccccc000000ffffff000000ffffffffffff000000ffffff000000ffffff

-ffffffffffffffffffffffff000000ffffff000000ffffffffffff000000ffffff000000

-ffffffffffff000000ffffffffffffffffffffffffffffff000000ffffffcccccc000000

-ffffff000000ffffffffffff000000ffffff000000ffffff000000ffffffffffff000000

-000000ffffff000000ffffff000000ffffff000000ffffffffffff000000000000ffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffff666666ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000ffffffffffffffffff000000000000000000ffffffffffff000000000000

-000000ffffffffffffffffff000000000000000000ffffff000000000000000000ffffff

-000000000000ffffffffffff000000000000ffffffffffffffffffffffffffffff000000

-000000000000000000000000000000000000000000000000ffffff000000000000000000

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666666666cccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccc000000000000000000000000000000cccccc

-000000000000000000cccccc000000000000000000cccccc000000000000cccccccccccc

-cccccccccccc000000000000000000000000000000cccccc000000000000000000000000

-cccccccccccccccccc000000000000000000cccccccccccccccccccccccccccccccccccc

-cccccccccccccccccc000000000000000000000000cccccccccccccccccccccccc000000

-000000000000cccccccccccccccccccccccccccccccccccccccccc000000000000000000

-000000000000000000000000cccccccccccc000000000000000000000000cccccccccccc

-000000000000000000cccccccccccccccccc000000000000000000000000000000000000

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccc999999666666ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffffffffff

-000000ffffff000000ffffffffffffffffffffffff000000000000000000ffffffffffff

-ffffffffffffffffffffffff000000000000ffffffffffffffffff000000ffffff000000

-000000000000ffffffffffffffffffffffffffffffffffff000000ffffff000000000000

-000000ffffffffffffffffff000000000000ffffffffffffffffffffffffffffff000000

-ffffffffffff000000000000000000000000ffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999333333999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc333333ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff000000

-ffffffffffff000000ffffffffffff000000ffffff000000ffffffffffff000000ffffff

-ffffffffffffffffff000000ffffff000000ffffffffffff000000ffffffffffff000000

-ffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff000000ffffff

-ffffff000000ffffff000000ffffff000000ffffffffffff000000ffffff000000ffffff

-ffffff000000ffffff000000ffffffffffff000000ffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333999999cccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccc999999666666ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000ffffffffffff000000ffffffffffffffffff000000000000000000000000

-000000ffffff000000000000000000ffffffffffff000000000000000000ffffffffffff

-ffffffffffffffffff000000000000000000000000000000ffffffffffffffffff000000

-000000000000ffffffffffffffffffffffffffffff000000ffffffffffff000000000000

-000000ffffffffffff000000000000000000000000000000ffffffffffff000000ffffff

-ffffff000000000000000000000000000000ffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff333333000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-000000333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc000000000000000000000000

-000000000000000000cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999000000000000000000000000000000000000000000999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffff000000ffffff

-ffffffffffff000000ffffffffffff000000cccccc000000ffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccc666666666666ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000

-000000000000ffffffffffffffffff000000000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999999999333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-333333999999cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccc333333ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-999999333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc333333999999cccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccc333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc333333999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999999999

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc333333666666cccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc999999333333

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666333333cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999333333333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc333333999999cccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccc666666333333999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff333333333333999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999999999333333666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff666666ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333666666

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccc999999666666333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999333333999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999000000999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-000000666666999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999999999333333333333999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666000000ccccccffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffff999999333333333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999333333333333999999cccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc999999

-666666000000ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc000000666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666333333999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999000000333333666666cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999666666333333333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999000000666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666000000666666999999cccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccc999999333333333333666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc000000000000999999ffffffcccccc

-666666ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-000000ffffffccccccffffff000000ffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffff000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999333333000000666666

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999999999333333333333333333999999ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc000000000000666666ffffffffffffffffff

-666666333333000000999999ccccccffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffff999999333333000000999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffff000000000000000000ffffff000000ffffff000000000000

-000000ffffffffffffffffff000000000000000000ffffff000000000000ffffffffffff

-ffffff000000000000ffffffffffff000000000000ffffffffffffffffffffffff000000

-000000ffffff000000000000ffffff000000000000ffffff000000000000000000ffffff

-000000000000ffffff000000000000ffffff000000000000000000000000000000ffffff

-ffffff000000000000000000ffffff000000000000ffffff000000000000000000000000

-000000ffffff000000000000ffffffffffff000000000000000000000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-333333000000666666666666cccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc999999

-999999333333333333333333999999ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000000000666666ffffffffffffffffffffffff

-ffffffffffffcccccc333333333333666666ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc999999000000666666999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000000000000000000000ffffffffffff000000000000ffffff000000ffffffffffff

-ffffff000000ffffff000000ffffffffffff000000000000ffffffffffff000000ffffff

-000000ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-000000000000ffffff000000000000ffffff000000000000ffffffffffffffffff000000

-ffffff000000000000ffffff000000ffffffffffff000000ffffff000000ffffffffffff

-000000ffffffffffffffffff000000ffffff000000000000ffffffffffff000000ffffff

-000000000000ffffff000000ffffff000000ffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666000000000000333333666666999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999999999666666333333000000333333

-666666999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000000000333333ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc999999333333ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000333333666666ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffff000000ffffffffffff000000ffffffffffff

-ffffff000000ffffff000000ffffffffffffffffff000000000000000000000000ffffff

-ffffff000000000000ffffffffffff000000000000ffffffffffffffffffffffffffffff

-000000ffffffffffff000000ffffffffffff000000000000ffffffffffffffffff000000

-ffffff000000ffffffffffff000000ffffffffffff000000ffffff000000ffffffffffff

-000000ffffffffffffffffff000000ffffff000000ffffffffffffffffff000000ffffff

-000000ffffffffffff000000ffffffffffff000000000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc666666333333000000666666666666

-999999999999cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccc999999999999333333333333333333999999999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff333333000000333333ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333333333

-999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-000000ffffffffffffffffffffffffffffff000000ffffffffffff000000ffffffffffff

-ffffff000000cccccc000000ffffffffffffffffff000000ffffffffffffccccccffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffffffffffffff

-000000ffffffcccccc000000ffffffffffff000000000000ffffffffffffcccccc000000

-ffffff000000ffffffffffff000000ffffffcccccc000000ffffff000000ffffffffffff

-000000ffffffccccccffffff000000ffffff000000ffffffffffffffffff000000ffffff

-000000ffffffffffff000000ffffff000000ccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-333333000000000000333333333333666666666666999999999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc666666666666333333333333

-333333000000000000333333666666ccccccccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff333333000000333333ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-666666333333000000666666999999ccccccccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffcccccc999999333333000000000000666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000ffffffffffffffffff000000000000000000ffffffffffff000000000000

-000000ffffffffffffffffff000000000000000000ffffff000000000000000000ffffff

-000000000000ffffffffffff000000000000ffffffffffffffffffffffffffffff000000

-000000000000ffffff000000000000ffffff000000000000000000000000000000ffffff

-000000000000000000ffffff000000000000000000000000000000000000000000ffffff

-ffffff000000000000000000ffffff000000000000000000ffffff000000000000000000

-000000000000ffffff000000000000000000000000000000000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccccccccc666666666666333333333333000000333333333333

-666666666666666666666666999999999999999999999999cccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccc999999999999999999999999999999

-999999666666666666666666666666333333000000000000666666666666999999999999

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333000000333333ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff999999666666666666ffffffffffffffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666333333666666ccccccccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999cccccc

-666666999999666666666666333333333333333333333333000000000000000000000000

-000000000000000000000000000000000000000000333333333333333333333333333333

-333333999999666666999999999999ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-333333000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999333333000000333333

-333333666666666666999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccccccccc999999999999333333333333000000000000

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff000000000000000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666

-000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc999999999999333333999999ffffffffffff999999666666666666999999999999

-ccccccccccccccccccccccccffffff999999999999ccccccccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccccccccc999999cccccccccccc999999666666

-999999ccccccffffffffffff999999333333666666666666ccccccccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffff999999000000000000000000000000000000000000000000000000000000000000

-999999ffffffffffffffffff333333999999ffffffffffffffffff999999000000000000

-000000000000000000000000000000000000000000000000999999ffffffffffffffffff

-333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000000000333333999999ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666000000

-000000ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999999999666666999999

-333333333333333333999999ffffff999999000000000000000000000000000000000000

-000000000000333333ffffffffffffcccccc333333333333333333333333666666999999

-666666ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-ffffffffffffffffffffffffccccccccccccffffffffffffffffffcccccccccccccccccc

-ccccccccccccccccccccccccccccccccccccccccccccccccffffffffffffffffffffffff

-ccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666000000000000000000000000333333999999999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000000000

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc000000000000000000000000000000000000

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666000000000000000000000000000000666666

-999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999000000000000999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666000000000000000000000000000000333333

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc999999333333000000000000

-000000000000333333666666ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc333333000000999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666000000000000000000000000000000000000000000333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999

-666666333333000000000000000000000000333333999999ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc000000000000666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-000000000000000000000000000000999999999999000000000000000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999333333000000000000000000000000333333999999cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc333333000000666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999666666000000000000000000

-000000333333999999ccccccffffffffffffffffff333333333333ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999666666000000000000000000000000

-000000666666999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc333333000000333333ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666000000000000000000000000333333999999

-ccccccffffffffffffffffffffffffffffffffffff999999ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc999999333333

-000000000000000000000000333333666666ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff666666000000333333ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666000000000000000000000000333333999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc999999333333333333000000000000000000000000333333999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffff666666000000333333ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-000000000000000000000000000000999999ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc666666333333000000000000000000000000333333

-999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff666666000000333333ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff999999666666000000000000000000

-000000333333999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999666666000000000000

-000000000000000000666666999999ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999000000000000999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666000000000000000000000000333333999999

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-999999333333000000000000000000000000333333666666ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666000000000000000000000000333333999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-999999999999666666999999333333333333333333333333333333333333333333666666

-666666999999666666ccccccccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999333333000000000000000000000000000000333333999999

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffffff999999

-000000000000999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-000000000000000000000000000000999999ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc999999333333000000000000

-333333666666666666666666999999999999999999999999999999999999999999666666

-666666666666666666333333333333000000666666999999ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc666666333333000000000000000000

-000000333333999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffffffffcccccc000000

-000000666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666000000000000000000

-000000333333999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc999999000000333333333333999999999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999666666000000333333999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-000000000000000000000000000000666666999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffffcccccc000000000000

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666000000000000000000000000333333999999

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffff

-ffffffffffffffffffcccccc333333333333999999cccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccc999999666666333333

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc999999333333000000000000000000000000333333666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ffffffffffffffffffffffffffffffffffff000000000000333333

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666000000000000000000000000333333999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffffffffff999999333333999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999999999

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-000000ffffffccccccffffff000000ffffffffffffffffffffffffffffffccccccffffff

-ffffff000000ffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffcccccc000000

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffff000000ffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffcccccc999999333333000000000000000000000000000000

-333333999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999

-666666000000000000666666666666999999ffffffffffff000000000000333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-000000000000000000000000000000999999ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffcccccc333333cccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccc000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-ffffffffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666333333000000

-000000000000000000333333666666999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000

-000000000000000000000000000000666666ffffff333333000000333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666000000000000000000

-000000333333999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffff999999333333cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999666666999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-ffffffffffffffffffffffffffffff000000ffffff000000000000000000000000ffffff

-000000000000000000ffffff000000000000ffffff000000000000000000ffffffffffff

-000000000000ffffff000000000000ffffff000000000000ffffffffffffffffff000000

-ffffffffffffffffff000000000000000000000000ffffffffffffffffff000000000000

-ffffffffffff000000000000ffffff000000000000ffffff000000000000ffffff000000

-000000ffffffffffff000000000000ffffff000000000000ffffff000000000000ffffff

-ffffff000000000000ffffff000000000000ffffff000000000000000000000000000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999666666000000000000000000000000000000666666666666ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc000000

-000000000000000000000000000000ffffff333333000000000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666000000000000000000000000333333999999

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffcccccc333333cccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccc333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-ffffffffffffffffffffffffffffff000000ffffffffffff000000ffffffffffff000000

-ffffff000000ffffffffffffffffff000000000000ffffffffffffffffff000000ffffff

-ffffff000000000000ffffff000000ffffffffffffffffff000000ffffffffffff000000

-ffffffffffffffffffffffff000000ffffffffffff000000ffffff000000ffffffffffff

-000000ffffffffffff000000000000ffffff000000000000ffffff000000000000ffffff

-000000ffffffffffffffffffffffff000000ffffff000000000000ffffff000000ffffff

-000000ffffffffffff000000ffffff000000000000ffffff000000ffffff000000ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc999999333333000000000000000000000000333333666666

-ccccccffffffffffffffffffffffffffffffffffff333333999999ffffffffffff666666

-000000000000000000000000999999666666000000000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666000000000000000000000000333333999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffff666666666666999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffcccccc000000

-ffffffffffffffffffffffffffffff000000ccccccffffff000000ffffffffffff000000

-ffffff000000ccccccffffffffffff000000000000ffffffffffffffffff000000ffffff

-ffffff000000ffffffffffff000000ffffff000000000000000000ffffffffffff000000

-ffffffffffffccccccffffff000000ffffffffffff000000ffffff000000000000000000

-000000ffffffffffff000000ffffffffffff000000ffffffffffff000000ffffffffffff

-000000ffffffcccccc000000000000000000ffffff000000ffffffffffff000000ffffff

-000000000000000000000000ffffff000000ccccccffffff000000ffffff000000ffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc999999333333000000000000000000

-000000000000333333999999ccccccffffffcccccc000000000000999999ffffffffffff

-000000000000000000000000666666000000000000ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-000000000000000000000000000000999999ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffff

-ffffffffffffffffff999999333333666666cccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc999999333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffff000000ffffffffffff000000

-ffffff000000ffffffffffffffffff000000000000ffffffffffffffffff000000ffffff

-ffffff000000ffffffffffff000000000000ffffffffffff000000ffffffffffff000000

-ffffffffffffffffffffffff000000ffffffffffff000000ffffff000000ffffffffffff

-ffffffffffffffffff000000ffffffffffff000000ffffffffffff000000ffffffffffff

-000000ffffff000000ffffffffffff000000ffffff000000ffffffffffff000000ffffff

-000000ffffffffffffffffffffffff000000ffffffffffff000000ffffff000000ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666

-333333000000000000000000000000000000666666000000000000000000666666ffffff

-999999000000000000333333000000000000ccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc666666000000000000000000

-000000333333999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffcccccc666666000000666666666666cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc999999cccccc

-999999cccccc999999cccccc999999cccccc999999999999333333000000333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000000000ffffffffffffffffffffffff000000000000000000ffffff

-ffffff000000000000ffffff000000000000000000000000000000000000ffffffffffff

-000000000000000000ffffff000000000000000000000000000000000000000000000000

-000000ffffffffffffffffff000000000000000000ffffffffffffffffff000000000000

-000000ffffff000000000000000000000000000000000000ffffff000000000000ffffff

-000000000000ffffff000000000000000000000000000000000000ffffff000000000000

-ffffff000000000000000000000000000000000000ffffff000000000000000000000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999666666000000000000000000000000000000000000000000666666

-cccccc000000000000000000000000999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff999999666666000000000000000000000000333333999999

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffff999999666666000000333333333333

-666666999999999999999999cccccccccccccccccccccccccccccccccccccccccc999999

-999999999999999999666666666666333333000000333333999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc000000000000000000000000000000000000

-666666333333000000000000999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffcccccc666666000000000000000000000000333333999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999999999

-666666333333333333333333000000000000000000000000000000000000000000333333

-333333333333333333999999999999ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffff000000000000000000ccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffff000000000000000000ccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff999999cccccc666666666666000000000000000000000000000000000000

-000000333333000000333333333333333333333333333333333333333333333333333333

-666666666666000000000000000000666666999999ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc999999666666666666000000

-000000000000666666333333999999333333000000000000666666666666999999999999

-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc

-999999666666666666666666666666333333333333000000333333333333999999999999

-ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccccccccc666666333333000000333333666666999999999999ffffff

-ffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccccccccc999999666666

-333333000000333333666666999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333666666999999ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc999999666666000000666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666

-333333999999ccccccffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffff999999333333666666ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff333333999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff999999333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000000000ffffffffffff000000000000ffffff000000000000000000000000

-ffffffffffffffffff000000000000000000ffffffffffff000000000000ffffffffffff

-ffffff000000000000ffffffffffff000000000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffff000000ffffffffffff000000000000000000ffffffffffffffffff

-000000ffffff000000ffffffffffff000000ffffff000000ffffffffffff000000ffffff

-000000ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff000000999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-000000ffffffcccccc000000ffffffffffff000000ffffff000000ffffffccccccffffff

-000000ffffff000000ffffffffffffffffffcccccc000000000000000000000000ffffff

-ffffff000000000000ffffffffffff000000000000ffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333333333

-666666ffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffcccccc666666333333666666666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffff000000ffffffffffff000000ffffff000000ffffffffffffffffff

-000000ffffff000000ffffffffffffffffffffffff000000ffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-999999000000666666999999ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffcccccc999999333333333333999999ffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000000000000000ffffffffffff000000000000000000ffffff000000000000000000

-ffffffffffffffffff000000000000000000ffffffffffff000000000000000000ffffff

-000000000000ffffffffffff000000000000ffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffff999999666666333333000000333333999999999999ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccccccccc

-666666666666000000333333666666ccccccffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffcccccc666666666666333333000000333333

-666666333333999999666666ccccccccccccccccccccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccccccccccccccc999999999999666666666666333333333333000000333333333333

-999999999999ffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccccccccc

-ffffffffffffffffff666666333333333333333333ffffffffffffffffff666666999999

-666666999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffcccccc000000

-000000000000ffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-999999cccccc666666999999333333333333333333333333000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-333333333333333333666666666666999999999999ccccccccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff666666000000333333333333

-ffffffffffffffffff999999ccccccccccccccccccffffffffffffffffff999999666666

-999999666666666666000000000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffff999999ccccccffffffffffff999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffcccccc000000999999ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffff

-ffffffffffffcccccc000000666666ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffcccccc000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffff000000

-ffffffffffff000000ffffffffffff000000ffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffffffffff000000000000ffffffffffff000000

-000000ffffff000000000000ffffff000000000000000000000000000000000000ffffff

-ffffff000000000000000000ffffffffffff000000000000ffffff000000ffffff000000

-000000ffffff000000000000ffffff000000000000ffffff000000000000000000ffffff

-ffffff000000000000000000000000ffffffffffff000000000000ffffff000000000000

-000000000000ffffffffffffffffff000000000000000000ffffffffffff000000000000

-ffffffffffffffffff000000000000ffffffffffff000000000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000cccccc

-ffffff999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-333333999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffff000000ffffffffffff

-000000000000ffffff000000000000ffffff000000ffffff000000ffffffffffff000000

-000000ffffffffffffffffff000000ffffffffffff000000000000ffffffffffffffffff

-ffffff000000ffffff000000000000ffffff000000ffffffffffff000000ffffffffffff

-ffffffffffff000000ffffffffffff000000ffffffffffff000000000000000000ffffff

-ffffffffffff000000ffffff000000ffffffffffff000000ffffff000000ffffffffffff

-000000ffffff000000ffffffffffffffffff000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffff666666333333ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666

-333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffff000000ffffffffffffffffff000000000000000000000000ffffffffffff

-000000ffffffcccccc000000ffffffffffff000000ffffff000000ffffffcccccc000000

-000000ffffffffffffffffff000000ffffffcccccc000000ffffffffffffffffff000000

-000000000000cccccc000000ffffffffffff000000ffffff000000ffffffccccccffffff

-ffffffffffff000000ffffffffffff000000ccccccffffff000000ffffff000000ffffff

-ffffffffffff000000ffffff000000ffffffffffffffffffffffff000000000000000000

-000000ffffffffffff000000000000ffffffcccccc000000000000ffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffff999999000000ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffffffffffffff

-000000ffffffffffff000000ffffffffffff000000ffffff000000ffffffffffff000000

-000000ffffffffffffffffff000000ffffffffffff000000ffffffffffff000000ffffff

-ffffff000000ffffff000000ffffffffffffffffff000000000000ffffffffffffffffff

-ffffffffffff000000ffffffffffff000000ffffffffffff000000ffffff000000ffffff

-ffffffffffff000000ffffff000000ffffffffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffff000000ffffffffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffccccccccccccffffffffffffccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000000000ffffffffffffffffff000000000000000000ffffff000000

-000000000000ffffff000000000000ffffff000000000000000000000000000000ffffff

-ffffff000000000000000000ffffffffffff000000000000000000ffffffffffff000000

-000000000000000000000000000000ffffffffffff000000ffffffffffffffffffffffff

-ffffffffffff000000000000000000ffffffffffff000000000000000000ffffff000000

-000000000000ffffffffffffffffff000000000000000000ffffffffffff000000000000

-000000ffffff000000000000ffffffffffff000000000000ffffffffffffffffff000000

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffff333333333333333333666666ffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffff999999

-ccccccffffffffffffcccccc666666000000333333999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccccccccc666666ffffff

-ffffffffffff333333000000000000000000ffffffffffffffffff000000000000333333

-333333ffffffffffffffffff999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffcccccc000000000000000000ffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffff000000000000ffffffffffffffffffffffffffffff

-ffffff000000000000000000ffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffff999999666666ffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffff999999666666ffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccccccccc

-666666999999666666666666333333333333333333333333333333333333333333999999

-666666999999999999ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffff999999666666ffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffcccccc999999333333000000333333333333

-999999666666999999999999cccccccccccccccccccccccccccccccccccccccccc666666

-999999666666666666333333000000333333999999ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffff999999333333333333999999999999ffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffcccccc666666333333000000999999ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffff

-ffffffffffffcccccc333333666666ccccccffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffffcccccc333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333

-999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999000000999999

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffff999999333333666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffff333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333333333ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff333333666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-666666999999ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff666666000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccc333333666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-cccccc333333ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-333333ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff000000ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999666666333333

-999999ccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffff666666333333ccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc666666

-666666ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-000000ffffffffffffffffff000000ffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffff000000ffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-666666333333333333999999ccccccffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffcccccc999999666666000000999999ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc666666333333ffffff

-ffffffffffff999999333333ccccccffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffff999999333333999999

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffff000000ffffffffffff000000000000ffffff000000000000

-ffffff000000000000000000ffffff000000000000ffffff000000000000ffffff000000

-000000ffffffffffff000000000000ffffff000000000000ffffff000000000000ffffff

-ffffff000000000000ffffff000000000000000000000000000000ffffffffffffffffff

-000000000000000000000000ffffff000000000000ffffff000000ffffff000000000000

-000000ffffffffffff000000000000000000ffffffffffff000000000000ffffffffffff

-ffffff000000000000ffffffffffff000000000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffcccccc666666333333000000666666666666ccccccccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff999999

-999999333333333333333333666666999999ffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffcccccc333333333333666666ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999666666000000666666ccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000000000000000000000ffffffffffff000000ffffffffffff000000ffffff000000

-000000ffffffffffff000000000000ffffff000000000000ffffff000000ffffffffffff

-ffffff000000ffffffffffff000000000000ffffff000000000000ffffffffffff000000

-ffffffffffff000000000000ffffff000000ffffff000000ffffffffffffffffffffffff

-ffffff000000ffffffffffff000000ffffff000000000000ffffff000000ffffffffffff

-ffffff000000000000ffffffffffff000000ffffff000000ffffffffffff000000ffffff

-000000ffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffff999999999999333333333333000000333333

-333333666666666666999999999999cccccc999999ccccccffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999cccccc999999999999666666999999333333333333333333000000333333666666

-666666ccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff666666666666ffffff

-ffffffffffffffffffffffffffffffcccccc999999333333333333333333666666666666

-ccccccccccccccccccccccccffffffffffffffffffffffffffffffffffffffffff999999

-cccccccccccc999999666666666666000000666666999999ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000ffffffffffffffffffffffffffffff000000000000000000000000ffffff000000

-ffffffffffffffffff000000ffffffffffff000000ffffffffffff000000ffffff000000

-000000000000ffffffffffff000000ffffffffffff000000000000000000000000000000

-ffffffffffff000000ffffffffffff000000ffffff000000ffffffffffffffffffffffff

-ffffff000000ffffffffffff000000ffffff000000ffffffffffff000000ffffffffffff

-ffffff000000000000ffffffffffffffffffffffff000000000000000000000000ffffff

-ffffff000000000000ffffffffffff000000000000ffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccccc

-cccccc999999999999666666666666333333333333333333000000000000000000000000

-000000000000000000000000000000000000000000000000000000000000000000000000

-666666333333666666333333999999666666cccccc999999ccccccffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffcccccccccccc999999999999

-333333333333333333333333000000000000000000000000000000000000000000333333

-333333333333666666999999999999ffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-000000ffffffccccccffffffffffffffffff000000ffffffffffffffffffcccccc000000

-ffffffffffffffffff000000ffffffffffff000000ffffffffffff000000000000ffffff

-ffffff000000ccccccffffff000000ffffffffffff000000000000ffffffccccccffffff

-ffffffffffff000000ffffffffffff000000cccccc000000ffffffffffffffffffffffff

-ffffff000000ccccccffffff000000ffffff000000ffffffffffff000000ccccccffffff

-ffffff000000000000ffffffffffffffffffcccccc000000ffffffffffffffffffffffff

-ffffffffffff000000ffffffffffffffffff000000ffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000

-000000000000ffffffffffffffffffffffffffffff000000000000000000000000000000

-000000ffffff000000000000000000ffffff000000000000ffffff000000000000000000

-000000000000000000000000000000000000ffffff000000000000000000000000000000

-ffffff000000000000000000ffffff000000000000000000000000ffffffffffffffffff

-ffffff000000000000000000ffffff000000000000000000ffffffffffff000000000000

-000000ffffffffffff000000000000000000ffffffffffff000000000000000000ffffff

-000000000000ffffffffffff000000000000ffffffffffffffffff000000ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccccccccffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff333333333333ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-999999000000000000ccccccffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999999999ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000cccccc

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffccccccffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffff999999666666ffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc000000000000ccccccffffffcccccc666666ccccccffffffffffffffffff666666

-ccccccffffffffffffffffff999999666666ffffffffffffffffffcccccc666666cccccc

-ffffffffffffffffff666666ccccccffffffffffffffffff999999666666ffffffffffff

-ffffffcccccc666666ccccccffffffffffffffffff666666ccccccffffffffffffffffff

-999999666666ffffffffffffffffffcccccc666666ccccccffffffffffffffffff666666

-ccccccffffffffffffffffffcccccc666666ffffffffffffffffffcccccc666666cccccc

-ffffffffffffffffff666666ccccccffffffffffffffffffcccccc666666ffffffffffff

-ffffffcccccc666666ccccccffffffffffffffffff666666ccccccffffffffffffffffff

-cccccc666666ffffffffffffffffffcccccc666666ccccccffffffffffffffffff666666

-ccccccffffffffffffffffffcccccc666666ffffffffffffffffffcccccc666666cccccc

-ffffffffffffffffff666666ccccccffffffffffffffffffcccccc666666ffffffffffff

-ffffffcccccc666666ccccccffffffffffffffffff666666ccccccffffffffffffffffff

-cccccc666666ffffffffffffffffffcccccc666666ccccccffffffffffffffffff666666

-ccccccffffffffffffffffffcccccc666666ffffffffffffffffffcccccc666666cccccc

-ffffffffffffffffff666666ccccccffffffffffffffffffcccccc666666ffffffffffff

-ffffffcccccc666666ccccccffffffffffffffffff666666ccccccffffffffffffffffff

-cccccc666666ffffffffffffffffffcccccc666666ccccccffffffffffffffffff666666

-ccccccffffffffffffffffffcccccc666666ffffffffffffffffffcccccc666666cccccc

-ffffffffffffffffff666666ccccccffffffffffffffffffcccccc666666ffffffffffff

-ffffffcccccc666666ccccccffffffffffffffffff666666ccccccffffffffffffffffff

-cccccc666666ffffffffffffffffffcccccc666666ccccccffffffffffffffffff666666

-ccccccffffffffffffffffffcccccc666666ffffffffffffffffffcccccc666666cccccc

-ffffffffffffffffff666666ccccccffffffffffffffffffcccccc666666ffffffffffff

-ffffffcccccc666666ccccccffffffffffffffffff666666ccccccffffffffffffffffff

-cccccc666666ffffffffffffffffffcccccc666666ccccccffffffffffffffffff666666

-999999ffffffffffffffffffcccccc666666ffffffffffffffffffcccccc666666cccccc

-ffffffffffffffffff666666999999ffffffffffffffffffcccccc666666ffffffffffff

-ffffffcccccc666666ccccccffffffffffffffffff666666999999ffffffffffffffffff

-cccccc666666ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-cccccc333333000000ffffffffffff333333000000666666ffffffffffff666666000000

-000000ffffffffffffcccccc000000000000999999ffffffffffff333333000000666666

-ffffffffffff666666000000000000ffffffffffffcccccc000000000000999999ffffff

-ffffff333333000000666666ffffffffffff666666000000000000ffffffffffffcccccc

-000000000000999999ffffffffffff333333000000666666ffffffffffff666666000000

-000000ffffffffffffcccccc000000000000999999ffffffffffff333333000000666666

-ffffffffffff666666000000000000ffffffffffffcccccc000000000000999999ffffff

-ffffff333333000000333333ffffffffffff666666000000000000ffffffffffffcccccc

-000000000000999999ffffffffffff333333000000333333ffffffffffff666666000000

-000000ffffffffffffcccccc000000000000999999ffffffffffff333333000000333333

-ffffffffffff666666000000000000ffffffffffffcccccc000000000000999999ffffff

-ffffff333333000000333333ffffffffffff999999000000000000ffffffffffffcccccc

-000000000000999999ffffffffffff333333000000333333ffffffffffff999999000000

-000000ffffffffffffcccccc000000000000999999ffffffffffff333333000000333333

-ffffffffffff999999000000000000ffffffffffffcccccc000000000000999999ffffff

-ffffff333333000000333333ffffffffffff999999000000000000ffffffffffffcccccc

-000000000000999999ffffffffffff333333000000333333ffffffffffff999999000000

-000000ffffffffffffcccccc000000000000999999ffffffffffff333333000000333333

-ffffffffffff999999000000000000ffffffffffffffffff000000000000999999ffffff

-ffffff333333000000333333ffffffffffff999999000000000000ffffffffffffffffff

-000000000000999999ffffffffffff333333000000333333ffffffffffff999999000000

-000000ffffffffffffffffff000000000000666666ffffffffffff333333000000333333

-ffffffffffff999999000000000000ffffffffffffffffff000000000000666666ffffff

-ffffff333333000000333333ffffffffffff999999000000000000ffffffffffffffffff

-000000000000666666ffffffffffff333333000000333333ffffffffffff999999000000

-000000ffffffffffffffffff000000000000666666ffffffffffff666666000000333333

-ffffffffffff999999000000000000ffffffffffffffffff000000000000666666ffffff

-ffffff666666000000333333ffffffffffff999999000000000000ffffffffffffffffff

-000000000000666666ffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffff999999333333999999ffffffffffffffffff333333

-999999ffffffffffffffffff666666333333ffffffffffffffffff999999333333999999

-ffffffffffffffffff333333999999ffffffffffffffffff666666333333ffffffffffff

-ffffff999999333333999999ffffffffffffffffff333333999999ffffffffffffffffff

-666666333333ffffffffffffffffff999999333333999999ffffffffffffffffff333333

-666666ffffffffffffffffff666666333333ffffffffffffffffff999999333333999999

-ffffffffffffffffff333333666666ffffffffffffffffff666666333333ffffffffffff

-ffffff999999333333999999ffffffffffffffffff333333666666ffffffffffffffffff

-666666333333ffffffffffffffffff999999333333999999ffffffffffffffffff333333

-666666ffffffffffffffffff666666333333ffffffffffffffffff999999333333999999

-ffffffffffffffffff333333666666ffffffffffffffffff666666333333ffffffffffff

-ffffff999999333333999999ffffffffffffffffff333333666666ffffffffffffffffff

-666666333333ffffffffffffffffff999999333333999999ffffffffffffffffff333333

-666666ffffffffffffffffff666666333333ffffffffffffffffff999999333333999999

-ffffffffffffffffff333333666666ffffffffffffffffff666666333333ffffffffffff

-ffffff999999333333999999ffffffffffffffffff333333666666ffffffffffffffffff

-666666333333ffffffffffffffffff999999333333999999ffffffffffffffffff333333

-666666ffffffffffffffffff666666333333ffffffffffffffffff999999333333999999

-ffffffffffffffffff333333666666ffffffffffffffffff666666333333ffffffffffff

-ffffff999999333333999999ffffffffffffffffff333333666666ffffffffffffffffff

-666666333333ffffffffffffffffff999999333333999999ffffffffffffffffff333333

-666666ffffffffffffffffff666666333333ffffffffffffffffff999999333333999999

-ffffffffffffffffff333333666666ffffffffffffffffff666666333333ffffffffffff

-ffffff999999333333999999ffffffffffffffffff333333666666ffffffffffffffffff

-666666333333ffffffffffffffffff999999333333999999ffffffffffffffffff333333

-666666ffffffffffffffffff999999333333ffffffffffffffffff999999333333999999

-ffffffffffffffffff333333666666ffffffffffffffffff999999333333ffffffffffff

-ffffff999999333333999999ffffffffffffffffff333333666666ffffffffffffffffff

-999999333333ffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffccccccffffffffffffffffffffffffffffffffffffffffffccccccffffff

-ffffffffffffffffffffffffffffffffffffccccccffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

-ffffffffffffffffffffffff

-

-showpage

-

-% stop using temporary dictionary

-end

-

-% restore original state

-origstate restore

-

-%%Trailer

diff --git a/lib/inviso/doc/src/notes.xml b/lib/inviso/doc/src/notes.xml
deleted file mode 100644
index 661284e786..0000000000
--- a/lib/inviso/doc/src/notes.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2006</year><year>2011</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
-    
-    </legalnotice>
-
-    <title>Inviso Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>notes.xml</file>
-  </header>
-  <p>This document describes the changes made to the Inviso application.</p>
-
-

-  <section><title>Inviso 0.6.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The <c>inviso</c> application has been deprecated and
-	    will be removed in the R16 release.</p>
-          <p>
-	    Own Id: OTP-9798</p>
-        </item>
-        <item>
-          <p>
-	    Eliminate use of deprecated regexp module</p>
-          <p>
-	    Own Id: OTP-9810</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Inviso 0.6.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    The obsolete guards has now been changed to the new guard
-	    interface.</p>
-          <p>
-	    Own Id: OTP-8747</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Inviso 0.6.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The documentation is now built with open source tools
-	    (xsltproc and fop) that exists on most platforms. One
-	    visible change is that the frames are removed.</p>
-          <p>
-	    Own Id: OTP-8201</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Inviso 0.6</title>

-      <section><title>Fixed Bugs and Malfunctions</title>

-      <list>

-        <item>

-          <p>

-            In this release the following has been fixed and

-            enhanced: Autostart: It is now possible to configure

-            modules that shall be loaded by the autostart mechanism.

-            This because it is not certain that all application

-            systems make use of the OTP boot script to set up paths

-            to all Erlang modules. Runtime_tools/Inviso: A bug in the

-            fetch_log functionality has been fixed. Further a bug

-            that was (supposedly) fixed in a previous patch

-            concerning meta-tracer write_ti has been fixed (again) in

-            this patch. A bug in inviso_as_lib making remote

-            autostart config file updates fail has been fixed.

-            Inviso: inviso_tool has been given a flush API.</p>

-          <p>

-            Own Id: OTP-6918</p>

-        </item>

-      </list>

-   </section>

-
  
-</section>

-<section><title>Inviso 0.5</title>

-

-    <section><title>Improvements and New Features</title>

-      <list>

-        <item>

-          <p>

-            The following bugs/improvements have been done: Internal

-            interworking between inviso_rt and inviso_rt_meta. The

-            call function used by inviso_rt to call inviso_rt_meta is

-            now protected with a monitor. Inviso_rt_meta now includes

-            the timestamp of the incoming meta trace message when

-            calling the call-callback. (Makes it possible to add a

-            "better" timestamp to the ti-file.) Bug in inviso_tool

-            making it not remove trace patterns when terminating. Bug

-            in internal function h_start_session making inviso_tool

-            crash if there were no active nodes to start the session

-            on. The user-inviso_tool and inviso API-inviso control

-            component request/response gen_server protocols had

-            default time-out. Since many trace operations can be time

-            consuming, a longer time-out is necessary. Improved

-            overload protection. It is now possible to let the

-            overload protection renew itself (e.g after an exit from

-            an external overload protector). Inviso_rt_meta now fully

-            uses the exception_trace match spec action term. Run

-            Trace Case API (as in contrast to activate and deactivate

-            trace case APIs) in inviso_tool. Flush trace-port API

-            added to inviso. Get_session_data API added to

-            inviso_tool. Improved inviso_tool:stop making it possible

-            to name nodes which shall not have their trace patterns

-            removed when inviso_tool terminates. Bug in handling of

-            writing multiple ti-entries if returned from a

-            call/return_from call-back in inviso_rt_meta Process

-            trace flags are no longer explicitly removed by the

-            inviso_tool when it terminates. Not necessary.

-            Inviso_tool get_autostart_data adopted to standard

-            autostarter.</p>

-          <p>

-            *** INCOMPATIBILITY with Meta trace call-backs are called

-            with different arguments now. ***</p>

-          <p>

-            Own Id: OTP-6881</p>

-        </item>

-      </list>

-    </section>

-

-</section>

-<section><title>Inviso 0.4</title>

-

-    <section><title>Fixed Bugs and Malfunctions</title>

-      <list>

-        <item>

-          <p>

-	    A bug in inviso_rt_meta caused an ETS table containing

-	    information on initiated (init_tpm) functions to be lost

-	    when suspending tracing. Further an enhancement to

-	    inviso_rt has been introduced making it possible to

-	    activate process trace flags based on globally registered

-	    names. It is then not an error to activate a global name

-	    on a node where the name does not reside. The process

-	    count in the return value will simply be set to zero

-	    (hence exactly one node in the NodeResult part of the

-	    return value will indicate one matching process found). A

-	    bug was found in fetch_log API. At the same time the

-	    fetch_log functionality was enhanced to also offer flow

-	    control making fetcher processes send chunks of

-	    transferred file data at a slower pace.</p>

-          <p>

-	    Own Id: OTP-6703</p>

-        </item>

-      </list>

-    </section>

-

-

-    <section><title>Improvements and New Features</title>

-      <list>

-        <item>

-          <p>

-	    Minor Makefile changes.</p>

-          <p>

-	    Own Id: OTP-6689 Aux Id: OTP-6742 </p>

-        </item>

-      </list>

-    </section>

-

-</section>

-

-

-<section><title>Inviso 0.3</title>

-

-    <section><title>Improvements and New Features</title>

-      <list>

-        <item>

-          <p>

-            In this release the first working version of the

-            inviso_tool is included. Updates and small bugfixes in

-            the inviso application.</p>

-          <p>

-            Own Id: OTP-6677</p>

-        </item>

-      </list>

-    </section>

-

-</section>

-<section><title>Inviso 0.2.1</title>

-

-    <section><title>Improvements and New Features</title>

-      <list>

-        <item>

-          <p>

-            Misc improvements.</p>

-          <p>

-            Own Id: OTP-6576</p>

-        </item>

-      </list>

-    </section>

-

-</section>

-

-<section><title>Inviso 0.2</title>

-

-    <section><title>Fixed Bugs and Malfunctions</title>

-      <list>

-        <item>

-          <p>

-            This ticket includes several improvements and bugfixes to

-            both runtime_tools and inviso. The overload mechanism can

-            now also react to incoming messages. This is useful if

-            an external overload watch-dog is used. Some improvements

-            of variable bindings has been done to the default

-            autostart mechanism - inviso_autostart_server. Autostart

-            "jobs" can now be done in parallel, allowing for some

-            jobs to hang waiting for some parts of the traced system

-            to become ready before proceeding. Previously when using

-            named meta-match-specs (tpm_ms) ending up with zero

-            match-specs still kept the meta trace pattern active.

-            This caused zero match-specs to be equal to unlimited

-            meta tracing on that particular function. If the internal

-            database becomes empty of meta match specs, meta trace

-            pattern is removed for that function. Standard public

-            loop data in the inviso runtime meta tracer process is

-            now extended to a 2-tuple. The functions ctp/1 and ctpl/1

-            are added making it possible to remove trace patterns for

-            a list of functions rather than one by one.

-            Inviso_rt_meta will now accept a list of binaries to be

-            output into the trace information file, in additions to a

-            single binary. Further it is also possible to make own

-            output to the trace information file using the write_ti/1

-            function. An error was discovered in inviso_rt making the

-            inviso_rt_meta remain rather than terminate if the

-            inviso_rt terminated due to "running alone" (not allowed

-            to run without a control component). A new tool,

-            inviso_tool, has been added to the inviso application.</p>

-          <p>

-            Own Id: OTP-6426</p>

-        </item>

-      </list>

-    </section>

-    

-</section>

-

-  <section>
-    <title>Inviso 0.1</title>
-    <p>First version.</p>
-  </section>
-
-</chapter>
-
diff --git a/lib/inviso/doc/src/part_notes.xml b/lib/inviso/doc/src/part_notes.xml
deleted file mode 100644
index 1cd8b0f1a7..0000000000
--- a/lib/inviso/doc/src/part_notes.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2006</year><year>2009</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
-    
-    </legalnotice>
-
-    <title>Inviso Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p><em>Inviso</em>, an Erlang trace tool.</p>
-  </description>
-  <xi:include href="notes.xml"/>
-</part>
-
diff --git a/lib/inviso/doc/src/ref_man.xml b/lib/inviso/doc/src/ref_man.xml
deleted file mode 100644
index c9e75e4029..0000000000
--- a/lib/inviso/doc/src/ref_man.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2006</year><year>2009</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
-    
-    </legalnotice>
-
-    <title>Inviso Reference Manual</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p><em>Inviso</em>, an Erlang trace tool.</p>
-  </description>
-  <xi:include href="inviso.xml"/>
-  <xi:include href="inviso_as_lib.xml"/>
-  <xi:include href="inviso_lfm.xml"/>
-  <xi:include href="inviso_lfm_tpfreader.xml"/>
-  <xi:include href="inviso_rt.xml"/>
-  <xi:include href="inviso_rt_meta.xml"/>
-</application>
-
diff --git a/lib/inviso/ebin/.gitignore b/lib/inviso/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/inviso/ebin/.gitignore
+++ /dev/null
diff --git a/lib/inviso/include/.gitignore b/lib/inviso/include/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/inviso/include/.gitignore
+++ /dev/null
diff --git a/lib/inviso/info b/lib/inviso/info
deleted file mode 100644
index 3190d6d1cc..0000000000
--- a/lib/inviso/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: tools
-short: A trace tool for both development and delivered systems.
diff --git a/lib/inviso/priv b/lib/inviso/priv
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/inviso/priv
+++ /dev/null
diff --git a/lib/inviso/src/Makefile b/lib/inviso/src/Makefile
deleted file mode 100644
index 1f2f8b1aff..0000000000
--- a/lib/inviso/src/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-# ``The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved via the world wide web at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-# AB. All Rights Reserved.''
-# 
-#     $Id$
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(INVISO_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/inviso-$(VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-MODULES= \
-	inviso \
-	inviso_c \
-	inviso_lfm \
-	inviso_lfm_tpfreader \
-	inviso_tool \
-	inviso_tool_lib
-
-
-#HRL_FILES= ../include/
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
-
-APP_FILE= inviso.app
-
-APP_SRC= $(APP_FILE).src
-APP_TARGET= $(EBIN)/$(APP_FILE)
-
-APPUP_FILE= inviso.appup
-
-APPUP_SRC= $(APPUP_FILE).src
-APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS += +warn_unused_vars -I../include 
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-#	$(INSTALL_DIR) $(RELSYSDIR)/include
-#	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-
-release_docs_spec:
-
-
-
-
-
-
-
diff --git a/lib/inviso/src/inviso.app.src b/lib/inviso/src/inviso.app.src
deleted file mode 100644
index 91eaa1b9b2..0000000000
--- a/lib/inviso/src/inviso.app.src
+++ /dev/null
@@ -1,13 +0,0 @@
-{application,inviso,
-   [{description,  "INVISO trace tool"},
-    {vsn,          "%VSN%"},
-    {modules,      [inviso_c,inviso,
-		    inviso_lfm,inviso_lfm_tpfreader
-		   ]},
-    {registered,   [inviso_c]},
-    {applications, [kernel, stdlib, runtime_tools]},
-    {env,          []}
-    ]}.
-
-
-
diff --git a/lib/inviso/src/inviso.appup.src b/lib/inviso/src/inviso.appup.src
deleted file mode 100644
index 54a63833e6..0000000000
--- a/lib/inviso/src/inviso.appup.src
+++ /dev/null
@@ -1 +0,0 @@
-{"%VSN%",[],[]}.
diff --git a/lib/inviso/src/inviso.erl b/lib/inviso/src/inviso.erl
deleted file mode 100644
index 07bdf3e649..0000000000
--- a/lib/inviso/src/inviso.erl
+++ /dev/null
@@ -1,1056 +0,0 @@
-%% ``The contents of this file are subject to the Erlang Public License,

-%% Version 1.1, (the "License"); you may not use this file except in

-%% compliance with the License. You should have received a copy of the

-%% Erlang Public License along with this software. If not, it can be

-%% retrieved via the world wide web at http://www.erlang.org/.

-%% 

-%% Software distributed under the License is distributed on an "AS IS"

-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See

-%% the License for the specific language governing rights and limitations

-%% under the License.

-%% 

-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.

-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings

-%% AB. All Rights Reserved.''

-%% 

-%%     $Id$

-%%

-%% Author: Ann-Marie L�f, [email protected]

-%%         Lennart �hman, [email protected]

-%%

-%% Description: API module for the inviso system.

-%% Inviso consists of a control component and possibly one or more runtime

-%% components. This module is simply the API to the inviso system. All normal

-%% calls goes through the control component.

-%% ------------------------------------------------------------------------------

-

--module(inviso).

--deprecated(module).
-

-%% ------------------------------------------------------------------------------

-%% Exported API functions.

-%% ------------------------------------------------------------------------------

-

--export([start/0, start/1,

-	 add_node/1, add_node/2, add_node_if_ref/1, add_node_if_ref/2,

-	 add_nodes/2, add_nodes/3, add_nodes_if_ref/2, add_nodes_if_ref/3,

-	 change_options/1, change_options/2,

-	 init_tracing/1, init_tracing/2, 

-	 stop_tracing/0, stop_tracing/1, 

-	 clear/0, clear/1, clear/2,

-	 flush/0,flush/1,

-	 stop/0, stop_nodes/0, stop_nodes/1, stop_all/0,

-	 tp/1,tp/2,tp/4,tp/5,tp/6,

-	 tpl/1,tpl/2,tpl/4,tpl/5,tpl/6,

-	 tpm_localnames/0,tpm_localnames/1,tpm_globalnames/0,tpm_globalnames/1,

-	 init_tpm/4,init_tpm/5,init_tpm/7,init_tpm/8,

-	 tpm/4,tpm/5,tpm/6,tpm/8,tpm/9,

-	 tpm_tracer/4,tpm_tracer/5,tpm_tracer/6,tpm_tracer/8,tpm_tracer/9,

-	 tpm_ms/5,tpm_ms/6,

-	 tpm_ms_tracer/5,tpm_ms_tracer/6,

-	 ctpm_ms/4,ctpm_ms/5,ctpm/3,ctpm/4,

-	 ctpm_localnames/0,ctpm_localnames/1,ctpm_globalnames/0,ctpm_globalnames/1,

-	 ctp/1,ctp/2,ctp/3,ctp/4,

-	 ctpl/1,ctpl/2,ctpl/3,ctpl/4,

-	 tf/1, tf/2, tf/3,

-	 ctf/1, ctf/2, ctf/3,

-	 ctp_all/0, ctp_all/1, ctf_all/0, ctf_all/1,

-	 suspend/1, suspend/2,

-	 cancel_suspension/0, cancel_suspension/1,

-	 get_status/0, get_status/1,

-	 get_tracerdata/0, get_tracerdata/1,

-	 list_logs/0, list_logs/1,

-	 fetch_log/2, fetch_log/3, fetch_log/4,

-	 delete_log/0, delete_log/1, delete_log/2,

-	 subscribe/0, subscribe/1, 

-	 unsubscribe/0, unsubscribe/1]).

-

-%% debuging inviso

--export([state/0, state/1]).

-

-%% ------------------------------------------------------------------------------

-%% Macros used in this module.

-%% ------------------------------------------------------------------------------

-

--define(CONTROLLER,inviso_c).

-

-%% Some function calls to runtime components may take long time, we must wait

-%% longer than the standard timeout for a reply from the control component.

--define(CALL_TIMEOUT,60000).

-%% ------------------------------------------------------------------------------

-

-

-

-%% =============================================================================

-%% CONTROL COMPONENT API FUNCTIONS.

-%% =============================================================================

-

-%% start()={ok,pid()}|{error,Reason}

-%% start(Options)={ok,pid()}|{error,Reason} 

-%%   Options=[Option,...], the options will be default options to runtime components

-%%     later started. See add_node about available options.

-%%     There are also options consumed by the control component:

-%%       Option={subscribe,pid()}

-%%

-%% Starts a control component process on the local node. A control component must

-%% be started before runtime components can be started manually.

-start() ->

-    gen_server:start({local,?CONTROLLER},?CONTROLLER,{self(),[]},[]).

-

-start(Options) ->

-    gen_server:start({local,?CONTROLLER},?CONTROLLER,{self(),Options},[]).

-%% -----------------------------------------------------------------------------

-

-%% add_node(Reference)=NodeResult|{error, Reason}

-%% add_node(Reference,Options)=NodeResult|{error, Reason}

-%%   Reference=PreviousReference = term(),

-%%   Options=[Option,...],

-%%   Option={dependency,Dep}

-%%     Dep=integer()|'infinity'; The timeout before the runtime component will

-%%       terminate if abandoned by this control component.

-%%   Option={overload,Overload}; controls how and how often overload checks shall

-%%       be performed. Instead of specifying a tuple, the atom 'overload' can be

-%%       specified to state no loadcheck. The result will actually be the same

-%%       if 'infinity' is used as intervall. It is sometimes necessary to

-%%       initialize the overlaod check. This can be done with InitMFA. The

-%%       loadchecker must then also be removed by using a RemoveMFA.

-%%     Overload=Iterval (int() in milliseconds) |

-%%         {LoadMF,Interval}|{LoadMF,Interval,InitMFA,RemoveMFA}

-%%           LoadMF={Mod,Func}

-%%           InitMFA,RemoveMFA={Mod,Func,ArgList}|void

-%%           If just Interval is used, it means using a default overload check.

-%%   NodeResult={ok,NAns}|{error,Reason} 

-%%   NAns=new|{adopted,State,Status,PreviousReference}|already_added

-%%   Status = running | {suspended, SReason}

-%%

-%% Starts or tries to connect to an existing runtime component at the local

-%% node, regardless if the system is distributed or not.

-%% Options will override any default options specified at start-up of the

-%% control component.

-add_node(Reference) ->

-    gen_server:call(?CONTROLLER,{add_nodes,[node()],[],Reference,any_ref},?CALL_TIMEOUT).

-

-add_node(Reference,Options) when is_list(Options) ->
-    gen_server:call(?CONTROLLER,{add_nodes,[node()],Options,Reference,any_ref},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-

-%% add_node(Reference)=NodeResult|{error,{wrong_reference,OtherRef}}|{error,Reason}

-%% add_node(Reference,Options)=NodeResult|{error,{wrong_reference,OtherRef}}|

-%%   {error,Reason}

-%%

-%% As add_node/1,/2 but will only connect to an already existing runtime component

-%% if its reference is the same as the one given as argument.

-add_node_if_ref(Reference) ->

-    gen_server:call(?CONTROLLER,{add_nodes,[node()],[],Reference,if_ref},?CALL_TIMEOUT).

-

-add_node_if_ref(Reference,Options) when is_list(Options) ->
-    gen_server:call(?CONTROLLER,{add_nodes,[node()],Options,Reference,if_ref},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-

-%% add_nodes(Nodes,Reference)={ok,NodeResults}|{error,Reason}

-%% add_nodes(Nodes,Reference,Options)={ok,NodeResults}|{error,Reason}

-%%   Nodes=[Node,...], 

-%%   NodeResults=[{Node,NodeResult},...]

-%%

-%% As add_node/1,/2 but for the nodes specified in Nodes.

-%% It is possible but not intended to use this function in a non-distributed

-%% system. By speicifying node() as the node where the runtime component shall

-%% be started. The return value will then follow the rules of non distributed

-%% returnvalues and not have a node indicator.

-add_nodes(Nodes,Reference) when is_list(Nodes) ->
-    gen_server:call(?CONTROLLER,{add_nodes,Nodes,[],Reference,any_ref},?CALL_TIMEOUT).

-

-add_nodes(Nodes,Reference,Options) when is_list(Nodes),is_list(Options) ->
-    gen_server:call(?CONTROLLER,{add_nodes,Nodes,Options,Reference,any_ref},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-

-%% add_nodes_if_ref(Nodes,Reference)={ok,NodeResults}|{error,Reason}

-%% add_nodes_if_ref(Nodes,Reference,Options)={ok,NodeResults}|{error,Reason}

-%%

-%% As add_nodes/2,/3 but will only connect to an already existing runtime component

-%% if its reference is the same as the one given as argument.

-add_nodes_if_ref(Nodes,Reference) when is_list(Nodes) ->
-    gen_server:call(?CONTROLLER,{add_nodes,Nodes,[],Reference,if_ref},?CALL_TIMEOUT).

-

-add_nodes_if_ref(Nodes,Reference,Options) when is_list(Nodes),is_list(Options) ->
-    gen_server:call(?CONTROLLER,{add_nodes,Nodes,Options,Reference,if_ref},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-

-%% change_options(Options)={ok,NodeResults}|NodeResult|{error,Reason}

-%% change_options(Nodes,Options)={ok,NodeResults}|{error,Reason}

-%%   Nodes=[Node,...], 

-%%   Options= see add_node and add_nodes on available options.

-%%

-%% Change options on all or specified Nodes. This may result in for instance

-%% reinitialization of overloadcheck.

-change_options(Options) when is_list(Options) ->
-    gen_server:call(?CONTROLLER,{change_options,all,Options},?CALL_TIMEOUT).

-change_options(Nodes,Options) when is_list(Nodes),is_list(Options)  ->
-    gen_server:call(?CONTROLLER,{change_options,Nodes,Options},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-

-%% init_tracing(TracerData)={ok,[{Node,NodeResult}]} | NodeResult | {error,Reason}

-%% init_tracing(TracerList)={ok,[{Node,NodeResult}]} | {error,Reason}

-%% init_tracing(Nodes,TracerData)={ok,[{Node,NodeResult}]}|{error,Reason}

-%%   TracerData = [{trace,LogTD} [,{ti,TiTD}]}] | LogTD

-%%   LogTD      = {HandlerFun,Data} | collector | {relayer,pid()} |  

-%%                {relayer,CollectingNode} | {ip,IPPortParameters} |

-%%                {file,FilePortParameters}

-%%   TiTD       = {file,FileName} | {file,FileName,TiMFA}

-%%   TiMFA      = {Module,Function,ArgumentList} initiating a private loopdata

-%%                inside the meta-tracer.

-%%   TracerList = [{Node,TracerData}],

-%%   IPPortParameters = Portno | {Portno, Qsiz}

-%%   Qsiz = 

-%%   FilePortParameters = {Filename, wrap, Tail, {time, WrapTime}, WrapCnt} |

-%%                        {FileName, wrap, Tail, WrapSize, WrapCnt} |

-%%                        {FileName, wrap, Tail, WrapSize} |

-%%                        {FileName, wrap, Tail} | FileName

-%%                          Tail =/= ""

-%%   HandlerFun is a function taking 2 arguments.

-%%   Nodes = [node()], 

-%%   CollectingNode = pid() | node(),

-%%   NodeResult = {ok,LogResults} | {error, NReason} 

-%%     LogResults=[LogResult,...]

-%%       LogResult={trace_log,LogRes} | {ti_log,LogRes}

-%%         LogRes=ok|{error,Reason}

-%%

-%% Starts tracing on the nodes specified. If just providing a TracerData tracing

-%% will be initiated on all our nodes. If it is the non distributed case, that

-%% means only on the local non distributed node.

-%%

-%% {HandlerFun,Data}

-%%   Will use the runtime components own process as tracer and handle all

-%%   incomming trace message using HandlerFun.

-%% {relayer,CollectingNode}

-%%   The runtime component addressed will act tracer and relay all incomming trace

-%%   messages to Node or Pid, if CollectingNode is not a traced node connected 

-%%   to the controll component, the init_tracing call will return an error.

-%%   Note that {relayer, Node} only is syntactical sugar for

-%%   {relayer, rpc:call(Node,erlang,whereis,[inviso_rt])}

-%% collector

-%%   The runtime component is used as tracer or collector of relayed 

-%%   trace messages using the default handler writing them to io.

-%% ip | file - will open a trace-port on Node using PortParameters

-init_tracing(TracerDataList) ->

-    gen_server:call(?CONTROLLER,{init_tracing,TracerDataList},?CALL_TIMEOUT).

-

-init_tracing(Nodes,TracerData) when is_list(Nodes) ->
-    gen_server:call(?CONTROLLER,{init_tracing,Nodes,TracerData},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-

-%% stop_tracing(Nodes)={ok,NodeResults}|{error,Reason}

-%% stop_tracing()={ok,NodeResults}|NodeResult

-%%   Nodes=[Node,...], 

-%%   NodeResults=[{Node,NodeResult},...]

-%%   NodeResult={ok,State}|{error,Reason}

-%%     State=new|idle

-%% Stops tracing on all or specified Nodes. Flushes trace buffert, 

-%% closes trace port and removes all trace flags and meta-patterns.

-%% The nodes are called in parallel.

-stop_tracing() ->

-    gen_server:call(?CONTROLLER,{stop_tracing,all},?CALL_TIMEOUT).

-

-stop_tracing(Nodes) when is_list(Nodes) ->

-    gen_server:call(?CONTROLLER,{stop_tracing,Nodes},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-

-%% clear()={ok,NodeResults}|NodeResult

-%% clear(Nodes,Options)={ok,NodeResults}|{error,Reason}

-%% clear(Options)={ok,NodeResults}|NodeResult|{error,Reason}

-%%   Nodes=[Node,...], 

-%%   Options=[Option,...],

-%%   Option=keep_trace_patterns|keep_log_files

-%%   NodeResults=[{Node,NodeResult},...]

-%%   NodeResult={ok,{new,Status}}|{error,Reason}

-%%     Status=running|{suspended,SReason}

-%%

-%% Stops all tracing including removing meta-trace patterns. If the node is tracing

-%% or idle, logs belonging to the current tracerdata are removed. Hence the node

-%% is returned to state 'new'. Note that node can still be suspended.

-clear() ->

-    gen_server:call(?CONTROLLER,{clear,all,[]},?CALL_TIMEOUT).

-

-clear(Nodes) when is_list(Nodes) ->
-    gen_server:call(?CONTROLLER,{clear,Nodes,[]},?CALL_TIMEOUT).

-

-clear(Nodes,Options) when is_list(Nodes),is_list(Options) ->
-    gen_server:call(?CONTROLLER,{clear,Nodes,Options},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-

-%% flush()={ok,NodeResults} | NodeResult

-%% flush(Nodes)={ok,NodeResults}

-%%   Nodes=[Node,...]

-%%   NodeResults=[{Node,NodeResult},...]

-%%   NodeResult=ok | {error,Reason}

-%% Sends a flush request to the trace-port driver on the nodes in Nodes.

-%% There will be an error for nodes that are not tracing. It is not an error to

-%% try to flush runtime components not using a trace-port.

-flush() ->

-    gen_server:call(?CONTROLLER,{flush,all},?CALL_TIMEOUT).

-flush(Nodes) when is_list(Nodes) ->

-    gen_server:call(?CONTROLLER,{flush,Nodes},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-

-%% stop()=shutdown

-%%

-%% Stops the controll component. Runtime components are left as is. They will

-%% behave according to their dependency values.

-stop() ->

-    case catch gen_server:call(?CONTROLLER,stop,?CALL_TIMEOUT) of

-	shutdown ->

-	    shutdown;

-	{'EXIT',{noproc,_}} ->

-	    shutdown;

-	{'EXIT',Reason} ->

-	    exit(Reason)

-    end.

-%% -----------------------------------------------------------------------------

-

-%% stop_nodes()={ok,NodeResults}|NodeResult

-%% stop_nodes(Nodes)={ok,NodeResults}|{error,Reason}

-%%   NodeResults=[{Node,NodeResult},...]

-%%   NodeResult=ok|{error,Reason}

-%%

-%% Stops runtime component on Nodes. stop_nodes/0 will if the control component

-%% is running on a distributed node stop all runtime components. And if running

-%% on a non distributed node, stop the local and only runtime component.

-stop_nodes() ->

-    gen_server:call(?CONTROLLER,{stop_nodes,all},?CALL_TIMEOUT).

-stop_nodes(Nodes) when is_list(Nodes) ->

-    gen_server:call(?CONTROLLER,{stop_nodes,Nodes},?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% stop_all()={ok,NodeResults}|NodeResult

-%%   NodeResults=[{Node,NodeResult},...]

-%%   NodeResult=ok|{error,Reason}

-%%

-%% A combination of stop/0 and stop_nodes/0.

-stop_all() ->

-    gen_server:call(?CONTROLLER, stop_all,?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% tp(Nodes,Module,Function,Arity,MatchSpec,Opts)={ok,NodeResults}|{error,Reason}

-%% tp(Nodes,Module,Function,Arity,MatchSpec)={ok,NodeResults}|{error,Reason}

-%% tp(Module,Function,Arity,MatchSpec)={ok,NodeResults}|NodeResult|{error,Reason}

-%% tp(Nodes,PatternList)={ok,NodeResults}|{error,Reason}

-%% tp(PatternList)={ok,NodeResults}|NodeResult|{error,Reason}

-%%   Nodes=[Node,...] 

-%%   Module,Function=atom() | '_'

-%%   Arity=integer() | '_'

-%%   MatchSpec=true|false|[]| matchspec()

-%%   PatternList=[Pattern,...],

-%%   Pattern={Module,Function,Arity,MatchSpec,Opts},

-%%   Opts=[Opt,...]

-%%     Opt='only_loaded'; means that the runtime component shall not try to load

-%%           a module should it not already be present in the runtime system.

-%%   NodeResults=[NodeResult,...]

-%%   NodeResult={ok,[Ans]}|{error,Reason},

-%%   Ans=integer()|{error,Reason}

-%%

-%% Set trace pattern (global) on specified or all Nodes. The integer replied

-%% if the call was successfully describes the matched number of functions.

-%% The functions without a Nodes argument means all nodes, in a non-distributed

-%% environment it means the local node.

-%% When calling several nodes, the nodes are called in parallel.

-tp(Nodes,Module,Function,Arity,MatchSpec,Opts) ->

-    trace_pattern(Nodes,[{Module,Function,Arity,MatchSpec,Opts}],[global]).

-

-tp(Nodes,Module,Function,Arity,MatchSpec) when is_list(Nodes) ->
-    trace_pattern(Nodes,[{Module,Function,Arity,MatchSpec,[]}],[global]);

-tp(Module,Function,Arity,MatchSpec,Opts) when is_atom(Module) ->
-    trace_pattern(all,[{Module,Function,Arity,MatchSpec,Opts}],[global]).

-

-tp(Module,Function,Arity,MatchSpec) ->

-    trace_pattern(all,[{Module,Function,Arity,MatchSpec,[]}],[global]).

-

-tp(Nodes,PatternList) ->

-    trace_pattern(Nodes,PatternList,[global]).

-

-tp(PatternList) ->

-    trace_pattern(all,PatternList,[global]).

-%% -----------------------------------------------------------------------------

-

-%% tpl(Nodes,Module,Function,Arity,MatchSpec)={ok,NodeResults}|{error,Reason}

-%% tpl(Module,Function,Arity,MatchSpec)={ok,NodeResults}|NodeResult|{error,Reason}

-%% tpl(Nodes,PatternList)={ok,NodeResults}|{error,Reason}

-%% tpl(PatternList)={ok,NodeResults}|NodeResult|{error,Reason}

-%%   see tp/X for description.

-%%

-%% Set trace pattern (local) on specified or all Nodes. The integer replied

-%% if the command was successfully describes the matched number of functions.

-%% The functions without a Nodes argument means all nodes, in a non-distributed

-%% environment it means the local node.

-%% When calling several nodes, the nodes are called in parallel.

-tpl(Nodes,Module,Function,Arity,MatchSpec,Opts) ->

-    trace_pattern(Nodes,[{Module,Function,Arity,MatchSpec,Opts}],[local]).

-

-tpl(Nodes,Module,Function,Arity,MatchSpec) when is_list(Nodes) ->
-    trace_pattern(Nodes,[{Module,Function,Arity,MatchSpec,[]}],[local]);

-tpl(Module,Function,Arity,MatchSpec,Opts) when is_atom(Module) ->
-    trace_pattern(all,[{Module,Function,Arity,MatchSpec,Opts}],[local]).

-

-tpl(Module,Function,Arity,MatchSpec) ->

-    trace_pattern(all,[{Module,Function,Arity,MatchSpec,[]}],[local]).

-

-tpl(Nodes, PatternList) ->

-    trace_pattern(Nodes,PatternList,[local]).

-

-tpl(PatternList) ->

-    trace_pattern(all,PatternList,[local]).

-%% -----------------------------------------------------------------------------

-

-%% ctp(Nodes,Module,Function,Arity)={ok,NodeResults}|{error,Reason}

-%% ctp(Module,Function,Arity)={ok,NodeResults}|NodeResult|{error,Reason}

-%% ctp(Nodes,PatternList)={ok,NodeResults}|{error,Reason}

-%% ctp(PatternList)={ok,NodeResults}|NodeResult|{error,Reason}

-%%   PatternList=[{Mod,Func,Arity},...]

-%%   see tp/X for other argument descriptions.

-%%

-%% Clear trace pattern (global) on specified or all Nodes. The integer replied

-%% if the call was successfully describes the matched number of functions.

-%% The functions without a Nodes argument means all nodes, in a non-distributed

-%% environment it means the local node.

-%% When calling several nodes, the nodes are called in parallel.

-ctp(Nodes,Module,Function,Arity) ->

-    trace_pattern(Nodes,[{Module,Function,Arity,false,[only_loaded]}],[global]).

-

-ctp(Module,Function,Arity) ->

-    trace_pattern(all,[{Module,Function,Arity,false,[only_loaded]}],[global]).

-

-ctp(Nodes,PatternList) when is_list(PatternList) ->
-    trace_pattern(Nodes,

-		  lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList),

-		  [global]).

-

-ctp(PatternList) when is_list(PatternList) ->
-    trace_pattern(all,

-		  lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList),

-		  [global]).

-%% -----------------------------------------------------------------------------

-

-%% ctpl(Nodes,Module,Function,Arity)={ok,NodeResults}|{error,Reason}

-%% ctpl(Module,Function,Arity)={ok,NodeResults}|NodeResult|{error,Reason}

-%% ctpl(Nodes,PatternList)={ok,NodeResults}|{error,Reason}

-%% ctpl(PatternList)={ok,NodeResults}|NodeResult|{error,Reason}

-%%   see ctp/X for argument description.

-%%

-%% Clear trace pattern (local) on specified or all Nodes. The integer replied

-%% if the call was successfully describes the matched number of functions.

-%% The functions without a Nodes argument means all nodes, in a non-distributed

-%% environment it means the local node.

-%% When calling several nodes, the nodes are called in parallel.

-ctpl(Nodes,Module,Function,Arity) ->

-    trace_pattern(Nodes,[{Module,Function,Arity,false,[only_loaded]}],[local]).

-

-ctpl(Module,Function,Arity) ->

-    trace_pattern(all,[{Module,Function,Arity,false,[only_loaded]}],[local]).

-

-ctpl(Nodes,PatternList) when is_list(PatternList) ->
-    trace_pattern(Nodes,

-		  lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList),

-		  [local]).

-

-ctpl(PatternList) when is_list(PatternList) ->
-    trace_pattern(all,

-		  lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList),

-		  [local]).

-%% -----------------------------------------------------------------------------

-

-%% Help function doing the control component calling for all tp/X, tpl/X, ctp/X

-%% and ctpl/X functions.

-trace_pattern(Nodes,Patterns,FlagList)  -> 

-    gen_server:call(?CONTROLLER, {trace_pattern, Nodes, Patterns, FlagList},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-%% -----------------------------------------------------------------------------

-

-%% tf(Nodes,PidSpec,FlagList)={ok,NodeResults}|{error,Reason}

-%% tf(PidSpec,FlagList)={ok,NodeResults}|NodeResult|{error,Reason}

-%% tf(Nodes,TraceConfList)={ok,NodeResults}|{error,Reason}

-%% tf(NodeTraceConfList)={ok,NodeResults}|{error,Reason}

-%% tf(TraceConfList)={ok,NodeResults}|NodeResult|{error,Reason}

-%%   Nodes=[Node,...],

-%%   NodeTraceConfList=[{Node,TraceConfList}]

-%%   TraceConfList=[{PidSpec,FlagList},...],

-%%   FlagList=[Flags],

-%%   PidSpec=all|new|existing|pid()|locally_registered_name()

-%%   Flags= all process trace flags allowed.

-%%   NodeResult={ok,[Ans]}|{error,Reason},

-%%   Ans=integer() | {error,Reason}

-%%

-%% Set process trace flags on processes on all or specified Nodes. The integer

-%% return if the call was successfully describes the matched number of processes.

-%% The functions without a Nodes argument means all nodes, in a non-distributed

-%% environment it means the local node.

-%% There are many combinations which does not make musch scense. For instance

-%% specifying a certain pid at all nodes. Or an empty TraceConfList for all

-%% nodes.

-%% When calling several nodes, the nodes are called in parallel.

-tf(Nodes,PidSpec,FlagList) when is_list(Nodes),is_list(FlagList) ->
-    trace_flags(Nodes,[{PidSpec, FlagList}],true).

-

-tf(Nodes,TraceConfList) when is_list(Nodes),is_list(TraceConfList) ->
-    trace_flags(Nodes,TraceConfList,true);

-tf(PidSpec,FlagList) when is_list(FlagList) ->
-    trace_flags(all,[{PidSpec,FlagList}],true).

-

-tf(ArgList) when is_list(ArgList) ->            % This one has triple functionality!
-    case ArgList of

-	[{_Process,Flags}|_] when is_list(Flags),is_atom(hd(Flags))-> % A call to all nodes.
-	    trace_flags(all,ArgList,true);

-	[{_Node,TraceConfList}|_] when is_list(TraceConfList),is_tuple(hd(TraceConfList)) ->
-	    trace_flags(ArgList,true);

-	[{_Node,_TraceConfList,_How}|_] ->

-	    trace_flags(ArgList);

-	[] ->                                % Stupid but allowed.

-	    trace_flags(all,ArgList,true)    % Actually doesn't matter which we choose.

-    end.

-%% -----------------------------------------------------------------------------

-

-%% ctf(Nodes,PidSpec,FlagList)={ok,NodeResults}|{error,Reason}

-%% ctf(PidSpec,FlagList)={ok,NodeResults}|NodeResult|{error,Reason}

-%% ctf(Nodes,TraceConfList)={ok,NodeResults}|{error,Reason}

-%% ctf(TraceConfList)={ok,NodeResults}|NodeResult|{error,Reason}

-%%   see tf/X for arguments.

-%%

-%% Clear process trace flags on all or specified Nodes. The integer replied

-%% if the command was successfully describes the matched number of processes.

-%% The functions without a Nodes argument means all nodes, in a non-distributed

-%% environment it means the local node.

-%% When calling several nodes, the nodes are called in parallel.

-ctf(Nodes,PidSpec,FlagList) when is_list(Nodes),is_list(FlagList) ->
-    trace_flags(Nodes,[{PidSpec,FlagList}],false).

-

-ctf(Nodes,TraceConfList) when is_list(Nodes),is_list(TraceConfList) ->
-    trace_flags(Nodes,TraceConfList,false);

-ctf(PidSpec,FlagList) when is_list(FlagList) ->
-    trace_flags(all,[{PidSpec,FlagList}],false).

-

-ctf(TraceConfList) when is_list(TraceConfList) ->
-    trace_flags(all,TraceConfList,false).

-%% -----------------------------------------------------------------------------

-

-%% ctf_all(Nodes)={ok,NodeResults}|{error,Reason}

-%% ctf_all()={ok,NodeResults}|NodeResult|{error,Reason}

-%%   Nodes=[Node,...],

-%%   NodeResults=[{Node,NodeResult},...]

-%%   NodeResult=ok|{error,Reason},

-%%

-%% Clears all trace flags on all or specified nodes. Just for convenience.

-ctf_all() ->

-    gen_server:call(?CONTROLLER,{trace_flags,all,[{all,[all]}],false},?CALL_TIMEOUT).

-

-ctf_all(Nodes) ->

-    gen_server:call(?CONTROLLER,{trace_flags,Nodes,[{all,[all]}],false},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-

-%% Help function to tf/X and ctf/X making the call to the control component.

-trace_flags(Nodes, TraceConfList, How) -> 

-    gen_server:call(?CONTROLLER, {trace_flags, Nodes, TraceConfList, How},?CALL_TIMEOUT).

-

-trace_flags(NodeTraceConfList,How) ->

-    gen_server:call(?CONTROLLER,{trace_flags,NodeTraceConfList,How},?CALL_TIMEOUT).

-

-trace_flags(NodeTraceConfListHow) ->

-    gen_server:call(?CONTROLLER,{trace_flags,NodeTraceConfListHow},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-%% -----------------------------------------------------------------------------

-

-%% tpm_localnames()={ok,NodeResults}|NodeResult|{error,Reason}

-%% tpm_localnames(Nodes)={ok,NodeResults}|{error,Reason}

-%%   NodeResults=[{Node,NodeResult},...]

-%%     NodeResult={ok,N}|{error,Reason}, Note that N can only be 0 or 1.

-%%

-%% Quick version for setting meta-trace patterns on erlang:register/2. It uses

-%% a default CallFunc and ReturnFunc in the meta-tracer server.

-%% The main purpose of this function is to create ti-log entries for printing

-%% the aliases for process instead of their process identities.

-tpm_localnames() ->

-    tpm_localnames(all).

-

-tpm_localnames(Nodes) ->

-    gen_server:call(?CONTROLLER,{meta_pattern,Nodes,{local_register,[]}},?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% tpm_globalnames()={ok,NodeResults}|NodeResult|{error,Reason}

-%% tpm_globalnames(Nodes)={ok,NodeResults}|{error,Reason}

-%%   NodeResults=[{Node,NodeResult},...]

-%%     NodeResult={SubResult,SubResult}

-%%       SubResult={ok,N}|{error,Reason}, Note that N can only be 0 or 1.

-%% As tpm_locanames/0,/1 but for registering names with global. Note that this

-%% actually involves setting meta trace patterns on two functions in global.

-tpm_globalnames() ->

-    tpm_globalnames(all).

-

-tpm_globalnames(Nodes) ->

-    gen_server:call(?CONTROLLER,{meta_pattern,Nodes,{global_register,[]}},?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% init_tpm(Mod,Func,Arity,CallFunc)={ok,NodeResults}|NodeResult|{error,Reason}

-%% init_tpm(Nodes,Mod,Func,Arity,CallFunc)={ok,NodeResults}|{error,Reason}

-%% init_tpm(Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc)=

-%%   {ok,NodeResults}|NodeResult|{error,Reason}

-%% init_tpm(Nodes,Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc)=

-%%   {ok,NodeResults}|{error,Reason}

-%%

-%%   Mod,Func=Pointing out the function which shall be meta traced, atom().

-%%   Arity=As above, integer().

-%%   NodeResults=[{Node,NodeResult},...]

-%%   NodeResult=ok|{error,Reason}

-%%

-%%   InitFunc,RemoveFunc={Module,Function}|fun(), functions being called when

-%%     to initialize the public loopdata structure, and to reset it.

-%%       InitFunc(Mod,Func,Arity,PublLD)->{ok,NewPublLD,Output}

-%%         Supposed to initialize whatever needs to be done before

-%%         handling any incoming meta-trace message for the Mod:Func/Arity.

-%%       RemoveFunc(Mod,Func,Arity,PublLD)->{ok,NewPublLD}

-%%         Called when meta tracing of Mod:Func/Arity is stopped. It is supposed

-%%         to clear datastructures away from the PublLD.

-%% Initializes the public loopdata for this function. Note that we can not use wildcards

-%% here (even if it is perfectly legal in Erlang). It also sets the CallFunc and

-%% ReturnFunc for the meta traced function. The function is hence ready to be

-%% meta traced with either tpm/5 or tpm_ms/5.

-%% When calling several nodes, the nodes are called in parallel.

-init_tpm(Mod,Func,Arity,CallFunc) ->

-    init_tpm(all,Mod,Func,Arity,CallFunc).

-

-init_tpm(Nodes,Mod,Func,Arity,CallFunc) ->

-    gen_server:call(?CONTROLLER,

-		    {meta_pattern,

-		     Nodes,

-		     {init_tpm,

-		      [Mod,Func,Arity,CallFunc]}},

-		    ?CALL_TIMEOUT).

-

-init_tpm(Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->

-    init_tpm(all,Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc).

-

-init_tpm(Nodes,Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->

-    gen_server:call(?CONTROLLER,

-		    {meta_pattern,

-		     Nodes,

-		     {init_tpm,

-		      [Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc]}},

-		    ?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% tpm(Mod,Func,Arity,MS)={ok,NodeResults}|NodeResult|{error,Reason}

-%% tpm(Nodes,Mod,Func,Arity,MS)={ok,NodeResults}|{error,Reason}

-%% tpm(Mod,Func,Arity,MS,CallFunc)={ok,NodeResults}|NodeResults|{error,Reason}

-%% tpm(Nodes,Mod,Func,Arity,MS,CallFunc)={ok,NodeResults}|{error,Reason}

-%% tpm(Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc)=

-%%   {ok,NodeResults}|NodeResults|{error,Reason}

-%% tpm(Nodes,Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc)=

-%%   {ok,NodeResults}|{error,Reason}

-%%

-%%   Mod,Func=atom() and not '_'.

-%%   Arity=integer()

-%%   MS=list(), matchspecification.

-%%   Nodes=List of nodenames.

-%%   InitFunc,CallFunc,ReturnFunc,RemoveFunc={Module,Function}|fun(),

-%%     functions being called when these functions are called by the meta trace

-%%     server at certain events.

-%%       CallFunc(CallingPid,ActualArgList,PublLD)->{ok,NewPrivLD,Output}

-%%       ReturnFunc(CallingPid,ReturnValue,PublLD)->{ok,NewPrivLD,Output}

-%%         When a call respectively return_from trace message arrives for the meta

-%%         traced function, the corresponding function is called.

-%%         The ReturnFunc must handle the fact that a return_from message arrives

-%%         for a call which was never noticed. This because the message queue of the

-%%         meta tracer may have been emptied.

-%%

-%%   NodeResults=[{Node,NodeResult},...]

-%%   NodeResult={ok,N}|{error,Reason}, Note that N can only be 0 or 1.

-%%

-%% Activates meta-tracing in the inviso_rt_meta tracer. Except when using tpm/6,/8

-%% and /9 the function must first have been initiated using init_tpm. If running

-%% a non distributed system the variants without Node shall be used. If running

-%% in a distributed environment, without Node means all our nodes.

-%% When calling several nodes, the nodes are called in parallel.

-tpm(Mod,Func,Arity,MS) ->

-    tpm(all,Mod,Func,Arity,MS).

-

-tpm(Nodes,Mod,Func,Arity,MS) when is_integer(Arity) ->
-    gen_server:call(?CONTROLLER,

-		    {meta_pattern,Nodes,{tpm,[Mod,Func,Arity,MS]}});

-tpm(Mod,Func,Arity,MS,CallFunc) when is_integer(Arity) ->
-    tpm(all,Mod,Func,Arity,MS,CallFunc).

-

-tpm(Nodes,Mod,Func,Arity,MS,CallFunc) ->

-    gen_server:call(?CONTROLLER,

-		    {meta_pattern,Nodes,{tpm,[Mod,Func,Arity,MS,CallFunc]}}).

-

-tpm(Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->

-    tpm(all,Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc).

-

-tpm(Nodes,Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->

-    gen_server:call(?CONTROLLER,

-		    {meta_pattern,

-		     Nodes,

-		     {tpm,

-		      [Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc]}},

-		    ?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% Same as tpm/X but the meta tracer will append {tracer,Tracer} to any enable

-%% list in a trace body action term.

-tpm_tracer(Mod,Func,Arity,MS) ->

-    tpm_tracer(all,Mod,Func,Arity,MS).

-

-tpm_tracer(Nodes,Mod,Func,Arity,MS) when is_integer(Arity) ->
-    gen_server:call(?CONTROLLER,

-		    {meta_pattern,Nodes,{tpm_tracer,[Mod,Func,Arity,MS]}},

-		    ?CALL_TIMEOUT);

-tpm_tracer(Mod,Func,Arity,MS,CallFunc) when is_integer(Arity) ->
-    tpm_tracer(all,Mod,Func,Arity,MS,CallFunc).

-

-tpm_tracer(Nodes,Mod,Func,Arity,MS,CallFunc) ->

-    gen_server:call(?CONTROLLER,

-		    {meta_pattern,Nodes,{tpm_tracer,[Mod,Func,Arity,MS,CallFunc]}}).

-

-tpm_tracer(Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->

-    tpm_tracer(all,Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc).

-

-tpm_tracer(Nodes,Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->

-    gen_server:call(?CONTROLLER,

-		    {meta_pattern,

-		     Nodes,

-		     {tpm_tracer,

-		      [Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc]}},

-		    ?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% tpm_ms(Mod,Func,Arity,MSname,MS)={ok,NodeResults}|NodeResult|{error,Reason}

-%% tpm_ms(Nodes,Mod,Func,Arity,MSname,MS)={ok,NodeResults}|{error,Reason}

-%%   Nodes= List of all nodes where the function shall be carried out.

-%%   Mod,Func=Pointing out the function to which we shall add a match-spec., atom().

-%%   Arity=As above, integer().

-%%   MSname=A name to be used if this MS shall be removed later. term().

-%%   MatchSpec=List of match specification, Remember {return_trace}

-%%     if expecting return_from messages.

-%%   NodeResults=[{Node,NodeResult},...]

-%%     NodeResult={ok,1}|{ok,0}|{error,Reason} where {ok,1} indicates that

-%%       setting the matchspecification for the function succeeded.

-%%

-%% This function adds a list of match-specs to the already existing ones. It

-%% uses an internal database to keep track of existing match-specs. If the

-%% match-spec does not result in any meta traced functions (for whatever reason),

-%% the MS is not saved in the database. The previously known match-specs are

-%% not removed.

-%% The function must previously have been initiated in order for this function

-%% to add a match-spec.

-%% When calling several nodes, the nodes are called in parallel.

-tpm_ms(Mod,Func,Arity,MSname,MS) ->

-    tpm_ms(all,Mod,Func,Arity,MSname,MS).

-

-tpm_ms(Nodes,Mod,Func,Arity,MSname,MS) ->

-    gen_server:call(?CONTROLLER,

-		    {meta_pattern,Nodes,{tpm_ms,[Mod,Func,Arity,MSname,MS]}},

-		    ?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% Same as tpm_ms/5, /6 but the meta tracer will append {tracer,Tracer} to any enable

-%% list in a trace body action term.

-tpm_ms_tracer(Mod,Func,Arity,MSname,MS) ->

-    tpm_ms_tracer(all,Mod,Func,Arity,MSname,MS).

-

-tpm_ms_tracer(Nodes,Mod,Func,Arity,MSname,MS) ->

-    gen_server:call(?CONTROLLER,

-		    {meta_pattern,Nodes,{tpm_ms_tracer,[Mod,Func,Arity,MSname,MS]}},

-		    ?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% ctpm_ms(Mod,Func,Arity,MSname)={ok,NodeResults}|NodeResult|{error,Reason}

-%% ctpm_ms(Nodes,Mod,Func,Arity,MSname)={ok,NodeResults}|{error,Reason}

-%%   NodeResults=[{Node,NodeResult},...]

-%%     NodeResult=ok|{error,Reason}

-%%

-%% Removes a named match-spec from the meta traced function. Note that it never

-%% is a fault to remove an MS. Not even from a function which is non existant.

-%% When calling several nodes, the nodes are called in parallel.

-ctpm_ms(Mod,Func,Arity,MSname) ->

-    ctpm_ms(all,Mod,Func,Arity,MSname).

-

-ctpm_ms(Nodes,Mod,Func,Arity,MSname) ->

-    gen_server:call(?CONTROLLER,

-		    {meta_pattern,Nodes,{ctpm_ms,[Mod,Func,Arity,MSname]}},

-		    ?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% ctpm(Mod,Func,Arity)={ok,NodeResults}|NodeResult|{error,Reason}

-%% ctpm(Node,Mod,Func,Arity)={ok,NodeResults}|{error,Reason}

-%%   NodeResults=[{Node,NodeResult},...]

-%%     NodeResult=ok|{error,Reason}

-%%

-%% Removes the meta trace pattern for the function, means stops generating output

-%% for this function. The public LD may be cleared by the previously entered

-%% RemoveFunc.

-%% When calling several nodes, the nodes are called in parallel.

-ctpm(Mod,Func,Arity) ->

-    ctpm(all,Mod,Func,Arity).

-

-ctpm(Nodes,Mod,Func,Arity) ->

-    gen_server:call(?CONTROLLER,

-		    {meta_pattern,Nodes,{ctpm,[Mod,Func,Arity]}},

-		    ?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% ctpm_localnames()={ok,NodeResults}|NodeResult|{error,Reason}

-%% ctpm_localnames(Nodes)={ok,NodeResults}|{error,Reason}

-%%   NodeResults=[{Node,NodeResult},...]

-%%     NodeResult=ok|{error,Reason}

-%%

-%% Removes meta-trace pattern for erlang:register/2, previously set by tpm_localnames.

-%% When calling several nodes, the nodes are called in parallel.

-ctpm_localnames() ->

-    ctpm_localnames(all).

-

-ctpm_localnames(Nodes) ->

-    gen_server:call(?CONTROLLER,{meta_pattern,Nodes,{remove_local_register,[]}},?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% ctpm_localnames()={ok,NodeResults}|NodeResult|{error,Reason}

-%% ctpm_localnames(Nodes)={ok,NodeResults}|{error,Reason}

-%%   NodeResults=[{Node,NodeResult},...]

-%%     NodeResult={SubResult,Subresult}

-%%       SubResult=ok|{error,Reason}

-%%

-%% Removes meta-trace pattern for the register functions in global. Note that there

-%% are two of them.

-%% When calling several nodes, the nodes are called in parallel.

-ctpm_globalnames() ->

-    ctpm_globalnames(all).

-

-ctpm_globalnames(Nodes) ->

-    gen_server:call(?CONTROLLER,{meta_pattern,Nodes,{remove_global_register,[]}},?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% ctp_all(Nodes)={ok,NodeResults}|{error,Reason}

-%% ctp_all()={ok,NodeResults}|NodeResult|{error,Reason}

-%%   Nodes=[Node,...], 

-%%   NodeResults=[{Node,NodeResult},...]

-%%   NodeResult=ok|{error,Reason},

-%%

-%% Clears all both global and local trace patterns on all or specified nodes.

-%% Does not effect meta patterns.

-ctp_all() ->

-    gen_server:call(?CONTROLLER,{ctp_all,all},?CALL_TIMEOUT).

-

-ctp_all(Nodes) ->

-    gen_server:call(?CONTROLLER,{ctp_all,Nodes},?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% suspend(Nodes,Reason)={ok,NodeResults}|{error,Reason}

-%% suspend(Reason)={ok,NodeResults}|NodeResult|{error,Reason}

-%%   Nodes=[Node],

-%%   Reason=term(); supposed to describe the reason why suspended.

-%%   NodeResults=[{Node,NodeResult},...]

-%%   NodeResult=ok|{error,Reason},

-%%

-%% Suspend all or specified Nodes with reason Reason. Suspend means that all

-%% process trace flags are removed and all meta-patterns.

-suspend(Nodes, Reason) ->

-    gen_server:call(?CONTROLLER,{suspend,Reason,Nodes},?CALL_TIMEOUT).

-

-suspend(Reason) ->

-    gen_server:call(?CONTROLLER,{suspend,Reason,all},?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% cancel_suspension(Nodes)={ok,NodeResults}|{error,Reason}

-%% cancel_suspension()={ok,NodeResults}|NodeResult|{error,Reason}

-%%   Nodes=[Node,...],

-%%   NodeResults=[{Node,NodeResult},...]

-%%   NodeResult=ok|{error,Reason},

-%% Cancel suspension on all or specified Nodes. Note that this does not imply

-%% that "business" is resumed as before. You must reactivate flags and meta-patter

-%% your self.

-cancel_suspension(Nodes) ->

-    gen_server:call(?CONTROLLER,{cancel_suspension,Nodes},?CALL_TIMEOUT).

-

-cancel_suspension() ->

-    gen_server:call(?CONTROLLER,{cancel_suspension,all},?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% get_status(Nodes)={ok,NodeResults}|{error,Reason}

-%% get_status()={ok,NodeResults}|NodeResult|{error,Reason}

-%%   Nodes=[Node,...],

-%%   NodeResults=[{Node,NodeResult},...]

-%%   NodeResult={ok,{State,Status}}|{error,Reason},

-%%   State=new|idle|tracing

-%%   Status=running|{suspended,SReason}

-%%

-%% Get Status form all or specified runtime components.

-get_status(Nodes) when is_list(Nodes) ->
-    gen_server:call(?CONTROLLER,{get_status,Nodes},?CALL_TIMEOUT).

-

-get_status() ->

-    gen_server:call(?CONTROLLER,{get_status,all},?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% get_tracerdata()={ok,NodeResults}|NodeResult|{error,Reason}

-%% get_tracerdata(Nodes)={ok,NodeResults}|{error,Reason}

-%%   Nodes=[Node,...],

-%%   NodeResult={ok,NResult}|{error,Reason},

-%%   NResult=TracerData|no_tracerdata

-%%   TracerData will be exactly as it was specified when doing init_tracing.

-%%

-%% Get TracerData form all or specified runtime components.

-get_tracerdata() ->

-    gen_server:call(?CONTROLLER,{get_tracerdata,all},?CALL_TIMEOUT).

-

-get_tracerdata(Nodes) when is_list(Nodes) -> 

-    gen_server:call(?CONTROLLER,{get_tracerdata,Nodes},?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% list_logs(TracerData)={ok,NodeResults}|NodeResult|{error,Reason}

-%% list_logs(NodeList)={ok,NodeResults}|{error,Reason}

-%% list_logs()={ok,NodeResults}|NodeResult|{error,Reason}

-%%   TracerData  see init_tracing/1/2

-%%   NodeList=[NodeSpec,...]

-%%     NodeSpec=Node|{Node,TracerData}

-%%   NodeResults=[{Node,NodeResult},...]

-%%     NodeResult={ok,FileList}|{ok,no_log}|{error,Reason}

-%%       FileList=[FileType,...], one or more of different types.

-%%         FileType={trace_log,Dir,Files}|{ti_log,Dir,Files}

-%%         Files=[FileNameWithOutPath,...]

-%%

-%% Ask local or specified runtime components for now existing logs given 

-%% TracerData. If TracerData is left out, the runtime components TracerData, 

-%% if existing, will be used instead. 

-list_logs() ->

-    gen_server:call(?CONTROLLER,list_logs,?CALL_TIMEOUT).

-

-list_logs(TracerDataOrNodesList) when is_list(TracerDataOrNodesList) ->
-    gen_server:call(?CONTROLLER,{list_logs,TracerDataOrNodesList},?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-%% fetch_log(LogSpecList,DestDir,Prefix)={ok,NodeResults}|{error,not_distributed}|

-%%     {error,Reason} 

-%% fetch_log(DestDir,Prefix)={ok,NodeResults}|{error,not_distributed}|

-%%     {error,Reason} 

-%% fetch_log(ToNode,DestDir,Prefix)=

-%% fetch_log(ToNode,LogSpecList,DestDir,Prefix)=

-%%   DestDir=string(), to where the fetched files shall be placed.

-%%   Prefix=string(), prefix on locally saved fetched files.

-%%   LogSpecList=[LogSpec,...],

-%%   LogSpec={Node,FileSpecList}|Node|{Node,TracerData} 

-%%   TracerData=see init_tracing/1/2

-%%   FileSpecList=[{trace_log,Dir,FileList},{ti_log,Dir,FileList}]

-%%       where each tuple-item is optional.

-%%   FileList=[RemoteFileName,...]

-%%   ToNode=atom()

-%%   NodeResult={Conclusion,ResultFileSpec}|no_log|{error,NReason}

-%%     Conclusion=complete|incomplete

-%%     ResultFileSpec=[{trace_log,FileResults},{ti_log,FileResults}]

-%%       FileResults=[FileResult,...]

-%%         FileResult={ok,FileName}|{error,FReason}

-%%     NReason=own_node|Reason

-%%   FReason = {file_open,{posix(),FileName}} |

-%%             {file_open,{posix(),RemoteFileName}}

-%%             {file_open,{posix(),[DestDir,Prefix,RemoteFileName]}}

-%%             {file_write,{posix(),FileName}} |

-%%             {truncated,FileName}

-%%             {truncated,{Reason,FileName}}

-%%   posix() - an atom which is named from the Posix error codes used in

-%%             Unix, and in the runtime libraries of most C compilers.

-%%             See module file in Kernel Reference manual.

-%%

-%% Copies logfiles over distributed erlang to ToNode. This

-%% function can only be used in a distributed system.

-%% The resulting transfered files will have the prefix Prefix and will be 

-%% located in DestDir.

-%% Note that the client process using this function will wait until all files

-%% are moved. The job can be cancelled, causing any already copied files to be

-%% removed, by simply terminating the waiting client process.

-fetch_log(DestDir,Prefix) when is_list(DestDir),is_list(Prefix) ->
-    gen_server:call(?CONTROLLER,{fetch_log,node(),all,DestDir,Prefix},infinity).

-

-fetch_log(ToNode,DestDir,Prefix) when is_atom(ToNode),is_list(DestDir),is_list(Prefix) ->
-    gen_server:call(?CONTROLLER,{fetch_log,ToNode,all,DestDir,Prefix},infinity);

-

-fetch_log(LogSpecList,DestDir,Prefix) when is_list(LogSpecList),is_list(DestDir),is_list(Prefix) ->
-    gen_server:call(?CONTROLLER,{fetch_log,node(),LogSpecList,DestDir,Prefix},infinity).

-

-fetch_log(ToNode,LogSpecList,DestDir,Prefix)

-  when is_atom(ToNode),is_list(LogSpecList),is_list(DestDir),is_list(Prefix) ->
-    gen_server:call(?CONTROLLER,{fetch_log,ToNode,LogSpecList,DestDir,Prefix},infinity).

-%% ------------------------------------------------------------------------------

-

-%% delete_log(Nodes,TracerData)={ok,NodeResults}|{error,Reason}

-%% delete_log(NodeSpecList)={ok,NodeResults}|{error,Reason}

-%% delete_log(Spec)={ok,NodeResults}|NodeResult|{error,Reason}

-%% delete_log(TracerData)={ok,NodeResults}|NodeResult|{error,Reason}

-%% delete_log()={ok,NodeResults}|NodeResult|{error,Reason}

-%%   Nodes=[Node,...], 

-%%   NodeSpecList=[{Node,Spec},...]

-%%   Spec=[AbsPathFileName,...]|LogSpecs

-%%   LogSpecs=[LogSpec,...]

-%%     LogSpec={trace_log,Dir,[FileNameWithoutPath,...]}|

-%%             {ti_log,Dir,[FileNameWithoutPath,...]}

-%%   TracerData = see init_tracing/1/2

-%%   NodeResults=[{Node,NodeResult},...]

-%%     NodeResult={ok,no_log}|{ok,LogInfos}|{ok,FileInfos}

-%%       LogInfos=[LogInfo,...]

-%%         LogInfo={trace_log,FileInfos}|{ti_log,FileInfos}

-%%           FileInfos=[FileInfo,...]

-%%             FileInfo={ok,FileName}|{error,Reason} whether FileName contains

-%%               full path or not depends on if AbsPathFileName or LogSpec was

-%%               used when specifying the files.

-%%

-%% Deletes listed files or files corresponding to TracerData from specified

-%% or all Nodes. If no TracerData or list of files is specified in the call the 

-%% TracerData at Node will be used to identify log files to delete.

-delete_log() ->

-    gen_server:call(?CONTROLLER,{delete_log,all},?CALL_TIMEOUT).

-delete_log(What) ->

-    gen_server:call(?CONTROLLER,{delete_log,What},?CALL_TIMEOUT).

-delete_log(Nodes,Spec) ->

-    gen_server:call(?CONTROLLER,{delete_log,Nodes,Spec},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-

-%% subscribe()= same as subscribe(self())

-%% subscribe(Pid)=ok|{error,Reason}

-%%   Pid=pid(),  

-%%   Reason = 

-%% Add Pid or self() to event sending list. Note that it is possible to add a 

-%% pid several times and that the Pid then will receive several event messages.

-%% All events will be sent to all subscribers in the event sending list.

-%%   Event={inviso_event,ControllerPid,erlang:localtime(),Msg},

-%%   Msg= 

-%%     {connected, Node, {Tag, {State, Status}}}

-%%     {disconnected, Node, not_applicable}

-%%     {state_change, Node, {State, Status}}

-%%     {port_down, Node, Reason}

-%%   Node = node() | local_runtime (when running in a non-distributed 

-%%                                  environment)

-subscribe() ->

-    gen_server:call(?CONTROLLER,{subscribe,self()},?CALL_TIMEOUT).

-

-subscribe(Pid) ->

-    gen_server:call(?CONTROLLER,{subscribe,Pid},?CALL_TIMEOUT).

-%% -----------------------------------------------------------------------------

-

-%% unsubscribe()= same as unsubscribe(self())

-%% unsubscribe(Pid)=ok

-%%   Pid=pid(),  

-%%

-%% Remove, if present, first occurrence of Pid or self() from event sending 

-%% list. Note that it is not an error to remove a non existing subscription.

-unsubscribe() ->

-    gen_server:call(?CONTROLLER,{unsubscribe,self()},?CALL_TIMEOUT).

-

-unsubscribe(Pid) ->

-    gen_server:call(?CONTROLLER,{unsubscribe,Pid},?CALL_TIMEOUT).

-%% ------------------------------------------------------------------------------

-

-

-

-%% debuging the controller

-%% ----------------------------------------------------------------------------

-state() ->

-    ?CONTROLLER ! state.

-

-%% debuging the runtime component

-state(Node) ->

-    ?CONTROLLER ! {state, Node}.

-

-%%% end of file

diff --git a/lib/inviso/src/inviso_c.erl b/lib/inviso/src/inviso_c.erl
deleted file mode 100644
index b1597a7f35..0000000000
--- a/lib/inviso/src/inviso_c.erl
+++ /dev/null
@@ -1,1335 +0,0 @@
-%% ``The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved via the world wide web at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id$
-%%
-%% Author: Ann-Marie L�f, [email protected]
-%%         Lennart �hman, [email protected]
-%%
-%% Description: The controlling part of the trace tool Inviso
-%%
-%% This code implements the inviso control component meant to be run on an Erlang
-%% node doing any tracing. It can also be used in a non distributed system where
-%% the control component and the runtime component will run on the same virtual
-%% machine.
-%% The control component is not meant to be started by a supervisor but rather
-%% directly by the user when needed.
-%% This module does not provide any APIs to users. Those are found in inviso.erl.
-%% This module merly has the gen_server call-backs.
-%% ------------------------------------------------------------------------------
-
--module(inviso_c).
--behavior(gen_server).
-
-
-%% ------------------------------------------------------------------------------
-%% gen_server callbacks.
-%% ------------------------------------------------------------------------------
--export([init/1,
-	 handle_call/3,handle_cast/2,handle_info/2, 
-	 terminate/2,
-	 code_change/3]).
-%% ------------------------------------------------------------------------------
-
-%% ------------------------------------------------------------------------------
-%% Exported internal functions (used in spawn of help process).
-%% ------------------------------------------------------------------------------
--export([log_rec_init/4]).
-
-%% ------------------------------------------------------------------------------
-
-%% ------------------------------------------------------------------------------
-%% Records.
-%% ------------------------------------------------------------------------------
-
-%% #state
-%% Record used in the loopdata.
--record(state,{
-	  nodes=[],                          % [#node,...]
-	  distributed,                       % false | true
-	  subscribers=[],                    % [{pid(),monitor_ref()},...]
-	  rt_options=[{dependency,{infinity,node()}},{overload, default}]
-	 }).
-%% ------------------------------------------------------------------------------
-
-%% #node
-%% Record storing information about a runtime component connected to this control
-%% component.
--record(node,{
-	  node,                              % [atom(),...]
-	  pid,                               % pid()
-	  vsn,
-	  ref,                               % monitor_ref()
-	  tag                                % term()
-	 }).
-%% ------------------------------------------------------------------------------
-
-%% ------------------------------------------------------------------------------
-%% Macros used in this module.
-%% ------------------------------------------------------------------------------
-
--define(RUNTIME,inviso_rt).                  % The module API name of the runtime.
-%% ------------------------------------------------------------------------------
-
-
-
-%% ==============================================================================
-%% Controller component implmentation.
-%% ==============================================================================
-
-init({_Parent,Options}) ->
-    process_flag(trap_exit,true),
-    case check_options(Options,start) of
-	{ok,Options2} ->
-	    LoopData=initiate_state(Options2),
-	    {ok,LoopData};
-	Error ->
-	    {stop,Error}
-    end.
-%% ------------------------------------------------------------------------------
-
-handle_call({subscribe,Pid},_From,LD) when is_pid(Pid) ->
-    MRef=erlang:monitor(process,Pid),
-    {reply,ok,LD#state{subscribers=[{Pid,MRef}|LD#state.subscribers]}};
-handle_call({subscribe,Faulty},_From,LD) ->
-    {reply,{error,{badarg,Faulty}},LD};
-handle_call({unsubscribe,Pid},_From,LD) ->
-    case lists:keysearch(Pid,1,LD#state.subscribers) of
-	{value,{_,MRef}} ->
-	    erlang:demonitor(MRef),
-	    {reply,ok,LD#state{subscribers=lists:keydelete(Pid,1,LD#state.subscribers)}};
-	false ->
-	    {reply,ok,LD}
-    end;
-handle_call({add_nodes,Nodes,Opts,Tag,Condition},_From,LD) ->
-    case check_options(Opts,add_node) of
-	{ok,Opts2} ->
-	    Opts3=merge_options(LD#state.rt_options,Opts2),
-	    {NewLD,Reply}=do_add_nodes(Nodes,LD,Opts3,Tag,Condition),
-	    {reply,adapt_reply(NewLD,Reply),NewLD};
-	Error ->
-	    {reply,Error,LD}
-    end;
-handle_call({change_options,Nodes,Opts},_From,LD) ->
-    case check_options(Opts,add_node) of
-	{ok,Opts2} ->
-	    {reply,adapt_reply(LD,do_change_option(Nodes,Opts2,LD)),LD};
-	Error ->
-	    {reply,Error,LD}
-    end;
-handle_call({init_tracing,TracerDataList},_From,LD) ->
-    {reply,adapt_reply(LD,do_init_tracing(TracerDataList,LD)),LD};
-handle_call({init_tracing,Nodes,TracerData},_From,LD) when is_list(Nodes) ->
-    TracerDataList=
-	lists:map(fun(N)->{N,TracerData} end,started_trace_nodes(Nodes,LD)),
-    {reply,adapt_reply(LD,do_init_tracing(TracerDataList,LD)),LD};
-handle_call({init_tracing,Nodes,_TracerData},_From,LD) ->
-    {reply,{error,{badarg,Nodes}},LD};
-handle_call({trace_pattern,Nodes,Patterns,FlagList},_From,LD) ->
-    {reply,adapt_reply(LD,distribute_tp(Nodes,Patterns,FlagList,LD)),LD};
-handle_call({trace_flags,Nodes,Args,How},_From,LD) ->
-    {reply,adapt_reply(LD,distribute_tf(Nodes,Args,How,LD)),LD};
-handle_call({trace_flags,NodeArgs,How},_From,LD) ->
-    {reply,distribute_tf(NodeArgs,How,LD),LD}; % Always distributed here.
-handle_call({trace_flags,NodeArgHows},_From,LD) ->
-    {reply,distribute_tf(NodeArgHows,LD),LD}; % Always distributed here.
-handle_call({meta_pattern,Nodes,Args},_From,LD) ->
-    {reply,adapt_reply(LD,distribute_metapattern(Nodes,Args,LD)),LD};
-handle_call({ctp_all,Nodes},_From,LD) ->
-    {reply,adapt_reply(LD,do_ctp_all(Nodes,LD)),LD};
-handle_call({suspend,Reason,Nodes},_From,LD) ->
-    {reply,adapt_reply(LD,do_suspend(Nodes,Reason,LD)),LD};
-handle_call({cancel_suspension,Nodes},_From,LD) ->
-    {reply,adapt_reply(LD,do_cancel_suspension(Nodes,LD)),LD};
-handle_call({stop_tracing,Nodes},_From,LD) ->
-    {reply,adapt_reply(LD,do_stop_tracing(Nodes,LD)),LD};
-handle_call({get_status,Nodes},_From,LD) ->
-    {reply,adapt_reply(LD,do_get_status(Nodes,LD)),LD};
-handle_call({get_tracerdata,Nodes},_From,LD) ->
-    {reply,adapt_reply(LD,do_get_tracerdata(Nodes,LD)),LD};
-handle_call(list_logs,_From,LD) ->
-    {reply,adapt_reply(LD,do_list_logs(all,LD)),LD};
-handle_call({list_logs,TracerDataOrNodesList},_From,LD) ->
-    {reply,adapt_reply(LD,do_list_logs(TracerDataOrNodesList,LD)),LD};
-handle_call({fetch_log,ToNode,Spec,Dest,Prefix},From,LD) ->
-    case LD#state.distributed of
-	true ->                              % It is a distributed system.
-	    do_fetch_log(ToNode,Spec,Dest,Prefix,From,LD),
-	    {noreply,LD};                    % Reply will come from collector pid.
-	false ->                             % Stupidity! you dont want this!
-	    {reply,{error,not_distributed},LD}
-    end;
-handle_call({delete_log,NodesOrNodeSpecs},_From,LD) ->
-    {reply,adapt_reply(LD,do_delete_log(NodesOrNodeSpecs,LD)),LD};
-handle_call({delete_log,Nodes,Specs},_From,LD) when is_list(Nodes) ->
-    Reply=do_delete_log(lists:map(fun(N)->{N,Specs} end,Nodes),LD),
-    {reply,adapt_reply(LD,Reply),LD};
-handle_call({delete_log,FaultyNodes,_Specs},_From,LD) ->
-    {reply,{error,{badarg,FaultyNodes}},LD};
-handle_call({clear,Nodes,Options},_From,LD) ->
-    {reply,adapt_reply(LD,do_clear(Nodes,LD,Options)),LD};
-handle_call({flush,Nodes},_From,LD) ->
-    {reply,adapt_reply(LD,do_flush(Nodes,LD)),LD};
-handle_call({stop_nodes,Nodes},_From,LD) ->
-    {NewLD,Reply}=do_stop_nodes(Nodes,LD),
-    {reply,adapt_reply(NewLD,Reply),NewLD};
-handle_call(stop,_From,LD) ->
-    {stop,normal,shutdown,LD};
-handle_call(stop_all,_From,LD) ->
-    {NewLD,Reply}=do_stop_nodes(started_trace_nodes(all,LD),LD),
-    {stop,normal,adapt_reply(NewLD,Reply),NewLD};
-handle_call(Request,_From,LD) -> %% for debug purpose only
-    {reply,{error,{invalid_request,Request}},LD}.
-
-handle_cast(_Request,LD) ->                  % There are no casts.
-    {noreply,LD}.
-
-handle_info({connect,_Node,Pid,_VSN,Tag},LD) -> % From connecting runtime.
-    {noreply,do_confirm_connection(Pid,Tag,LD)};
-handle_info({trace_event,Event},LD) ->       % A runtime component issues an event.
-    send_to_subscribers(Event,LD),           % Relay to our subscribers.
-    {noreply,LD};
-handle_info({'DOWN',Ref,process,_From,Info},LD) -> % A runtime component died?
-    {noreply,do_down_msg(Ref,Info,LD)};
-handle_info(state,LD) ->                     % For debug purposes.
-    io:format("trace_c state: ~p~n",[LD]),
-    {noreply,LD};
-handle_info(_Msg,LD) ->
-    {noreply,LD}.
-
-terminate(_Reason, _LD) ->
-    ok.
-
-code_change(_OldVsn, LoopData, _Extra) ->
-    {ok, LoopData}.
-%% -----------------------------------------------------------------------------
-
-
-%% -----------------------------------------------------------------------------
-%% Handle call help functions.
-%% -----------------------------------------------------------------------------
-
-%% Help function which adapts a reply based on if this is a distributed system
-%% or not. The first argument indicates distribution (='true').
-%% If we are not running a distributed system, all node references are removed.
-adapt_reply(#state{distributed=Distributed},Reply) ->
-    adapt_reply(Distributed,Reply);
-adapt_reply(true,Reply) ->                   % We are distributed.
-    Reply;
-adapt_reply(false,{ok,[{_Node,LocalReply}]}) ->
-    LocalReply;
-adapt_reply(false,{ok,[]}) ->
-    {error,not_an_added_node};               % �R DET H�R VERKLIGEN RIKTIGT?
-adapt_reply(false,Reply) ->
-    Reply.
-%% ------------------------------------------------------------------------------
-
-
-%% ==============================================================================
-%% First level help functions to handler functions.
-%% ==============================================================================
-
-%% Function starting a runtime component at the nodes in Nodes. If doing non
-%% distributed, Nodes will be a list of nonode@nohost.
-%% Returns {NewLD,{ok,Replies}} or {LD,{error,Reason}}.
-do_add_nodes(Nodes,LD,Options,Tag,Condition) ->
-    do_add_nodes_2(Nodes,LD,Options,Tag,Condition,[]).
-
-do_add_nodes_2([Node|Tail],LD,Options,Tag,Condition,Replies) ->
-    case find(fun is_started/2,LD#state.nodes,Node) of
-	{value,true} ->                      % Already started by us.
-	    do_add_nodes_2(Tail,LD,Options,Tag,Condition,[{Node,{ok,already_added}}|Replies]);
-	no_match ->
-	    case ?RUNTIME:start(Node,Options,Tag,Condition) of
-		{node_info,_Node,Pid,VSN,State,Status,new} ->
-		    NewLD=do_add_nodes_3(Node,LD,Tag,Pid,VSN,State,Status),
-		    do_add_nodes_2(Tail,NewLD,Options,Tag,Condition,[{Node,{ok,new}}|Replies]);
-		{node_info,_Node,Pid,VSN,State,Status,{tag,Tag2}} ->
-		    NewLD=do_add_nodes_3(Node,LD,Tag,Pid,VSN,State,Status),
-		    do_add_nodes_2(Tail,NewLD,Options,Tag,Condition,
-				   [{Node,{ok,{adopted,State,Status,Tag2}}}|Replies]);
-		Error ->
-		    do_add_nodes_2(Tail,LD,Options,Tag,Condition,[{Node,Error}|Replies])
-	    end
-    end;
-do_add_nodes_2([],LD,_,_,_,Replies) ->
-    {LD,{ok,lists:reverse(Replies)}};
-do_add_nodes_2(Faulty,LD,_,_,_,_) ->         % Not a list of nodes.
-    {LD,{error,{badarg,Faulty}}}.
-
-do_add_nodes_3(Node,LD,Tag,Pid,VSN,State,Status) ->
-    MRef=erlang:monitor(process,Pid),
-    NodeRec=#node{node=Node,pid=Pid,vsn=VSN,ref=MRef,tag=Tag},
-    send_to_subscribers({connected,Node,{Tag,{State,Status}}},LD),
-    _NewLD=set_node_rec(NodeRec,LD).
-%% ------------------------------------------------------------------------------
-
-%% Function calling change_options sequensially on all nodes in Nodes.
-%% Returns {ok,Replies} or {error,Reason}.
-do_change_option(Nodes,Options,LD) ->
-    do_change_option_2(started_trace_nodes(Nodes,LD#state.nodes),Options,LD,[]).
-
-do_change_option_2([Node|Tail],Options,LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	Rec when is_record(Rec,node) ->
-	    Answer=?RUNTIME:change_options(Rec#node.pid,Options),
-	    do_change_option_2(Tail,Options,LD,[{Node,Answer}|Replies]);
-	Error ->
-	    do_change_option_2(Tail,Options,LD,[{Node,Error}|Replies])
-    end;
-do_change_option_2([],_Options,_LD,Replies) ->
-    {ok,Replies};
-do_change_option_2(Faulty,_,_,_) ->
-    {error,{badarg,Faulty}}.
-%% ------------------------------------------------------------------------------
-
-%% Function which calls the runtime components in TracerDataList and initiates
-%% the tracing. TracerDataList may either be just one tracer data which shall be
-%% applied to all runtime components, or a list of nodes and tracerdata.
-do_init_tracing(TracerDataList,LD) ->
-    case inviso_rt_lib:is_tracerdata(TracerDataList) of
-	true ->                              % Then we must add all our nodes.
-	    List=lists:map(fun(N)->{N,TracerDataList} end,started_trace_nodes(all,LD)),
-	    do_init_tracing_2(List,LD,[]);
-	false ->                             % Assume it is a list of {Node,Tracerdata}
-	    do_init_tracing_2(TracerDataList,LD,[])
-    end.
-
-do_init_tracing_2([{Node,TracerData}|Tail],LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	Rec when is_record(Rec,node) ->
-	    case check_modify_tracerdata(TracerData,LD) of
-		{ok,NewTracerData} ->        % Tracerdata ok and node->pid.
-		    Reply=?RUNTIME:init_tracing(Rec#node.pid,NewTracerData),
-		    do_init_tracing_2(Tail,LD,[{Node,Reply}|Replies]);
-		{error,Reason} ->            % Unknown tracerdata.
-		    do_init_tracing_2(Tail,LD,[{Node,{error,Reason}}|Replies])
-	    end;
-	{error,Reason} ->
-	    do_init_tracing_2(Tail,LD,[{Node,{error,Reason}}|Replies])
-    end;
-do_init_tracing_2([_|Tail],LD,Replies) ->    % Just ignore item we don't understand.
-    do_init_tracing_2(Tail,LD,Replies);      % Will not end up in Replies either.
-do_init_tracing_2([],_LD,Replies) ->
-    {ok,lists:reverse(Replies)};
-do_init_tracing_2(What,_LD,_) ->
-    {error,{badarg,What}}.
-%% -----------------------------------------------------------------------------
-
-%% Function setting trace patterns on all nodes mentioned in Nodes. Uses a
-%% parallel mechanism in the runtime component.
-%% Returns {ok,Reply} or {error,Reason}.
-distribute_tp(all,Patterns,FlagList,LD) ->
-    distribute_tp(started_trace_nodes(all,LD),Patterns,FlagList,LD);
-distribute_tp(Nodes,Patterns,FlagList,LD) when is_list(Nodes) ->
-    RTpids=lists:map(fun(N)->case get_node_rec(N,LD) of
-				 #node{pid=Pid} ->
-				     {Pid,N};
-				 Error ->
-				     {Error,N}
-			     end
-		     end,
-		     Nodes),
-    {ok,?RUNTIME:trace_patterns_parallel(RTpids,Patterns,FlagList)};
-distribute_tp(Faulty,_,_,_) ->
-    {error,{badarg,Faulty}}.
-%% ------------------------------------------------------------------------------
-
-%% Function which in parallel sets trace flags on all nodes in Nodes. Can be
-%% either a list of node names or 'all'. Note that in the reply list there will be an
-%% error indicating nodes not reachable. Either because such a node disappeared or
-%% because it is not one of "our" nodes.
-%% Returns {ok,Reply} or {error,Reason}.
-distribute_tf(all,Args,How,LD) ->
-    distribute_tf(started_trace_nodes(all,LD),Args,How,LD);
-distribute_tf(Nodes,Args,How,LD) when is_list(Nodes) ->
-    RTpids=lists:map(fun(Node)->
-			     case get_node_rec(Node,LD) of
-				 #node{pid=Pid} ->
-				     {Pid,Node};
-				 Error ->       % Not an added node then!
-				     {Error,Node}
-			     end
-		     end,
-		     Nodes),
-    {ok,?RUNTIME:trace_flags_parallel(RTpids,Args,How)};
-distribute_tf(Faulty,_,_,_) ->
-    {error,{badarg,Faulty}}.
-
-%% As above but specific args for each node.
-distribute_tf(NodeArgs,How,LD) when is_list(NodeArgs) ->
-    RTpidArgs=lists:map(fun({Node,Args})->
-				case get_node_rec(Node,LD) of
-				    #node{pid=Pid} ->
-					{Pid,Node,Args};
-				    Error -> % Not an added node then!
-					{Error,Node}
-				end
-			end,
-			NodeArgs),
-    {ok,?RUNTIME:trace_flags_parallel(RTpidArgs,How)};
-distribute_tf(Faulty,_,_) ->
-    {error,{badarg,Faulty}}.
-
-%% As above but both specific args for each node and How (set or remove flag).
-distribute_tf(NodeArgHows,LD) when is_list(NodeArgHows) ->
-    RTpidArgHows=
-	lists:map(fun({Node,Args,How}) ->
-			  case get_node_rec(Node,LD) of
-			      #node{pid=Pid} ->
-				  {Pid,Node,Args,How};
-			      Error ->       % Not an added node then!
-				  {Error,Node}
-			  end
-		  end,
-		  NodeArgHows),
-    {ok,?RUNTIME:trace_flags_parallel(RTpidArgHows)};
-distribute_tf(Faulty,_) ->
-    {error,{badarg,Faulty}}.
-%% ------------------------------------------------------------------------------
-
-%% Function making a parallel call to all nodes in Nodes, calling the generic
-%% meta-tracer function stated in Args.
-%% Returns {ok,Reply} or {error,Reason}.
-distribute_metapattern(all,Args,LD) ->
-    distribute_metapattern(started_trace_nodes(all,LD),Args,LD);
-distribute_metapattern(Nodes,Args,LD) when is_list(Nodes) ->
-    RTpids=lists:map(fun(N)->case get_node_rec(N,LD) of
-				 #node{pid=Pid} ->
-				     {Pid,N};
-				 Error ->
-				     {Error,N}
-			     end
-		     end,
-		     Nodes),
-    {ok,?RUNTIME:meta_tracer_call_parallel(RTpids,Args)};
-distribute_metapattern(Faulty,_,_) ->
-    {error,{badarg,Faulty}}.
-%% ------------------------------------------------------------------------------
-
-%% Function clearing all trace patterns on all node mentioned in Nodes.
-%% Returns {ok,Reply} or {error,Reason}.
-do_ctp_all(Nodes,LD) ->
-    do_ctp_all_2(started_trace_nodes(Nodes,LD),LD,[]).
-
-do_ctp_all_2([Node|Tail],LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{pid=Pid} ->
-	    do_ctp_all_2(Tail,LD,[{Node,?RUNTIME:clear_all_tp(Pid)}|Replies]);
-	Error ->
-	    do_ctp_all_2(Tail,LD,[{Node,Error}|Replies])
-    end;
-do_ctp_all_2([],_LD,Replies) ->
-    {ok,lists:reverse(Replies)};
-do_ctp_all_2(Faulty,_,_) ->
-    {error,{badarg,Faulty}}.
-%% ------------------------------------------------------------------------------
-
-%% Function suspending all runtime components mentioned in Nodes.
-%% Returns {ok,Reply} or {error,Reason}.
-do_suspend(Nodes,Reason,LD) ->
-    do_suspend_2(started_trace_nodes(Nodes,LD),Reason,LD,[]).
-
-do_suspend_2([Node|Tail],Reason,LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{pid=Pid} ->
-	    Answer=?RUNTIME:call_suspend(Pid,Reason),
-	    do_suspend_2(Tail,Reason,LD,[{Node,Answer}|Replies]);
-	Error ->
-	    do_suspend_2(Tail,Reason,LD,[{Node,Error}|Replies])
-    end;
-do_suspend_2([],_Reason,_LD,Replies) ->
-    {ok,lists:reverse(Replies)};
-do_suspend_2(Faulty,_,_,_) ->
-    {error,{badarg,Faulty}}.
-%% ------------------------------------------------------------------------------
-
-%% Function cancelling a suspension at the runtime components mentioned in Nodes.
-%% Returns {ok,Reply} or {error,Reason}.
-do_cancel_suspension(Nodes,LD) ->
-    do_cancel_suspension_2(started_trace_nodes(Nodes,LD),LD,[]).
-
-do_cancel_suspension_2([Node|Tail],LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{pid=Pid} ->
-	    Answer=?RUNTIME:cancel_suspension(Pid),
-	    do_cancel_suspension_2(Tail,LD,[{Node,Answer}|Replies]);
-	Error ->
-	    do_cancel_suspension_2(Tail,LD,[{Node,Error}|Replies])
-    end;
-do_cancel_suspension_2([],_LD,Replies) ->
-    {ok,lists:reverse(Replies)};
-do_cancel_suspension_2(Faulty,_,_) ->
-    {error,{badarg,Faulty}}.
-%% ------------------------------------------------------------------------------
-
-%% Function which stops tracing on all nodes in Nodes. The function is performed
-%% in parallel over the nodes to get a more precise stop-time.
-%% Return {ok,Reply} or {error,Reason}.
-do_stop_tracing(all,LD) ->
-    do_stop_tracing(started_trace_nodes(all,LD),LD);
-do_stop_tracing(Nodes,LD) when is_list(Nodes) ->
-    RTpids=lists:map(fun(N)->case get_node_rec(N,LD) of
-				 #node{pid=Pid} ->
-				     {Pid,N};
-				 Error ->
-				     {Error,N}
-			     end
-		     end,
-		     Nodes),
-    {ok,?RUNTIME:stop_tracing_parallel(RTpids)};
-do_stop_tracing(Faulty,_) ->
-    {error,{badarg,Faulty}}.
-%% -----------------------------------------------------------------------------
-
-%% Function fetching the current status of the runtime components in Nodes.
-%% Returns {ok,Reply} or {error,Reason}.
-do_get_status(Nodes,LD) ->
-    do_get_status_2(started_trace_nodes(Nodes,LD),LD,[]).
-
-do_get_status_2([Node|Tail],LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{pid=Pid} ->
-	    do_get_status_2(Tail,LD,[{Node,?RUNTIME:get_status(Pid)}|Replies]);
-	Error ->
-	    do_get_status_2(Tail,LD,[{Node,Error}|Replies])
-    end;
-do_get_status_2([],_LD,Replies) ->
-    {ok,lists:reverse(Replies)};
-do_get_status_2(Faulty,_,_) ->
-    {error,{badarg,Faulty}}.
-%% ------------------------------------------------------------------------------
-
-%% Function retrieving the tracerdata for the nodes in Nodes.
-%% Returns {ok,Reply} or {error,Reason}.
-do_get_tracerdata(Nodes,LD) ->
-    do_get_tracerdata_2(started_trace_nodes(Nodes,LD),LD,[]).
-
-do_get_tracerdata_2([Node|Tail],LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{pid=Pid} ->
-	    do_get_tracerdata_2(Tail,LD,[{Node,?RUNTIME:get_tracerdata(Pid)}|Replies]);
-	Error ->
-	    do_get_tracerdata_2(Tail,LD,[{Node,Error}|Replies])
-    end;
-do_get_tracerdata_2([],_LD,Replies) ->
-    {ok,lists:reverse(Replies)};
-do_get_tracerdata_2(Faulty,_,_) ->
-    {error,{badarg,Faulty}}.
-%% ------------------------------------------------------------------------------
-
-%% Function that lists all logfiles associated with a certain tracerdata
-%% or the current tracerdata should no tracerdata be mentioned.
-%% Returns {ok,Replies} or {error,Reason}.
-do_list_logs(all,LD) ->                     % When doing all known nodes.
-    do_list_logs_2(started_trace_nodes(all,LD),LD,[]);
-do_list_logs(TracerDataOrNodesList,LD) ->
-    case inviso_rt_lib:is_tracerdata(TracerDataOrNodesList) of
-	true ->                             % It is tracerdata for this node.
-	    do_list_logs_2([{node(),TracerDataOrNodesList}],LD,[]);
-	false ->
-	    do_list_logs_2(TracerDataOrNodesList,LD,[])
-    end.
-
-do_list_logs_2([{Node,TD}|Tail],LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{pid=Pid} ->
-	    case check_modify_tracerdata(TD,LD) of
-		{ok,TracerData} ->
-		    Answer=?RUNTIME:list_logs(Pid,TracerData),
-		    do_list_logs_2(Tail,LD,[{Node,Answer}|Replies]);
-		Error ->
-		    do_list_logs_2(Tail,LD,[{Node,Error}|Replies])
-	    end;
-	Error ->
-	    do_list_logs_2(Tail,LD,[{Node,Error}|Replies])
-    end;
-do_list_logs_2([Node|Tail],LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{pid=Pid} ->
-	    Answer=?RUNTIME:list_logs(Pid),
-	    do_list_logs_2(Tail,LD,[{Node,Answer}|Replies]);
-	Error ->
-	    do_list_logs_2(Tail,LD,[{Node,Error}|Replies])
-    end;
-do_list_logs_2([],_LD,Replies) ->
-    {ok,lists:reverse(Replies)};
-do_list_logs_2(Other,_LD,_Replies) ->
-    {error,{badarg,Other}}.
-%% -----------------------------------------------------------------------------
-
-%% Function fetching logfiles using distributed erlang. This function does not
-%% return anything significant. This since the reply to the client is always
-%% sent by the CollectPid unless there is badarg fault detected before the
-%% CollectPid is spawned. Note that this function sends a list of fetchers from
-%% which the CollectPid shall expect replies.
-%% We try to catch some bad arguments like Destination and Prefix not being
-%% strings. However the fact that they are lists does not guarantee they are
-%% proper strings.
-do_fetch_log(ToNode,all,Dest,Prefix,From,LD) ->
-    do_fetch_log(ToNode,started_trace_nodes(all,LD),Dest,Prefix,From,LD);
-do_fetch_log(ToNode,Specs,Dest,Prefix,From,LD) when is_list(Dest),is_list(Prefix) ->
-    CollectPid=spawn_link(ToNode,?MODULE,log_rec_init,[self(),Dest,Prefix,From]),
-    do_fetch_log_2(Specs,LD,CollectPid,[],[]);
-do_fetch_log(_ToNode,_Specs,Dest,Prefix,From,_LD) ->
-    gen_server:reply(From,{error,{badarg,[Dest,Prefix]}}).
-
-do_fetch_log_2([{Node,Spec}|Rest],LD,CollectPid,Fetchers,Replies) ->
-    if
-	Node==node() ->                     % This is plain stupid!
-	    do_fetch_log_2(Rest,LD,CollectPid,Fetchers,[{Node,{error,own_node}}|Replies]);
-	true ->
-	    case get_node_rec(Node,LD) of
-		#node{pid=Pid} ->
-		    {NewFetchers,NewReplies}=
-			do_fetch_log_3(Fetchers,
-				       Replies,
-				       Node,
-				       ?RUNTIME:fetch_log(Pid,CollectPid,Spec)),
-		    do_fetch_log_2(Rest,LD,CollectPid,NewFetchers,NewReplies);
-		Error ->                    % Most likely the node does not exist.
-		    do_fetch_log_2(Rest,LD,CollectPid,Fetchers,[{Node,Error}|Replies])
-	    end
-    end;
-do_fetch_log_2([Node|Rest],LD,CollectPid,Fetchers,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{pid=Pid} ->
-	    {NewFetchers,NewReplies}=
-		do_fetch_log_3(Fetchers,Replies,Node,?RUNTIME:fetch_log(Pid,CollectPid)),
-	    do_fetch_log_2(Rest,LD,CollectPid,NewFetchers,NewReplies);
-	Error ->                            % Most likely the node does not exist.
-	    do_fetch_log_2(Rest,LD,CollectPid,Fetchers,[{Node,Error}|Replies])
-    end;
-do_fetch_log_2([],_,CollectPid,Fetchers,Replies) ->
-    CollectPid ! {?MODULE,self(),Fetchers,Replies};
-do_fetch_log_2(FaultySpec,_,CollectPid,_Fetchers,_Replies) ->
-    CollectPid ! {?MODULE,self(),[],{error,{badarg,FaultySpec}}}.
-
-do_fetch_log_3(Fetchers,Replies,Node,{ok,Fetcher}) ->
-    {[{Node,Fetcher}|Fetchers],Replies};
-do_fetch_log_3(Fetchers,Replies,Node,{complete,no_log}) ->
-    {Fetchers,[{Node,{complete,no_log}}|Replies]};
-do_fetch_log_3(Fetchers,Replies,Node,{error,Reason}) ->
-    {Fetchers,[{Node,{error,Reason}}|Replies]}.
-%% -----------------------------------------------------------------------------
-
-%% Function removing files from the runtime components. We can either ask for
-%% all files associated with the current tracerdata to be removed, or provide
-%% tracerdata or a list of files to be removed.
-%% Returns the client reply.
-do_delete_log(all,LD) ->
-    do_delete_log_2(started_trace_nodes(all,LD),LD,[]);
-do_delete_log(NodeSpecs,LD) ->
-    case inviso_rt_lib:is_tracerdata(NodeSpecs) of
-	true ->                             % It is tracerdata for all nodes.
-	    do_delete_log_2(lists:map(fun(N)->{N,NodeSpecs} end,
-				      started_trace_nodes(all,LD)),
-			    LD,[]);
-	false ->
-	    if
-		is_list(NodeSpecs),is_list(hd(NodeSpecs)) -> % A list of files.
-		    do_delete_log_2(lists:map(fun(N)->{N,NodeSpecs} end,
-					      started_trace_nodes(all,LD)),
-				    LD,[]);
-		true ->                     % Then use it as is.
-		    do_delete_log_2(NodeSpecs,LD,[])
-	    end
-    end.
-
-do_delete_log_2([{Node,Spec}|Tail],LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{pid=Pid} ->
-	    do_delete_log_2(Tail,LD,[{Node,?RUNTIME:delete_log(Pid,Spec)}|Replies]);
-	Error ->
-	    do_delete_log_2(Tail,LD,[{Node,Error}|Replies])
-    end;
-do_delete_log_2([Node|Tail],LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{pid=Pid} ->
-	    do_delete_log_2(Tail,LD,[{Node,?RUNTIME:delete_log(Pid)}|Replies]);
-	Error ->
-	    do_delete_log_2(Tail,LD,[{Node,Error}|Replies])
-    end;
-do_delete_log_2([],_LD,Replies) ->
-    {ok,lists:reverse(Replies)};
-do_delete_log_2(Faulty,_,_) ->
-    {error,{badarg,Faulty}}.
-%% -----------------------------------------------------------------------------
-
-%% Function removing files from runtime components.
-%% Returns {ok,Replies} or {error,Reason}.
-do_clear(Nodes,LD,Options) ->
-    do_clear_2(started_trace_nodes(Nodes,LD),LD,Options,[]).
-
-do_clear_2([Node|Tail],LD,Options,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{pid=Pid} ->
-	    do_clear_2(Tail,LD,Options,[{Node,?RUNTIME:clear(Pid,Options)}|Replies]);
-	Error ->
-	    do_clear_2(Tail,LD,Options,[{Node,Error}|Replies])
-    end;
-do_clear_2([],_LD,_Options,Replies) ->
-    {ok,lists:reverse(Replies)};
-do_clear_2(FaultyNodes,_LD,_Options,_Replies) ->
-    {error,{badarg,FaultyNodes}}.
-%% -----------------------------------------------------------------------------
-
-%% Function doing a flush trace-port.
-%% Returns {ok,Replies} or {error,Reason}.
-do_flush(Nodes,LD) ->
-    do_flush_2(started_trace_nodes(Nodes,LD),LD,[]).
-
-do_flush_2([Node|Rest],LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{pid=Pid} ->
-	    do_flush_2(Rest,LD,[{Node,?RUNTIME:flush(Pid)}|Replies]);
-	Error ->
-	    do_flush_2(Rest,LD,[{Node,Error}|Replies])
-    end;
-do_flush_2([],_LD,Replies) ->
-    {ok,lists:reverse(Replies)};
-do_flush_2(FaultyNodes,_LD,_Replies) ->
-    {error,{badarg,FaultyNodes}}.
-%% -----------------------------------------------------------------------------
-
-%% Function stopping runtime components. We can only stop runtime components
-%% belonging to this control component.
-%% Returns {NewLoopdata,Reply}.
-do_stop_nodes(Nodes,LD) ->
-    do_stop_nodes_2(started_trace_nodes(Nodes,LD),LD,[]).
-
-do_stop_nodes_2([Node|Tail],LD,Replies) ->
-    case get_node_rec(Node,LD) of
-	#node{ref=MRef} ->
-	    erlang:demonitor(MRef),
-	    case ?RUNTIME:stop(Node) of
-		ok ->
-		    NewLD=delete_node_rec(Node,LD),
-		    send_to_subscribers({disconnected,Node,void},LD),
-		    do_stop_nodes_2(Tail,NewLD,[{Node,ok}|Replies]);
-		Error ->
-		    do_stop_nodes_2(Tail,LD,[{Node,Error}|Replies])
-	    end;
-	Error ->
-	    do_stop_nodes_2(Tail,LD,[{Node,Error}|Replies])
-    end;
-do_stop_nodes_2([],LD,Replies) ->
-    {LD,{ok,Replies}};
-do_stop_nodes_2(Faulty,LD,_) ->
-    {LD,{error,{badarg,Faulty}}}.
-%% -----------------------------------------------------------------------------
-
-%% Function being called when a runtime component sends a connect message to
-%% the controlcomponent. The control component then confirms that is has indeed
-%% taken on that runtime component.
-%% Returns a new loopdata structure.
-do_confirm_connection(Pid,Tag,LD) ->
-    case ?RUNTIME:confirm_connection(Pid,Tag) of
-	{node_info,Node,_Pid,VSN,State,Status,_Tag} ->
-	    MRef=erlang:monitor(process,Pid), % We must monitor it from now on.
-	    Rec=#node{node=Node,vsn=VSN,tag=Tag,ref=MRef,pid=Pid},
-	    send_to_subscribers({connected,Node,{Tag,{State,Status}}},LD),
-	    set_node_rec(Rec,LD);            % Makes new loopdata.
-	_Error ->                            % Strange, it wanted us as control!?
-	    LD
-    end.
-%% ------------------------------------------------------------------------------
-
-%% Function handling an incomming DOWN message. This can be one of our runtime
-%% components terminating, or a process subscribing to events. Send a trace-event
-%% to subscribers if it was a runtime terminating and remove it from
-%% our list of runtime components.
-%% Note that if a subscriber has subscribed multiple times to events, we will get
-%% multiple DOWN messages too, since we have monitored that process multiple
-%% times. It is therefore sufficient to remove just one subscription entry here
-%% each time (remove on the monitor reference!).
-%% Returns a new LoopData structure.
-do_down_msg(Ref,Info,LD) ->
-   case find(fun ref/2,LD#state.nodes,Ref) of
-       {value,Node} ->                       % Yes it was one of our nodes.
-	   send_to_subscribers({disconnected,Node,Info},LD),
-	   delete_node_rec(Node,LD);
-       no_match ->                           % Not one of our nodes.
-	   case lists:keysearch(Ref,2,LD#state.subscribers) of
-	       {value,{_Pid,_}} ->           % It was a subscriber terminating.
-		   LD#state{subscribers=lists:keydelete(Ref,2,LD#state.subscribers)};
-	       false ->                      % Not one of our subscribers either.
-		   LD                        % Do nothing then.
-	   end
-   end.
-%% ------------------------------------------------------------------------------
-
-
-
-%% ==============================================================================
-%% Help functions.
-%% ==============================================================================
-
-
-%% Help function which inspects options to start and add_node. Returns a new
-%% list of options in {ok,Options} or {error,Reason}.
-check_options(Options, Context) ->
-    check_options_2(Options, Context, []).
-
-check_options_2([],_Context,Result) ->
-    {ok,Result};
-check_options_2([{subscribe,Pid}|OptionsTail],start,Result) when is_pid(Pid) ->
-    check_options_2(OptionsTail,start,[{subscribe,Pid}|Result]);
-check_options_2([{unsubscribe,Pid}|OptionsTail],start,Result) when is_pid(Pid) ->
-    check_options_2(OptionsTail,start,[{unsubscribe,Pid}|Result]);
-check_options_2([{dependency,How}|OptionsTail],Context,Result) ->
-    check_options_2(OptionsTail,Context,[{dependency,How}|Result]);
-check_options_2([{overload,How}|OptionsTail],Context,Result) ->
-    check_options_2(OptionsTail,Context,[{overload,How}|Result]);
-check_options_2([overload|OptionsTail],Context,Result) ->
-    check_options_2(OptionsTail,Context,[overload|Result]);
-check_options_2([UnKnown|_],_Context,_Result) ->
-    {error,{unknown_option,UnKnown}};
-check_options_2(UnKnown,_Context,_Result) ->
-    {error,{unknown_option,UnKnown}}. 
-%% ------------------------------------------------------------------------------
-
-%% Help function initiating the #state structure, i.e the loopdata. Since there
-%% are some initial values from the record defaults when creating a new #state,
-%% those must be compared with possibly specified Options. Specified Options shall
-%% of course override defaults.
-%% Note that it is not the control component's responsibility to understand all
-%% options later given to a runtime component. It mearly stores them in rt_options
-%% so they can be passed to the runtime component at start-up.
-%% Returns a loopdata structure.
-initiate_state(Options) ->
-    ResultingOptions=merge_options((#state{})#state.rt_options,Options),
-    LD1=initiate_state_2(ResultingOptions,#state{rt_options=[]}),
-    case node() of                           % Finally set the distribution flag.
-	nonode@nohost ->
-	    LD1#state{distributed=false};
-	_ ->
-	    LD1#state{distributed=true}
-    end.
-
-initiate_state_2([{subscribe,Proc}|Tail],LD) when is_pid(Proc);is_atom(Proc)->
-    MRef=erlang:monitor(process,Proc),
-    initiate_state_2(Tail,LD#state{subscribers=[{Proc,MRef}|LD#state.subscribers]});
-initiate_state_2([Opt|Tail],LD) when is_tuple(Opt),size(Opt)>=1 ->
-    initiate_state_2(Tail,initiate_state_3(element(1,Opt),Opt,LD));
-initiate_state_2([Opt|Tail],LD) when is_atom(Opt) ->
-    initiate_state_2(Tail,initiate_state_3(Opt,Opt,LD));
-initiate_state_2([_|Tail],LD) ->
-    initiate_state_2(Tail,LD);
-initiate_state_2([],LD) ->
-    LD.
-
-initiate_state_3(OptName,Opt,LD) ->
-    case initiate_state_is_rt_option(OptName) of
-	true ->                              % Yes, it shall be part of the rt_options.
-	    LD#state{rt_options=[Opt|LD#state.rt_options]};
-	false ->                             % Ignore the option then.
-	    LD
-    end.
-
-%% This is the only place you have to change should there be more rt_options
-%% introduced.
-initiate_state_is_rt_option(overload) -> true;
-initiate_state_is_rt_option(dependency) -> true;
-initiate_state_is_rt_option(_) -> false.
-%% ------------------------------------------------------------------------------
-
-%% Help function which takes a list of default options and a list of overriding
-%% options. The function builds a return value consisting of all default options
-%% unless they are overridden by a overriding option.
-%% An option can be either {Param,.....} or Param. I.e either a tuple with zero
-%% or more values associated with the Parameter, or just an atom.
-merge_options([], Options) ->
-    Options;
-merge_options([T|DefaultTail],Options) when is_tuple(T),size(T)>=1 ->
-    merge_options(DefaultTail,merge_options_2(element(1,T),T,Options));
-merge_options([Param|DefaultTail],Options) when is_atom(Param) ->
-    merge_options(DefaultTail,merge_options_2(Param,Param,Options));
-merge_options([_|DefaultTail],Options) ->    % Strange, bad default option!
-    merge_options(DefaultTail,Options).
-
-merge_options_2(Param,Opt,Options) ->
-    case merge_options_find(Param,Options) of
-	true ->
-	    Options;
-	false ->
-	    [Opt|Options]
-    end.
-
-merge_options_find(Param,[T|_]) when is_tuple(T),element(1,T)==Param ->
-    true;
-merge_options_find(Param,[Param|_]) ->
-    true;
-merge_options_find(Param,[_|Rest]) ->
-    merge_options_find(Param,Rest);
-merge_options_find(_,[]) ->
-    false.
-%% ------------------------------------------------------------------------------
-
-%% Help function which transforms certain parts of a tracer data. Those are
-%% parts which must be transformed at the controlnode like node to pid mappings.
-%% It also checks the formatting of the tracerdata since runtime components
-%% does not accept too badly formatted tracerdata.
-%% Returns {ok,NewTraceData} or {error,Reason}.
-check_modify_tracerdata(TracerData,LoopData) when is_list(TracerData) ->
-    case lists:keysearch(trace,1,TracerData) of
-	{value,{_,TraceTD}} ->               % Examine the trace part.
-	    case check_modify_tracerdata(TraceTD,LoopData) of
-		{ok,NewTraceTD} ->
-		    {ok,lists:keyreplace(trace,1,TracerData,{trace,NewTraceTD})};
-		{error,Reason} ->            % The trace part was faulty.
-		    {error,Reason}           % Ruins everything :-)
-	    end;
-	false ->                             % Unusual, but no trace part.
-	    {ok,TracerData}                  % No modifications necessary.
-    end;
-check_modify_tracerdata(collector,_LoopData) ->
-    {ok, collector};
-check_modify_tracerdata({relayer,Collector},_LoopData) when is_pid(Collector) ->
-    {ok,{relayer,Collector}};
-check_modify_tracerdata({relayer,Collector},LoopData) when is_atom(Collector) ->
-    case get_node_rec(Collector,LoopData) of
-	Rec when is_record(Rec,node) ->      % Collector is a known node.
-	    {ok,{relayer,Rec#node.pid}};
-	{error,not_an_added_node} ->
-	    {error,{not_an_added_node,Collector}}
-    end;
-check_modify_tracerdata({Type,Data},_LoopData) when Type==ip;Type==file ->
-    {ok,{Type,Data}};
-check_modify_tracerdata({Handler,Data},_LoopData) when is_function(Handler) ->
-    {ok,{Handler,Data}};
-check_modify_tracerdata(Data,_LoopData) ->
-    {error,{bad_tracerdata,Data}}.
-%% -----------------------------------------------------------------------------
-
-%% Help function sending an event to all processes subscribing to events.
-%% Note that the function manipulates the from Node indicator incase we are not
-%% running in a distributed system.
-%% Returns nothing significant.
-send_to_subscribers(Msg={Event,_Node,Data},LD) ->
-    AdaptedMsg=
-	case LD#state.distributed of
-	    true ->
-		Msg;
-	    false ->
-		{Event,local_runtime,Data}
-	end,
-    TraceEvent={inviso_event,self(),erlang:localtime(),AdaptedMsg},
-    send_to_subscribers_2(LD#state.subscribers,TraceEvent).
-
-send_to_subscribers_2([],_) ->
-    ok;
-send_to_subscribers_2([{Subscriber,_}|Tail],TraceEvent) ->
-    Subscriber ! TraceEvent,
-    send_to_subscribers_2(Tail,TraceEvent).
-%% -----------------------------------------------------------------------------
-
-%% Help function converting the Nodes parameter to known nodes. Actually today
-%% it only converts the all atom to all known nodes.
-%% Returns a list of nodes.
-started_trace_nodes(all,LoopData) ->
-    lists:map(fun(N)->N#node.node end,LoopData#state.nodes);
-started_trace_nodes(Nodes,_) ->
-    Nodes.
-%% ------------------------------------------------------------------------------
-
-%% Help function searching through a list of elements looking for an element
-%% containing Key. How the element shall be interpreted is done by the Fun.
-%% Returns {value,Element} or 'no_match'.
-%% Fun=fun(Element,Key)={return,Value} | false
-find(_,[],_Key) -> 
-    no_match;
-find(Fun,[H|T],Key) ->
-    case Fun(H,Key) of
-	{return,Value}->
-	    {value,Value};
-	_ ->
-	    find(Fun,T,Key)
-    end.
-%% -----------------------------------------------------------------------------
-
-
-%% -----------------------------------------------------------------------------
-%% Functions handling the nodes datastructure part of the #state.
-%% #state.nodes is a list of #node.
-%% -----------------------------------------------------------------------------
-
-%% Function used to build find fun, looking for a certain #node with its monitoring
-%% reference set to Ref. Useful when finding out if a DOWN message comes from one
-%% of our runtime components.
-ref(#node{ref=Ref,node=Node},Ref) ->
-    {return,Node};
-ref(_,_) ->
-    false.
-%% -----------------------------------------------------------------------------
-
-%% use in find/3
-%% Function used to build find fun, finding out if we have a node with the node
-%% name Node.
-is_started(#node{node=Node},Node) ->
-    {return,true};
-is_started(_,_) ->
-    false.
-%% -----------------------------------------------------------------------------
-
-%% Help function replacing or adding an entry for a node. Works on either a list
-%% of #node or a loopdata structure. Returns a new list of #node or a loopdata struct.
-set_node_rec(Rec,LD=#state{nodes=NodeList}) ->
-    LD#state{nodes=set_node_rec_2(Rec,NodeList)}.
-
-set_node_rec_2(Rec,[]) ->
-    [Rec];
-set_node_rec_2(Rec,[NodeRec|Tail]) when NodeRec#node.node==Rec#node.node ->
-    [Rec|Tail];
-set_node_rec_2(Rec,[NodeRec|Tail]) ->
-    [NodeRec|set_node_rec_2(Rec,Tail)].
-%% ------------------------------------------------------------------------------
-
-%% Help function finding a node record for Node in a list of #node or in loopdata.
-%% Returns the #node in question or {error,not_an_added_node}.
-get_node_rec(Node,NodeList) when is_list(NodeList) ->
-    get_node_rec_2(Node,NodeList);
-get_node_rec(Node,#state{nodes=NodeList}) ->
-    get_node_rec_2(Node,NodeList).
-
-get_node_rec_2(_Node,[]) ->
-    {error,not_an_added_node};
-get_node_rec_2(Node,[NodeRec|_]) when NodeRec#node.node==Node ->
-    NodeRec;
-get_node_rec_2(Node,[_NodeRec|Tail]) ->
-    get_node_rec_2(Node,Tail).
-%% ------------------------------------------------------------------------------
-
-%% Help function removing a #node from either a list of #node or from a loopdata
-%% structure. Returns a new list of #node or a new loopdata structure.
-delete_node_rec(Node,LD=#state{nodes=NodeList}) ->
-    LD#state{nodes=delete_node_rec_2(Node,NodeList)};
-delete_node_rec(Node,NodeList) when is_list(NodeList) ->
-    delete_node_rec_2(Node,NodeList).
-
-delete_node_rec_2(_,[]) ->
-    [];
-delete_node_rec_2(#node{node=Node},[#node{node=Node}|Tail]) ->
-    Tail;
-delete_node_rec_2(Node,[#node{node=Node}|Tail]) ->
-    Tail;
-delete_node_rec_2(Node,[NRec|Tail]) ->
-    [NRec|delete_node_rec_2(Node,Tail)].
-%% ------------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% Implementation of the help process receiving all logs from the runtime
-%% components. This process is referred to as the CollectPid.
-%% It is responsible for sending the reply back to the control component
-%% client. If a runtime component becomes suspended, the CollectPid is
-%% alerted by the DOWN message.
-%% Note that it may take some time before this process responds back to the client.
-%% Therefore the client must wait for 'infinity'. The job of transferring the
-%% files can be costly. Therefore it is a good idea to stop if no one is really
-%% interested in the result. This collector process monitors the From client in
-%% order to learn if the job can be cancelled. That will also be a possibility
-%% for a client to willfully cancel a fetch job.
-%% =============================================================================
-
-%% Intitial function on which the control component spawns. Note that the start
-%% must be done in two steps since the runtime components must be informed of
-%% the CollectPid. But the CollectPid must also know from which runtime components
-%% it can expect files from.
-%% InitialReplies: contains {Node,Result} for nodes from where there will be no
-%%   files, but which must be part of the final reply.
-log_rec_init(Parent,Dest,Prefix,From={ClientPid,_}) ->
-    receive
-	{?MODULE,Parent,Fetchers,InitialReplies} ->
-	    RTs=lists:map(fun({N,F})->
-				  {N,erlang:monitor(process,F),void,void,void}
-			  end,
-			  Fetchers),
-	    CMRef=erlang:monitor(process,ClientPid), % Monitor the client.
-	    case log_rec_loop(Dest,Prefix,RTs,InitialReplies,CMRef) of
-		Reply when is_list(Reply) ->   % It is an ok value.
-		    gen_server:reply(From,{ok,Reply});
-		{error,Reason} ->
-		    gen_server:reply(From,{error,Reason});
-		false ->                    % The client terminated, no response.
-		    true                    % Simply terminate, fetchers will notice.
-	    end
-    end.
-
-log_rec_loop(_Dest,_Prefix,[],Replies,_CMRef) -> % All nodes done!
-    Replies;                                % This is the final reply.
-log_rec_loop(Dest,Prefix,RTs,Replies,CMRef) ->
-    receive
-	{Node,open,{FType,RemoteFName}} ->
-	    case lists:keysearch(Node,1,RTs) of
-		{value,{_,MRef,_,_,_}} ->
-		    {NewRTs,NewReplies}=
-			log_rec_open(Dest,Prefix,Node,MRef,FType,RemoteFName,RTs,Replies),
-		    log_rec_loop(Dest,Prefix,NewRTs,NewReplies,CMRef);
-		false ->
-		    log_rec_loop(Dest,Prefix,RTs,Replies,CMRef)
-	    end;
-	{Node,open_failure,{FType,RemoteFName}} ->
-	    case lists:keysearch(Node,1,RTs) of
-		{value,{_,MRef,_,_,_}} ->
-		    {NewRTs,NewReplies}=
-			log_rec_open_failure(Node,MRef,FType,RemoteFName,RTs,Replies),
-		    log_rec_loop(Dest,Prefix,NewRTs,NewReplies,CMRef);
-		false ->
-		    log_rec_loop(Dest,Prefix,RTs,Replies,CMRef)
-	    end;
-	{Node,payload,Bin,FPid} ->          % A chunk of data from a fetcher.
-	    case lists:keysearch(Node,1,RTs) of
-		{value,{_,_,_,_,void}} ->   % Node has no file open here.
-		    FPid ! {self(),cancel_transmission}, % No use sending more to me.
-		    log_rec_loop(Dest,Prefix,RTs,Replies,CMRef); % Simply ignore payload.
-		{value,{_Node,MRef,FType,FName,FD}} ->
-		    case log_rec_payload(Node,MRef,FType,FName,FD,Bin,RTs,Replies) of
-			{ok,{NewRTs,NewReplies}} ->
-			    FPid ! {self(),chunk_ack}, % For flow control.
-			    log_rec_loop(Dest,Prefix,NewRTs,NewReplies,CMRef);
-			{error,{NewRTs,NewReplies}} ->
-			    FPid ! {self(),cancel_transmission}, % No use sending more to me.
-			    log_rec_loop(Dest,Prefix,NewRTs,NewReplies,CMRef)
-		    end;
-		false ->                    % Node is not part of transfere.
-		    FPid ! {self(),cancel_transmission}, % No use sending more to me.
-		    log_rec_loop(Dest,Prefix,RTs,Replies,CMRef)
-	    end;
-	{Node,end_of_file} ->
-	    case lists:keysearch(Node,1,RTs) of
-		{value,{_,_,_,_,void}} ->   % Node has no file open here.
-		    log_rec_loop(Dest,Prefix,RTs,Replies,CMRef);
-		{value,{_,MRef,FType,FName,FD}} ->
-		    {NewRTs,NewReplies}=
-			log_rec_eof(Node,MRef,FType,FName,FD,RTs,Replies),
-		    log_rec_loop(Dest,Prefix,NewRTs,NewReplies,CMRef);
-		false ->
-		    log_rec_loop(Dest,Prefix,RTs,Replies,CMRef)
-	    end;
-	{Node,end_of_transmission} ->       % This runtime is done!
-	    case lists:keysearch(Node,1,RTs) of
-		{value,{_Node,MRef,_,_,_}} ->
-		    erlang:demonitor(MRef),
-		    log_rec_loop(Dest,Prefix,
-				 lists:keydelete(Node,1,RTs),
-				 log_rec_mkreply(Node,complete,Replies),
-				 CMRef);
-		false ->                    % Strange, not one of our nodes.
-		    log_rec_loop(Dest,Prefix,RTs,Replies,CMRef)
-	    end;
-	{Node,incomplete} ->                % This runtime is done (with errors).
-	    case lists:keysearch(Node,1,RTs) of
-		{value,{_,MRef,FType,FName,FD}} ->
-		    erlang:demonitor(MRef),
-		    {NewRTs,NewReplies}=
-			log_rec_incomplete(Node,FType,FName,FD,RTs,Replies),
-		    log_rec_loop(Dest,Prefix,NewRTs,NewReplies,CMRef);
-		false ->                    % Not our, or not anylonger.
-		    log_rec_loop(Dest,Prefix,RTs,Replies,CMRef)
-	    end;
-	{Node,{error,Reason}} ->            % Remote file read_error.
-	    case lists:keysearch(Node,1,RTs) of
-		{value,{_,MRef,FType,FName,FD}} ->
-		    {NewRTs,NewReplies}=
-			log_rec_error(Node,MRef,FType,FName,FD,RTs,Reason,Replies),
-		    log_rec_loop(Dest,Prefix,NewRTs,NewReplies,CMRef);
-		false ->
-		    log_rec_loop(Dest,Prefix,RTs,Replies,CMRef)
-	    end;
-	{'DOWN',CMRef,process,_,_} ->       % The client got tired waiting.
-	    log_rec_cancel(Dest,RTs,Replies), % Close and remove all files.
-	    false;                          % Indicate no response message.
-	{'DOWN',Ref,process,_P,_Info} ->
-	    case lists:keysearch(Ref,2,RTs) of
-		{value,{Node,_,FType,FName,FD}} ->
-		    {NewRTs,NewReplies}=
-			log_rec_incomplete(Node,FType,FName,FD,RTs,Replies),
-		    log_rec_loop(Dest,Prefix,NewRTs,NewReplies,CMRef);
-		false ->                    % Not our, or not anylonger.
-		    log_rec_loop(Dest,Prefix,RTs,Replies,CMRef)
-	    end;
-	_ ->
-	    log_rec_loop(Dest,Prefix,RTs,Replies,CMRef)
-    end.
-
-%% Help function opening a new target file on the receiver. It returns
-%% {NewRTs,NewReplies}.
-%% Note that we must protect us against that some of the strings are not proper
-%% strings, but contains garbage.
-log_rec_open(Dest,Prefix,Node,MRef,FType,RemoteFName,RTs,Replies) ->
-    case catch log_rec_open_2(Dest,Prefix,Node,MRef,FType,RemoteFName,RTs,Replies) of
-	{'EXIT',Reason} ->
-	    NewRTs=lists:keyreplace(Node,1,RTs,{Node,MRef,void,void,void}),
-	    NewReplies=
-		log_rec_addreply(Node,
-				 FType,
-				 {error,{file_open,{Reason,[Dest,Prefix,RemoteFName]}}},Replies),
-	    {NewRTs,NewReplies};
-	Result ->
-	    Result
-    end.
-
-log_rec_open_2(Dest,Prefix,Node,MRef,FType,RemoteFName,RTs,Replies) ->
-    FName=Prefix++RemoteFName,              % Our file name.
-    case file:open(filename:join([Dest,FName]),[write]) of
-	{ok,FD} ->
-	    NewRTs=lists:keyreplace(Node,1,RTs,{Node,MRef,FType,FName,FD}),
-	    {NewRTs,Replies};
-	{error,Reason} ->
-	    NewRTs=lists:keyreplace(Node,1,RTs,{Node,MRef,void,void,void}),
-	    NewReplies=
-		log_rec_addreply(Node,FType,{error,{file_open,{Reason,FName}}},Replies),
-	    {NewRTs,NewReplies}
-    end.
-
-%% Help function adding a file that was unsuccessfully opened as failed.
-log_rec_open_failure(Node,MRef,FType,RemoteFName,RTs,Replies) ->
-    NewRTs=lists:keyreplace(Node,1,RTs,{Node,MRef,void,void,void}),
-    NewReplies=
-	log_rec_addreply(Node,
-			 FType,
-			 {error,{remote_open,RemoteFName}},Replies),
-    {NewRTs,NewReplies}.
-
-%% Help function whih writes the Bin to the FD file. If writing was unsuccessful,
-%% close the file and modify RTs and add a reply to Replies. Note that we can not
-%% stop the runtime from sending us more data belonging to this file. But we will
-%% simply just inore it from now on.
-%% Returns {SuccessCode,{NewRTs,NewReplies}}.
-log_rec_payload(Node,MRef,FType,FName,FD,Bin,RTs,Replies) ->
-    case file:write(FD,Bin) of
-	ok ->
-	    {ok,{RTs,Replies}};
-	{error,Reason} ->
-	    file:close(FD),
-	    NewRTs=lists:keyreplace(Node,1,RTs,{Node,MRef,void,void,void}),
-	    NewReplies=
-		log_rec_addreply(Node,FType,{error,{file_write,{Reason,FName}}},Replies),
-	    {error,{NewRTs,NewReplies}}
-    end.
-
-%% Help function whih shall be used when a file has been successfully transfered.
-%% This function closes the output file and updates RTs and the Replies.
-%% Returns {NewRTs,NewReplies}.
-log_rec_eof(Node,MRef,FType,FName,FD,RTs,Replies) ->
-    file:close(FD),
-    NewRTs=lists:keyreplace(Node,1,RTs,{Node,MRef,void,void,void}),
-    {NewRTs,log_rec_addreply(Node,FType,{ok,FName},Replies)}.
-
-%% Help function which, if there is an open file, indicates it as truncated in the
-%% replies. And finalize the reply for Node assuming that the node is in total incomplete
-%% Returns {NewRTs,NewReplies}.
-log_rec_incomplete(Node,_FType,_FName,void,RTs,Replies) ->
-    NewRTs=lists:keydelete(Node,1,RTs),     % The node is done.
-    {NewRTs,log_rec_mkreply(Node,incomplete,Replies)};
-log_rec_incomplete(Node,FType,FName,FD,RTs,Replies) ->
-    file:close(FD),                         % Not going to write anymore in this file.
-    NewRTs=lists:keydelete(Node,1,RTs),     % The node is done.
-    NewReplies=log_rec_addreply(Node,FType,{error,{truncated,FName}},Replies),
-    {NewRTs,log_rec_mkreply(Node,incomplete,NewReplies)}.
-
-%% Help function handling the case when runtime component experiences an error
-%% transferering the file. That means that there will be no more chunks of this
-%% file. Hence it works a bit like EOF.
-%% Returns {NewRTs,NewReplies}.
-log_rec_error(Node,MRef,FType,FName,FD,RTs,Reason,Replies) ->
-    file:close(FD),
-    NewRTs=lists:keyreplace(Node,1,RTs,{Node,MRef,void,void,void}),
-    {NewRTs,log_rec_addreply(Node,FType,{error,{truncated,{Reason,FName}}},Replies)}.
-%% -----------------------------------------------------------------------------
-
-%% Help function adding a reply to the list of replies.
-%% Replies is a list {Node,FType,Reply} for each file handled, sucessfully or not.
-%% The list may also contain finalized nodes, which will be on the format:
-%% {Node,{Conclusion,[{trace_log,TraceLogReplies},{ti_log,TiLogReplies}]}}.
-log_rec_addreply(Node,FType,Reply,Replies) ->
-    [{Node,FType,Reply}|Replies].
-
-%% Help function which converts the {Node,FType,Reply} tuples in Replies to
-%% a finalized reply.
-log_rec_mkreply(Node,Conclusion,Replies) ->
-    {RemainingReplies,TiReplies,TraceReplies}=
-	log_rec_mkreply_node_ftype(Node,Replies,[],[],[]),
-    [{Node,{Conclusion,[{trace_log,TraceReplies},{ti_log,TiReplies}]}}|
-     RemainingReplies].
-
-%% Help function taking out the ti_log and trace_log file-types replies for
-%% Node. Returns {RemainingReplies,Ti,Trace}. 
-log_rec_mkreply_node_ftype(Node,[{Node,ti_log,Result}|Rest],Replies,Ti,Trace) ->
-    log_rec_mkreply_node_ftype(Node,Rest,Replies,[Result|Ti],Trace);
-log_rec_mkreply_node_ftype(Node,[{Node,trace_log,Result}|Rest],Replies,Ti,Trace) ->
-    log_rec_mkreply_node_ftype(Node,Rest,Replies,Ti,[Result|Trace]);
-log_rec_mkreply_node_ftype(Node,[Reply|Rest],Replies,Ti,Trace) ->
-    log_rec_mkreply_node_ftype(Node,Rest,[Reply|Replies],Ti,Trace);
-log_rec_mkreply_node_ftype(_,[],Replies,Ti,Trace) ->
-    {Replies,Ti,Trace}.
-%% -----------------------------------------------------------------------------
-
-%% If the fetching job shall be cancelled, we must close all open files and
-%% remove them including all already closed files. Returns nothing significant.
-log_rec_cancel(Dest,RTs,Replies) ->
-    log_rec_cancel_open(Dest,RTs),          % First close and remove all open files.
-    log_rec_cancel_finished(Dest,Replies).  % Remove all already closed files.
-
-log_rec_cancel_open(Dest,[{_Node,_MRef,_FType,_FName,void}|Rest]) ->
-    log_rec_cancel_open(Dest,Rest);         % There is no open file to close.
-log_rec_cancel_open(Dest,[{_Node,_MRef,_FType,FName,FD}|Rest]) ->
-    file:close(FD),
-    catch file:delete(filename:join(Dest,FName)), % Will just try to do my best.
-    log_rec_cancel_open(Dest,Rest);
-log_rec_cancel_open(_Dest,[]) ->
-    true.
-
-log_rec_cancel_finished(Dest,[{_N,_FT,Reply}|Rest]) ->
-    [FName]=log_rec_cancel_finished_get_fname([Reply]),
-    catch file:delete(filename:join(Dest,FName)),
-    log_rec_cancel_finished(Dest,Rest);
-log_rec_cancel_finished(Dest,[{_N,{_Conclusion,[{_,Replies1},{_,Replies2}]}}|Rest]) ->
-    FNames1=log_rec_cancel_finished_get_fname(Replies1),
-    lists:foreach(fun(FName)->
-			  catch file:delete(filename:join(Dest,FName))
-		  end,
-		  FNames1),
-    FNames2=log_rec_cancel_finished_get_fname(Replies2),
-    lists:foreach(fun(FName)->
-			  catch file:delete(filename:join(Dest,FName))
-		  end,
-		  FNames2),
-    log_rec_cancel_finished(Dest,Rest);
-log_rec_cancel_finished(_Dest,[]) ->
-    true.
-
-%% Help function going through all possible reply values for a file. So
-%% consequently there must be a clause here for every possible log_rec_addreply
-%% call above. Returns a list of filenames that shall be removed in order to
-%% restore the disk since the fetch job is cancelled.
-log_rec_cancel_finished_get_fname([{error,{file_open,{_,FName}}}|Rest]) ->
-    [FName|log_rec_cancel_finished_get_fname(Rest)];
-log_rec_cancel_finished_get_fname([{error,{file_write,{_,FName}}}|Rest]) ->
-    [FName|log_rec_cancel_finished_get_fname(Rest)];
-log_rec_cancel_finished_get_fname([{ok,FName}|Rest]) ->
-    [FName|log_rec_cancel_finished_get_fname(Rest)];
-log_rec_cancel_finished_get_fname([{error,{truncated,{_,FName}}}|Rest]) ->
-    [FName|log_rec_cancel_finished_get_fname(Rest)];
-log_rec_cancel_finished_get_fname([{error,{truncated,FName}}|Rest]) ->
-    [FName|log_rec_cancel_finished_get_fname(Rest)];
-log_rec_cancel_finished_get_fname([_|Rest]) ->       % This shall not happend.
-    log_rec_cancel_finished_get_fname(Rest);
-log_rec_cancel_finished_get_fname([]) ->
-    [].
-%% -----------------------------------------------------------------------------
-
-%% EOF
diff --git a/lib/inviso/src/inviso_lfm.erl b/lib/inviso/src/inviso_lfm.erl
deleted file mode 100644
index 085048518c..0000000000
--- a/lib/inviso/src/inviso_lfm.erl
+++ /dev/null
@@ -1,431 +0,0 @@
-%% ``The contents of this file are subject to the Erlang Public License,

-%% Version 1.1, (the "License"); you may not use this file except in

-%% compliance with the License. You should have received a copy of the

-%% Erlang Public License along with this software. If not, it can be

-%% retrieved via the world wide web at http://www.erlang.org/.

-%% 

-%% Software distributed under the License is distributed on an "AS IS"

-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See

-%% the License for the specific language governing rights and limitations

-%% under the License.

-%% 

-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.

-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings

-%% AB. All Rights Reserved.''

-%% 

-%%     $Id$

-%%

-%% Author: Lennart �hman, [email protected]

-%%

-%% INVISO LogFile Merger.

-%%

-%% Merges all log-entries in all files in Files in chronological order

-%% into what ever is handled by WorkHandlerFun. Note that Files can contain

-%% several files. Both in the sence that it can be a wrapset. But also because

-%% the log is spread over more than one LogFiles (i.e trace_log + ti_log).

-%% It is further possible to use another reader-process (for the logfiles)

-%% than the default one. This is useful if the logfiles are formatted in

-%% another way than as done by a trace-port.

-

--module(inviso_lfm).

-

-%% -----------------------------------------------------------------------------

-%% API exports.

-%% -----------------------------------------------------------------------------

-

--export([merge/2,merge/3,merge/4,merge/5,merge/6]).

-%% -----------------------------------------------------------------------------

-

-%% -----------------------------------------------------------------------------

-%% Default handler exports.

-%% -----------------------------------------------------------------------------

-

--export([outfile_opener/1,outfile_writer/4,outfile_closer/1]).

-%% -----------------------------------------------------------------------------

-

-%% -----------------------------------------------------------------------------

-%% Formatting functions.

-%% -----------------------------------------------------------------------------

-

--export([format_arguments/3,format_argument_string/2]).

-%% -----------------------------------------------------------------------------

-%% Internal exports.

-%% -----------------------------------------------------------------------------

-

--export([init_receiver/7]).

-%% -----------------------------------------------------------------------------

-

-%% merge(Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerData)=

-%%   {ok,Count} | {error,Reason}

-%% merge(Files,OutputFile) =

-%%

-%%   Files=[FileDescription,...]

-%%   FileDescription=FileSet | {reader,Mod,Func,FileSet}

-%%   FileSet={Node,LogFiles} | {Node,[LogFiles,...]}

-%%     in the latter case the LogFiles must be sorted, beginning with the oldest.

-%%   LogFiles=[{trace_log,Files} [,{ti_log,[FileName]}] ]

-%%       either just trace_log or trace_log and ti_log.

-%%     Files=[FileName] | [FileName,...]

-%%       in the latter case it is a wrapset.

-%%   BeginHandlerFun= ( fun(HandlerData)->{ok,NewHandleData} | {error,Reason} )

-%%   WorkHandlerFun= ( fun(Node,Term,PidMappings,HandlerData)->

-%%     {ok,NewHandlerData} | {error,Reason}

-%%   EndHandlerFun= ( fun(HandlerData)->ok | {error,Reason} )

-%%   Count=integer(), the total number of handled log entries.

-%%

-%% Merges all logfiles in Files together into one common log file, in chronological

-%% order according to the time-stamps in each log. Each entry is also marked with

-%% the node name in the merged log.

-%% Configuration:

-%% If a non-default reader shall be used, Mod:Func(ReceiverPid,LogFiles) shall

-%%   spawn a reader process complying to the receiver/reader message protocoll.

-%%   The default reader reads logs generated by a trace-port.

-%% BeginHandler is called before any logentries are processed, typically to open

-%%   the out-file, if any.

-%% WorkHandlerFun is called for every log-entry. It typically writes the output.

-%% EndHandlerFun is called when the last reader has finished, typically to

-%%   close the outfile.

-%%

-%% Using merge/2 assumes you want to use default handlers writing to a file.

-merge(Files,OutputFile) when is_list(OutputFile) ->
-    merge(Files,fun outfile_opener/1,fun outfile_writer/4,fun outfile_closer/1,OutputFile,off).

-merge(Files,WorkHandlerFun,HandlerData) when is_function(WorkHandlerFun) ->
-    merge(Files,void,WorkHandlerFun,void,HandlerData,off);

-merge(Files,OutputFile,Dbg) when is_list(OutputFile) ->
-    merge(Files,fun outfile_opener/1,fun outfile_writer/4,fun outfile_closer/1,OutputFile,Dbg).

-merge(Files,WorkHandlerFun,HandlerData,Dbg) when is_function(WorkHandlerFun) ->
-    merge(Files,void,WorkHandlerFun,void,HandlerData,Dbg).

-merge(Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerData) ->

-    merge(Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerData,off).

-merge(Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerData,Dbg) ->

-    ReceiverPid=spawn_link(?MODULE,

-			   init_receiver,

-			   [self(),Files,BeginHandlerFun,WorkHandlerFun,

-			    EndHandlerFun,HandlerData,Dbg]),

-    wait_for_response(ReceiverPid).

-

-wait_for_response(ReceiverPid) ->

-    receive

-	{reply,ReceiverPid,Reply} ->

-	    Reply;

-	{'EXIT',ReceiverPid,Reason} ->

-	    {error,Reason}

-    end.

-%% -----------------------------------------------------------------------------

-

-%% =============================================================================

-%% Code for the receiver process.

-%% =============================================================================

-

-%% Initial function for the receiver process. This function must be exported.

-init_receiver(From,Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerData,Dbg) ->

-    case setup_readers(Files) of            % Create the reader processes.

-	{ok,Readers} ->

-	    process_flag(trap_exit,true),

-	    if

-		is_function(BeginHandlerFun) ->
-		    case catch BeginHandlerFun(HandlerData) of

-			{ok,NewHandlerData} ->

-			    init_receiver_2(From,WorkHandlerFun,EndHandlerFun,

-					    NewHandlerData,Dbg,Readers);

-			{error,Reason} ->   % Faulty begin-function.

-			    From ! {reply,self(),{error,{begin_handler,Reason}}};

-			{'EXIT',Reason} ->

-			    From ! {reply,self(),{error,{begin_handler,Reason}}}

-		    end;

-		true ->                     % There is no begin-handler.

-		    init_receiver_2(From,WorkHandlerFun,EndHandlerFun,HandlerData,Dbg,Readers)

-	    end;

-	{error,Reason} ->

-	    From ! {reply,self(),{error,{files,Reason}}}

-    end.

-

-init_receiver_2(From,WorkHandlerFun,EndHandlerFun,HandlerData,Dbg,Readers) ->

-    {NewReaders,EntryStruct}=mk_entrystruct(Readers,Dbg),

-    {Reply,NewHandlerData}=

-	loop(From,WorkHandlerFun,HandlerData,NewReaders,EntryStruct,Dbg,0),

-    if

-	is_function(EndHandlerFun) ->
-	    case EndHandlerFun(NewHandlerData) of

-		ok ->

-		    From ! {reply,self(),Reply};

-		{error,_Reason} ->

-		    From ! {reply,self(),Reply}

-	    end;

-	true ->                             % Reply directly then, no finish fun.

-	    From ! {reply,self(),Reply}

-    end.

-

-%% Function that spawns a help process for each group of files in the list.

-%% The help process will read entries from the input files in the correct order

-%% and deliver them to the receiver process.

-%% Note that there is a possibility to design your own readers. The default

-%% reader understands trace-port generated logfiles.

-%% Returns a list of {Node,Pid}.

-setup_readers(Files) ->

-    setup_readers_2(Files,[]).

-

-setup_readers_2([{reader,Mod,Func,{Node,FileStruct}}|Rest],Acc) ->

-    Pid=spawn_link(Mod,Func,[self(),FileStruct]),

-    setup_readers_2(Rest,[{Node,Pid}|Acc]);

-setup_readers_2([{Node,FileStruct}|Rest],Acc) ->

-    Pid=spawn_link(inviso_lfm_tpfreader,init,[self(),FileStruct]),

-    setup_readers_2(Rest,[{Node,Pid}|Acc]);

-setup_readers_2([],Acc) ->

-    {ok,Acc};

-setup_readers_2([Faulty|_],_Acc) ->

-    {error,{bad_reader_spec,Faulty}}.

-%% -----------------------------------------------------------------------------

-

-%% This is the workloop that polls each reader for messages and writes them

-%% in the correct order.

-loop(From,WorkHFun,HData,Readers,EntryStruct,Dbg,Count) ->

-    case find_oldest_entry(EntryStruct) of

-	{Pid,Node,PidMappings,Term} ->

-	    case get_and_insert_new_entry(From,Node,Pid,Readers,EntryStruct,Dbg) of

-		{ok,{NewReaders,NewEntryStruct}} ->

-		    case WorkHFun(Node,Term,PidMappings,HData) of

-			{ok,NewHData} ->

-			    loop(From,WorkHFun,NewHData,NewReaders,NewEntryStruct,Dbg,Count+1);

-			{error,Reason} ->   % Serious, we cant go on then.

-			    stop_readers(NewReaders),

-			    {{error,{writing_output_file,Reason}},HData}

-		    end;

-		{stop,_Reason} ->           % The original caller is no longer there!

-		    stop_readers(Readers),

-		    {error,HData}

-	    end;

-	done ->                             % No more readers.

-	    {{ok,Count},HData}

-    end.

-

-%% Help function which finds the oldest entry in the EntryStruct. Note that the

-%% timestamp can actually be the atom 'false'. This happens for instance if it is

-%% a dropped-messages term. But since 'false' is smaller than any tuple, that

-%% term will be consumed immediately as soon as it turns up in EntryList.

-find_oldest_entry(EntryStruct) ->

-    case list_all_entries(EntryStruct) of

-	[] ->                               % The we are done!

-	    done;

-	EntryList when is_list(EntryList) ->   % Find smallest timestamp in here then.
-	    {Pid,Node,PidMappings,_TS,Term}=

-		lists:foldl(fun({P,N,PMap,TS1,T},{_P,_N,_PMap,TS0,_T}) when TS1<TS0 ->

-				    {P,N,PMap,TS1,T};

-			       (_,Acc) ->

-				    Acc

-			    end,

-			    hd(EntryList),

-			    EntryList),

-	    {Pid,Node,PidMappings,Term}

-    end.

-

-%% Help function which signals all reader process to clean-up and terminate.

-%% Returns nothing significant.

-stop_readers([Pid|Rest]) ->

-    Pid ! {stop,self()},

-    stop_readers(Rest);

-stop_readers([]) ->

-    ok.

-%% -----------------------------------------------------------------------------

-

-%% Help function which tries to replace the entry by Pid in EntryStruct with

-%% a new one from that process. If one is returned on request, it replaces

-%% the old one in EntryStruct. If Pid is done or otherwise dissapears, Pid

-%% is simply removed from Readers and the EntryStruct.

-get_and_insert_new_entry(Node,Pid,Readers,EntryStruct,Dbg) ->

-    get_and_insert_new_entry(void,Node,Pid,Readers,EntryStruct,Dbg).

-

-get_and_insert_new_entry(From,Node,Pid,Readers,EntryStruct,Dbg) ->

-    Pid ! {get_next_entry,self()},

-    receive

-	{'EXIT',From,Reason} ->              % No one is waiting for our reply!

-	    {stop,Reason};                   % No use continuing then.

-	{next_entry,Pid,PidMappings,TS,Term} -> % We got a next entry from Pid!

-	    ets:insert(EntryStruct,{Pid,Node,PidMappings,TS,Term}),

-	    {ok,{Readers,EntryStruct}};

-	{next_entry,Pid,{error,_Reason}} ->  % Reading an entry went wrong.

-	    get_and_insert_new_entry(From,Node,Pid,Readers,EntryStruct,Dbg);

-	{'EXIT',Pid,_Reason} ->              % The process has terminated.

-	    ets:delete(EntryStruct,Pid),

-	    NewReaders=lists:delete(Pid,Readers),

-	    {ok,{NewReaders,EntryStruct}}

-    end.

-%% -----------------------------------------------------------------------------

-

-%% Help function which from a list of reader processes creates the private

-%% storage where the oldest entry from each reader is always kept.

-%% Returns {Readers,EntryStruct}.

-mk_entrystruct(Pids,Dbg) ->

-    TId=ets:new(list_to_atom("inviso_lfm_tab_"++pid_to_list(self())),[set]),

-    mk_entrystruct_2(Pids,lists:map(fun({_,P})->P end,Pids),Dbg,TId).

-

-mk_entrystruct_2([{Node,Pid}|Rest],Readers,Dbg,EntryStruct) ->

-    {ok,{NewReaders,NewEntryStruct}}=

-	get_and_insert_new_entry(Node,Pid,Readers,EntryStruct,Dbg),

-    mk_entrystruct_2(Rest,NewReaders,Dbg,NewEntryStruct);

-mk_entrystruct_2([],Readers,_Dbg,EntryStruct) ->

-    {Readers,EntryStruct}.

-%% -----------------------------------------------------------------------------

-

-%% Help function that returns a list of our oldest entry structure.

-%% [{Pid,Node,PidMappings,TimeStamp,Term},...]

-list_all_entries(EntryStruct) ->

-    ets:tab2list(EntryStruct).

-%% -----------------------------------------------------------------------------

-

-%% =============================================================================

-%% Default handlers for the receiver

-%% =============================================================================

-

-%% These functions are also exported in order to make them available when creating

-%% other funs in other modules.

-

-%% Default begin-handler.

-outfile_opener(FileName) ->

-    case file:open(FileName,[write]) of

-	{ok,FD} ->

-	    {ok,FD};                          % Let the descriptor be handlerdata.

-	{error,Reason} ->

-	    {error,{open,Reason}}

-    end.

-

-%% Default work-handler.

-%% DEN H�R �R L�NGT IFR�N F�RDIG!!!

-outfile_writer(Node,Term,PidMappings,FD) ->

-    io:format(FD,"~w ~w ~w~n",[Node,PidMappings,Term]),

-    {ok,FD}.

-

-%% Default end-handler.

-outfile_closer(FD) ->

-    file:close(FD),

-    ok.

-%% -----------------------------------------------------------------------------

-

-%% =============================================================================

-%% Formatting functions.

-%% =============================================================================

-

-%% This section contains a useful formatting function formatting an (function)

-%% argument list. It also offers a working example of how to write

-%% own datatype translators (which will be used by the formatting function to

-%% further enhance the output).

-

-%% format_arguments(Args,FOpts,Transaltors)=Args2 | <failure>

-%%   Args=list(), list of the argument as usually given in a trace message,

-%%     a stack trace or similar.

-%%   FOpts=term(), formatting options understood by the translation functions.

-%%   Translations=[Translator,...]

-%%     Translator=fun(Term,FOpts)=TResult | {M,F}, where M:F(Term,FOpts)=TResult

-%%       TResult={ok,TranslationString} | false

-%%   Arg2=list(), list of Args where terms may be replaced by own representations.

-%%     Note that terms not effected will remain as is, but if an own representation

-%%     is choosen, that must be a string in order for any io format function to

-%%     print it exactly as formatted here.

-format_arguments([Arg|Rest],FOpts,Translators) -> % More than one argument.

-    [format_argument(Arg,FOpts,Translators)|format_arguments(Rest,FOpts,Translators)];

-format_arguments([],_FOpts,_Translators) ->

-    [].                                     % The empty list.

-

-%% Help function handling the various Erlang datatypes. There must hence be one

-%% clause here for every existing datatype.

-format_argument(List,FOpts,Translators) when is_list(List) ->

-    case format_argument_own_datatype(List,FOpts,Translators) of

-	{true,TranslationStr} ->

-	    TranslationStr;

-	false ->

-	    format_argument_list(List,FOpts,Translators)

-    end;

-format_argument(Tuple,FOpts,Translators) when is_tuple(Tuple) ->

-    case format_argument_own_datatype(Tuple,FOpts,Translators) of

-	{true,TranslationStr} ->            % It was one of our special datatypes.

-	    TranslationStr;

-	false ->                            % Regular tuple.

-	    format_argument_tuple(Tuple,FOpts,Translators)

-    end;

-format_argument(Binary,FOpts,Translators) when is_binary(Binary) ->

-    case format_argument_own_datatype(Binary,FOpts,Translators) of

-	{true,TranslationStr} ->            % It was one of our special datatypes..

-	    TranslationStr;

-	false ->                            % Regular binary.

-	    format_argument_binary(Binary,FOpts,Translators)

-    end;

-format_argument(Atom,_FOpts,_Translators) when is_atom(Atom) ->

-    Atom;

-format_argument(Integer,_FOpts,_Translators) when is_integer(Integer) ->

-    Integer;

-format_argument(Float,_FOpts,_Translators) when is_float(Float) ->

-    Float;

-format_argument(Pid,_FOpts,_Translators) when is_pid(Pid) ->

-    Pid;

-format_argument(Port,_FOpts,_Translators) when is_port(Port) ->

-    Port;

-format_argument(Ref,_FOpts,_Translators) when is_reference(Ref) ->

-    Ref;

-format_argument(Fun,_FOpts,_Translators) when is_function(Fun) ->

-    Fun.

-

-%% Help function handling the case when an element is a list.

-format_argument_list([Element|Rest],FOpts,Translators) ->

-    [format_argument(Element,FOpts,Translators)|

-     format_argument_list(Rest,FOpts,Translators)];

-format_argument_list([],_FOpts,_Translators) ->

-    [].

-

-%% Help function handling the case when an element is a tuple.

-format_argument_tuple(Tuple,FOpts,Translators) ->

-    list_to_tuple(format_argument_tuple(Tuple,FOpts,Translators,size(Tuple),[])).

-

-format_argument_tuple(_,_,_,0,List) ->

-    List;

-format_argument_tuple(Tuple,FOpts,Translators,Index,List) ->

-    E=format_argument(element(Index,Tuple),FOpts,Translators),

-    format_argument_tuple(Tuple,FOpts,Translators,Index-1,[E|List]).

-

-%% Help function handling the case when an element is a binary.

-format_argument_binary(Binary,_FOpts,_Translators) ->

-    Binary.

-

-%% Help function trying to use the translations.

-format_argument_own_datatype(Term,FOpts,[Fun|Rest]) when is_function(Fun) ->

-    case catch Fun(Term,FOpts) of

-	{ok,TranslationStr} ->

-	    {true,TranslationStr};

-	_ ->

-	    format_argument_own_datatype(Term,FOpts,Rest)

-    end;

-format_argument_own_datatype(Term,FOpts,[{M,F}|Rest]) ->

-    case catch M:F(Term,FOpts) of

-	{ok,TranslationStr} ->

-	    {true,TranslationStr};

-	_ ->

-	    format_argument_own_datatype(Term,FOpts,Rest)

-    end;

-format_argument_own_datatype(Term,FOpts,[_|Rest]) ->

-    format_argument_own_datatype(Term,FOpts,Rest);

-format_argument_own_datatype(_Term,_FOpts,[]) -> % There is no applicable format.

-    false.

-%% -----------------------------------------------------------------------------

-

-%% format_argument_string(String,_FOpts)={ok,QuotedString} | false

-%%   String=string() | term()

-%%   QuotedString="String"

-%% Example of datatype checker that checks, in this case, that its argument is

-%% a string. If it is, it returns a deep list of the characters to print in order

-%% to make it a quoted string.

-format_argument_string(List=[_|_],_FOpts) -> % Must be at least one element.

-    case format_argument_string_2(List) of

-	true ->

-	    {ok,[$",List,$"]};

-	false ->

-	    false

-    end;

-format_argument_string(_,_FOpts) ->

-    false.

-

-format_argument_string_2([C|Rest]) when (((C<127) and (C>=32)) or ((C>=8) and (C=<13))) ->

-    format_argument_string_2(Rest);

-format_argument_string_2([_|_]) ->

-    false;

-format_argument_string_2([]) ->

-    true.

-%% -----------------------------------------------------------------------------

diff --git a/lib/inviso/src/inviso_lfm_tpfreader.erl b/lib/inviso/src/inviso_lfm_tpfreader.erl
deleted file mode 100644
index 6de4d11fe0..0000000000
--- a/lib/inviso/src/inviso_lfm_tpfreader.erl
+++ /dev/null
@@ -1,388 +0,0 @@
-%% ``The contents of this file are subject to the Erlang Public License,

-%% Version 1.1, (the "License"); you may not use this file except in

-%% compliance with the License. You should have received a copy of the

-%% Erlang Public License along with this software. If not, it can be

-%% retrieved via the world wide web at http://www.erlang.org/.

-%% 

-%% Software distributed under the License is distributed on an "AS IS"

-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See

-%% the License for the specific language governing rights and limitations

-%% under the License.

-%% 

-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.

-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings

-%% AB. All Rights Reserved.''

-%% 

-%%     $Id$

-%%

-%% Author: Lennart �hman, [email protected]

-

-%%

-%% INVISO LogFileMerger TracePort File READER.

-%%

-%% This module implements a reader process capable of reading traceport files

-%% and feeding them according to the logfile merger process message protocoll

-%% to the logfile merger process.

-%% This module can also serve as example for writing file readers for other

-%% file formats.

-%%

-%% A reader process must:

-%%   Support the reader-receiver protocoll.

-%%     receive next_entry message: {get_next_entry,ReceiverPid}

-%%     recieve stop message should the receiver wish to quit: {stop,ReceiverPid}.

-%%     send next_entry message, either with entry or fault-code.

-%%       next_entry message contains:{next_entry,self(),PidMappings,Timestamp,Term}

-%%                                   {next_entry,self(),Error}

-%%     recognize receiver termination (EXIT-signal).

-%%  Understand logfile structure, both filename structure and content.

-%%  Understand content (log-entry) details to extract the entry and entry

-%%    components as timestamp and originating pid (to make pid-mappings).

-%%  Understand any trace information files (ti).

-%%

-%%  The logfile structure written by inviso_rt_meta is:

-%%    {Pid,Alias,Op,TimeStamp} where:

-%%      Pid=pid(), if Alias==unalias: pid()|other_than_pid()

-%%      Op=alias|unalias,

-%%      TimeStamp=now()

-%% -----------------------------------------------------------------------------

--module(inviso_lfm_tpfreader).

-

--export([init/2]).

-%% -----------------------------------------------------------------------------

-

--export([handle_logfile_sort_wrapset/1]).   % Exported as a service to other readers.

-%% -----------------------------------------------------------------------------

-

-%% init(RecPid,FileStruct)=N/A

-%%   RecPid=pid(), the process id of the log file merger.

-%%   FileStruct=LogFiles | [LogFiles,...]

-%%     LogFiles=[{trace_log,[File,...]} [,{ti_log,[File]}] ]

-%%       File=string()

-%% Spawn on this function to start a reader process for trace-port generated

-%% logfiles, possibly with inviso-generated ti-files.

-init(RecPid,LogFiles=[Tuple|_]) when is_tuple(Tuple) -> % Only one LogFiles.
-    init(RecPid,[LogFiles]);

-init(RecPid,FileStruct) when is_list(FileStruct) ->
-    logfiles_loop(RecPid,FileStruct).

-%% -----------------------------------------------------------------------------

-

-logfiles_loop(RecPid,[LogFiles|Rest]) ->

-    {TIalias,TIunalias}=handle_ti_file(LogFiles),% If there is a ti-file, read it.

-    Files=handle_logfiles(LogFiles),        % Returns a sorted list of logfiles.

-    case open_next_file(Files) of

-	{ok,FileName,FD,NewFiles} ->

-	    case loop(RecPid,FileName,NewFiles,TIalias,TIunalias,FD) of

-		next ->

-		    logfiles_loop(RecPid,Rest);

-		stop ->

-		    true                    % Terminate normally.

-	    end;

-	done ->                             % Hmm, already out of files.

-	    true;                           % Then lets terminate normally.

-	{error,Reason} ->                   % Couldn't even open the first file.

-	    exit(Reason)

-    end;

-logfiles_loop(_RecPid,[]) ->                % No more files in LogFiles.

-    true.                                   % Terminate normally.

-

-%% This workloop reads an entry from the input file upon request from the merger

-%% process and sends it back to the merger process (Parent). If the file ends

-%% there are more files to open and read in Files, the next file will be opened. 

-loop(RecPid,FileName,Files,TIalias,TIunalias,FD) ->

-    receive

-	{get_next_entry,RecPid} ->           % The receiver request the next entry.

-	    case fetch_next(FileName,FD,Files) of

-		{ok,Term,NewCurrFile,NewFiles,NewFD} ->

-		    TS=find_timestamp_in_term(Term),

-		    PidMappings=make_pid_mappings(Term,TIalias,TIunalias,TS),

-		    RecPid ! {next_entry,self(),PidMappings,TS,Term},

-		    loop(RecPid,NewCurrFile,NewFiles,TIalias,TIunalias,NewFD);

-		{error,Reason} ->            % Not a properly formatted entry.

-		    RecPid ! {next_entry,self(),{error,Reason}},

-		    loop(RecPid,FileName,Files,TIalias,TIunalias,FD);

-		done ->                     % No more files to read in this LogFiles.

-		    next                    % Are there more Files in FileStruct?

-	    end;

-	{stop,RecPid} ->                    % The receiver process is done.

-	    file:close(FD),                 % Close file and terminate normally.

-	    stop

-    end.

-%% -----------------------------------------------------------------------------

-

-%% Function which reads the next trace-entry from the file handled by FD, or if

-%% that file reaches EOF opens the next file in Files. Files must be sorted in

-%% the correct order.

-%% Returns {ok,Term,NewFileName,NewFiles,NewFD}, {error,Reason} or 'done'.

-fetch_next(FileName,FD,Files) ->

-    case read_traceport_file(FileName,FD) of

-	{ok,Term} ->                        % There were more terms in the file.

-	    {ok,Term,FileName,Files,FD};    % No changes necessary then.

-	eof ->                              % This file is empty, try next file!

-	    file:close(FD),

-	    case open_next_file(Files) of

-		{ok,NewFileName,NewFD,NewFiles} -> % A new file has been opened.

-		    fetch_next(NewFileName,NewFD,NewFiles); % Try again.

-		done ->                     % No more files.

-		    done;

-		{error,Reason} ->           % Problems opening files.

-		    {error,Reason}

-	    end;

-	{error,Reason} ->                   % Problems reading the file.

-	    {error,Reason}

-    end.

-

-read_traceport_file(FileName,FD) ->

-    case file:read(FD,5) of                 % Trace-port file entries start with 5 bytes.

-	{ok,<<0,Size:32>>} ->               % Each entry in a traceport file begins.

-	    case file:read(FD,Size) of

-		{ok,Bin} when is_binary(Bin),size(Bin)=:=Size ->
-		    try binary_to_term(Bin) of

-			Term ->             % Bin was a properly formatted term!

-			    {ok,Term}

-		    catch

-			error:_Reason ->    % Not a properly formatted term!

-			    {error,{binary_to_term,[FileName,Bin]}}

-		    end;

-		{ok,Bin} ->                 % Incorrect length.

-		    {error,{faulty_length,[FileName,Size,Bin]}};

-		eof ->                      % This is premature end of file!

-		    {error,{premature_eof,FileName}}

-	    end;

-	{ok,<<1,DroppedMsgs:32>>} ->

-	    {ok,{drop,DroppedMsgs}};

-	{ok,JunkBin} ->                     % Don't understand, report it as error.

-	    {error,{junk,[FileName,JunkBin]}};

-	eof ->                              % A correct end of file!

-	    eof

-    end.

-

-%% Help function which opens a file in raw binary mode and returns

-%% {ok,FileName,FD,Rest} or {error,Reason}.

-open_next_file([]) ->                       % There are no more files to open.

-    done;

-open_next_file([FileName|Rest]) ->

-    case file:open(FileName,[read,raw,binary]) of

-	{ok,FD} ->

-	    {ok,FileName,FD,Rest};

-	{error,Reason} ->

-	    {error,{open,[FileName,Reason]}}

-    end.

-%% ------------------------------------------------------------------------------

-

-%% ==============================================================================

-%% Help functions.

-%% ==============================================================================

-

-

-%% Help function which extract the originating process id from the log entry

-%% term and returns a list of all associations to the PID found in TIalias.

-make_pid_mappings(_,void,_,_) ->            % Trace Information is not used.

-    [];                                     % Simply no pid mappings then!

-make_pid_mappings(Term,TIalias,TIunalias,TS)

-  when element(1,Term)==trace;element(1,Term)==trace_ts ->

-    Pid=element(2,Term),                    % The pid.

-    TempAliases=find_aliases(ets:lookup(TIalias,Pid),TS),

-    remove_expired_aliases(TempAliases,TIalias,TIunalias,TS),

-    lists:map(fun({_,_,Alias})->Alias end,

-	      find_aliases(ets:lookup(TIalias,Pid),TS));

-make_pid_mappings(_Term,_TIalias,_TIunalias,_TS) -> % Don't understand Term.

-    [].                                     % Simply no translations then!

-

-%% Help function traversing a list of ets-alias-table entries and returning a

-%% list of those old enough to have happend before TS.

-%% Note that it is possible to have an Offset in microseconds. This because an

-%% association may end up in the ti-file a short time after logentries starts

-%% to appear in the log file for the process in question. We therefore like to

-%% allow some slack, 

-find_aliases(List,TS) ->

-    lists:filter(fun({_,Now,_}) when Now<TS -> true;

-		    (_) -> false

-		 end,

-		 List).

-%% ------------------------------------------------------------------------------

-

-%% Help function which removes aliases that are no longer valid from the

-%% ETS table. It uses unalias entries which are older than TS but younger than

-%% the alias association.

-%% Returns nothing significant.

-remove_expired_aliases([{Pid,Now1,Alias}|Rest],TIalias,TIunalias,TS) ->

-    Candidates=ets:lookup(TIunalias,Alias),

-    lists:foreach(fun({_,Now2,P})

-		     when (Now2>Now1) and

-		          (Now2<TS) and

-		          ((P==Pid) or (not(is_pid(P)))) ->

-			  ets:delete_object(TIalias,{Pid,Now1,Alias}),

-			  true;             % This alias is infact no longer.

-		     (_) ->

-			  false

-		  end,

-		  Candidates),

-    remove_expired_aliases(Rest,TIalias,TIunalias,TS);

-remove_expired_aliases([],_,_,_) ->

-    true.

-%% ------------------------------------------------------------------------------

-

-find_timestamp_in_term({trace_ts,_,_,_,TS}) ->

-    TS;

-find_timestamp_in_term({trace_ts,_,_,_,_,TS}) ->

-    TS;

-find_timestamp_in_term(_) ->                % Don't know if there is a timestamp.

-    false.

-%% -----------------------------------------------------------------------------

-

-

-%% -----------------------------------------------------------------------------

-%% Help function handling a trace-information file and building the TIstruct storage.

-%% -----------------------------------------------------------------------------

-

-%% Help function which opens a standard ti-file, reads its content and

-%% builds two ETS-table where PID is primary index in the one for aliases, and

-%% the alias is primary index in the one for unalias.

-%% Returns a handle to the two ETS tables.

-%%

-%% This function currently handles:

-%%   (1) plain straight raw binary files.

-handle_ti_file(FileStruct) ->

-    case lists:keysearch(ti_log,1,FileStruct) of

-	{value,{_,[FileName]}} when is_list(FileName) -> % There is one ti-file in this set.
-	    case file:open(FileName,[read,raw,binary]) of

-		{ok,FD} ->

-		    TIdAlias=ets:new(list_to_atom("inviso_ti_atab_"++pid_to_list(self())),

-				     [bag]),

-		    TIdUnalias=ets:new(list_to_atom("inviso_ti_utab_"++pid_to_list(self())),

-				       [bag]),

-		    handle_ti_file_2(FD,TIdAlias,TIdUnalias), % Fill the table.

-		    file:close(FD),

-		    {TIdAlias,TIdUnalias};

-		{error,_Reason} ->          % Hmm, unable to open the file.

-		    {void,void}             % Treat it as no ti-file.

-	    end;

-	{value,_} ->                        % Some other file-set.

-	    {void,void};                    % Pretend we don't understand.

-	false ->                            % No ti-file in this set.

-	    {void,void}

-    end.

-

-handle_ti_file_2(FD,TIdAlias,TIdUnalias) ->

-    case file:read(FD,5) of                 % First read the header.

-	{ok,<<_,Size:32>>} ->

-	    case file:read(FD,Size) of      % Read the actual term.

-		{ok,Bin} when size(Bin)=:=Size ->

-		    try binary_to_term(Bin) of

-			{Pid,Alias,alias,NowStamp} -> % Save this association.

-			    ets:insert(TIdAlias,{Pid,NowStamp,Alias}),

-			    handle_ti_file_2(FD,TIdAlias,TIdUnalias);

-			{Pid,Alias,unalias,NowStamp} ->

-			    ets:insert(TIdUnalias,{Alias,NowStamp,Pid}),

-			    handle_ti_file_2(FD,TIdAlias,TIdUnalias);

-			_Term ->            % Don't understand!

-			    handle_ti_file_2(FD,TIdAlias,TIdUnalias)

-		    catch

-			error:_Reason ->    % Badly formatted term

-			    handle_ti_file_2(FD,TIdAlias,TIdUnalias)

-		    end;

-		{ok,_JunkBin} ->            % To short probably.

-		    handle_ti_file_2(FD,TIdAlias,TIdUnalias); % Just drop it.

-		eof ->                      % Should not come here, but

-		    {TIdAlias,TIdUnalias}   % not much we can do, drop it and stop.

-	    end;

-	{ok,_} ->                           % Also an error.

-	    handle_ti_file_2(FD,TIdAlias,TIdUnalias);

-	eof ->                              % This is the normal eof point.

-	    {TIdAlias,TIdUnalias}

-    end.

-%% -----------------------------------------------------------------------------

-

-

-%% -----------------------------------------------------------------------------

-%% Help functions sorting out what kind of logfiles we have to deal with.

-%% -----------------------------------------------------------------------------

-

-%% Help function which takes the filestruct argument and retrieves the names

-%% of all log-files mentioned there. If there are several logfiles, this function

-%% sorts them beginning with the oldest. That means that this function must

-%% have knowledge of how wrap-sets and so on works.

-%% Today known set-types:

-%%   (1) file: One plain file.

-%%   (2) wrap_set: List of files belonging to a wrap-set. Must be sorted.

-handle_logfiles(FileStruct) ->

-    handle_logfiles_2(lists:keysearch(trace_log,1,FileStruct)).

-

-handle_logfiles_2({value,{_,[FileName]}}) when is_list(FileName)-> % One single plain file.
-    [FileName];

-handle_logfiles_2({value,{_,Files}}) when is_list(Files) -> % A wrap-set.
-    handle_logfile_sort_wrapset(Files);

-handle_logfiles_2(_) ->

-    [].                                      % Pretend there were no files otherwise.

-

-%% Help function which sorts the files in WrapSet beginning with the oldest.

-%% It assumes that a logfile is Name++SeqNo++Suffix.

-%% First the Name and Suffix must be established. We look at all files to find

-%% that out.

-%% Returns a list of sorted filenames.

-%% This function is exported since it might turn useful in own implemented

-%% readers.

-handle_logfile_sort_wrapset(Set=[_FileName]) -> % Only one file! Done then :-)

-    Set;

-handle_logfile_sort_wrapset([]) ->           % Also pretty simple :-)

-    [];

-handle_logfile_sort_wrapset(FileSet) ->

-    Prefix=find_common_prefix(FileSet),

-    Suffix=find_common_prefix(lists:map(fun(Str)->lists:reverse(Str) end,FileSet)),

-    find_hole_in_wrapset(FileSet,length(Prefix),length(Suffix)).

-

-%% Help function which finds the longest common prefix of all strings in the

-%% argument-list. Returns that string.

-find_common_prefix(Files=[[FirstChar|_]|_]) ->

-    find_common_prefix_2(Files,FirstChar,[],[]);

-find_common_prefix([_|_]) ->                 % Means that prefix is "".

-    "".

-

-find_common_prefix_2([[CurrChar|RestString]|Rest],CurrChar,Files,RevPrefix) ->

-    find_common_prefix_2(Rest,CurrChar,[RestString|Files],RevPrefix);

-find_common_prefix_2([_String|_],_CurrChar,_Files,RevPrefix) ->

-    lists:reverse(RevPrefix);                % Found a difference.

-find_common_prefix_2([],CurrChar,Files=[[FirstChar|_]|_],RevPrefix) ->

-    find_common_prefix_2(Files,FirstChar,[],[CurrChar|RevPrefix]);

-find_common_prefix_2([],CurrChar,_,RevPrefix) ->

-    lists:reverse([CurrChar|RevPrefix]).     % Actually, prefix was entire string!

-

-%% Help function which returns a sorted list of FileSet with the oldest first.

-find_hole_in_wrapset(FileSet,PreLen,SufLen) ->

-    NumberedFiles=find_hole_in_wrapset_2(FileSet,PreLen,SufLen),

-    find_hole_in_wrapset_3(lists:sort(NumberedFiles),0,[]). % Wrap-sets start at 0.

-

-find_hole_in_wrapset_2([FileName|Rest],PreLen,SufLen) ->

-    [{list_to_integer(lists:sublist(FileName,PreLen+1,length(FileName)-PreLen-SufLen)),

-      FileName}|

-     find_hole_in_wrapset_2(Rest,PreLen,SufLen)];

-find_hole_in_wrapset_2([],_,_) ->

-    [].

-

-find_hole_in_wrapset_3([{N,FileName}|Rest],N,Acc) ->

-    find_hole_in_wrapset_3(Rest,N+1,[FileName|Acc]);

-find_hole_in_wrapset_3([{_,FileName}|Rest],_N,Acc) -> % FileName is the oldest one.

-    [FileName|lists:map(fun({_,FN})->FN end,Rest)]++lists:reverse(Acc);

-find_hole_in_wrapset_3([],_,Acc) ->          % Means all were in order.

-    lists:reverse(Acc).    

-%% -----------------------------------------------------------------------------

-

-

-			      

-    

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

diff --git a/lib/inviso/src/inviso_tool.erl b/lib/inviso/src/inviso_tool.erl
deleted file mode 100644
index 7d3cfb9da0..0000000000
--- a/lib/inviso/src/inviso_tool.erl
+++ /dev/null
@@ -1,3255 +0,0 @@
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% Description:
-%% The inviso_tool implementation. A tool that uses inviso.
-%%
-%% Authors:
-%% Lennart Öhman, [email protected]
-%% -----------------------------------------------------------------------------
-
--module(inviso_tool).
-
-
-%% This is the inviso tool, which is a tool using the inviso trace application.
-%% It is developed to make tracing using trace cases possible in an environment
-%% of distributed Erlang nodes.
-%% A current restriction is that the Erlang nodes are supposed to have the same
-%% code. This since inviso tool can at this point not handle subsets of nodes.
-%% Instead all participating Erlang nodes are treated the same.
-%%
-%% The main functionality of the inviso tool are:
-%%
-%% (1) Handles start and stop of tracing at participating nodes.
-%% (2) Interprets trace-case files at a distributed network level.
-%%     (The inviso runtime component is responsible for interpreting
-%%      trace cases at a local level, if run in an autostart).
-%% (3) Keeps a command history log from which:
-%%     (a) Sequences easily can be repeated.
-%%     (b) Autostart configuration files can be created (understood by the
-%%         default inviso autostart mechanism).
-%% (4) Performs reactivation in case tracing is suspended (manually or by
-%%     an overload mechanism).
-%% (5) Can reconnect crashed nodes and by using the history bringing them
-%%     up to speed.
-
-%% Distributed Erlang
-%% ------------------
-%% Inviso is built to run in a distributed environment.
-%% The inviso tool can also be used in a non distributed environment.
-
-%% Short description
-%% -----------------
-%% Start-up of the inviso tool
-%% During the start-up of the tool, the tool starts runtime components at
-%% all participating nodes. A runtime component can already be running at
-%% a particular node and will then simply be adopted.
-%%
-%% Session
-%% A session is said to start when tracing is initiated, and ends when
-%% made to stop by the user. When a session is stopped, tracing is stopped
-%% at all participating nodes. Note that participating nodes may come and
-%% go though the time-frame of a session. That means that if a node is
-%% reconnected it may resume its tracing in the current session through
-%% a 'restart_session'. A runtime component that is already tracing at the
-%% time start-session will simply be part of the session without its
-%% ingoing tracing being changed.
-%%
-%% Reactivation
-%% A node that is suspended can be reactivated to resume tracing. Note that
-%% tracing has in this situation never been stopped at the node in question.
-%% The inviso tool resumes the node and applies the history to it.
-%%
-%% Reconnect
-%% A node that is "down" from the inviso tool's perspective can be
-%% reconnected. During reconnection the tool restarts the runtime component
-%% at that node but does not (re)initiate tracing. The latter is called
-%% restart_session and must be done explicitly, unless the node in question
-%% is in fact already tracing. If the node is already tracing (due to an autostart
-%% for instance), it automatically becomes part of the ongoing session (if
-%% there is an ongoing session).
-%%
-%% Restart Session
-%% A node that has been down and has been reconnected can be made to
-%% initialize and resume its tracing. This is done by starting the session
-%% at the node in question and redoing the current history.
-
-%% Trace files within a session
-%% Since it is possible to init-tracing (from an inviso perspective) several
-%% times within the same session, a session may leave several trace log files
-%% behind. This must be resolved by the tracer data generator function
-%% (user supplied) by marking filenames in a chronological order but still
-%% making them possible to identify as part of the same session
-
-
-
-%% -----------------------------------------------------------------------------
-%% API exports.
-%% -----------------------------------------------------------------------------
-
--export([start/0,start/1,stop/0,stop/1]).
--export([reconnect_nodes/0,reconnect_nodes/1,
-	 start_session/0,start_session/1,
-	 reinitiate_session/0,reinitiate_session/1,
-	 restore_session/0,restore_session/1,restore_session/2,
-	 stop_session/0,
-	 reset_nodes/0,reset_nodes/1,
-	 atc/3,sync_atc/3,sync_atc/4,
-	 sync_rtc/2,sync_rtc/3,
-	 dtc/2,sync_dtc/2,sync_dtc/3,
-	 inviso/2]).
--export([reactivate/0,reactivate/1,
-	 save_history/1,
-	 get_autostart_data/1,get_autostart_data/2,
-	 get_activities/0,get_node_status/0,get_node_status/1,get_session_data/0]).
--export([flush/0,flush/1]).
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% Debug exports.
-%% -----------------------------------------------------------------------------
-
--export([get_loopdata/0]).
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% OTP exports and call backs.
-%% -----------------------------------------------------------------------------
-
--export([init/1,handle_call/3,handle_cast/2,handle_info/2,terminate/2]).
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% Internal exports.
-%% -----------------------------------------------------------------------------
-
--export([tc_executer/4,reactivator_executer/6]).
--export([std_options_generator/1]).
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% Constants.
-%% -----------------------------------------------------------------------------
-
-%% Defines the inviso function calls that shall be possible to do through the
-%% inviso API in this tool.
--define(INVISO_CMDS,
-	[{tp,5},{tp,4},{tp,1},{tpl,5},{tpl,4},{tpl,1},
-	 {ctp,1},{ctp,2},{ctp,3},{ctpl,1},{ctpl,2},{ctpl,3},
-	 {tf,2},{tf,1},{ctf,2},{ctf,1},{ctf_all,0},
-	 {init_tpm,4},{init_tpm,7},
-	 {tpm,4},{tpm,5},{tpm,8},
-	 {tpm_tracer,4},{tpm_tracer,5},{init_tpm,8},
-	 {tpm_ms,5},{tpm_ms_tracer,5},
-	 {ctpm_ms,4},{ctpm,3},
-	 {tpm_localnames,0},{ctpm_localnames,0},
-	 {tpm_globalnames,0},{ctpm_globalnames,0},
-	 {ctp_all,0},
-	 {suspend,1},{cancel_suspension,0}]).
-%% -----------------------------------------------------------------------------
-
-%% These inviso functions shall be included in the command history log. Others
-%% are not relevant to be redone during a recactivation, a restart session or
-%% exported to an autostart file.
--define(INVISO_CMD_HISTORY,
-	[{tp,5},{tp,4},{tp,1},{tpl,5},{tpl,4},{tpl,1},
-	 {ctp,1},{ctp,2},{ctp,3},{ctpl,1},{ctpl,2},{ctpl,3},
-	 {tf,2},{tf,1},{ctf,2},{ctf,1},{ctf_all,0},
-	 {init_tpm,4},{init_tpm,7},
-	 {tpm,4},{tpm,5},{tpm,8},
-	 {tpm_tracer,4},{tpm_tracer,5},{init_tpm,8},
-	 {tpm_ms,5},{tpm_ms_tracer,5},
-	 {ctpm_ms,4},{ctpm,3},
-	 {tpm_localnames,0},{ctpm_localnames,0},
-	 {tpm_globalnames,0},{ctpm_globalnames,0},
-	 {ctp_all,0}]).
-%% -----------------------------------------------------------------------------
-
-%% Since many function calls to inviso may take long time, especially if they
-%% involve difficult and many trace patterns to set, the default gen_server:call
-%% time out can not be used. We just do not want to get stuck for ever if some
-%% error occurs.
--define(CALL_TIMEOUT,60000).
-
-%% Default max time to wait for a trace case called synchronously to return.
--define(SYNC_TC_TIMEOUT,10000).
-
-%% Runtime components shall terminate when the tool terminates.
--define(DEFAULT_DEPENDENCY,{dependency,0}).
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% Record definitions.
-%% -----------------------------------------------------------------------------
-
-%% The loopdata record.
--record(ld,{
-	  dir=".",                          % Working dir of the tool.
-	  nodes=down,                       % The nodesD database, defaults to non-distr.
-	  c_node,                           % Location of inviso_c.
-	  c_pid,                            % The inviso control component.
-	  regexp_node,                      % Node for regexp expansions.
-	  tc_dict,                          % Trace case definition db.
-	  chl,                              % Command history log.
-	  session_state=passive,            % passive | tracing
-	  tdg={inviso_tool_lib,std_tdg,[]}, % Tracer data generator func.
-	  tracer_data,                      % Current session nr and TDGargs.
-	  reactivators=[],                  % Pids of now running reactivators.
-	  tc_def_file,                      % Trace case definition file.
-	  optg={?MODULE,std_options_generator,[]}, % Generates options to add_nodes/3.
-	  initial_tcs=[],                   % Initial trace cases.
-	  started_initial_tcs=[],           % Cases that must be stopped when stop_tracing.
-	  history_dir,                      % File path for history file.
-	  keep_nodes=[],                    % Nodes that shall not be cleared when stopping.
-	  debug=false                       % Internal debug mode
-	  }).
-%% -----------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% API
-%% =============================================================================
-
-%% start()={ok,Pid} | {error,{already_started,pid()}}
-%% start(Config)
-%%   Config=[{Opt,Value},...], list of tuple options.
-%%     Opt=dir|nodes|c_node|regexp_node|tdg|tc_def_file|optg|initial_tcs|
-%%           history_dir|keep_nodes
-%% Starts the inviso_tool process. Options in Config are the same as those
-%% which are kept in the #ld structure.
-start() ->
-    start([]).
-start(Config) ->
-    gen_server:start({local,?MODULE},?MODULE,Config,[]).
-%% -----------------------------------------------------------------------------
-
-%% stop(UntouchedNodes)=
-%% stop()={ok,NodeResults} | NodeResult | {error,Reason}
-%%   UntouchedNodes=list(), nodes where any trace patterns shall not be removed.
-%%   NodeResults=[{Node,NodeResult},...]
-%%   NodeResult=ok | {error,Reason} | patterns_untouched
-%% Stops the inviso tool and the inviso control component. Runtime components are
-%% stopped by them selves depending on their dependcy of the control component.
-%% All runtime components that are not marked as to be kept will have their
-%% trace patterns cleared before the inviso control component is shutdown.
-%% The NodeResults indicates which nodes were successfullt handled.
-stop() ->
-    stop([]).
-stop(UntouchedNodes) ->
-    gen_server:call(?MODULE,{stop,UntouchedNodes},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% reconnect_nodes()=NodeResult; function for the nod-distributed case.
-%% reconnect_nodes(Nodes)={ok,NodesResults}
-%%   NodesResults=[{Node,NodeResult},...]
-%%     NodeResult={ok,{State,Status}} | {error,NReason}
-%%       State=tracing | inactive
-%%       Status=running | suspended
-%%       NReason=unknown_node | already_connected | down
-%% (Re)starts the inviso runtime components at Nodes. Depending on its state
-%% (new,idle or tracing) and if the tool is running a session or not, it becomes
-%% part of the tool's ongoing session. If the newly reconnected node is not
-%% tracing but the tool runs a session, the node must be reinitiated to become
-%% tracing.
-reconnect_nodes() ->
-    gen_server:call(?MODULE,{reconnect_nodes,local_runtime},?CALL_TIMEOUT).
-reconnect_nodes(Node) when is_atom(Node) ->
-    reconnect_nodes([Node]);
-reconnect_nodes(Nodes) when is_list(Nodes) ->
-    gen_server:call(?MODULE,{reconnect_nodes,Nodes},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% start_session()={ok,{SessionNr,InvisoReturn}} | {error,Reason}
-%% start_session(MoreTDGargs)=
-%%   MoreTDGargs=list(), prepended to the fixed list of args used when calling the
-%%     tracer data generator function.
-%%   SessionNr=integer(), trace sessions are numbered by the tool.
-%%   InvisoReturn=If successful inviso call, the returnvalue from inviso.
-%%     Note that individual nodes may be unsuccessful. See inviso:init_tracing/1
-%% Initiates tracing at all participating nodes.
-start_session() ->
-    start_session([]).
-start_session(MoreTDGargs) ->
-    gen_server:call(?MODULE,{start_session,MoreTDGargs},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% reinitiate_session(Nodes)={ok,InvisoReturn} | {error,Reason}
-%%   InvisoReturn=If successful inviso call, the returnvalue from inviso:init_tracing/1.
-%%     Note that individual nodes may be unsuccessful. Mentioned nodes not part
-%%       of the tool or not in state inactive will be marked as failing by the
-%%       tool in the InvisoReturn.
-%% To reinitate a node means to (inviso) init tracing at it according to saved
-%% tracer data generator arguments for the current session and then redo the current
-%% history to bring it up to speed. Note that the tool must be running a session
-%% for reinitiate to work.
-reinitiate_session() ->
-    gen_server:call(?MODULE,{reinitiate_session,local_runtime},?CALL_TIMEOUT).
-reinitiate_session(Nodes) ->
-    gen_server:call(?MODULE,{reinitiate_session,Nodes},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% restore_session()=
-%% restore_session(MoreTDGargs)=
-%% restore_session(FileName)=
-%% restore_session(FileName,MoreTDGargs)={ok,{SessionNr,InvisoReturn}} | {error,Reason}
-%% The two first clauses will start a new session using the last history. This
-%% implies that there must have been a session running prior.
-%% The two last clauses starts a session and reads a history file and executes the
-%% tracecases in it at all inactive nodes.
-%% In both cases the reused or read history becomes the current histoy, just if the
-%% session had been initiated manually. The tool may not
-%% have a session ongoing, and nodes already tracing (nodes which were adopted)
-%% are not effected. Just like when starting a session manually.
-restore_session() ->
-    restore_session([]).
-restore_session([]) ->                      % This cant be a filename.
-    gen_server:call(?MODULE,{restore_session,[]},?CALL_TIMEOUT);
-restore_session(FileNameOrMoreTDGargs) ->
-    case is_string(FileNameOrMoreTDGargs) of
-	true ->                             % Interpret it as a filename.
-	    restore_session(FileNameOrMoreTDGargs,[]);
-	false ->                            % The we want to use last session history!
-	    gen_server:call(?MODULE,{restore_session,FileNameOrMoreTDGargs},?CALL_TIMEOUT)
-    end.
-restore_session(FileName,MoreTDGargs) ->
-    gen_server:call(?MODULE,{restore_session,{FileName,MoreTDGargs}},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% stop_session()={ok,{SessionNr,Result}} | {error,Reason}
-%%   SessionNr=integer()
-%%   Result=[{Node,NodeResult},...] | NonDistributedNodeResult
-%%     NodeResult=ok | {error,Reason}
-%%     NonDistributedNodeResult=[ok] | []
-%% Stops inviso tracing at all participating nodes. The inviso runtime components
-%% will go to state idle. It is now time to fetch the logfiles. Will most often
-%% succeed. Will only return an error if the entire inviso call returned an
-%% error. Not if an individual node failed stop tracing successfully.
-%% Any running trace case, including reactivator processes will be terminated.
-stop_session() ->
-    gen_server:call(?MODULE,stop_session,?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% reset_nodes()=NodeResult | {error,Reason}
-%% reset_nodes(Nodes)={ok,NodeResults} | {error,Reason}
-%%   NodeResults and NodeResult as returned by inviso:clear/1 and /0.
-%% Clear nodes from trace flags, trace patterns and meta trace patterns. The tool
-%% must not be having a running session.
-reset_nodes() ->
-    gen_server:call(?MODULE,{reset_nodes,local_runtime},?CALL_TIMEOUT).
-reset_nodes(Nodes) ->
-    gen_server:call(?MODULE,{reset_nodes,Nodes},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% atc(TC,Id,Vars)=ok | {error,Reason}
-%%   TC=atom(), name of the trace case.
-%%   Id=term(), given name of this usage of TC.
-%%   Vars=list(), list of variable bindings [{Var,Value},...], Var=atom(),Value=term().
-%% Function activating a trace case. The trace case must be defined in the
-%% trace case dictionary. The 'ok' return value is only a signal that the
-%% trace case has started successfully. It may then run for as long as it is
-%% programmed to run. An erroneous return value does not necessarily mean that
-%% the trace case has not been executed. It rather means that is undetermined
-%% what happend.
-atc(TC,Id,Vars) ->
-    gen_server:call(?MODULE,{atc,{TC,Id,Vars}},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% sync_atc(TC,Id,Vars)=Result | {error,Reason}
-%% sync_atc(TC,Id,Vars,TimeOut)=
-%%   Result=term(), what ever is returned be the last expression in the trace case.
-%%   TimeOut=interger() | infinity, the max wait time for the trace case to finnish.
-%% As atc/3 but waits for the trace case to finish.
-sync_atc(TC,Id,Vars) ->
-    gen_server:call(?MODULE,{sync_atc,{TC,Id,Vars,?SYNC_TC_TIMEOUT}},?CALL_TIMEOUT).
-sync_atc(TC,Id,Vars,TimeOut) ->
-    gen_server:call(?MODULE,{sync_atc,{TC,Id,Vars,TimeOut}},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% sync_rtc(TC,Vars)=Result | {error,Reason}
-%% sync_rtc(TC,Vars,TimeOut)=
-%%   Result=term(), what ever is returned be the last expression in the trace case.
-%%   TimeOut=interger() | infinity, the max wait time for the trace case to finnish.
-%% As sync_atc/3 but the trace case is not marked as activated. It is mearly placed
-%% in the history. Hence with sync_rtc a trace case can be "activated" multiple time.
-sync_rtc(TC,Vars) ->
-    gen_server:call(?MODULE,{sync_rtc,{TC,Vars,?SYNC_TC_TIMEOUT}},?CALL_TIMEOUT).
-sync_rtc(TC,Vars,TimeOut) ->
-    gen_server:call(?MODULE,{sync_rtc,{TC,Vars,TimeOut}},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% dtc(TC,Id)=ok | {error,Reason}
-%% Deactivates a previosly activated trace case. This function can only be used
-%% on trace cases that has a deactivation defined in the trace case dictionary.
-%% There is of course really no difference between a file containing an activation
-%% compared to a deactivation. But to be able cancelling activations out from the
-%% history log, a defined deactivation is essential.
-%% As with activation, the returned 'ok' simply indicates the start of the trace
-%% case.
-dtc(TC,Id) ->
-    gen_server:call(?MODULE,{dtc,{TC,Id}},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% sync_dtc(TC,Id)=Result | {error,Reason}
-%% sync_dtc(TC,Id,TimeOut)=
-%%   Synchronous deactivation of trace case. See dtc/2 and sync_atc/3 for
-%%   parameters.
-sync_dtc(TC,Id) ->
-    gen_server:call(?MODULE,{sync_dtc,{TC,Id,?SYNC_TC_TIMEOUT}},?CALL_TIMEOUT).
-sync_dtc(TC,Id,TimeOut) ->
-    gen_server:call(?MODULE,{sync_dtc,{TC,Id,TimeOut}},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% inviso(Cmd,Args)=Result
-%%   Cmd=atom(), the (inviso) function name that shall be called.
-%%   Args=list(), the arguments to Cmd.
-%%   Result=term(), the result from the inviso function call.
-%% This function executes a Cmd in the inviso tool context. The inviso call will
-%% be logged in history log and thereby repeated in case of a reactivation.
-%% Note that this function is intended for use with inviso function API without
-%% specifying any nodes, since the function call is supposed to be carried out on
-%% all nodes.
-%% When these functions are written to an autostart config file by the tool there
-%% is supposed to be a translation to inviso_rt functions.
-inviso(Cmd,Args) ->
-    gen_server:call(?MODULE,{inviso,{Cmd,Args}},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% reactivate()=ok | {error,Reason}
-%% reactivate(Node)=ok | {error,Reason}
-%% Moves a runtime component from suspended to the state running. This can be
-%% done for both tracing and inactive nodes. The later is necessary since you
-%% may have stopped tracing with a node suspended.
-%% In case the node is tracing, commands in the command history log are redone at
-%% the node in questions.
-%% Note that this function returns 'ok' before the node is running. This because the
-%% the reactivated history is done by a separate process and there is no guarantee
-%% when it will be ready. The reactivated node will not be marked as running in
-%% the tool until done reactivating.
-%% Further it is important to understand that if there are "ongoing" tracecases
-%% (i.e tracecase scripts that are currently executing) and this node was running
-%% at the time that tracecase script started to execute, the list of nodes bound
-%% to the Nodes variable in that script executer includes this node. Making it
-%% no longer suspended makes it start executing inviso commands from where ever
-%% such are called. Hence the reactivation may be interferred by that tracecase.
-reactivate() ->                             % Non-distributed API.
-    reactivate(node()).
-reactivate(Node) ->
-    gen_server:call(?MODULE,{reactivate,Node},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% save_history(FileName)={ok,AbsFileName} | {error,Reason}
-%% Saves the currently collected command history log to a file. The file will
-%% be a binary-file. If FileName is an absolute path, it will be saved to that
-%% file. Otherwise the history dir will be used. If no history dir was specified
-%% the tool dir will be used, prepended to FileName.
-save_history(FileName) ->
-    gen_server:call(?MODULE,{save_history,FileName},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% get_autostart_data(Nodes,Dependency)={ok,{AutoStartData,NodeResults} |
-%%     {ok,{AutoStartData,NodeResult}} | {error,Reason}
-%%   Dependency=inviso dependency parameter which will be used for every
-%%     autostarted runtime component (included in Options).
-%%   NodeResults=[{Node,NodeResult},...]
-%%     NodeResult={ok,{Options,{tdg,{M,F,CompleteTDGargs}}}} | {error,Reason}
-%%       Options=add_nodes options to the inviso runtime component.
-%%       M,F=atom(), the module and function for tracerdata generation.
-%%       CompleteTDGargs=list(), all arguments as they are given to the tracer
-%%         data generator function.
-%%       AutostartData=[CaseSpec,...]
-%%         CaseSpec={file,{FileName,Bindings}} | {mfa,{M,F,Args}}
-%%           FileName=string(), pointing out the trace case file. Note that this
-%%             is the same as the path used by the tool.
-%%           Bindings=Var bindings used according to the history for the
-%%             invocation.
-%%           M,F=atom(), the function that shall be called (normally some inviso).
-%%           Args=list(), the actual arguments. Note that this may contain things
-%%             which can not be written to file (ports, pids,...).
-%% Function returning information on how to autostart a node to make it trace
-%% according to the current history. The inviso_tool does not know how to write
-%% the necessary files at the nodes in question. That must be done by the user
-%% of the tool, guided by the return value from this function.
-%% Note that there will be two types of trace case files. Regular trace case
-%% files and binaries returned from this function. The latter contains the
-%% inviso commands which have been executed. Note that the order amongst the
-%% trace cases and binaries is of importance (otherwise they will be redone in
-%% an incorrect order).
-get_autostart_data(Dependency) ->
-    gen_server:call(?MODULE,{get_autostart_data,Dependency},?CALL_TIMEOUT).
-get_autostart_data(Nodes,Dependency) ->
-    gen_server:call(?MODULE,{get_autostart_data,{Nodes,Dependency}},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% get_activities()={ok,Ongoing} | {error,Reason}
-%%   Ongoing=list(); [ [TraceCases] [,Reactivators] ]
-%%     TraceCases={tracecases,TraceCaseList}
-%%       TraceCaseList=[{{TCname,Id},Phase},...]
-%%         Phase=activating | deactivating
-%%     Reactivators={reactivating_nodes,ReactivatingNodes}
-%%       ReactivatingNodes=[Node,...]
-%% Returns a list of assynchronous tracecases and nodes doing reactivation at
-%% this momement. This can be useful to implement "home brewn" synchronization,
-%% waiting for the runtime components to reach a certain state.
-get_activities() ->
-    gen_server:call(?MODULE,get_activities,?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% get_status(Node)={ok,StateStatus} | {error,Reason}
-%%   StateStatus={State,Status} | reactivating | down
-%%     State=tracing | inactive | trace_failure
-%%     Status=running | suspended
-get_node_status() ->
-    get_node_status(local_runtime).
-get_node_status(Node) ->
-    gen_server:call(?MODULE,{get_node_status,Node},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% get_session_data()={ok,{Status,SessionNr,TDGargs}} | {error,Reason}
-%%   Status=tracing | not_tracing, info about current/last session.
-%%   SessionNr=integer()
-%%   TDGargs=list(), list of the arguments that will be given to the tracer data
-%%     generator function (not including the leading Nodes list).
-%% Returns data about the current or last session.
-get_session_data() ->
-    gen_server:call(?MODULE,get_session_data,?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% flush()={ok,NodeResults} | NodeResult | {error,Reason}
-%% flush(Nodes)={ok,NodesResults} | {error,Reason}
-%%   NodeResults=[{Node,NodeResult},...]
-%%   NodeResult=ok | {error,Reason}
-%% Makes runtime components flush their trace ports.
-flush() ->
-    gen_server:call(?MODULE,flush,?CALL_TIMEOUT).
-flush(Nodes) ->
-    gen_server:call(?MODULE,{flush,Nodes},?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% get_loopdata()=#ld
-%% Debug API returning the internal loopdata structure. See #ld above for details.
-get_loopdata() ->
-    gen_server:call(?MODULE,get_loopdata,?CALL_TIMEOUT).
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% Internal APIs.
-%% -----------------------------------------------------------------------------
-
-%% tc_executer_reply(To,Reply)=nothing significant
-%%   To=pid()
-%%   Reply=term()
-%% Internal API used by a trace case executer process to signal its completion.
-tc_executer_reply(To,Reply) ->
-    gen_server:cast(To,{tc_executer_reply,Reply}).
-%% -----------------------------------------------------------------------------
-
-%% Internal API used by a reactivator process indicating it is done with the
-%% history log it has got so far.
-%% Timeout set to infinity since the tool may be busy, then the reactivator just
-%% have to wait. If the tool crashes the reactivator will be go down too automatically.
-reactivator_reply(TPid,Counter) ->
-    gen_server:call(TPid,{reactivator_reply,{Counter,self()}},infinity).
-%% -----------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% gen_server implementation.
-%% =============================================================================
-
-init(Config) ->
-    case fetch_configuration(Config) of     % From conf-file and Config.
-	{ok,LD} when is_record(LD,ld) ->
-	    case start_inviso_at_c_node(LD) of
-		{ok,CPid} ->
-		    LD2=start_runtime_components(LD),
-		    LD3=read_trace_case_definitions(LD2),
-		    process_flag(trap_exit,true),
-		    start_subscribe_inviso_events(LD3#ld.c_node),
-		    {ok,LD3#ld{c_pid=CPid}};
-		{error,Reason} ->           % Most likely already running.
-		    {stop,{error,Reason}}
-	    end;
-	{error,Reason} ->
-	    {stop,{error,{start_up,Reason}}}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function starting the inviso control component at node c_node, or "here"
-%% if it is not a distributed network.
-start_inviso_at_c_node(#ld{c_node=undefined}) -> % Non distributed case.
-    case inviso:start() of
-	{ok,Pid} ->
-	    {ok,Pid};
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-start_inviso_at_c_node(#ld{c_node=CNode}) ->
-    case rpc:call(CNode,inviso,start,[]) of
-	{ok,Pid} ->
-	    {ok,Pid};
-	{error,{already_started,_}} ->      % A control component already started.
-	    {error,{inviso_control_already_running,CNode}};
-	{error,Reason} ->
-	    {error,Reason};
-	{badrpc,Reason} ->
-	    {error,{inviso_control_node_error,Reason}}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function starting the runtime components at all particapting nodes.
-%% It also updates the nodes structure in the #ld to indicate which nodes where
-%% successfully started. Returns a new #ld.
-%% Note that a runtime component may actually be running at one or several nodes.
-%% This is supposed to be the result of an (wanted) autostart. Meaning that the
-%% inviso tool can not handle the situation if a runtime component is not doing
-%% what it is supposed to do. In case a runtime component is already running it
-%% will be adopted and therefore marked as running.
-start_runtime_components(LD=#ld{c_node=undefined}) ->
-    start_runtime_components_2(local_runtime,undefined,LD);
-start_runtime_components(LD=#ld{c_node=CNode,nodes=NodesD}) ->
-    start_runtime_components_2(get_all_nodenames_nodes(NodesD),CNode,LD).
-start_runtime_components(Nodes,LD=#ld{c_node=CNode}) ->
-    start_runtime_components_2(Nodes,CNode,LD).
-
-start_runtime_components_2(local_runtime,CNode,LD=#ld{optg=OptG}) ->
-    Opts=start_runtime_components_mk_opts(local_runtime,OptG),
-    case inviso:add_node(mk_rt_tag(),Opts) of
-	{ok,NAnsw} ->                       % Should be more clever really!
-	    NewNodesD=update_added_nodes(CNode,{ok,NAnsw},LD#ld.nodes),
-	    LD#ld{nodes=NewNodesD};
-	{error,_Reason} ->
-	    LD
-    end;
-start_runtime_components_2([Node|Rest],CNode,LD=#ld{optg=OptG}) ->
-    Opts=start_runtime_components_mk_opts(Node,OptG),
-    case rpc:call(CNode,inviso,add_nodes,[[Node],mk_rt_tag(),Opts]) of
-	{ok,NodeResults} ->
-	    NewNodesD=update_added_nodes(CNode,NodeResults,LD#ld.nodes),
-	    start_runtime_components_2(Rest,CNode,LD#ld{nodes=NewNodesD});
-	{error,_Reason} ->
-	    start_runtime_components_2(Rest,CNode,LD);
-	{badrpc,_Reason} ->
-	    start_runtime_components_2(Rest,CNode,LD)
-    end;
-start_runtime_components_2([],_,LD) ->
-    LD.
-
-start_runtime_components_mk_opts(Node,{M,F,Args}) ->
-    case catch apply(M,F,[Node|Args]) of
-	{ok,Opts} when is_list(Opts) ->
-	    start_runtime_component_mk_opts_add_dependency(Opts);
-	_ ->
-	    [?DEFAULT_DEPENDENCY]
-    end.
-
-%% The options generator is not supposed to generate the dependency. Hence this
-%% function adds and if necessary removes an incorrectly added dependency tag.
-start_runtime_component_mk_opts_add_dependency(Opts) ->
-    case lists:keysearch(dependency,1,Opts) of
-	{value,_} ->                           % Not allowed!!!
-	    [?DEFAULT_DEPENDENCY|lists:keydelete(dependecy,1,Opts)];
-	false ->
-	    [?DEFAULT_DEPENDENCY|Opts]
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function subscribing to inviso events from the inviso controller. This
-%% will make it possible to follow runtime components going down.
-start_subscribe_inviso_events(undefined) ->
-    inviso:subscribe();
-start_subscribe_inviso_events(CNode) ->
-    rpc:call(CNode,inviso,subscribe,[self()]). % Don't want the rpc-proc to subscribe!
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% gen_server handle call back functions.
-%% -----------------------------------------------------------------------------
-
-handle_call({stop,UntouchedNodes},_From,LD=#ld{nodes=NodesD,c_node=CNode,keep_nodes=KeepNodes})
-  when is_list(UntouchedNodes) ->
-    {stop,
-     normal,
-     remove_all_trace_patterns(CNode,
-			       UntouchedNodes++KeepNodes,
-			       get_available_nodes(NodesD)),
-     LD};
-handle_call({stop,BadArg},_From,LD) ->
-    {reply,{error,{badarg,BadArg}},LD};
-
-handle_call({reconnect_nodes,Nodes},_From,LD) ->
-    case h_reconnect_nodes(Nodes,LD) of
-	{ok,{Nodes2,NodesErr,NewLD}} ->
-	    if
-		Nodes==local_runtime ->
-		    {reply,
-		     build_reconnect_nodes_reply(Nodes,Nodes2,NodesErr,NewLD#ld.nodes),
-		     NewLD};
-		is_list(Nodes) ->
-		    {reply,
-		     {ok,build_reconnect_nodes_reply(Nodes,Nodes2,NodesErr,NewLD#ld.nodes)},
-		     NewLD}
-	    end;
-	{error,Reason} ->
-	    {reply,{error,Reason},LD}
-    end;
-
-handle_call({start_session,MoreTDGargs},_From,LD=#ld{session_state=SState}) ->
-    case is_tracing(SState) of
-	false ->                               % No session running.
-	    if
-		is_list(MoreTDGargs) ->
-		    DateTime=calendar:universal_time(),
-		    {M,F,Args}=LD#ld.tdg,
-		    TDGargs=inviso_tool_lib:mk_tdg_args(DateTime,MoreTDGargs++Args),
-		    case h_start_session(M,F,TDGargs,LD) of
-			{ok,{SessionNr,ReturnVal,NewLD}} -> % No nodes to initiate.
-			    NewLD2=add_initial_tcs_to_history(NewLD#ld.initial_tcs,
-							      NewLD#ld{chl=mk_chl(LD#ld.chl)}),
-			    {reply,
-			     {ok,{SessionNr,ReturnVal}},
-			     NewLD2#ld{session_state=tracing_sessionstate()}};
-			{ok,{SessionNr,ReturnVal,Nodes2,NewLD}} ->
-			    NewLD2=do_initial_tcs(NewLD#ld.initial_tcs,
-						  Nodes2,
-						  NewLD#ld{chl=mk_chl(LD#ld.chl)}),
-			    {reply,
-			     {ok,{SessionNr,ReturnVal}},
-			     NewLD2#ld{session_state=tracing_sessionstate()}};
-			{error,Reason} ->
-			    {reply,{error,Reason},LD}
-		    end;
-		true ->                        % Faulty TDGargs.
-		    {reply,{error,{badarg,MoreTDGargs}},LD}
-	    end;
-	true ->
-	    {reply,{error,session_already_started},LD}
-    end;
-
-handle_call({reinitiate_session,Nodes},_From,LD=#ld{session_state=SState}) ->
-    case is_tracing(SState) of
-	true ->                                % The tool must be tracing.
-	    {M,F,_Args}=LD#ld.tdg,
-	    TDGargs=get_latest_tdgargs_tracer_data(LD#ld.tracer_data),
-	    case h_reinitiate_session(Nodes,M,F,TDGargs,LD) of
-		{ok,{NodesErr,ReturnVal,NewLD}} ->
-		    {reply,
-		     {ok,build_reinitiate_session_reply(Nodes,NodesErr,ReturnVal)},
-		     NewLD};
-		{error,Reason} ->
-		    {reply,{error,Reason},LD}
-	    end;
-	false ->                               % Must have a running session!
-	    {reply,{error,no_session},LD}
-    end;
-
-handle_call({restore_session,{FileName,MoreTDGargs}},_From,LD=#ld{chl=OldCHL})
-  when is_list(MoreTDGargs) ->
-    case is_tracing(LD#ld.session_state) of
-	false ->
-	    case catch make_absolute_path(FileName,LD#ld.dir) of
-		AbsFileName when is_list(AbsFileName) ->
-		    case file:read_file(AbsFileName) of
-			{ok,Bin} ->
-			    if
-				is_list(MoreTDGargs) ->
-				    case catch replace_history_chl(OldCHL,
-								   binary_to_term(Bin)) of
-					{ok,CHL} -> % The file was well formatted.
-					    case h_restore_session(MoreTDGargs,
-								   LD#ld{chl=CHL}) of
-						{ok,{SessionNr,ReturnVal,NewLD}} ->
-						    {reply,
-						     {ok,{SessionNr,ReturnVal}},
-						     NewLD#ld{session_state=
-							      tracing_sessionstate()}};
-						{error,Reason} ->
-						    {reply,{error,Reason},LD}
-					    end;
-					Error -> % Badly formatted file.
-					    {reply,
-					     {error,{bad_file,{AbsFileName,Error}}},
-					     LD}
-				    end;
-				true ->
-				    {reply,{error,{badarg,MoreTDGargs}},LD}
-			    end;
-			{error,Reason} ->
-			    {reply,{error,{read_file,Reason}},LD}
-		    end;
-		Error ->
-		    {reply,{error,{bad_filename,{FileName,Error}}},LD}
-	    end;
-	true ->
-	    {reply,{error,session_already_started},LD}
-    end;
-%% This is doing restore session on the current history.
-handle_call({restore_session,MoreTDGargs},_From,LD=#ld{chl=CHL}) ->
-    case is_tracing(LD#ld.session_state) of
-	false ->
-	    case history_exists_chl(CHL) of
-		true ->                        % There is a history to redo.
-		    if
-			is_list(MoreTDGargs) ->
-			    case h_restore_session(MoreTDGargs,LD) of
-				{ok,{SessionNr,ReturnVal,NewLD}} ->
-				    {reply,
-				     {ok,{SessionNr,ReturnVal}},
-				     NewLD#ld{session_state=tracing_sessionstate()}};
-				{error,Reason} ->
-				    {reply,{error,Reason},LD}
-			    end;
-			true ->
-			    {reply,{error,{badarg,MoreTDGargs}},LD}
-		    end;
-		false ->
-		    {reply,{error,no_history},LD}
-	    end;
-	true ->
-	    {reply,{error,session_already_started},LD}
-    end;
-
-%% To stop tracing means stop_tracing through the inviso API. But we must also
-%% remove any help processes executing inviso commands (trace case executers
-%% and reactivators).
-%% Note that to be really sure we should actually wait for EXIT-signals from those
-%% processes before returning a successful returnvalue to the caller. In theory
-%% those processes could issue an inviso call effecting a new trace session started
-%% with init_tracing shortly after the call to stop_tracing. But too complicated! :-)
-%% Further, stop-tracing is done on all nodes in our nodes structure. Regardless
-%% if the node is tracing or not
-handle_call(stop_session,_From,LD=#ld{session_state=SState,chl=CHL,reactivators=ReAct}) ->
-    case is_tracing(SState) of
-	true ->
-	    NewCHL=stop_all_tc_executer_chl(CHL), % Stop any running trace case proc.
-	    NewReAct=stop_all_reactivators(ReAct),  % Stop any running reactivators.
-	    case h_stop_session(LD) of
-		{ok,{SessionNr,Result}} ->
-		    NewNodesD=set_inactive_nodes(Result,LD#ld.nodes),
-		    {reply,
-		     {ok,{SessionNr,Result}},
-		     LD#ld{session_state=passive_sessionstate(),
-			   nodes=NewNodesD,
-			   chl=NewCHL,
-			   reactivators=NewReAct,
-			   started_initial_tcs=[]}};
-		{error,Reason} ->           % Now we're really in deep shit :-)
-		    {reply,{error,{unrecoverable,Reason}},LD}
-	    end;
-	false ->
-	    {reply,{error,no_session},LD}
-    end;
-
-handle_call({reset_nodes,Nodes},_From,LD=#ld{session_state=SState}) ->
-    case is_tracing(SState) of
-	false ->                            % We can not be in a session.
-	    {reply,h_reset_nodes(Nodes,LD#ld.c_node),LD};
-	true ->
-	    {reply,{error,session_active},LD}
-    end;
-
-%% Calling a trace-case, or "turning it on".
-handle_call({atc,{TC,Id,Vars}},_From,LD=#ld{session_state=SState}) ->
-    case is_tracing(SState) of              % Check that we are tracing now.
-	true ->
-	    case h_atc(TC,Id,Vars,LD) of
-		{ok,NewLD} ->               % Trace case executed.
-		    {reply,ok,NewLD};
-		{error,Reason} ->
-		    {reply,{error,Reason},LD}
-	    end;
-	false ->                            % Can't activate if not tracing.
-	    {reply,{error,no_session},LD}
-    end;
-
-handle_call({sync_atc,{TC,Id,Vars,TimeOut}},_From,LD=#ld{session_state=SState}) ->
-    case is_tracing(SState) of
-	true ->
-	    if
-		is_integer(TimeOut);TimeOut==infinity ->
-		    case h_sync_atc(TC,Id,Vars,TimeOut,LD) of
-			{ok,NewLD,Result} ->
-			    {reply,Result,NewLD};
-			{error,Reason} ->
-			    {reply,{error,Reason},LD}
-		    end;
-		true ->
-		    {reply,{error,{badarg,TimeOut}},LD}
-	    end;
-	false ->
-	    {reply,{error,no_session},LD}
-    end;
-
-handle_call({sync_rtc,{TC,Vars,TimeOut}},_From,LD=#ld{session_state=SState}) ->
-    case is_tracing(SState) of
-	true ->
-	    if
-		is_integer(TimeOut);TimeOut==infinity ->
-		    case h_sync_rtc(TC,Vars,TimeOut,LD) of
-			{ok,NewLD,Result} ->
-			    {reply,Result,NewLD};
-			{error,Reason} ->
-			    {reply,{error,Reason},LD}
-		    end;
-		true ->
-		    {reply,{error,{badarg,TimeOut}},LD}
-	    end;
-	false ->
-	    {reply,{error,no_session},LD}
-    end;
-
-
-handle_call({dtc,{TC,Id}},_From,LD=#ld{session_state=SState}) ->
-    case is_tracing(SState) of              % Check that we are tracing now.
-	true ->
-	    case h_dtc(TC,Id,LD) of
-		{ok,NewLD} ->
-		    {reply,ok,NewLD};
-		{error,Reason} ->
-		    {reply,{error,Reason},LD}
-	    end;
-	false ->                            % Can't activate if not tracing.
-	    {reply,{error,no_session},LD}
-    end;
-
-handle_call({sync_dtc,{TC,Id,TimeOut}},_From,LD=#ld{session_state=SState}) ->
-    case is_tracing(SState) of              % Check that we are tracing now.
-	true ->
-	    if
-		is_integer(TimeOut);TimeOut==infinity ->
-		    case h_sync_dtc(TC,Id,TimeOut,LD) of
-			{ok,NewLD,Result} ->
-			    {reply,Result,NewLD};
-			{error,Reason} ->
-			    {reply,{error,Reason},LD}
-		    end;
-		true ->
-		    {reply,{error,{badarg,TimeOut}},LD}
-	    end;
-	false ->                            % Can't activate if not tracing.
-	    {reply,{error,no_session},LD}
-    end;
-
-handle_call({inviso,{Cmd,Args}},_From,LD=#ld{session_state=SState}) ->
-    case is_tracing(SState) of
-	true ->
-	    if
-		is_list(Args) ->
-		    case h_inviso(Cmd,Args,LD) of
-			{ok,{Reply,NewLD}} ->
-			    {reply,Reply,NewLD};
-			{error,Reason} ->
-			    {reply,{error,Reason},LD}
-		    end;
-		true ->
-		    {reply,{error,{badarg,Args}},LD}
-	    end;
-	false ->                            % Can't do if not tracing.
-	    {reply,{error,no_session},LD}
-    end;
-
-handle_call({reactivate,Node},_From,LD=#ld{nodes=NodesD,c_node=CNode}) ->
-    case get_state_nodes(Node,NodesD) of
-	{trace_failure,_} ->
-	    {reply,{error,trace_failure},LD};
-	{State,suspended} ->                % The node is infact suspended.
-	    case h_reactivate(Node,CNode) of
-		ok ->
-		    case {State,is_tracing(LD#ld.session_state)} of
-			{tracing,true} ->   % Only then shall we redo cmds.
-			    {reply,ok,redo_cmd_history(Node,LD)};
-			_ ->                % All other just no longer suspended.
-			    {reply,ok,LD#ld{nodes=set_running_nodes(Node,NodesD)}}
-		    end;
-		{error,Reason} ->
-		    {reply,{error,Reason},LD}
-	    end;
-	reactivating ->
-	    {reply,{error,reactivating},LD};
-	{_,running} ->
-	    {reply,{error,already_running},LD};
-	down ->
-	    {reply,{error,not_available},LD};
-	false ->
-	    {reply,{error,unknown_node},LD}
-    end;
-
-handle_call({save_history,FileName},_From,LD=#ld{chl=CHL,dir=Dir,history_dir=HDir}) ->
-    case lists:keysort(2,get_loglist_chl(CHL)) of
-	[] ->                               % Empty history or no history.
-	    {reply,{error,no_history},LD};
-	Log ->
-	    case h_save_history(HDir,Dir,FileName,Log) of
-		{ok,AbsFileName} ->
-		    {reply,{ok,AbsFileName},LD};
-		{error,Reason} ->
-		    {reply,{error,Reason},LD}
-	    end
-    end;
-
-handle_call({get_autostart_data,{Nodes,Dependency}},_From,LD=#ld{chl=CHL}) ->
-    {ok,ASD} = build_autostart_data(lists:keysort(2,get_loglist_chl(CHL)),LD#ld.tc_dict),
-    TDGargs=get_latest_tdgargs_tracer_data(LD#ld.tracer_data),
-    {M,F,_}=LD#ld.tdg,
-    OptsG=LD#ld.optg,                       % Addnodes options generator.
-    {reply,
-     h_get_autostart_data(Nodes,LD#ld.c_node,Dependency,ASD,M,F,TDGargs,OptsG),
-     LD};
-
-handle_call({get_autostart_data,Dependency},From,LD=#ld{c_node=undefined}) ->
-    handle_call({get_autostart_data,{local_runtime,Dependency}},From,LD);
-handle_call({get_autostart_data,Dependency},From,LD=#ld{nodes=NodesD}) ->
-    Nodes=get_all_nodenames_nodes(NodesD),
-    handle_call({get_autostart_data,{local_runtime,{Nodes,Dependency}}},From,LD);
-
-handle_call(get_activities,_From,LD=#ld{chl=CHL,reactivators=Reactivators}) ->
-    TraceCases=get_ongoing_chl(CHL),
-    RNodes=get_all_nodes_reactivators(Reactivators),
-    ReturnList1=
-	if
-	    TraceCases==[] ->
-		[];
-	    true ->
-		[{tracecases,TraceCases}]
-	end,
-    ReturnList2=
-	if
-	    RNodes==[] ->
-		ReturnList1;
-	    true ->
-		[{reactivating_nodes,RNodes}|ReturnList1]
-	end,
-    {reply,{ok,ReturnList2},LD};
-
-handle_call({get_node_status,Node},_Node,LD) ->
-    case get_state_nodes(Node,LD#ld.nodes) of
-	false ->
-	    {reply,{error,unknown_node},LD};
-	StateStatus ->
-	    {reply,{ok,StateStatus},LD}
-    end;
-
-handle_call(get_session_data,_From,LD=#ld{session_state=SState,tracer_data=TD}) ->
-    case get_latest_session_nr_tracer_data(TD) of
-	undefined ->
-	    {reply,{error,no_session},LD};
-	SessionNr ->
-	    TDGargs=get_latest_tdgargs_tracer_data(TD),
-	    case is_tracing(SState) of
-		true ->
-		    {reply,{ok,{tracing,SessionNr,TDGargs}},LD};
-		false ->
-		    {reply,{ok,{not_tracing,SessionNr,TDGargs}},LD}
-	    end
-    end;
-
-handle_call(flush,_From,LD=#ld{c_node=CNode,nodes=NodesD}) ->
-    Nodes=get_tracing_nodes(NodesD),
-    {reply,h_flush(CNode,Nodes),LD};
-handle_call({flush,Nodes},_From,LD=#ld{c_node=CNode}) ->
-    {reply,h_flush(CNode,Nodes),LD};
-
-handle_call(get_loopdata,_From,LD) ->
-    {reply,LD,LD};
-
-%% Internal handle_call callbacks.
-
-handle_call({reactivator_reply,{Counter,RPid}},_From,LD=#ld{chl=CHL}) ->
-    HighestUsedCounter=get_highest_used_counter_chl(CHL),
-    if
-	HighestUsedCounter>Counter ->       % There are now more log entries.
-	    NewUnsortedLog=get_loglist_chl(CHL),
-	    {reply,{more,NewUnsortedLog},LD};
-	true ->                             % No Counter is youngest log entry.
-	    NodesD=LD#ld.nodes,
-	    Node=get_node_reactivators(RPid,LD#ld.reactivators),
-	    {reply,
-	     done,
-	     LD#ld{nodes=set_running_nodes(Node,NodesD),
-		   reactivators=del_reactivators(RPid,LD#ld.reactivators)}}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Handling a notification from a trace case execution process. Receiving this
-%% indicated that this phase of the trace case is finnished.
-handle_cast({tc_executer_reply,{Phase,ProcH,Result}},LD) ->
-    case Phase of
-	activating ->                       % The trace case is running now.
-	    {ok,NewLD}=h_tc_activation_done(ProcH,Result,LD),
-	    {noreply,NewLD};
-	stopping ->
-	    {ok,NewLD}=h_tc_stopping_done(ProcH,Result,LD),
-	    {noreply,NewLD};
-	_ ->
-	    {noreply,LD}
-    end;
-handle_cast(_,LD) ->
-    {noreply,LD}.
-%% -----------------------------------------------------------------------------
-
-%% This is the case when a runtime component goes down. We stop all running
-%% reactivators for this node. Note that there can also be tracecases ongoing
-%% where this node is part of the Nodes variable. But there is not much we can
-%% do about that. Other then informing the user that it is unwise to reconnect
-%% this node before those tracecases have stopped being ongoing.
-handle_info({inviso_event,_CNode,_Time,{disconnected,Node,_}},LD) ->
-    {noreply,LD#ld{nodes=set_down_nodes(Node,LD#ld.nodes),
-		   reactivators=stop_node_reactivators(Node,LD#ld.reactivators)}};
-
-%% This is the case when a runtime component gets suspended. Much of the same
-%% problem as described above applies.
-handle_info({inviso_event,_CNode,_Time,{state_change,Node,{_,{suspended,_}}}},LD) ->
-    {noreply,LD#ld{nodes=set_suspended_nodes(Node,LD#ld.nodes),
-		   reactivators=stop_node_reactivators(Node,LD#ld.reactivators)}};
-
-handle_info(_,LD) ->
-    {noreply,LD}.
-%% -----------------------------------------------------------------------------
-
-%% Called when the tool server stops. First clause, termination is initiated by
-%% our self and therefore controlled another way. In the second case we are
-%% stopping for some external reason, and we must then do more here in terminate/2.
-terminate(normal,#ld{c_node=CNode}) ->      % This is when we are stopping our self.
-    stop_inviso_at_c_node(CNode);
-terminate(_,#ld{c_node=CNode,nodes=NodesD,keep_nodes=KeepNodes}) ->
-    remove_all_trace_patterns(CNode,KeepNodes,get_all_nodenames_nodes(NodesD)),
-    stop_inviso_at_c_node(CNode).
-%% -----------------------------------------------------------------------------
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% =============================================================================
-%% Handler first level help functions.
-%% =============================================================================
-
-%% -----------------------------------------------------------------------------
-%% reconnect_nodes
-%% -----------------------------------------------------------------------------
-
-%% Help function reconnecting the nodes in Nodes. Listed nodes must be part of
-%% the set of nodes handled by the tool. It is not possible to reconnect a node
-%% that is not marked as down. This partly because we otherwise risk losing the
-%% trace_failure state (which can not be rediscovered).
-h_reconnect_nodes(local_runtime,LD=#ld{nodes=NodesD}) -> % Non-distributed.
-    case get_state_nodes(local_runtime,NodesD) of
-	down ->
-	    {ok,{local_runtime,[],start_runtime_components(local_runtime,LD)}};
-	_ ->                                   % Allready connected!
-	    {ok,{[],{error,already_connected},LD}}
-    end;
-h_reconnect_nodes(Nodes,LD=#ld{nodes=NodesD}) when is_list(Nodes) ->
-    {Nodes2,NodesErr}=
-	lists:foldl(fun(N,{Nodes2,NodesErr})->
-			    case get_state_nodes(N,NodesD) of
-				down ->        % Yes this node can be reconnected.
-				    {[N|Nodes2],NodesErr};
-				false ->       % Not part of the node-set!
-				    {Nodes2,[{N,{error,unknown_node}}|NodesErr]};
-				_ ->           % Allready connected!
-				    {Nodes2,[{N,{error,already_connected}}|NodesErr]}
-			    end
-		    end,
-		    {[],[]},
-		    Nodes),
-    LD2=start_runtime_components(Nodes2,LD),   % Inpect the #ld.nodes for result.
-    {ok,{Nodes2,NodesErr,LD2}};
-h_reconnect_nodes(Nodes,_LD) ->
-    {error,{badarg,Nodes}}.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% start_session
-%% -----------------------------------------------------------------------------
-
-%% Help function starting the tracing at all nodes. Note that the tracer data
-%% is calculated using a user defined function. This is how for instance the
-%% file names (of the log files) are determined.
-%% Before the nodes are initiated their (possibly remaining) trace patterns are
-%% cleared, both local and global.
-h_start_session(M,F,TDGargs,LD=#ld{c_node=CNode,nodes=NodesD,tracer_data=TDs}) ->
-    case get_inactive_running_nodes(NodesD) of
-	[] ->                               % There are no nodes to initiate!
-	    h_start_session_nonodes(TDGargs,LD,[]);
-	Nodes ->                            % List of nodes or 'local_runtime'.
-	    case h_start_session_ctp_all(CNode,Nodes) of
-		{ok,Errors,[]} ->           % Now no nodes to initiate!
-		    h_start_session_nonodes(TDGargs,LD,Errors);
-		{ok,Errors,Nodes2} ->       % Now these nodes are fresh.
-		    case call_tracer_data_generator(CNode,M,F,TDGargs,Nodes2) of
-			{ok,TracerList} ->  % Generated our tracerdata.
-			    case h_start_session_2(CNode,TracerList,Errors) of
-				{ok,ReturnValue} -> % Some nodes are initialized now.
-				    {NewNodesD,Nodes3}=
-					set_tracing_running_nodes(CNode,ReturnValue,NodesD),
-				    {SessionNr,NewTDs}=insert_td_tracer_data(TDGargs,TDs),
-				    {ok,{SessionNr,
-					 ReturnValue,
-					 Nodes3, % The nodes that shall get initial tracases.
-					 LD#ld{nodes=NewNodesD,tracer_data=NewTDs}}};
-				{error,Reason} ->
-				    {error,Reason}
-			    end;
-			{error,Reason} ->   % Faulty tracer data generator func.
-			    {error,{bad_tdg,Reason}}
-		    end;
-		{error,Reason} ->           % Error clearing patterns.
-		    {error,Reason}
-	    end
-    end.
-
-h_start_session_nonodes(TDGargs,LD=#ld{c_node=CNode,tracer_data=TDs},Errors) ->
-    {SessionNr,NewTDs}=insert_td_tracer_data(TDGargs,TDs),
-    if
-	CNode==undefined ->
-	    {ok,{SessionNr,[],LD#ld{tracer_data=NewTDs}}};
-	true ->
-	    {ok,{SessionNr,{ok,Errors},LD#ld{tracer_data=NewTDs}}}
-    end.
-
-%% Help function clearing all trace patterns on all nodes.
-h_start_session_ctp_all(CNode,Nodes) ->
-    case remove_all_trace_patterns(CNode,[],Nodes) of
-	ok ->                               % Non-distributed case1.
-	    {ok,[],local_runtime};
-	{error,Reason} ->                   % Non-distributed case2 and general failure.
-	    {error,Reason};
-	{ok,NodeResults} ->
-	    h_start_session_ctp_all_2(NodeResults,[],[])
-    end.
-
-h_start_session_ctp_all_2([{Node,{error,Reason}}|Rest],Errors,Nodes) ->
-    h_start_session_ctp_all_2(Rest,[{Node,{error,Reason}}|Errors],Nodes);
-h_start_session_ctp_all_2([{Node,_OkOrPatternsUntouched}|Rest],Errors,Nodes) ->
-    h_start_session_ctp_all_2(Rest,Errors,[Node|Nodes]);
-h_start_session_ctp_all_2([],Errors,Nodes) ->
-    {ok,Errors,Nodes}.
-
-%% Help function doing the actual init_tracing.
-h_start_session_2(undefined,TracerData,_Errors) -> % Non distributed case.
-    case inviso:init_tracing(TracerData) of
-	{ok,LogResult} when is_list(LogResult) ->
-	    {ok,{ok,LogResult}};
-	{error,already_initated} ->         % Perhaps adopted!?
-	    {ok,{error,already_initiated}}; % Not necessarily wrong.
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-h_start_session_2(CNode,TracerList,Errors) ->
-    case rpc:call(CNode,inviso,init_tracing,[TracerList]) of
-	{ok,NodeResults} ->
-	    {ok,{ok,Errors++NodeResults}};
-	{error,Reason} ->
-	    {error,Reason};
-	{badrpc,Reason} ->
-	    {error,{inviso_control_node_error,Reason}}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function starting all initial trace cases. They are actually handled
-%% the same way as user started trace cases. We actually only start initial
-%% tracecases at Nodes (if Nodes is a list of nodes). This because we may have
-%% adopted some nodes some already tracing nodes, and such are supposed to have
-%% the correct patterns and flags set.
-do_initial_tcs([{TC,Vars}|Rest],Nodes,LD) ->
-    Id=make_ref(),                          % Trace case ID.
-    case h_atc(TC,Id,Vars,LD,Nodes) of      % Start using regular start methods.
-	{ok,NewLD} ->                       % Trace case was successfully started.
-	    NewInitialTcs=add_initial_tcs(TC,Id,NewLD#ld.started_initial_tcs),
-	    do_initial_tcs(Rest,Nodes,NewLD#ld{started_initial_tcs=NewInitialTcs});
-	{error,_Reason} ->
-	    do_initial_tcs(Rest,Nodes,LD)
-    end;
-do_initial_tcs([_|Rest],Nodes,LD) ->
-    do_initial_tcs(Rest,Nodes,LD);
-do_initial_tcs([],_Nodes,LD) ->
-    LD.
-%% -----------------------------------------------------------------------------
-
-%% This help functio is used instead of do_initial_tcs/3 if there actually are no
-%% nodes to do the trace cases on. The reason we must have this function is that
-%% the tracecases must still be entered into the history with bindings and all.
-%% But we let them be marked as 'running' immediately (no need for the activator
-%% process).
-add_initial_tcs_to_history([{TC,Vars}|Rest],LD=#ld{tc_dict=TCdict,chl=CHL}) ->
-    case get_tracecase_tc_dict(TC,TCdict) of
-	{ok,TraceCase} ->
-	    case check_bindings(Vars,TraceCase) of
-		{ok,Bindings} ->
-		    Id=make_ref(),          % Trace case ID.
-		    FakeProcH=make_ref(),   % Need something to enter as activator.
-		    NewCHL=set_activating_chl(TC,Id,CHL,Bindings,FakeProcH),
-		    NewCHL2=set_running_chl(FakeProcH,TC,Id,void,NewCHL), % Result=void.
-		    NewInitialTcs=add_initial_tcs(TC,Id,LD#ld.started_initial_tcs),
-		    add_initial_tcs_to_history(Rest,LD#ld{chl=NewCHL2,
-							  started_initial_tcs=NewInitialTcs});
-		{error,_Reason} ->          % Not much we can do about that.
-		    add_initial_tcs_to_history(Rest,LD)
-	    end;
-	false ->
-	    add_initial_tcs_to_history(Rest,LD)
-    end;
-add_initial_tcs_to_history([],LD) ->
-    LD.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% reinitiate_session
-%% -----------------------------------------------------------------------------
-
-%% Function doing the reinitiation. That means first do init_tracing at the nodes
-%% in question. Then redo the command history to bring them up to speed.
-%% But first the runtime component is cleared of all trace patterns.
-h_reinitiate_session(Nodes,M,F,TDGargs,LD=#ld{c_node=CNode,nodes=NodesD}) ->
-    case h_reinitiate_session_2(Nodes,NodesD,CNode) of
-	{ok,{[],NodesErr}} ->               % No nodes to reinitiate.
-	    {ok,{NodesErr,{ok,[]},LD}};
-	{ok,{Nodes2,NodesErr}} ->           % List of nodes or local_runtime.
-	    case call_tracer_data_generator(CNode,M,F,TDGargs,Nodes2) of
-		{ok,TracerList} ->
-		    case h_start_session_2(CNode,TracerList,[]) of % Borrow from start_session.
-			{ok,ReturnValue} -> % Ok, now we must redo cmd history.
-			    {NewNodesD,_Nodes}=
-				set_tracing_running_nodes(CNode,ReturnValue,NodesD),
-			    NewLD=h_reinitiate_session_chl(Nodes2,LD#ld{nodes=NewNodesD}),
-			    {ok,{NodesErr,ReturnValue,NewLD}};
-			{error,Reason} ->
-			    {error,Reason}
-		    end;
-		{error,Reason} ->
-		    {error,{bad_tdg,Reason}}
-	    end;
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-
-%% Help function finding out which nodes in Nodes actually can be reinitiated.
-%% A node must be up, inactive and not suspended in order for this to work. All the
-%% rest is just a matter of how detailed error return values we want to generate.
-h_reinitiate_session_2(local_runtime,NodesD,undefined) -> % Non distributed case.
-    case get_state_nodes(local_runtime,NodesD) of
-	{inactive,running} ->               % Only ok case.
-	    case inviso:ctp_all() of
-		ok ->
-		    {ok,{local_runtime,[]}};
-		{error,Reason} ->           % This is strange.
-		    {error,Reason}
-	    end;
-	{_,suspended} ->
-	    {ok,{[],{error,suspended}}};
-	down ->
-	    {ok,{[],{error,down}}};
-	_ ->
-	    {ok,{[],{error,already_in_session}}}
-    end;
-h_reinitiate_session_2(Nodes,NodesD,CNode) when is_list(Nodes) ->
-    {ok,lists:foldl(fun(N,{Nodes2,NodesErr})->
-			    case get_state_nodes(N,NodesD) of
-				{inactive,running} -> % Only ok case.
-				    case rpc:call(CNode,inviso,ctp_all,[[N]]) of
-					{ok,[{N,ok}]} ->
-					    {[N|Nodes2],NodesErr};
-					{ok,[{N,{error,Reason}}]} ->
-					    {Nodes2,[{N,{error,Reason}}|NodesErr]};
-					{error,Reason} ->
-					    {Nodes2,[{N,{error,Reason}}|NodesErr]};
-					{badrpc,Reason} ->
-					    {Nodes2,[{N,{error,{badrpc,Reason}}}|NodesErr]}
-				    end;
-				{_,suspended} ->
-				    {Nodes2,[{N,{error,suspended}}|NodesErr]};
-				down ->
-				    {Nodes2,[{N,{error,down}}|NodesErr]};
-				false ->
-				    {Nodes2,[{N,{error,unknown_node}}|NodesErr]};
-				_ ->
-				    {Nodes2,[{N,{error,already_in_session}}|NodesErr]}
-			    end
-		    end,
-		    {[],[]},
-		    Nodes)};
-h_reinitiate_session_2(Nodes,_NodesD,_CNode) ->
-    {error,{badarg7,Nodes}}.
-
-%% Help function redoing the command history log at all nodes that actually
-%% started to trace. Note that we do not modify the return value which will be
-%% given to the caller just because we decide not to redo commands. The user
-%% must conclude him self from the inviso return value that commands were not
-%% redone at a particular node.
-h_reinitiate_session_chl(local_runtime,LD) ->
-    h_reinitiate_session_chl([local_runtime],LD);
-h_reinitiate_session_chl([Node|Rest],LD=#ld{nodes=NodesD}) ->
-    case get_state_nodes(Node,NodesD) of
-	{tracing,running} ->                % Only case when we shall redo!
-	    h_reinitiate_session_chl(Rest,redo_cmd_history(Node,LD));
-	_ ->                                % No redo of chl in other cases.
-	    h_reinitiate_session_chl(Rest,LD)
-    end;
-h_reinitiate_session_chl([],LD) ->
-    LD.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% restore_session
-%% -----------------------------------------------------------------------------
-
-%% Help function starting a session (init tracing) and redoes the history
-%% found in CHL.
-h_restore_session(MoreTDGargs,LD) ->
-    DateTime=calendar:universal_time(),
-    {M,F,Args}=LD#ld.tdg,
-    TDGargs=inviso_tool_lib:mk_tdg_args(DateTime,MoreTDGargs++Args),
-    case h_start_session(M,F,TDGargs,LD) of
-	{ok,{SessionNr,ReturnVal,NewLD}} ->   % There were no available nodes.
-	    {ok,{SessionNr,ReturnVal,NewLD}};
-	{ok,{SessionNr,ReturnVal,Nodes2,NewLD}} ->
-	    NewLD2=h_reinitiate_session_chl(Nodes2,NewLD),
-	    {ok,{SessionNr,ReturnVal,NewLD2}};
-	{error,Reason} ->                     % Risk of out of control.
-	    {error,Reason}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% stop_session
-%% -----------------------------------------------------------------------------
-
-%% Help function stopping tracing at tracing nodes.
-h_stop_session(#ld{c_node=CNode,nodes=NodesD,tracer_data=TDs}) ->
-    case h_stop_session_2(CNode,NodesD) of
-	{ok,Result} ->
-	    {ok,{get_latest_session_nr_tracer_data(TDs),Result}};
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-
-h_stop_session_2(undefined,NodesD) ->  % The non distributed case.
-    case get_tracing_nodes(NodesD) of
-	{up,{inactive,_}} ->           % Already not tracing!
-	    {ok,[]};
-	{up,_} ->
-	    case inviso:stop_tracing() of
-		{ok,_State} ->
-		    {ok,[ok]};
-		{error,no_response} ->
-		    {ok,[]};
-		{error,Reason} ->
-		    {error,Reason}
-	    end;
-	down ->
-	    {ok,[]}
-    end;
-h_stop_session_2(CNode,NodesD) ->
-    Nodes=get_tracing_nodes(NodesD),
-    case rpc:call(CNode,inviso,stop_tracing,[Nodes]) of
-	{ok,NodeResults} ->
-	    {ok,lists:map(fun({N,{ok,_}})->{N,ok};
-			     (NodeError)->NodeError
-			  end,
-			  NodeResults)};
-	{error,Reason} ->
-	    {error,Reason};
-	{badrpc,Reason} ->
-	    {error,{inviso_control_node_error,Reason}}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function removing any trace flags, trace patterns and meta trace patterns
-%% at Nodes. This will cause the nodes to become "fresh".
-h_reset_nodes(local_runtime,_CNode) ->
-    inviso:clear([keep_log_files]);
-h_reset_nodes(Nodes,CNode) ->
-    case inviso_tool_lib:inviso_cmd(CNode,clear,[Nodes,[keep_log_files]]) of
-	{ok,NodeResults} ->
-	    {ok,NodeResults};
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-%% -----------------------------------------------------------------------------
-
-
-%% -----------------------------------------------------------------------------
-%% atc
-%% -----------------------------------------------------------------------------
-
-%% Function handling ativating a trace case. Trace cases that do not have a
-%% particular on/off handling (but just on in some scense) are handled here too.
-%% The trace case is entered into the Command History Log.
-%% Note that the trace case can not be executed at this node but must be
-%% executed where the inviso control component is.
-%% Further it is possible to either activated the tracecase for all running and
-%% tracing nodes, or just for a specified list of nodes.
-%%  TC=tracecase_name(),
-%%  Id=term(), identifiying this usage so we can turn it off later.
-%%  Vars=list(), list of variable-value bindnings.
-h_atc(TC,Id,Vars,LD) ->
-    h_atc(TC,Id,Vars,LD,void).              % For all running-tracing nodes.
-
-h_atc(TC,Id,Vars,LD=#ld{c_node=CNode,tc_dict=TCdict,chl=CHL},Nodes) ->
-    case find_id_chl(TC,Id,CHL) of
-	activating ->                       % Already started.
-	    {error,activating};
-	stopping ->                         % Not yet stopped.
-	    {error,deactivating};
-	false ->
-	    case get_tracecase_tc_dict(TC,TCdict) of
-		{ok,TraceCase} ->           % Such a trace case exists.
-		    case check_bindings(Vars,TraceCase) of
-			{ok,Bindings} ->    % Necessary vars exists in Vars.
-			    if
-				is_list(Nodes) -> % Nodes predefined.
-				    h_atc_2(TC,Id,CNode,CHL,LD,TraceCase,Bindings,Nodes);
-				true ->     % Use all tracing and running nodes.
-				    Nodes1=get_nodenames_running_nodes(LD#ld.nodes),
-				    h_atc_2(TC,Id,CNode,CHL,LD,TraceCase,Bindings,Nodes1)
-			    end;
-			{error,Reason} ->   % Variable def missing.
-			    {error,Reason}
-		    end;
-		false ->
-		    {error,unknown_tracecase}
-	    end;
-	{ok,_Bindings} ->                   % Already activated and running.
-	    {error,already_started}
-    end.
-
-h_atc_2(TC,Id,CNode,CHL,LD,TraceCase,Bindings,Nodes) ->
-    {ok,ProcH} = exec_trace_case_on(CNode,TraceCase,Bindings,Nodes),
-    %% Trace cases have no return values.
-    NewCHL=set_activating_chl(TC,Id,CHL,Bindings,ProcH),
-    {ok,LD#ld{chl=NewCHL}}.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% sync_atc
-%% -----------------------------------------------------------------------------
-
-h_sync_atc(TC,Id,Vars,TimeOut,LD=#ld{c_node=CNode,tc_dict=TCdict,chl=CHL}) ->
-    case find_id_chl(TC,Id,CHL) of
-	activating ->                       % Already started.
-	    {error,activating};
-	stopping ->                         % Not yet stopped.
-	    {error,deactivating};
-	false ->
-	    case get_tracecase_tc_dict(TC,TCdict) of
-		{ok,TraceCase} ->           % Such a trace case exists.
-		    case check_bindings(Vars,TraceCase) of
-			{ok,Bindings} ->    % Necessary vars exists in Vars.
-			    {ok,TcFName}=get_tc_activate_fname(TraceCase),
-			    Nodes=get_nodenames_running_nodes(LD#ld.nodes),
-			    Bindings2=erl_eval:add_binding('Nodes',Nodes,Bindings),
-			    RpcNode=get_rpc_nodename(CNode),
-			    case rpc:call(RpcNode,file,script,[TcFName,Bindings2],TimeOut) of
-				{ok,Value} ->
-				    FakeProcH=make_ref(),
-				    NewCHL1=set_activating_chl(TC,Id,CHL,Bindings,FakeProcH),
-				    NewCHL2=set_running_chl(FakeProcH,TC,Id,Value,NewCHL1),
-				    {ok,LD#ld{chl=NewCHL2},Value};
-				{error,Reason} ->
-				    {error,{faulty_tracecase,{TcFName,Reason}}};
-				{badrpc,Reason} ->
-				    {error,{badrpc,Reason}}
-			    end;
-			{error,Reason} ->   % Variable def missing.
-			    {error,Reason}
-		    end;
-		false ->
-		    {error,unknown_tracecase}
-	    end;
-	{ok,_Bindings} ->                   % Already activated and running.
-	    {error,already_started}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% rtc
-%% -----------------------------------------------------------------------------
-
-%% Function handling running a trace case without marking it as activated. It
-%% is in the history mearly indicated as activated
-h_sync_rtc(TC,Vars,TimeOut,LD=#ld{c_node=CNode,tc_dict=TCdict,chl=CHL}) ->
-    case get_tracecase_tc_dict(TC,TCdict) of
-	{ok,TraceCase} ->                   % Such a trace case exists.
-	    case check_bindings(Vars,TraceCase) of
-		{ok,Bindings} ->            % Necessary vars exists in Vars.
-		    {ok,TcFName}=get_tc_activate_fname(TraceCase),
-		    Nodes=get_nodenames_running_nodes(LD#ld.nodes),
-		    Bindings2=erl_eval:add_binding('Nodes',Nodes,Bindings),
-		    RpcNode=get_rpc_nodename(CNode),
-		    case rpc:call(RpcNode,file,script,[TcFName,Bindings2],TimeOut) of
-			{ok,Value} ->
-			    {ok,LD#ld{chl=add_rtc_chl(TC,Bindings2,CHL)},Value};
-			{error,Reason} ->
-			    {error,{faulty_tracecase,{TcFName,Reason}}};
-			{badrpc,Reason} ->
-			    {error,{badrpc,Reason}}
-		    end;
-		{error,Reason} ->   % Variable def missing.
-		    {error,Reason}
-	    end;
-	false ->
-	    {error,unknown_tracecase}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% dtc
-%% -----------------------------------------------------------------------------
-
-%% Function handling turning a trace case off. The trace case must be registered
-%% as having an off mechanism. If it has an off mechanism and was previously entered
-%% into the Command History Log and is done with its activation phase, it will be
-%% executed and removed from the CHL.
-h_dtc(TC,Id,LD=#ld{c_node=CNode,tc_dict=TCdict,chl=CHL}) ->
-    case find_id_chl(TC,Id,CHL) of
-	{ok,Bindings} ->                    % Yes, we have turned it on before.
-	    case get_tracecase_tc_dict(TC,TCdict) of
-		{ok,TraceCase} ->
-		    Nodes=get_nodenames_running_nodes(LD#ld.nodes),
-		    case exec_trace_case_off(CNode,TraceCase,Bindings,Nodes) of
-			{ok,ProcH} ->
-			    NewCHL=set_stopping_chl(TC,Id,CHL,ProcH),
-			    {ok,LD#ld{chl=NewCHL}};
-			{error,Reason} ->
-			    {error,Reason}
-		    end;
-		false ->                    % Strange, Id ok but no such trace case.
-		    {error,unknown_tracecase}
-	    end;
-	false ->                            % Not previously turned on.
-	    {error,unknown_id};
-	activating ->
-	    {error,activating};
-	stopping ->
-	    {error,already_deactivating}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% sync_dtc
-%% -----------------------------------------------------------------------------
-
-h_sync_dtc(TC,Id,TimeOut,LD=#ld{c_node=CNode,tc_dict=TCdict,chl=CHL}) ->
-    case find_id_chl(TC,Id,CHL) of
-	{ok,Bindings} ->                    % Yes, we have turned it on before.
-	    case get_tracecase_tc_dict(TC,TCdict) of
-		{ok,TraceCase} ->
-		    case get_tc_deactivate_fname(TraceCase) of
-			{ok,TcFName} ->
-			    Nodes=get_nodenames_running_nodes(LD#ld.nodes),
-			    Bindings2=erl_eval:add_binding('Nodes',Nodes,Bindings),
-			    RpcNode=get_rpc_nodename(CNode),
-			    case rpc:call(RpcNode,file,script,[TcFName,Bindings2],TimeOut) of
-				{ok,Value} ->
-				    FakeProcH=make_ref(),
-				    NewCHL1=set_stopping_chl(TC,Id,CHL,FakeProcH),
-				    NewCHL2=nullify_chl(FakeProcH,TC,Id,NewCHL1),
-				    {ok,LD#ld{chl=NewCHL2},Value};
-				{error,Reason} -> % Script fault.
-				    {error,{faulty_tracecase,{TcFName,Reason}}};
-				{badrpc,Reason} ->
-				    {error,{badrpc,Reason}}
-			    end;
-			false ->
-			    {error,no_deactivation}
-		    end;
-		false ->                    % Strange, Id ok but no such trace case.
-		    {error,unknown_tracecase}
-	    end;
-	false ->                            % Not previously turned on.
-	    {error,unknown_id};
-	activating ->
-	    {error,activating};
-	stopping ->
-	    {error,already_deactivating}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% inviso
-%% -----------------------------------------------------------------------------
-
-%% Function executing one inviso command. The returnvalue from the inviso
-%% function call will be the return value to the client. The command is
-%% entered into the history command log.
-%% Note that the inviso call may have to be done at another node, dictated
-%% by the c_node field. Further, if the module name is not an atom it is
-%% most likely a regexp, which must be expanded at the regexp_node. Note
-%% this is only relevant for tp and tpl.
-h_inviso(Cmd,Args,LD=#ld{c_node=CNode,regexp_node=RegExpNode,chl=CHL}) ->
-    Arity=length(Args),
-    case check_proper_inviso_call(Cmd,Arity) of
-	{true,RegExpFlag} ->                % Yes it is an inviso call.
-	    Nodes=get_nodenames_running_nodes(LD#ld.nodes),
-	    case h_inviso_2(Cmd,Args,CNode,RegExpNode,RegExpFlag,Nodes) of
-		{ok,Result} ->
-		    case check_inviso_call_to_history(Cmd,Arity) of
-			true ->             % This function shall be added to chl.
-			    {ok,{Result,LD#ld{chl=add_inviso_call_chl(Cmd,Args,CHL)}}};
-			false ->            % Do not add it.
-			    {ok,{Result,LD}}
-		    end;
-		{error,Reason} ->
-		    {error,Reason}
-	    end;
-	false ->                            % Not an inviso function.
-	    {error,invalid_function_name}
-    end.
-
-h_inviso_2(Cmd,Args,undefined,_,_,_) ->     % A non distributed system.
-    case catch apply(inviso,Cmd,Args) of    % Regexp expansion only relevant when
-	{'EXIT',Reason} ->                  % distributed, here let inviso_rt expand.
-	    {error,{'EXIT',Reason}};
-	Result ->
-	    {ok,Result}
-    end;
-h_inviso_2(Cmd,Args,CNode,RegExpNode,RegExpFlag,Nodes) ->
-    case expand_module_regexps(Args,RegExpNode,Nodes,RegExpFlag) of
-	{ok,NewArgs} ->
-	    case catch inviso_tool_lib:inviso_cmd(CNode,Cmd,[Nodes|NewArgs]) of
-		{'EXIT',Reason} ->
-		    {error,{'EXIT',Reason}};
-		{error,{badrpc,Reason}} ->  % Includes runtime failure.
-		    {error,{badrpc,Reason}};
-		Result ->
-		    {ok,Result}
-	    end;
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% reactivate
-%% -----------------------------------------------------------------------------
-
-h_reactivate(_Node,undefined) ->            % The non-distributed case.
-    case inviso:cancel_suspension() of
-	ok ->
-	    ok;
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-h_reactivate(Node,CNode) ->
-    case inviso_tool_lib:inviso_cmd(CNode,cancel_suspension,[[Node]]) of
-	{ok,[{Node,ok}]} ->
-	    ok;
-	{ok,[{Node,{error,Reason}}]} ->
-	    {error,Reason};
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% save_history
-%% -----------------------------------------------------------------------------
-
-h_save_history(HDir,Dir,FileName,SortedLog) ->
-    Dir0=
-	if
-	    is_list(HDir) ->                   % There is a history dir specified.
-		HDir;                       % Use it then.
-	    true ->
-		Dir                         % Else use the tool dir.
-	end,
-    case catch make_absolute_path(FileName,Dir0) of
-	AbsFileName when is_list(AbsFileName) ->
-	    Log2=build_saved_history_data(SortedLog), % Remove stopped tracecases.
-	    case file:write_file(AbsFileName,term_to_binary(Log2)) of
-		ok ->
-		    {ok,AbsFileName};
-		{error,Reason} ->
-		    {error,{write_file,Reason}}
-	    end;
-	{'EXIT',_Reason} ->
-	    {error,{bad_filename,FileName}}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%%  get_autostart_data
-%% -----------------------------------------------------------------------------
-
-%% Help function building the structures used when exporting autostart information
-%% from the tool. Note that we remove the tool-dependency and insert the one
-%% specify in the get_autostart_data call.
-h_get_autostart_data(local_runtime,_,Dependency,ASD,M,F,TDGargs,OptsG) ->
-    CompleteTDGargs=call_tracer_data_generator_mkargs(local_runtime,TDGargs),
-    Opts0=start_runtime_components_mk_opts(local_runtime,OptsG),
-    Opts=[Dependency|lists:keydelete(dependency,1,Opts0)],
-    {ok,{ASD,{ok,{Opts,{tdg,{M,F,CompleteTDGargs}}}}}};
-
-h_get_autostart_data(Nodes,CNode,Dependency,ASD,M,F,TDGargs,OptsG) when is_list(Nodes) ->
-    {ok,{ASD,h_get_autostart_data_2(Nodes,CNode,Dependency,M,F,TDGargs,OptsG)}};
-h_get_autostart_data(Nodes,_CNode,_Dependency,_ASD,_M,_F,_TDGargs,_OptsG) ->
-    {error,{badarg,Nodes}}.
-
-h_get_autostart_data_2([Node|Rest],CNode,Dependency,M,F,TDGargs,OptsG) ->
-    CompleteTDGargs=call_tracer_data_generator_mkargs(Node,TDGargs),
-    Opts0=start_runtime_components_mk_opts(Node,OptsG),
-    Opts=[Dependency|lists:keydelete(dependency,1,Opts0)],
-    [{Node,{ok,{Opts,{tdg,{M,F,CompleteTDGargs}}}}}|
-     h_get_autostart_data_2(Rest,CNode,Dependency,M,F,TDGargs,OptsG)];
-h_get_autostart_data_2([],_CNode,_Dependency,_M,_F,_TDGargs,_OptsG) ->
-    [].
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% flush
-%% -----------------------------------------------------------------------------
-
-h_flush(undefined,_Nodes) ->
-    inviso:flush();
-h_flush(CNode,Nodes) ->
-    inviso_tool_lib:inviso_cmd(CNode,flush,[Nodes]).
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% tc_executer_reply
-%% -----------------------------------------------------------------------------
-
-%% Function handling that a trace case has completed its activation phase and
-%% shall now be marked in the Command History Log as running.
-h_tc_activation_done(ProcH,Result,LD=#ld{chl=CHL}) ->
-    case find_tc_executer_chl(ProcH,CHL) of
-	{activating,{TC,Id}} ->
-	    case Result of
-		{ok,Value} ->               % The trace case is successful activated.
-		    {ok,LD#ld{chl=set_running_chl(ProcH,TC,Id,Value,CHL)}};
-		{error,_} ->                % Then pretend it never happend :-)
-		    {ok,LD#ld{chl=del_tc_chl(ProcH,TC,Id,CHL)}} % Remove it.
-	    end;
-	_ ->                                % Where did this come from?
-	    {ok,LD}                         % Well just ignore it then.
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Function handling that a trace case has completed its stopping phase and
-%% shall now be nulled in the Command History Log (meaning that it will not
-%% be repeated in the event of a reactivation).
-h_tc_stopping_done(ProcH,Result,LD=#ld{chl=CHL}) ->
-    case find_tc_executer_chl(ProcH,CHL) of
-	{stopping,{TC,Id}} ->
-	    case Result of
-		{ok,_Result} ->             % _Result is returned from the tracecase.
-		    {ok,LD#ld{chl=nullify_chl(ProcH,TC,Id,CHL)}};
-		{error,_} ->                % This is difficult, is it still active?
-		    {ok,LD#ld{chl=nullify_chl(ProcH,TC,Id,CHL)}}
-	    end;
-	_ ->                                % Strange.
-	    {ok,LD}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% Terminate.
-%% -----------------------------------------------------------------------------
-
-%% Help function stopping the inviso control component. Does not return
-%% anything significant.
-stop_inviso_at_c_node(undefined) ->         % Non distributed case.
-    inviso:stop();
-stop_inviso_at_c_node(CNode) ->
-    rpc:call(CNode,inviso,stop,[]).
-%% -----------------------------------------------------------------------------
-
-%% Help function that removes all trace patterns from the nodes that are not
-%% marked as such were patterns shall be left after stopping of inviso.
-%% Returns {ok,NodeResult} or {error,Reason}. In the non-distributed case
-%% 'ok' is returned incase of success, ot 'patterns_untouched'.
-remove_all_trace_patterns(undefined,KeepNodes,_Nodes) ->
-    case KeepNodes of
-	undefined ->                        % No, remove patterns from localruntime.
-	    inviso:ctp_all();
-	_ ->
-	    patterns_untouched
-    end;
-remove_all_trace_patterns(CNode,KeepNodes,Nodes) ->
-    Nodes2=lists:filter(fun(N)->not(lists:member(N,KeepNodes)) end,Nodes),
-    case inviso_tool_lib:inviso_cmd(CNode,ctp_all,[Nodes2]) of
-	{ok,NodeResults} ->
-	    F=fun(N) ->
-		      case lists:member(N,KeepNodes) of
-			  true ->
-			      {N,patterns_untouched};
-			  false ->
-			      case lists:keysearch(N,1,NodeResults) of
-				  {value,Result} ->
-				      Result; % {Node,ok}
-				  false ->  % Extremely strange.
-				      {N,{error,general_error}}
-			      end
-		      end
-	      end,
-	    {ok,lists:map(F,Nodes)};
-	{error,{badrpc,Reason}} ->
-	    {error,{inviso_control_node_error,Reason}};
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% =============================================================================
-%% Second level help functions.
-%% =============================================================================
-
-%% Help function building a reply to a reconnection call based on which nodes
-%% where asked to be reconnected and which of those are actually now working.
-%% We actually make an effort to serve the return value in the same order as the
-%% nodes were mentioned in the original call (Nodes).
-build_reconnect_nodes_reply(local_runtime,local_runtime,_NodesErr,NodesD) ->
-    case get_state_nodes(local_runtime,NodesD) of
-	down ->
-	    {error,down};
-	{State,Status} ->
-	    {ok,{State,Status}}
-    end;
-build_reconnect_nodes_reply(local_runtime,_,NodesErr,_NodesD) ->
-    NodesErr;
-build_reconnect_nodes_reply([Node|Rest],Nodes2,NodesErr,NodesD) ->
-    case lists:member(Node,Nodes2) of
-	true ->                               % Ok, look in the #ld.nodes.
-	    case get_state_nodes(Node,NodesD) of
-		down ->                       % Somekind of failure, still down.
-		    [{Node,{error,down}}|
-		     build_reconnect_nodes_reply(Rest,Nodes2,NodesErr,NodesD)];
-		{State,Status} ->             % {State,Status}
-		    [{Node,{ok,{State,Status}}}|
-		     build_reconnect_nodes_reply(Rest,Nodes2,NodesErr,NodesD)]
-	    end;
-	false ->                              % Error already from the beginning.
-	    {value,{_,Error}}=lists:keysearch(Node,1,NodesErr),
-	    [{Node,Error}|build_reconnect_nodes_reply(Rest,Nodes2,NodesErr,NodesD)]
-    end;
-build_reconnect_nodes_reply([],_,_,_) ->
-    [].
-%% -----------------------------------------------------------------------------
-
-%% Help function building a return value to reinitiate_session. Nodes contains
-%% all involved nodes. If the node occurrs in NodesErr, we choose the error in
-%% NodesErr. Otherwise the returnvalue in ReturnVal is used.
-build_reinitiate_session_reply(Nodes,NodesErr,{ok,NodesResults}) ->
-    {ok,build_reinitiate_session_reply_2(Nodes,NodesErr,NodesResults)};
-build_reinitiate_session_reply(local_runtime,[],NodeResult) ->
-    NodeResult;
-build_reinitiate_session_reply(local_runtime,NodesErr,_NodeResult) ->
-    NodesErr.
-build_reinitiate_session_reply_2([Node|Rest],NodesErr,NodeResults) ->
-    case lists:keysearch(Node,1,NodesErr) of
-	{value,{_,Error}} ->
-	    [{Node,Error}|build_reinitiate_session_reply_2(Rest,NodesErr,NodeResults)];
-	false ->
-	    case lists:keysearch(Node,1,NodeResults) of
-		{value,Value} ->
-		    [Value|build_reinitiate_session_reply_2(Rest,NodesErr,NodeResults)]
-	    end
-    end;
-build_reinitiate_session_reply_2([],_NodesErr,_NodeResults) ->
-    [].
-%% -----------------------------------------------------------------------------
-
-%% Help function returning a history log where stop and stopping entries have
-%% been removed. Further all tracecase log entries must be set to running since
-%% there can not be such a thing as an activating tracecase stored away in a
-%% saved historyfile!
-%% We must also take away any #Ref.
-build_saved_history_data(SortedLog) ->
-    CleanedLog=
-	lists:filter(fun({_,_,Stop,_}) when Stop==stop;Stop==stopping -> false;
-			(_) -> true
-		     end,
-		     SortedLog),
-    lists:map(fun({{TC,Id},C,activating,B}) -> {{TC,Id},C,running,B};
-		 ({{TC,Id},C,S,B}) -> {{TC,Id},C,S,B};
-		 ({{M,F,Args,_Ref},C}) -> {{M,F,Args},C};
-		 ({{TC,_Ref},C,B}) -> {TC,C,B} % An rtc.
-	      end,
-	      CleanedLog).
-%% -----------------------------------------------------------------------------
-    
-%% This help function builds the AutoStartData structure which is returned from
-%% get_austostart_data. An AutoStartData structure is a list of trace-files and
-%% inviso commands. The order is significant since it is the idea that doing
-%% the trace case files and inviso commands in that order will bring a node to
-%% a certain state in a trace perspective.
-%% Returns {ok,AutoStartData} or {error,Reason}
-build_autostart_data(SortedLog,TCdict) ->
-    build_autostart_data_2(SortedLog,TCdict,[]).
-
-build_autostart_data_2([{_,_C,Stop,_B}|Rest],TCdict,Accum) when Stop==stop;Stop==stopping->
-    build_autostart_data_2(Rest,TCdict,Accum); % Simply skip deactivated/deativating.
-build_autostart_data_2([{{TCname,_},_C,activating,Bindings}|Rest],TCdict,Accum) ->
-    build_autostart_data_tc(TCname,Bindings,TCdict,Rest,Accum);
-build_autostart_data_2([{{TCname,_},_C,running,Bindings}|Rest],TCdict,Accum) ->
-    build_autostart_data_tc(TCname,Bindings,TCdict,Rest,Accum);
-build_autostart_data_2([{{TCname,_Ref},_C,Bindings}|Rest],TCdict,Accum) ->
-    build_autostart_data_tc(TCname,Bindings,TCdict,Rest,Accum);
-build_autostart_data_2([{{M,F,Args,_Ref},_C}|Rest],TCdict,Accum) ->
-    build_autostart_data_2(Rest,TCdict,[{mfa,{M,F,Args}}|Accum]);
-build_autostart_data_2([],_TCdict,Accum) ->
-    {ok,lists:reverse(Accum)}.
-
-%% Help function placing the filename in the AutoStartData structure.    
-build_autostart_data_tc(TCname,Bindings,TCdict,Rest,Accum) ->
-    {ok,TC}=get_tracecase_tc_dict(TCname,TCdict),
-    {ok,FName}=get_tc_activate_fname(TC),
-    build_autostart_data_2(Rest,TCdict,[{file,{FName,Bindings}}|Accum]).
-%% -----------------------------------------------------------------------------
-
-%% Help function generating tracerdata to init inviso tracing. The generation
-%% is done by the TracerDataGenerator, TDG, function.
-%% Individual tracerdata is generated for each node in Nodes.
-%% Returns {ok,TracerData} or {error,Reason}.
-call_tracer_data_generator(undefined,M,F,TDGargs,_Nodes) -> % Non distributed.
-    case catch call_tracer_data_generator_3(M,F,TDGargs,local_runtime) of
-	{'EXIT',Reason} ->
-	    {error,{'EXIT',Reason}};
-	TracerData ->
-	    {ok,TracerData}
-    end;
-call_tracer_data_generator(_CNode,M,F,TDGargs,Nodes) ->
-    case catch call_tracer_data_generator_2(M,F,TDGargs,Nodes) of
-	{'EXIT',Reason} ->
-	    {error,{'EXIT',Reason}};
-	TracerList ->
-	    {ok,TracerList}
-    end.
-
-call_tracer_data_generator_2(M,F,TDGargs,[Node|Rest]) ->
-    [{Node,call_tracer_data_generator_3(M,F,TDGargs,Node)}|
-     call_tracer_data_generator_2(M,F,TDGargs,Rest)];
-call_tracer_data_generator_2(_,_,_,[]) ->
-    [].
-
-call_tracer_data_generator_3(M,F,TDGargs,Node) ->
-    apply(M,F,call_tracer_data_generator_mkargs(Node,TDGargs)).
-
-%% This function creates the arguments that the tracer data generator function
-%% accepts (in an apply call). The reason for making it a sepparate function is
-%% that the arguments are constructed in more situations than just when actually
-%% doing the apply. By having a function it will become obvious where to change
-%% should the arguments change.
-call_tracer_data_generator_mkargs(Node,TDGargs) ->
-    inviso_tool_lib:mk_complete_tdg_args(Node,TDGargs).
-%% -----------------------------------------------------------------------------
-
-%% This function acts as standard options generator function. That is returning
-%% the options argument to inviso:add_node/3. Note that this function must not
-%% return the dependency part of that option.
-std_options_generator(_Node) ->
-    [].                                     % No particular options(!)
-%% -----------------------------------------------------------------------------
-
-
-%% Help function checking that Vars contains a binding for every variable
-%% listed in the VarNames field in TraceCase. Note that the special variable 'Nodes'
-%% is disregarded, since it is always added by the inviso_tool.
-%% Returns {ok,Bindings} or {error,Reason}. Where Bindings is a bindngs structure
-%% according to file:eval functionality.
-check_bindings(Vars,TraceCase) ->
-    case catch check_bindings_2(Vars,
-				get_tc_varnames(TraceCase),
-				erl_eval:new_bindings()) of
-	{'EXIT',_Reason} ->
-	    {error,variable_error};
-	{error,Reason} ->                   % Missing a bindning.
-	    {error,Reason};
-	{ok,Bindings} ->
-	    {ok,Bindings}
-    end.
-
-check_bindings_2(Vars,['Nodes'|Rest],Bindings) ->
-    check_bindings_2(Vars,Rest,Bindings);   % Disregard Nodes since it is automatic.
-check_bindings_2(Vars,[VarName|Rest],Bindings) ->
-    case lists:keysearch(VarName,1,Vars) of
-	{value,{_,Val}} ->
-	    check_bindings_2(Vars,Rest,erl_eval:add_binding(VarName,Val,Bindings));
-	false ->                            % Mandatory variable missing.
-	    {error,{missing_variable,VarName}} % Quite here then.
-    end;
-check_bindings_2(_,[],Bindings) ->
-    {ok,Bindings}.
-%% -----------------------------------------------------------------------------
-
-%% This help function checks that the command the user tries to do is amongst
-%% the inviso API. It at the same time returns what kind of command it is.
-%% {true,RegExpFlag} or 'false' where RegExpFlag indicates if this command
-%% needs to have its argument modified by module regexp expansion or not.
-check_proper_inviso_call(Cmd,Arity) ->
-    case lists:member({Cmd,Arity},?INVISO_CMDS) of
-	true ->                             % It is part of inviso API.
-	    {true,check_proper_inviso_call_regexp(Cmd,Arity)};
-	false ->
-	    false
-    end.
-
-%% Returns {Type,Arity,PlaceOfModuleSpec} or 'false'.
-check_proper_inviso_call_regexp(tp,5) -> {tp,5,1};
-check_proper_inviso_call_regexp(tp,4) -> {tp,4,1};
-check_proper_inviso_call_regexp(tp,1) -> {tp,1,1};
-check_proper_inviso_call_regexp(tpl,5) -> {tp,5,1};
-check_proper_inviso_call_regexp(tpl,4) -> {tp,4,1};
-check_proper_inviso_call_regexp(tpl,1) -> {tp,1,1};
-check_proper_inviso_call_regexp(ctp,3) -> {ctp,3,1};
-check_proper_inviso_call_regexp(ctp,1) -> {ctp,1,1};
-check_proper_inviso_call_regexp(ctpl,3) -> {ctp,3,1};
-check_proper_inviso_call_regexp(ctpl,1) -> {ctp,1,1};
-check_proper_inviso_call_regexp(_,_) ->      % No regexp expansion.
-    false.
-%% -----------------------------------------------------------------------------
-
-%% Help function checking if this inviso command shall be added to the command
-%% history log. Returns true or false.
-check_inviso_call_to_history(Cmd,Arity) ->
-    case lists:member({Cmd,Arity},?INVISO_CMD_HISTORY) of
-	true ->
-	    true;
-	false ->
-	    false
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function traversing the arguments and expanding module names stated
-%% as regular expressions. This means that the resulting arguments may be longer
-%% than the orginal ones.
-%% When we run this function it has been determined that we are a distributed
-%% system.
-%% Also note that if there are no regexps in Args, no regexpansion will be
-%% made and RegExpNode may be 'undefined' (as it is if not set at start-up).
-%% If RegExpNode is unavailable the nodes found in Nodes will be used until
-%% one that works is found.
-expand_module_regexps(Args,_RegExpNode,_Nodes,false) ->
-    {ok,Args};
-expand_module_regexps([PatternList],RegExpNode,Nodes,{tp,1,1}) ->
-    case catch expand_module_regexps_tp(PatternList,RegExpNode,Nodes) of
-	NewPatternList when is_list(NewPatternList) ->
-	    {ok,[NewPatternList]};
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-expand_module_regexps([PatternList],RegExpNode,Nodes,{ctp,1,1}) ->
-    case catch expand_module_regexps_ctp(PatternList,RegExpNode,Nodes) of
-	NewPatternList when is_list(NewPatternList) ->
-	    {ok,[NewPatternList]};
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-expand_module_regexps([M,F,Arity,MS,Opts],RegExpNode,Nodes,{tp,5,1}) ->
-    expand_module_regexps([[{M,F,Arity,MS,Opts}]],RegExpNode,Nodes,{tp,1,1});
-expand_module_regexps([M,F,Arity,MS],RegExpNode,Nodes,{tp,4,1}) ->
-    expand_module_regexps([[{M,F,Arity,MS,[]}]],RegExpNode,Nodes,{tp,1,1});
-expand_module_regexps([M,F,Arity],RegExpNode,Nodes,{ctp,3,1}) ->
-    expand_module_regexps([[{M,F,Arity}]],RegExpNode,Nodes,{ctp,1,1}).
-
-
-expand_module_regexps_tp([E={M,_,_,_,_}|Rest],RegExpNode,Nodes) when is_atom(M) ->
-    [E|expand_module_regexps_tp(Rest,RegExpNode,Nodes)];
-expand_module_regexps_tp([{M,F,Arity,MS,Opts}|Rest],RegExpNode,Nodes) when is_list(M);is_tuple(M) ->
-    case inviso_tool_lib:expand_module_names([RegExpNode],
-					     M,
-					     [{expand_only_at,RegExpNode}]) of
-	{singlenode_expansion,Modules} ->
-	    expand_module_regexps_tp_2(Modules,F,Arity,MS,Opts,Rest,RegExpNode,Nodes);
-	{error,{faulty_node,RegExpNode}} ->    % RegExpNode probably down.
-	    case Nodes of
-		[NewRegExpNode|RestNodes] ->   % Ok, just choose a node.
-		    expand_module_regexps_tp([{M,F,Arity,MS,Opts}|Rest],NewRegExpNode,RestNodes);
-		[] ->                          % No more nodes to choose from.
-		    throw({error,no_available_regexpnode})
-	    end;
-	{error,_Reason} ->
-	    expand_module_regexps_tp(Rest,RegExpNode,Nodes)
-    end;
-expand_module_regexps_tp([_|Rest],RegExpNode,Nodes) ->
-    expand_module_regexps_tp(Rest,RegExpNode,Nodes); % Skip faulty module specification.
-expand_module_regexps_tp([],_RegExpNodes,_Nodes) ->
-    [].
-
-expand_module_regexps_tp_2([M|MRest],F,Arity,MS,Opts,Rest,RegExpNode,Nodes) ->
-    [{M,F,Arity,MS,Opts}|
-     expand_module_regexps_tp_2(MRest,F,Arity,MS,Opts,Rest,RegExpNode,Nodes)];
-expand_module_regexps_tp_2([],_,_,_,_,Rest,RegExpNode,Nodes) ->
-    expand_module_regexps_tp(Rest,RegExpNode,Nodes).
-
-expand_module_regexps_ctp([E={M,_,_}|Rest],RegExpNode,Nodes) when is_atom(M) ->
-    [E|expand_module_regexps_ctp(Rest,RegExpNode,Nodes)];
-expand_module_regexps_ctp([{M,F,Arity}|Rest],RegExpNode,Nodes) when is_list(M);is_tuple(M) ->
-    case inviso_tool_lib:expand_module_names([RegExpNode],
-					     M,
-					     [{expand_only_at,RegExpNode}]) of
-	{singlenode_expansion,Modules} ->
-	    expand_module_regexps_ctp_2(Modules,F,Arity,Rest,RegExpNode,Nodes);
-	{error,_Reason} ->
-	    expand_module_regexps_ctp(Rest,RegExpNode,Nodes)
-    end;
-expand_module_regexps_ctp([_|Rest],RegExpNode,Nodes) ->
-    expand_module_regexps_tp(Rest,RegExpNode,Nodes); % Skip faulty module specification.
-expand_module_regexps_ctp([],_RegExpNodes,_Nodes) ->
-    [].
-
-expand_module_regexps_ctp_2([M|MRest],F,Arity,Rest,RegExpNode,Nodes) ->
-    [{M,F,Arity}|expand_module_regexps_ctp_2(MRest,F,Arity,Rest,RegExpNode,Nodes)];
-expand_module_regexps_ctp_2([],_,_,Rest,RegExpNode,Nodes) ->
-    expand_module_regexps_ctp(Rest,RegExpNode,Nodes).
-%% -----------------------------------------------------------------------------
-
-
-
-%% Help function running the activation of a trace case. Note that this must
-%% be done at the inviso control component's Erlang node *and* that it must be
-%% done in its own process since there is no telling for how long a trace case
-%% may run.
-%% Returns {ok,ActivationHandler}.
-exec_trace_case_on(CNode,TraceCase,Bindings,Nodes) ->
-    {ok,TcFName}=get_tc_activate_fname(TraceCase),
-    {ok,exec_trace_case_2(CNode,
-			  TcFName,
-			  erl_eval:add_binding('Nodes',Nodes,Bindings),
-			  activating)}.
-
-%% Help function running the deactivation of a trace case.
-exec_trace_case_off(CNode,TraceCase,Bindings,Nodes) ->
-    case get_tc_deactivate_fname(TraceCase) of
-	{ok,TcFName} ->                     % There is a deactivation.
-	    {ok,exec_trace_case_2(CNode,
-				  TcFName,
-				  erl_eval:add_binding('Nodes',Nodes,Bindings),
-				  stopping)};
-	false ->
-	    {error,no_deactivation}
-    end.
-
-exec_trace_case_2(CNode,TcFName,Bindings,Phase) ->
-    if
-	CNode==undefined ->                 % The non distributed case.
-	    spawn_link(?MODULE,tc_executer,[TcFName,Bindings,Phase,self()]);
-	true ->
-	    spawn_link(CNode,?MODULE,tc_executer,[TcFName,Bindings,Phase,self()])
-    end.
-
-%% This function is run in its own process and is responsible for executing
-%% the trace case.
-tc_executer(TcFName,Bindings,Phase,Parent) ->
-    case catch file:script(TcFName,Bindings) of
-	{ok,Value} ->
-	    tc_executer_reply(Parent,{Phase,self(),{ok,Value}});
-	{'EXIT',Reason} ->
-	    tc_executer_reply(Parent,{Phase,self(),{error,{'EXIT',Reason}}});
-	Error ->
-	    tc_executer_reply(Parent,{Phase,self(),Error})
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function which starts a reactivator process redoing command history at
-%% Node. It also updates the loopdata to indicate that Node is now in state
-%% reactivating. It is a good idea to only handle one node per reactivator process.
-%% This because if the node terminates and comes back up, the reactivator must be
-%% stopped.
-redo_cmd_history(Node,LD=#ld{c_node=CNode,tc_dict=TCdict,chl=CHL,nodes=NodesD}) ->
-    P=start_reactivator(Node,CNode,TCdict,CHL),
-    LD#ld{nodes=set_reactivating_nodes(Node,NodesD),
-	  reactivators=add_reactivators(Node,P,LD#ld.reactivators)}.
-
-%% Help function starting a reactivator process replaying the command history log.
-%% Returns a pid of the reactivator process.
-start_reactivator(Node,CNode,TCdict,CHL) ->
-    UnsortedLog=get_loglist_chl(CHL),       % Must fetch here, later on wrong node.
-    if
-	CNode==undefined ->                 % The non-distributed case.
-	    spawn_link(?MODULE,
-		       reactivator_executer,
-		       [Node,TCdict,UnsortedLog,self(),0,[]]);
-	true ->
-	    spawn_link(CNode,
-		       ?MODULE,
-		       reactivator_executer,
-		       [Node,TCdict,UnsortedLog,self(),0,[]])
-    end.
-
-%% The strategy is to traverse the CHL ETS table in Counter order, redoing the
-%% commands one by one. We wait until one command is finished until we do the
-%% next. Commands marked as nullified are not performed. In fact when a command
-%% is nullified only the stop will be found in the CHL. Its activation will be
-%% removed.
-reactivator_executer(Node,TCdict,UnsortedLog,TPid,StartCounter,DoneCases) ->
-    SortedLog=lists:keysort(2,UnsortedLog), % Sort on Counter, oldest first.
-    Log=reactivator_skip_log_entries(SortedLog,StartCounter),
-    case reactivator_executer_2(Node,TCdict,TPid,StartCounter,DoneCases,Log) of
-	done ->
-	    true;                           % Simply terminate the reactivator then.
-	{more,{NewStartCounter,NewDoneCases,NewUnsortedLog}} ->
-	    reactivator_executer(Node,TCdict,NewUnsortedLog,TPid,NewStartCounter,NewDoneCases)
-    end.
-
-reactivator_executer_2(Node,TCdict,TPid,_Counter,DoneCases,
-		       [{{TCname,Id},NextC,running,Bindings}|Rest]) ->
-    reactivator_executer_3(Node,TCdict,TPid,DoneCases,Rest,TCname,Id,NextC,Bindings,Rest);
-reactivator_executer_2(Node,TCdict,TPid,_Counter,DoneCases,
-		       [{{TCname,_Ref},NextC,Bindings}|Rest]) ->
-    reactivator_executer_rtc(Node,TCdict,TPid,DoneCases,Rest,TCname,NextC,Bindings,Rest);
-reactivator_executer_2(Node,TCdict,TPid,_Counter,DoneCases,
-		       [{{TCname,Id},NextC,activating,Bindings}|Rest]) ->
-    reactivator_executer_3(Node,TCdict,TPid,DoneCases,Rest,TCname,Id,NextC,Bindings,Rest);
-reactivator_executer_2(Node,TCdict,TPid,_Counter,DoneCases,
-		       [{{M,F,Args,_Ref},NextC}|Rest]) ->
-    reactivator_executer_cmd(Node,M,F,Args),
-    reactivator_executer_2(Node,TCdict,TPid,NextC,DoneCases,Rest);
-reactivator_executer_2(Node,TCdict,TPid,_Counter,DoneCases,
-		       [{{_TCname,_Id},NextC,stopping,_Bindings}|Rest]) ->
-    reactivator_executer_2(Node,TCdict,TPid,NextC,DoneCases,Rest);
-reactivator_executer_2(Node,TCdict,TPid,_Counter,DoneCases,
-		       [{{TCname,Id,_Ref},NextC,stop,Bindings}|Rest]) ->
-    case lists:member({TCname,Id},DoneCases) of
-	true ->                             % We have activated it, must stop then.
-	    case get_tracecase_tc_dict(TCname,TCdict) of
-		{ok,{_,_,_,_,FNameOff}} ->
-		    reactivator_executer_tc(Node,Bindings,FNameOff),
-		    NewDoneCases=lists:delete({TCname,Id},DoneCases),
-		    reactivator_executer_2(Node,TCdict,TPid,NextC,NewDoneCases,Rest);
-		{ok,_} ->                   % No stop-filename, strange!
-		    reactivator_executer_2(Node,TCdict,TPid,NextC,DoneCases,Rest);
-		false ->                    % Even stranger, does not exist!?
-		    reactivator_executer_2(Node,TCdict,TPid,NextC,DoneCases,Rest)
-	    end;
-	false ->                            % Never activated in the first place.
-	    reactivator_executer_2(Node,TCdict,TPid,NextC,DoneCases,Rest)
-    end;
-%% Done all log entries found this lap. See if there are more entries by now.
-reactivator_executer_2(_Node,_TCdict,TPid,Counter,DoneCases,[]) ->
-    case reactivator_reply(TPid,Counter) of % Ask the tool process for more entries.
-	done ->                             % No more entries in the CHL.
-	    done;
-	{more,NewUnsortedLog} ->            % Repeat the procedure
-	    {more,{Counter+1,DoneCases,NewUnsortedLog}} % with log entries from Counter+1.
-    end.
-
-%% This help function activates a tracecase.
-reactivator_executer_3(Node,TCdict,TPid,DoneCases,Rest,TCname,Id,NextC,Bindings,Rest) ->
-    case get_tracecase_tc_dict(TCname,TCdict) of
-	{ok,{_,_,_,FNameOn}} ->             % A case with just on functionality.
-	    reactivator_executer_tc(Node,Bindings,FNameOn),
-	    reactivator_executer_2(Node,TCdict,TPid,NextC,[{TCname,Id}|DoneCases],Rest);
-	{ok,{_,_,_,FNameOn,_}} ->
-	    reactivator_executer_tc(Node,Bindings,FNameOn),
-	    reactivator_executer_2(Node,TCdict,TPid,NextC,[{TCname,Id}|DoneCases],Rest);
-	false ->                            % Strange, does not exist anylonger!?
-	    reactivator_executer_2(Node,TCdict,TPid,NextC,DoneCases,Rest)
-    end.
-
-%% Help function executing a trace case in the reactivators context. Does not
-%% return anything significant.
-reactivator_executer_tc(Node,Bindings,FileName) ->
-    catch file:eval(FileName,erl_eval:add_binding('Nodes',[Node],Bindings)).
-
-%% Help function handling trace case that are simply executed - rtc.
-reactivator_executer_rtc(Node,TCdict,TPid,DoneCases,Rest,TCname,NextC,Bindings,Rest) ->
-    case get_tracecase_tc_dict(TCname,TCdict) of
-	{ok,{_,_,_,FNameOn}} ->             % A case with just on functionality.
-	    reactivator_executer_tc(Node,Bindings,FNameOn),
-	    reactivator_executer_2(Node,TCdict,TPid,NextC,DoneCases,Rest);
-	{ok,{_,_,_,FNameOn,_}} ->
-	    reactivator_executer_tc(Node,Bindings,FNameOn),
-	    reactivator_executer_2(Node,TCdict,TPid,NextC,DoneCases,Rest);
-	false ->                            % Strange, does not exist anylonger!?
-	    reactivator_executer_2(Node,TCdict,TPid,NextC,DoneCases,Rest)
-    end.
-
-reactivator_executer_cmd(nonode@nohost,M,F,Args) ->
-    catch apply(M,F,Args);                  % Non-distributed.
-reactivator_executer_cmd(Node,M,F,Args) ->
-    catch apply(M,F,[[Node]|Args]).
-
-%% Help function returning a list of log entries missing the first entries
-%% having a counter less or equal to C1.
-reactivator_skip_log_entries([{_,C,_,_}|Rest],C1) when C<C1 ->
-    reactivator_skip_log_entries(Rest,C1);
-reactivator_skip_log_entries([{_,C}|Rest],C1) when C<C1 ->
-    reactivator_skip_log_entries(Rest,C1);
-reactivator_skip_log_entries(Log,_) ->
-    Log.
-%% -----------------------------------------------------------------------------
-
-%% Help function returning the node name to use in an rpc call.
-get_rpc_nodename(undefined) ->
-    node();
-get_rpc_nodename(CNode) ->
-    CNode.
-%% -----------------------------------------------------------------------------
-
-mk_rt_tag() ->
-    inviso_tool.
-%% -----------------------------------------------------------------------------
-
-is_string([C|Rest]) when C>=32, C=<255 ->
-    is_string(Rest);
-is_string([]) ->
-    true;
-is_string(_) ->
-    false.
-%% -----------------------------------------------------------------------------
-
-	    
-%% -----------------------------------------------------------------------------
-%% Functions for handling the configuration file.
-%% -----------------------------------------------------------------------------
-
-%% The inviso tool is configured via start arguments and/or a configuration file.
-%% Start arguments will override any definitions in a configuration file.
-%% The configuration file is pointed out by either a start argument or the
-%% inviso application parameter 'inviso_tool_config_file'.
-
-%% Help function building the internal configuration structure. Configurations
-%% in the start argument will override parameters found in a configuration file.
-fetch_configuration(Config) ->
-    case fetch_config_filename(Config) of
-	{ok,FName} ->                       % We are supposed to use a conf-file.
-	    case read_config_file(FName) of
-		{ok,LD} ->                  % Managed to open a file.
-		    NewLD=read_config_list(LD,Config),
-		    {ok,NewLD};
-		Error = {error,_Reason} ->          % Problem finding/opening file.
-		    Error
-	    end;
-	false ->                            % No filename specified.
-	    LD=read_config_list(#ld{},Config),
-	    {ok,LD}
-    end.
-
-%% Help function determining the name of the file which shall be consulted as
-%% the main configuration file.
-%% Returns {ok,FileName} or 'false'. The latter if no name could be determined.
-fetch_config_filename(Config) ->
-    case catch lists:keysearch(config_file,1,Config) of
-	{value,{_,FName}} when is_list(FName) ->
-	    {ok,FName};
-	_ ->                                % No filename in the start argument.
-	    fetch_config_filename_2()
-    end.
-
-fetch_config_filename_2() ->
-    case application:get_env(inviso_tool_config_file) of
-	{ok,FName} when is_list(FName) ->
-	    {ok,FName};
-	_ ->                                % Application parameter not specified.
-	    false                           % Means no config file will be used.
-    end.
-
-%% Help function reading the configuration file. Returns a #conf or {error,Reason}.
-read_config_file(FName) ->
-    case catch file:consult(FName) of
-	{ok,Terms} ->
-	    {ok,read_config_list(#ld{},Terms)};
-	{error,Reason} ->
-	    {error,{file_consult,Reason}};
-	{'EXIT',Reason} ->
-	    {error,{failure,Reason}}
-    end.
-
-%% Help function traversing the Terms list entering known tag-values into #ld.
-read_config_list(LD,Terms) ->
-    LD#ld{
-      nodes = case mk_nodes(proplists:get_value(nodes,Terms,LD#ld.nodes)) of 
-		  {ok,Nodes} -> Nodes;
-		  _ -> LD#ld.nodes
-	      end,
-      c_node = proplists:get_value(c_node,Terms,LD#ld.c_node), % atom8)
-      regexp_node = proplists:get_value(regexp_node,Terms,LD#ld.regexp_node), % atom()
-      tc_def_file = proplists:get_value(tc_def_file,Terms,LD#ld.tc_def_file),
-      tdg = proplists:get_value(tdg,Terms,LD#ld.tdg),
-      debug = proplists:get_value(debug,Terms,LD#ld.debug),
-      initial_tcs = proplists:get_value(initial_tcs,Terms,LD#ld.initial_tcs),
-      dir = proplists:get_value(dir,Terms,LD#ld.dir),
-      optg = proplists:get_value(optg,Terms,LD#ld.optg)
-     }.
-
-%% -----------------------------------------------------------------------------
-
-
-%% Help function which, if it exists, consults the trace definition file. The
-%% idea behind the trace definition file is to point out which trace cases there
-%% are, where to find them and how to turn them on and off.
-%% Trace case definitions are:
-%% {TCname,Type,VariableNameList,ActivatioFileName} |
-%%     {TCname,Type,VariableNameList,ActivationFileName,DeactivationFileName}
-%%   TCname=atom()
-%%   Type=on | on_off
-%%   VariableNameList=[atom(),...]
-%%   ActivationFileName=DeactivationFileName=string()
-read_trace_case_definitions(LD) ->
-    case LD#ld.tc_def_file of
-	TCfileName when is_list(TCfileName) ->
-	    case catch file:consult(TCfileName) of
-		{ok,Terms} ->
-		    Dir=LD#ld.dir,          % The working directory of the tool.
-		    TCdict=read_trace_case_definitions_2(Terms,Dir,mk_tc_dict()),
-		    LD#ld{tc_dict=TCdict};
-		_ ->
-		    LD
-	    end;
-	_ ->
-	    LD
-    end.
-
-read_trace_case_definitions_2([{TCname,on,VarNames,FName}|Rest],Dir,TCdict) ->
-    FileName=make_absolute_path(FName,Dir),
-    read_trace_case_definitions_2(Rest,
-				  Dir,
-				  insert_tracecase_tc_dict(TCname,
-							   on,
-							   VarNames,
-							   FileName,
-							   TCdict));
-read_trace_case_definitions_2([{TCname,on_off,VarNames,FNameOn,FNameOff}|Rest],Dir,TCdict) ->
-    FileNameOn=make_absolute_path(FNameOn,Dir),
-    FileNameOff=make_absolute_path(FNameOff,Dir),
-    read_trace_case_definitions_2(Rest,
-				  Dir,
-				  insert_tracecase_tc_dict(TCname,
-							   on_off,
-							   VarNames,
-							   FileNameOn,
-							   FileNameOff,
-							   TCdict));
-read_trace_case_definitions_2([_|Rest],Dir,TCdict) ->
-    read_trace_case_definitions_2(Rest,Dir,TCdict);
-read_trace_case_definitions_2([],_Dir,TCdict) ->
-    TCdict.
-
-%% Help function returning an absolute path to FName if FName is not already
-%% absolute. Dir is the working dir of the tool and supposed to be absolute.
-make_absolute_path(FName,Dir) ->
-    case filename:pathtype(FName) of
-	absolute ->                         % Then do nothing, allready absolute.
-	    FName;
-	_ ->
-	    filename:join(Dir,FName)
-    end.    
-%% -----------------------------------------------------------------------------
-
-get_status(undefined,_Node) ->
-    inviso:get_status();
-get_status(CNode,Nodes) ->
-    inviso_tool_lib:inviso_cmd(CNode,get_status,[Nodes]).
-%% -----------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% Internal data structure functions.
-%% =============================================================================
-
-%% -----------------------------------------------------------------------------
-%% The nodes database structure.
-%% -----------------------------------------------------------------------------
-
-%% The purpose of the nodes database structure is to keep track of what runtime
-%% nodes we have, and their current status.
-%% Implementation:
-%% [{NodeName,AvailableStatus},...] or AvailableStatus in the
-%%     non-distributed case.
-%%   AvailableStatus={up,Status1} | down
-%%     Status1={State,Status} | reactivating
-%%       State=tracing | inactive | trace_failure
-%%       Status=running | suspended
-%%         reactivating=the node is now being brought up to date.
-%%         inactive=not tracing, can be initiated and then reactivated.
-%% The following states can occure.
-%%   {inactive,running}
-%%     Mainly when we start the tool, before a session has been started.
-%%   {tracing,running}
-%%     When a trace session is on-going.
-%%   {trace_failure,running}
-%%     If init_tracing failed for some reason.
-%%   {tracing,suspended}
-%%   reactivating
-%%     The node is tracing (has always been) but was suspended. It is now
-%%     no longer suspended and the tool is redong commands.
-%%   {inactive,suspended}
-%%     We can end up here if a session is stopped with this node suspended.
-
-%% Returns a nodes database structure filled with the nodes Nodes.
-mk_nodes(Nodes) when is_list(Nodes) ->
-    {ok,lists:map(fun(N) when is_atom(N)->{N,down} end,Nodes)};
-mk_nodes(local_runtime) ->                  % The non-distributed case.
-    down;
-mk_nodes(_Nodes) ->
-    error.
-%% -----------------------------------------------------------------------------
-
-%% Updates the nodes database structure for each node that has been added.
-%% This is the case when we start the tool or reactivate a node. Note that a node
-%% may have become adopted instead of started.
-%% Returns a new nodes database structure.
-update_added_nodes(CNode,[{Node,NodeResult}|Rest],NodesD) ->
-    case update_added_nodes_3(NodeResult) of
-	already_added ->                    % Already added to the control component.
-	    case get_status(CNode,[Node]) of % Examine if it is tracing or not.
-		{ok,[{Node,NodeResult2}]} ->
-		    Result=mk_nodes_state_from_status(NodeResult2),
-		    update_added_nodes_2(CNode,Node,Result,NodesD,Rest);
-		{error,_Reason} ->          % Strange, mark it as down now.
-		    update_added_nodes_2(CNode,Node,down,NodesD,Rest)
-	    end;
-	Result ->
-	    update_added_nodes_2(CNode,Node,Result,NodesD,Rest)
-    end;
-update_added_nodes(_CNode,[],NodesD) ->
-    NodesD;
-update_added_nodes(_CNode,NodeResult,_NodesD) -> % Non distributed case.
-    case update_added_nodes_3(NodeResult) of
-	already_added ->                    % Already added, most likely autostart.
-	    mk_nodes_state_from_status(inviso:get_status());
-	Result ->
-	    Result                          % Simply replace NodesD.
-    end.
-
-update_added_nodes_2(CNode,Node,Result,NodesD,Rest) ->
-    case lists:keysearch(Node,1,NodesD) of
-	{value,_} ->                        % Node already exists, replace!
-	    update_added_nodes(CNode,Rest,lists:keyreplace(Node,1,NodesD,{Node,Result}));
-	false ->                            % Strange, unknown node!
-	    update_added_nodes(CNode,Rest,NodesD)
-    end.
-
-update_added_nodes_3({ok,{adopted,tracing,running,_Tag}}) ->
-    {up,{tracing,running}};
-update_added_nodes_3({ok,{adopted,tracing,{suspended,_SReason},_Tag}}) ->
-    {up,{tracing,suspended}};
-update_added_nodes_3({ok,{adopted,_,running,_Tag}}) ->
-    {up,{inactive,running}};
-update_added_nodes_3({ok,{adopted,_,{suspended,_SReason},_Tag}}) ->
-    {up,{inactive,suspended}};
-update_added_nodes_3({ok,new}) ->
-    {up,{inactive,running}};
-update_added_nodes_3({ok,already_added}) ->
-    already_added;                          % This is an error value!
-update_added_nodes_3({error,_Reason}) ->
-    down.
-%% -----------------------------------------------------------------------------
-
-%% Function marking all nodes that, according to the returnvalue from init_tracing,
-%% now are successfully initiated as tracing and running. Note that nodes that
-%% does not fully respond 'ok' when init_tracing are marked as 'trace_failure'.
-%% Also note that we assume that the nodes must be running to have made it this far.
-%% A node can of course have become suspended in the process, but that node will
-%% be marked as suspended later when that inviso event message arrives to the tool.
-%% Returns {NewNodesD,Nodes} where Nodes are the nodes that actually got initiated
-%% as a result of the init_tracing call (judged from the LogResults).
-set_tracing_running_nodes(undefined,{ok,_LogResults},_AvailableStatus) -> % Non-distr. case.
-    {{up,{tracing,running}},local_runtime};
-set_tracing_running_nodes(undefined,{error,already_initiated},_) -> % Non-distributed case.
-    {mk_nodes_state_from_status(inviso:get_status()),[]}; % Ask it for its status.
-set_tracing_running_nodes(undefined,{error,_Reason},_) -> % Non-distributed case.
-    {down,[]};                             % This is questionable!
-set_tracing_running_nodes(CNode,{ok,NodeResults},NodesD) ->
-    set_tracing_running_nodes_2(CNode,NodeResults,NodesD,[]).
-
-set_tracing_running_nodes_2(CNode,[{Node,{ok,_LogResults}}|Rest],NodesD,Nodes) ->
-    case lists:keysearch(Node,1,NodesD) of
-	{value,_} ->
-	    NewNodesD=lists:keyreplace(Node,1,NodesD,{Node,{up,{tracing,running}}}),
-	    set_tracing_running_nodes_2(CNode,Rest,NewNodesD,[Node|Nodes]);
-	false ->                   % Strange.
-	    set_tracing_running_nodes_2(CNode,Rest,NodesD,Nodes)
-    end;
-set_tracing_running_nodes_2(CNode,[{Node,{error,already_initiated}}|Rest],NodesD,Nodes) ->
-    case get_status(CNode,[Node]) of       % Then we must ask what it is doing now.
-	{ok,[{Node,NodeResult}]} ->
-	    Result=mk_nodes_state_from_status(NodeResult),
-	    NewNodesD=lists:keyreplace(Node,1,NodesD,{Node,Result}),
-	    set_tracing_running_nodes_2(CNode,Rest,NewNodesD,Nodes);
-	{error,_Reason} ->                 % Strange, mark it as down.
-	    NewNodesD=lists:keyreplace(Node,1,NodesD,{Node,down}),
-	    set_tracing_running_nodes_2(CNode,Rest,NewNodesD,Nodes)
-    end;
-set_tracing_running_nodes_2(CNode,[{Node,{error,_Reason}}|Rest],NodesD,Nodes) ->
-    NewNodesD=lists:keyreplace(Node,1,NodesD,{Node,{up,{trace_failure,running}}}),
-    set_tracing_running_nodes_2(CNode,Rest,NewNodesD,Nodes);
-set_tracing_running_nodes_2(_CNode,[],NodesD,Nodes) ->
-    {NodesD,Nodes}.                        % New NodesD and nodes successfully initiated.
-
-%% -----------------------------------------------------------------------------
-
-%% Function updating Node in the NodesD structure and sets it to 'down'.
-%% Returns a new nodes structure.
-set_down_nodes(Node,[{Node,_}|Rest]) ->
-    [{Node,down}|Rest];
-set_down_nodes(Node,[NodeStruct|Rest]) ->
-    [NodeStruct|set_down_nodes(Node,Rest)];
-set_down_nodes(_,[]) ->
-    [];
-set_down_nodes(_,_) ->                     % Non-distributed case.
-    down.                                  % One can argue if this can happend.
-%% -----------------------------------------------------------------------------
-
-%% Function updating Node in NodesD to now be suspended. Note that if the node is
-%% reactivating it must be moved to state tracing because that is what is doing.
-set_suspended_nodes(Node,[{Node,{up,reactivating}}|Rest]) ->
-    [{Node,{up,{tracing,suspended}}}|Rest];
-set_suspended_nodes(Node,[{Node,{up,{State,_}}}|Rest]) ->
-    [{Node,{up,{State,suspended}}}|Rest];
-set_suspended_nodes(Node,[NodesData|Rest]) ->
-    [NodesData|set_suspended_nodes(Node,Rest)];
-set_suspended_nodes(_Node,[]) ->           % Hmm, strange why did we end up here?
-    [];
-set_suspended_nodes(_,{up,reactivating}) -> % Non-distributed case.
-    {up,{tracing,suspended}};
-set_suspended_nodes(_,{up,{State,_}}) ->
-    {up,{State,suspended}}.
-%% -----------------------------------------------------------------------------
-
-%% This function is called when reactivation is completed. Hence it moves the
-%% node to no longer suspended. Note this can mean that the node is either
-%% tracing or inactive. Reactivation is not allowed for a node have trace_failure.
-set_running_nodes(Node,NodesD) when is_list(NodesD) ->
-    case lists:keysearch(Node,1,NodesD) of
-	{value,{_,AvailableStatus}} ->
-	    lists:keyreplace(Node,1,NodesD,{Node,set_running_nodes_2(AvailableStatus)});
-	false ->                           % Very strange!
-	    NodesD
-    end;
-set_running_nodes(_,NodesD) ->             % The non-distributed case.
-    set_running_nodes_2(NodesD).
-
-set_running_nodes_2({up,reactivating}) ->
-    {up,{tracing,running}};
-set_running_nodes_2({up,{State,suspended}}) ->
-    {up,{State,running}}.
-%% -----------------------------------------------------------------------------
-
-%% Function marking node as now reactivating. That means it is not suspended
-%% any longer (and tracing), but still not part of the set of nodes which shall
-%% get all commands. Returns a new NodesD.
-set_reactivating_nodes(Node,[{Node,_}|Rest]) ->
-    [{Node,{up,reactivating}}|Rest];
-set_reactivating_nodes(Node,[NodesData|Rest]) ->
-    [NodesData|set_reactivating_nodes(Node,Rest)];
-set_reactivating_nodes(_,[]) ->
-    [];
-set_reactivating_nodes(_,{up,_}) ->        % The non-distributed case.
-    {up,reactivating}.
-%% -----------------------------------------------------------------------------
-
-%% Function called when stop-tracing is done. That is all nodes in Nodes shall
-%% be inactive now. Note that an inactive node can still be suspended.
-%% Returns a new NodesD.
-set_inactive_nodes(_,{up,reactivating}) -> % Non-distributed case.
-    {up,{inactive,running}};
-set_inactive_nodes(_,{up,{_,Status}}) ->   % Tracing or trace_failure.
-    {up,{inactive,Status}};
-set_inactive_nodes(_,down) ->
-    down;
-set_inactive_nodes([{Node,ok}|Rest],NodesD) ->
-    case lists:keysearch(Node,1,NodesD) of
-	{value,{_,{up,reactivating}}} ->
-	    set_inactive_nodes(Rest,lists:keyreplace(Node,1,NodesD,{Node,{up,{inactive,running}}}));
-	{value,{_,{up,{_,Status}}}} ->     % Tracing or trace_failure.
-	    set_inactive_nodes(Rest,lists:keyreplace(Node,1,NodesD,{Node,{up,{inactive,Status}}}));
-	_ ->                               % This should not happend.
-	    set_inactive_nodes(Rest,NodesD)
-    end;
-set_inactive_nodes([{_Node,_Error}|Rest],NodesD) ->
-    set_inactive_nodes(Rest,NodesD);
-set_inactive_nodes([],NodesD) ->
-    NodesD.
-%% -----------------------------------------------------------------------------
-
-%% Returns a list of all node names. Note that it can only be used in the
-%% distributed case.
-get_all_nodenames_nodes(NodesD) ->
-    lists:map(fun({Node,_})->Node end,NodesD).
-%% -----------------------------------------------------------------------------
-
-%% Returns a list of all nodes that are up, tracing and running (not suspended),
-%% or 'void' in the non-distributed case. This is the list of nodes that shall get
-%% inviso commands.
-get_nodenames_running_nodes([{Node,{up,{tracing,running}}}|Rest]) ->
-    [Node|get_nodenames_running_nodes(Rest)];
-get_nodenames_running_nodes([{_Node,_}|Rest]) ->
-    get_nodenames_running_nodes(Rest);
-get_nodenames_running_nodes([]) ->
-    [];
-get_nodenames_running_nodes(_) ->
-    void.                                   % When non distributed, N/A.
-%% -----------------------------------------------------------------------------
-
-%% Returns a list of nodes that can be made to initiate tracing.
-get_inactive_running_nodes({up,{inactive,running}}) ->
-    local_runtime;
-get_inactive_running_nodes(NonDistributed) when not(is_list(NonDistributed)) ->
-    [];
-get_inactive_running_nodes([{Node,{up,{inactive,running}}}|Rest]) ->
-    [Node|get_inactive_running_nodes(Rest)];
-get_inactive_running_nodes([{_Node,_}|Rest]) ->
-    get_inactive_running_nodes(Rest);
-get_inactive_running_nodes([]) ->
-    [].
-%% -----------------------------------------------------------------------------
-
-%% Returns a list of nodes that are currently tracing (not necessarily running).
-%% In the non-distributed case the status of the runtime component will be
-%% returned.
-%% Note that nodes showing trace_failure will be included since we like to stop
-%% tracing at those nodes too.
-get_tracing_nodes([{Node,{up,{tracing,_}}}|Rest]) ->
-    [Node|get_tracing_nodes(Rest)];
-get_tracing_nodes([{Node,{up,{trace_failure,_}}}|Rest]) ->
-    [Node|get_tracing_nodes(Rest)];
-get_tracing_nodes([{Node,{up,reactivating}}|Rest]) ->
-    [Node|get_tracing_nodes(Rest)];
-get_tracing_nodes([_|Rest]) ->
-    get_tracing_nodes(Rest);
-get_tracing_nodes([]) ->
-    [];
-get_tracing_nodes(AvailableStatus) ->
-    AvailableStatus.
-%% -----------------------------------------------------------------------------
-
-%% Returns a list of all nodes that are currently up.
-get_available_nodes(down) ->
-    undefined;
-get_available_nodes([{_Node,down}|Rest]) ->
-    get_available_nodes(Rest);
-get_available_nodes([{Node,_}|Rest]) ->
-    [Node|get_available_nodes(Rest)];
-get_available_nodes([]) ->
-    [].
-%% -----------------------------------------------------------------------------
-
-%% Function returning the "state" of Node. Mainly used to check if the node is
-%% suspended or not.
-%% Returns {State,Status} | reactivating | down
-%% where 
-get_state_nodes(Node,NodesD) when is_list(NodesD) ->
-    case lists:keysearch(Node,1,NodesD) of
-	{value,{_,AvailableStatus}} ->
-	    get_state_nodes_2(AvailableStatus);
-	false ->
-	    false
-    end;
-get_state_nodes(_,NodesD) ->                % Non distributed case.
-    get_state_nodes_2(NodesD).
-
-get_state_nodes_2({up,{trace_failure,Status}}) ->
-    {trace_failure,Status};
-get_state_nodes_2({up,{State,suspended}}) -> % {tracing|inactive,suspended}
-    {State,suspended};
-get_state_nodes_2({up,reactivating}) ->
-    reactivating;
-get_state_nodes_2({up,{State,running}}) ->
-    {State,running};
-get_state_nodes_2(down) ->
-    down.
-%% -----------------------------------------------------------------------------
-
-%% Help function in the case we need to consult the state/status of a runtime
-%% component. Returns a nodesD value that can be added to the nodes database.
-mk_nodes_state_from_status({ok,{tracing,running}}) ->
-    {up,{tracing,running}};
-mk_nodes_state_from_status({ok,{tracing,{suspended,_SReason}}}) ->
-    {up,{tracing,suspended}};
-mk_nodes_state_from_status({ok,{_,running}}) ->
-    {up,{inactive,running}};
-mk_nodes_state_from_status({ok,{_,{suspended,_SReason}}}) ->
-    {up,{inactive,suspended}};
-mk_nodes_state_from_status({error,_Reason}) ->
-    down.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% The session_state.
-%% -----------------------------------------------------------------------------
-
-%% The session state reflects if the inviso_tool is tracing or not.
-%% This means that if the tool is tracing a reconnected node can be made to
-%% restart_session.
-
-%% Returns the correct value indicating that we are tracing now.
-tracing_sessionstate() ->
-    tracing.
-%% -----------------------------------------------------------------------------
-
-%% Returns true or false depending on if we are tracing now or not.
-is_tracing(tracing) ->
-    true;
-is_tracing(_) ->
-    false.
-%% -----------------------------------------------------------------------------
-
-%% Returns the correct value indicating that the tool is not tracing.
-passive_sessionstate() ->
-    idle.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% The tracer_data datastructure.
-%% -----------------------------------------------------------------------------
-
-%% The tracer_data structure collects the tracer data arguments used to init tracing
-%% by this inviso tool. The args are saved per session. Each session has
-%% a number.
-%% Implementation:
-%%     Sessions=[{SessionNr,TDGargs},...]
-%%     SessionNr=integer()
-%%     TDGargs=list(), args given to the tracer data generator
-%%       minus the first argument which is the Node name.
-
-%% Function taking tracerdata args structure inserting yet another session.
-%% Returns {SessionNr,NewTDs}.
-insert_td_tracer_data(TDGargs,TDs=[{SNr,_}|_]) ->
-    {SNr+1,[{SNr+1,TDGargs}|TDs]};
-insert_td_tracer_data(TDGargs,undefined) ->
-    {1,[{1,TDGargs}]}.
-%% -----------------------------------------------------------------------------
-
-%% Returns the latest session nr.
-get_latest_session_nr_tracer_data(undefined) ->
-    undefined;
-get_latest_session_nr_tracer_data([{SessionNr,_}|_]) ->
-    SessionNr.
-%% -----------------------------------------------------------------------------
-
-%% Returns the tracer data arguments used when creating the trace data for the
-%% latest session.
-get_latest_tdgargs_tracer_data(undefined) ->
-    undefined;
-get_latest_tdgargs_tracer_data([{_,TDGargs}|_]) ->
-    TDGargs.
-%% -----------------------------------------------------------------------------
-
-
-%% -----------------------------------------------------------------------------
-%% The tc_dict or trace case dictionary datastructure.
-%% -----------------------------------------------------------------------------
-
-%% The tc_dict stores information about all available trace cases.
-%% Implementation:
-%%   [{TCname,Type,VarNames,FNameOn [,FNameOff]},...]
-%%     TCname=atom()
-%%     Type=on | on_off
-%%     VarNames=[atom(),...]
-%%     FNameOn=FNameOff=string()
-
-%% Returns the empty trace case dictionary.
-mk_tc_dict() ->
-    [].
-%% -----------------------------------------------------------------------------
-
-%% Function inserting a new trace case into the trace case dictionary.
-insert_tracecase_tc_dict(TCname,on,VarNames,FNameOn,TCdict) ->
-    [{TCname,on,VarNames,FNameOn}|TCdict].
-insert_tracecase_tc_dict(TCname,on_off,VarNames,FNameOn,FNameOff,TCdict) ->
-    [{TCname,on_off,VarNames,FNameOn,FNameOff}|TCdict].
-%% -----------------------------------------------------------------------------
-
-%% Function finding a trace case definition in the tc_dict structure.
-%% Returns {ok,{TCname,Type,VarNAmes,FNameOn [,FNameOff]}} or 'false'.
-get_tracecase_tc_dict(TCname,[Tuple|_]) when element(1,Tuple)==TCname ->
-    {ok,Tuple};
-get_tracecase_tc_dict(TCname,[_|Rest]) ->
-    get_tracecase_tc_dict(TCname,Rest);
-get_tracecase_tc_dict(_,[]) ->
-    false;
-get_tracecase_tc_dict(_,_) ->               % There are no trace cases!
-    false.
-%% -----------------------------------------------------------------------------
-
-%% Function working on the trace case definition returned by get_tracecase_tc_dict/2
-%% function.
-%% Returning {ok,ActivationFileName}.
-get_tc_activate_fname({_TCname,_Type,_VarNames,FNameOn}) ->
-    {ok,FNameOn};
-get_tc_activate_fname({_TCname,_Type,_VarNames,FNameOn,_FNameOff}) ->
-    {ok,FNameOn}.
-
-get_tc_deactivate_fname({_TCname,_Type,_VarNames,_FNameOn,FNameOff}) ->
-    {ok,FNameOff};
-get_tc_deactivate_fname(_) ->               % Not a case with off function.
-    false.
-
-get_tc_varnames({_TCname,_Type,VarNames,_FNameOn}) ->
-    VarNames;
-get_tc_varnames({_TCname,_Type,VarNames,_FNameOn,_FNameOff}) ->
-    VarNames.
-
-%% -----------------------------------------------------------------------------
-
-
-%% The Command History Log (CHL) stores commands to make it possible to
-%% reactivate suspended nodes, reconnect restarted nodes, and to make
-%% autostart files.
-%% Each time tracing is initiated (that is started) the CHL is cleared since
-%% it would not make scense to repeat commands from an earlier tracing at
-%% reactivation for instance.
-
-%% Implementation: {NextCounter,OnGoingList,ETStable}
-%%   NextCounter=integer(), next command number - to be able to sort them in order.
-%%   OnGoingList=[{ProcH,{TCname,ID}},...]
-%%   ID=term(), instance id for this execution of this trace case.
-%%   ETStable=tid() -> {{TCname,Id},Counter,State1,Bindings}
-%%   ETStable=tid() -> {{TCname,Id},Counter,running,Bindings,Result} |
-%%                     {{TCname,Id,#Ref},Counter,stop,Bindings} |
-%%                     {{TCname,#Ref},Counter,Bindings} % An rtc
-%%                     {{M,F,Args,#Ref},Counter}
-%%     Counter=integer(), the order-counter for this logged entry.
-%%     State1=activating | stopping
-%%       Where:
-%%         activating: the activation file for the tracecase is running.
-%%         running   : activation is completed.
-%%         stopping  : set on the previously running ETS entry when deactivation
-%%                       file is currently executing.
-%%         stop      : entered with own Counter into the ETS table when
-%%                       deactivation file is executing. Remains after too.
-%%     Result=term(), the result returned from the tr-case or inviso call.
-
-
-%% Returning an initial empty CHL.
-mk_chl(undefined) ->
-    {1,[],ets:new(inviso_tool_chl,[set,protected])};
-mk_chl({_,_,TId}) ->
-    ets:delete(TId),
-    mk_chl(undefined).
-
-%% Help function returning 'true' if there is a current history.
-history_exists_chl(undefined) ->
-    false;
-history_exists_chl({_,_,_}) ->
-    true.
-
-%% Function looking up the state of this trace case.    
-find_id_chl(TCname,Id,{_NextCounter,_OnGoingList,TId}) ->
-    case ets:lookup(TId,{TCname,Id}) of
-	[{_,_,running,Bindings,_Result}] -> % The trace case is tracing.
-	    {ok,Bindings};
-	[{_,_,State,_}] ->                  % activating or stopping.
-	    State;
-	[] ->
-	    false
-    end.
-
-%% Function finding the Trace case associated with a process handle
-%% doing this trace case's activation or stopping.
-find_tc_executer_chl(ProcH,{_,OnGoingList,TId}) ->
-    case lists:keysearch(ProcH,1,OnGoingList) of
-	{value,{_,{TCname,Id}}} ->
-	    [{_,_,State,_}]=ets:lookup(TId,{TCname,Id}),
-	    {State,{TCname,Id}};            % Should be activating or stopping.
-	false ->
-	    false
-    end.
-
-%% Adds a Trace case to the CHL. This is done when it is turned on. Or when it
-%% is called for trace cases that do not have on/off functionality.
-set_activating_chl(TCname,Id,{Counter,OnGoingList,TId},Bindings,ProcH) ->
-    ets:insert(TId,{{TCname,Id},Counter,activating,Bindings}),
-    {Counter+1,[{ProcH,{TCname,Id}}|OnGoingList],TId}.
-
-%% Function marking a trace case as now running. That is the activation
-%% phase is completed. It is normaly completed when the process executing
-%% the trace case signals that it is done.
-set_running_chl(ProcH,TCname,Id,Result,{NextCounter,OnGoingList,TId}) ->
-    [{_,Counter,_,Bindings}]=ets:lookup(TId,{TCname,Id}),
-    ets:insert(TId,{{TCname,Id},Counter,running,Bindings,Result}),
-    NewOnGoingList=lists:keydelete(ProcH,1,OnGoingList),
-    {NextCounter,NewOnGoingList,TId}.
-
-%% Function marking trace case TCname with identifier Id as now in its stopping
-%% state. Where ProcH is the handler to the process running the stopping
-%% trace case.
-set_stopping_chl(TCname,Id,{NextCounter,OnGoingList,TId},ProcH)->
-    [{_,Counter,_,Bindings,_}]=ets:lookup(TId,{TCname,Id}),
-    ets:insert(TId,{{TCname,Id},Counter,stopping,Bindings}),
-    ets:insert(TId,{{TCname,Id,make_ref()},NextCounter,stop,Bindings}),
-    {NextCounter+1,[{ProcH,{TCname,Id}}|OnGoingList],TId}.
-
-%% Function removing a TCname-Id from the CHL. This is mostly used
-%% if activating the trace case failed for some reason. We do not then
-%% expect the user to stop the trace case. Hence it must be removed now.
-%% A reactivation process may have noticed the activating-entry and started
-%% to activate it. But since the general state reached after an unsuccessful
-%% activation can not easily be determined, we don't try to do much about it.
-del_tc_chl(ProcH,TCname,Id,{NextCounter,OnGoingList,TId}) ->
-   ets:delete(TId,{TCname,Id}),
-   NewOnGoingList=lists:keydelete(ProcH,1,OnGoingList),
-   {NextCounter,NewOnGoingList,TId}.
-
-%% Function removing the entry TCname+Id from the CHL. This makes it
-%% possible to activate a tracecase with this id again. The entry was
-%% previously marked as stopping.
-nullify_chl(ProcH,TCname,Id,{NextCounter,OnGoingList,TId}) ->
-    ets:delete(TId,{TCname,Id}),
-    NewOnGoingList=lists:keydelete(ProcH,1,OnGoingList),
-    {NextCounter+1,NewOnGoingList,TId}.
-
-%% Function stopping all processes saved as being now running tc executers.
-%% This is useful as cleanup during stop tracing for instance.
-%% Returns a new CHL which is not in all parts correct. Entries in the
-%% ETS table are for instance not properly state-changed. But the CHL will
-%% from now on only be used to create command files and similar.
-stop_all_tc_executer_chl({NextCounter,[{ProcH,_}|Rest],TId}) ->
-    exit(ProcH,kill),
-    stop_all_tc_executer_chl({NextCounter,Rest,TId});
-stop_all_tc_executer_chl({NextCounter,[],TId}) ->
-    {NextCounter,[],TId}.
-
-%% Function adding a "plain" inviso call to the CHL.
-add_inviso_call_chl(Cmd,Args,{NextCounter,OnGoingList,TId}) ->
-    ets:insert(TId,{{inviso,Cmd,Args,make_ref()},NextCounter}),
-    {NextCounter+1,OnGoingList,TId}.
-
-%% Function adding a run trace case entry to the chl.
-add_rtc_chl(TCname,Bindings,{NextCounter,OnGoingList,TId}) ->
-    ets:insert(TId,{{TCname,make_ref()},NextCounter,Bindings}),
-    {NextCounter+1,OnGoingList,TId}.
-%% Returns the highest used counter number in the command history log.
-get_highest_used_counter_chl({NextCounter,_,_}) ->    
-    NextCounter-1.
-
-%% Help function returning a list of {{TCname,Id},Phase} for all ongoing
-%% assynchronous tracecases.
-get_ongoing_chl(undefined) ->
-    [];
-get_ongoing_chl({_,OngoingList,TId}) ->
-    get_ongoing_chl_2(OngoingList,TId).
-
-get_ongoing_chl_2([{_ProcH,{TCname,Id}}|Rest],TId) ->
-    case ets:lookup(TId,{TCname,Id}) of
-	[{_,_C,activating,_B}] ->
-	    [{{TCname,Id},activating}|get_ongoing_chl_2(Rest,TId)];
-	[{_,_C,stopping,_B}] ->
-	    [{{TCname,Id},deactivating}|get_ongoing_chl_2(Rest,TId)]
-    end;
-get_ongoing_chl_2([],_) ->
-    [].
-
-%% Function returning a list of log entries. Note that the list is unsorted
-%% in respect to Counter.
-get_loglist_chl({_,_,TId}) ->
-    L=ets:tab2list(TId),
-    lists:map(fun({{TC,Id},C,S,B,_Result}) -> {{TC,Id},C,S,B}; % running
-		 (Tuple={{_TC,_Id},_C,_S,_B}) -> Tuple;      % activating | stopping
-		 (Tuple={{_TC,_Id,_Ref},_C,_S,_B}) -> Tuple; % stop
-		 (Tuple={{_M,_F,_Args,_Ref},_C}) -> Tuple;
-		 (Tuple={{_TC,_Ref},_C,_B}) -> Tuple
-	      end,
-	      L);
-get_loglist_chl(_) ->                       % The history is not initiated, ever!
-    [].
-
-%% Function returning a list of log entries, but only those which are not
-%% cancelled out by deactivations.
-% get_loglist_active_chl({_,_,TId}) ->
-%     L=ets:tab2list(TId),
-%     lists:zf(fun({{TC,Id},C,S,B,_Result}) -> {true,{{TC,Id},C,S,B}}; % running
-% 		(Tuple={{_TC,_Id},_C,_S,_B}) -> Tuple;      % activating | stopping
-% 		(Tuple={{_TC,_Id,_Ref},_C,_S,_B}) -> Tuple; % stop
-% 		(Tuple={{_M,_F,_Args,_Ref},_C}) -> Tuple
-% 	     end,
-% 	     L);
-% get_loglist_chl(_) ->                       % The history is not initiated, ever!
-%     [].
-
-
-%% This helpfunction recreates a history from a saved history list. This function
-%% is supposed to crash if the log is not well formatted. Note that we must restore
-%% the counter in order for the counter to work if new commands are added to the
-%% history.
-replace_history_chl(OldCHL,SortedLog) ->
-    {_,Ongoing,TId}=mk_chl(OldCHL),
-    {NewTId,Counter}=replace_history_chl_2(TId,SortedLog,0),
-    {ok,{Counter+1,Ongoing,NewTId}}.
-
-replace_history_chl_2(TId,[{{TC,Id},C,running,B}|Rest],_Counter) ->
-    ets:insert(TId,{{TC,Id},C,running,B,undefined}),
-    replace_history_chl_2(TId,Rest,C);
-replace_history_chl_2(TId,[{{M,F,Args},C}|Rest],_Counter) ->
-    ets:insert(TId,{{M,F,Args,make_ref()},C}),
-    replace_history_chl_2(TId,Rest,C);
-replace_history_chl_2(TId,[{TC,C,B}|Rest],_Counter) ->
-    ets:insert(TId,{{TC,make_ref()},C,B}),
-    replace_history_chl_2(TId,Rest,C);
-replace_history_chl_2(TId,[],Counter) ->
-    {TId,Counter}.
-%% -----------------------------------------------------------------------------
-
-
-%% -----------------------------------------------------------------------------
-%% Reactivators data structure.
-%% -----------------------------------------------------------------------------
-
-%% Function adding a new node-reactivatorpid pair to the reactivators structure.
-%% In this way we know which reactivators to remove if Node terminates, or when
-%% a node is fully updated when a reactivator is done.
-add_reactivators(Node,Pid,Reactivators) ->
-    [{Node,Pid}|Reactivators].
-
-%% Function removing a reactivator entry from the reactivators structure.
-del_reactivators(RPid,[{_Node,RPid}|Rest]) ->
-    Rest;
-del_reactivators(RPid,[Element|Rest]) ->
-    [Element|del_reactivators(RPid,Rest)];
-del_reactivators(_,[]) ->                   % This should not happend.
-    [].
-
-get_node_reactivators(RPid,Reactivators) ->
-    case lists:keysearch(RPid,2,Reactivators) of
-	{value,{Node,_}} ->
-	    Node;
-	false ->                            % This should not happend.
-	    false
-    end.
-
-%% Returns a list of list all nodes that are currently reactivating.
-get_all_nodes_reactivators([{Nodes,_Pid}|Rest]) ->
-    [Nodes|get_all_nodes_reactivators(Rest)];
-get_all_nodes_reactivators([]) ->
-    [].
-
-%% Function stopping all running reactivator processes. Returns a new empty
-%% reactivators structure. Note that this function does not set the state of
-%% Nodes. It must most often be set to running.
-stop_all_reactivators([{_Nodes,Pid}|Rest]) ->
-    exit(Pid,kill),
-    stop_all_reactivators(Rest);
-stop_all_reactivators([]) ->
-    [].                                     % Returns an empty reactivators.
-
-%% Help function stopping the reactivator (if any) that reactivates Node.
-%% Returns a new list of reactivators structure.
-stop_node_reactivators(Node,[{Node,Pid}|Rest]) ->
-    exit(Pid,kill),
-    Rest;
-stop_node_reactivators(Node,[NodePid|Rest]) ->
-    [NodePid|stop_node_reactivators(Node,Rest)];
-stop_node_reactivators(_,[]) ->
-    [].
-%% -----------------------------------------------------------------------------
-
-
-%% -----------------------------------------------------------------------------
-%% Started initial trace cases data structure.
-%% -----------------------------------------------------------------------------
-
-%% This datastructure keeps information about ongoing trace cases started
-%% automatically at init_tracing. These must be automatically stopped when calling
-%% stop_tracing.
-
-add_initial_tcs(TCname,Id,StartedInitialTcs) ->
-    [{TCname,Id}|StartedInitialTcs].
-%% -----------------------------------------------------------------------------
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/inviso/src/inviso_tool_lib.erl b/lib/inviso/src/inviso_tool_lib.erl
deleted file mode 100644
index f221c4b6de..0000000000
--- a/lib/inviso/src/inviso_tool_lib.erl
+++ /dev/null
@@ -1,379 +0,0 @@
-% ``The contents of this file are subject to the Erlang Public License,

-%% Version 1.1, (the "License"); you may not use this file except in

-%% compliance with the License. You should have received a copy of the

-%% Erlang Public License along with this software. If not, it can be

-%% retrieved via the world wide web at http://www.erlang.org/.

-%% 

-%% Software distributed under the License is distributed on an "AS IS"

-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See

-%% the License for the specific language governing rights and limitations

-%% under the License.

-%% 

-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.

-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings

-%% AB. All Rights Reserved.''

-%% 

-%%     $Id$

-%%

-%% Description:

-%% Support module to the inviso tool.

-%%

-%% Authors:

-%% Lennart Öhman, [email protected]

-%% -----------------------------------------------------------------------------

-

--module(inviso_tool_lib).

-

-%% -----------------------------------------------------------------------------

-%% Exported library APIs

-%% -----------------------------------------------------------------------------

--export([inviso_cmd/3,expand_module_names/3,make_patterns/7,std_tdg/2]).

--export([mk_tdg_args/2,mk_complete_tdg_args/2,get_datetime_from_tdg_args/1]).

--export([debug/3]).

-

-%% -----------------------------------------------------------------------------

-%% Constants.

-%% -----------------------------------------------------------------------------

--define(DBG_OFF,off).                        % No internal debug indicator.

-

-

-%% =============================================================================

-%% Functions for inviso_cmd

-%% =============================================================================

-

-%% Help function which executes a trace control call. The reason for having a special

-%% function is that we either want to do rpc if the trace control component is

-%% located on another Erlang node than this one. Or call trace_c directly if

-%% it actually is on this node.

-%% Returns whatever the inviso function returns. In case of badrpc it is wrapped

-%% in an error-tuple.

-inviso_cmd(NodeName,Func,Args) ->

-    case node() of

-	NodeName ->                          % Control component on this node.

-	    apply(inviso,Func,Args);

-	_ ->                                 % On other node, must do RPC.

-	    case rpc:call(NodeName,inviso,Func,Args) of

-		{badrpc,Reason} ->

-		    {error,{badrpc,Reason}};

-		Result ->

-		    Result

-	    end

-    end.

-%% -----------------------------------------------------------------------------

-

-

-%% =============================================================================

-%% Functions for expand_module_names

-%% =============================================================================

-

-%% Help function which expands the module name depending on how it is expressed.

-%% Setting Nodes to 'void' makes it non-distributed, expanding only here.

-%% The following special cases are handled:

-%% '_'  =All modules, no expansion into individual module names. Instead

-%%       it is intended to use the '_' mechanism in the trace_pattern BIF.

-%%       Can therefore not be combined with a directory regexp.

-%% "*"  =Is translated into ".*".

-%% "abc"=Means ".*abc.*". Can only be used for module or directory names

-%%       containing upper or lowercase, digits and a slash.

-%% Returns {multinode_expansion,NodeModules},

-%%         {singlenode_expansion,Modules},

-%%         'module', 'wildcard' or {error,Reason},

-%% To limit the places where expansion is done, the option {expand_only_at,Node}

-%% can be provided in the Opts list.

-%% In the non-distributed case the singlenode_expansion will be returned.

-expand_module_names(_Nodes,Mod={_,'_'},_) ->

-    {error,{faulty_regexp_combination,Mod}};

-expand_module_names(Nodes,{DirStr,ModStr},Opts) when is_list(DirStr), is_list(ModStr) ->
-    case expand_module_names_special_regexp(DirStr) of

-	{ok,NewDirStr} ->

-	    case expand_module_names_special_regexp(ModStr) of

-		{ok,NewModStr} ->

-		    expand_module_names_2(Nodes,NewDirStr,NewModStr,Opts);

-		{error,_Reason} ->

-		    {error,{faulty_regexp,ModStr}}

-	    end;

-	{error,_Reason} ->

-	    {error,{faulty_regexp,DirStr}}

-    end;

-expand_module_names(_,'_',_Opts) ->          % If we want to trace all modules

-    wildcard;                                % we shall not expand it.

-expand_module_names(_Nodes,Mod,_Opts) when is_atom(Mod) ->
-    module;                                  % If it is an atom, no expansion.

-expand_module_names(Nodes,"*",Opts) ->       % Treat this as a reg.exp.

-    expand_module_names(Nodes,".*",Opts);

-expand_module_names(Nodes,ModStr,Opts) when is_list(ModStr) ->
-    case expand_module_names_special_regexp(ModStr) of

-	{ok,NewModStr} ->

-	    expand_module_names_2(Nodes,NewModStr,Opts);

-	{error,_Reason} ->

-	    {error,{faulty_regexp,ModStr}}

-    end.

-

-expand_module_names_2(void,ModStr,Opts) ->   % Non-distributed case.

-    {singlenode_expansion,inviso_rt_lib:expand_regexp(ModStr,Opts)};

-expand_module_names_2(Nodes,ModStr,Opts) ->

-    case get_expand_regexp_at_opts(Opts) of

-	{ok,Node} ->                         % Expansion only at this node.

-	    case inviso_rt_lib:expand_regexp([Node],ModStr,Opts) of

-		[{Node,Modules}] when is_list(Modules) ->
-		    {singlenode_expansion,Modules};

-		[{Node,_}] ->                % Most likely badrpc.

-		    {error,{faulty_node,Node}}

-	    end;

-	false ->                             % Expand on all nodes.

-	    Result=inviso_rt_lib:expand_regexp(Nodes,ModStr,Opts),

-	    {multinode_expansion,Result}

-    end.

-expand_module_names_2(void,DirStr,ModStr,Opts) -> % Non-distributed case.

-    {singlenode_expansion,inviso_rt_lib:expand_regexp(DirStr,ModStr,Opts)};

-expand_module_names_2(Nodes,DirStr,ModStr,Opts) ->

-    case get_expand_regexp_at_opts(Opts) of

-	{ok,Node} ->                         % Expansion only at this node.

-	    case inviso_rt_lib:expand_regexp([Node],DirStr,ModStr,Opts) of

-		[{Node,Modules}] when is_list(Modules) ->
-		    {singlenode_expansion,Modules};

-		[{Node,_}] ->                % Most likely badrpc.

-		    {error,{faulty_node,Node}}

-	    end;

-	false ->                             % Expand on all nodes.

-	    Result=inviso_rt_lib:expand_regexp(Nodes,DirStr,ModStr,Opts),

-	    {multinode_expansion,Result}

-    end.

-

-%% Help function which converts a special regexp into a proper one. With

-%% special regexps we mean e.g:"abc" which is supposed to mean ".*abc.*".

-%% Always returns a regexp or {error,Reason}. 

-expand_module_names_special_regexp(Str) ->

-    StrLen=length(Str),

-    case re:run(Str,"[0-9a-zA-Z_/]*") of

-	{match,[{0,StrLen}]} ->	             % Ok, it is the special case.

-	    {ok,".*"++Str++".*"};            % Convert it to a proper regexp.

-	{match,_} ->

-	    {ok,Str};                        % Keep it and hope it is a regexp.

-	nomatch ->

-	    {ok,Str};                        % Keep it and hope it is a regexp.

-	{error,Reason} ->                    % Can't continue with this!

-	    {error,Reason}

-    end.

-%% -----------------------------------------------------------------------------

-

-

-%% =============================================================================

-%% Functions for make_pattern.

-%% =============================================================================

-

--define(DEPTH,3).                            % Max recursive safety catch depth.

-

-%% Help function that creates trace-patterns for each module in the list.

-%% It can handle both lists of modules or lists of nodes and modules.

-%% It will also in the process apply safety catches, if such are not disabled,

-%% in order to prevent certain patterns to form.

-%% The safety catch function is supposed to return either 'ok' or {new,NewTracePattern}.

-%% Where the NewTracePattern is a list of zero or more {M,F,Arity,MS}. The

-%% NewTracePatter is then the replacement for the tried trace-pattern.

-%% Note that the new trace-pattern(s) are also tried against all safety catches.

-%% This can possibly result in even replacements of the replacements. There is

-%% a depth meter to prevent the safety catch mechanism from circularly expanding

-%% trace patterns for ever.

-%% Returns a list of [{Node,PatternList},...] or [Pattern,...].

-%% The latter is used when the modules have been expanded on a single node.

-make_patterns(Catches,Opts,Dbg,NodeModsOrMods,F,A,MS) ->

-    OwnArg=get_ownarg_opts(Opts),

-    case get_disable_safety_opts(Opts) of

-	true ->                              % Do not use the safety catches.

-	    make_patterns_2(void,OwnArg,Dbg,NodeModsOrMods,F,A,MS);

-	false ->

-	    make_patterns_2(Catches,OwnArg,Dbg,NodeModsOrMods,F,A,MS)

-    end.

-	    

-make_patterns_2(Catches,OwnArg,Dbg,[{Node,Mods}|Rest],F,A,MS) when is_list(Mods) ->
-    TPs=make_patterns_3(Catches,OwnArg,Dbg,Mods,F,A,MS,[]),

-    [{Node,join_patterns(TPs)}|make_patterns_2(Catches,OwnArg,Dbg,Rest,F,A,MS)];

-make_patterns_2(Catches,OwnArg,Dbg,[{_Node,_}|Rest],F,A,MS) -> % badrpc!?

-    make_patterns_2(Catches,OwnArg,Dbg,Rest,F,A,MS);

-make_patterns_2(Catches,OwnArg,Dbg,Modules,F,A,MS) when is_list(Modules) ->
-    TPs=make_patterns_3(Catches,OwnArg,Dbg,Modules,F,A,MS,[]),

-    join_patterns(TPs);

-make_patterns_2(_,_,_,[],_,_,_) ->

-    [].

-

-make_patterns_3(void,OwnArg,Dbg,[M|Rest],F,A,MS,Result) -> % S-catches not used!

-    make_patterns_3(void,OwnArg,Dbg,Rest,F,A,MS,[{M,F,A,MS}|Result]);

-make_patterns_3(Catches,OwnArg,Dbg,[M|Rest],F,A,MS,Result) ->

-    NewTPs=try_safety_catches(Catches,OwnArg,[{M,F,A,MS}],Dbg,[],?DEPTH),

-    make_patterns_3(Catches,OwnArg,Dbg,Rest,F,A,MS,[NewTPs|Result]);

-make_patterns_3(_,_,_,[],_,_,_,Result) ->

-    lists:flatten(Result).

-

-try_safety_catches(_Catches,_OwnArg,TPs,Dbg,_Accum,0) -> % Max depth here!

-    debug(max_catch_depth,Dbg,[TPs]),

-    TPs;                                     % Just return them unchanged.

-try_safety_catches(Catches,OwnArg,[TP={M,F,A,MS}|Rest],Dbg,Accum,Depth) ->

-    case try_safety_catch(Catches,OwnArg,M,F,A,MS,Dbg) of

-	ok ->                                % This pattern is safe!

-	    try_safety_catches(Catches,OwnArg,Rest,Dbg,[TP|Accum],?DEPTH);

-	{new,NewTPs} ->                      % Then we must try them too!

-	    NewTPs2=try_safety_catches(Catches,OwnArg,NewTPs,Dbg,[],Depth-1),

-	    try_safety_catches(Catches,OwnArg,Rest,Dbg,[NewTPs2|Accum],?DEPTH)

-    end;

-try_safety_catches(_,_,[],_,Accum,_) ->

-    Accum.

-

-try_safety_catch([{SafetyMod,SafetyFunc}|Rest],OwnArg,M,F,A,MS,Dbg) ->

-    case (catch apply(SafetyMod,SafetyFunc,[M,F,A,MS,OwnArg])) of

-	ok ->                                % This catch has no oppinion about it.

-	    try_safety_catch(Rest,OwnArg,M,F,A,MS,Dbg); % Continue with the next.

-	{new,NewTPs} ->                      % Replace it with this or these new.

-	    debug(safety_catch,Dbg,[new,{SafetyMod,SafetyFunc},M,F,A,MS,NewTPs]),

-	    {new,NewTPs};                    % and stop trying safety cathes.

-	{'EXIT',Reason} ->                   % Something wrong with the safety catch.

-	    debug(safety_catch,Dbg,['EXIT',{SafetyMod,SafetyFunc},M,F,A,MS,Reason]),

-	    try_safety_catch(Rest,OwnArg,M,F,A,MS,Dbg) % Skip it and go on.

-    end;

-try_safety_catch([],_,_,_,_,_,_) ->

-    ok.                                      % Since it passed all, it is safe!

-%% -----------------------------------------------------------------------------

-

-%% Help function that joins patterns together. This is necessary since you can

-%% only set the pattern once for a module-function-arity. This function can not

-%% remove conflicting match-spec "commands". Match-specs will simply be concatenated.

-%% Returns a list of patterns where each mod-func-arity is unique.

-join_patterns(Patterns) ->

-    join_patterns_2(Patterns,[]).

-

-join_patterns_2([{M,F,Arity,MS}|Rest],Result) ->

-    case join_patterns_is_already_done(M,F,Arity,Result) of

-	false ->                             % No we have not collapsed this one.

-	    case join_patterns_3(M,F,Arity,Rest) of

-		[] ->                        % No this combination is unique.

-		    join_patterns_2(Rest,[{M,F,Arity,MS}|Result]);

-		MSs ->                       % We got a list of all other TPs.

-		    join_patterns_2(Rest,[{M,F,Arity,MS++MSs}|Result])

-	    end;

-	true ->                              % We already joined this M-F-Arity.

-	    join_patterns_2(Rest,Result)     % Simply skip it, already done.

-    end;

-join_patterns_2([],Result) ->

-    Result.                                  % Reversed but does not matter!

-

-%% Help function checking if we have already built a trace-pattern for

-%% this M-F-Arity. If so, the found M-F-Arity is already handled.

-join_patterns_is_already_done(M,F,Arity,[{M,F,Arity,_}|_]) ->

-    true;

-join_patterns_is_already_done(M,F,Arity,[_|Rest]) ->

-    join_patterns_is_already_done(M,F,Arity,Rest);

-join_patterns_is_already_done(_,_,_,[]) ->

-    false.

-

-%% Help function which simply concatenates all match-specs for this

-%% M-F-Arity.

-join_patterns_3(M,F,Arity,[{M,F,Arity,MS}|Rest]) ->

-    [MS|join_patterns_3(M,F,Arity,Rest)];

-join_patterns_3(M,F,Arity,[_|Rest]) ->

-    join_patterns_3(M,F,Arity,Rest);

-join_patterns_3(_,_,_,[]) ->

-    [].

-%% -----------------------------------------------------------------------------

-

-

-%% =============================================================================

-%% Function for tracer data creation.

-%% =============================================================================

-

--define(I2L(Arg),integer_to_list(Arg)).

-

-%% The inviso_tool uses a tracer-data generator function to create the tracer_data

-%% specification for each node that shall participate in tracing controlled

-%% through the inviso-tool. If no own tracer data generator function is specified,

-%% this function is used.

-std_tdg(Node,{{Y,Mo,D},{H,Mi,S}}) ->

-    NameStr=atom_to_list(Node)++"_"++?I2L(Y)++"-"++?I2L(Mo)++"-"++?I2L(D)++"_"++

-	?I2L(H)++"-"++?I2L(Mi)++"-"++?I2L(S),

-    LogTD={file,NameStr++".log"},

-    TiTD={file,NameStr++".ti"},

-    [{trace,LogTD},{ti,TiTD}].

-%% ------------------------------------------------------------------------------

-

-%% mk_tdg_args(DateTime,Args)=TDGargs

-%%   DateTime={Date,Time}

-%%     Date=tuple(),

-%%     Time=tuple(),

-%%   Args=list()

-%%   TDGargs=list(),

-%% Creates the TDGargs list used when calling functions making the CompleteTDGargs.

-mk_tdg_args(DateTime,Args) ->

-    [DateTime|Args].

-%% ------------------------------------------------------------------------------

-

-%% mk_complete_tdg_args(Node,TDGargs)=CompleteTDGargs

-%% Returns the list of all arguments a tracer data generator function must accept.

-mk_complete_tdg_args(Node,TDGargs) ->

-    [Node|TDGargs].

-%% ------------------------------------------------------------------------------

-

-%% get_datetime_from_tdg_args(TDGargs)=DateTime

-%% Function returning the DateTime tuple in a TDGargs list.

-get_datetime_from_tdg_args([DateTime|_]) ->

-    DateTime.

-%% ------------------------------------------------------------------------------

-

-

-%% =============================================================================

-%% Various help functions.

-%% =============================================================================

-

-%% -----------------------------------------------------------------------------

-%% Functions handling set trace-pattern options.

-%% -----------------------------------------------------------------------------

-

-%% Gets additional arguments given to various configurable functions.

-%% Returns a list.

-get_ownarg_opts(Opts) ->

-    case lists:keysearch(arg,1,Opts) of

-	{value,{_,OwnArg}} when is_list(OwnArg) ->
-	    OwnArg;

-	{value,{_,OwnArg}} ->

-	    [OwnArg];

-	false ->

-	    []

-    end.

-%% -----------------------------------------------------------------------------

-

-get_disable_safety_opts(Opts) ->

-    case lists:member(disable_safety,Opts) of

-	true ->

-	    true;

-	false ->

-	    false

-    end.

-%% -----------------------------------------------------------------------------

-

-get_expand_regexp_at_opts(Opts) ->

-    case lists:keysearch(expand_only_at,1,Opts) of

-	{value,{_,Node}} when is_atom(Node) ->
-	    {ok,Node};

-	_ ->

-	    false

-    end.

-%% -----------------------------------------------------------------------------

-

-

-%% =============================================================================

-%% Functions for the internal debugging system.

-%% =============================================================================

-

-%% The debug system is meant to provide tracing of inviso tool at different levels.

-%%

-%% debug(What,Level,Description) -> nothing significant.

-%%   What : controls what kind of event. This can both be certain parts of the tool

-%%          as well as certain levels (info to catastrophy).

-%%   Level: Determines if What shall be printed or not.

-%%   Description: this is what happend.

-debug(_What,?DBG_OFF,_Description) ->

-    true;                                    % Debug is off, no action.

-debug(What,On,Description) ->

-    debug_2(What,On,Description).

-

-debug_2(What,_,Description) ->

-    io:format("INVISO DEBUG:~w, ~p~n",[What,Description]).

-%% -----------------------------------------------------------------------------

diff --git a/lib/inviso/src/inviso_tool_sh.erl b/lib/inviso/src/inviso_tool_sh.erl
deleted file mode 100644
index b02f498c5b..0000000000
--- a/lib/inviso/src/inviso_tool_sh.erl
+++ /dev/null
@@ -1,1749 +0,0 @@
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% Description:
-%% The runtime component of the trace tool Inviso.
-%%
-%% Authors:
-%% Lennart �hman, [email protected]
-%% -----------------------------------------------------------------------------
-
--module(inviso_tool_sh).
-
-%% Inviso Session Handler.
-%% This is the code for the session handler process. Its purpose is that we have
-%% one session handler process for each trace session started through the
-%% start_session inviso tool API. The session handler process is responsible for:
-%%
-%% -Knowing the state/status of all participating runtime components.
-%% -Keeping storage of all tracerdata all our participants have used. This means
-%%  also to find out the tracerdata of runtime components connecting by them
-%%  selves.
-%%
-%% STORAGE STRATEGY
-%% ----------------
-%% The local information storage can be changed by two things. Either by executing
-%% commands issued through our APIs. Or by receiving trace_event from the control
-%% component. When we execute commands, a corresponding event will also follow.
-%% Meaning that in those situations we are informed twice.
-%% A simple strategy could be to wait for the event even when doing the changes
-%% to the runtime components our self (through commands). But that may result in
-%% a small time frame where someone might do yet another command and failing
-%% because the local information storage is not uptodate as it would have been
-%% expected to be. Therefore we always update the local storage when making changes
-%% to a runtime component our selves. There will eventually be a double update
-%% through an incoming event. But the storage must coop with that, preventing
-%% inconsitancies to happend. An example of a strategy is that the tracerdata table
-%% is a bag, not allowing for double entries of the same kind. Therefore a double
-%% update is harmless there.
-
-%% ------------------------------------------------------------------------------
-%% Module wide constants.
-%% ------------------------------------------------------------------------------
--define(LOCAL_RUNTIME,local_runtime).        % Used as node name when non-disitrbuted.
--define(TRACING,tracing).                    % A state defined by the control component.
--define(RUNNING,running).                    % A status according to control componet.
-
--define(COPY_LOG_FROM,copy_log_from).        % Common fileystem option.
-%% ------------------------------------------------------------------------------
-
-%% ------------------------------------------------------------------------------
-%% API exports.
-%% ------------------------------------------------------------------------------
--export([start_link/5,start_link/8]).
--export([cancel_session/1,stop_session/3]).
--export([reactivate/1,reactivate/2]).
--export([ctpl/5,tpl/5,tpl/6,tpl/7,
-	 tf/2,tf/3,
-	 tpm_localnames/2,init_tpm/6,init_tpm/9,tpm/6,tpm/7,tpm/10,
-	 tpm_ms/7,ctpm_ms/6,ctpm/5
-	]).
-%% ------------------------------------------------------------------------------
-
-
-%% ------------------------------------------------------------------------------
-%% Internal exports.
-%% ------------------------------------------------------------------------------
--export([init/1,handle_call/3,handle_info/2,terminate/2]).
-
--export([get_loopdata/1]).
-%% ------------------------------------------------------------------------------
-
-
-%% ------------------------------------------------------------------------------
-%% Includes.
-%% ------------------------------------------------------------------------------
--include_lib("kernel/include/file.hrl").     % Necessary for file module.
-%% ------------------------------------------------------------------------------
-
-
-%% ==============================================================================
-%% Exported API functions.
-%% ==============================================================================
-
-%% start_link(From,NodeParams,CtrlNode,CtrlPid,SafetyCatches,NodesIn,NodesNotIn) =
-%%     {ok,Pid} | {error,Reason}
-%%   From= pid(), the initial client expecting the reply.
-%%   NodeParams=[{Node,TracerData},{Node,TracerData,Opts}...]
-%%   CtrlNode=atom() | 'void', the node where the trace control component is.
-%%   CtrlPid=pid(), the pid of the trace control component.
-%%   SafetyCatches=
-%%   Dir=string(), where to place fetched logs and the merged log.
-%%   Dbg=debug structure.
-%%   NodesIn=[Node,...], list of nodes already in another session.
-%%   NodesNotIn=[Node,...], list of nodes not in another session.
-%%
-%% Starts a session-handler. It keeps track of the the state and status of all
-%% participating runtime components. Note that there is a non-distributed case too.
-%% In the non-distributed case there is no things such as CtrlNode.
-start_link(From,TracerData,CtrlPid,SafetyCatches,Dbg) ->
-    gen_server:start_link(?MODULE,
-			  {self(),From,TracerData,CtrlPid,SafetyCatches,Dbg},
-			  []).
-
-start_link(From,NodeParams,CtrlNode,CtrlPid,SafetyCatches,Dbg,NodesIn,NodesNotIn) ->
-    gen_server:start_link(?MODULE,
-			  {self(),From,NodeParams,CtrlNode,CtrlPid,
-			   SafetyCatches,Dbg,NodesIn,NodesNotIn},
-			  []).
-%% ------------------------------------------------------------------------------
-
-%% Stops tracing where it is ongoing. Fetches all logfiles.
-stop_session(SID,Dir,Prefix) ->
-    gen_server:call(SID,{stop_session,Dir,Prefix}).
-%% ------------------------------------------------------------------------------
-
-%% stop_session(SID) = ok
-%%
-%% Cancels the session brutaly. All runtime components are made to stop tracing,
-%% all local log files are removed using the tracerdata we know for them.
-cancel_session(SID) ->
-    gen_server:call(SID,cancel_session).
-%% ------------------------------------------------------------------------------
-
-%% reactivate(SID) = {ok,
-%% reactivate(SID,Nodes) = {ok,NodeResults} | {error,Reason}.
-%%   SID=session id, pid().
-%%   Nodes=[Node,...]
-%%   NodeResult=[{Node,Result},...]
-%%   Result={Good,Bad}
-%%   Good,Bad=integer(), the number of redone activities.
-%%
-%% Function which reactivates runtime components being suspended. This is done
-%% replaying all trace flags (in the correct order) to the corresponding nodes.
-%% Note that this may also mean turning flags off. Like first turning them on
-%% then off a split second later.
-reactivate(SID) ->
-    gen_server:call(SID,reactivate). %% NOT IMPLEMENTED YET.
-reactivate(SID,Nodes) ->
-    gen_server:call(SID,{reactivate,Nodes}).
-%% ------------------------------------------------------------------------------
-
-
-%% tpl(SessionID,Mod,Func,Arity,MS)=
-%% tpl(SessionID,Mod,Func,Arity,MS,Opts)={ok,N}|{error,Reason}.
-%% tpl(SessionID,Nodes,Mod,Func,Arity,MS)=
-%% tpl(SessionID,Nodes,Mod,Func,Arity,MS,Opts)={ok,Result}|{error,Reason}
-%%   Mod='_' | ModuleName | ModRegExp | {DirRegExp,ModRegExp}
-%%     ModRegExp=DirRegExp= string()
-%%   Func='_' | FunctionName
-%%   Arity='_' | integer()
-%%   MS=[] | false | a match specification
-%%   Opts=[Opts,...]
-%%     Opt={arg,Arg}, disable_safety, {expand_regexp_at,NodeName}, only_loaded
-%%   Nodes=[NodeName,...]
-tpl(SID,Mod,Func,Arity,MS) ->
-    gen_server:call(SID,{tp,tpl,Mod,Func,Arity,MS,[]}).
-tpl(SID,Mod,Func,Arity,MS,Opts) when list(MS);MS==true;MS==false ->
-    gen_server:call(SID,{tp,tpl,Mod,Func,Arity,MS,Opts});
-tpl(SID,Nodes,Mod,Func,Arity,MS) when integer(Arity);Arity=='_' ->
-    gen_server:call(SID,{tp,tpl,Nodes,Mod,Func,Arity,MS,[]}).
-tpl(SID,Nodes,Mod,Func,Arity,MS,Opts) ->
-    gen_server:call(SID,{tp,tpl,Nodes,Mod,Func,Arity,MS,Opts}).
-%% ------------------------------------------------------------------------------
-
-%% ctpl(SessionID,Nodes,Mod,Func,Arity)=
-%% See tpl/X for arguments.
-%%
-%% Removes local trace-patterns from functions.
-ctpl(SID,Nodes,Mod,Func,Arity) ->
-    gen_server:call(SID,{ctp,ctpl,Nodes,Mod,Func,Arity}).
-%% ------------------------------------------------------------------------------
-
-
-tpm_localnames(SID,Nodes) ->
-    gen_server:call(SID,{tpm_localnames,Nodes}).
-
-%% tpm_globalnames(SID,Nodes) ->
-%%     gen_server:call(SID,{tpm_globalnames,Nodes}).
-
-init_tpm(SID,Nodes,Mod,Func,Arity,CallFunc) ->
-    gen_server:call(SID,{init_tpm,Nodes,Mod,Func,Arity,CallFunc}).
-init_tpm(SID,Nodes,Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->
-    gen_server:call(SID,
-		    {init_tpm,Nodes,Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc}).
-tpm(SID,Nodes,Mod,Func,Arity,MS) ->
-    gen_server:call(SID,{tpm,Nodes,Mod,Func,Arity,MS}).
-tpm(SID,Nodes,Mod,Func,Arity,MS,CallFunc) ->
-    gen_server:call(SID,{tpm,Nodes,Mod,Func,Arity,MS,CallFunc}).
-tpm(SID,Nodes,Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->
-    gen_server:call(SID,{tpm,Nodes,Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc}).
-
-tpm_ms(SID,Nodes,Mod,Func,Arity,MSname,MS) ->
-    gen_server:call(SID,{tpm_ms,Nodes,Mod,Func,Arity,MSname,MS}).
-
-ctpm_ms(SID,Nodes,Mod,Func,Arity,MSname) ->
-    gen_server:call(SID,{tpm_ms,Nodes,Mod,Func,Arity,MSname}).
-
-ctpm(SID,Nodes,Mod,Func,Arity) ->
-    gen_server:call(SID,{ctpm,Nodes,Mod,Func,Arity}).
-%% ------------------------------------------------------------------------------
-
-
-%% tf(SessionID,Nodes,TraceConfList)=
-%%   TraceConfList=[{PidSpec,Flags},...]
-%%     PidSpec=pid()|atom()|all|new|existing
-%%     Flags=[Flag,...]
-tf(SID,TraceConfList) ->
-    gen_server:call(SID,{tf,TraceConfList}).
-tf(SID,Nodes,TraceConfList) ->
-    gen_server:call(SID,{tf,Nodes,TraceConfList}).
-%% ------------------------------------------------------------------------------
-
-
-get_loopdata(SID) ->
-    gen_server:call(SID,get_loopdata).
-%% ------------------------------------------------------------------------------
-
-%% ==============================================================================
-%% Genserver call-backs.
-%% ==============================================================================
-
-%% Initial function for the session handler process. The nodes participating in
-%% the session must previously have been added to our control component by the tool.
-%% The session handler first finds out the state/status of the specified runtime
-%% components, then it tries to initiate tracing on those where it is applicable.
-%% Note that a reply to the initial (tool)client is done from here instead from
-%% the tool-server.
-init({Parent,From,TracerData,CtrlPid,SafetyCatches,Dbg}) -> % The non-distributed case.
-    {ok,StateStatus}=init_rtcomponent_states([],void,CtrlPid,[?LOCAL_RUNTIME]),
-    case is_tool_internal_tracerdata(TracerData) of
-	false ->                             % We shall initiate local runtime.
-	    case inviso:init_tracing(TracerData) of
-		ok ->
-		    gen_server:reply(From,{ok,{self(),ok}}),
-		    {ok,mk_ld(Parent,
-			      void,
-			      CtrlPid,
-			      to_rtstates([{?LOCAL_RUNTIME,{tracing,?RUNNING},[]}]),
-			      [{?LOCAL_RUNTIME,TracerData}],
-			      [],
-			      SafetyCatches,
-			      Dbg)};
-		{error,Reason} ->            % It might have become suspended?!
-		    gen_server:reply(From,{error,Reason}),
-		    {ok,mk_ld(Parent,
-			      void,
-			      CtrlPid,
-			      to_rtstates([{?LOCAL_RUNTIME,StateStatus,[]}]),
-			      [{?LOCAL_RUNTIME,TracerData}],
-			      [],
-			      SafetyCatches,
-			      Dbg)}
-	    end;
-	true ->                              % We shall not pass this one on.
-	    gen_server:reply(From,{ok,{self(),ok}}), % Then it is ok.
-	    {ok,mk_ld(Parent,
-		      void,
-		      CtrlPid,
-		      to_rtstates([{?LOCAL_RUNTIME,StateStatus,[]}]),
-		      [],
-		      [?LOCAL_RUNTIME],
-		      SafetyCatches,
-		      Dbg)}
-    end;
-init({Parent,From,NodeParams,CtrlNode,CtrlPid,SafetyCatches,Dbg,NodesIn,NodesNotIn}) ->
-    case init_rtcomponent_states(NodeParams,CtrlNode,CtrlPid,NodesNotIn) of
-	{ok,States} ->                       % A list of {Node,{State,Status},Opts}.
-	    {NodeParams2,Nodes2}=remove_nodeparams(NodesIn,NodeParams),
-	    case inviso_tool_lib:inviso_cmd(CtrlNode,init_tracing,[NodeParams2]) of
-		{ok,Result} ->               % Resulted in state changes!
-		    RTStates=set_tracing_rtstates(to_rtstates(States),Result),
-		    ReplyValue=init_fix_resultnodes(NodesIn,Nodes2,Result),
-		    gen_server:reply(From,{ok,{self(),ReplyValue}}),
-		    {ok,mk_ld(Parent,CtrlNode,CtrlPid,RTStates,
-			      NodeParams2,Nodes2,SafetyCatches,Dbg)};
-		{error,Reason} ->            % Some general failure.
-		    inviso_tool_lib:inviso_cmd(CtrlNode,unsubscribe,[]),
-		    gen_server:reply(From,{error,{init_tracing,Reason}}),
-		    {stop,{init_tracing,Reason}};
-		What ->
-		    io:format("GOT:~n~w~n",[What]),
-		    exit(foo)
-	    end;
-	{error,Reason} ->                    % Unable to get the state/status.
-	    inviso_tool_lib:inviso_cmd(CtrlNode,unsubscribe,[]),
-	    gen_server:reply(From,{error,Reason}),
-	    {stop,{error,Reason}};
-	What ->
-	    io:format("GOT:~n~w~n",[What]),
-	    exit(foo)
-    end.
-%% ------------------------------------------------------------------------------
-
-%% To stop a session means stop the tracing and remove all local files on the
-%% runtime nodes. We do have a table with all tracer data and that is how we are
-%% going to recreate what files to remove.
-%% Since runtime components may actually change state when this procedure is
-%% on-going, we do not care! It is the state in the session handling process at
-%% the time of start of this procedure which is used.
-handle_call(cancel_session,_From,LD) ->
-    CtrlNode=get_ctrlnode_ld(LD),
-    RTStates=get_rtstates_ld(LD),
-    Dbg=get_dbg_ld(LD),
-    TracingNodes=get_all_tracing_nodes_rtstates(RTStates),
-    case stop_all_tracing(CtrlNode,Dbg,TracingNodes) of
-	ok->                                 % Hopefully all nodes are stopped now.
-	    AvailableNodes=get_all_available_nodes_rtstates(RTStates),
-	    TRDstorage=get_trdstorage_ld(LD),
-	    remove_all_local_logs(CtrlNode,TRDstorage,AvailableNodes,Dbg),
-	    {stop,normal,ok,LD};             % LD actually not correct now!
-	{error,Reason} ->                    % Some serious error when stop_tracing.
-	    {stop,normal,{error,Reason},LD}
-    end;
-%% ------------------------------------------------------------------------------
-
-%% *Stop all tracing on runtime components still tracing.
-%% *Copy all local log files to the collection directory.
-handle_call({stop_session,Dir,Prefix},_From,LD) ->
-    case check_directory_exists(Dir) of      % Check that this directory exists here.
-	true ->
-	    RTStates=get_rtstates_ld(LD),
-	    CtrlNode=get_ctrlnode_ld(LD),
-	    Dbg=get_dbg_ld(LD),
-	    TracingNodes=get_all_tracing_nodes_rtstates(RTStates),
-	    case stop_all_tracing(CtrlNode,Dbg,TracingNodes) of
-		ok ->                        % Hopefully no node is still tracing now.
-		    TRDstorage=get_trdstorage_ld(LD),
-		    AvailableNodes=get_all_available_nodes_rtstates(RTStates),
-		    {FailedNodes,FetchedFiles}=
-			transfer_logfiles(RTStates,CtrlNode,Dir,Prefix,
-					  TRDstorage,Dbg,AvailableNodes),
-		    RemoveNodes=             % We only delete local logs where fetch ok.
-			lists:filter(fun(N)->
-					     case lists:keysearch(N,1,FailedNodes) of
-						 {value,_} ->
-						     false;
-						 false ->
-						     true
-					     end
-				     end,
-				     AvailableNodes),
-		    remove_all_local_logs(CtrlNode,TRDstorage,RemoveNodes,Dbg),
-		    {stop,normal,{ok,{FailedNodes,FetchedFiles}},LD};
-		{error,Reason} ->            % Some general failure, quit.
-		    {stop,normal,{error,Reason},LD}
-	    end;
-	false ->                             % You specified a non-existing directory!
-	    {reply,{error,{faulty_dir,Dir}},LD}
-    end;
-%% ------------------------------------------------------------------------------
-
-handle_call({reactivate,Nodes},_From,LD) ->
-    RTStates=get_rtstates_ld(LD),
-    {OurNodes,OtherNodes}=
-	remove_nodes_not_ours(Nodes,get_all_session_nodes_rtstates(RTStates)),
-    CtrlNode=get_ctrlnode_ld(LD),
-    ACTstorage=get_actstorage_ld(LD),
-    case h_reactivate(CtrlNode,OurNodes,ACTstorage) of
-	{ok,Results} ->                      % A list of {Node,Result}.
-	    if
-		OtherNodes==[] ->            % Normal case, no non-session nodes.
-		    {reply,{ok,Results},LD};
-		true ->                      % Add error values for non-session nodes.
-		    {reply,
-		     {ok,
-		      lists:map(fun(N)->{N,{error,not_in_session}} end,OtherNodes)++
-		      Results},
-		     LD}
-	    end;
-	{error,Reason} ->                    % Then this error takes presidence.
-	    {reply,{error,Reason},LD}
-    end;
-%% ------------------------------------------------------------------------------
-
-%% Call-back for set trace-pattern for both global and local functions.
-handle_call({tp,PatternFunc,Mod,F,A,MS,Opts},_From,LD) ->
-    Reply=h_tp(all,PatternFunc,Mod,F,A,MS,Opts,LD), % For all active nodes in the session.
-    {reply,Reply,LD};
-handle_call({tp,PatternFunc,Nodes,Mod,F,A,MS,Opts},_From,LD) ->
-    RTStates=get_rtstates_ld(LD),
-    SNodes=get_all_session_nodes_rtstates(RTStates), % Notes belongoing to the session.
-    {Nodes2,FaultyNodes}=remove_nodes_not_ours(Nodes,SNodes),
-    Reply=h_tp(Nodes2,PatternFunc,Mod,F,A,MS,Opts,LD),
-    ErrorReply=lists:map(fun(N)->{N,{error,not_in_session}} end,FaultyNodes),
-    {reply,ErrorReply++Reply,LD};
-%% ------------------------------------------------------------------------------
-
-%% Call-back handling the removal of both local and global trace-patterns.
-%% NOT IMPLEMENTED YET.
-handle_call({ctp,PatternFunc,Nodes,Mod,F,A},_From,LD) ->
-    Reply=h_ctp(Nodes,PatternFunc,Mod,F,A,LD),
-    {reply,Reply,LD};
-%% ------------------------------------------------------------------------------
-
-handle_call({tpm_localnames,Nodes},_From,LD) ->
-    RTStates=get_rtstates_ld(LD),
-    OurNodes=get_all_session_nodes_rtstates(RTStates),
-    {Nodes2,NotOurNodes}=remove_nodes_not_ours(Nodes,OurNodes),
-    ACTstorage=get_actstorage_ld(LD),
-    {Reply,NewACTstorage}=
-	h_tpm_localnames(get_ctrlnode_ld(LD),Nodes2,RTStates,ACTstorage),
-    ErrorReply=lists:map(fun(N)->{N,{error,not_in_session}} end,NotOurNodes),
-    {reply,ErrorReply++Reply,put_actstorage_ld(NewACTstorage,LD)};
-
-handle_call({init_tpm,Nodes,Mod,Func,Arity,CallFunc},_From,LD) ->
-    RTStates=get_rtstates_ld(LD),
-    OurNodes=get_all_session_nodes_rtstates(RTStates),
-    {Nodes2,NotOurNodes}=remove_nodes_not_ours(Nodes,OurNodes),
-    ACTstorage=get_actstorage_ld(LD),
-    {Reply,NewACTstorage}=
-	h_all_tpm(get_ctrlnode_ld(LD),
-		  Nodes2,
-		  init_tpm,
-		  [Mod,Func,Arity,CallFunc],
-		  RTStates,
-		  ACTstorage),
-    ErrorReply=lists:map(fun(N)->{N,{error,not_in_session}} end,NotOurNodes),
-    {reply,ErrorReply++Reply,put_actstorage_ld(NewACTstorage,LD)};
-
-handle_call({init_tpm,Nodes,Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc},_From,LD) ->
-    RTStates=get_rtstates_ld(LD),
-    OurNodes=get_all_session_nodes_rtstates(RTStates),
-    {Nodes2,NotOurNodes}=remove_nodes_not_ours(Nodes,OurNodes),
-    ACTstorage=get_actstorage_ld(LD),
-    {Reply,NewACTstorage}=
-	h_all_tpm(get_ctrlnode_ld(LD),
-		  Nodes2,
-		  init_tpm,
-		  [Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc],
-		  RTStates,
-		  ACTstorage),
-    ErrorReply=lists:map(fun(N)->{N,{error,not_in_session}} end,NotOurNodes),
-    {reply,ErrorReply++Reply,put_actstorage_ld(NewACTstorage,LD)};
-
-handle_call({tpm,Nodes,Mod,Func,Arity,MS},_From,LD) ->
-    RTStates=get_rtstates_ld(LD),
-    OurNodes=get_all_session_nodes_rtstates(RTStates),
-    {Nodes2,NotOurNodes}=remove_nodes_not_ours(Nodes,OurNodes),
-    ACTstorage=get_actstorage_ld(LD),
-    {Reply,NewACTstorage}=
-	h_all_tpm(get_ctrlnode_ld(LD),Nodes2,tpm,[Mod,Func,Arity,MS],RTStates,ACTstorage),
-    ErrorReply=lists:map(fun(N)->{N,{error,not_in_session}} end,NotOurNodes),
-    {reply,ErrorReply++Reply,put_actstorage_ld(NewACTstorage,LD)};
-
-handle_call({tpm,Nodes,Mod,Func,Arity,MS,CallFunc},_From,LD) ->
-    RTStates=get_rtstates_ld(LD),
-    OurNodes=get_all_session_nodes_rtstates(RTStates),
-    {Nodes2,NotOurNodes}=remove_nodes_not_ours(Nodes,OurNodes),
-    ACTstorage=get_actstorage_ld(LD),
-    {Reply,NewACTstorage}=
-	h_all_tpm(get_ctrlnode_ld(LD),
-		  Nodes2,
-		  tpm,
-		  [Mod,Func,Arity,MS,CallFunc],
-		  RTStates,
-		  ACTstorage),
-    ErrorReply=lists:map(fun(N)->{N,{error,not_in_session}} end,NotOurNodes),
-    {reply,ErrorReply++Reply,put_actstorage_ld(NewACTstorage,LD)};
-
-handle_call({tpm,Nodes,Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc},_From,LD) ->
-    RTStates=get_rtstates_ld(LD),
-    OurNodes=get_all_session_nodes_rtstates(RTStates),
-    {Nodes2,NotOurNodes}=remove_nodes_not_ours(Nodes,OurNodes),
-    ACTstorage=get_actstorage_ld(LD),
-    {Reply,NewACTstorage}=
-	h_all_tpm(get_ctrlnode_ld(LD),
-		  Nodes2,
-		  tpm,
-		  [Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc],
-		  RTStates,
-		  ACTstorage),
-    ErrorReply=lists:map(fun(N)->{N,{error,not_in_session}} end,NotOurNodes),
-    {reply,ErrorReply++Reply,put_actstorage_ld(NewACTstorage,LD)};
-
-handle_call({tpm_ms,Nodes,Mod,Func,Arity,MSname,MS},_From,LD) ->
-    RTStates=get_rtstates_ld(LD),
-    OurNodes=get_all_session_nodes_rtstates(RTStates),
-    {Nodes2,NotOurNodes}=remove_nodes_not_ours(Nodes,OurNodes),
-    ACTstorage=get_actstorage_ld(LD),
-    {Reply,NewACTstorage}=
-	h_all_tpm(get_ctrlnode_ld(LD),
-		  Nodes2,
-		  tpm_ms,
-		  [Mod,Func,Arity,MSname,MS],
-		  RTStates,
-		  ACTstorage),
-    ErrorReply=lists:map(fun(N)->{N,{error,not_in_session}} end,NotOurNodes),
-    {reply,ErrorReply++Reply,put_actstorage_ld(NewACTstorage,LD)};
-
-handle_call({ctpm_ms,Nodes,Mod,Func,Arity,MSname},_From,LD) ->
-    RTStates=get_rtstates_ld(LD),
-    OurNodes=get_all_session_nodes_rtstates(RTStates),
-    {Nodes2,NotOurNodes}=remove_nodes_not_ours(Nodes,OurNodes),
-    ACTstorage=get_actstorage_ld(LD),
-    {Reply,NewACTstorage}=
-	h_all_tpm(get_ctrlnode_ld(LD),
-		  Nodes2,
-		  ctpm_ms,
-		  [Mod,Func,Arity,MSname],
-		  RTStates,
-		  ACTstorage),
-    ErrorReply=lists:map(fun(N)->{N,{error,not_in_session}} end,NotOurNodes),
-    {reply,ErrorReply++Reply,put_actstorage_ld(NewACTstorage,LD)};
-
-handle_call({ctpm,Nodes,Mod,Func,Arity},_From,LD) ->
-    RTStates=get_rtstates_ld(LD),
-    OurNodes=get_all_session_nodes_rtstates(RTStates),
-    {Nodes2,NotOurNodes}=remove_nodes_not_ours(Nodes,OurNodes),
-    ACTstorage=get_actstorage_ld(LD),
-    {Reply,NewACTstorage}=
-	h_all_tpm(get_ctrlnode_ld(LD),Nodes2,ctpm,[Mod,Func,Arity],RTStates,ACTstorage),
-    ErrorReply=lists:map(fun(N)->{N,{error,not_in_session}} end,NotOurNodes),
-    {reply,ErrorReply++Reply,put_actstorage_ld(NewACTstorage,LD)};
-%% ------------------------------------------------------------------------------
-
-%% Call-back for setting process trace-flags. Handles both distributed and non-
-%% distributed case.
-handle_call({tf,TraceConfList},From,LD) ->
-    handle_call({tf,all,TraceConfList},From,LD);
-handle_call({tf,Nodes,TraceConfList},_From,LD) ->
-    {Reply,NewACTstorage}=h_tf(get_ctrlnode_ld(LD),
-			      Nodes,
-			      TraceConfList,
-			      get_actstorage_ld(LD),
-			      get_rtstates_ld(LD)),
-    {reply,Reply,put_actstorage_ld(NewACTstorage,LD)};
-%% ------------------------------------------------------------------------------
-
-
-
-handle_call(get_loopdata,_From,LD) ->
-    io:format("The loopdata:~n~p~n",[LD]),
-    {reply,ok,LD}.
-%% ------------------------------------------------------------------------------
-
-
-%% Clause handling an incomming state-change event from the control component.
-%% Note that it does not have to be one of our nodes since it is not possible
-%% to subscribe to certain node-events.
-%% We may very well get state-change events for state-changes we are the source
-%% to our selves. Those state-changes are already incorporated into the RTStates.
-%% There is however no harm in doing them again since we know that this event
-%% message will reach us before a reply to a potentially following state-change
-%% request will reach us. Hence we will do all state-changes in the correct order,
-%% even if sometimes done twice.
-handle_info({trace_event,CtrlPid,_Time,{state_change,Node,{State,Status}}},LD) ->
-    case get_ctrlpid_ld(LD) of
-	CtrlPid ->                           % It is from our control component.
-	    case {State,Status} of
-		{?TRACING,?RUNNING} ->       % This is the only case when new tracerdata!
-		    NewTracerData=add_current_tracerdata_ld(get_ctrlnode_ld(LD),
-							    Node,
-							    get_rtstates_ld(LD),
-							    get_trdstorage_ld(LD)),
-		    NewRTStates=statechange_rtstates(Node,State,Status,get_rtstates_ld(LD)),
-		    {noreply,put_trdstorage_ld(NewTracerData,
-					       put_rtstates_ld(NewRTStates,LD))};
-		_ ->                         % In all other cases, just fix rtstates.
-		    NewRTStates=statechange_rtstates(Node,State,Status,get_rtstates_ld(LD)),
-		    {noreply,put_rtstates_ld(NewRTStates,LD)}
-	    end;
-	_ ->
-	    {noreply,LD}
-    end;
-%% If a new runtime component connects to our trace control component, and it is
-%% in our list of runtime components belonging to this session, we may update its
-%% state to now being present. Otherwise it does not belong to this session.
-%% Note that we avoid updating an already connected runtime component. This
-%% can happend if it connected by itself after we started the session handler,
-%% but before we managed to initiate tracing. Doing so or not will not result in
-%% any error in the long run, but during a short period of time we might be
-%% prevented from doing things with the runtime though it actually is tracing.
-handle_info({trace_event,CtrlPid,_Time,{connected,Node,{_Tag,{State,Status}}}},LD) ->
-    case get_ctrlpid_ld(LD) of
-	CtrlPid ->                           % It is from our control component.
-	    case get_statestatus_rtstates(Node,get_rtstates_ld(LD)) of
-		{ok,unavailable} ->          % This is the situation when we update!
-		    NewRTStates=statechange_rtstates(Node,State,Status,get_rtstates_ld(LD)),
-		    {noreply,put_rtstates_ld(NewRTStates,LD)};
-		_ ->                         % In all other cases, let it be.
-		    {noreply,LD}
-	    end;
-	_ ->                                 % Not from our control component.
-	    {noreply,LD}
-    end;
-%% If a runtime component disconnects we mark it as unavailable. We must also
-%% remove all saved trace-flags in order for them to not be accidently reactivated
-%% should the runtime component reconnect and then suspend.
-handle_info({trace_event,CtrlPid,_Time,{disconnected,Node,_}},LD) ->
-    case get_ctrlpid_ld(LD) of
-	CtrlPid ->                           % It is from our control component.
-	    NewRTStates=set_unavailable_rtstates(Node,get_rtstates_ld(LD)),
-	    NewACTstorage=del_node_actstorage(Node,get_actstorage_ld(LD)),
-	    {noreply,put_actstorage_ld(NewACTstorage,put_rtstates_ld(NewRTStates,LD))};
-	_ ->
-	    {noreply,LD}
-    end;
-handle_info(_,LD) ->
-    {noreply,LD}.
-%% ------------------------------------------------------------------------------
-
-%% In terminate we cancel our subscription to event from the trace control component.
-%% That should actually not be necessary, but lets do it the correct way!
-terminate(_,LD) ->
-    case get_ctrlnode_ld(LD) of
-	void ->                              % Non-distributed.
-	    inviso:unsubscribe();
-	Node ->
-	    inviso_tool_lib:inviso_cmd(Node,unsubscribe,[])
-    end.
-%% ------------------------------------------------------------------------------
-
-
-
-%% ==============================================================================
-%% First level help functions to call-backs.
-%% ==============================================================================
-
-%% ------------------------------------------------------------------------------
-%% Help functions to init.
-%% ------------------------------------------------------------------------------
-
-%% Help function which find out the state/status of the runtime components.
-%% Note that since we have just started subscribe to state changes we must
-%% check our inqueue to see that we have no waiting messages for the nodes
-%% we learned the state/status of. If there is a waiting message we don't
-%% know whether that was a state change received before or after the state
-%% check was done. We will then redo the state-check.
-%% Returns {ok,States} or {error,Reason}.
-%% Where States is [{Node,{State,Status},Opts},...].
-%% Note that {error,Reason} can not occur in the non-distributed case.
-init_rtcomponent_states(NodeParams,void,CtrlPid,Nodes) -> % The non-distributed case.
-    ok=inviso:subscribe(),
-    init_rtcomponent_states_2(NodeParams,void,CtrlPid,Nodes,[]);
-init_rtcomponent_states(NodeParams,CtrlNode,CtrlPid,Nodes) ->
-    ok=inviso_tool_lib:inviso_cmd(CtrlNode,subscribe,[]),
-    init_rtcomponent_states_2(NodeParams,CtrlNode,CtrlPid,Nodes,[]).
-
-init_rtcomponent_states_2(_,_,_,[],States) ->
-    {ok,States};
-init_rtcomponent_states_2(NodeParams,void,CtrlPid,_Nodes,States) ->
-    case inviso:get_status() of
-	{ok,StateStatus} ->                  % Got its state/status, now...
-	    {ProblemNodes,NewStates}=
-		init_rtcomponent_states_3(NodeParams,CtrlPid,[{?LOCAL_RUNTIME,{ok,StateStatus}}],
-					  [],States),
-	    init_rtcomponent_states_2(NodeParams,void,CtrlPid,ProblemNodes,NewStates);
-	{error,_Reason} ->                   % The runtime is not available!?
-	    {ok,[{?LOCAL_RUNTIME,unavailable,[]}]} % Create the return value immediately.
-    end;
-init_rtcomponent_states_2(NodeParams,CtrlNode,CtrlPid,Nodes,States) ->
-    case inviso_tool_lib:inviso_cmd(CtrlNode,get_status,[Nodes]) of
-	{ok,NodeResult} ->
-	    {ProblemNodes,NewStates}=
-		init_rtcomponent_states_3(NodeParams,CtrlPid,NodeResult,[],States),
-	    init_rtcomponent_states_2(NodeParams,CtrlNode,CtrlPid,ProblemNodes,NewStates);
-	{error,Reason} ->                    % Severe problem, abort the session.
-	    {error,{get_status,Reason}}
-    end.
-
-%% Traverses the list of returnvalues and checks that we do not have an event
-%% waiting in the message queue. If we do have, it is a problem. That node will
-%% be asked about its state again.
-%% Note that it is here we construct the RTStatesList.
-init_rtcomponent_states_3(NodeParams,CtrlPid,[{Node,{ok,{State,Status}}}|Rest],Problems,States) ->
-    receive
-	{trace_event,CtrlPid,_Time,{state_change,Node,_}} ->
-	    init_rtcomponent_states_3(NodeParams,CtrlPid,Rest,[Node|Problems],States)
-    after
-	0 ->                                 % Not in msg queue, then we're safe!
-	    RTState=case lists:keysearch(Node,1,NodeParams) of
-			{value,{_Node,_TracerData,Opts}} ->
-			    {Node,{State,Status},Opts};
-			_ ->                 % No option available, use [].
-			    {Node,{State,Status},[]}
-		    end,
-	    init_rtcomponent_states_3(NodeParams,CtrlPid,Rest,Problems,[RTState|States])
-    end;
-init_rtcomponent_states_3(NodeParams,CtrlPid,[{Node,{error,_Reason}}|Rest],Problems,States) ->
-    RTState=case lists:keysearch(Node,1,NodeParams) of
-			{value,{_Node,_TracerData,Opts}} ->
-			    {Node,unavailable,Opts};
-			_ ->                 % No option available, use [].
-			    {Node,unavailable,[]}
-		    end,
-    init_rtcomponent_states_3(NodeParams,CtrlPid,Rest,Problems,[RTState|States]);
-init_rtcomponent_states_3(_,_,[],Problems,States) ->
-    {Problems,States}.
-%% ------------------------------------------------------------------------------
-
-%% Help function removing nodes from NodeParams. The reason for this can either
-%% be that we are using a tool internal tracerdata that shall not be forwarded to
-%% the trace control component, or that the node is actually already part of
-%% another session.
-%% Returns {NewNodeParams,NodesWhichShallNotBeInitiated}.
-remove_nodeparams(Nodes,NodesParams) ->
-    remove_nodeparams_2(Nodes,NodesParams,[],[]).
-
-remove_nodeparams_2(Nodes,[NodeParam|Rest],NPAcc,NAcc) when  % NPAcc=NodeParamsAcc.
-  (is_tuple(NodeParam) and ((size(NodeParam)==2) or (size(NodeParam)==3))) ->
-    Node=element(1,NodeParam),
-    Params=element(2,NodeParam),             % This is tracerdata!
-    case lists:member(Node,Nodes) of
-	true ->                              % Remove this one, in another session.
-	    remove_nodeparams_2(Nodes,Rest,NPAcc,NAcc);
-	false ->                             % Ok so far...
-	    case is_tool_internal_tracerdata(Params) of
-		false ->                     % Then keep it and use it later!
-		    remove_nodeparams_2(Nodes,Rest,[{Node,Params}|NPAcc],NAcc);
-		true ->                      % Since it is, remove it from the list.
-		    remove_nodeparams_2(Nodes,Rest,NPAcc,[Node|NAcc])
-	    end
-    end;
-remove_nodeparams_2(Nodes,[_|Rest],NPAcc,NAcc) -> % Faulty NodeParam, skip it!
-    remove_nodeparams_2(Nodes,Rest,NPAcc,NAcc);
-remove_nodeparams_2(_,[],NPAcc,NAcc) ->
-    {lists:reverse(NPAcc),NAcc}.
-%% ------------------------------------------------------------------------------
-
-%% Help function which adds both the nodes which were already part of another
-%% session and the nodes that we actually did not issue any init_tracing for.
-%% Returns a new Result list of [{Node,NodeResult},...].
-init_fix_resultnodes(NodesOtherSes,NodesNotInit,Result) ->
-    NewResult=init_fix_resultnodes_2(NodesOtherSes,{error,in_other_session},Result),
-    init_fix_resultnodes_2(NodesNotInit,ok,NewResult).
-
-init_fix_resultnodes_2([Node|Rest],NodeResult,Result) ->
-    [{Node,NodeResult}|init_fix_resultnodes_2(Rest,NodeResult,Result)];
-init_fix_resultnodes_2([],_,Result) ->
-    Result.                                  % Append Result to the end of the list.
-%% ------------------------------------------------------------------------------
-
-
-%% ------------------------------------------------------------------------------
-%% Help functions to reactivate.
-%% ------------------------------------------------------------------------------
-
-h_reactivate(CtrlNode,Nodes,ACTstorage) ->   % Distributed case.
-    case inviso_tool_lib:inviso_cmd(CtrlNode,cancel_suspension,[Nodes]) of
-	{ok,CSuspResults} ->
-	    {GoodNodes,BadResults}=          % Sort out nodes no longer suspended.
-		lists:foldl(fun({Node,ok},{GoodNs,BadNs})->
-				    {[Node|GoodNs],BadNs};
-			       ({Node,{error,Reason}},{GoodNs,BadNs})->
-				    {GoodNs,[{Node,{error,{cancel_suspension,Reason}}}|BadNs]}
-			    end,
-			    {[],[]},
-			    CSuspResults),
-	    Results=h_reactivate_redo_activity(CtrlNode,GoodNodes,ACTstorage,[]),
-	    {ok,BadResults++Results};
-	{error,Reason} ->                    % General failure cancelling suspend.
-	    {error,{cancel_suspension,Reason}}
-    end.
-%% ------------------------------------------------------------------------------
-
-%% Help function which traverses the list of nodes known to be ours and have
-%% cancelled their suspend. If we fail redoing one of the activities associated
-%% with a node, the node will be reported in the return value as failed. From
-%% that point on its state must be considered unknown since we do not know how
-%% many of the activities were successfully redone.
-h_reactivate_redo_activity(CtrlNode,[Node|Rest],ACTstorage,Acc) ->
-    case get_activities_actstorage(Node,ACTstorage) of
-	{ok,Activities} ->                   % The node existed in activity storage.
-	    {Good,Bad}=h_reactivate_redo_activity_2(CtrlNode,Node,Activities,0,0),
-	    h_reactivate_redo_activity(CtrlNode,Rest,ACTstorage,[{Node,{Good,Bad}}|Acc]);
-	false ->                             % Node not present in activity storage.
-	    h_reactivate_redo_activity(CtrlNode,Rest,ACTstorage,[{Node,{0,0}}|Acc])
-    end;
-h_reactivate_redo_activity(_CtrlNode,[],_,Acc) ->
-    lists:reverse(Acc).
-
-%% Help function actually redoing the activity. Note that there must be one
-%% clause here for every type of activity.
-%% Returns {NrGoodCmds,NrBadCmds}.
-%% The number of good or bad commands refers to inviso commands done. If any
-%% of the subparts of such a command returned an error, the command is concidered
-%% no good.
-h_reactivate_redo_activity_2(CtrlNode,Node,[{tf,{Op,TraceConfList}}|Rest],Good,Bad) ->
-    case inviso_tool_lib:inviso_cmd(CtrlNode,Op,[[Node],TraceConfList]) of
-	{ok,[{_Node,{ok,Answers}}]} ->
-	    case h_reactivate_redo_activity_check_tf(Answers) of
-		ok ->
-		    h_reactivate_redo_activity_2(CtrlNode,Node,Rest,Good+1,Bad);
-		error ->                     % At least oneReports the first encountered error.
-		    h_reactivate_redo_activity_2(CtrlNode,Node,Rest,Good,Bad+1)
-	    end;
-	{ok,[{_Node,{error,_Reason}}]} ->
-	    h_reactivate_redo_activity_2(CtrlNode,Node,Rest,Good,Bad+1);
-	{error,_Reason} ->                   % General error when doing cmd.
-	    h_reactivate_redo_activity_2(CtrlNode,Node,Rest,Good,Bad+1)
-    end;
-h_reactivate_redo_activity_2(CtrlNode,Node,[{tpm,{Op,InvisoCmdParams}}|Rest],Good,Bad) ->
-    case inviso_tool_lib:inviso_cmd(CtrlNode,Op,[[Node]|InvisoCmdParams]) of
-	{ok,[{_Node,ok}]} ->
-	    h_reactivate_redo_activity_2(CtrlNode,Node,Rest,Good+1,Bad);
-	{ok,[{_Node,{error,_Reason}}]} ->
-	    h_reactivate_redo_activity_2(CtrlNode,Node,Rest,Good,Bad+1);
-	{error,_Reason} ->                   % General error when doing cmd.
-	    h_reactivate_redo_activity_2(CtrlNode,Node,Rest,Good,Bad+1)
-    end;
-h_reactivate_redo_activity_2(_CtrlNode,_Node,[],Good,Bad) ->
-    {Good,Bad}.
-
-%% Help function traversing a list of results from inviso:tf/2 or inviso:ctf/2
-%% to see if there were any errors.
-h_reactivate_redo_activity_check_tf([N|Rest]) when integer(N) ->
-    h_reactivate_redo_activity_check_tf(Rest);
-h_reactivate_redo_activity_check_tf([{error,_Reason}|_]) ->
-    error;
-h_reactivate_redo_activity_check_tf([]) ->
-    ok.
-%% ------------------------------------------------------------------------------
-
-
-%% ------------------------------------------------------------------------------
-%% Help functions to tp (setting trace patterns, both local and global).
-%% ------------------------------------------------------------------------------
-
-%% Help function which handles both tpl and tp. Note that the non-distributed case
-%% handled with Nodes='all'.
-%% Returns what shall be the reply to the client.
-h_tp(all,PatternFunc,Mod,F,A,MS,Opts,LD) ->  % All available runtime nodes.
-    Nodes=get_all_available_nodes_rtstates(get_rtstates_ld(LD)),
-    h_tp(Nodes,PatternFunc,Mod,F,A,MS,Opts,LD);
-h_tp(Nodes,PatternFunc,Mod,F,A,MS,Opts,LD) -> % Only certain nodes in the session.
-    CtrlNode=get_ctrlnode_ld(LD),
-    Dbg=get_dbg_ld(LD),
-    SafetyCatches=get_safetycatches_ld(LD),
-    case inviso_tool_lib:expand_module_names(Nodes,Mod,Opts) of % Take care of any reg-exps.
-	{multinode_expansion,NodeMods} ->
-	    NodeTPs=inviso_tool_lib:make_patterns(SafetyCatches,Opts,Dbg,NodeMods,F,A,MS),
-	    h_tp_node_by_node(CtrlNode,PatternFunc,Dbg,NodeTPs,[]);
-	{singlenode_expansion,Modules} ->
-	    TPs=inviso_tool_lib:make_patterns(SafetyCatches,Opts,Dbg,Modules,F,A,MS),
-	    h_tp_do_tps(CtrlNode,Nodes,TPs,PatternFunc,Dbg);
-	module ->
-	    TPs=inviso_tool_lib:make_patterns(SafetyCatches,Opts,Dbg,[Mod],F,A,MS),
-	    h_tp_do_tps(CtrlNode,Nodes,TPs,PatternFunc,Dbg);
-	wildcard ->                          % Means do for all modules, no safety.
-	    h_tp_do_tps(CtrlNode,Nodes,[{Mod,F,A,MS}],PatternFunc,Dbg);
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-
-%% Note that this function can never be called in the non-distributed case.
-h_tp_node_by_node(CtrlNode,PatternFunc,Dbg,[{Node,TPs}|Rest],Accum) ->
-    case h_tp_do_tps(CtrlNode,[Node],TPs,PatternFunc,Dbg) of
-	{ok,[{Node,Result}]} ->
-	    h_tp_node_by_node(CtrlNode,PatternFunc,Dbg,Rest,[{Node,Result}|Accum]);
-	{error,Reason} ->                    % Failure, but don't stop.
-	    h_tp_node_by_node(CtrlNode,PatternFunc,Dbg,Rest,[{Node,{error,Reason}}|Accum])
-    end;
-h_tp_node_by_node(_,_,_,[],Accum) ->
-    {ok,lists:reverse(Accum)}.
-
-%% Help function which does the actual call to the trace control component.
-%% Note that Nodes can be a list of nodes (including a single one) or
-%% ?LOCAL_RUNTIME if we are not distributed. The non-distributed case is otherwise
-%% detected by the 'void' CtrlNode.
-%% Returns {ok,[{Node,{ok,{NrOfFunctions,NrOfErrors}}},{Node,{error,Reason}},...]} or
-%% {error,Reason}. In the non-distributed case {ok,{NrOfFunctions,NrOfErros}} or
-%% {error,Reason}.
-h_tp_do_tps(void,_Nodes,TPs,PatternFunc,Dbg) -> % Non distributed case!
-    inviso_tool_lib:debug(tp,Dbg,[TPs,PatternFunc]),
-    case inviso:PatternFunc(TPs) of
-	{ok,Result} ->                       % A list of [Nr1,Nr2,error,...].
-	    {ok,
-	     lists:foldl(fun(N,{AccNr,AccErr}) when integer(N) ->
-				 {AccNr+N,AccErr};
-			    (error,{AccNr,AccErr}) ->
-				 {AccNr,AccErr+1}
-			 end,
-			 {0,0},
-			 Result)};
-	{error,Reason} ->
-	    {error,{PatternFunc,Reason}}
-    end;
-h_tp_do_tps(CtrlNode,Nodes,TPs,PatternFunc,Dbg) ->
-    inviso_tool_lib:debug(tp,Dbg,[Nodes,TPs,PatternFunc]),
-    case inviso_tool_lib:inviso_cmd(CtrlNode,PatternFunc,[Nodes,TPs]) of
-	{ok,Result} ->                       % Result is [{Node,Result},...].
-	    {ok,
-	     lists:map(fun({Node,{ok,Res}})->
-			       {Node,lists:foldl(fun(N,{ok,{AccNr,AccErr}}) when integer(N) ->
-							 {ok,{AccNr+N,AccErr}};
-						    (error,{AccNr,AccErr}) ->
-							 {ok,{AccNr,AccErr+1}}
-						 end,
-						 {ok,{0,0}},
-						 Res)};
-			  ({_Node,{error,Reason}})->
-			       {error,Reason}
-		       end,
-		       Result)};
-	{error,Reason} ->
-	    {error,{PatternFunc,Reason}}
-    end.
-%% ------------------------------------------------------------------------------
-
-%% ------------------------------------------------------------------------------
-%% Help functions for removing trace-patterns.
-%% ------------------------------------------------------------------------------
-
-%% NOT IMPLEMENTED YET.
-h_ctp(Node,PatternFunc,Mod,F,A,LD) ->
-    tbd.
-%% ------------------------------------------------------------------------------
-
-
-%% ------------------------------------------------------------------------------
-%% Help functions for calling the trace information facility.
-%% ------------------------------------------------------------------------------
-
-
-%% Function handling the meta trace pattern for capturing registration of local
-%% process names.
-h_tpm_localnames(CtrlNode,Nodes,RTStates,ACTstorage) ->
-    AvailableNodes=get_all_available_nodes_rtstates(RTStates),
-    {Nodes3,FaultyNodes}=remove_nodes_not_ours(Nodes,AvailableNodes),
-    case inviso_tool_lib:inviso_cmd(CtrlNode,tpm_localnames,[Nodes3]) of
-	{ok,Result} ->                       % That good we want to modify tpmstorage!
-	    NewACTstorage=add_tpm_actstorage(Result,tpm_localnames,[],ACTstorage),
-	    ErrorResult=lists:map(fun(N)->{N,{error,not_available}} end,FaultyNodes),
-	    {{ok,ErrorResult++Result},NewACTstorage};
-	{error,Reason} ->                    % If general failure, do not modify storage.
-	    {{error,Reason},ACTstorage}
-    end.
-%% ------------------------------------------------------------------------------
-
-%% Functions calling meta trace functions for specified nodes. This function is
-%% intended for use with all tmp function calls, init_tpm,tpm,tpm_ms,ctpm_ms and
-%% ctpm.
-%% Note that we must store called meta trace functions and their parameters in the
-%% activity storage in order to be able to redo them in case of a reactivate.
-h_all_tpm(CtrlNode,Nodes,TpmCmd,InvisoCmdParams,RTStates,ACTstorage) ->
-    AvailableNodes=get_all_available_nodes_rtstates(RTStates),
-    {Nodes3,FaultyNodes}=remove_nodes_not_ours(Nodes,AvailableNodes),
-    case inviso_tool_lib:inviso_cmd(CtrlNode,TpmCmd,[Nodes3|InvisoCmdParams]) of
-	{ok,Result} ->                       % That good we want to modify tpmstorage!
-	    NewACTstorage=add_tpm_actstorage(Result,TpmCmd,InvisoCmdParams,ACTstorage),
-	    ErrorResult=lists:map(fun(N)->{N,{error,not_available}} end,FaultyNodes),
-	    {{ok,ErrorResult++Result},NewACTstorage};
-	{error,Reason} ->                    % If general failure, do not modify storage.
-	    {{error,Reason},ACTstorage}
-    end.
-%% ------------------------------------------------------------------------------
-
-
-%% ------------------------------------------------------------------------------
-%% Help functions for set trace flags.
-%% ------------------------------------------------------------------------------
-
-%% Help function which sets the tracepatterns in TraceConfList for all nodes
-%% mentioned in Nodes. Note that non-distributed case is handled with Nodes='all'.
-%% Returns {Reply,NewACTstorage} where Reply is whatever shall be returned to caller
-%% and NewACTstorage is traceflag storage modified with the flags added to the
-%% corresponding nodes.
-h_tf(void,_Nodes,TraceConfList,ACTstorage,_RTStates) -> % The non-distributed case.
-    Reply=inviso:tf(TraceConfList),
-    NewACTstorage=add_tf_actstorage([{?LOCAL_RUNTIME,Reply}],tf,TraceConfList,ACTstorage),
-    {Reply,NewACTstorage};
-h_tf(CtrlNode,all,TraceConfList,ACTstorage,RTStates) ->
-    AllNodes=get_all_session_nodes_rtstates(RTStates),
-    h_tf(CtrlNode,AllNodes,TraceConfList,ACTstorage,RTStates);
-h_tf(CtrlNode,Nodes,TraceConfList,ACTstorage,_RTStates) ->
-    case inviso_tool_lib:inviso_cmd(CtrlNode,tf,[Nodes,TraceConfList]) of
-	{ok,Result} ->                       % That good we want to modify actstorage!
-	    NewACTstorage=add_tf_actstorage(Result,tf,TraceConfList,ACTstorage),
-	    {{ok,Result},NewACTstorage};
-	{error,Reason} ->                    % If general failure, do not modify actstorage.
-	    {{error,Reason},ACTstorage}
-    end.
-%% ------------------------------------------------------------------------------
-
-%% ------------------------------------------------------------------------------
-%% Help functions to stop_session.
-%% ------------------------------------------------------------------------------
-
-%% This function fetches all local log-files using our stored tracerdata. Note
-%% that there are two major ways of tranfering logfiles. Either via distributed
-%% Erlang or by common filesystem (like NFS). The default is distributed Erlang.
-%% But there may be info in the RTStates structure about a common file-system.
-%% Returns {FailedNodes,FetchedFileNames} where FailedNodes is a list of
-%% nodenames where problems occurred. Note that problems does not necessarily
-%% mean that no files were copied.
-%% FetchedFileNames contains one or two of the tuples {trace_log,Files} and/or
-%% {ti_log,Files}, listing all files successfully fetched. Note that the
-%% list of fetched files contains sublists of filenames. One for each node and
-%% tracerdata.
-%% In the non-distributed system we always use copy (since the files always
-%% resides locally).
-transfer_logfiles(RTStates,CtrlNode,Dir,Prefix,TRDstorage,Dbg,AvailableNodes) ->
-    if
-	CtrlNode==void ->                    % When non-distributed, always copy!
-		fetch_logfiles_copy(CtrlNode,Dir,Prefix,TRDstorage,Dbg,[?LOCAL_RUNTIME]);
-	true ->                              % The distributed case.
-	    {FetchNodes,CopyNodes}=find_logfile_transfer_methods(AvailableNodes,RTStates),
-	    {FailedFetchNodes,FetchedFiles}=
-		case fetch_logfiles_distributed(CtrlNode,Dir,Prefix,TRDstorage,Dbg,FetchNodes) of
-		    {ok,Failed,Files} ->     % So far no disasters.
-			{Failed,Files};
-		    {error,Reason} ->        % Means all fetch-nodes failed!
-			inviso_tool_lib:debug(transfer_logfiles,Dbg,[FetchNodes,Reason]),
-			{lists:map(fun(N)->{N,error} end,FetchNodes),[]}
-		end,
-	    {FailedCopyNodes,CopiedFiles}=
-		fetch_logfiles_copy(CtrlNode,Dir,Prefix,TRDstorage,Dbg,CopyNodes),
-	    {FailedFetchNodes++FailedCopyNodes,FetchedFiles++CopiedFiles}
-    end.
-
-%% Help function which finds out which node we have a common file system with
-%% and from which we must make distributed erlang tranfere.
-%% Returns {DistributedNodes,CopyNodes} where CopyNode is [{Node,CopyFromDir},...].
-find_logfile_transfer_methods(Nodes,RTStates) ->
-    find_logfile_transfer_methods_2(Nodes,RTStates,[],[]).
-
-find_logfile_transfer_methods_2([Node|Rest],RTStates,FetchAcc,CopyAcc) ->
-    {ok,Opts}=get_opts_rtstates(Node,RTStates), % Node must be in RTStates!
-    case lists:keysearch(?COPY_LOG_FROM,1,Opts) of
-	{value,{_,FromDir}} when list(FromDir) -> % Node has common filesystem.
-	    find_logfile_transfer_methods_2(Rest,RTStates,FetchAcc,[{Node,FromDir}|CopyAcc]);
-	{value,_} ->                         % Can't understand dir option.
-	    find_logfile_transfer_methods_2(Rest,RTStates,[Node|FetchAcc],CopyAcc);
-	false ->                             % Then we want to use fetch instead.
-	    find_logfile_transfer_methods_2(Rest,RTStates,[Node|FetchAcc],CopyAcc)
-    end;
-find_logfile_transfer_methods_2([],_,FetchAcc,CopyAcc) ->
-    {FetchAcc,CopyAcc}.
-%% ------------------------------------------------------------------------------
-
-%% Help function which transferes all local logfiles according to the tracerdata
-%% stored for the nodes in Nodes.
-%% Returns {ok,FailedNodes,FileNodeSpecs} or {error,Reason}.
-%% FailedNodes is a list of nodes where fetching logs did not succeed, partially
-%% or not at all.
-%% FileNames is a list of list of actually fetched files (the name as it is here, including
-%% Dir). The sublists are files which belong together.
-fetch_logfiles_distributed(CtrlNode,Dir,Prefix,TRDstorage,Dbg,Nodes) ->
-    LogSpecList=build_logspeclist(Nodes,TRDstorage),
-    case inviso_fetch_log(inviso_tool_lib:inviso_cmd(CtrlNode,
-						     fetch_log,
-						     [LogSpecList,Dir,Prefix])) of
-	{ok,Result} ->
-	    Files=get_all_filenames_fetchlog_result(Result,Dbg),
-	    FailedNodes=get_all_failednodes_fetchlog_result(Result),
-	    {ok,FailedNodes,Files};
-	{error,Reason} ->                    % Some general failure!
-	    {error,{fetch_log,Reason}}
-    end.
-
-%% Help function which constructs a list {Node,TracerData} for all nodes in Nodes.
-%% Note that there may be more than one tracerdata for a node, resulting in multiple
-%% tuples for that node.
-build_logspeclist(Nodes,TRDstorage) ->
-    build_logspeclist_2(Nodes,TRDstorage,[]).
-
-build_logspeclist_2([Node|Rest],TRDstorage,Acc) ->
-    TRDlist=find_tracerdata_for_node_trd(Node,TRDstorage), % A list of all tracerdata.
-    build_logspeclist_2(Rest,
-			TRDstorage,
-			[lists:map(fun(TRD)->{Node,TRD} end,TRDlist)|Acc]);
-build_logspeclist_2([],_,Acc) ->
-    lists:flatten(Acc).
-
-%% Help function which translates inviso:fetch_log return values to what I
-%% want!
-inviso_fetch_log({error,Reason}) ->
-    {error,Reason};
-inviso_fetch_log({_Success,ResultList}) ->
-    {ok,ResultList}.
-
-%% Help function which collects all filenames mentioned in a noderesult structure.
-%% The files may or may not be complete.
-%% Returns a list of list of filenames. Each sublist contains files which belong
-%% together, i.e because they are a wrap-set.
-get_all_filenames_fetchlog_result(NodeResult,Dbg) ->
-    get_all_filenames_fetchlog_result_2(NodeResult,Dbg,[]).
-
-get_all_filenames_fetchlog_result_2([{Node,{Success,FileInfo}}|Rest],Dbg,Accum) 
-  when Success=/=error, list(FileInfo) ->
-    SubAccum=get_all_filenames_fetchlog_result_3(FileInfo,[]),
-    get_all_filenames_fetchlog_result_2(Rest,Dbg,[{Node,SubAccum}|Accum]);
-get_all_filenames_fetchlog_result_2([{Node,{error,FReason}}|Rest],Dbg,Accum) ->
-    inviso_tool_lib:debug(fetch_files,Dbg,[Node,FReason]),
-    get_all_filenames_fetchlog_result_2(Rest,Dbg,Accum);
-get_all_filenames_fetchlog_result_2([],_Dbg,Accum) ->
-    Accum.
-
-get_all_filenames_fetchlog_result_3([{FType,Files}|Rest],SubAccum) ->
-    FilesOnly=lists:foldl(fun({ok,FName},Acc)->[FName|Acc];(_,Acc)->Acc end,[],Files),
-    get_all_filenames_fetchlog_result_3(Rest,[{FType,FilesOnly}|SubAccum]);
-get_all_filenames_fetchlog_result_3([],SubAccum) ->
-    SubAccum.		  
-
-%% Help function which traverses a noderesult and builds a list as return
-%% value containing the nodenames of all nodes not being complete.
-%% Note that a node may occur multiple times since may have fetched logfiles
-%% for several tracerdata from the same node. Makes sure the list contains
-%% unique node names.
-%% Returns a list nodes.
-get_all_failednodes_fetchlog_result(NodeResult) ->
-    get_all_failednodes_fetchlog_result_2(NodeResult,[]).
-
-get_all_failednodes_fetchlog_result_2([{_Node,{complete,_}}|Rest],Acc) ->
-    get_all_failednodes_fetchlog_result_2(Rest,Acc);
-get_all_failednodes_fetchlog_result_2([{Node,{_Severity,_}}|Rest],Acc) ->
-    case lists:member(Node,Acc) of
-	true ->                              % Already in the list.
-	    get_all_failednodes_fetchlog_result_2(Rest,Acc);
-	false ->                             % Not in Acc, add it!
-	    get_all_failednodes_fetchlog_result_2(Rest,[Node|Acc])
-    end;
-get_all_failednodes_fetchlog_result_2([],Acc) ->
-    Acc.
-%% ------------------------------------------------------------------------------
-
-%% Help function which copies files from one location to Dir and at the same time
-%% adds the Prefix to the filename. NodeSpecs contains full path to the files. The
-%% reason the node information is still part of NodeSpecs is that otherwise we can
-%% not report faulty nodes. Note that one node may occur multiple times since there
-%% may be more than one tracerdata for a node.
-%% Returns {FailedNodes,Files} where FailedNodes is a list of nodes where problems
-%% occurred. Files is a tuple list of [{Node,[{FType,FileNames},...]},...].
-fetch_logfiles_copy(CtrlNode,Dir,Prefix,TRDstorage,Dbg,NodeSpecs) ->
-    CopySpecList=build_copylist(CtrlNode,Dbg,NodeSpecs,TRDstorage),
-    fetch_logfiles_copy_2(Dir,Prefix,Dbg,CopySpecList,[],[]).
-
-fetch_logfiles_copy_2(Dir,Prefix,Dbg,[{Node,CopySpecs}|Rest],FailedNodes,Files) ->
-    case fetch_logfiles_copy_3(Dir,Prefix,Dbg,CopySpecs,[],0) of
-	{0,LocalFiles} ->                    % Copy went ok and zero errors.
-	    fetch_logfiles_copy_2(Dir,Prefix,Dbg,Rest,FailedNodes,[{Node,LocalFiles}|Files]);
-	{_N,LocalFiles} ->                   % Copied files, but some went wrong.
-	    case lists:member(Node,FailedNodes) of
-		true ->                      % Node already in FailedNodes.
-		    fetch_logfiles_copy_2(Dir,Prefix,Dbg,Rest,FailedNodes,
-					  [{Node,LocalFiles}|Files]);
-		false ->                     % Node not marked as failed, yet.
-		    fetch_logfiles_copy_2(Dir,Prefix,Dbg,Rest,[Node|FailedNodes],
-					  [{Node,LocalFiles}|Files])
-	    end
-    end;
-fetch_logfiles_copy_2(_,_,_,[],FailedNodes,Files) ->
-    {FailedNodes,Files}.                     % The return value from fetch_logfiles_copy.
-
-fetch_logfiles_copy_3(Dir,Prefix,Dbg,[{FType,RemoteFiles}|Rest],Results,Errors) ->
-    {Err,LocalFiles}=fetch_logfiles_copy_3_1(Dir,Prefix,Dbg,RemoteFiles,[],0),
-    fetch_logfiles_copy_3(Dir,Prefix,Dbg,Rest,[{FType,LocalFiles}|Results],Errors+Err);
-fetch_logfiles_copy_3(_,_,_,[],Results,Errors) ->
-    {Errors,Results}.
-
-%% For each file of one file-type (e.g. trace_log).
-fetch_logfiles_copy_3_1(Dir,Prefix,Dbg,[File|Rest],LocalFiles,Errors) ->
-    DestName=Prefix++filename:basename(File),
-    Destination=filename:join(Dir,DestName),
-    case do_copy_file(File,Destination) of
-	ok ->
-	    fetch_logfiles_copy_3_1(Dir,Prefix,Dbg,Rest,[DestName|LocalFiles],Errors);
-	{error,Reason} ->
-	    inviso_tool_lib:debug(copy_files,Dbg,[File,Destination,Reason]),
-	    fetch_logfiles_copy_3_1(Dir,Prefix,Dbg,Rest,LocalFiles,Errors+1)
-    end;
-fetch_logfiles_copy_3_1(_,_,_,[],LocalFiles,Errors) ->
-    {Errors,LocalFiles}.
-
-%% Help function which builds a [{Node,[{Type,[ListOfRemoteFiles]}},...}]
-%% where Type describes trace_log or ti_log and each entry in ListOfRemoteFiles
-%% is a complete path to a file to be copied.
-build_copylist(CtrlNode,Dbg,NodeSpecList,TRDstorage) ->
-    build_copylist_2(CtrlNode,Dbg,NodeSpecList,TRDstorage,[]).
-
-%% For each node specified in the NodeSpecList.
-build_copylist_2(CtrlNode,Dbg,[{Node,SourceDir}|Rest],TRDstorage,Acc) ->
-    TRDlist=find_tracerdata_for_node_trd(Node,TRDstorage),
-    CopySpecList=build_copylist_3(CtrlNode,Dbg,SourceDir,Node,TRDlist),
-    build_copylist_2(CtrlNode,Dbg,Rest,TRDstorage,[CopySpecList|Acc]);
-build_copylist_2(_,_,[],_,Acc) ->
-    lists:flatten(Acc).
-
-%% For each tracerdata found for the node.
-build_copylist_3(void,Dbg,SourceDir,Node,[TRD|Rest]) -> % The non-distributed case.
-    case inviso:list_logs(TRD) of
-	{ok,FileSpec} when list(FileSpec) -> % [{trace_log,Dir,Files},...]
-	    NewFileSpec=build_copylist_4(SourceDir,FileSpec,[]),
-	    [{Node,NewFileSpec}|build_copylist_3(void,Dbg,SourceDir,Node,Rest)];
-	{ok,no_log} ->                       % This tracedata not associated with any log.
-	    build_copylist_3(void,Dbg,SourceDir,Node,Rest);
-	{error,Reason} ->
-	    inviso_tool_lib:debug(list_logs,Dbg,[Node,TRD,Reason]),
-	    build_copylist_3(void,Dbg,SourceDir,Node,Rest)
-    end;
-build_copylist_3(CtrlNode,Dbg,SourceDir,Node,[TRD|Rest]) -> % The distributed case.
-    case inviso_tool_lib:inviso_cmd(CtrlNode,list_logs,[[{Node,TRD}]]) of
-	{ok,[{Node,{ok,FileSpec}}]} when list(FileSpec) ->
-	    NewFileSpec=build_copylist_4(SourceDir,FileSpec,[]),
-	    [{Node,NewFileSpec}|build_copylist_3(CtrlNode,Dbg,SourceDir,Node,Rest)];
-	{ok,[{Node,{ok,no_log}}]} ->         % It relays to another node, no files!
-	    build_copylist_3(CtrlNode,Dbg,SourceDir,Node,Rest);
-	{ok,[{Node,{error,Reason}}]} ->
-	    inviso_tool_lib:debug(list_logs,Dbg,[Node,TRD,Reason]),
-	    build_copylist_3(CtrlNode,Dbg,SourceDir,Node,Rest);
-	{error,Reason} ->                    % Some general failure.
-	    inviso_tool_lib:debug(list_logs,Dbg,[Node,TRD,Reason]),
-	    build_copylist_3(CtrlNode,Dbg,SourceDir,Node,Rest)
-    end;
-build_copylist_3(_,_,_,_,[]) ->
-    [].
-
-%% Help function which makes a [{Type,Files},...] list where each file in Files
-%% is with full path as found from our file-system.
-build_copylist_4(SourceDir,[{Type,_Dir,Files}|Rest],Accum) ->
-    NewFiles=
-	lists:foldl(fun(FName,LocalAcc)->[filename:join(SourceDir,FName)|LocalAcc] end,
-		    [],
-		    Files),
-    build_copylist_4(SourceDir,Rest,[{Type,NewFiles}|Accum]);
-build_copylist_4(_,[],Accum) ->
-    Accum.
-				 
-
-%% Help function which copies a file using os:cmd.
-%% Returns 'ok' or {error,Reason}.
-do_copy_file(Source,Destination) ->
-    case os:type() of
-	{win32,_} ->
-	    os:cmd("copy "++Source++" "++Destination), % Perhaps a test on success?
-	    ok;
-	{unix,_} ->
-	    os:cmd("cp "++Source++" "++Destination), % Perhaps a test on success?
-	    ok
-    end.
-%% ------------------------------------------------------------------------------
-
-
-%% ------------------------------------------------------------------------------
-
-%% ==============================================================================
-%% Various help functions.
-%% ==============================================================================
-
-%% Help function going through the Nodes list and checking that only nodes
-%% mentioned in OurNodes gets returned. It also makes the nodes in the return
-%% value unique.
-remove_nodes_not_ours(Nodes,OurNodes) ->
-    remove_nodes_not_ours_2(Nodes,OurNodes,[],[]).
-
-remove_nodes_not_ours_2([Node|Rest],OurNodes,OurAcc,OtherAcc) ->
-    case lists:member(Node,OurNodes) of
-	true ->                              % Ok it is one of our nodes.
-	    case lists:member(Node,OurAcc) of
-		true ->                      % Already in the list, skip.
-		    remove_nodes_not_ours_2(Rest,OurNodes,OurAcc,OtherAcc);
-		false ->
-		    remove_nodes_not_ours_2(Rest,OurNodes,[Node|OurAcc],OtherAcc)
-	    end;
-	false ->
-	    case lists:member(Node,OtherAcc) of
-		true ->
-		    remove_nodes_not_ours_2(Rest,OurNodes,OurAcc,OtherAcc);
-		false ->
-		    remove_nodes_not_ours_2(Rest,OurNodes,OurAcc,[Node|OtherAcc])
-	    end
-    end;
-remove_nodes_not_ours_2([],_,OurAcc,OtherAcc) ->
-    {lists:reverse(OurAcc),lists:reverse(OtherAcc)}.
-%% ------------------------------------------------------------------------------
-
-%% Help function which returns 'true' or 'false' depending on if TracerData is
-%% meant to be used by the session handler (true) or if it supposed to be passed
-%% on to the trace system.
-is_tool_internal_tracerdata(_) -> % CURRENTLY NO INTERNAL TRACER DATA!
-    false.
-%% ------------------------------------------------------------------------------
-
-%% Help function which checks that all nodes in the first list of nodes exists
-%% in the second list of nodes. Returns 'true' or 'false'. The latter if as much
-%% as one incorrect node was found.
-check_our_nodes([Node|Rest],AllNodes) ->
-    case lists:member(Node,AllNodes) of
-	true ->
-	    check_our_nodes(Rest,AllNodes);
-	false ->                             % Then we can stop right here.
-	    false
-    end;
-check_our_nodes([],_) ->
-    true.
-%% ------------------------------------------------------------------------------
-
-%% Help function which checks that a directory actually exists. Returns 'true' or
-%% 'false'.
-check_directory_exists(Dir) ->
-    case file:read_file_info(Dir) of
-	{ok,#file_info{type=directory}} ->
-	    true;
-	_ ->                                 % In all other cases it is not valid.
-	    false
-    end.
-%% ------------------------------------------------------------------------------
-
-%% This function stops the tracing on all nodes in Nodes. Preferably Nodes is a list
-%% of only tracing runtime components. Not that there will actually be any difference
-%% since the return value does not reflect how stopping the nodes went.
-%% Returns 'ok' or {error,Reason}, the latter only in case of general failure.
-stop_all_tracing(void,Dbg,[?LOCAL_RUNTIME]) ->   % The non-distributed case, and is tracing.
-    case inviso:stop_tracing() of
-	{ok,_State} ->
-	    ok;
-	{error,Reason} ->                    % We actually don't care.
-	    inviso_tool_lib:debug(stop_tracing,Dbg,[?LOCAL_RUNTIME,Reason]),
-	    ok
-    end;
-stop_all_tracing(void,_,_) ->                % There is no local runtime started.
-    ok;
-stop_all_tracing(CtrlNode,Dbg,Nodes) ->
-    case inviso_tool_lib:inviso_cmd(CtrlNode,stop_tracing,[Nodes]) of
-	{ok,Result} ->                       % The result is only used for debug.
-	    Failed=lists:foldl(fun({N,{error,Reason}},Acc)->[{N,{error,Reason}}|Acc];
-				  (_,Acc)->Acc
-			       end,
-			       [],
-			       Result),
-	    if
-		Failed==[] ->
-		    ok;
-		true ->
-		    inviso_tool_lib:debug(stop_tracing,Dbg,[Nodes,Failed]),
-		    ok
-	    end;
-	{error,Reason} ->
-	    {error,{stop_tracing,Reason}}
-    end.
-%% ------------------------------------------------------------------------------
-
-%% Help function removing all local logs using the tracerdata to determine what
-%% logs to remove from where.
-%% There is no significant return value since it is not really clear what to do
-%% if removal went wrong. The function can make debug-reports thought.
-remove_all_local_logs(CtrlNode,TRDstorage,Nodes,Dbg) ->
-    LogSpecList=build_logspeclist_remove_logs(Nodes,TRDstorage),
-    case inviso_tool_lib:inviso_cmd(CtrlNode,delete_log,[LogSpecList]) of
-	{ok,Results} ->
-	    case look_for_errors_resultlist(Results) of
-		[] ->                        % No errors found in the result!
-		    true;
-		Errors ->
-		    inviso_tool_lib:debug(remove_all_local_logs,Dbg,[Errors]),
-		    true
-	    end;
-	{error,Reason} ->                    % Some general error.
-	    inviso_tool_lib:debug(remove_all_local_logs,Dbg,[{error,Reason}]),
-	    true
-    end.
-
-%% Help function which puts together a list of {Node,Tracerdata} tuples. Note that
-%% we must build one tuple for each tracerdata for one node.
-build_logspeclist_remove_logs(Nodes,TRDstorage) ->
-    [{Node,TracerData}||Node<-Nodes,TracerData<-find_tracerdata_for_node_trd(Node,TRDstorage)].
-%% ------------------------------------------------------------------------------
-
-%% Help function which traverses a resultlist from an inviso function. Such are
-%% built up as [{Node,SubResults},...] where SubResult is a list of tuples for each
-%% file-type (e.g trace_log) {FType,FileList} where a FileList is either {error,Reason}
-%% or {ok,FileName}.
-%% Returns a list of {Node,[{error,Reason},...]}.
-look_for_errors_resultlist([{Node,{error,Reason}}|Rest]) ->
-    [{Node,{error,Reason}}|look_for_errors_resultlist(Rest)];
-look_for_errors_resultlist([{Node,{ok,NResults}}|Rest]) when list(NResults) ->
-    case look_for_errors_resultlist_2(NResults,[]) of
-	[] ->
-	    look_for_errors_resultlist(Rest);
-	Errors ->                            % A list of lists.
-	    [{Node,lists:flatten(Errors)}|look_for_errors_resultlist(Rest)]
-    end;
-look_for_errors_resultlist([_|Rest]) ->
-    look_for_errors_resultlist(Rest);
-look_for_errors_resultlist([]) ->
-    [].
-
-look_for_errors_resultlist_2([{_FType,NSubResult}|Rest],Accum) ->
-    case lists:filter(fun({error,_Reason})->true;(_)->false end,NSubResult) of
-	[] ->                                % No errors for this node.
-	    look_for_errors_resultlist_2(Rest,Accum);
-	Errors ->                            % A list of at least one error.
-	    look_for_errors_resultlist_2(Rest,[Errors|Accum])
-    end;
-look_for_errors_resultlist_2([],Accum) ->
-    Accum.
-%% ------------------------------------------------------------------------------
-
-
-%% ------------------------------------------------------------------------------
-%% Functions working on the loopdata structure.
-%% Its main purpose is to store information about runtime components participating
-%% in the session and their current status.
-%% ------------------------------------------------------------------------------
-
--record(ld,{parent,
-	    ctrlnode,
-	    ctrlpid,                         % To where to send inviso cmd.
-	    rtstates,
-	    tracerdata,
-	    safetycatches,
-	    dbg,
-	    actstorage                       % Activity storage, for reactivate.
-	   }).
-
-%% Function creating the initial datastructure.
-%% The datastructure is [{Node,State},...].
-%%
-%% The tracerdata table is a bag simply for the reason that if we try to insert
-%% the same tracerdata for a node twice, we will end up with one tracerdata after
-%% all. This is useful when we insert tracerdata ourselves, the tracerdata will
-%% come as a state-change too.
-mk_ld(Parent,CtrlNode,CtrlPid,RTStates,NodeParams,OtherNodes,SafetyCatches,Dbg) ->
-    TRDtableName=list_to_atom("inviso_tool_sh_trdstorage_"++pid_to_list(self())),
-    TRDtid=ets:new(TRDtableName,[bag]),
-    ACTtableName=list_to_atom("inviso_tool_sh_actstorage_"++pid_to_list(self())),
-    ACTtid=ets:new(ACTtableName,[bag]),
-    mk_ld_fill_tracerdata(CtrlNode,TRDtid,NodeParams,OtherNodes), % Fill the ETS table.
-    #ld{parent=Parent,                       % The tool main process.
-	ctrlnode=CtrlNode,                   % Node name where the control component is.
-	ctrlpid=CtrlPid,                     % The process id of the control component.
-	rtstates=RTStates,                   % All nodes and their state/status.
-	tracerdata=TRDtid,
-	safetycatches=SafetyCatches,
-	dbg=Dbg,
-	actstorage=ACTtid
-       }.
-
-%% Help function which inserts tracer data for the nodes. Note that we can get
-%% tracer data either from the return value from init_tracing or by asking the
-%% node for it. The latter is necessary for the nodes which were marked not to
-%% be initiated by the session handler. This maybe because those nodes have
-%% autostarted.
-mk_ld_fill_tracerdata(CtrlNode,TId,NodeParams,OtherNodes) ->
-    mk_ld_fill_tracerdata_nodeparams(TId,NodeParams),
-    mk_ld_fill_tracerdata_othernodes(CtrlNode,TId,OtherNodes).
-
-mk_ld_fill_tracerdata_nodeparams(TId,[{Node,TracerData}|Rest]) ->
-    ets:insert(TId,{Node,TracerData}),
-    mk_ld_fill_tracerdata_nodeparams(TId,Rest);
-mk_ld_fill_tracerdata_nodeparams(_,[]) ->
-    ok.
-
-mk_ld_fill_tracerdata_othernodes(_,_,[]) ->  % Then not necessary to do anything.
-    ok;
-mk_ld_fill_tracerdata_othernodes(void,TId,[Node]) -> % The non-distributed case.
-    case inviso:get_tracerdata() of
-	{error,_Reason} ->                   % Perhaps in state new or disconnected.
-	    ok;                              % Do nothing.
-	{ok,TracerData} ->
-	    ets:insert(TId,{Node,TracerData})
-    end;
-mk_ld_fill_tracerdata_othernodes(CtrlNode,TId,Nodes) ->
-    case inviso_tool_lib:invisomd(CtrlNode,get_tracerdata,[Nodes]) of
-	{ok,Results} ->
-	    mk_ld_fill_tracerdata_othernodes_2(TId,Results);
-	{error,_Reason} ->                   % Strange, we will probably crash later.
-	    ok
-    end.
-
-mk_ld_fill_tracerdata_othernodes_2(TId,[{_Node,{ok,no_tracerdata}}|Rest]) ->
-    mk_ld_fill_tracerdata_othernodes_2(TId,Rest); % It was not initiated then!
-mk_ld_fill_tracerdata_othernodes_2(TId,[{Node,{ok,TracerData}}|Rest]) ->
-    ets:insert(TId,{Node,TracerData}),
-    mk_ld_fill_tracerdata_othernodes_2(TId,Rest);
-mk_ld_fill_tracerdata_othernodes_2(_,[]) ->
-    ok.
-%% ------------------------------------------------------------------------------
-
-get_ctrlnode_ld(#ld{ctrlnode=CtrlNode}) ->
-    CtrlNode.
-%% ------------------------------------------------------------------------------
-
-
-get_ctrlpid_ld(#ld{ctrlpid=CtrlPid}) ->
-    CtrlPid.
-%% ------------------------------------------------------------------------------
-
-get_rtstates_ld(#ld{rtstates=RTStates}) ->
-    RTStates.
-
-put_rtstates_ld(NewRTStates,LD) ->
-    LD#ld{rtstates=NewRTStates}.
-%% ------------------------------------------------------------------------------
-
-get_trdstorage_ld(#ld{tracerdata=TId}) ->
-    TId.
-
-put_trdstorage_ld(_NewTId,LD) ->
-    LD.
-%% ------------------------------------------------------------------------------
-
-%% Help function which adds the current tracerdata of node Node to the tracerdata
-%% storage. We only want to add tracerdata we have not seen before. We therefore
-%% avoid adding it if the node already is in state ?TRACING.
-%% Returns a new tracerdata (what ever it is)!
-add_current_tracerdata_ld(CtrlNode,Node,RTStates,TId) ->
-    case get_statestatus_rtstates(Node,RTStates) of
-	{ok,{?TRACING,_}} ->                 % Then we have already added the tracerdata.
-	    TId;                             % Then do nothing.
-	{ok,_} ->                            % Since we were not tracing before.
-	    case add_current_tracerdata_ld_fetchtracerdata(CtrlNode,Node) of
-		{ok,TracerData} ->
-		    ets:insert(TId,{Node,TracerData});
-		no_tracerdata ->             % Strange, how could we become tracing
-		    ok;
-		{error,_Reason} ->           % The node perhaps disconnected!?
-		    ok
-	    end;
-	false ->                             % Very strange, not our node!
-	    ok                               % Do nothing.
-    end.
-
-add_current_tracerdata_ld_fetchtracerdata(void,_Node) ->
-    case inviso:get_tracerdata() of
-	{ok,TracerData} ->
-	    {ok,TracerData};
-	{error,no_tracerdata} ->
-	    no_tracerdata;
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-add_current_tracerdata_ld_fetchtracerdata(CtrlNode,Node) ->
-    case inviso_tool_lib:inviso_cmd(CtrlNode,get_tracerdata,[[Node]]) of
-	{ok,[{Node,{ok,TracerData}}]} ->
-	    {ok,TracerData};
-	{ok,[{Node,{error,no_tracerdata}}]} ->
-	    no_tracerdata;
-	{ok,[{Node,{error,Reason}}]} ->
-	    {error,Reason};
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-%% ------------------------------------------------------------------------------
-
-
-get_safetycatches_ld(#ld{safetycatches=SCs}) ->
-    SCs.
-%% ------------------------------------------------------------------------------
-
-get_dbg_ld(#ld{dbg=Dbg}) ->
-    Dbg.
-%% ------------------------------------------------------------------------------
-
-get_actstorage_ld(#ld{actstorage=ACTstorage}) ->
-    ACTstorage.
-
-put_actstorage_ld(_NewACTstorage,LD) ->
-    LD.
-%% ------------------------------------------------------------------------------
-
-
-
-%% ------------------------------------------------------------------------------
-%% Functions working on the rtstates structure (which is a substructure of loopdata).
-%% It is either:
-%% [{Node,StateStatus,Opts},...]
-%% Node is either the node name of the runtime component erlang node or
-%% ?LOCAL_RUNTIME as returned from the trace control component.
-%% StateStatus is {State,Status}, 'unavailable' or 'unknown'.
-%% Status is the returnvalue from trace control component.
-%%   i.e: running | {suspended,Reason}
-%% ------------------------------------------------------------------------------
-
-%% Function contructing an rtstates structure from a list of [{Node,StateStatus,Opts},...].
-to_rtstates(ListOfStates) when list(ListOfStates) ->
-    ListOfStates.
-%% ------------------------------------------------------------------------------
-
-%% Function which takes a rtstates structure and returns a list of [{Node,StateStatus},...].
-from_rtstates(RTStates) ->
-    RTStates.
-%% ------------------------------------------------------------------------------
-
-%% Function which takes an rtstates structure and a result as returned from
-%% init_tracing. The RTStates is modified for the nodes that changed state as a
-%% result of successful init_tracing.
-%% Returns a new RTStates.
-set_tracing_rtstates([E={Node,_StateStatus,Opts}|Rest],Result) ->
-    case lists:keysearch(Node,1,Result) of
-	{value,{_,ok}} ->                    % Means state-change to tracing!
-	    [{Node,{tracing,running},Opts}|set_tracing_rtstates(Rest,Result)];
-	_ ->                                 % Otherwise, leave it as is.
-	    [E|set_tracing_rtstates(Rest,Result)]
-    end;
-set_tracing_rtstates([],_Result) ->
-    [].
-%% ------------------------------------------------------------------------------
-
-%% Function updating the state/status for a certain runtime component.
-%% Returns a new RTStates structure. Note that Node must not necessarily be one
-%% of the nodes in the session. Meaning that Node shall not be added to RTStates
-%% should it not already be in there.
-statechange_rtstates(Node,State,Status,RTStates) when list(RTStates) ->
-    case lists:keysearch(Node,1,RTStates) of
-	{value,{_,_,Opts}} ->
-	    lists:keyreplace(Node,1,RTStates,{Node,{State,Status},Opts});
-	_ ->                                 % Then Node does not exist.
-	    RTStates                         % Just keep it as is, as keyreplace would have done.
-    end.
-%% ------------------------------------------------------------------------------
-
-%% Function updating the state/status for a certain runtime component. The
-%% state/status is set to 'unavailable'.
-%% Returns a new RTStates structure.
-set_unavailable_rtstates(Node,RTStates) when list(RTStates) ->
-    case lists:keysearch(Node,1,RTStates) of
-	{value,{_,_,Opts}} ->
-	    lists:keyreplace(Node,1,RTStates,{Node,unavailable,Opts});
-	_ ->                                 % Then Node does not exist.
-	    RTStates                         % Just keep it as is, as keyreplace would have done.
-    end.
-%% ------------------------------------------------------------------------------
-
-%% Function finding the statestatus associated with Node in the RTStates structure.
-%% Returns {ok,StateStatus} or 'false'.
-get_statestatus_rtstates(Node,RTStates) ->
-    case lists:keysearch(Node,1,RTStates) of
-	{value,{_,StateStatus,_}} ->
-	    {ok,StateStatus};
-	false ->
-	    false
-    end.
-%% ------------------------------------------------------------------------------
-
-%% Help function which returns a list of all nodes that are currently marked
-%% as available to us in the runtime state structure.	      
-get_all_available_nodes_rtstates(RTStates) ->
-    get_all_session_nodes_rtstates(lists:filter(fun({_N,unavailable,_})->false;
-						   (_)->true
-						end,
-						RTStates)).
-%% ------------------------------------------------------------------------------
-
-%% Help function returning a list of all nodes belonging to this session.
-get_all_session_nodes_rtstates(RTStates) ->
-    lists:map(fun({Node,_,_})->Node end,RTStates).
-%% ------------------------------------------------------------------------------
-
-%% Function which returns a list of nodes that are indicated as tracing in the
-%% RTStates structure.
-get_all_tracing_nodes_rtstates(RTStates) ->
-    lists:map(fun({N,_,_})->N end,
-	      lists:filter(fun({_,{tracing,_},_})->true;(_)->false end,RTStates)).
-%% ------------------------------------------------------------------------------
-
-%% Returns the options associated with Node in the RTStates structure.
-get_opts_rtstates(Node,RTStates) ->
-    case lists:keysearch(Node,1,RTStates) of
-	{value,{_,_,Opts}} ->
-	    {ok,Opts};
-	false ->
-	    false
-    end.
-
-%% ------------------------------------------------------------------------------
-%% Functions working on the tracerdata structure, which is a part of the loopdata.
-%% The tracerdata structure is an ETS-table of type bag storing:
-%% {Node,TracerData}.
-%% Note that there can of course be multiple entries for a node.
-%% ------------------------------------------------------------------------------
-
-%% Help function which takes a tracerdata loopdata structure and returns a list
-%% of all stored tracerdata for a certain Node.
-find_tracerdata_for_node_trd(Node,TRD) ->
-    case ets:lookup(TRD,Node) of
-	Result when list(Result) ->
-	    lists:map(fun({_Node,TracerData})->TracerData end,Result);
-	_ ->                                 % Should probably never happend.
-	    []
-    end.
-%% ------------------------------------------------------------------------------
-			 
-
-%% ------------------------------------------------------------------------------
-%% Functions working on the activity storage structure, which is part of the
-%% loopdata. It stores entries about things that needs to be "redone" in case
-%% of a reactivation of the node. The time order is also important.
-%% Note that for every ActivityType there must be a "handler" in the reactivation
-%% functionality.
-%%
-%% The structure is a bag of {Node,ActivityType,What}.
-%%   ActivityType/What=tf/{Op,TraceConfList}|tpm/{Op,[Mod,Func,Arity,MS,CallFunc]}
-%%                                              /{Op,[Mod,Func,Arity,MS,CallFunc,ReturnFunc]}
-%%                                              /{Op,[]}
-%%     TraceConfList=[{Proc,Flags},...]
-%%     How=true|false
-%% ------------------------------------------------------------------------------
-
-%% Function that adds meta-pattern activities to the activity storage. Note
-%% that one of the parameters to the function is a return value from an
-%% inviso call. In that way we do not enter activities that were unsuccessful.
-%% Op can be either the setting or clearing of a meta pattern.
-%% Returns a new ACTstorage.
-add_tpm_actstorage([{Node,ok}|Rest],Op,InvisoCmdParams,ACTstorage) ->
-    true=ets:insert(ACTstorage,{Node,tpm,{Op,InvisoCmdParams}}),
-    add_tpm_actstorage(Rest,Op,InvisoCmdParams,ACTstorage);
-add_tpm_actstorage([_|Rest],Op,InvisoCmdParams,ACTstorage) ->
-    add_tpm_actstorage(Rest,Op,InvisoCmdParams,ACTstorage);
-add_tpm_actstorage([],_,_,ACTstorage) ->
-    ACTstorage.
-
-%% Function that adds process trace-flags to the activity storage. Note that one
-%% of the parameters is the return value from an inviso function. Meaning that
-%% if the flags failed in their entirety, no activity will be saved. If only
-%% some of the flags failed, we will not go through the effort of trying to find
-%% out exactly which.
-%% Returns a new activity storage structure.
-add_tf_actstorage([{_Node,{error,_Reason}}|Rest],Op,TraceConfList,ACTstorage) ->
-    add_tf_actstorage(Rest,Op,TraceConfList,ACTstorage);
-add_tf_actstorage([{Node,_Result}|Rest],Op,TraceConfList,ACTstorage) ->
-    true=ets:insert(ACTstorage,{Node,tf,{Op,TraceConfList}}),
-    add_tf_actstorage(Rest,Op,TraceConfList,ACTstorage);
-add_tf_actstorage([],_,_,ACTstorage) ->
-    ACTstorage.
-%% ------------------------------------------------------------------------------
-
-%% Finds all activities associated with Node. Returns a list of them in the
-%% same order as they were inserted.
-get_activities_actstorage(Node,ACTstorage) ->
-    case ets:lookup(ACTstorage,Node) of
-	[] ->
-	    false;
-	Result when list(Result) ->
-	    {ok,lists:map(fun({_N,Type,What})->{Type,What} end,Result)}
-    end.
-%% ------------------------------------------------------------------------------
-
-%% Function removing all activity entries associated with Node. This is useful
-%% if the Node disconnects for instance.
-del_node_actstorage(Node,ACTstorage) ->
-    ets:delete(ACTstorage,Node),
-    ACTstorage.
-%% ------------------------------------------------------------------------------
-
diff --git a/lib/inviso/test/Makefile b/lib/inviso/test/Makefile
deleted file mode 100644
index c1df29d631..0000000000
--- a/lib/inviso/test/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-MODULES =  \
-	inviso_tool_SUITE
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-INSTALL_PROGS= $(TARGET_FILES)
-
-EMAKEFILE=Emakefile
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/inviso_test
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_MAKE_FLAGS += 
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
-
-EBIN = .
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-make_emakefile:
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
-	> $(EMAKEFILE)
-
-tests debug opt: make_emakefile
-	erl $(ERL_MAKE_FLAGS) -make
-
-clean:
-	rm -f $(EMAKEFILE)
-	rm -f $(TARGET_FILES)
-	rm -f core
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-
-release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) inviso.spec inviso.cover $(ERL_FILES) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
-
-release_docs_spec:
-
-
diff --git a/lib/inviso/test/inviso.cover b/lib/inviso/test/inviso.cover
deleted file mode 100644
index e23b9fa59b..0000000000
--- a/lib/inviso/test/inviso.cover
+++ /dev/null
@@ -1,2 +0,0 @@
-{incl_app,inviso,details}.
-
diff --git a/lib/inviso/test/inviso.spec b/lib/inviso/test/inviso.spec
deleted file mode 100644
index 49f9b0b460..0000000000
--- a/lib/inviso/test/inviso.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../inviso_test",all}.
diff --git a/lib/inviso/test/inviso_tool_SUITE.erl b/lib/inviso/test/inviso_tool_SUITE.erl
deleted file mode 100644
index e14f32de44..0000000000
--- a/lib/inviso/test/inviso_tool_SUITE.erl
+++ /dev/null
@@ -1,1166 +0,0 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.

-%%

-%% The contents of this file are subject to the Erlang Public License,

-%% Version 1.1, (the "License"); you may not use this file except in

-%% compliance with the License. You should have received a copy of the

-%% Erlang Public License along with this software. If not, it can be

-%% retrieved online at http://www.erlang.org/.

-%%

-%% Software distributed under the License is distributed on an "AS IS"

-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See

-%% the License for the specific language governing rights and limitations

-%% under the License.

-%%

-%% %CopyrightEnd%

-%%

-%%

-%% Description:

-%% Test suite for the inviso_tool. It is here assumed that inviso works

-%% properly.

-%%

-%% Authors:

-%% Lennart Öhman, [email protected]

-%% -----------------------------------------------------------------------------

-

--module(inviso_tool_SUITE).

--compile(export_all).

-

--include_lib("common_test/include/ct.hrl").

--include_lib("kernel/include/file.hrl").

-

--define(l,?line).

-

-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [dist_basic_1, dist_rtc, dist_reconnect, dist_adopt,
-     dist_history, dist_start_session_special].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% -----------------------------------------------------------------------------

-

-init_per_suite(Config) ->

-    case test_server:is_native(lists) of
-	true ->
-	    {skip,"Native libs -- tracing doesn't work"};
-	false ->
-	    Config
-    end.
-%% -----------------------------------------------------------------------------

-

-end_per_suite(_Config) ->

-    ok.

-%% -----------------------------------------------------------------------------

-

-%% For each distributed testcase, we need two other distributed nodes to run the

-%% runtime components on. Since they are freshly started every time there is no

-%% need to clean them up first.

-init_per_testcase(_Case,Config) ->

-    ?l TH=test_server:timetrap(100000),

-    ?l {ok,Node1}=test_server:start_node(inviso1,peer,[]),

-    ?l {ok,Node2}=test_server:start_node(inviso2,peer,[]),

-    ?l SuiteDir=filename:dirname(code:which(?MODULE)),

-

-    %% Otherwise peer nodes will not find this module!

-    ?l true=rpc:call(Node1,code,add_patha,[SuiteDir]),

-    ?l true=rpc:call(Node2,code,add_patha,[SuiteDir]),

-

-    %% SPECIAL FOR MY PRIVATE TEST ENVIROMENT

-%    ?l rpc:call(Node1,code,add_patha,["/clearcase/otp/tools/runtime_tools/ebin"]),

-%    ?l rpc:call(Node1,code,add_patha,["/clearcase/otp/tools/inviso/ebin"]),

-%    ?l rpc:call(Node2,code,add_patha,["/clearcase/otp/tools/runtime_tools/ebin"]),

-%    ?l rpc:call(Node2,code,add_patha,["/clearcase/otp/tools/inviso/ebin"]),

-

-%    %% SPECIAL FOR MY PRIVATE TEST ENVIROMENT, windows.

-%    ?l rpc:call(Node1,code,add_patha,["C:/DATA/PROJECTS/inviso_project/runtime_tools/ebin"]),

-%    ?l rpc:call(Node1,code,add_patha,["C:/DATA/PROJECTS/inviso_project/inviso/ebin"]),

-%    ?l rpc:call(Node2,code,add_patha,["C:/DATA/PROJECTS/inviso_project/runtime_tools/ebin"]),

-%    ?l rpc:call(Node2,code,add_patha,["C:/DATA/PROJECTS/inviso_project/inviso/ebin"]),

-

-    ?l ok=rpc:call(Node1,application,start,[runtime_tools]),

-    ?l ok=rpc:call(Node2,application,start,[runtime_tools]),

-    ?l timer:sleep(100),                     % Problem with autostarted runtime.

-    %% The following is a test that the inviso_rt processes which are autostarted

-    %% are now gone.

-

-    ?l ok=poll(rpc,call,[Node1,erlang,whereis,[inviso_rt]],undefined,20),

-    ?l ok=poll(rpc,call,[Node2,erlang,whereis,[inviso_rt]],undefined,20),

-

-    NewConfig1=insert_remotenode_config(inviso1,Node1,Config),

-    NewConfig2=insert_remotenode_config(inviso2,Node2,NewConfig1),

-    insert_timetraphandle_config(TH,NewConfig2).

-%% -----------------------------------------------------------------------------

-

-end_per_testcase(_Case,Config) ->

-    ?l test_server:stop_node(get_remotenode_config(inviso1,Config)),

-    ?l test_server:stop_node(get_remotenode_config(inviso2,Config)),

-    ?l test_server:timetrap_cancel(get_timetraphandle_config(Config)),

-    ?l case whereis(inviso_tool) of          % In case inviso_tool did not stop.

-	   Pid when is_pid(Pid) ->

-	       ?l io:format("Had to kill inviso_tool!~n",[]),

-	       ?l exit(Pid,kill);

-	   _ ->

-	       true

-       end,

-    ?l case whereis(inviso_rt) of            % In case we ran a runtime here.

-	   Pid2 when is_pid(Pid2) ->

-	       ?l io:format("Had to kill inviso_rt!~n",[]),

-	       ?l exit(Pid2,kill);

-	   _ ->

-	       true

-       end,

-    ?l case whereis(inviso_c) of             % In case we ran the controll component here.

-	   Pid3 when is_pid(Pid3) ->

-	       ?l io:format("Had to kill inviso_c!~n",[]),

-	       ?l exit(Pid3,kill);

-	   _ ->

-	       true

-       end,

-    NewConfig1=remove_remotenode_config(inviso1,Config),

-    NewConfig2=remove_remotenode_config(inviso2,NewConfig1),

-    remove_timetraphandle_config(NewConfig2).

-%% -----------------------------------------------------------------------------

-

-%% ==============================================================================

-%% Testcases.

-%% ==============================================================================

-

-%% -----------------------------------------------------------------------------

-%% Functional tests:

-%% API:

-%%   start/0                                 dist_basic_1

-%%   stop/0                                  dist_basic_1

-%%   reconnect_nodes/1                       dist_reconnect

-%%   start_session/0                         dist_basic_1

-%%   reinitiate_session/1                    dist_reconnect

-%%   stop_session/0                          dist_basic_1

-%%   atc/3                                   dist_basic_1

-%%   sync_atc/3                              dist_basic_1

-%%   sync_rtc/2,                             dist_rtc

-%%   dtc/2                                   dist_basic_1

-%%   sync_dtc/2                              dist_basic_1

-%%   inviso/2                                dist_basic_1

-%%   reactivate/1                            dist_basic_1

-%%   get_autostart_data/2                    dist_basic_1

-%%   get_activities/0                        dist_basic_1

-%%   save_history/1                          dist_history

-%%   restore_session/1                       dist_history

-%%   get_node_status/1                       dist_basic_1

-%%   get_session_data/0                      dist_basic_1

-%%   flush/0                                 dist_basic_1

-%% -----------------------------------------------------------------------------

-

-%% Non functional tests:

-%%   Run the control component on both the   dist_history

-%%     same node as the tool and on a

-%%     different node.

-%%   Let a trace case crash in its execution dist_basic_1

-%%     and check that it does not become

-%%     part of the history.

-%%   Check that tracer data becomes what the NOT IMPLEMENTED

-%%     tdg function generates.

-%%   Check that all inviso runtime           stop_inviso_tool/2

-%%     components terminate if the tool is

-%%     killed.

-%%   Check that activation/deactivation      dist_basic_1

-%%     cancels each other out in the history.

-%%   Check that regexp expansion is done on  dist_reconnect

-%%     another node if regexp_node is down.

-%%   Test that tool-commands activating      dist_basic_1

-%%     something done during a reactivation

-%%     are actually done a bit later at the

-%%     reactivated node (this since the the

-%%     command being reactivated at the momen

-%%     at the reactivating node may not

-%%     be finished at the time the new tool

-%%     command is issued).

-%%   Check that deactivating tracecases are  dist_basic_1

-%%     not redone at a reactivating node.

-%%     (to prevent it from being redone and

-%%     then just deactivated).

-%%   Check that on-going reactivators and    NOT IMPLEMENTED

-%%     tracecases are killed when stop_session.

-%%   Check that inviso_tool can and will adopt

-%%     a running runtime component.          dist_adopt

-%% -----------------------------------------------------------------------------

-

--define(TC_DEF_FILE,filename:join(DataDir,"tracecase_def.txt")).

-

-%% TEST CASE: Basic, distributed, start of inviso_tool with simple tracing.

-dist_basic_1(doc) -> ["Simple test"];

-dist_basic_1(suite) -> [];

-dist_basic_1(Config) when is_list(Config) ->

-    RemoteNodes=get_remotenodes_config(Config),

-    [RegExpNode|_]=RemoteNodes,

-    CNode=node(),

-    Nodes=RemoteNodes,

-    DataDir=?config(data_dir,Config),

-    PrivDir=filename:join(?config(priv_dir,Config),""),

-    Opts=[{regexp_node,RegExpNode},

-	  {tdg,{?MODULE,tdg,[PrivDir]}},

-	  {tc_def_file,?TC_DEF_FILE},

-	  {initial_tcs,[{tracecase_init,[]}]},

-	  {dir,DataDir}],                    % This is where we find tracecases.

-    ?l start_inviso_tool(Nodes,CNode,Opts),

-    %% Now we know that all inviso runtimes are running and are not tracing.

-    ?l {error,no_session}=inviso_tool:inviso(tpl,[lists,module_info,0,[]]),

-    ?l {error,no_session}=inviso_tool:get_session_data(),

-    ?l start_inviso_tool_session(CNode,[],1,Nodes),

-    ?l {ok,{tracing,1,TDGargs}}=inviso_tool:get_session_data(),

-    ?l true=is_list(TDGargs),

-    %% Check that the initial tracecase has been executed at all tracing nodes.

-    ?l lists:foreach(fun(N)->

-			     ok=poll(rpc,

-				     call,

-				     [N,

-				      erlang,

-				      trace_info,

-				      [{lists,module_info,1},traced]],

-				     {traced,local},

-				     20)

-		     end,

-		     Nodes),

-    %% Start a test process at every node with a runtime component.

-    ?l lists:foreach(fun(N)->spawn(N,?MODULE,test_proc_init,[]) end,Nodes),

-
-    %% Let the processes start
-    timer:sleep(100),
-
-    %% Find the pids of the test processes.

-    ?l TestProcs=lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_tool_test_proc]) end,

-			   Nodes),

-    ?l true=(1=<length(TestProcs)),

-

-    %% Activate a trace case.

-    ?l {error,unknown_tracecase}=inviso_tool:atc(nonexistant,id,[]),

-    ?l {error,{missing_variable,'ProcessName'}}=

-	inviso_tool:atc(tracecase1,id1,[]),

-    ?l ok=inviso_tool:atc(tracecase1,id1,[{'ProcessName',inviso_tool_test_proc}]),

-    ?l {error,activating}=inviso_tool:atc(tracecase1,id1,[{'ProcessName',inviso_tool_test_proc}]),

-    ?l {ok,[{tracecases,[{{tracecase1,id1},activating}]}]}=inviso_tool:get_activities(),

-    ?l timer:sleep(1700),                     % There is a 500 ms delay in the tracecase.

-    ?l {error,already_started}=

-	inviso_tool:atc(tracecase1,id1,[{'ProcessName',inviso_tool_test_proc}]),

-

-    %% Now check that the trace case was executed at Nodes.

-    ?l lists:foreach(fun(P)->

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[P,flags]],

-					{flags,[call]},

-					10),

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[{math,module_info,1},traced]],

-					{traced,local},

-					10)

-		     end,

-		     TestProcs),

-    ?l lists:foreach(fun(P) ->

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[{math,module_info,0},traced]],

-					{traced,false},

-					1)

-		     end,

-		     TestProcs),

-

-    %% Test inviso_tool:inviso/2.

-    ?l {ok,NodeResults1}=inviso_tool:inviso(tpl,[math,module_info,0,[]]),

-    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults1),

-    ?l lists:foreach(fun(P) ->

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[{math,module_info,0},traced]],

-					{traced,local},

-					10)

-		     end,

-		     TestProcs),

-

-    %% Test inviso_tool:sync_atc/3.

-    ?l a_return_value=inviso_tool:sync_atc(tracecase2,id2,[]), % This will take 3000 ms.

-    ?l lists:foreach(fun(P) ->

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[{math,pi,0},traced]],

-					{traced,local},

-					10)

-		     end,

-		     TestProcs),

-

-    %% Test the reactivation mechanism.

-    ?l [ANode|OtherNodes]=Nodes,             % Get a node to suspend.

-    ?l {ok,{tracing,running}}=inviso_tool:get_node_status(ANode),

-    ?l {ok,[{ANode,ok}]}=rpc:call(CNode,inviso,suspend,[[ANode],test]),

-    ?l [APid|_]=TestProcs,                   % The first process is at ANode.

-    %% Now check that trace flags were removed at ANode. This is actually testing inviso.

-    ?l ok=poll(rpc,call,[node(APid),erlang,trace_info,[APid,flags]],{flags,[]},10),

-    ?l {ok,{tracing,suspended}}=inviso_tool:get_node_status(ANode),

-    %% Now reactivate it and expect the history to be redone. But it will take

-    %% 3000 ms since there is a delay in tracecase2. Use that delay to issue a new

-    %% tool command.

-    ?l ok=inviso_tool:reactivate(ANode),

-    ?l {ok,reactivating}=inviso_tool:get_node_status(ANode),

-    ?l {ok,NodeResults2}=inviso_tool:inviso(tpl,[math,sin,1,[]]),

-    ?l true=check_noderesults(OtherNodes,{ok,[1]},NodeResults2),

-    %% Verify that the inviso command was not done (yet) at ANode.

-    ?l {traced,false}=rpc:call(ANode,erlang,trace_info,[{math,sin,1},traced]),

-    ?l {ok,[{reactivating_nodes,[ANode]}]}=inviso_tool:get_activities(),

-    ?l timer:sleep(3600),

-    %% Now the history shall have been redone including the new inviso command.

-    ?l ok=poll(rpc,call,[ANode,erlang,trace_info,[{math,sin,1},traced]],{traced,local},10),

-    ?l {flags,[call]}=rpc:call(ANode,erlang,trace_info,[APid,flags]),

-    ?l {ok,[]}=inviso_tool:get_activities(),

-

-    %% Check the get_autostart function. We know that we use the standard options

-    %% generator and the tracecases activated above.

-    ?l {ok,{AutostartData1,NodeResults3}}=

-	inviso_tool:get_autostart_data(Nodes,{dependency,infinity}),

-    ?l true=check_noderesults(Nodes,

-			      fun({_N,{ok,{[{dependency,infinity}],{tdg,{_M,_F,TDlist}}}}})

-				 when is_list(TDlist)->

-				      true;

-				 (_) ->

-				      false

-			      end,

-			      NodeResults3),

-    %% Check the tracecase that shall be activated and their order.

-    ?l TraceCaseFileNameInit=filename:join(DataDir,"./tracecase_init.trc"),

-    ?l TraceCaseFileName1=filename:join(DataDir,"./tracecase1_on.trc"),

-    ?l TraceCaseFileName2=filename:join(DataDir,"./tracecase2_on.trc"),

-    ?l [{file,{TraceCaseFileNameInit,[]}},

-	{file,{TraceCaseFileName1,[{'ProcessName',inviso_tool_test_proc}]}},

-	{mfa,{inviso,tpl,[math,module_info,0,[]]}},

-	{file,{TraceCaseFileName2,[]}},

-	{mfa,{inviso,tpl,[math,sin,1,[]]}}]=AutostartData1,

-

-    %% Try to activate a faulty tracecase. We shall get the same history as before.

-    ?l ok=inviso_tool:atc(tracecase3,id3,[]),

-    ?l ok=poll(inviso_tool,get_activities,[],{ok,[]},10),

-    ?l {ok,{AutostartData1,NodeResults3}}=

-	inviso_tool:get_autostart_data(Nodes,{dependency,infinity}),

-

-    %% Now deactivate a trace case.

-    ?l inviso_tool:dtc(tracecase1,id1),

-    %% Check that the now deactivated trace case is not part of autostart data

-    %% if requested from the tool.

-    ?l {ok,{AutostartData2,_NodeResults}}=

-	inviso_tool:get_autostart_data(Nodes,{dependency,infinity}),

-    ?l [{file,{TraceCaseFileNameInit,[]}},

-	{mfa,{inviso,tpl,[math,module_info,0,[]]}},

-	{file,{TraceCaseFileName2,[]}},

-	{mfa,{inviso,tpl,[math,sin,1,[]]}}]=AutostartData2,

-    %% Now tracing shall be removed since we deactivated tracecase1.

-    ?l lists:foreach(fun(P)->

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[P,flags]],

-					{flags,[]},

-					10),

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[{math,module_info,1},traced]],

-					{traced,false},

-					10)

-		     end,

-		     TestProcs),

-

-    %% Suspend the ANode again and check that when it is reactivated that

-    %% tracecase1 is not redone at all. We use an ets table with a counter that is

-    %% incremented every time the tracecase1 is executed.

-    ?l {ok,[{ANode,ok}]}=rpc:call(CNode,inviso,suspend,[[ANode],testagain]),

-    ?l [{counter,SideEffectCounter1}]=rpc:call(ANode,ets,lookup,[test_proc_tab,counter]),

-    ?l true=(SideEffectCounter1>0),

-    ?l ok=inviso_tool:reactivate(ANode),

-    ?l timer:sleep(3000),                    % The delay in tracecase2.

-    ?l ok=poll(inviso_tool,get_activities,[],{ok,[]},10),

-    %% Now the reactivation is done, check that tracecase1 was not redone at ANode.

-    ?l [{counter,SideEffectCounter1}]=rpc:call(ANode,ets,lookup,[test_proc_tab,counter]),

-

-    %% Deactivate tracecase2.

-    ?l another_return_value=inviso_tool:sync_dtc(tracecase2,id2),

-    %% Immediately check the autostart data (again!). This time we want to see

-    %% that the two inviso commands have been joined since there is no tracecase

-    %% in between.

-    ?l {ok,{AutostartData3,NodeResults}}=

-	inviso_tool:get_autostart_data(Nodes,{dependency,infinity}),

-    ?l [{file,{TraceCaseFileNameInit,[]}},

-	{mfa,{inviso,tpl,[math,module_info,0,[]]}},

-	{mfa,{inviso,tpl,[math,sin,1,[]]}}]=AutostartData3,

-

-    %% Check that a deactivating tracecase is not redone at a reactivating node.

-    ?l inviso_tool:sync_atc(tracecase5,id5,[]), % Updates the counter.

-    %% Yet again suspend the node when we know that tracecase5 has been executed.

-    ?l {ok,[{ANode,ok}]}=rpc:call(CNode,inviso,suspend,[[ANode],testagain2]),

-    ?l timer:sleep(100),                     % Subscription reaches the tool.

-    ?l [{counter,SideEffectCounter2A}]=rpc:call(ANode,ets,lookup,[test_proc_tab,counter]),

-    ?l [BNode|_]=OtherNodes,

-    ?l [{counter,SideEffectCounter2B}]=rpc:call(BNode,ets,lookup,[test_proc_tab,counter]),

-    ?l ok=inviso_tool:dtc(tracecase5,id5),   % In here there is a 2000 ms delay!

-    ?l ok=inviso_tool:reactivate(ANode),

-    %% Check that the reactivator is done, but that the tracecase remains. The

-    %% reactivator should be done pretty quickly since there are no delays in the

-    %% still active tracecases.

-    ?l ok=poll(inviso_tool,

-	       get_activities,

-	       [],

-	       {ok,[{tracecases,[{{tracecase5,id5},deactivating}]}]},

-	       10),

-    ?l ok=poll(inviso_tool,get_activities,[],{ok,[]},30),

-    ?l [{counter,SideEffectCounter2A}]=rpc:call(ANode,ets,lookup,[test_proc_tab,counter]),

-    ?l SideEffectCounter2B1=SideEffectCounter2B+1,

-    ?l [{counter,SideEffectCounter2B1}]=rpc:call(BNode,ets,lookup,[test_proc_tab,counter]),

-

-    %% Check the flush function. It is difficult to find out if it really flushed.

-    ?l {ok,NodeResults4}=inviso_tool:flush(),

-    ?l true=check_noderesults(Nodes,ok,NodeResults4),

-

-    %% Check that this function still has a trace pattern. We are going to stop session

-    %% and check that it is still there.

-    ?l lists:foreach(fun(N)->

-			     ok=poll(rpc,

-				     call,

-				     [N,

-				      erlang,

-				      trace_info,

-				      [{math,sin,1},traced]],

-				     {traced,local},

-				     20)

-		     end,

-		     Nodes),

-

-    ?l stop_inviso_tool_session(CNode,1,Nodes),

-    ?l {ok,{not_tracing,1,TDGargs}}=inviso_tool:get_session_data(),

-

-    ?l {ok,NodeResults5}=inviso_tool:flush(Nodes),

-    ?l true=check_noderesults(Nodes,fun({_,{error,_}})->true;(_)->false end,NodeResults5),

-    ?l {ok,[]}=inviso_tool:flush(),

-

-    %% Check that you can not start trace cases when the session is stopped.

-    ?l {error,no_session}=inviso_tool:atc(tracecase2,id3,[]),

-    %% But the history shall be there to retrieve.

-    ?l {ok,{AutostartData3,NodeResults}}=

-	inviso_tool:get_autostart_data(Nodes,{dependency,infinity}),

-    ?l {ok,{inactive,running}}=inviso_tool:get_node_status(ANode),

-

-    %% Check that the trace pattern is still there.

-    ?l lists:foreach(fun(N)->

-			     ok=poll(rpc,

-				     call,

-				     [N,

-				      erlang,

-				      trace_info,

-				      [{math,sin,1},traced]],

-				     {traced,local},

-				     20)

-		     end,

-		     Nodes),

-

-    %% Now start a session and check that the trace patterns is gone.

-    ?l start_inviso_tool_session(CNode,[],2,Nodes),

-    ?l lists:foreach(fun(N)->

-			     ok=poll(rpc,

-				     call,

-				     [N,

-				      erlang,

-				      trace_info,

-				      [{math,sin,1},traced]],

-				     {traced,false},

-				     20)

-		     end,

-		     Nodes),

-    ?l stop_inviso_tool_session(CNode,2,Nodes),

-

-    ?l stop_inviso_tool(CNode,Nodes),

-    ok.

-%% -----------------------------------------------------------------------------

-

-%% This test case tests the rtc trace case mechanism.

-dist_rtc(doc) -> [""];

-dist_rtc(suite) -> [];

-dist_rtc(Config) when is_list(Config) ->

-    RemoteNodes=get_remotenodes_config(Config),

-    [RegExpNode|_]=RemoteNodes,

-    CNode=node(),

-    Nodes=RemoteNodes,

-    DataDir=?config(data_dir,Config),

-    PrivDir=filename:join(?config(priv_dir,Config),""),

-    Opts=[{regexp_node,RegExpNode},

-	  {tdg,{?MODULE,tdg,[PrivDir]}},

-	  {tc_def_file,?TC_DEF_FILE},

-	  {initial_tcs,[{tracecase_init,[]}]},

-	  {dir,DataDir}],                    % This is where we find tracecases.

-    ?l start_inviso_tool(Nodes,CNode,Opts),

-    ?l start_inviso_tool_session(CNode,[],1,Nodes),

-    %% Check that the initial tracecase has been executed at all tracing nodes.

-    ?l lists:foreach(fun(N)->

-			     ok=poll(rpc,

-				     call,

-				     [N,

-				      erlang,

-				      trace_info,

-				      [{lists,module_info,1},traced]],

-				     {traced,local},

-				     20)

-		     end,

-		     Nodes),

-    %% Start a test process at every node with a runtime component.

-    ?l lists:foreach(fun(N)->spawn(N,?MODULE,test_proc_init,[]) end,Nodes),

-
-    %% Let the processes start
-    timer:sleep(100),
-
-    %% Find the pids of the test processes.

-    ?l TestProcs=lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_tool_test_proc]) end,

-			   Nodes),

-    ?l true=(1=<length(TestProcs)),

-    ?l [ANode|_]=Nodes,

-    ?l [{counter,Val}]=rpc:call(ANode,ets,lookup,[test_proc_tab,counter]),

-    %% Call the tracecase as an rtc.

-    ?l inviso_tool:sync_rtc(tracecase5,[]), % Updates the counter.

-    ?l [{counter,Val2}]=rpc:call(ANode,ets,lookup,[test_proc_tab,counter]),

-    ?l true=(Val2==Val+1),

-    ?l inviso_tool:sync_rtc(tracecase5,[]), % Updates the counter.

-    ?l [{counter,Val3}]=rpc:call(ANode,ets,lookup,[test_proc_tab,counter]),

-    ?l true=(Val3==Val2+1),

-

-    %% Now we stop the session and restore it again.

-    ?l stop_inviso_tool_session(CNode,1,Nodes),

-    ?l {ok,{2,_InvisoReturn}}=inviso_tool:restore_session(),

-    %% The tracecase shall be done twice then.

-    ?l ok=poll(rpc,call,[ANode,ets,lookup,[test_proc_tab,counter]],

-	       fun([{counter,V}]) when V==Val3+2 -> true;

-		  (_) -> false

-	       end,

-	       20),

-    ?l stop_inviso_tool_session(CNode,2,Nodes),

-

-    ?l {ok,{AutostartData,_NodeResults}}=

-	inviso_tool:get_autostart_data(Nodes,{dependency,infinity}),

-    ?l [{file,{_FileNameInit,_}},{file,{FileName,Bindings}},{file,{FileName,Bindings}}]=

-	AutostartData,

-    ?l stop_inviso_tool(CNode,Nodes),

-    ok.

-%% -----------------------------------------------------------------------------

-

-

-%% This test case tests mainly that reconnect and reinitiations of a node works.

-dist_reconnect(doc) -> [""];

-dist_reconnect(suite) -> [];

-dist_reconnect(Config) when is_list(Config) ->

-    RemoteNodes=get_remotenodes_config(Config),

-    [RegExpNode|OtherNodes]=RemoteNodes,

-    CNode=node(),

-    Nodes=RemoteNodes,

-    DataDir=?config(data_dir,Config),

-    PrivDir=filename:join(?config(priv_dir,Config),""),

-    Opts=[{regexp_node,RegExpNode},

-	  {tdg,{?MODULE,tdg,[PrivDir]}},

-	  {tc_def_file,?TC_DEF_FILE},

-	  {initial_tcs,[{tracecase_init,[]}]},

-	  {dir,DataDir}],                    % This is where we find tracecases.

-    ?l start_inviso_tool(Nodes,CNode,Opts), 

-    ?l start_inviso_tool_session(CNode,[],1,Nodes),

-    %% Start a test process at every node with a runtime component.

-    ?l lists:foreach(fun(N)->spawn(N,?MODULE,test_proc_init,[]) end,Nodes),

-
-    %% Let the processes start
-    timer:sleep(100),
-    
-    %% Find the pids of the test processes.

-    ?l TestProcs=lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_tool_test_proc]) end,

-			   Nodes),

-    ?l true=(1=<length(TestProcs)),

-    ?l ok=inviso_tool:atc(tracecase1,id1,[{'ProcessName',inviso_tool_test_proc}]),

-    ?l ok=poll(inviso_tool,get_activities,[],{ok,[]},20),

-

-    %% Now we want to crash a node. Lets choose the RegExp node, then we can test

-    %% that regexp expansion is done elsewhere too.

-    ?l test_server:stop_node(RegExpNode),

-    ?l ok=poll(net_adm,ping,[RegExpNode],pang,10),

-    %% Make time for the monitoring signal to reach inviso_c and for inviso_c to

-    %% inform its subscribers e.g inviso_tool.

-    ?l timer:sleep(100),

-    ?l {_,[{_Node,Modules}]}=

-	inviso_tool_lib:expand_module_names([node()],"application.*",[]),

-    ?l NrOfModules=length(Modules),

-    %% This also checks that regexp expansion can be made at another node

-    %% than RexExpNode.

-    ?l {ok,NodeResults1}=inviso_tool:inviso(tp,["application.*",module_info,0,[]]),

-    ?l true=check_noderesults(OtherNodes,

-			      fun({_N,{ok,Ints}}) when is_list(Ints) ->

-				      NrOfModules=lists:sum(Ints),

-				      true;

-				 (_) ->

-				      false

-			      end,

-			      NodeResults1),

-

-    %% Do some faulty tests on the dead node.

-    ?l {ok,{ok,[{RegExpNode,{error,down}}]}}=

-	inviso_tool:reinitiate_session([RegExpNode]),

-    ?l {ok,down}=inviso_tool:get_node_status(RegExpNode),

-

-    %% Now it is time to restart the crashed node and reconnect it and then

-    %% finally reinitiate it.

-    ?l RegExpNodeString=atom_to_list(RegExpNode),
-    ?l [NodeNameString,_HostNameString] = string:tokens(RegExpNodeString,[$@]),
-    ?l RegExpNodeName=list_to_atom(NodeNameString),
-    ?l test_server:start_node(RegExpNodeName,peer,[]),

-    ?l ok=poll(net_adm,ping,[RegExpNode],pong,20),

-    ?l SuiteDir=filename:dirname(code:which(?MODULE)),

-    ?l true=rpc:call(RegExpNode,code,add_patha,[SuiteDir]),

-    ?l ok=rpc:call(RegExpNode,application,start,[runtime_tools]),

-    ?l ok=poll(rpc,call,[RegExpNode,erlang,whereis,[inviso_rt]],undefined,20),

-    ?l {ok,down}=inviso_tool:get_node_status(RegExpNode),

-

-    %% Restart the test process.

-    ?l spawn(RegExpNode,?MODULE,test_proc_init,[]),

-    ?l ok=poll(rpc,

-	       call,

-	       [RegExpNode,erlang,whereis,[inviso_tool_test_proc]],

-	       fun(P) when is_pid(P) -> true;

-		  (undefined) -> false

-	       end,

-	       10),

-    ?l TPid=rpc:call(RegExpNode,erlang,whereis,[inviso_tool_test_proc]),

-    ?l {ok,[{RegExpNode,{ok,{inactive,running}}}]}=inviso_tool:reconnect_nodes([RegExpNode]),

-    %% Try to reconnect the node again and an unknown node.

-    ?l UnknownNode='unknown@nonexistant',

-    ?l {ok,[{RegExpNode,{error,already_connected}},{UnknownNode,{error,unknown_node}}]}=

-	inviso_tool:reconnect_nodes([RegExpNode,UnknownNode]),

-    ?l {ok,{ok,[{RegExpNode,{ok,_}}]}}=inviso_tool:reinitiate_session([RegExpNode]),

-    ?l ok=poll(rpc,

-	       call,

-	       [RegExpNode,erlang,trace_info,[TPid,flags]],

-	       {flags,[call]},

-	       10),

-    ?l {ok,{ok,[{RegExpNode,{error,already_in_session}},{UnknownNode,{error,unknown_node}}]}}=

-	inviso_tool:reinitiate_session([RegExpNode,UnknownNode]),

-

-    %% Suspend RegExpNode and test that it can not be reinitiated.

-    ?l {ok,[{RegExpNode,ok}]}=rpc:call(CNode,inviso,suspend,[[RegExpNode],yetatest]),

-    ?l {ok,[{RegExpNode,{error,already_connected}}]}=inviso_tool:reconnect_nodes([RegExpNode]),

-    ?l {ok,{ok,[{RegExpNode,{error,suspended}}]}}=inviso_tool:reinitiate_session([RegExpNode]),

-

-    %% Now we start a tracecase that will never terminate. We then reactivate the

-    %% suspended node. Then there will be a running reactivator and a running

-    %% tracecase to kill.

-    ?l ok=inviso_tool:atc(tracecase4,id4,[]), % This one will not terminate.

-    ?l ok=inviso_tool:reactivate(RegExpNode),

-    ?l ok=poll(inviso_tool,

-	       get_activities,

-	       [],

-	       fun({ok,L}) when length(L)==2 -> true;

-		  (_) -> false

-	       end,

-	       20),

-    %% Now the reactivator and the tracecase shall be stuck(!)

-    ?l {links,ToolLinks}=process_info(whereis(inviso_tool),links),

-    ?l [P1,P2]=lists:foldl(fun(P,Acc)->case process_info(P,initial_call) of

-					   {initial_call,{inviso_tool,_,_}} ->

-					       [P|Acc];

-					   _ ->

-					       Acc

-				       end

-			   end,

-			   [],

-			   ToolLinks),

-    ?l stop_inviso_tool_session(CNode,1,Nodes),

-    %% Check that the processes are killed.

-    ?l ok=poll(erlang,process_info,[P1],undefined,10),

-    ?l ok=poll(erlang,process_info,[P2],undefined,10),

-    ?l stop_inviso_tool(CNode,Nodes),

-    ok.

-%% -----------------------------------------------------------------------------

-

-%% This test tests that we can adopt a running inviso runtime component and

-%% mark it as tracing-running.

-dist_adopt(doc) -> [""];

-dist_adopt(suite) -> [];

-dist_adopt(Config) when is_list(Config) ->

-    RemoteNodes=get_remotenodes_config(Config),

-    [RegExpNode|_]=RemoteNodes,

-    CNode=node(),

-    Nodes=RemoteNodes,

-    DataDir=?config(data_dir,Config),

-    PrivDir=filename:join(?config(priv_dir,Config),""),

-

-    %% Then first start runtime components at different nodes for us to

-    %% later adopt.

-    ?l {ok,_IPid}=inviso:start(),

-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_tag,[{dependency,infinity}]),

-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),

-    ?l [ANode|OtherNodes]=Nodes,

-    ?l {ok,[{ANode,_LogResult}]}=

-	inviso:init_tracing([ANode],

-			    [{trace,{file,filename:join(PrivDir,"dist_adopt_adoptednode.log")}},

-			     {ti,{file,filename:join(PrivDir,"dist_adopt_adoptednode.ti")}}]),

-    ?l inviso:stop(),

-    ?l ok=poll(erlang,whereis,[inviso_c],undefined,10),

-    ?l lists:foreach(fun(N)->true=(is_pid(rpc:call(N,erlang,whereis,[inviso_rt]))) end,

-		     Nodes),

-

-    %% Now start the tool and watch it adopt the runtimes.

-    Opts=[{regexp_node,RegExpNode},

-	  {tdg,{?MODULE,tdg,[PrivDir]}},

-	  {tc_def_file,?TC_DEF_FILE},

-	  {initial_tcs,[{tracecase_init,[]}]},

-	  {dir,DataDir}],                    % This is where we find tracecases.

-    ?l Options=[{nodes,Nodes},{c_node,CNode}|Opts],

-    ?l {ok,_Pid}=inviso_tool:start(Options),

-    ?l ok=poll(erlang,whereis,[inviso_tool],fun(X)->true=is_pid(X) end,10),

-    ?l io:format("LoopData:~p~n",[inviso_tool:get_loopdata()]),

-    ?l {ok,{1,InvisoReturn}}=inviso_tool:start_session([]),

-    ?l io:format("Invisoreturn:~p~n",[InvisoReturn]),

-    %% Now check that all nodes are tracing.

-    ?l lists:foreach(fun(N)->ok=poll(rpc,

-				     call,

-				     [CNode,inviso,get_status,[[N]]],

-				     fun({ok,[{_N,{ok,{tracing,running}}}]})->true;

-					(_) ->false

-				     end,

-				     10)

-		     end,

-		     Nodes),

-

-    %% At this point all nodes shall be tracing. However the initial tracecase

-    %% shall not have been executed at ANode since it was adopted by the tool.

-    ?l {traced,false}=rpc:call(ANode,erlang,trace_info,[{lists,module_info,1},traced]),

-    ?l lists:foreach(fun(N)->

-			     {traced,local}=

-				 rpc:call(N,erlang,trace_info,[{lists,module_info,1},traced])

-		     end,

-		     OtherNodes),

-    ?l stop_inviso_tool_session(CNode,1,Nodes),

-    ?l [BNode|_]=OtherNodes,

-    %% Since nodes are not cleared the pattern still be there.

-    ?l {traced,local}=rpc:call(BNode,erlang,trace_info,[{lists,module_info,1},traced]),

-    ?l start_inviso_tool_session(CNode,[],2,Nodes),

-    ?l stop_inviso_tool_session(CNode,2,Nodes),

-    ?l {ok,_NodeResults}=inviso_tool:stop(),

-    ?l ok=poll(erlang,whereis,[inviso_tool],undefined,10),

-    ?l ok=poll(rpc,call,[CNode,erlang,whereis,[inviso_c]],undefined,10),

-

-    ok.

-%% -----------------------------------------------------------------------------

-

-%% This test tests that saving and restoring a history works.

-dist_history(doc) -> [""];

-dist_history(suite) -> [];

-dist_history(Config) when is_list(Config) ->		     

-    RemoteNodes=get_remotenodes_config(Config),

-    [RegExpNode|_]=RemoteNodes,

-    CNode=RegExpNode,                       % We use a remote control component.

-    Nodes=RemoteNodes,

-    DataDir=?config(data_dir,Config),

-    PrivDir=filename:join(?config(priv_dir,Config),""),

-

-    %% Start up the tool and a couple of inviso runtimes.

-    Opts=[{regexp_node,RegExpNode},

-	  {tdg,{?MODULE,tdg,[PrivDir]}},

-	  {tc_def_file,?TC_DEF_FILE},

-	  {initial_tcs,[{tracecase_init,[]}]},

-	  {dir,DataDir}],                    % This is where we find tracecases.

-    ?l start_inviso_tool(Nodes,CNode,Opts), 

-    ?l start_inviso_tool_session(CNode,[],1,Nodes),

-    %% Start a test process at every node with a runtime component.

-    ?l lists:foreach(fun(N)->spawn(N,?MODULE,test_proc_init,[]) end,Nodes),

-

-    %% Activate tracing of the test process.

-    ?l ok=inviso_tool:atc(tracecase1,id1,[{'ProcessName',inviso_tool_test_proc}]),

-    ?l ok=poll(inviso_tool,get_activities,[],{ok,[]},10),

-    ?l TestProcs=lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_tool_test_proc]) end,

-			   Nodes),

-    ?l lists:foreach(fun(P)->

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[P,flags]],

-					{flags,[call]},

-					10),

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[{math,module_info,1},traced]],

-					{traced,local},

-					10)

-		     end,

-		     TestProcs),

-

-    %% Create a history file.

-    ?l AbsFileName=filename:join(PrivDir,"dist_history.his"),

-    ?l {ok,AbsFileName}=inviso_tool:save_history(AbsFileName),

-    ?l {ok,_FileInfo}=file:read_file_info(AbsFileName),

-

-    %% Stop the tracing of the test process.

-    ?l inviso_tool:sync_dtc(tracecase1,id1),

-    ?l lists:foreach(fun(P)->

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[P,flags]],

-					{flags,[]},

-					10),

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[{math,module_info,1},traced]],

-					{traced,false},

-					10)

-		     end,

-		     TestProcs),

-    %% Now stop the session.

-    ?l stop_inviso_tool_session(CNode,1,Nodes),

-    %% Restart the session using the previously saved history.

-    ?l {ok,{2,_InvisoReturn}}=inviso_tool:restore_session(AbsFileName),

-    ?l ok=poll(inviso_tool,get_activities,[],{ok,[]},10),

-    %% Check that the history has been redone.

-    ?l lists:foreach(fun(P)->

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[P,flags]],

-					{flags,[call]},

-					10),

-			     ?l ok=poll(rpc,

-					call,

-					[node(P),erlang,trace_info,[{math,module_info,1},traced]],

-					{traced,local},

-					10)

-		     end,

-		     TestProcs),

-    ?l {ok,_NodeResults1}=inviso_tool:inviso(tpl,[math,module_info,0,[]]),

-    %% Also check that the restored history now is our history.

-    ?l {ok,{AutostartData,_NodeResults2}}=

-	inviso_tool:get_autostart_data(Nodes,{dependency,infinity}),

-    ?l FNameInit=filename:join(DataDir,"tracecase_init.trc"),

-    ?l FName1=filename:join(DataDir,"tracecase1_on.trc"),

-    ?l [{file,{FNameInit,[]}},

-	{file,{FName1,[{'ProcessName',inviso_tool_test_proc}]}},

-	{mfa,{inviso,tpl,[math,module_info,0,[]]}}]=AutostartData,

-    ?l stop_inviso_tool_session(CNode,2,Nodes),

-    ?l NodeCounters=lists:foldl(fun(N,Acc)->[{_,X}]=rpc:call(N,ets,lookup,[test_proc_tab,counter]),

-					    [{N,X}|Acc]

-				end,

-				[],

-				Nodes),

-    %% Remove the patterns set by the initial tracecase.

-    ?l lists:foreach(fun(N)->rpc:call(N,

-				      erlang,

-				      trace_pattern,

-				      [{lists,module_info,1},false,[local]])

-		     end,

-		     Nodes),

-    %% Now we want to test that we can do restore on the current session.

-    ?l {ok,{3,_InvisoReturn2}}=inviso_tool:restore_session(),

-    ?l ok=poll(inviso_tool,get_activities,[],{ok,[]},10),

-    %% Check that the history has been redone yet again.

-    ?l lists:foreach(fun({N,X})->

-			     [{counter,Y}]=

-				 rpc:call(N,ets,lookup,[test_proc_tab,counter]),

-			     Y=X+1

-		     end,

-		     NodeCounters),

-    ?l lists:foreach(fun(N)->

-			     {traced,local}=

-				 rpc:call(N,erlang,trace_info,[{lists,module_info,1},traced])

-		     end,

-		     Nodes),

-

-    ?l {error,session_active}=inviso_tool:reset_nodes(Nodes),

-    %% Now stop the session and check that we can clear the nodes.

-    ?l stop_inviso_tool_session(CNode,3,Nodes),

-    ?l lists:foreach(fun(N)->{traced,local}=

-				 rpc:call(N,erlang,trace_info,[{lists,module_info,1},traced])

-		     end,

-		     Nodes),

-    ?l {ok,NodeResults3}=inviso_tool:reset_nodes(Nodes),

-    ?l true=check_noderesults(Nodes,{ok,{new,running}},NodeResults3),

-    ?l lists:foreach(fun(N)->{traced,false}=

-				 rpc:call(N,erlang,trace_info,[{lists,module_info,1},traced])

-		     end,

-		     Nodes),

-    ?l stop_inviso_tool(CNode,Nodes),

-

-    %% Now we want to test that restoring a session at no active nodes will

-    %% not result in a crash. (Previous error).

-    ?l FaultyNodes=[gurka@nonexistant,tomat@nonexistant],

-    ?l Options=[{nodes,FaultyNodes},{c_node,CNode}|Opts],

-    ?l {ok,_Pid}=inviso_tool:start(Options),

-    ?l ok=poll(erlang,whereis,[inviso_tool],fun(X)->true=is_pid(X) end,10),

-    %% Now try to restore a session.

-    ?l {ok,{_,{ok,[]}}}=inviso_tool:restore_session(AbsFileName),

-    ?l {ok,down}=inviso_tool:get_node_status(gurka@nonexistant),

-    %% Now stop the (useless) session.

-    ?l {ok,{_,[]}}=inviso_tool:stop_session(),

-    ?l stop_inviso_tool(CNode,[]),

-    ok.

-%% -----------------------------------------------------------------------------

-

-%% This test tests a few strange situations when activating a session and there

-%% are no nodes that can be initiated or reinitiated.

-dist_start_session_special(doc) -> [""];

-dist_start_session_special(suite) -> [];

-dist_start_session_special(Config) when is_list(Config) ->

-    RemoteNodes=get_remotenodes_config(Config),

-    [RegExpNode|_]=RemoteNodes,

-    CNode=RegExpNode,                       % We use a remote control component.

-%    Nodes=RemoteNodes,

-    DataDir=?config(data_dir,Config),

-    PrivDir=filename:join(?config(priv_dir,Config),""),

-

-    %% Start up the tool but with no exiting nodes.

-    FaultyNodes=[gurka@nonexistant,tomat@nonexistant],

-    Opts=[{regexp_node,RegExpNode},

-	  {tdg,{?MODULE,tdg,[PrivDir]}},

-	  {tc_def_file,?TC_DEF_FILE},

-	  {initial_tcs,[{tracecase_init,[]}]},

-	  {dir,DataDir}],                    % This is where we find tracecases.

-    ?l Options=[{nodes,FaultyNodes},{c_node,CNode}|Opts],

-    ?l {ok,_Pid}=inviso_tool:start(Options),

-    ?l ok=poll(erlang,whereis,[inviso_tool],fun(X)->true=is_pid(X) end,10),

-    %% Now try to initate a session.

-    ?l {ok,{SessionNr,{ok,[]}}}=inviso_tool:start_session(),

-    ?l {ok,down}=inviso_tool:get_node_status(gurka@nonexistant),

-    %% Now stop the (useless) session.

-    ?l {ok,{SessionNr,[]}}=inviso_tool:stop_session(),

-

-    %% Now start again, still no useful nodes.

-    ?l {ok,{SessionNr2,{ok,[]}}}=inviso_tool:start_session(),

-    ?l {ok,{SessionNr2,[]}}=inviso_tool:stop_session(),

-    ?l stop_inviso_tool(CNode,[]), % No nodes are connected.

-

-    ok.

-%% -----------------------------------------------------------------------------

-

-    

-%% ==============================================================================

-%% Help functions.

-%% ==============================================================================

-    

-%% Help function starting the inviso_tool with runtime components at Nodes

-%% and the inviso control component at CNode. OtherOpts shall contain all other

-%% necessary options except nodes and c_node. Returns nothing significant.

-start_inviso_tool(Nodes,CNode,OtherOpts) -> 

-    ?l Options=[{nodes,Nodes},{c_node,CNode}|OtherOpts],

-    ?l {ok,_Pid}=inviso_tool:start(Options),

-    ?l ok=poll(erlang,whereis,[inviso_tool],fun(X)->true=is_pid(X) end,10),

-    %% Now the runtime components shall be started but no tracing started.

-    ?l lists:foreach(fun(N)->ok=poll(rpc,

-				     call,

-				     [CNode,inviso,get_status,[[N]]],

-				     fun({ok,[{_N,{ok,{new,running}}}]})->true;

-					(_) ->false

-				     end,

-				     10)

-		     end,

-		     Nodes),

-    true.

-%% -----------------------------------------------------------------------------

-

-%% Stops the inviso_tool.

-stop_inviso_tool(CNode,Nodes) ->

-    ?l {ok,NodeResults}=inviso_tool:stop(),

-    ?l true=check_noderesults(Nodes,ok,NodeResults),

-    ?l ok=poll(erlang,whereis,[inviso_tool],undefined,10),

-    %% Check that all inviso components are gone.

-    ?l ok=poll(rpc,call,[CNode,erlang,whereis,[inviso_c]],undefined,10),

-    ?l lists:foreach(fun(N)->ok=poll(rpc,

-				     call,

-				     [N,erlang,whereis,[inviso_rt]],

-				     undefined,

-				     10)

-		     end,

-		     Nodes),

-    true.

-%% -----------------------------------------------------------------------------

-

-%% Starts a trace session. Returns the InvisoReturn part of the return value.

-start_inviso_tool_session(CNode,MoreTDGargs,SessionNr,Nodes) ->

-    ?l {ok,{SessionNr,InvisoReturn}}=inviso_tool:start_session(MoreTDGargs),

-    %% Now check that all nodes are tracing.

-    ?l lists:foreach(fun(N)->ok=poll(rpc,

-				     call,

-				     [CNode,inviso,get_status,[[N]]],

-				     fun({ok,[{_N,{ok,{tracing,running}}}]})->true;

-					(_) ->false

-				     end,

-				     10),

-			     %% Check that the initial trace case is executed.

-			     ?l ok=poll(rpc,

-					call,

-					[N,erlang,trace_info,[{lists,module_info,1},traced]],

-					{traced,local},

-					10)

-		     end,

-		     Nodes),

-    InvisoReturn.

-%% -----------------------------------------------------------------------------

-

-%% Stops a trace session.

-stop_inviso_tool_session(CNode,SessionNr,Nodes) ->

-    ?l {ok,{SessionNr,NodeResults}}=inviso_tool:stop_session(),

-    ?l true=check_noderesults(Nodes,ok,NodeResults),

-    %% Now the runtimes shall not be tracing any longer.

-    ?l lists:foreach(fun(N)->ok=poll(rpc,

-				     call,

-				     [CNode,inviso,get_status,[[N]]],

-				     fun({ok,[{_N,{ok,{idle,running}}}]})->true;

-					(_) ->false

-				     end,

-				     10)

-		     end,

-		     Nodes),

-    true.

-%% -----------------------------------------------------------------------------

-

-%% Help function checking that there is a Result for each node in Nodes.

-%% Returns 'true' if successful.

-check_noderesults(Nodes,Fun,[{Node,Result}|Rest]) when is_function(Fun) ->

-    case Fun({Node,Result}) of

-	true ->

-	    case lists:member(Node,Nodes) of

-		true ->

-		    check_noderesults(lists:delete(Node,Nodes),Fun,Rest);

-		false ->                     % Not good.

-		    unknown_node_in_returnvalue

-	    end;

-	_ ->

-	    illegal_result

-    end;

-check_noderesults(Nodes,Result,[{Node,Result}|Rest]) ->

-    case lists:member(Node,Nodes) of

-	true ->

-	    check_noderesults(lists:delete(Node,Nodes),Result,Rest);

-	false ->                             % Not good.

-	    unknown_node_in_returnvalue

-    end;

-check_noderesults([],_,[]) ->

-    true;

-check_noderesults(X,Y,Z) ->

-    io:format("Bad arguments to check noderesults:~w~n~w~n~w~n",[X,Y,Z]),

-    false.

-%% ------------------------------------------------------------------------------

-

-%% Help function which waits for a function call to become Result. This is useful

-%% if what we are waiting for can happend independantly of indications we have

-%% access to.

-poll(_,_,_,_,0) ->

-    error;

-poll(M,F,Args,Result,Times) ->

-    try apply(M,F,Args) of

-	What when is_function(Result) ->

-	    case Result(What) of

-		true ->

-		    ok;

-		X ->

-		    io:format("Poll: ~w:~w ~w ~w ~w~n",[M,F,Args,Result,X]),

-		    timer:sleep(100),

-		    poll(M,F,Args,Result,Times-1)

-	    end;

-	Result ->

-	    ok;

-	X ->

-	    io:format("Poll: ~w:~w ~w ~w ~w~n",[M,F,Args,Result,X]),

-	    timer:sleep(100),

-	    poll(M,F,Args,Result,Times-1)

-    catch

-	error:Reason ->

-	    io:format("Apply in suite-function poll/5 failed, ~w~n",[Reason]),

-	    timer:sleep(100),

-	    poll(M,F,Args,Result,Times-1)

-    end.

-%% ------------------------------------------------------------------------------

-

-%% ------------------------------------------------------------------------------

-%% The Tracer Data Generator function.

-%% ------------------------------------------------------------------------------

-

--define(I2L(Arg),integer_to_list(Arg)).

-

-tdg(Node,{{Y,Mo,D},{H,Mi,S}},PrivDir) ->

-    NameStr=atom_to_list(Node)++"_"++?I2L(Y)++"-"++?I2L(Mo)++"-"++?I2L(D)++"_"++

-	?I2L(H)++"-"++?I2L(Mi)++"-"++?I2L(S),

-    LogTD={file,filename:join(PrivDir,NameStr++".log")},

-    TiTD={file,filename:join(PrivDir,NameStr++".ti")},

-    [{trace,LogTD},{ti,TiTD}].

-%% ------------------------------------------------------------------------------

-

-

-%% ------------------------------------------------------------------------------

-%% Handling the test server Config.

-%% ------------------------------------------------------------------------------

-

-insert_remotenode_config(Name,Node,Config) ->

-    [{remotenode,{Name,Node}}|Config].

-%% ------------------------------------------------------------------------------

-

-insert_timetraphandle_config(Handle,Config) ->

-    [{timetraphandle,Handle}|Config].

-%% ------------------------------------------------------------------------------

-

-get_remotenode_config(Name, [{remotenode, {Name, Node}}| _Cs]) ->

-    Node;

-get_remotenode_config(Name, [_C | Cs]) ->

-    get_remotenode_config(Name, Cs);

-get_remotenode_config(Name, []) ->

-    exit({no_remotenode, Name}).

-

-%% ------------------------------------------------------------------------------

-

-get_timetraphandle_config(Config) ->

-    {value,{_,Handle}}=lists:keysearch(timetraphandle,1,Config),

-    Handle.

-%% ------------------------------------------------------------------------------

-

-get_remotenodes_config([{remotenode,{_Name,Node}}|Config]) ->

-    [Node|get_remotenodes_config(Config)];

-get_remotenodes_config([_|Config]) ->

-    get_remotenodes_config(Config);

-get_remotenodes_config([]) ->

-    [].

-%% ------------------------------------------------------------------------------

-

-remove_remotenode_config(Name, [{remotenode, {Name, _}} | Cs]) ->

-    Cs;

-remove_remotenode_config(Name, [C | Cs]) ->

-    [C | remove_remotenode_config(Name, Cs)];

-remove_remotenode_config(_Name, []) ->

-    [].

-%% ------------------------------------------------------------------------------

-

-remove_timetraphandle_config(Config) ->

-    lists:keydelete(timetraphandle,1,Config).

-%% ------------------------------------------------------------------------------

-

-

-%% ==============================================================================

-%% Code for a test process which can be started.

-%% ==============================================================================

-

-%% The test proc is also responsible for owning a side effect table. The table

-%% can be updated by tracecases.

-test_proc_init() ->

-    register(inviso_tool_test_proc,self()),

-    ets:new(test_proc_tab,[named_table,public]),

-    ets:insert(test_proc_tab,{counter,0}),

-    test_proc_loop().

-

-test_proc_loop() ->

-    receive

-	{apply,M,F,Args} ->

-	    apply(M,F,Args),

-	    test_proc_loop();

-	X ->

-	    io:format("Got ~w~n",[X]),

-	    test_proc_loop()

-    end.

-%% ------------------------------------------------------------------------------

diff --git a/lib/inviso/test/inviso_tool_SUITE_data/tracecase1_off.trc b/lib/inviso/test/inviso_tool_SUITE_data/tracecase1_off.trc
deleted file mode 100644
index 426c1ed9f9..0000000000
--- a/lib/inviso/test/inviso_tool_SUITE_data/tracecase1_off.trc
+++ /dev/null
@@ -1,12 +0,0 @@
-%% TRACECASE1_OFF.TRC

-%% -----------------------------------------------------------------------------

-%% This is a test trace case to be used by the inviso_tool_SUITE.

-%% Trace case deactivating the trace started by the activation case tracecase1_on.

-%%

-%% ProcessName=atom(), variable set in the test environment.

-%% Nodes=list(), inviso_tool variable - all traced nodes.

-%% -----------------------------------------------------------------------------

-

-inviso:ctf(Nodes,ProcessName,[call]).

-inviso:ctpl(Nodes,math,module_info,1).

-%% END-OF-TRACE-CASE

diff --git a/lib/inviso/test/inviso_tool_SUITE_data/tracecase1_on.trc b/lib/inviso/test/inviso_tool_SUITE_data/tracecase1_on.trc
deleted file mode 100644
index a9106dbc78..0000000000
--- a/lib/inviso/test/inviso_tool_SUITE_data/tracecase1_on.trc
+++ /dev/null
@@ -1,17 +0,0 @@
-%% TRACECASE1_ON.TRC

-%% -----------------------------------------------------------------------------

-%% This is a test trace case to be used by the inviso_tool_SUITE.

-%% Trace case setting a local pattern on math:module_info/1 and process flags

-%% on a test process which is supposed to be started by the test environment.

-%%

-%% ProcessName=atom(), variable set in the test environment.

-%% Nodes=list(), inviso_tool variable - all traced nodes.

-%% -----------------------------------------------------------------------------

-

-inviso:tpl(Nodes,math,module_info,1,[]).

-inviso:tf(Nodes,ProcessName,[call]).

-lists:foreach(fun(N)->rpc:call(N,ets,update_counter,[test_proc_tab,counter,1]) end,

-	      Nodes).

-timer:sleep(500).

-%% END-OF-TRACE-CASE

-

diff --git a/lib/inviso/test/inviso_tool_SUITE_data/tracecase2_off.trc b/lib/inviso/test/inviso_tool_SUITE_data/tracecase2_off.trc
deleted file mode 100644
index cc89c3aa03..0000000000
--- a/lib/inviso/test/inviso_tool_SUITE_data/tracecase2_off.trc
+++ /dev/null
@@ -1,12 +0,0 @@
-%% TRACECASE2_OFF.TRC

-%% -----------------------------------------------------------------------------

-%% This is a test trace case to be used by the inviso_tool_SUITE.

-%% The tracecase is mainly used for testing that synchronous tracecases return

-%% values.

-%%

-%% Nodes=list(), inviso_tool variable - all traced nodes.

-%% -----------------------------------------------------------------------------

-

-inviso:ctpl(Nodes,math,pi,0).

-another_return_value.

-%% END-OF-TRACE-CASE

diff --git a/lib/inviso/test/inviso_tool_SUITE_data/tracecase2_on.trc b/lib/inviso/test/inviso_tool_SUITE_data/tracecase2_on.trc
deleted file mode 100644
index a3ab5fcfc7..0000000000
--- a/lib/inviso/test/inviso_tool_SUITE_data/tracecase2_on.trc
+++ /dev/null
@@ -1,16 +0,0 @@
-%% TRACECASE2_ON.TRC

-%% -----------------------------------------------------------------------------

-%% This is a test trace case to be used by the inviso_tool_SUITE.

-%% The tracecase is mainly used for testing that synchronous tracecases return

-%% values.

-%% We also use this tracecase to check that reactivation works when it comes to

-%% handling simulataneously issued tool commands (issued during reactivation).

-%% 

-%% Nodes=list(), inviso_tool variable - all traced nodes.

-%% -----------------------------------------------------------------------------

-

-inviso:tpl(Nodes,math,pi,0,[]).

-timer:sleep(3000).

-a_return_value.

-%% END-OF-TRACE-CASE

-

diff --git a/lib/inviso/test/inviso_tool_SUITE_data/tracecase3_on.trc b/lib/inviso/test/inviso_tool_SUITE_data/tracecase3_on.trc
deleted file mode 100644
index e6c5ff78b1..0000000000
--- a/lib/inviso/test/inviso_tool_SUITE_data/tracecase3_on.trc
+++ /dev/null
@@ -1,9 +0,0 @@
-%% TRACECASE3_ON.TRC

-%% -----------------------------------------------------------------------------

-%% This is a test trace case to be used by the inviso_tool_SUITE.

-%% It is faulty and meant to cause a crash!

-%% -----------------------------------------------------------------------------

-

-1=2.

-%% END-OF-TRACE-CASE

-

diff --git a/lib/inviso/test/inviso_tool_SUITE_data/tracecase4_on.trc b/lib/inviso/test/inviso_tool_SUITE_data/tracecase4_on.trc
deleted file mode 100644
index d14c11f78c..0000000000
--- a/lib/inviso/test/inviso_tool_SUITE_data/tracecase4_on.trc
+++ /dev/null
@@ -1,9 +0,0 @@
-%% TRACECASE4_ON.TRC

-%% -----------------------------------------------------------------------------

-%% This is a test trace case to be used by the inviso_tool_SUITE.

-%% It contains an infinity timer in order for the tracecase executer to hang.

-%% -----------------------------------------------------------------------------

-

-timer:sleep(infinity).

-%% END-OF-TRACE-CASE

-

diff --git a/lib/inviso/test/inviso_tool_SUITE_data/tracecase5_off.trc b/lib/inviso/test/inviso_tool_SUITE_data/tracecase5_off.trc
deleted file mode 100644
index feb67acb11..0000000000
--- a/lib/inviso/test/inviso_tool_SUITE_data/tracecase5_off.trc
+++ /dev/null
@@ -1,11 +0,0 @@
-%% TRACECASE5_OFF.TRC

-%% -----------------------------------------------------------------------------

-%% This is a test trace case to be used by the inviso_tool_SUITE.

-%% Contains a 2 second sleep.

-%% -----------------------------------------------------------------------------

-

-lists:foreach(fun(N)->rpc:call(N,ets,update_counter,[test_proc_tab,counter,1]) end,

-	      Nodes).

-timer:sleep(2000).

-%% END-OF-TRACE-CASE

-

diff --git a/lib/inviso/test/inviso_tool_SUITE_data/tracecase5_on.trc b/lib/inviso/test/inviso_tool_SUITE_data/tracecase5_on.trc
deleted file mode 100644
index 724c617c5a..0000000000
--- a/lib/inviso/test/inviso_tool_SUITE_data/tracecase5_on.trc
+++ /dev/null
@@ -1,11 +0,0 @@
-%% TRACECASE5_ON.TRC

-%% -----------------------------------------------------------------------------

-%% This is a test trace case to be used by the inviso_tool_SUITE.

-%% This tracecase updates an ETS table. Can be used to verify that it has been

-%% done (or not done!).

-%% -----------------------------------------------------------------------------

-

-lists:foreach(fun(N)->rpc:call(N,ets,update_counter,[test_proc_tab,counter,1]) end,

-	      Nodes).

-%% END-OF-TRACE-CASE

-

diff --git a/lib/inviso/test/inviso_tool_SUITE_data/tracecase_def.txt b/lib/inviso/test/inviso_tool_SUITE_data/tracecase_def.txt
deleted file mode 100644
index 5b08fa32a5..0000000000
--- a/lib/inviso/test/inviso_tool_SUITE_data/tracecase_def.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{tracecase_init,on,[],"./tracecase_init.trc"}.

-{tracecase1,on_off,['ProcessName'],"./tracecase1_on.trc","./tracecase1_off.trc"}.

-{tracecase2,on_off,[],"./tracecase2_on.trc","./tracecase2_off.trc"}.

-{tracecase3,on,[],"./tracecase3_on.trc"}.

-{tracecase4,on,[],"./tracecase4_on.trc"}.

-{tracecase5,on_off,[],"./tracecase5_on.trc","./tracecase5_off.trc"}.

-

-

diff --git a/lib/inviso/test/inviso_tool_SUITE_data/tracecase_init.trc b/lib/inviso/test/inviso_tool_SUITE_data/tracecase_init.trc
deleted file mode 100644
index 49a79cd3a5..0000000000
--- a/lib/inviso/test/inviso_tool_SUITE_data/tracecase_init.trc
+++ /dev/null
@@ -1,10 +0,0 @@
-%% TRACECASE_INIT.TRC

-%% -----------------------------------------------------------------------------

-%% This is a test trace case to be used by the inviso_tool_SUITE.

-%% Initial trace case executed at session start.

-%%

-%% Nodes=list(), inviso_tool variable - all traced nodes.

-%% -----------------------------------------------------------------------------

-

-inviso:tpl(Nodes,lists,module_info,1,[]).

-%% END-OF-TRACE-CASE

diff --git a/lib/inviso/vsn.mk b/lib/inviso/vsn.mk
deleted file mode 100644
index c6b0398bde..0000000000
--- a/lib/inviso/vsn.mk
+++ /dev/null
@@ -1 +0,0 @@
-INVISO_VSN = 0.6.3
diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile
index acd5307dee..4d5713566c 100644
--- a/lib/jinterface/doc/src/Makefile
+++ b/lib/jinterface/doc/src/Makefile
@@ -3,7 +3,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2000-2010. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -160,17 +160,17 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html/java/$(JAVA_PKG_PATH)
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	(/bin/cp -rf  ../html $(RELSYSDIR)/doc)
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html/java/$(JAVA_PKG_PATH)"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	(/bin/cp -rf  ../html "$(RELSYSDIR)/doc")
 
 #	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-#		$(RELSYSDIR)/doc/html
-#	$(INSTALL_DATA) $(JAVA_EXTRA_FILES) $(RELSYSDIR)/doc/html/java
-#	$(INSTALL_DATA) $(TOP_HTML_FILES) $(RELSYSDIR)/doc
+#		"$(RELSYSDIR)/doc/html"
+#	$(INSTALL_DATA) $(JAVA_EXTRA_FILES) "$(RELSYSDIR)/doc/html/java"
+#	$(INSTALL_DATA) $(TOP_HTML_FILES) "$(RELSYSDIR)/doc"
 
 
 release_spec:
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index 420e121389..19f25e3681 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
index 365798e68a..8ae63a1561 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
@@ -3,7 +3,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -66,7 +66,7 @@ JARFLAGS=-cvf
 JAVA_OPTIONS = 
 
 ifeq ($(TESTROOT),)
-RELEASE_PATH=$(ERL_TOP)/release/$(TARGET)
+RELEASE_PATH="$(ERL_TOP)/release/$(TARGET)"
 else
 RELEASE_PATH=$(TESTROOT)
 endif
@@ -96,13 +96,13 @@ docs:
 # include $(ERL_TOP)/make/otp_release_targets.mk
 
 release release_docs release_tests release_html:
-	$(MAKE) $(MFLAGS) RELEASE_PATH=$(RELEASE_PATH) $(TARGET_MAKEFILE)  $@_spec
+	$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE)  $@_spec
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/java_src/com/ericsson/otp/erlang
-	$(INSTALL_DATA) $(JAVA_SRC) $(RELSYSDIR)/java_src/com/ericsson/otp/erlang
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
+	$(INSTALL_DATA) $(JAVA_SRC) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
index deac528133..b985f8aa50 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
@@ -358,7 +358,7 @@ public class OtpEpmd {
     }
 
     public static String[] lookupNames() throws IOException {
-	return lookupNames(InetAddress.getLocalHost());
+       return lookupNames(InetAddress.getByName(null));
     }
 
     public static String[] lookupNames(final InetAddress address)
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
index b9b43481ee..ae5f4ee072 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
@@ -1112,12 +1112,16 @@ public class OtpInputStream extends ByteArrayInputStream {
 	final int size = read4BE();
 	final byte[] buf = new byte[size];
 	final java.util.zip.InflaterInputStream is = 
-	    new java.util.zip.InflaterInputStream(this);
+	    new java.util.zip.InflaterInputStream(this, new java.util.zip.Inflater(), size);
+	int curPos = 0;
 	try {
-	    final int dsize = is.read(buf, 0, size);
-	    if (dsize != size) {
+	    int curRead;
+	    while(curPos < size && (curRead = is.read(buf, curPos, size - curPos)) != -1) {
+		curPos += curRead;
+	    }
+	    if (curPos != size) {
 		throw new OtpErlangDecodeException("Decompression gave "
-			+ dsize + " bytes, not " + size);
+			+ curPos + " bytes, not " + size);
 	    }
 	} catch (final IOException e) {
 	    throw new OtpErlangDecodeException("Cannot read from input stream");
diff --git a/lib/jinterface/test/Makefile b/lib/jinterface/test/Makefile
index a85d0e7411..d9ff406994 100644
--- a/lib/jinterface/test/Makefile
+++ b/lib/jinterface/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2011. All Rights Reserved.
+# Copyright Ericsson AB 2004-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -80,6 +80,6 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(TEST_SPEC_FILE) $(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(TEST_SPEC_FILE) $(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
diff --git a/lib/jinterface/test/jitu.erl b/lib/jinterface/test/jitu.erl
index c57fb9bfad..571a2dc9c7 100644
--- a/lib/jinterface/test/jitu.erl
+++ b/lib/jinterface/test/jitu.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -89,13 +89,19 @@ classpath(Dir) ->
 	    {win32, _} -> ";";
 	    _          -> ":"
 	end,
-    Dir++PS++
+    es(Dir++PS++
 	filename:join([code:lib_dir(jinterface),"priv","OtpErlang.jar"])++PS++
 	case os:getenv("CLASSPATH") of
 	    false -> "";
 	    Classpath -> Classpath
-	end.
-
+	end).
+
+es(L) ->
+    lists:flatmap(fun($ ) ->
+			  "\\ ";
+		     (C) ->
+			  [C]
+		  end,lists:flatten(L)).
 
 cmd(Cmd) ->
     PortOpts = [{line,80},eof,exit_status,stderr_to_stdout],
diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl
index 9c88400c2a..d5388e54f4 100644
--- a/lib/jinterface/test/nc_SUITE.erl
+++ b/lib/jinterface/test/nc_SUITE.erl
@@ -89,7 +89,7 @@ end_per_suite(Config) ->
 init_per_testcase(Case, Config) ->
     T = case atom_to_list(Case) of
 	    "unicode"++_ -> 240;
-	    _ -> 20
+	    _ -> 30
 	end,
     WatchDog = test_server:timetrap(test_server:seconds(T)),
     [{watchdog, WatchDog}| Config].
@@ -187,10 +187,18 @@ binary_roundtrip(Config) when is_list(Config) ->
 decompress_roundtrip(doc) -> [];
 decompress_roundtrip(suite) -> [];
 decompress_roundtrip(Config) when is_list(Config) ->
+	RandomBin = erlang:term_to_binary(lists:seq(1, 5 * 1024 * 1024)), % roughly 26MB
+	<<RandomBin1k:1024/binary,_/binary>> = RandomBin,
+	<<RandomBin1M:1048576/binary,_/binary>> = RandomBin,
+	<<RandomBin10M:10485760/binary,_/binary>> = RandomBin,
     Terms =
 	[0.0,
 	 math:sqrt(2),
 	 <<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,31:5>>,
+	 RandomBin1k,
+	 RandomBin1M,
+	 RandomBin10M,
+	 RandomBin,
 	 make_ref()],
     OutTrans =
 	fun (D) ->
@@ -205,10 +213,18 @@ decompress_roundtrip(Config) when is_list(Config) ->
 compress_roundtrip(doc) -> [];
 compress_roundtrip(suite) -> [];
 compress_roundtrip(Config) when is_list(Config) ->
+	RandomBin = erlang:term_to_binary(lists:seq(1, 5 * 1024 * 1024)), % roughly 26MB
+	<<RandomBin1k:1024/binary,_/binary>> = RandomBin,
+	<<RandomBin1M:1048576/binary,_/binary>> = RandomBin,
+	<<RandomBin10M:10485760/binary,_/binary>> = RandomBin,
     Terms =
 	[0.0,
 	 math:sqrt(2),
 	 <<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,31:5>>,
+	 RandomBin1k,
+	 RandomBin1M,
+	 RandomBin10M,
+	 RandomBin,
 	 make_ref()],
     OutTrans =
 	fun (D) ->
diff --git a/lib/kernel/doc/src/Makefile b/lib/kernel/doc/src/Makefile
index 214e994889..5e04bff0c1 100644
--- a/lib/kernel/doc/src/Makefile
+++ b/lib/kernel/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -155,18 +155,18 @@ $(SPECDIR)/specs_zlib_stub.xml:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man4
-	$(INSTALL_DATA) $(MAN4_FILES) $(RELEASE_PATH)/man/man4
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6_FILES) $(RELEASE_PATH)/man/man6
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man4"
+	$(INSTALL_DATA) $(MAN4_FILES) "$(RELEASE_PATH)/man/man4"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6_FILES) "$(RELEASE_PATH)/man/man6"
 
 release_spec:
 
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index ee687511a3..279c7558bc 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -91,7 +91,7 @@
       of the additional library directories will override modules with
       the same name in OTP, except for modules in Kernel and
       STDLIB.</p>
-    <p>The environment variable <c>ERL_LIBS</c> (if defined) shold contain
+    <p>The environment variable <c>ERL_LIBS</c> (if defined) should contain
       a colon-separated (for Unix-like systems) or semicolon-separated
       (for Windows) list of additional libraries.</p>
     <p>Example: On an Unix-like system, <c>ERL_LIBS</c> could be set to
@@ -728,16 +728,13 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name>is_module_native(Module) -> boolean() | undefined</name>
+      <name name="is_module_native" arity="1"/>
       <fsummary>Test whether a module has native code</fsummary>
-      <type>
-        <v>Module = module()</v>
-      </type>
       <desc>
-        <p>This function returns <c>true</c> if <c>Module</c> is 
+        <p>This function returns <c>true</c> if <c><anno>Module</anno></c> is
 	name of a loaded module that has native code loaded, and 
-	<c>false</c> if <c>Module</c> is loaded but does not have
-	native. If <c>Module</c> is not loaded, this function returns
+	<c>false</c> if <c><anno>Module</anno></c> is loaded but does not have
+	native. If <c><anno>Module</anno></c> is not loaded, this function returns
 	<c>undefined</c>.</p>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/erl_ddll.xml b/lib/kernel/doc/src/erl_ddll.xml
index 1911fb628e..26db11cfcd 100644
--- a/lib/kernel/doc/src/erl_ddll.xml
+++ b/lib/kernel/doc/src/erl_ddll.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -182,11 +182,8 @@
   </datatypes>
   <funcs>
     <func>
-      <name>demonitor(MonitorRef) -> ok</name>
+      <name name="demonitor" arity="1"/>
       <fsummary>Remove a monitor for a driver</fsummary>
-      <type>
-        <v>MonitorRef = reference()</v>
-      </type>
       <desc>
         <p>Removes a driver monitor in much the same way as 
           <seealso marker="erts:erlang#erlang:demonitor/1">erlang:demonitor/1</seealso> does with process
@@ -232,24 +229,19 @@
       </desc>
     </func>
     <func>
-      <name>info(Name, Tag) -> Value</name>
+      <name name="info" arity="2"/>
       <fsummary>Retrieve specific information about one driver</fsummary>
-      <type>
-        <v>Name = string() | atom()</v>
-        <v>Tag = processes | driver_options | port_count | linked_in_driver | permanent | awaiting_load | awaiting_unload</v>
-        <v>Value = term()</v>
-      </type>
       <desc>
         <p>This function returns specific information about one aspect
-          of a driver. The <c>Tag</c> parameter specifies which aspect
-          to get information about. The <c>Value</c> return differs
+          of a driver. The <c><anno>Tag</anno></c> parameter specifies which aspect
+          to get information about. The <c><anno>Value</anno></c> return differs
           between different tags:</p>
         <taglist>
           <tag><em>processes</em></tag>
           <item>
             <p>Return all processes containing <seealso marker="#users">users</seealso> of the specific drivers
-              as a list of tuples <c>{pid(),int()}</c>, where the
-              <c>int()</c> denotes the number of users in the process
+              as a list of tuples <c>{pid(),integer() >= 0}</c>, where the
+              <c>integer()</c> denotes the number of users in the process
               <c>pid()</c>.</p>
           </item>
           <tag><em>driver_options</em></tag>
@@ -261,16 +253,16 @@
           </item>
           <tag><em>port_count</em></tag>
           <item>
-            <p>Return the number of ports (an <c>int()</c>) using the driver.</p>
+            <p>Return the number of ports (an <c>integer >= 0()</c>) using the driver.</p>
           </item>
           <tag><em>linked_in_driver</em></tag>
           <item>
-            <p>Return a <c>bool()</c>, being <c>true</c> if the driver is a
+            <p>Return a <c>boolean()</c>, being <c>true</c> if the driver is a
               statically linked in one and <c>false</c> otherwise.</p>
           </item>
           <tag><em>permanent</em></tag>
           <item>
-            <p>Return a <c>bool()</c>, being <c>true</c> if the driver has made
+            <p>Return a <c>boolean()</c>, being <c>true</c> if the driver has made
               itself permanent (and is <em>not</em> a statically
               linked in driver). <c>false</c> otherwise.</p>
           </item>
@@ -278,14 +270,14 @@
           <item>
             <p>Return a list of all processes having monitors for
               <c>loading</c> active, each process returned as
-              <c>{pid(),int()}</c>, where the <c>int()</c> is the
+              <c>{pid(),integer() >= 0}</c>, where the <c>integer()</c> is the
               number of monitors held by the process <c>pid()</c>.</p>
           </item>
           <tag><em>awaiting_unload</em></tag>
           <item>
             <p>Return a list of all processes having monitors for
               <c>unloading</c> active, each process returned as
-              <c>{pid(),int()}</c>, where the <c>int()</c> is the
+              <c>{pid(),integer() >= 0}</c>, where the <c>integer()</c> is the
               number of monitors held by the process <c>pid()</c>.</p>
           </item>
         </taglist>
@@ -377,41 +369,34 @@
       </desc>
     </func>
     <func>
-      <name>monitor(Tag, Item) -> MonitorRef</name>
+      <name name="monitor" arity="2"/>
       <fsummary>Create a monitor for a driver</fsummary>
-      <type>
-        <v>Tag = driver </v>
-        <v>Item = {Name, When}</v>
-        <v>Name = atom() | string()</v>
-        <v>When = loaded | unloaded | unloaded_only</v>
-        <v>MonitorRef = reference()</v>
-      </type>
       <desc>
         <p>This function creates a driver monitor and works in many
           ways as the function <seealso marker="erts:erlang#erlang:monitor/2">erlang:monitor/2</seealso>,
           does for processes. When a driver changes state, the monitor
           results in a monitor-message being sent to the calling
-          process. The <c>MonitorRef</c> returned by this function is
+          process. The <c><anno>MonitorRef</anno></c> returned by this function is
           included in the message sent.</p>
         <p>As with process monitors, each driver monitor set will only
           generate <em>one single message</em>. The monitor is
           "destroyed" after the message is sent and there is then no
           need to call <seealso marker="#demonitor/1">demonitor/1</seealso>.</p>
-        <p>The <c>MonitorRef</c> can also be used in subsequent calls
+        <p>The <c><anno>MonitorRef</anno></c> can also be used in subsequent calls
           to <seealso marker="#demonitor/1">demonitor/1</seealso> to
           remove a monitor.</p>
         <p>The function accepts the following parameters:</p>
         <taglist>
-          <tag><em>Tag</em></tag>
+          <tag><em><anno>Tag</anno></em></tag>
           <item>
             <p>The monitor tag is always <c>driver</c> as this function
               can only be used to create driver monitors. In the future,
               driver monitors will be integrated with process monitors,
               why this parameter has to be given for consistence.</p>
           </item>
-          <tag><em>Item</em></tag>
+          <tag><em><anno>Item</anno></em></tag>
           <item>
-            <p>The <c>Item</c> parameter specifies which driver one
+            <p>The <c><anno>Item</anno></c> parameter specifies which driver one
               wants to monitor (the name of the driver) as well as
               which state change one wants to monitor. The parameter
               is a tuple of arity two whose first element is the
@@ -588,22 +573,8 @@
       </desc>
     </func>
     <func>
-      <name>try_load(Path, Name, OptionList) -> {ok,Status} | {ok, PendingStatus, Ref} | {error, ErrorDesc}</name>
+      <name name="try_load" arity="3"/>
       <fsummary>Load a driver</fsummary>
-      <type>
-        <v>Path = Name = string() | atom()</v>
-        <v>OptionList = [ Option ]</v>
-        <v>Option = {driver_options, DriverOptionList} | {monitor, MonitorOption} | {reload, ReloadOption}</v>
-        <v>DriverOptionList = [ DriverOption ]</v>
-        <v>DriverOption = kill_ports</v>
-        <v>MonitorOption = pending_driver | pending</v>
-        <v>ReloadOption = pending_driver | pending</v>
-        <v>Status = loaded | already_loaded | PendingStatus </v>
-        <v>PendingStatus = pending_driver | pending_process</v>
-        <v>Ref = reference()</v>
-        <v>ErrorDesc = ErrorAtom | OpaqueError</v>
-        <v>ErrorAtom = linked_in_driver | inconsistent | permanent | not_loaded_by_this_process | not_loaded |  pending_reload | pending_process</v>
-      </type>
       <desc>
         <p>This function provides more control than the
           <c>load/2</c>/<c>reload/2</c> and
@@ -655,65 +626,65 @@
         <p>When the function returns <c>{ok, pending_driver}</c> or
           <c>{ok, pending_process}</c>, one might want to get information
           about when the driver is <em>actually</em> loaded. This can
-          be achieved by using the <c>{monitor, PendingOption}</c> option.</p>
+          be achieved by using the <c>{monitor, <anno>MonitorOption</anno>}</c> option.</p>
         <p>When monitoring is requested, and a corresponding <c>{ok, pending_driver}</c> or <c>{ok, pending_process}</c> would be
-          returned, the function will instead return a tuple <c>{ok, PendingStatus, reference()}</c> and the process will, at a later
+          returned, the function will instead return a tuple <c>{ok, <anno>PendingStatus</anno>, reference()}</c> and the process will, at a later
           time when the driver actually gets loaded, get a monitor
           message. The monitor message one can expect is described in
           the <seealso marker="#monitor/2">monitor/2</seealso>
           function description. </p>
         <note>
           <p>Note that in case of loading, monitoring can
-            <em>not</em> only get triggered by using the <c>{reload, ReloadOption}</c> option, but also in special cases where
+            <em>not</em> only get triggered by using the <c>{reload, <anno>ReloadOption</anno>}</c> option, but also in special cases where
             the load-error is transient, why <c>{monitor, pending_driver}</c> should be used under basically
             <em>all</em> real world circumstances!</p>
         </note>
         <p>The function accepts the following parameters:</p>
         <taglist>
-          <tag><em>Path</em></tag>
+          <tag><em><anno>Path</anno></em></tag>
           <item>
             <p>The filesystem path to the directory where the driver
               object file is situated. The filename of the object file
               (minus extension) must correspond to the driver name
               (used in the name parameter) and the driver must
               identify itself with the very same name. The
-              <c>Path</c> might be provided as an <em>io_list</em>,
-              meaning it can be a list of other io_lists, characters
+              <c><anno>Path</anno></c> might be provided as an <em>iolist()</em>,
+              meaning it can be a list of other <c>iolist()</c>s, characters
               (eight bit integers) or binaries, all to be flattened
               into a sequence of characters.</p>
-            <p>The (possibly flattened) <c>Path</c> parameter must be
+            <p>The (possibly flattened) <c><anno>Path</anno></c> parameter must be
               consistent throughout the system, a driver should, by
               all <seealso marker="#users">users</seealso>, be loaded
-              using the same <em>literal</em><c>Path</c>. The
+              using the same <em>literal</em><c><anno>Path</anno></c>. The
               exception is when <em>reloading</em> is requested, in
-              which case the <c>Path</c> may be specified
+              which case the <c><anno>Path</anno></c> may be specified
               differently. Note that all <seealso marker="#users">users</seealso> trying to load the
-              driver at a later time will need to use the <em>new</em><c>Path</c> if the <c>Path</c> is changed using a
+              driver at a later time will need to use the <em>new</em><c><anno>Path</anno></c> if the <c><anno>Path</anno></c> is changed using a
               <c>reload</c> option. This is yet another reason
               to have <em>only one loader</em> of a driver one wants to
               upgrade in a running system!  </p>
           </item>
-          <tag><em>Name</em></tag>
+          <tag><em><anno>Name</anno></em></tag>
           <item>
             <p>The name parameter is the name of the driver to be used
               in subsequent calls to <seealso marker="erts:erlang#open_port/2">open_port</seealso>. The
-              name can be specified either as an <c>io_list()</c> or
+              name can be specified either as an <c>iolist()</c> or
               as an <c>atom()</c>. The name given when loading is used
               to find the actual object file (with the
-              help of the <c>Path</c> and the system implied
+              help of the <c><anno>Path</anno></c> and the system implied
               extension suffix, i.e. <c>.so</c>). The name by which
               the driver identifies itself must also be consistent
-              with this <c>Name</c> parameter, much as a beam-file's
+              with this <c><anno>Name</anno></c> parameter, much as a beam-file's
               module name much correspond to its filename.</p>
           </item>
-          <tag><em>OptionList</em></tag>
+          <tag><em><anno>OptionList</anno></em></tag>
           <item>
             <p>A number of options can be specified to control the
               loading operation. The options are given as a list of
               two-tuples, the tuples having the following values and
               meanings:</p>
             <taglist>
-              <tag><em>{driver_options, DriverOptionsList}</em></tag>
+              <tag><em>{driver_options, <anno>DriverOptionList</anno>}</em></tag>
               <item>
                 <p>This option is to provide options that will change
                   its general behavior and will "stick" to the driver
@@ -729,14 +700,14 @@
                   when the last <seealso marker="#users">user</seealso> calls <seealso marker="#try_unload/2">try_unload/2</seealso>, or
                   the last process having loaded the driver exits.</p>
               </item>
-              <tag><em>{monitor, MonitorOption}</em></tag>
+              <tag><em>{monitor, <anno>MonitorOption</anno>}</em></tag>
               <item>
-                <p>A <c>MonitorOption</c> tells <c>try_load/3</c> to
+                <p>A <c><anno>MonitorOption</anno></c> tells <c>try_load/3</c> to
                   trigger a driver monitor under certain
                   conditions. When the monitor is triggered, the
-                  function will return a three-tuple <c>{ok, PendingStatus, reference()}</c>, where the <c>reference()</c> is
+                  function will return a three-tuple <c>{ok, <anno>PendingStatus</anno>, reference()}</c>, where the <c>reference()</c> is
                   the monitor ref for the driver monitor.</p>
-                <p>Only one <c>MonitorOption</c> can be specified and
+                <p>Only one <c><anno>MonitorOption</anno></c> can be specified and
                   it is either the atom <c>pending</c>, which means
                   that a monitor should be created whenever a load
                   operation is delayed, and the atom
@@ -747,7 +718,7 @@
                   is present for completeness, it is very well defined
                   which reload-options might give rise to which
                   delays. It might, however, be a good idea to use the
-                  same <c>MonitorOption</c> as the <c>ReloadOption</c>
+                  same <c><anno>MonitorOption</anno></c> as the <c><anno>ReloadOption</anno></c>
                   if present.</p>
                 <p>If reloading is not requested, it might still be
                   useful to specify the <c>monitor</c> option, as
@@ -760,12 +731,12 @@
                   <c>{monitor, pending_driver}</c> in production
                   code (see the monitor discussion above). </p>
               </item>
-              <tag><em>{reload,RealoadOption}</em></tag>
+              <tag><em>{reload,<anno>ReloadOption</anno>}</em></tag>
               <item>
                 <p>This option is used when one wants to
                   <em>reload</em> a driver from disk, most often in a
                   code upgrade scenario. Having a <c>reload</c> option
-                  also implies that the <c>Path</c> parameter need
+                  also implies that the <c><anno>Path</anno></c> parameter need
                   <em>not</em> be consistent with earlier loads of
                   the driver.</p>
                 <p>To reload a driver, the process needs to have previously
@@ -814,9 +785,9 @@
           <tag><em>{error,inconsistent}</em></tag>
           <item>
             <p>The driver has already been loaded with either other
-              <c>DriverOptions</c> or a different <em>literal</em><c>Path</c> argument.</p>
+              <c><anno>DriverOptionList</anno></c> or a different <em>literal</em><c>Path</c> argument.</p>
             <p>This can happen even if a <c>reload</c> option is given,
-              if the <c>DriverOptions</c> differ from the current.</p>
+              if the <c>DriverOptionList</c> differ from the current.</p>
           </item>
           <tag><em>{error, permanent}</em></tag>
           <item>
@@ -830,19 +801,19 @@
           </item>
           <tag><em>{error, pending_reload}</em></tag>
           <item>
-            <p>Driver reload is already requested by another <seealso marker="#users">user</seealso> when the <c>{reload, ReloadOption}</c> option was given.</p>
+            <p>Driver reload is already requested by another <seealso marker="#users">user</seealso> when the <c>{reload, <anno>ReloadOption</anno>}</c> option was given.</p>
           </item>
           <tag><em>{error, not_loaded_by_this_process}</em></tag>
           <item>
             <p>Appears when the <c>reload</c> option is given. The
-              driver <c>Name</c> is present in the system, but there is no
+              driver <c><anno>Name</anno></c> is present in the system, but there is no
               <seealso marker="#users">user</seealso> of it in this
               process.</p>
           </item>
           <tag><em>{error, not_loaded}</em></tag>
           <item>
             <p>Appears when the <c>reload</c> option is given. The
-              driver <c>Name</c> is not in the system. Only drivers
+              driver <c><anno>Name</anno></c> is not in the system. Only drivers
               loaded by this process can be reloaded.</p>
           </item>
         </taglist>
@@ -856,18 +827,8 @@
       </desc>
     </func>
     <func>
-      <name>try_unload(Name, OptionList) -> {ok,Status} | {ok, PendingStatus, Ref} | {error, ErrorAtom}</name>
+      <name name="try_unload" arity="2"/>
       <fsummary>Unload a driver</fsummary>
-      <type>
-        <v>Name = string() | atom()</v>
-        <v>OptionList = [ Option ]</v>
-        <v>Option = {monitor, MonitorOption} | kill_ports</v>
-        <v>MonitorOption = pending_driver | pending</v>
-        <v>Status = unloaded | PendingStatus </v>
-        <v>PendingStatus = pending_driver | pending_process</v>
-        <v>Ref = reference()</v>
-        <v>ErrorAtom = linked_in_driver | not_loaded |  not_loaded_by_this_process | permanent</v>
-      </type>
       <desc>
         <p>This is the low level function to unload (or decrement
           reference counts of) a driver. It can be used to force port
@@ -948,15 +909,15 @@
         </taglist>
         <p>The function accepts the following parameters:</p>
         <taglist>
-          <tag><em>Name</em></tag>
+          <tag><em><anno>Name</anno></em></tag>
           <item>
             <p>The name parameter is the name of the driver to be
               unloaded. The name can be specified either as an
-              <c>io_list()</c> or as an <c>atom()</c>. </p>
+              <c>iolist()</c> or as an <c>atom()</c>. </p>
           </item>
-          <tag><em>OptionList</em></tag>
+          <tag><em><anno>OptionList</anno></em></tag>
           <item>
-            <p>The <c>OptionList</c> argument can be used to specify
+            <p>The <c><anno>OptionList</anno></c> argument can be used to specify
               certain behavior regarding ports as well as triggering
               monitors under certain conditions:</p>
             <taglist>
@@ -972,10 +933,10 @@
                   unloads, one should use the driver option
                   <c>kill_ports</c> when loading the driver instead.</p>
               </item>
-              <tag><em>{monitor, MonitorOption}</em></tag>
+              <tag><em>{monitor, <anno>MonitorOption</anno>}</em></tag>
               <item>
                 <p>This option creates a driver monitor if the condition
-                  given in <c>MonitorOptions</c> is true. The valid
+                  given in <c><anno>MonitorOption</anno></c> is true. The valid
                   options are:</p>
                 <taglist>
                   <tag><em>pending_driver</em></tag>
@@ -989,7 +950,7 @@
                       <c>{ok, pending_driver}</c> or <c>{ok, pending_process}</c>.</p>
                   </item>
                 </taglist>
-                <p>The <c>pending_driver</c> <c>MonitorOption</c> is by far
+                <p>The <c>pending_driver</c> <c><anno>MonitorOption</anno></c> is by far
                   the most useful and it has to be used to ensure that the
                   driver has really been unloaded and the ports closed
                   whenever the <c>kill_ports</c> option is used or the
@@ -1016,11 +977,11 @@
           </item>
           <tag><em>{error, not_loaded}</em></tag>
           <item>
-            <p>The driver <c>Name</c> is not present in the system.</p>
+            <p>The driver <c><anno>Name</anno></c> is not present in the system.</p>
           </item>
           <tag><em>{error, not_loaded_by_this_process}</em></tag>
           <item>
-            <p>The driver <c>Name</c> is present in the system, but
+            <p>The driver <c><anno>Name</anno></c> is present in the system, but
               there is no <seealso marker="#users">user</seealso> of
               it in this process. </p>
             <p>As a special case, drivers can be unloaded from
@@ -1088,12 +1049,8 @@
       </desc>
     </func>
     <func>
-      <name>loaded_drivers() -> {ok, Drivers}</name>
+      <name name="loaded_drivers" arity="0"/>
       <fsummary>List loaded drivers</fsummary>
-      <type>
-        <v>Drivers = [Driver]</v>
-        <v>Driver = string()</v>
-      </type>
       <desc>
         <p>Returns a list of all the available drivers, both
           (statically) linked-in and dynamically loaded ones.</p>
diff --git a/lib/kernel/doc/src/error_logger.xml b/lib/kernel/doc/src/error_logger.xml
index ec3274965a..cd86b364f6 100644
--- a/lib/kernel/doc/src/error_logger.xml
+++ b/lib/kernel/doc/src/error_logger.xml
@@ -127,11 +127,8 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name>warning_map() -> Tag</name>
+      <name name="warning_map" arity="0"/>
       <fsummary>Return the current mapping for warning events</fsummary>
-      <type>
-        <v>Tag = error | warning | info</v>
-      </type>
       <desc>
         <p>Returns the current mapping for warning events. Events sent
           using <c>warning_msg/1,2</c> or <c>warning_report/1,2</c>
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 772eff13cc..b2a259080d 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -412,7 +412,7 @@
       </desc>
     </func>
     <func>
-      <name>file_info(Filename) -> {ok, FileInfo} | {error, Reason}</name>
+      <name name="file_info" arity="1"/>
       <fsummary>Get information about a file (deprecated)</fsummary>
       <desc>
         <p>This function is obsolete. Use <c>read_file_info/1,2</c>
@@ -598,7 +598,7 @@
       </desc>
     </func>
     <func>
-      <name>native_name_encoding() -> latin1 | utf8</name>
+      <name name="native_name_encoding" arity="0"/>
       <fsummary>Return the VM's configured filename encoding.</fsummary>
       <desc>
         <p>This function returns the configured default file name encoding to use for raw file names. Generally an application supplying file names raw (as binaries), should obey the character encoding returned by this function.</p>
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index 579b7f1f74..7ea58fffff 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2007</year><year>2011</year>
+      <year>2007</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -123,7 +123,7 @@
         <p>Completely closes the socket and all associations on it. The unsent
           data is flushed as in <c>eof/2</c>. The <c>close/1</c> call 
           is blocking or otherwise depending of the value of
-          the <seealso marker="#option-linger">linger</seealso> socket
+          the <seealso marker="inet#option-linger">linger</seealso> socket
           <seealso marker="#options">option</seealso>.
           If <c>close</c> does not linger or linger timeout expires,
           the call returns and the data is flushed in the background.</p>
@@ -309,8 +309,8 @@
           <seealso marker="#option-active">passive</seealso> mode,
 	  with <anno>SockType</anno> <c>seqpacket</c>,
           and with reasonably large
-          <seealso marker="#option-sndbuf">kernel</seealso> and driver
-          <seealso marker="#option-buffer">buffers.</seealso></p>
+          <seealso marker="inet#option-sndbuf">kernel</seealso> and driver
+          <seealso marker="inet#option-buffer">buffers.</seealso></p>
       </desc>
     </func>
     <func>
@@ -530,19 +530,8 @@
               SCTP data interleaved with other inter-process messages.</p>
           </item>
         </list>
-        <marker id="option-buffer"></marker>
       </item>
-      <tag><c>{buffer, integer()}</c></tag>
-      <item>
-        <p>Determines the size of the user-level software buffer used by
-          the SCTP driver. Not to be confused with <c>sndbuf</c>
-          and <c>recbuf</c> options which correspond to
-          the kernel socket buffers. It is recommended
-          to have <c>val(buffer) &gt;= max(val(sndbuf),val(recbuf))</c>.
-          In fact, the <c>val(buffer)</c> is automatically set to
-          the above maximum when <c>sndbuf</c> or <c>recbuf</c> values are set.</p>
-      </item>
-      <tag><c>{tos, integer()}</c></tag>
+     <tag><c>{tos, integer()}</c></tag>
       <item>
         <p>Sets the Type-Of-Service field on the IP datagrams being sent,
           to the given value, which effectively determines a prioritization
@@ -567,19 +556,8 @@
           <c>{IP,Port}</c> of the socket can be re-used immediately:
           no waiting in the CLOSE_WAIT state is performed (may be
           required for high-throughput servers).</p>
-        <marker id="option-linger"></marker>
-      </item>
-      <tag><c>{linger, {true|false, integer()}</c></tag>
-      <item>
-        <p>Determines the timeout in seconds for flushing unsent data in the
-          <c>gen_sctp:close/1</c> socket call. If the 1st component of the value
-          tuple is <c>false</c>, the 2nd one is ignored, which means that
-          <c>gen_sctp:close/1</c> returns immediately not waiting
-          for data to be flushed. Otherwise, the 2nd component is
-          the flushing time-out in seconds.</p>
-        <marker id="option-sndbuf"></marker>
       </item>
-      <tag><c>{sndbuf, integer()}</c></tag>
+	  <tag><c>{sndbuf, integer()}</c></tag>
       <item>
         <p>The size, in bytes, of the *kernel* send buffer for this socket.
           Sending errors would occur for datagrams larger than
@@ -593,6 +571,15 @@
           <c>val(sndbuf)</c>. Setting this option also adjusts
           the size of the driver buffer (see <c>buffer</c> above).</p>
       </item>
+
+		  <tag><c>{sctp_module, module()}</c></tag>
+		  <item> <p>
+				  Override which callback module is used. Defaults to
+				  <c>inet_sctp</c> for IPv4 and <c>inet6_sctp</c> for IPv6.
+			  </p>
+		  </item>
+
+
       <tag><c>{sctp_rtoinfo, #sctp_rtoinfo{}}</c></tag>
       <item>
 <pre>  #sctp_rtoinfo{
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index cf97607af1..11a0843c10 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -96,37 +96,47 @@ do_recv(Sock, Bs) ->
           can be either a hostname, or an IP address.</p>
         <p>The available options are:</p>
         <taglist>
-          <tag><c>list</c></tag>
-          <item>
-            <p>Received <c>Packet</c> is delivered as a list.</p>
-          </item>
-          <tag><c>binary</c></tag>
-          <item>
-            <p>Received <c>Packet</c> is delivered as a binary.</p>
-          </item>
-          <tag><c>{ip, ip_address()}</c></tag>
+         <tag><c>{ip, ip_address()}</c></tag>
           <item>
             <p>If the host has several network interfaces, this option
               specifies which one to use.</p>
           </item>
-          <tag><c>{port, Port}</c></tag>
+
+		  <tag><c>{ifaddr, ip_address()}</c></tag>
           <item>
-            <p>Specify which local port number to use.</p>
-          </item>
+			  <p>Same as <c>{ip, ip_address()}</c>. If the host has several network interfaces, this option
+              specifies which one to use.</p>
+		  </item>
+
           <tag><c>{fd, integer() >= 0}</c></tag>
           <item>
             <p>If a socket has somehow been connected without using
               <c>gen_tcp</c>, use this option to pass the file
               descriptor for it.</p>
           </item>
-          <tag><c>inet6</c></tag>
+
+          <tag><c>inet</c></tag>
           <item>
+            <p>Set up the socket for IPv4.</p>
+          </item>
+
+		  <tag><c>inet6</c></tag>
+		  <item>
             <p>Set up the socket for IPv6.</p>
           </item>
-          <tag><c>inet</c></tag>
+
+          <tag><c>{port, Port}</c></tag>
           <item>
-            <p>Set up the socket for IPv4.</p>
+            <p>Specify which local port number to use.</p>
           </item>
+
+		  <tag><c>{tcp_module, module()}</c></tag>
+		  <item> <p>
+				  Override which callback module is used. Defaults to
+				  <c>inet_tcp</c> for IPv4 and <c>inet6_tcp</c> for IPv6.
+			  </p>
+		  </item>
+
           <tag><c>Opt</c></tag>
           <item>
             <p>See
@@ -197,6 +207,13 @@ do_recv(Sock, Bs) ->
               <c>gen_tcp</c>, use this option to pass the file
               descriptor for it.</p>
           </item>
+
+		  <tag><c>{ifaddr, ip_address()}</c></tag>
+          <item>
+			  <p>Same as <c>{ip, ip_address()}</c>. If the host has several network interfaces, this option
+              specifies which one to use.</p>
+		  </item>
+
           <tag><c>inet6</c></tag>
           <item>
             <p>Set up the socket for IPv6.</p>
@@ -205,6 +222,14 @@ do_recv(Sock, Bs) ->
           <item>
             <p>Set up the socket for IPv4.</p>
           </item>
+
+		  <tag><c>{tcp_module, module()}</c></tag>
+		  <item> <p>
+				  Override which callback module is used. Defaults to
+				  <c>inet_tcp</c> for IPv4 and <c>inet6_tcp</c> for IPv6.
+			  </p>
+		  </item>
+
           <tag><c>Opt</c></tag>
           <item>
             <p>See
@@ -299,7 +324,7 @@ do_recv(Sock, Bs) ->
           <c><anno>Socket</anno></c>. The controlling process is the process which
           receives messages from the socket. If called by any other
           process than the current controlling process,
-          <c>{error, eperm}</c> is returned.</p>
+          <c>{error, not_owner}</c> is returned.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index daa9b7d887..4850278a64 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -72,6 +72,14 @@
             <p>If the host has several network interfaces, this option
               specifies which one to use.</p>
           </item>
+
+		  <tag><c>{ifaddr, ip_address()}</c></tag>
+          <item>
+			  <p>Same as <c>{ip, ip_address()}</c>. If the host has several network interfaces, this option
+              specifies which one to use.</p>
+		  </item>
+
+
           <tag><c>{fd, integer() >= 0}</c></tag>
           <item>
             <p>If a socket has somehow been opened without using
@@ -86,6 +94,51 @@
           <item>
             <p>Set up the socket for IPv4.</p>
           </item>
+
+		  <tag><c>{udp_module, module()}</c></tag>
+		  <item> <p>
+				  Override which callback module is used. Defaults to
+				  <c>inet_udp</c> for IPv4 and <c>inet6_udp</c> for IPv6.
+			  </p>
+		  </item>
+
+          <tag><c>{multicast_if, Address}</c></tag>
+          <item>
+			  <p>Set the local device for a multicast socket.</p>
+          </item>
+ 
+          <tag><c>{multicast_loop, true | false}</c></tag>
+          <item>
+			  <p>
+				  When <c>true</c> sent multicast packets will be looped back to the local
+				  sockets.
+			  </p>
+          </item>
+
+          <tag><c>{multicast_ttl, Integer}</c></tag>
+          <item>
+			  <p>
+				  The <c>multicast_ttl</c> option changes the time-to-live (TTL) for
+				  outgoing multicast datagrams in order to control the scope of the 
+				  multicasts.
+			  </p>
+			  <p>
+				  Datagrams with a TTL of 1 are not forwarded beyond the local
+				  network.
+				  <br />Default: 1
+			  </p>
+          </item>
+
+		  <tag><c>{add_membership, {MultiAddress, InterfaceAddress}}</c></tag>
+          <item>
+			  <p>Join a multicast group. </p>
+          </item>
+
+		  <tag><c>{drop_membership, {MultiAddress, InterfaceAddress}}</c></tag>
+          <item>
+			  <p>Leave multicast group.</p>
+          </item>
+
           <tag><c>Opt</c></tag>
           <item>
             <p>See
@@ -136,7 +189,9 @@
       <desc>
         <p>Assigns a new controlling process <c><anno>Pid</anno></c> to
           <c><anno>Socket</anno></c>. The controlling process is the process which
-          receives messages from the socket.</p>
+          receives messages from the socket. If called by any other
+          process than the current controlling process,
+          <c>{error, not_owner}</c> is returned.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/kernel/doc/src/global.xml b/lib/kernel/doc/src/global.xml
index 304a9b1d88..9c50049503 100644
--- a/lib/kernel/doc/src/global.xml
+++ b/lib/kernel/doc/src/global.xml
@@ -163,7 +163,8 @@
       <fsummary>Globally register a name for a pid</fsummary>
       <type name="method"/>
       <type_desc name="method">{<c>Module</c>, <c>Function</c>}
-        is also allowed
+        is currently also allowed for backward compatibility, but its use is
+	deprecated
       </type_desc>
       <desc>
         <p>Globally associates the name <c><anno>Name</anno></c> with a pid, that is,
@@ -180,6 +181,15 @@
           unregistered. This function is called once for each name
           clash.</p>
 
+	<warning>
+	  <p>If you plan to change code without restarting your system,
+	  you must use an external fun (<c>fun Module:Function/Arity</c>)
+	  as the <c><anno>Resolve</anno></c> function; if you use a
+	  local fun you can never replace the code for the module that
+	  the fun belongs to.
+	  </p>
+	</warning>
+
         <p>There are three pre-defined resolve functions:
           <c>random_exit_name/3</c>, <c>random_notify_name/3</c>, and
           <c>notify_all_name/3</c>. If no <c><anno>Resolve</anno></c> function is
diff --git a/lib/kernel/doc/src/heart.xml b/lib/kernel/doc/src/heart.xml
index 26d1e27822..2856d84dcf 100644
--- a/lib/kernel/doc/src/heart.xml
+++ b/lib/kernel/doc/src/heart.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -71,6 +71,39 @@
       timeout and try to reboot the system. This can happen, for
       example, if the system clock is adjusted automatically by use of
       NTP (Network Time Protocol).</p>
+
+  <p> If a crash occurs, an <c><![CDATA[erl_crash.dump]]></c> will <em>not</em> be written
+	  unless the environment variable <c><![CDATA[ERL_CRASH_DUMP_SECONDS]]></c> is set.
+  </p>
+
+    <pre>
+% <input>erl -heart -env ERL_CRASH_DUMP_SECONDS 10 ...</input></pre>
+  <p>
+	  Furthermore, <c><![CDATA[ERL_CRASH_DUMP_SECONDS]]></c> has the following behaviour on
+	  <c>heart</c>:
+  </p>
+  <taglist>
+	  <tag><c><![CDATA[ERL_CRASH_DUMP_SECONDS=0]]></c></tag>
+	  <item><p>
+			  Suppresses the writing a crash dump file entirely,
+			  thus rebooting the runtime system immediately.
+			  This is the same as not setting the environment variable.
+		  </p>
+	  </item>
+	  <tag><c><![CDATA[ERL_CRASH_DUMP_SECONDS=-1]]></c></tag>
+	  <item><p> Setting the environment variable to a negative value will not reboot
+			  the runtime system until the crash dump file has been completly written.
+		  </p>
+	  </item>
+	  <tag><c><![CDATA[ERL_CRASH_DUMP_SECONDS=S]]></c></tag>
+	  <item><p>
+			  Heart will wait for <c>S</c> seconds to let the crash dump file be written.
+			  After <c>S</c> seconds <c>heart</c> will reboot the runtime system regardless of
+			  the crash dump file has been written or not.
+		  </p>
+	  </item>
+  </taglist>
+
     <p>In the following descriptions, all function fails with reason
       <c>badarg</c> if <c>heart</c> is not started.</p>
   </description>
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index bfdb163e17..a1590c2dce 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -371,7 +371,51 @@ fe80::204:acff:fe17:bf38
         </taglist>
       </desc>
     </func>
-
+    <func>
+      <name name="parse_ipv4_address" arity="1" />
+      <fsummary>Parse an IPv4 address</fsummary>
+      <desc>
+	<p>Parses an IPv4 address string and returns an <a href="#type-ip4_address">ip4_address()</a>.
+	 Accepts a shortened IPv4 shortened address string.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="parse_ipv4strict_address" arity="1" />
+      <fsummary>Parse an IPv4 address strict.</fsummary>
+      <desc>
+	<p>Parses an IPv4 address string containing four fields, i.e <b>not</b> shortened, and returns an <a href="#type-ip4_adress">ip4_address()</a>.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="parse_ipv6_address" arity="1" />
+      <fsummary>Parse an IPv6 address</fsummary>
+      <desc>
+	<p>Parses an IPv6 address string and returns an <a href="#type-ip6_address">ip6_address()</a>.
+	 If an IPv4 address string is passed, an IPv4-mapped IPv6 address is returned.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="parse_ipv6strict_address" arity="1" />
+      <fsummary>Parse an IPv6 address strict.</fsummary>
+      <desc>
+	<p>Parses an IPv6 address string and returns an <a href="#type-ip6_address">ip6_address()</a>. 
+	Does <b>not</b> accept IPv4 adresses.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="parse_address" arity="1" />
+      <fsummary>Parse an IPv4 or IPv6 address.</fsummary>
+      <desc>
+	<p>Parses an IPv4 or IPv6 address string and returns an <a href="#type-ip4_address">ip4_address()</a> or <a href="#type-ip6_address">ip6_address()</a>. Accepts a shortened IPv4 address string.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="parse_strict_address" arity="1" />
+      <fsummary>Parse an IPv4 or IPv6 address strict.</fsummary>
+      <desc>
+	<p>Parses an IPv4 or IPv6 address string and returns an <a href="#type-ip4_address">ip4_address()</a> or <a href="#type-ip6_adress">ip6_address()</a>. Does <b>not</b> accept a shortened IPv4 address string.</p>
+      </desc>
+    </func>
     <func>
       <name name="peername" arity="1"/>
       <fsummary>Return the address and port for the other end of a connection</fsummary>
@@ -445,10 +489,24 @@ fe80::204:acff:fe17:bf38
               flow control; the other side will not be able send
               faster than the receiver can read.</p>
           </item>
+
           <tag><c>{broadcast, Boolean}</c>(UDP sockets)</tag>
           <item>
             <p>Enable/disable permission to send broadcasts.</p>
+			<marker id="option-buffer"></marker>
           </item>
+
+		  <tag><c>{buffer, Size}</c></tag>
+		  <item>
+			  <p>Determines the size of the user-level software buffer used by
+				  the driver. Not to be confused with <c>sndbuf</c>
+				  and <c>recbuf</c> options which correspond to
+				  the kernel socket buffers. It is recommended
+				  to have <c>val(buffer) &gt;= max(val(sndbuf),val(recbuf))</c>.
+				  In fact, the <c>val(buffer)</c> is automatically set to
+				  the above maximum when <c>sndbuf</c> or <c>recbuf</c> values are set.</p>
+		  </item>
+
           <tag><c>{delay_send, Boolean}</c></tag>
           <item>
             <p>Normally, when an Erlang process sends to a socket,
@@ -463,10 +521,19 @@ fe80::204:acff:fe17:bf38
               real property of the socket. Needless to say it is an
               implementation specific option. Default is <c>false</c>.</p>
           </item>
+
+		  <tag><c>{deliver, port | term}</c></tag>
+		  <item> <p> When <c>{active, true}</c> delivers data on the forms
+				  <c>port</c> : <c>{S, {data, [H1,..Hsz | Data]}}</c> or
+				  <c>term</c> : <c>{tcp, S, [H1..Hsz | Data]}</c>.
+				  </p>
+		  </item>
+
           <tag><c>{dontroute, Boolean}</c></tag>
           <item>
             <p>Enable/disable routing bypass for outgoing messages.</p>
           </item>
+
           <tag><c>{exit_on_close, Boolean}</c></tag>
           <item>
             <p>By default this option is set to <c>true</c>.</p>
@@ -476,6 +543,7 @@ fe80::204:acff:fe17:bf38
               <seealso marker="gen_tcp#shutdown/2">gen_tcp:shutdown/2</seealso>
               to shutdown the write side.</p>
           </item>
+
           <tag><c>{header, Size}</c></tag>
           <item>
             <p>This option is only meaningful if the <c>binary</c>
@@ -487,6 +555,7 @@ fe80::204:acff:fe17:bf38
               example <c>Size == 2</c>, the data received will match
               <c>[Byte1,Byte2|Binary]</c>.</p>
           </item>
+
           <tag><c>{high_msgq_watermark, Size}</c> (TCP/IP sockets)</tag>
           <item>
 	    <p>The socket message queue will be set into a busy
@@ -505,6 +574,7 @@ fe80::204:acff:fe17:bf38
 	    <seealso marker="erts:erlang#system_info_dist_buf_busy_limit">distribution
 	    buffer busy limit</seealso> which is a similar feature.</p>
           </item>
+
           <tag><c>{high_watermark, Size}</c> (TCP/IP sockets)</tag>
           <item>
 	    <p>The socket will be set into a busy state when the amount
@@ -517,6 +587,70 @@ fe80::204:acff:fe17:bf38
 	    <c>high_msgq_watermark</c>, and <c>low_msqg_watermark</c>
 	    options.</p>
           </item>
+
+	  <tag><c>{ipv6_v6only, Boolean}</c></tag>
+	  <item>
+	    <p>
+	      Restricts the socket to only use IPv6, prohibiting any
+	      IPv4 connections. This is only applicable for
+	      IPv6 sockets (option <c>inet6</c>).
+	    </p>
+	    <p>
+	      On most platforms this option has to be set on the socket
+	      before associating it to an address. Therefore it is only
+	      reasonable to give it when creating the socket and not
+	      to use it when calling the function
+	      (<seealso marker="#setopts/2">setopts/2</seealso>)
+	      containing this description.
+	    </p>
+	    <p>
+	      The behaviour of a socket with this socket option set to
+	      <c>true</c> is becoming the only portable one. The original
+	      idea when IPv6 was new of using IPv6 for all traffic
+	      is now not recommended by FreeBSD (you can use
+	      <c>{ipv6_v6only,false}</c> to override the recommended
+	      system default value),
+	      forbidden by OpenBSD (the supported GENERIC kernel)
+	      and impossible on Windows (that has separate
+	      IPv4 and IPv6 protocol stacks). Most Linux distros
+	      still have a system default value of <c>false</c>.
+	      This policy shift among operating systems towards
+	      separating IPv6 from IPv4 traffic has evolved since
+	      it gradually proved hard and complicated to get
+	      a dual stack implementation correct and secure.
+	    </p>
+	    <p>
+	      On some platforms the only allowed value for this option
+	      is <c>true</c>, e.g. OpenBSD and Windows. Trying to set
+	      this option to <c>false</c> when creating the socket
+	      will in this case fail.
+	    </p>
+	    <p>
+	      Setting this option on platforms where it does not exist
+	      is ignored and getting this option with
+	      <seealso marker="#getopts/2">getopts/2</seealso>
+	      returns no value i.e the returned list will not contain an
+	      <c>{ipv6_v6only,_}</c> tuple. On Windows the option acually
+	      does not exist, but it is emulated as being a
+	      read-only option with the value <c>true</c>.
+	    </p>
+	    <p>
+	      So it boils down to that setting this option to <c>true</c>
+	      when creating a socket will never fail except possibly
+	      (at the time of this writing) on a platform where you
+	      have customized the kernel to only allow <c>false</c>,
+	      which might be doable (but weird) on e.g. OpenBSD.
+	    </p>
+	    <p>
+	      If you read back the option value using
+	      <seealso marker="#getopts/2">getopts/2</seealso>
+	      and get no value the option does not exist in the host OS
+	      and all bets are off regarding the behaviour of both
+	      an IPv6 and an IPv4 socket listening on the same port
+	      as well as for an IPv6 socket getting IPv4 traffic.
+	    </p>
+	  </item>
+
           <tag><c>{keepalive, Boolean}</c>(TCP/IP sockets)</tag>
           <item>
             <p>Enables/disables periodic transmission on a connected
@@ -524,7 +658,19 @@ fe80::204:acff:fe17:bf38
               the other end does not respond, the connection is
               considered broken and an error message will be sent to
               the controlling process. Default disabled.</p>
+			<marker id="option-linger"></marker>
           </item>
+
+		  <tag><c>{linger, {true|false, Seconds}}</c></tag>
+		  <item>
+			  <p>Determines the timeout in seconds for flushing unsent data in the
+				  <c>close/1</c> socket call. If the 1st component of the value
+				  tuple is <c>false</c>, the 2nd one is ignored, which means that
+				  <c>close/1</c> returns immediately not waiting
+				  for data to be flushed. Otherwise, the 2nd component is
+				  the flushing time-out in seconds.</p>
+		  </item>
+
           <tag><c>{low_msgq_watermark, Size}</c> (TCP/IP sockets)</tag>
           <item>
 	    <p>If the socket message queue is in a busy state, the
@@ -545,6 +691,7 @@ fe80::204:acff:fe17:bf38
 	    <seealso marker="erts:erlang#system_info_dist_buf_busy_limit">distribution
 	    buffer busy limit</seealso> which is a similar feature.</p>
           </item>
+
           <tag><c>{low_watermark, Size}</c> (TCP/IP sockets)</tag>
           <item>
 	    <p>If the socket is in a busy state, the socket will
@@ -559,6 +706,22 @@ fe80::204:acff:fe17:bf38
 	    <c>high_msgq_watermark</c>, and <c>low_msgq_watermark</c>
 	    options.</p>
           </item>
+
+		  <tag><c>{mode, Mode :: binary | list}</c></tag>
+          <item>
+			  <p>Received <c>Packet</c> is delivered as defined by Mode.</p>
+		  </item>
+
+		  <tag><c>list</c></tag>
+          <item>
+			  <p>Received <c>Packet</c> is delivered as a list.</p>
+		  </item>
+
+		  <tag><c>binary</c></tag>
+          <item>
+			  <p>Received <c>Packet</c> is delivered as a binary.</p>
+		  </item>
+
           <tag><c>{nodelay, Boolean}</c>(TCP/IP sockets)</tag>
           <item>
             <p>If <c>Boolean == true</c>, the <c>TCP_NODELAY</c> option
@@ -642,6 +805,16 @@ fe80::204:acff:fe17:bf38
 	    indicated length are accepted and not considered invalid due
 	    to internal buffer limitations.</p>
           </item>
+
+		  <tag><c>{priority, Priority}</c></tag>
+          <item> <p>Set the protocol-defined priority for all packets to be sent
+			  on this socket.</p>
+		  </item>
+
+		  <tag><c>{raw, Protocol, OptionNum, ValueBin}</c></tag>
+          <item> <p>See below.</p>
+		  </item>
+
           <tag><c>{read_packets, Integer}</c>(UDP sockets)</tag>
           <item>
             <p>Sets the max number of UDP packets to read without
@@ -653,7 +826,7 @@ fe80::204:acff:fe17:bf38
               high the system can become unresponsive due to
               UDP packet flooding.</p>
           </item>
-          <tag><c>{recbuf, Integer}</c></tag>
+          <tag><c>{recbuf, Size}</c></tag>
           <item>
             <p>Gives the size of the receive buffer to use for
               the socket.</p>
@@ -682,9 +855,10 @@ fe80::204:acff:fe17:bf38
               returns <c>{error,timeout}</c>. The recommended setting is
               <c>true</c> which will automatically close the socket.
               Default is <c>false</c> due to backward compatibility.</p>
+			<marker id="option-sndbuf"></marker>
           </item>
 
-          <tag><c>{sndbuf, Integer}</c></tag>
+          <tag><c>{sndbuf, Size}</c></tag>
           <item>
             <p>Gives the size of the send buffer to use for the socket.</p>
           </item>
@@ -703,6 +877,7 @@ fe80::204:acff:fe17:bf38
               not implemented. Use with caution.</p>
           </item>
         </taglist>
+
         <p>In addition to the options mentioned above, <em>raw</em>
           option specifications can be used. The raw options are
           specified as a tuple of arity four, beginning with the tag
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 94624bf512..78bc533464 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,6 +30,135 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 2.15.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Ensure 'erl_crash.dump' when asked for it. This will
+	    change erl_crash.dump behaviour.</p>
+          <p>
+	    * Not setting ERL_CRASH_DUMP_SECONDS will now terminate
+	    beam immediately on a crash without writing a crash dump
+	    file.</p>
+          <p>
+	    * Setting ERL_CRASH_DUMP_SECONDS to 0 will also terminate
+	    beam immediately on a crash without writing a crash dump
+	    file, i.e. same as not setting ERL_CRASH_DUMP_SECONDS
+	    environment variable.</p>
+          <p>
+	    * Setting ERL_CRASH_DUMP_SECONDS to a negative value will
+	    let the beam wait indefinitely on the crash dump file
+	    being written.</p>
+          <p>
+	    * Setting ERL_CRASH_DUMP_SECONDS to a positive value will
+	    let the beam wait that many seconds on the crash dump
+	    file being written.</p>
+          <p>
+	    A positive value will set an alarm/timeout for restart
+	    both in beam and in heart if heart is running.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-10422 Aux Id: kunagi-250 [161] </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 2.15.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed issue where using controlling_process/2 with self()
+	    as the second argument caused the port to leak if self()
+	    crashes. (Thanks to Ricardo Catalinas Jim�nez)</p>
+          <p>
+	    Own Id: OTP-10094</p>
+        </item>
+        <item>
+          <p>
+	    When sending large files using the file:sendfile fallback
+	    file:sendfile would crash. This is now fixed.</p>
+          <p>
+	    Own Id: OTP-10098</p>
+        </item>
+        <item>
+          <p>
+	    Fix rpc:call/5 for local calls with a finite Timeout
+	    (Thanks to Tomer Chachamu)</p>
+          <p>
+	    Own Id: OTP-10149</p>
+        </item>
+        <item>
+          <p>
+	    fix escript/primary archive reloading</p>
+          <p>
+	    If the mtime of an escript/primary archive file changes
+	    after being added to the code path, correctly reload the
+	    archive and update the cache. (Thanks to Tuncer Ayaz)</p>
+          <p>
+	    Own Id: OTP-10151</p>
+        </item>
+        <item>
+          <p>
+	    Support added for home directories named with non-ASCII
+	    characters (codepoints above 127) on a system running in
+	    Unicode file mode (e.g. on MacOSX or Linux with startup
+	    arguments +fnu or +fna with the right LOCALE). Also
+	    environment variables with Unicode content are supported
+	    in applicable environments.</p>
+          <p>
+	    Own Id: OTP-10160</p>
+        </item>
+        <item>
+          <p>
+	    Allow mixed IPv4 and IPv6 addresses to sctp_bindx</p>
+          <p>
+	    Also allow mixed address families to bind, since the
+	    first address on a multihomed sctp socket must be bound
+	    with bind, while the rest are to be bound using
+	    sctp_bindx. At least Linux supports adding address of
+	    mixing families. Make inet_set_faddress function
+	    available also when HAVE_SCTP is not defined, since we
+	    use it to find an address for bind to be able to mix ipv4
+	    and ipv6 addresses. Thanks to Tomas Abrahamsson</p>
+          <p>
+	    Own Id: OTP-10217</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Document inet options: high_watermark, priority,
+	    linger and a some other options that previously was
+	    undocumented.</p>
+          <p>
+	    Own Id: OTP-10053</p>
+        </item>
+        <item>
+	    <p>Remove bit8 option support from inet</p>
+          <p>
+	    Own Id: OTP-10056</p>
+        </item>
+        <item>
+	    <p> The type of the disk log header has been corrected.
+	    (Thanks to Niclas Eklund.) </p>
+          <p>
+	    Own Id: OTP-10131</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 2.15.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index e94119845a..5e182de41d 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -73,65 +73,65 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
       </desc>
     </func>
     <func>
-      <name>getenv() -> [string()]</name>
+      <name name="getenv" arity="0"/>
       <fsummary>List all environment variables</fsummary>
       <desc>
         <p>Returns a list of all environment variables.
           Each environment variable is given as a single string on
           the format <c>"VarName=Value"</c>, where <c>VarName</c> is
           the name of the variable and <c>Value</c> its value.</p>
+	<p>If Unicode file name encoding is in effect (see the <seealso
+	marker="erts:erl#file_name_encoding">erl manual
+	page</seealso>), the strings may contain characters with
+	codepoints > 255.</p>
       </desc>
     </func>
     <func>
-      <name>getenv(VarName) -> Value | false</name>
+      <name name="getenv" arity="1"/>
       <fsummary>Get the value of an environment variable</fsummary>
-      <type>
-        <v>VarName = string() </v>
-        <v>Value = string()</v>
-      </type>
       <desc>
-        <p>Returns the <c>Value</c> of the environment variable
-          <c>VarName</c>, or <c>false</c> if the environment variable
+        <p>Returns the <c><anno>Value</anno></c> of the environment variable
+          <c><anno>VarName</anno></c>, or <c>false</c> if the environment variable
           is undefined.</p>
+	<p>If Unicode file name encoding is in effect (see the <seealso
+	marker="erts:erl#file_name_encoding">erl manual
+	page</seealso>), the strings (both <c><anno>VarName</anno></c> and
+	<c><anno>Value</anno></c>) may contain characters with codepoints > 255.</p>
       </desc>
     </func>
     <func>
-      <name>getpid() -> Value </name>
+      <name name="getpid" arity="0"/>
       <fsummary>Return the process identifier of the emulator process</fsummary>
-      <type>
-        <v>Value = string()</v>
-      </type>
       <desc>
         <p>Returns the process identifier of the current Erlang emulator
           in the format most commonly used by the operating system
-          environment. <c>Value</c> is returned as a string containing
+          environment. <c><anno>Value</anno></c> is returned as a string containing
           the (usually) numerical identifier for a process. On Unix,
           this is typically the return value of the <c>getpid()</c>
-          system call. On VxWorks, <c>Value</c> contains the task id
-          (decimal notation) of the Erlang task. On Windows,
+          system call. On Windows,
           the process id as returned by the <c>GetCurrentProcessId()</c>
           system call is used.</p>
       </desc>
     </func>
     <func>
-      <name>putenv(VarName, Value) -> true</name>
+      <name name="putenv" arity="2"/>
       <fsummary>Set a new value for an environment variable</fsummary>
-      <type>
-        <v>VarName = string() </v>
-        <v>Value = string()</v>
-      </type>
       <desc>
-        <p>Sets a new <c>Value</c> for the environment variable
-          <c>VarName</c>.</p>
+        <p>Sets a new <c><anno>Value</anno></c> for the environment variable
+          <c><anno>VarName</anno></c>.</p>
+	<p>If Unicode filename encoding is in effect (see the <seealso
+	marker="erts:erl#file_name_encoding">erl manual
+	page</seealso>), the strings (both <c><anno>VarName</anno></c> and
+	<c><anno>Value</anno></c>) may contain characters with codepoints > 255.</p>
+	<p>On Unix platforms, the environment will be set using UTF-8 encoding
+	if Unicode file name translation is in effect. On Windows the 
+	environment is set using wide character interfaces.</p>
       </desc>
     </func>
     <func>
-      <name>timestamp() -> Timestamp</name>
+      <name name="timestamp" arity="0"/>
+      <type_desc variable="Timestamp">Timestamp = {MegaSecs, Secs, MicroSecs}</type_desc>
       <fsummary>Returna a timestamp from the OS in the erlang:now/0 format</fsummary>
-      <type>
-        <v>Timestamp = {MegaSecs, Secs, MicroSecs} = <seealso marker="erts:erlang#type-timestamp">erlang:timestamp()</seealso></v>
-        <v>MegaSecs = Secs = MicroSecs = integer() >= 0</v>
-      </type>
       <desc>
       <p>Returns a tuple in the same format as <seealso marker="erts:erlang#now/0">erlang:now/0</seealso>. The difference is that this function returns what the operating system thinks (a.k.a. the wall clock time) without any attempts at time correction. The result of two different calls to this function is <em>not</em> guaranteed to be different.</p>
       <p>The most obvious use for this function is logging. The tuple can be used together with the function <seealso marker="stdlib:calendar#now_to_universal_time/1">calendar:now_to_universal_time/1</seealso> 
@@ -168,8 +168,6 @@ format_utc_timestamp() ->
           Solaris 1 and 2, it will be <c>sunos</c>.</p>
         <p>In Windows, <c><anno>Osname</anno></c> will be either <c>nt</c> (on
           Windows NT), or <c>windows</c> (on Windows 95).</p>
-        <p>On VxWorks the OS family alone is returned, that is
-          <c>vxworks</c>.</p>
         <note>
           <p>Think twice before using this function. Use the
             <c>filename</c> module if you want to inspect or build
diff --git a/lib/kernel/doc/src/packages.xml b/lib/kernel/doc/src/packages.xml
index 80de2e05fc..8a82b91a90 100644
--- a/lib/kernel/doc/src/packages.xml
+++ b/lib/kernel/doc/src/packages.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -204,11 +204,5 @@ ok
       Explicitly
       declaring each use of a module makes for safe code.</p>
   </description>
-  <funcs>
-    <func>
-      <name>no functions exported</name>
-      <fsummary>x</fsummary>
-    </func>
-  </funcs>
 </erlref>
 
diff --git a/lib/kernel/examples/Makefile b/lib/kernel/examples/Makefile
index fb27f8d438..21dfd0ec0e 100644
--- a/lib/kernel/examples/Makefile
+++ b/lib/kernel/examples/Makefile
@@ -47,8 +47,8 @@ RELSYSDIR = $(RELEASE_PATH)/lib/kernel-$(KERNEL_VSN)/examples
 EXAMPLES  = uds_dist
 
 release_spec:
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	tar cf - $(EXAMPLES) | \
-	(cd $(RELSYSDIR); tar xf - ; chmod -R ug+w $(EXAMPLES) )
+	(cd "$(RELSYSDIR)"; tar xf - ; chmod -R ug+w $(EXAMPLES) )
 
 release_docs_spec:
diff --git a/lib/kernel/examples/uds_dist/c_src/uds_drv.c b/lib/kernel/examples/uds_dist/c_src/uds_drv.c
index 9327ab19dc..9ad6b85a0f 100644
--- a/lib/kernel/examples/uds_dist/c_src/uds_drv.c
+++ b/lib/kernel/examples/uds_dist/c_src/uds_drv.c
@@ -967,7 +967,7 @@ static void *my_malloc(size_t size)
     void *ptr;
 
     if ((ptr = driver_alloc(size)) == NULL) {
-	erl_exit(1,"Could not allocate %d bytes of memory",(int) size);
+	erl_exit(1,"Could not allocate %lu bytes of memory",(unsigned long) size);
     }
     return ptr;
 }
@@ -977,7 +977,7 @@ static void *my_realloc(void *ptr, size_t size)
     void erl_exit(int, char *, ...);
     void *nptr;
     if ((nptr = driver_realloc(ptr, size)) == NULL) {
-	erl_exit(1,"Could not reallocate %d bytes of memory",(int) size);
+	erl_exit(1,"Could not reallocate %lu bytes of memory",(unsigned long) size);
     }
     return nptr;
 }
diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
index 54f21eb2b8..c76ff9e2f0 100644
--- a/lib/kernel/src/Makefile
+++ b/lib/kernel/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2011. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -198,13 +198,13 @@ $(EBIN)/erl_epmd.beam: $(ESRC)/erl_epmd.erl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/kernel/src/application.erl b/lib/kernel/src/application.erl
index c299fb085c..9b7c4aa7b8 100644
--- a/lib/kernel/src/application.erl
+++ b/lib/kernel/src/application.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -37,8 +37,7 @@
 -type application_opt() :: {'description', Description :: string()}
                          | {'vsn', Vsn :: string()}
                          | {'id', Id :: string()}
-                         | {'modules', [(Module :: module()) |
-                                        {Module :: module(), Version :: term()}]}
+                         | {'modules', [Module :: module()]}
                          | {'registered', Names :: [Name :: atom()]}
                          | {'applications', [Application :: atom()]}
                          | {'included_applications', [Application :: atom()]}
diff --git a/lib/kernel/src/application_controller.erl b/lib/kernel/src/application_controller.erl
index ebfe84463a..68cd26ec10 100644
--- a/lib/kernel/src/application_controller.erl
+++ b/lib/kernel/src/application_controller.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -162,7 +162,7 @@
 %%       appl_opt() = {description, string()}           |
 %%                    {vsn, string()}                   |
 %%                    {id, string()},                   |
-%%                    {modules, [Module|{Module,Vsn}]}  |
+%%                    {modules, [Module]}  |
 %%                    {registered, [atom()]}            |
 %%                    {applications, [atom()]}          |
 %%                    {included_applications, [atom()]} |
@@ -172,7 +172,6 @@
 %%                    {maxP, integer()|infinity}        |
 %%                    {mod, {Module, term()}}
 %%         Module = atom()
-%%         Vsn = term()
 %% Purpose: Starts the application_controller.  This process starts all
 %%          application masters for the applications.
 %%          The kernel application is the only application that is
@@ -446,7 +445,7 @@ get_application_module(Module) ->
     get_application_module(Module, AppModules).
 
 get_application_module(Module, [[AppName, Modules]|AppModules]) ->
-    case in_modules(Module, Modules) of
+    case lists:member(Module, Modules) of
 	true ->
 	    {ok, AppName};
 	false ->
@@ -455,16 +454,6 @@ get_application_module(Module, [[AppName, Modules]|AppModules]) ->
 get_application_module(_Module, []) ->
     undefined.
 
-%% 'modules' key in .app is a list of Module or {Module,Vsn}
-in_modules(Module, [Module|_Modules]) ->
-    true;
-in_modules(Module, [{Module, _Vsn}|_Modules]) ->
-    true;
-in_modules(Module, [_Module|Modules]) ->
-    in_modules(Module, Modules);
-in_modules(_Module, []) ->
-    false.
-
 permit_application(ApplName, Flag) ->
     gen_server:call(?AC, 
 		    {permit_application, ApplName, Flag},
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index b7fda69ce0..c808ac7cb7 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -63,53 +63,13 @@
 	 which/1,
 	 where_is_file/1,
 	 where_is_file/2,
-	 set_primary_archive/3,
+	 set_primary_archive/4,
 	 clash/0]).
 
 -export_type([load_error_rsn/0, load_ret/0]).
 
 -include_lib("kernel/include/file.hrl").
 
-%% User interface.
-%%
-%% objfile_extension()		 -> ".beam"
-%% get_path()			 -> [Dir]
-%% set_path([Dir])		 -> true | {error, bad_directory | bad_path}
-%% add_path(Dir)		 -> true | {error, bad_directory}
-%% add_patha(Dir)		 -> true | {error, bad_directory}
-%% add_pathz(Dir)		 -> true | {error, bad_directory}
-%% add_paths([Dir])              -> ok
-%% add_pathsa([Dir])             -> ok
-%% add_pathsz([Dir])             -> ok
-%% del_path(Dir)		 -> boolean() | {error, bad_name}
-%% replace_path(Name, Dir)       -> true | {error, bad_directory | bad_name
-%%                                                 | {badarg,_}}
-%% load_file(Module)		 -> {module, Module} | {error, What :: atom()}
-%% load_abs(File)		 -> {module, Module} | {error, What :: atom()}
-%% load_abs(File, Module)	 -> {module, Module} | {error, What :: atom()}
-%% load_binary(Module, File, Bin)-> {module, Module} | {error, What :: atom()}
-%% ensure_loaded(Module)         -> {module, Module} | {error, What :: atom()}
-%% delete(Module)                -> boolean()
-%% purge(Module)                 -> boolean()  kills all procs running old code
-%% soft_purge(Module)            -> boolean()
-%% is_loaded(Module)	         -> {file, loaded_filename()} | false
-%% all_loaded()		         -> [{Module, loaded_filename()}]
-%% get_object_code(Module)       -> {Module, Bin, Filename} | error
-%% stop()                        -> no_return()
-%% root_dir()                    -> Dir
-%% compiler_dir()                -> Dir
-%% lib_dir()                     -> Dir
-%% lib_dir(Application)          -> Dir | {error, bad_name}
-%% priv_dir(Application)         -> Dir | {error, bad_name}
-%% stick_dir(Dir)                -> ok | error
-%% unstick_dir(Dir)              -> ok | error
-%% stick_mod(Module)             -> true
-%% unstick_mod(Module)           -> true
-%% is_sticky(Module)             -> boolean()
-%% which(Module)                 -> Filename | loaded_ret_atoms() | non_existing
-%% set_primary_archive((FileName, Bin, FileInfo) -> ok | {error, Reason}
-%% clash()                       -> ok         prints out number of clashes
-
 %%----------------------------------------------------------------------------
 %% Some types for basic exported functions of this module
 %%----------------------------------------------------------------------------
@@ -125,6 +85,39 @@
 -type loaded_ret_atoms() :: 'cover_compiled' | 'preloaded'.
 -type loaded_filename() :: (Filename :: file:filename()) | loaded_ret_atoms().
 
+%%% BIFs
+
+-export([get_chunk/2, is_module_native/1, make_stub_module/3, module_md5/1]).
+
+-spec get_chunk(Bin, Chunk) ->
+                       binary() | undefined when
+      Bin :: binary(),
+      Chunk :: string().
+
+get_chunk(_, _) ->
+    erlang:nif_error(undef).
+
+-spec is_module_native(Module) -> true | false | undefined when
+      Module :: module().
+
+is_module_native(_) ->
+    erlang:nif_error(undef).
+
+-spec make_stub_module(Module, Beam, Info) -> Module when
+      Module :: module(),
+      Beam :: binary(),
+      Info :: {list(), list()}.
+
+make_stub_module(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec module_md5(binary()) -> binary() | undefined.
+
+module_md5(_) ->
+    erlang:nif_error(undef).
+
+%%% End of BIFs
+
 %%----------------------------------------------------------------------------
 %% User interface
 %%----------------------------------------------------------------------------
@@ -481,13 +474,16 @@ where_is_file(Path, File) when is_list(Path), is_list(File) ->
 
 -spec set_primary_archive(ArchiveFile :: file:filename(),
 			  ArchiveBin :: binary(),
-			  FileInfo :: file:file_info())
+			  FileInfo :: file:file_info(),
+			  ParserFun :: fun())
 			 -> 'ok' | {'error', atom()}.
 
-set_primary_archive(ArchiveFile0, ArchiveBin, #file_info{} = FileInfo)
+set_primary_archive(ArchiveFile0, ArchiveBin, #file_info{} = FileInfo,
+		    ParserFun)
   when is_list(ArchiveFile0), is_binary(ArchiveBin) ->
     ArchiveFile = filename:absname(ArchiveFile0),
-    case call({set_primary_archive, ArchiveFile, ArchiveBin, FileInfo}) of
+    case call({set_primary_archive, ArchiveFile, ArchiveBin, FileInfo,
+	       ParserFun}) of
 	{ok, []} ->
 	    ok;
 	{ok, _Mode, Ebins} ->
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index a2db7c9790..00ad923466 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -394,8 +394,8 @@ handle_call(stop,{_From,_Tag}, S) ->
 handle_call({is_cached,_File}, {_From,_Tag}, S=#state{cache=no_cache}) ->
     {reply, no, S};
 
-handle_call({set_primary_archive, File, ArchiveBin, FileInfo}, {_From,_Tag}, S=#state{mode=Mode}) ->
-    case erl_prim_loader:set_primary_archive(File, ArchiveBin, FileInfo) of
+handle_call({set_primary_archive, File, ArchiveBin, FileInfo, ParserFun}, {_From,_Tag}, S=#state{mode=Mode}) ->
+    case erl_prim_loader:set_primary_archive(File, ArchiveBin, FileInfo, ParserFun) of
 	{ok, Files} ->
 	    {reply, {ok, Mode, Files}, S};
 	{error, _Reason} = Error ->
diff --git a/lib/kernel/src/disk_log.erl b/lib/kernel/src/disk_log.erl
index f5f972c112..1513fdaec0 100644
--- a/lib/kernel/src/disk_log.erl
+++ b/lib/kernel/src/disk_log.erl
@@ -44,6 +44,8 @@
 %% To be used for debugging only:
 -export([pid2name/1]).
 
+-export_type([continuation/0]).
+
 -type dlog_state_error() :: 'ok' | {'error', term()}.
 
 -record(state, {queue = [],
@@ -282,7 +284,8 @@ change_notify(Log, Pid, NewNotify) ->
 
 -spec change_header(Log, Header) -> 'ok' | {'error', Reason} when
       Log :: log(),
-      Header :: {head, dlog_head_opt()} | {head_func, mfa()},
+      Header :: {head, dlog_head_opt()}
+              | {head_func, MFA :: {atom(), atom(), list()}},
       Reason :: no_such_log | nonode | {read_only_mode, Log}
               | {blocked_log, Log} | {badarg, head}.
 change_header(Log, NewHead) ->
@@ -336,7 +339,9 @@ format_error(Error) ->
                         ok | {blocked, QueueLogRecords :: boolean()}}
                    | {node, Node :: node()}
                    | {distributed, Dist :: local | [node()]}
-                   | {head, Head :: none | {head, term()} | mfa()}
+                   | {head, Head :: none
+                                  | {head, term()}
+                                  | (MFA :: {atom(), atom(), list()})}
                    | {no_written_items, NoWrittenItems ::non_neg_integer()}
                    | {full, Full :: boolean}
                    | {no_current_bytes, non_neg_integer()}
diff --git a/lib/kernel/src/disk_log.hrl b/lib/kernel/src/disk_log.hrl
index 259967650f..242a25a7a6 100644
--- a/lib/kernel/src/disk_log.hrl
+++ b/lib/kernel/src/disk_log.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -74,7 +74,7 @@
                           | {distributed, Nodes :: [node()]}
                           | {notify, boolean()}
                           | {head, Head :: dlog_head_opt()}
-                          | {head_func, mfa()}
+                          | {head_func, MFA :: {atom(), atom(), list()}}
                           | {mode, Mode :: dlog_mode()}.
 -type dlog_options()     :: [dlog_option()].
 -type dlog_repair()      :: 'truncate' | boolean().
diff --git a/lib/kernel/src/disk_log_1.erl b/lib/kernel/src/disk_log_1.erl
index 266df84a03..0cb1ed579a 100644
--- a/lib/kernel/src/disk_log_1.erl
+++ b/lib/kernel/src/disk_log_1.erl
@@ -1495,7 +1495,7 @@ fwrite_close2(Fd, FileName, B) ->
 pwrite_close2(Fd, FileName, Position, B) ->
     case file:pwrite(Fd, Position, B) of
 	ok -> ok;
-	Error -> file_error(FileName, {error, Error})
+	{error,Error} -> file_error(FileName, {error, Error})
     end.
 
 position2(Fd, FileName, Pos) ->
diff --git a/lib/kernel/src/erl_ddll.erl b/lib/kernel/src/erl_ddll.erl
index 646cac99c5..e03d280cd8 100644
--- a/lib/kernel/src/erl_ddll.erl
+++ b/lib/kernel/src/erl_ddll.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -30,9 +30,97 @@
 %%----------------------------------------------------------------------------
 
 -type path()   :: string() | atom().
--type driver() :: string() | atom().
+-type driver() :: iolist() | atom().
 
 %%----------------------------------------------------------------------------
+%%% BIFs
+
+-export([demonitor/1, info/2, format_error_int/1, monitor/2,
+         try_load/3, try_unload/2, loaded_drivers/0]).
+
+-spec demonitor(MonitorRef) -> ok when
+      MonitorRef :: reference().
+
+demonitor(_) ->
+    erlang:nif_error(undef).
+
+-spec info(Name, Tag) -> Value when
+      Name :: driver(),
+      Tag :: processes | driver_options | port_count | linked_in_driver
+           | permanent | awaiting_load | awaiting_unload,
+      Value :: term().
+
+info(_, _) ->
+    erlang:nif_error(undef).
+
+-spec format_error_int(ErrSpec) -> string() when
+      ErrSpec :: term().
+
+format_error_int(_) ->
+    erlang:nif_error(undef).
+
+-spec monitor(Tag, Item) -> MonitorRef when
+      Tag :: driver,
+      Item :: {Name, When},
+      Name :: driver(),
+      When :: loaded | unloaded | unloaded_only,
+      MonitorRef :: reference().
+
+monitor(_, _) ->
+    erlang:nif_error(undef).
+
+-spec try_load(Path, Name, OptionList) ->
+                      {ok,Status} |
+                      {ok, PendingStatus, Ref} |
+                      {error, ErrorDesc} when
+      Path :: path(),
+      Name :: driver(),
+      OptionList :: [Option],
+      Option :: {driver_options, DriverOptionList}
+              | {monitor, MonitorOption}
+              | {reload, ReloadOption},
+      DriverOptionList :: [DriverOption],
+      DriverOption :: kill_ports,
+      MonitorOption :: pending_driver | pending,
+      ReloadOption :: pending_driver | pending,
+      Status :: loaded | already_loaded | PendingStatus,
+      PendingStatus :: pending_driver | pending_process,
+      Ref :: reference(),
+      ErrorDesc :: ErrorAtom | OpaqueError,
+      ErrorAtom :: linked_in_driver | inconsistent | permanent
+                 | not_loaded_by_this_process | not_loaded
+                 |  pending_reload | pending_process,
+      OpaqueError :: term().
+
+try_load(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec try_unload(Name, OptionList) ->
+                        {ok, Status} |
+                        {ok, PendingStatus, Ref} |
+                        {error, ErrorAtom} when
+      Name :: driver(),
+      OptionList :: [Option],
+      Option :: {monitor, MonitorOption} | kill_ports,
+      MonitorOption :: pending_driver | pending,
+      Status :: unloaded | PendingStatus,
+      PendingStatus :: pending_driver | pending_process,
+      Ref :: reference(),
+      ErrorAtom :: linked_in_driver | not_loaded |
+                   not_loaded_by_this_process | permanent.
+
+try_unload(_, _) ->
+    erlang:nif_error(undef).
+
+-spec loaded_drivers() -> {ok, Drivers} when
+      Drivers :: [Driver],
+      Driver :: string().
+
+loaded_drivers() ->
+    erlang:nif_error(undef).
+
+%%% End of BIFs
+
 
 -spec start() -> {'error', {'already_started', 'undefined'}}.
 
diff --git a/lib/kernel/src/error_handler.erl b/lib/kernel/src/error_handler.erl
index a67b11a888..f8bc5f499c 100644
--- a/lib/kernel/src/error_handler.erl
+++ b/lib/kernel/src/error_handler.erl
@@ -90,7 +90,7 @@ int() -> int.
 crash(Fun, Args) ->
     crash({Fun,Args,[]}).
 
--spec crash(atom(), atom(), arity()) -> no_return().
+-spec crash(atom(), atom(), arity() | [term()]) -> no_return().
 
 crash(M, F, A) ->
     crash({M,F,A,[]}).
diff --git a/lib/kernel/src/error_logger.erl b/lib/kernel/src/error_logger.erl
index f94cca000f..92c1eb80dc 100644
--- a/lib/kernel/src/error_logger.erl
+++ b/lib/kernel/src/error_logger.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -42,6 +42,18 @@
 
 -type state()   :: {non_neg_integer(), non_neg_integer(), [term()]}.
 
+%%% BIF
+
+-export([warning_map/0]).
+
+-spec warning_map() -> Tag when
+      Tag :: error | warning | info.
+
+warning_map() ->
+    erlang:nif_error(undef).
+
+%%% End of BIF
+
 %%-----------------------------------------------------------------
 
 -spec start() -> {'ok', pid()} | {'error', any()}.
diff --git a/lib/kernel/src/erts_debug.erl b/lib/kernel/src/erts_debug.erl
index b8871e0d45..6654cd9ee7 100644
--- a/lib/kernel/src/erts_debug.erl
+++ b/lib/kernel/src/erts_debug.erl
@@ -28,6 +28,135 @@
 %%   same/2
 %%   flat_size/1
 
+%%% BIFs
+
+-export([breakpoint/2, disassemble/1, display/1, dist_ext_to_term/2,
+         dump_monitors/1, dump_links/1, flat_size/1,
+         get_internal_state/1, instructions/0, lock_counters/1,
+         same/2, set_internal_state/2]).
+
+-spec breakpoint(MFA, Flag) -> non_neg_integer() when
+      MFA :: {Module :: module(),
+              Function :: atom(),
+              Arity :: arity() | '_'},
+      Flag :: boolean().
+
+breakpoint(_, _) ->
+    erlang:nif_error(undef).
+
+-spec disassemble(What) -> false | undef | Result when
+      What :: MFA | Address,
+      Result :: {Address, Code, MFA},
+      MFA :: mfa(),
+      Address :: non_neg_integer(),
+      Code :: binary().
+
+disassemble(_) ->
+    erlang:nif_error(undef).
+
+-spec display(Term) -> string() when
+      Term :: term().
+
+display(_) ->
+    erlang:nif_error(undef).
+
+-spec dist_ext_to_term(Tuple, Binary) -> term() when
+      Tuple :: tuple(),
+      Binary :: binary().
+
+dist_ext_to_term(_, _) ->
+    erlang:nif_error(undef).
+
+-spec dump_monitors(Id) -> true when
+      Id :: pid() | atom().
+
+dump_monitors(_) ->
+    erlang:nif_error(undef).
+
+-spec dump_links(Id) -> true when
+      Id :: pid() | port() | atom().
+
+dump_links(_) ->
+    erlang:nif_error(undef).
+
+-spec flat_size(Term) -> non_neg_integer() when
+      Term :: term().
+
+flat_size(_) ->
+    erlang:nif_error(undef).
+
+-spec get_internal_state(W) -> term() when
+      W :: reds_left | node_and_dist_references | monitoring_nodes
+         | next_pid | 'DbTable_words' | check_io_debug
+         | process_info_args | processes | processes_bif_info
+         | max_atom_out_cache_index | nbalance | available_internal_state
+         | force_heap_frags | memory
+         | {process_status, pid()}
+         | {link_list, pid() | port() | node()}
+         | {monitor_list, pid() | node()}
+         | {channel_number, non_neg_integer()}
+         | {have_pending_exit, pid() | port() | atom()}
+         | {binary_info, binary()}
+         | {term_to_binary_no_funs, term()}
+         | {dist_port, port()}
+         | {atom_out_cache_index, atom()}
+         | {fake_scheduler_bindings,
+            default_bind | spread | processor_spread | thread_spread
+            | thread_no_node_processor_spread | no_node_processor_spread
+            | no_node_thread_spread | no_spread | unbound}
+         | {reader_groups_map, non_neg_integer()}.
+
+get_internal_state(_) ->
+    erlang:nif_error(undef).
+
+-spec instructions() -> [string()].
+
+instructions() ->
+    erlang:nif_error(undef).
+
+-spec lock_counters(info) -> term();
+                      (clear) -> ok;
+                      ({copy_save, boolean()}) -> boolean();
+                      ({process_locks, boolean()}) -> boolean().
+
+lock_counters(_) ->
+    erlang:nif_error(undef).
+
+-spec same(Term1, Term2) -> boolean() when
+      Term1 :: term(),
+      Term2 :: term().
+
+same(_, _) ->
+    erlang:nif_error(undef).
+
+-spec set_internal_state(available_internal_state, boolean()) -> boolean();
+                           (reds_left, non_neg_integer()) -> true;
+                           (block, non_neg_integer()) -> true;
+                           (sleep, non_neg_integer()) -> true;
+                           (block_scheduler, non_neg_integer()) -> true;
+                           (next_pid, non_neg_integer()) -> false | integer();
+                           (force_gc, pid() | atom()) -> boolean();
+                           (send_fake_exit_signal, {pid() | port(), pid(), term()}) -> dead | message | unaffected | exit;
+                           (colliding_names, {atom(), non_neg_integer()}) ->
+                                   [atom()];
+                           (binary_loop_limit, default) -> -1;
+                           (binary_loop_limit, non_neg_integer()) -> non_neg_integer();
+                           (re_loop_limit, default) -> -1;
+                           (re_loop_limit, non_neg_integer()) -> non_neg_integer();
+                           (unicode_loop_limit, default) -> -1;
+                           (unicode_loop_limit, non_neg_integer()) -> non_neg_integer();
+                           (hipe_test_reschedule_suspend, term()) -> nil();
+                           (hipe_test_reschedule_resume, pid() | port()) -> boolean();
+                           (test_long_gc_sleep, non_neg_integer()) -> true;
+                           (kill_dist_connection, port()) -> boolean();
+                           (not_running_optimization, boolean()) -> boolean();
+                           (wait, deallocations) -> ok.
+
+set_internal_state(_, _) ->
+    erlang:nif_error(undef).
+
+%%% End of BIFs
+
 %% size(Term)
 %%  Returns the size of Term in actual heap words. Shared subterms are
 %%  counted once.  Example: If A = [a,b], B =[A,A] then size(B) returns 8,
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index d8033ee192..22af38c598 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -111,6 +111,24 @@
 -type sendfile_option() :: {chunk_size, non_neg_integer()}.
 -type file_info_option() :: {'time', 'local'} | {'time', 'universal'} 
 			  | {'time', 'posix'}.
+%%% BIFs
+
+-export([file_info/1, native_name_encoding/0]).
+
+-spec file_info(Filename) -> {ok, FileInfo} | {error, Reason} when
+      Filename :: name(),
+      FileInfo :: file_info(),
+      Reason :: posix() | badarg.
+
+file_info(_) ->
+    erlang:nif_error(undef).
+
+-spec native_name_encoding() -> latin1 | utf8.
+
+native_name_encoding() ->
+    erlang:nif_error(undef).
+
+%%% End of BIFs
 
 
 %%%-----------------------------------------------------------------
@@ -1258,7 +1276,7 @@ sendfile_fallback_int(File, Sock, Bytes, ChunkSize, BytesSent)
   when Bytes > BytesSent; Bytes == 0 ->
     Size = if Bytes == 0 ->
 		   ChunkSize;
-	       (Bytes - BytesSent + ChunkSize) > 0 ->
+	       (Bytes - BytesSent) < ChunkSize ->
 		   Bytes - BytesSent;
 	      true ->
 		   ChunkSize
diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl
index d8954f0cf7..74ad192802 100644
--- a/lib/kernel/src/gen_sctp.erl
+++ b/lib/kernel/src/gen_sctp.erl
@@ -44,6 +44,7 @@
         {priority, non_neg_integer()} |
         {recbuf, non_neg_integer()} |
         {reuseaddr, boolean()} |
+	{ipv6_v6only, boolean()} |
         {sctp_adaptation_layer, #sctp_setadaptation{}} |
         {sctp_associnfo, #sctp_assocparams{}} |
         {sctp_autoclose, non_neg_integer()} |
@@ -72,6 +73,7 @@
         priority |
         recbuf |
         reuseaddr |
+	ipv6_v6only |
         sctp_adaptation_layer |
         sctp_associnfo |
         sctp_autoclose |
@@ -425,9 +427,10 @@ error_string(X) ->
     erlang:error(badarg, [X]).
 
 
--spec controlling_process(Socket, Pid) -> ok when
+-spec controlling_process(Socket, Pid) -> ok | {error, Reason} when
       Socket :: sctp_socket(),
-      Pid :: pid().
+      Pid :: pid(),
+      Reason :: closed | not_owner | inet:posix().
 
 controlling_process(S, Pid) when is_port(S), is_pid(Pid) ->
     inet:udp_controlling_process(S, Pid);
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index 519c1bb8b4..ec13ab6d2e 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -31,7 +31,6 @@
 
 -type option() ::
         {active,          true | false | once} |
-        {bit8,            clear | set | on | off} |
         {buffer,          non_neg_integer()} |
         {delay_send,      boolean()} |
         {deliver,         port | term} |
@@ -60,10 +59,10 @@
         {send_timeout,    non_neg_integer() | infinity} |
         {send_timeout_close, boolean()} |
         {sndbuf,          non_neg_integer()} |
-        {tos,             non_neg_integer()}.
+        {tos,             non_neg_integer()} |
+	{ipv6_v6only,     boolean()}.
 -type option_name() ::
         active |
-        bit8 |
         buffer |
         delay_send |
         deliver |
@@ -91,7 +90,8 @@
         send_timeout |
         send_timeout_close |
         sndbuf |
-        tos.
+        tos |
+	ipv6_v6only.
 -type connect_option() ::
         {ip, inet:ip_address()} |
         {fd, Fd :: non_neg_integer()} |
diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl
index 8688799ae9..c5a1173575 100644
--- a/lib/kernel/src/gen_udp.erl
+++ b/lib/kernel/src/gen_udp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -47,7 +47,8 @@
         {recbuf,          non_neg_integer()} |
         {reuseaddr,       boolean()} |
         {sndbuf,          non_neg_integer()} |
-        {tos,             non_neg_integer()}.
+        {tos,             non_neg_integer()} |
+	{ipv6_v6only,     boolean()}.
 -type option_name() ::
         active |
         broadcast |
@@ -69,7 +70,8 @@
         recbuf |
         reuseaddr |
         sndbuf |
-        tos.
+        tos |
+	ipv6_v6only.
 -type socket() :: port().
 
 -export_type([option/0, option_name/0]).
@@ -185,9 +187,10 @@ connect(S, Address, Port) when is_port(S) ->
 	    Error
     end.
 
--spec controlling_process(Socket, Pid) -> ok when
+-spec controlling_process(Socket, Pid) -> ok | {error, Reason} when
       Socket :: socket(),
-      Pid :: pid().
+      Pid :: pid(),
+      Reason :: closed | not_owner | inet:posix().
 
 controlling_process(S, NewOwner) ->
     inet:udp_controlling_process(S, NewOwner).
diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl
index 36cb713ee1..b24a9d5eac 100644
--- a/lib/kernel/src/global.erl
+++ b/lib/kernel/src/global.erl
@@ -232,7 +232,8 @@ register_name(Name, Pid) when is_pid(Pid) ->
       Name :: term(),
       Pid :: pid(),
       Resolve :: method().
-register_name(Name, Pid, Method) when is_pid(Pid) ->
+register_name(Name, Pid, Method0) when is_pid(Pid) ->
+    Method = allow_tuple_fun(Method0),
     Fun = fun(Nodes) ->
         case (where(Name) =:= undefined) andalso check_dupname(Name, Pid) of
             true ->
@@ -290,7 +291,8 @@ re_register_name(Name, Pid) when is_pid(Pid) ->
       Name :: term(),
       Pid :: pid(),
       Resolve :: method().
-re_register_name(Name, Pid, Method) when is_pid(Pid) ->
+re_register_name(Name, Pid, Method0) when is_pid(Pid) ->
+    Method = allow_tuple_fun(Method0),
     Fun = fun(Nodes) ->
 		  gen_server:multi_call(Nodes,
 					global_name_server,
@@ -2218,3 +2220,9 @@ intersection(_, []) ->
     [];
 intersection(L1, L2) ->
     L1 -- (L1 -- L2).
+
+%% Support legacy tuple funs as resolve functions.
+allow_tuple_fun({M, F}) when is_atom(M), is_atom(F) ->
+    fun M:F/3;
+allow_tuple_fun(Fun) when is_function(Fun, 3) ->
+    Fun.
diff --git a/lib/kernel/src/heart.erl b/lib/kernel/src/heart.erl
index 255ae4e51b..87cb9d7f51 100644
--- a/lib/kernel/src/heart.erl
+++ b/lib/kernel/src/heart.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -18,6 +18,10 @@
 %%
 -module(heart). 
 
+-compile(no_native).
+% 'no_native' as part of a crude fix to make init:restart/0 work by clearing
+% all hipe inter-module information (hipe_mfa_info's in hipe_bif0.c).
+
 %%%--------------------------------------------------------------------
 %%% This is a rewrite of pre_heart from BS.3.
 %%%
@@ -38,9 +42,11 @@
 -define(CLEAR_CMD, 5).
 -define(GET_CMD, 6).
 -define(HEART_CMD, 7).
+-define(PREPARING_CRASH, 8). % Used in beam vm
 
 -define(TIMEOUT, 5000).
 -define(CYCLE_TIMEOUT, 10000).
+-define(HEART_PORT_NAME, heart_port).
 
 %%---------------------------------------------------------------------
 
@@ -126,6 +132,8 @@ start_portprogram() ->
 	Port when is_port(Port) ->
 	    case wait_ack(Port) of
 		ok ->
+		    %% register port so the vm can find it if need be
+		    register(?HEART_PORT_NAME, Port),
 		    {ok, Port};
 		{error, Reason} ->
 		    report_problem({{port_problem, Reason},
@@ -221,6 +229,7 @@ no_reboot_shutdown(Port) ->
     end.
 
 do_cycle_port_program(Caller, Parent, Port, Cmd) ->
+    unregister(?HEART_PORT_NAME),
     case catch start_portprogram() of
 	{ok, NewPort} ->
 	    send_shutdown(Port),
diff --git a/lib/kernel/src/hipe_unified_loader.erl b/lib/kernel/src/hipe_unified_loader.erl
index 8b3aa0286d..06d404905d 100644
--- a/lib/kernel/src/hipe_unified_loader.erl
+++ b/lib/kernel/src/hipe_unified_loader.erl
@@ -34,6 +34,13 @@
 
 -module(hipe_unified_loader).
 
+-compile(no_native).
+% 'no_native' is a workaround to avoid "The code server called unloaded module"
+% caused by Mod:module_info(exports) in patch_to_emu_step1() called by post_beam_load.
+% Reproducable with hipelibs and asn1_SUITE.
+% I think the real solution would be to let BIF erlang:load_module/2 redirect all
+% hipe calls to the module and thereby remove post_beam_load.
+
 -export([chunk_name/1,
 	 %% Only the code and code_server modules may call the entries below!
 	 load_native_code/2,
@@ -330,11 +337,16 @@ exports(ExportMap, BaseAddress) ->
   exports(ExportMap, BaseAddress, [], []).
 
 exports([Offset,M,F,A,IsClosure,IsExported|Rest], BaseAddress, MFAs, Addresses) ->
-  MFA = {M,F,A},
-  Address = BaseAddress + Offset,
-  FunDef = #fundef{address=Address, mfa=MFA, is_closure=IsClosure,
-		   is_exported=IsExported},
-  exports(Rest, BaseAddress, [MFA|MFAs], [FunDef|Addresses]);
+  case IsExported andalso erlang:is_builtin(M, F, A) of
+    true ->
+      exports(Rest, BaseAddress, MFAs, Addresses);
+    _false ->
+      MFA = {M,F,A},
+      Address = BaseAddress + Offset,
+      FunDef = #fundef{address=Address, mfa=MFA, is_closure=IsClosure,
+		       is_exported=IsExported},
+      exports(Rest, BaseAddress, [MFA|MFAs], [FunDef|Addresses])
+  end;
 exports([], _, MFAs, Addresses) ->
   {MFAs, Addresses}.
 
@@ -498,7 +510,7 @@ patch_offset(Type, Data, Address, ConstAndZone, Addresses) ->
       Atom = Data,
       patch_atom(Address, Atom);
     sdesc ->
-      patch_sdesc(Data, Address, ConstAndZone);
+      patch_sdesc(Data, Address, ConstAndZone, Addresses);
     x86_abs_pcrel ->
       patch_instr(Address, Data, x86_abs_pcrel)
     %% _ ->
@@ -511,14 +523,16 @@ patch_atom(Address, Atom) ->
   patch_instr(Address, hipe_bifs:atom_to_word(Atom), atom).
 
 patch_sdesc(?STACK_DESC(SymExnRA, FSize, Arity, Live),
-	    Address, {_ConstMap2,CodeAddress}) ->
+	    Address, {_ConstMap2,CodeAddress}, _Addresses) ->
   ExnRA =
     case SymExnRA of
       [] -> 0; % No catch
       LabelOffset -> CodeAddress + LabelOffset
     end,
   ?ASSERT(assert_local_patch(Address)),
-  hipe_bifs:enter_sdesc({Address, ExnRA, FSize, Arity, Live}).
+  DBG_MFA = ?IF_DEBUG(address_to_mfa_lth(Address, _Addresses), {undefined,undefined,0}),
+  hipe_bifs:enter_sdesc({Address, ExnRA, FSize, Arity, Live, DBG_MFA}).
+
 
 %%----------------------------------------------------------------
 %% Handle a 'load_address'-type patch.
@@ -725,7 +739,7 @@ find_const(ConstNo, []) ->
 %%
 
 add_ref(CalleeMFA, Address, Addresses, RefType, Trampoline, RemoteOrLocal) ->
-  CallerMFA = address_to_mfa(Address, Addresses),
+  CallerMFA = address_to_mfa_lth(Address, Addresses),
   %% just a sanity assertion below
   true = case RemoteOrLocal of
 	   local ->
@@ -738,11 +752,31 @@ add_ref(CalleeMFA, Address, Addresses, RefType, Trampoline, RemoteOrLocal) ->
   %% io:format("Adding ref ~w\n",[{CallerMFA, CalleeMFA, Address, RefType}]),
   hipe_bifs:add_ref(CalleeMFA, {CallerMFA,Address,RefType,Trampoline,RemoteOrLocal}).
 
-address_to_mfa(Address, [#fundef{address=Adr, mfa=MFA}|_Rest]) when Address >= Adr -> MFA;
-address_to_mfa(Address, [_ | Rest]) -> address_to_mfa(Address, Rest);
-address_to_mfa(Address, []) -> 
-  ?error_msg("Local adddress not found ~w\n",[Address]),
-  exit({?MODULE, local_address_not_found}).
+% For FunDefs sorted from low to high addresses
+address_to_mfa_lth(Address, FunDefs) ->
+    case address_to_mfa_lth(Address, FunDefs, false) of
+	false ->
+	    ?error_msg("Local adddress not found ~w\n",[Address]),
+	    exit({?MODULE, local_address_not_found});
+	MFA ->
+	    MFA
+    end.
+    
+address_to_mfa_lth(Address, [#fundef{address=Adr, mfa=MFA}|Rest], Prev) ->
+  if Address < Adr -> 
+	  Prev;
+     true -> 
+	  address_to_mfa_lth(Address, Rest, MFA)
+  end;
+address_to_mfa_lth(_Address, [], Prev) -> 
+    Prev.
+
+% For FunDefs sorted from high to low addresses
+%% address_to_mfa_htl(Address, [#fundef{address=Adr, mfa=MFA}|_Rest]) when Address >= Adr -> MFA;
+%% address_to_mfa_htl(Address, [_ | Rest]) -> address_to_mfa_htl(Address, Rest);
+%% address_to_mfa_htl(Address, []) -> 
+%%   ?error_msg("Local adddress not found ~w\n",[Address]),
+%%   exit({?MODULE, local_address_not_found}).
 
 %%----------------------------------------------------------------
 %% Change callers of the given module to instead trap to BEAM.
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index e791bb135f..9670271b2e 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -30,7 +30,9 @@
 	 ifget/3, ifget/2, ifset/3, ifset/2,
 	 getstat/1, getstat/2,
 	 ip/1, stats/0, options/0, 
-	 pushf/3, popf/1, close/1, gethostname/0, gethostname/1]).
+	 pushf/3, popf/1, close/1, gethostname/0, gethostname/1, 
+	 parse_ipv4_address/1, parse_ipv6_address/1, parse_ipv4strict_address/1,
+	 parse_ipv6strict_address/1, parse_address/1, parse_strict_address/1]).
 
 -export([connect_options/2, listen_options/2, udp_options/2, sctp_options/2]).
 
@@ -527,16 +529,58 @@ getservbyname(Name, Protocol) when is_atom(Name) ->
 	Error -> Error
     end.
 
+-spec parse_ipv4_address(Address) ->
+	{ok, IPv4Address} | {error, einval} when
+      Address :: string(),
+      IPv4Address :: ip_address().
+parse_ipv4_address(Addr) ->
+    inet_parse:ipv4_address(Addr).
+
+-spec parse_ipv6_address(Address) ->
+	{ok, IPv6Address} | {error, einval} when
+      Address :: string(),
+      IPv6Address :: ip_address().
+parse_ipv6_address(Addr) ->
+    inet_parse:ipv6_address(Addr).
+
+-spec parse_ipv4strict_address(Address) ->
+	{ok, IPv4Address} | {error, einval} when
+      Address :: string(),
+      IPv4Address :: ip_address().
+parse_ipv4strict_address(Addr) ->
+    inet_parse:ipv4strict_address(Addr).
+
+-spec parse_ipv6strict_address(Address) ->
+	{ok, IPv6Address} | {error, einval} when
+      Address :: string(),
+      IPv6Address :: ip_address().
+parse_ipv6strict_address(Addr) ->
+    inet_parse:ipv6strict_address(Addr).
+
+-spec parse_address(Address) ->
+	{ok, IPAddress} | {error, einval} when
+      Address :: string(),
+      IPAddress :: ip_address().
+parse_address(Addr) ->
+    inet_parse:address(Addr).
+
+-spec parse_strict_address(Address) ->
+	{ok, IPAddress} | {error, einval} when
+      Address :: string(),
+      IPAddress :: ip_address().
+parse_strict_address(Addr) ->
+    inet_parse:strict_address(Addr).
+
 %% Return a list of available options
 options() ->
     [
      tos, priority, reuseaddr, keepalive, dontroute, linger,
-     broadcast, sndbuf, recbuf, nodelay,
+     broadcast, sndbuf, recbuf, nodelay, ipv6_v6only,
      buffer, header, active, packet, deliver, mode,
      multicast_if, multicast_ttl, multicast_loop,
      exit_on_close, high_watermark, low_watermark,
      high_msgq_watermark, low_msgq_watermark,
-     bit8, send_timeout, send_timeout_close
+     send_timeout, send_timeout_close
     ].
 
 %% Return a list of statistics options
@@ -554,8 +598,7 @@ connect_options() ->
     [tos, priority, reuseaddr, keepalive, linger, sndbuf, recbuf, nodelay,
      header, active, packet, packet_size, buffer, mode, deliver,
      exit_on_close, high_watermark, low_watermark, high_msgq_watermark,
-     low_msgq_watermark, bit8, send_timeout, send_timeout_close,
-     delay_send,raw].
+     low_msgq_watermark, send_timeout, send_timeout_close, delay_send, raw].
     
 connect_options(Opts, Family) ->
     BaseOpts = 
@@ -609,10 +652,10 @@ con_add(Name, Val, R, Opts, AllOpts) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 listen_options() ->
     [tos, priority, reuseaddr, keepalive, linger, sndbuf, recbuf, nodelay,
-     header, active, packet, buffer, mode, deliver, backlog,
+     header, active, packet, buffer, mode, deliver, backlog, ipv6_v6only,
      exit_on_close, high_watermark, low_watermark, high_msgq_watermark,
-     low_msgq_watermark, bit8, send_timeout, send_timeout_close,
-     delay_send, packet_size,raw].
+     low_msgq_watermark, send_timeout, send_timeout_close, delay_send,
+     packet_size, raw].
 
 listen_options(Opts, Family) ->
     BaseOpts = 
@@ -667,7 +710,7 @@ list_add(Name, Val, R, Opts, As) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 udp_options() ->
     [tos, priority, reuseaddr, sndbuf, recbuf, header, active, buffer, mode, 
-     deliver,
+     deliver, ipv6_v6only,
      broadcast, dontroute, multicast_if, multicast_ttl, multicast_loop,
      add_membership, drop_membership, read_packets,raw].
 
@@ -723,7 +766,7 @@ udp_add(Name, Val, R, Opts, As) ->
 sctp_options() ->
 [   % The following are generic inet options supported for SCTP sockets:
     mode, active, buffer, tos, priority, dontroute, reuseaddr, linger, sndbuf,
-    recbuf,
+    recbuf, ipv6_v6only,
 
     % Other options are SCTP-specific (though they may be similar to their
     % TCP and UDP counter-parts):
@@ -766,8 +809,12 @@ sctp_opt([Opt|Opts], Mod, R, As) ->
 	{Name,Val}	-> sctp_opt (Opts, Mod, R, As, Name, Val);
 	_ -> {error,badarg}
     end;
-sctp_opt([], _Mod, R, _SockOpts) ->
-    {ok, R}.
+sctp_opt([], _Mod, #sctp_opts{ifaddr=IfAddr}=R, _SockOpts) ->
+    if is_list(IfAddr) ->
+	    {ok, R#sctp_opts{ifaddr=lists:reverse(IfAddr)}};
+       true ->
+	    {ok, R}
+    end.
 
 sctp_opt(Opts, Mod, R, As, Name, Val) ->
     case add_opt(Name, Val, R#sctp_opts.opts, As) of
@@ -1018,11 +1065,7 @@ open(Fd, Addr, Port, Opts, Protocol, Family, Type, Module) when Fd < 0 ->
 	    case prim_inet:setopts(S, Opts) of
 		ok ->
 		    case if is_list(Addr) ->
-				 prim_inet:bind(S, add,
-						[case A of
-						     {_,_} -> A;
-						     _     -> {A,Port}
-						 end || A <- Addr]);
+				 bindx(S, Addr, Port);
 			    true ->
 				 prim_inet:bind(S, Addr, Port)
 			 end of
@@ -1043,6 +1086,34 @@ open(Fd, Addr, Port, Opts, Protocol, Family, Type, Module) when Fd < 0 ->
 open(Fd, _Addr, _Port, Opts, Protocol, Family, Type, Module) ->
     fdopen(Fd, Opts, Protocol, Family, Type, Module).
 
+bindx(S, [Addr], Port0) ->
+    {IP, Port} = set_bindx_port(Addr, Port0),
+    prim_inet:bind(S, IP, Port);
+bindx(S, Addrs, Port0) ->
+    [{IP, Port} | Rest] = [set_bindx_port(Addr, Port0) || Addr <- Addrs],
+    case prim_inet:bind(S, IP, Port) of
+	{ok, AssignedPort} when Port =:= 0 ->
+	    %% On newer Linux kernels, Solaris and FreeBSD, calling
+	    %% bindx with port 0 is ok, but on SuSE 10, it results in einval
+	    Rest2 = [change_bindx_0_port(Addr, AssignedPort) || Addr <- Rest],
+	    prim_inet:bind(S, add, Rest2);
+	{ok, _} ->
+	    prim_inet:bind(S, add, Rest);
+	Error ->
+	    Error
+    end.
+
+set_bindx_port({_IP, _Port}=Addr, _OtherPort) ->
+    Addr;
+set_bindx_port(IP, Port) ->
+    {IP, Port}.
+
+change_bindx_0_port({IP, 0}, AssignedPort) ->
+    {IP, AssignedPort};
+change_bindx_0_port({_IP, _Port}=Addr, _AssignedPort) ->
+    Addr.
+
+
 -spec fdopen(Fd :: non_neg_integer(),
 	     Opts :: [socket_setopt()],
 	     Protocol :: socket_protocol(),
@@ -1249,6 +1320,8 @@ udp_close(S) when is_port(S) ->
 %% Set controlling process for TCP socket.
 tcp_controlling_process(S, NewOwner) when is_port(S), is_pid(NewOwner) ->
     case erlang:port_info(S, connected) of
+	{connected, NewOwner} ->
+	    ok;
 	{connected, Pid} when Pid =/= self() ->
 	    {error, not_owner};
 	undefined ->
@@ -1256,7 +1329,10 @@ tcp_controlling_process(S, NewOwner) when is_port(S), is_pid(NewOwner) ->
 	_ ->
 	    case prim_inet:getopt(S, active) of
 		{ok, A0} ->
-		    prim_inet:setopt(S, active, false),
+		    case A0 of
+			false -> ok;
+			_ -> prim_inet:setopt(S, active, false)
+		    end,
 		    case tcp_sync_input(S, NewOwner, false) of
 			true ->  %% socket already closed, 
 			    ok;
@@ -1264,7 +1340,10 @@ tcp_controlling_process(S, NewOwner) when is_port(S), is_pid(NewOwner) ->
 			    try erlang:port_connect(S, NewOwner) of
 				true -> 
 				    unlink(S), %% unlink from port
-				    prim_inet:setopt(S, active, A0),
+				    case A0 of
+					false -> ok;
+					_ -> prim_inet:setopt(S, active, A0)
+				    end,
 				    ok
 			    catch
 				error:Reason -> 
@@ -1300,6 +1379,8 @@ tcp_sync_input(S, Owner, Flag) ->
 %% Set controlling process for UDP or SCTP socket.
 udp_controlling_process(S, NewOwner) when is_port(S), is_pid(NewOwner) ->
     case erlang:port_info(S, connected) of
+	{connected, NewOwner} ->
+	    ok;
 	{connected, Pid} when Pid =/= self() ->
 	    {error, not_owner};
 	_ ->
diff --git a/lib/kernel/src/inet_config.erl b/lib/kernel/src/inet_config.erl
index 1ddbdcec25..526baca335 100644
--- a/lib/kernel/src/inet_config.erl
+++ b/lib/kernel/src/inet_config.erl
@@ -197,16 +197,6 @@ do_load_resolv({win32,Type}, longnames) ->
     win32_load_from_registry(Type),
     inet_db:set_lookup([native]);
 
-do_load_resolv(vxworks, _) ->	
-    vxworks_load_hosts(),
-    inet_db:set_lookup([file, dns]),
-    case os:getenv("ERLRESCONF") of
-	false ->
-	    no_ERLRESCONF;
-	Resolv ->
-	    load_resolv(Resolv, resolv)
-    end;
-
 do_load_resolv(_, _) ->
     inet_db:set_lookup([native]).
 
@@ -408,55 +398,6 @@ win32_get_strings(Reg, [Name|Rest], Result) ->
 win32_get_strings(_, [], Result) ->
     lists:reverse(Result).
 
-%%
-%% Load host data from VxWorks hostShow command
-%%
-
-vxworks_load_hosts() ->
-    HostShow = os:cmd("hostShow"),
-    case check_hostShow(HostShow) of
-	Hosts when is_list(Hosts) ->
-	    case inet_parse:hosts_vxworks({chars, Hosts}) of
-		{ok, Ls} ->
-		    foreach(
-		      fun({IP, Name, Aliases}) -> 
-			      inet_db:add_host(IP, [Name|Aliases])
-		      end,
-		      Ls);
-		{error,Reason} ->
-		    error("parser error VxWorks hostShow ~s", [Reason])
-	    end;
-	_Error ->
-	    error("error in VxWorks hostShow~s~n", [HostShow])
-    end.
-
-%%
-%% Check if hostShow yields at least two line; the first one
-%% starting with "hostname", the second one starting with
-%% "--------".
-%% Returns: list of hosts in VxWorks notation
-%% rows of 'Name          IP                [Aliases]  \n'
-%% if hostShow yielded these two lines, false otherwise.
-check_hostShow(HostShow) ->
-    check_hostShow(["hostname", "--------"], HostShow).
-
-check_hostShow([], HostShow) ->
-    HostShow;
-check_hostShow([String_match|Rest], HostShow) ->
-    case lists:prefix(String_match, HostShow) of
-	true ->
-	    check_hostShow(Rest, next_line(HostShow));
-	false ->
-	    false
-    end.
-
-next_line([]) ->
-    [];
-next_line([$\n|Rest]) ->
-    Rest;
-next_line([_First|Rest]) ->
-    next_line(Rest).
-
 read_rc() ->
     {RcFile,CfgList} = read_inetrc(),
     case extract_cfg_files(CfgList, [], []) of
diff --git a/lib/kernel/src/inet_int.hrl b/lib/kernel/src/inet_int.hrl
index 2dfbf75d25..000119bc74 100644
--- a/lib/kernel/src/inet_int.hrl
+++ b/lib/kernel/src/inet_int.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -124,6 +124,7 @@
 -define(UDP_OPT_MULTICAST_LOOP,  13).
 -define(UDP_OPT_ADD_MEMBERSHIP,  14).
 -define(UDP_OPT_DROP_MEMBERSHIP, 15).
+-define(INET_OPT_IPV6_V6ONLY,    16).
 % "Local" options: codes start from 20:
 -define(INET_LOPT_BUFFER,        20).
 -define(INET_LOPT_HEADER,        21).
@@ -134,7 +135,6 @@
 -define(INET_LOPT_EXITONCLOSE,   26).
 -define(INET_LOPT_TCP_HIWTRMRK,  27).
 -define(INET_LOPT_TCP_LOWTRMRK,  28).
--define(INET_LOPT_BIT8,          29).
 -define(INET_LOPT_TCP_SEND_TIMEOUT, 30).
 -define(INET_LOPT_TCP_DELAY_SEND,   31).
 -define(INET_LOPT_PACKET_SIZE,   32).
@@ -188,12 +188,6 @@
 -define(TCP_PB_HTTP_BIN,13).
 -define(TCP_PB_HTTPH_BIN,14).
 
-%% bit options, INET_LOPT_BIT8
--define(INET_BIT8_CLEAR, 0).
--define(INET_BIT8_SET,   1).
--define(INET_BIT8_ON,    2).
--define(INET_BIT8_OFF,   3).
-
 
 %% getstat, INET_REQ_GETSTAT
 -define(INET_STAT_RECV_CNT,  1).
diff --git a/lib/kernel/src/inet_parse.erl b/lib/kernel/src/inet_parse.erl
index 65edddcb46..3551e701b6 100644
--- a/lib/kernel/src/inet_parse.erl
+++ b/lib/kernel/src/inet_parse.erl
@@ -23,7 +23,6 @@
 %% Avoid warning for local function error/2 clashing with autoimported BIF.
 -compile({no_auto_import,[error/2]}).
 -export([hosts/1, hosts/2]).
--export([hosts_vxworks/1]).
 -export([protocols/1, protocols/2]).
 -export([netmasks/1, netmasks/2]).
 -export([networks/1, networks/2]).
@@ -37,7 +36,7 @@
 
 -export([ipv4_address/1, ipv6_address/1]).
 -export([ipv4strict_address/1, ipv6strict_address/1]).
--export([address/1]).
+-export([address/1, strict_address/1]).
 -export([visible_string/1, domain/1]).
 -export([ntoa/1, dots/1]).
 -export([split_line/1]).
@@ -107,18 +106,6 @@ hosts(Fname,File) ->
     parse_file(Fname, File, Fn).
 
 %% --------------------------------------------------------------------------
-%% Parse hostShow vxworks style
-%% Syntax:
-%%      Name          IP                [Aliases]  \n 
-%% --------------------------------------------------------------------------
-hosts_vxworks(Hosts) ->
-    Fn = fun([Name, Address | Aliases]) ->
-		 {ok,IP} = address(Address),
-		 {IP, Name, Aliases}
-	 end,
-    parse_file(Hosts, Fn).
-
-%% --------------------------------------------------------------------------
 %% Parse resolv file unix style
 %% Syntax:
 %%      domain Domain \n
@@ -291,9 +278,6 @@ networks(Fname, File) ->
 %%
 %% --------------------------------------------------------------------------
 
-parse_file(File, Fn) ->
-    parse_file(noname, File, Fn).
-
 parse_file(Fname, {fd,Fd}, Fn) ->
     parse_fd(Fname,Fd, 1, Fn, []);
 parse_file(Fname, {chars,Cs}, Fn) when is_list(Cs) ->
@@ -472,6 +456,17 @@ address(Cs) when is_list(Cs) ->
 address(_) -> 
     {error, einval}.
 
+%%Parse ipv4 strict address or ipv6 strict address
+strict_address(Cs) when is_list(Cs) ->
+    case ipv4strict_address(Cs) of
+	{ok,IP} ->
+	    {ok,IP};
+	_ ->
+	    ipv6strict_address(Cs)
+    end;
+strict_address(Cs) ->
+    {error, einval}.
+
 %%
 %% Parse IPv4 address: 
 %%    d1.d2.d3.d4
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index bded2408a7..54628800a8 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -17,11 +17,11 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max two major revisions back
- [{<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
-  {<<"2\\.14(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R14
-  {<<"2\\.13(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R13
+ [{<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
+  {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
+  {<<"2\\.14(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R14
  %% Down to - max two major revisions back
- [{<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
-  {<<"2\\.14(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R14
-  {<<"2\\.13(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R13
+ [{<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
+  {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
+  {<<"2\\.14(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R14
 }.
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index 9e3d730cee..0d59e7af67 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -142,6 +142,17 @@
 
 -include("net_address.hrl").
 
+%%% BIF
+
+-export([dflag_unicode_io/1]).
+
+-spec dflag_unicode_io(pid()) -> boolean().
+
+dflag_unicode_io(_) ->
+    erlang:nif_error(undef).
+
+%%% End of BIF
+
 %% Interface functions
 
 kernel_apply(M,F,A) ->         request({apply,M,F,A}).
diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index f6769df585..e20a2434b4 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -24,16 +24,48 @@
 
 -include("file.hrl").
 
--spec type() -> vxworks | {Osfamily, Osname} when
+%%% BIFs
+
+-export([getenv/0, getenv/1, getpid/0, putenv/2, timestamp/0]).
+
+-spec getenv() -> [string()].
+
+getenv() -> erlang:nif_error(undef).
+
+-spec getenv(VarName) -> Value | false when
+      VarName :: string(),
+      Value :: string().
+
+getenv(_) ->
+    erlang:nif_error(undef).
+
+-spec getpid() -> Value when
+      Value :: string().
+
+getpid() ->
+    erlang:nif_error(undef).
+
+-spec putenv(VarName, Value) -> true when
+      VarName :: string(),
+      Value :: string().
+
+putenv(_, _) ->
+    erlang:nif_error(undef).
+
+-spec timestamp() -> Timestamp when
+      Timestamp :: erlang:timestamp().
+
+timestamp() ->
+    erlang:nif_error(undef).
+
+%%% End of BIFs
+
+-spec type() -> {Osfamily, Osname} when
       Osfamily :: unix | win32,
       Osname :: atom().
 
 type() ->
-    case erlang:system_info(os_type) of
-	{vxworks, _} ->
-	    vxworks;
-	Else -> Else
-    end.
+    erlang:system_info(os_type).
 
 -spec version() -> VersionString | {Major, Minor, Release} when
       VersionString :: string(),
@@ -83,25 +115,14 @@ find_executable1(_Name, [], _Extensions) ->
 
 verify_executable(Name0, [Ext|Rest], OrigExtensions) ->
     Name1 = Name0 ++ Ext,
-    case os:type() of
-	vxworks ->
-	    %% We consider all existing VxWorks files to be executable
-	    case file:read_file_info(Name1) of
-		{ok, _} ->
-		    {ok, Name1};
-		_ ->
-		    verify_executable(Name0, Rest, OrigExtensions)
-	    end;
+    case file:read_file_info(Name1) of
+	{ok, #file_info{type=regular,mode=Mode}}
+	when Mode band 8#111 =/= 0 ->
+	    %% XXX This test for execution permission is not fool-proof
+	    %% on Unix, since we test if any execution bit is set.
+	    {ok, Name1};
 	_ ->
-	    case file:read_file_info(Name1) of
-		{ok, #file_info{type=regular,mode=Mode}}
-		when Mode band 8#111 =/= 0 ->
-		    %% XXX This test for execution permission is not fool-proof
-		    %% on Unix, since we test if any execution bit is set.
-		    {ok, Name1};
-		_ ->
-		    verify_executable(Name0, Rest, OrigExtensions)
-	    end
+	    verify_executable(Name0, Rest, OrigExtensions)
     end;
 verify_executable(Name, [], OrigExtensions) when OrigExtensions =/= [""] -> %% Windows
     %% Will only happen on windows, hence case insensitivity
@@ -154,8 +175,7 @@ reverse_element(List) ->
 extensions() ->
     case type() of
 	{win32, _} -> [".exe",".com",".cmd",".bat"];
-	{unix, _} -> [""];
-	vxworks -> [""]
+	{unix, _} -> [""]
     end.
 
 %% Executes the given command in the default shell for the operating system.
@@ -173,11 +193,6 @@ cmd(Cmd) ->
 			  {Cspec,_} -> lists:concat([Cspec," /c",Cmd])
 		      end,
 	    Port = open_port({spawn, Command}, [stream, in, eof, hide]),
-	    get_data(Port, []);
-	%% VxWorks uses a 'sh -c hook' in 'vxcall.c' to run os:cmd.
-	vxworks ->
-	    Command = lists:concat(["sh -c '", Cmd, "'"]),
-	    Port = open_port({spawn, Command}, [stream, in, eof]),
 	    get_data(Port, [])
     end.
 
diff --git a/lib/kernel/src/pg2.erl b/lib/kernel/src/pg2.erl
index 0d5838716e..1ff10eb303 100644
--- a/lib/kernel/src/pg2.erl
+++ b/lib/kernel/src/pg2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -159,7 +159,7 @@ get_closest_pid(Name) ->
 
 -record(state, {}).
 
--opaque state() :: #state{}.
+-type state() :: #state{}.
 
 -spec init(Arg :: []) -> {'ok', state()}.
 
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index e214ffa404..7c965ca384 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -62,6 +62,8 @@
 %% Internals
 -export([proxy_user_flush/0]).
 
+-export_type([key/0]).
+
 %%------------------------------------------------------------------------
 
 -type state() :: gb_tree().
@@ -286,7 +288,7 @@ call(N,M,F,A) ->
       Reason :: term(),
       Timeout :: timeout().
 
-call(N,M,F,A,_Timeout) when node() =:= N ->  %% Optimize local call
+call(N,M,F,A,infinity) when node() =:= N ->  %% Optimize local call
     local_call(M,F,A);
 call(N,M,F,A,infinity) ->
     do_call(N, {call,M,F,A,group_leader()}, infinity);
diff --git a/lib/kernel/src/wrap_log_reader.erl b/lib/kernel/src/wrap_log_reader.erl
index c41e0091e4..689269fc28 100644
--- a/lib/kernel/src/wrap_log_reader.erl
+++ b/lib/kernel/src/wrap_log_reader.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -30,6 +30,8 @@
 
 -export([open/1, open/2, chunk/1, chunk/2, close/1]).
 
+-export_type([continuation/0]).
+
 -include("disk_log.hrl").
 
 -record(wrap_reader, 
diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index 5dcaad3f5e..8eca37029d 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -140,12 +140,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(APP_FILES) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(APP_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) kernel.spec  $(EMAKEFILE)\
-		$(COVERFILE) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+		$(COVERFILE) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/kernel/test/bif_SUITE.erl b/lib/kernel/test/bif_SUITE.erl
index 6276270d20..c369dca4e1 100644
--- a/lib/kernel/test/bif_SUITE.erl
+++ b/lib/kernel/test/bif_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -260,23 +260,15 @@ spawn_opt2(Config) when is_list(Config) ->
      ?line P1 = spawn_opt(fun() ->
  				 Parent ! {self(), fetch_proc_vals(self())}
  			 end,
- 			  case heap_type() of
-			      separate ->
-				  [{fullsweep_after, 0},{min_heap_size, 1000}];
-			      shared ->
-				  []
-			  end
-			  ++ [link, {priority, max}]),
+			  [{fullsweep_after, 0},{min_heap_size, 1000},
+			   link, {priority, max}]),
      ?line receive
  	      {P1, PV1} ->
  		  ?line Node = node(P1),
  		  ?line check_proc_vals(true, max, 0, 1000, PV1)
  	  end,
     ?line P2 = spawn_opt(fun() -> Parent ! {self(), fetch_proc_vals(self())} end,
-			 case heap_type() of
-			     separate -> [{min_heap_size, 10}];
-			     shared -> []
-			 end),
+			 [{min_heap_size, 10}]),
     ?line receive
 	      {P2, PV2} ->
 		  ?line Node = node(P2),
@@ -295,13 +287,8 @@ spawn_opt3(Config) when is_list(Config) ->
 			 fun() ->
 				 Parent ! {self(), fetch_proc_vals(self())}
 			 end,
-			 case heap_type() of
-			     separate ->
-				 [{fullsweep_after,0}, {min_heap_size,1000}];
-			     shared ->
-				 []
-			 end
-			 ++ [link, {priority, max}]),
+			 [{fullsweep_after,0}, {min_heap_size,1000},
+			  link, {priority, max}]),
     ?line receive
 	      {P1, PV1} ->
 		  ?line Node = node(P1),
@@ -309,10 +296,7 @@ spawn_opt3(Config) when is_list(Config) ->
 	  end,
     ?line P2 = spawn_opt(Node,
 			fun() -> Parent ! {self(), fetch_proc_vals(self())} end,
-			case heap_type() of
-			     separate -> [{min_heap_size, 10}];
-			     shared -> []
-			end),
+			 [{min_heap_size, 10}]),
     ?line receive
 	      {P2, PV2} ->
 		  ?line Node = node(P2),
@@ -333,13 +317,8 @@ spawn_opt4(Config) when is_list(Config) ->
 			 [fun() ->
 				  Parent ! {self(), fetch_proc_vals(self())}
 			  end],
-			 case heap_type() of
-			     separate ->
-				 [{fullsweep_after,0}, {min_heap_size,1000}];
-			     shared ->
-				 []
-			 end
-			 ++ [link, {priority, max}]),
+			 [{fullsweep_after,0}, {min_heap_size,1000},
+			  link, {priority, max}]),
     ?line receive
 	      {P1, PV1} ->
 		  ?line Node = node(P1),
@@ -350,10 +329,7 @@ spawn_opt4(Config) when is_list(Config) ->
 			 [fun() ->
 				  Parent ! {self(), fetch_proc_vals(self())}
 			  end],
-			 case heap_type() of
-			     separate -> [{min_heap_size, 10}];
-			     shared -> []
-			 end),
+			     [{min_heap_size, 10}]),
     ?line receive
 	      {P2, PV2} ->
 		  ?line Node = node(P2),
@@ -374,13 +350,8 @@ spawn_opt5(Config) when is_list(Config) ->
 			 [fun() ->
 				  Parent ! {self(), fetch_proc_vals(self())}
 			  end],
-			 case heap_type() of
-			     separate ->
-				 [{fullsweep_after,0}, {min_heap_size,1000}];
-			     shared ->
-				 []
-			 end
-			 ++ [link, {priority, max}]),
+			 [{fullsweep_after,0}, {min_heap_size,1000},
+			  link, {priority, max}]),
     ?line receive
 	      {P1, PV1} ->
 		  ?line Node = node(P1),
@@ -392,10 +363,7 @@ spawn_opt5(Config) when is_list(Config) ->
 			 [fun() ->
 				  Parent ! {self(), fetch_proc_vals(self())}
 			  end],
-			 case heap_type() of
-			     separate -> [{min_heap_size, 10}];
-			     shared -> []
-			 end),
+			  [{min_heap_size, 10}]),
     ?line receive
 	      {P2, PV2} ->
 		  ?line Node = node(P2),
@@ -532,34 +500,19 @@ spawn_failures(Config) when is_list(Config) ->
 check_proc_vals(Link, Priority, FullsweepAfter, MinHeapSize, {Ls, P, FA, HS}) ->
     ?line Link = lists:member(self(), Ls),
     ?line Priority = P,
-    ?line case heap_type() of
-	      separate ->
-		  ?line FullsweepAfter = FA,
-		  ?line true = (HS >= MinHeapSize);
-	      shared ->
-		  ?line ok
-	  end,
+    FullsweepAfter = FA,
+    true = (HS >= MinHeapSize),
     ?line ok.
 
 fetch_proc_vals(Pid) ->
     ?line PI = process_info(Pid),
     ?line {value,{links, Ls}} = lists:keysearch(links, 1, PI),
     ?line {value,{priority,P}} = lists:keysearch(priority, 1, PI),
-    ?line {FA, HS}
-	= case heap_type() of
-	      separate ->
-		  ?line {value,
-			 {garbage_collection,
-			  Gs}} = lists:keysearch(garbage_collection, 1, PI),
-		  ?line {value,
-			 {fullsweep_after,
-			  Fa}} = lists:keysearch(fullsweep_after, 1, Gs),
-		  ?line {value,
-			 {heap_size,Hs}} = lists:keysearch(heap_size, 1, PI),
-		  ?line {Fa, Hs};
-	      shared ->
-		  {undefined, undefined}
-	  end,
+    {value,{garbage_collection,Gs}} =
+	lists:keysearch(garbage_collection, 1, PI),
+    {value,{fullsweep_after,FA}} =
+	lists:keysearch(fullsweep_after, 1, Gs),
+    {value,{heap_size,HS}} = lists:keysearch(heap_size, 1, PI),
     ?line {Ls, P, FA, HS}.
      
 % This testcase should probably be moved somewhere else
@@ -650,12 +603,3 @@ stop_node(Node) ->
 
 run_fun(Fun) ->
     Fun().
-
-heap_type() ->
-    case catch erlang:system_info(heap_type) of
-	shared   -> shared;
-	unified  -> shared;
-	_        -> separate
-    end.
-    
-
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 2c59351600..d7424c0c9a 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -25,6 +25,7 @@
 	 replace_path/1, load_file/1, load_abs/1, ensure_loaded/1,
 	 delete/1, purge/1, soft_purge/1, is_loaded/1, all_loaded/1,
 	 load_binary/1, dir_req/1, object_code/1, set_path_file/1,
+	 upgrade/1,
 	 sticky_dir/1, pa_pz_option/1, add_del_path/1,
 	 dir_disappeared/1, ext_mod_dep/1, clash/1,
 	 load_cached/1, start_node_with_cache/1, add_and_rehash/1,
@@ -43,6 +44,8 @@
 	 handle_event/2, handle_call/2, handle_info/2,
 	 terminate/2]).
 
+-export([compile_load/4]).
+
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
@@ -50,6 +53,7 @@ all() ->
      replace_path, load_file, load_abs, ensure_loaded,
      delete, purge, soft_purge, is_loaded, all_loaded,
      load_binary, dir_req, object_code, set_path_file,
+     upgrade,
      pa_pz_option, add_del_path, dir_disappeared,
      ext_mod_dep, clash, load_cached, start_node_with_cache,
      add_and_rehash, where_is_file_no_cache,
@@ -450,6 +454,46 @@ load_binary(Config) when is_list(Config) ->
     code:delete(code_b_test),
     ok.
 
+upgrade(Config) ->    
+    DataDir = ?config(data_dir, Config),
+
+    %%T = [beam, hipe],
+    T = [beam],
+
+    [upgrade_do(DataDir, Client, U1, U2, O1, O2)
+     || Client<-T, U1<-T, U2<-T, O1<-T, O2<-T],
+    
+    ok.
+
+upgrade_do(DataDir, Client, U1, U2, O1, O2) ->
+    compile_load(upgrade_client, DataDir, undefined, Client),        
+    upgrade_client:run(DataDir, U1, U2, O1, O2),
+    ok.
+
+compile_load(Mod, Dir, Ver, CodeType) ->
+    Version = case Ver of
+		  undefined ->
+		      io:format("Compiling '~p' as ~p\n", [Mod, CodeType]),
+		      [];
+		  _ ->
+		      io:format("Compiling version ~p of '~p' as ~p\n",
+				[Ver, Mod, CodeType]),
+		      [{d,list_to_atom("VERSION_" ++ integer_to_list(Ver))}]
+	      end,
+    Target = case CodeType of
+		 beam -> [];
+		 hipe -> [native]
+	     end,
+    CompOpts = [binary, report] ++ Target ++ Version,
+
+    Src = filename:join(Dir, atom_to_list(Mod) ++ ".erl"),
+    %io:format("compile:file(~p,~p)\n", [Src, CompOpts]),
+    {ok,Mod,Code} = compile:file(Src, CompOpts),
+    ObjFile = filename:basename(Src,".erl") ++ ".beam",
+    {module,Mod} = code:load_binary(Mod, ObjFile, Code),
+    %IsNative = code:is_module_native(Mod),
+    ok.
+
 dir_req(suite) -> [];
 dir_req(doc) -> [];
 dir_req(Config) when is_list(Config) ->
@@ -501,7 +545,7 @@ sticky_dir(doc) -> ["Test that a module with the same name as a module in ",
 		    "a sticky directory cannot be loaded."];
 sticky_dir(Config) when is_list(Config) ->
     MyDir=filename:dirname(code:which(?MODULE)),
-    ?line {ok, Node}=?t:start_node(sticky_dir, slave,[{args, "-pa "++MyDir}]),
+    ?line {ok, Node}=?t:start_node(sticky_dir, slave,[{args, "-pa \""++MyDir++"\""}]),
     File=filename:join([?config(data_dir, Config), "calendar"]),
     ?line Ret=rpc:call(Node, ?MODULE, sticky_compiler, [File]),
     case Ret of
@@ -535,30 +579,25 @@ sticky_compiler(File) ->
 pa_pz_option(suite) -> [];
 pa_pz_option(doc) -> ["Test that the -pa and -pz options work as expected"];
 pa_pz_option(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "Slave nodes not supported on VxWorks"};
-	_ ->
-	    DDir = ?config(data_dir,Config),
-	    PaDir = filename:join(DDir,"pa"),
-	    PzDir = filename:join(DDir,"pz"),
-	    ?line {ok, Node}=?t:start_node(pa_pz1, slave,
-					   [{args,
-					     "-pa " ++ PaDir
-					     ++ " -pz " ++ PzDir}]),
-	    ?line Ret=rpc:call(Node, code, get_path, []),
-	    ?line [PaDir|Paths] = Ret,
-	    ?line [PzDir|_] = lists:reverse(Paths),
-	    ?t:stop_node(Node),
-	    ?line {ok, Node2}=?t:start_node(pa_pz2, slave,
-					    [{args,
-					      "-mode embedded " ++ "-pa "
-					      ++ PaDir ++ " -pz " ++ PzDir}]),
-	    ?line Ret2=rpc:call(Node2, code, get_path, []),
-	    ?line [PaDir|Paths2] = Ret2,
-	    ?line [PzDir|_] = lists:reverse(Paths2),
-	    ?t:stop_node(Node2)
-    end.
+    DDir = ?config(data_dir,Config),
+    PaDir = filename:join(DDir,"pa"),
+    PzDir = filename:join(DDir,"pz"),
+    {ok, Node}=?t:start_node(pa_pz1, slave,
+	[{args,
+		"-pa " ++ PaDir
+		++ " -pz " ++ PzDir}]),
+    Ret=rpc:call(Node, code, get_path, []),
+    [PaDir|Paths] = Ret,
+    [PzDir|_] = lists:reverse(Paths),
+    ?t:stop_node(Node),
+    {ok, Node2}=?t:start_node(pa_pz2, slave,
+	[{args,
+		"-mode embedded " ++ "-pa "
+		++ PaDir ++ " -pz " ++ PzDir}]),
+    Ret2=rpc:call(Node2, code, get_path, []),
+    [PaDir|Paths2] = Ret2,
+    [PzDir|_] = lists:reverse(Paths2),
+    ?t:stop_node(Node2).
 
 add_del_path(suite) ->
     [];
@@ -645,8 +684,8 @@ ext_mod_dep(Config) when is_list(Config) ->
     xref:set_default(s, [{verbose,false},{warnings,false},
 			 {builtins,true},{recurse,true}]),
     xref:set_library_path(s, code:get_path()),
-    xref:add_directory(s, filename:dirname(code:which(kernel))),
-    xref:add_directory(s, filename:dirname(code:which(lists))),
+    xref:add_directory(s, filename:join(code:lib_dir(kernel),"ebin")),
+    xref:add_directory(s, filename:join(code:lib_dir(stdlib),"ebin")),
     case catch ext_mod_dep2() of
 	{'EXIT', Reason} -> 
 	    xref:stop(s),
@@ -822,7 +861,7 @@ load_cached(Config) when is_list(Config) ->
     ?line WD = filename:dirname(code:which(?MODULE)),
     ?line {ok,Node} = 
 	?t:start_node(code_cache_node, peer, [{args,
-					       "-pa " ++ WD},
+					       "-pa \"" ++ WD ++ "\""},
 					      {erl, [this]}]),
     CCTabCreated = fun(Tab) ->
 			   case ets:info(Tab, name) of
@@ -907,7 +946,7 @@ add_and_rehash(Config) when is_list(Config) ->
     ?line WD = filename:dirname(code:which(?MODULE)),
     ?line {ok,Node} = 
 	?t:start_node(code_cache_node, peer, [{args,
-					       "-pa " ++ WD},
+					       "-pa \"" ++ WD ++ "\""},
 					      {erl, [this]}]),
     CCTabCreated = fun(Tab) ->
 			   case ets:info(Tab, name) of
@@ -1550,7 +1589,8 @@ native_early_modules_1(Architecture) ->
         true ->
             ?line true = lists:all(fun code:is_module_native/1,
 				   [ets,file,filename,gb_sets,gb_trees,
-				    hipe_unified_loader,lists,os,packages]),
+				    %%hipe_unified_loader, no_native as workaround
+				    lists,os,packages]),
             ok
     end.
 
diff --git a/lib/kernel/test/code_SUITE_data/other.erl b/lib/kernel/test/code_SUITE_data/other.erl
new file mode 100644
index 0000000000..58ce87f222
--- /dev/null
+++ b/lib/kernel/test/code_SUITE_data/other.erl
@@ -0,0 +1,38 @@
+-module(other).
+
+-ifdef(VERSION_1).
+-define(VERSION,1).
+-export([exp1/0]).
+-export([exp1loc2/0]).
+-export([exp1exp2/0]).
+exp1() -> check([loc1(),exp1loc2(),exp1exp2(),loc1exp2(),loc1loc2()]).
+loc1() -> check([exp1loc2(),exp1exp2(),loc1exp2(),loc1loc2()]).
+exp1loc2() -> check([exp1exp2(),loc1exp2(),loc1loc2()]).
+exp1exp2() -> check([loc1exp2(),loc1loc2()]).
+loc1exp2() -> check([loc1loc2()]).
+-endif. % VERSION_1
+
+-ifdef(VERSION_2).
+-define(VERSION,2).
+-export([exp2/0]).
+-export([loc1exp2/0]).
+-export([exp1exp2/0]).
+loc1exp2() -> check([exp1exp2(),exp1loc2(),loc2(),exp2(),loc1loc2()]).
+exp1exp2() -> check([exp1loc2(),loc2(),exp2(),loc1loc2()]).
+exp1loc2() -> check([loc2(),exp2(),loc1loc2()]).
+loc2() -> check([exp2(),loc1loc2()]).
+exp2() -> check([loc1loc2()]).
+
+-endif. % VERSION_2
+
+loc1loc2() -> ?VERSION.
+
+
+check(VerList) ->
+    case lists:all(fun(?VERSION) -> true; (_) -> false end,
+		   VerList) of
+	true ->
+	    ?VERSION;
+	false ->
+	    VerList
+    end.
diff --git a/lib/kernel/test/code_SUITE_data/upgrade_client.erl b/lib/kernel/test/code_SUITE_data/upgrade_client.erl
new file mode 100644
index 0000000000..bb655e01d3
--- /dev/null
+++ b/lib/kernel/test/code_SUITE_data/upgrade_client.erl
@@ -0,0 +1,259 @@
+-module(upgrade_client).
+
+-export([run/5]).
+
+%%-define(line, io:format("~s:~p\n", [?MODULE,?LINE]),).
+-define(line,).    
+
+run(Dir, Upgradee1, Upgradee2, Other1, Other2) ->
+    %% Load version 1 of upgradee
+    code_SUITE:compile_load(upgradee, Dir, 1, Upgradee1),
+
+    ?line 1 = upgradee:exp1(),
+    ?line 1 = upgradee:exp1exp2(),
+    ?line 1 = upgradee:exp1loc2(),
+
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1exp2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1loc2()),
+
+    P = spawn_link(upgradee,dispatch_loop,[]),
+
+    ?line 1 = proxy_call(P, local, exp1),
+    ?line 1 = proxy_call(P, local, loc1),
+    ?line 1 = proxy_call(P, local, exp1exp2),
+    ?line 1 = proxy_call(P, local, exp1loc2),
+    ?line 1 = proxy_call(P, local, loc1exp2),
+    ?line 1 = proxy_call(P, local, loc1loc2),
+    ?line 1 = proxy_call(P, external, exp1),
+    ?line 1 = proxy_call(P, external, exp1exp2),
+    ?line 1 = proxy_call(P, external, exp1loc2),
+
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc2),
+    ?line {cannot_compile,1} = proxy_call(P, local, exp2),
+    ?line {cannot_compile,1} = proxy_call(P, local, loc2),
+
+    ?line {'EXIT',{undef,_}} = (catch other:exp1()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp1exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc11exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc2()),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc2),
+
+    %%
+    %% Load version 1 of other
+    %%
+    code_SUITE:compile_load(other, Dir, 1, Other1),
+    ?line 1 = other:exp1(),
+    ?line 1 = other:exp1loc2(),
+    ?line 1 = other:exp1exp2(),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc2()),
+
+    ?line 1 = proxy_call(P, other, exp1),
+    ?line 1 = proxy_call(P, other, exp1loc2),
+    ?line 1 = proxy_call(P, other, exp1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc2),
+
+    %%
+    %% Load version 2 of upgradee
+    %%
+    code_SUITE:compile_load(upgradee, Dir, 2, Upgradee2),
+
+    ?line 2 = upgradee:exp2(),
+    ?line 2 = upgradee:exp1exp2(),
+    ?line 2 = upgradee:loc1exp2(),
+    
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc2()),
+
+    ?line 1 = proxy_call(P, local, exp1),
+    ?line 1 = proxy_call(P, local, loc1),
+    ?line 1 = proxy_call(P, local, exp1exp2),
+    ?line 1 = proxy_call(P, local, exp1loc2),
+    ?line 1 = proxy_call(P, local, loc1exp2),
+    ?line 1 = proxy_call(P, local, loc1loc2),
+    ?line {cannot_compile,1} = proxy_call(P, local, exp2),
+    ?line {cannot_compile,1} = proxy_call(P, local, loc2),
+
+    ?line 2 = proxy_call(P, external, exp1exp2),
+    ?line 2 = proxy_call(P, external, loc1exp2),
+    ?line 2 = proxy_call(P, external, exp2),
+
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1),    
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc2),
+
+    ?line 1 = other:exp1(),
+    ?line 1 = other:exp1loc2(),
+    ?line 1 = other:exp1exp2(),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc2()),
+
+    ?line 1 = proxy_call(P, other, exp1),
+    ?line 1 = proxy_call(P, other, exp1loc2),
+    ?line 1 = proxy_call(P, other, exp1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc2),
+
+    %%
+    %% Load version 2 of other
+    %%
+    code_SUITE:compile_load(other, Dir, 2, Other2),
+
+    ?line 2 = upgradee:exp2(),
+    ?line 2 = upgradee:exp1exp2(),
+    ?line 2 = upgradee:loc1exp2(),
+    
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc2()),
+
+    ?line 1 = proxy_call(P, local, exp1),
+    ?line 1 = proxy_call(P, local, loc1),
+    ?line 1 = proxy_call(P, local, exp1exp2),
+    ?line 1 = proxy_call(P, local, exp1loc2),
+    ?line 1 = proxy_call(P, local, loc1exp2),
+    ?line 1 = proxy_call(P, local, loc1loc2),
+    ?line {cannot_compile,1} = proxy_call(P, local, exp2),
+    ?line {cannot_compile,1} = proxy_call(P, local, loc2),
+
+    ?line 2 = proxy_call(P, external, exp1exp2),
+    ?line 2 = proxy_call(P, external, loc1exp2),
+    ?line 2 = proxy_call(P, external, exp2),
+
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1),    
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc2),
+
+    ?line 2 = other:exp2(),
+    ?line 2 = other:loc1exp2(),
+    ?line 2 = other:exp1exp2(),
+    ?line {'EXIT',{undef,_}} = (catch other:exp1()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc2()),
+
+    ?line 2 = proxy_call(P, other, exp2),
+    ?line 2 = proxy_call(P, other, loc1exp2),
+    ?line 2 = proxy_call(P, other, exp1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc2),
+
+
+    %%
+    %% Upgrade proxy to version 2
+    %%
+    P ! upgrade_order,
+
+    
+    %%
+    io:format("Delete version 2 of 'upgradee'\n",[]),
+    %%
+    code:purge(upgradee),
+    code:delete(upgradee),
+    
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1exp2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1exp2()),    
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc2()),
+    
+    ?line 2 = proxy_call(P, local, exp2),
+    ?line 2 = proxy_call(P, local, loc2),
+    ?line 2 = proxy_call(P, local, exp1exp2),
+    ?line 2 = proxy_call(P, local, exp1loc2),
+    ?line 2 = proxy_call(P, local, loc1exp2),
+    ?line 2 = proxy_call(P, local, loc1loc2),
+    ?line {cannot_compile,2} = proxy_call(P, local, exp1),
+    ?line {cannot_compile,2} = proxy_call(P, local, loc1),
+    
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1),    
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc2),
+    
+    ?line 2 = other:exp2(),
+    ?line 2 = other:loc1exp2(),
+    ?line 2 = other:exp1exp2(),
+    ?line {'EXIT',{undef,_}} = (catch other:exp1()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc2()),
+    
+    ?line 2 = proxy_call(P, other, exp2),
+    ?line 2 = proxy_call(P, other, loc1exp2),
+    ?line 2 = proxy_call(P, other, exp1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc2),
+    
+    unlink(P),
+    exit(P, die_please),
+
+    io:format("Purge 'upgradee'\n",[]),
+    code:purge(upgradee),
+
+    io:format("Delete and purge 'other'\n",[]),
+    code:purge(other),
+    code:delete(other),
+    code:purge(other),
+    ok.
+
+proxy_call(Pid, CallType, Func) ->
+    Pid ! {self(), CallType, Func},
+    receive
+	{Pid, call_result, Func, Ret} -> Ret
+    end.
diff --git a/lib/kernel/test/code_SUITE_data/upgradee.erl b/lib/kernel/test/code_SUITE_data/upgradee.erl
new file mode 100644
index 0000000000..62b1d95e30
--- /dev/null
+++ b/lib/kernel/test/code_SUITE_data/upgradee.erl
@@ -0,0 +1,123 @@
+-module(upgradee).
+
+-export([dispatch_loop/0]).
+
+-ifdef(VERSION_1).
+-define(VERSION,1).
+
+-export([exp1/0]).     % only exported in v1
+-export([exp1loc2/0]). % exported in v1, local in v2
+-export([exp1exp2/0]). % exported in v1 and v2
+
+exp1() -> ?VERSION.
+loc1() -> ?VERSION.
+
+-endif. % VERSION_1
+
+-ifdef(VERSION_2).
+-define(VERSION,2).
+
+-export([exp2/0]).
+-export([loc1exp2/0]).
+-export([exp1exp2/0]).
+
+exp2() -> ?VERSION.
+loc2() -> ?VERSION.
+
+-endif. % VERSION_2
+
+exp1exp2() -> ?VERSION.
+exp1loc2() -> ?VERSION.
+loc1exp2() -> ?VERSION.
+loc1loc2() -> ?VERSION.
+
+dispatch_loop() ->
+    receive 
+	upgrade_order ->
+	    %%erlang:display({"upgradee version", ?VERSION, "got upgrade_order"}),
+	    ?MODULE:dispatch_loop();
+
+	Msg -> 
+	    %%erlang:display({"upgradee version", ?VERSION, "got msg", Msg}),
+	    {Func,Ret} = case Msg of
+			     %% Local calls
+			     {Pid, local, F=exp1} ->
+				 {F, local_exp1()};
+			     {Pid, local, F=loc1} ->
+				 {F, local_loc1()};
+			     {Pid, local, F=exp1exp2} ->
+				 {F, catch exp1exp2()};
+			     {Pid, local, F=exp1loc2} ->
+				 {F, catch exp1loc2()};
+			     {Pid, local, F=loc1exp2} ->
+				 {F, catch loc1exp2()};
+			     {Pid, local, F=loc1loc2} ->
+				 {F, catch loc1loc2()};
+			     {Pid, local, F=exp2} ->
+				 {F, local_exp2()};
+			     {Pid, local, F=loc2} ->
+				 {F, local_loc2()};
+			     
+			     %% Extern calls to own module
+			     {Pid, external, F=exp1} ->
+				 {F, catch ?MODULE:exp1()};
+			     {Pid, external, F=loc1} ->
+				 {F, catch ?MODULE:loc1()};
+			     {Pid, external, F=exp1exp2} ->
+				 {F, catch ?MODULE:exp1exp2()};
+			     {Pid, external, F=exp1loc2} ->
+				 {F, catch ?MODULE:exp1loc2()};
+			     {Pid, external, F=loc1exp2} ->
+				 {F, catch ?MODULE:loc1exp2()};
+			     {Pid, external, F=loc1loc2} ->
+				 {F, catch ?MODULE:loc1loc2()};
+			     {Pid, external, F=exp2} ->
+				 {F, catch ?MODULE:exp2()};
+			     {Pid, external, F=loc2} ->
+				 {F, catch ?MODULE:loc2()};
+			     
+			     %% External calls to other module
+			     {Pid, other, F=exp1} ->
+				 {F, catch other:exp1()};
+			     {Pid, other, F=loc1} ->
+				 {F, catch other:loc1()};
+			     {Pid, other, F=exp1exp2} ->
+				 {F, catch other:exp1exp2()};
+			     {Pid, other, F=exp1loc2} ->
+				 {F, catch other:exp1loc2()};
+			     {Pid, other, F=loc1exp2} ->
+				 {F, catch other:loc1exp2()};
+			     {Pid, other, F=loc1loc2} ->
+				 {F, catch other:loc1loc2()};
+			     {Pid, other, F=exp2} ->
+				 {F, catch other:exp2()};
+			     {Pid, other, F=loc2} ->
+				 {F, catch other:loc2()}
+			 end,
+	    Pid ! {self(), call_result, Func, Ret},
+	    
+	    dispatch_loop() % A local call, we don't want to upgrade the dispatcher
+    end.
+
+
+
+-ifdef(VERSION_1).
+local_exp1() -> catch exp1().
+local_loc1() -> catch loc1().
+-else.
+local_exp1() ->
+    %%erlang:display({"upgradee:local_exp1 in version", ?VERSION}),
+    {cannot_compile,?VERSION}.
+local_loc1() -> {cannot_compile,?VERSION}.
+-endif.
+
+-ifdef(VERSION_2).
+local_exp2() -> catch exp2().
+local_loc2() -> catch loc2().
+-else.
+local_exp2() -> 
+    %%erlang:display({"upgradee:local_exp2 in version", ?VERSION}),
+    {cannot_compile,?VERSION}.
+local_loc2() -> 
+    {cannot_compile,?VERSION}.
+-endif.
diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
index ad987fe7a7..0f811b8f73 100644
--- a/lib/kernel/test/disk_log_SUITE.erl
+++ b/lib/kernel/test/disk_log_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -90,7 +90,7 @@
 
          evil/1,
 
-         otp_6278/1]).
+         otp_6278/1, otp_10131/1]).
 
 -export([head_fun/1, hf/0, lserv/1, 
 	 measure/0, init_m/1, xx/0, head_exit/0, slow_header/1]).
@@ -124,12 +124,7 @@
 	[halt_int, wrap_int, halt_ext, wrap_ext, read_mode, head,
 	 notif, new_idx_vsn, reopen, block, unblock, open, close,
 	 error, chunk, truncate, many_users, info, change_size,
-	 change_attribute, distribution, evil, otp_6278]).
-
-%% The following two lists should be mutually exclusive. To skip a case
-%% on VxWorks altogether, use the kernel.spec.vxworks file instead.
-%% PLEASE don't skip out of laziness, the goal is to make every
-%% testcase runnable on VxWorks.
+	 change_attribute, distribution, evil, otp_6278, otp_10131]).
 
 %% These test cases should be skipped if the VxWorks card is 
 %% configured without NFS cache.
@@ -153,7 +148,7 @@ all() ->
      {group, open}, {group, close}, {group, error}, chunk,
      truncate, many_users, {group, info},
      {group, change_size}, change_attribute,
-     {group, distribution}, evil, otp_6278].
+     {group, distribution}, evil, otp_6278, otp_10131].
 
 groups() -> 
     [{halt_int, [], [halt_int_inf, {group, halt_int_sz}]},
@@ -4915,6 +4910,22 @@ otp_6278(Conf) when is_list(Conf) ->
     end,
     ?line error_logger:delete_report_handler(?MODULE).
 
+otp_10131(suite) -> [];
+otp_10131(doc) -> ["OTP-10131. head_func type."];
+otp_10131(Conf) when is_list(Conf) ->
+    Dir = ?privdir(Conf),
+    Log = otp_10131,
+    File = filename:join(Dir, lists:concat([Log, ".LOG"])),
+    HeadFunc = {?MODULE, head_fun, [{ok,"head"}]},
+    {ok, Log} = disk_log:open([{name,Log},{file,File},
+                               {head_func, HeadFunc}]),
+    HeadFunc = info(Log, head, undef),
+    HeadFunc2 = {?MODULE, head_fun, [{ok,"head2"}]},
+    ok = disk_log:change_header(Log, {head_func, HeadFunc2}),
+    HeadFunc2 = info(Log, head, undef),
+    ok = disk_log:close(Log),
+    ok.
+
 mark(FileName, What) ->
     {ok,Fd} = file:open(FileName, [raw, binary, read, write]),
     {ok,_} = file:position(Fd, 4),
@@ -5110,33 +5121,8 @@ stop_node(Node) ->
 %% If the board is configured without NFS, the port program will fail to load
 %% and this will return 0, which may or may not be the wrong thing to do.
 
-check_nfs(Config) ->
-    case (catch check_cache(Config)) of
-	N when is_integer(N) ->
-	    N;
-	_ ->
-	    0
-    end.
-
-check_cache(Config) ->
-    ?line Check = filename:join(?datadir(Config), "nfs_check"),
-    ?line P = open_port({spawn, Check}, [{line,100}, eof]),
-    ?line Size = receive
-		     {P,{data,{eol,S}}} ->
-			 list_to_integer(S)
-		 after 1000 ->
-			 erlang:display(got_timeout),
-			 exit(timeout)
-		 end,
-    ?line receive
-	      {P, eof} ->
-		  ok
-	  end,
-    ?line P ! {self(), close},
-    ?line receive
-	      {P, closed} -> ok
-	  end,
-    Size.
+check_nfs(_Config) ->
+    0.
 
 skip_expand([]) ->
     [];
@@ -5159,13 +5145,8 @@ skip_list(Config) ->
 	    skip_expand(?SKIP_LARGE_CACHE)
     end.
 
-should_skip(Test,Config) ->
-    case os:type() of
-	vxworks ->
-	    lists:member(Test, skip_list(Config));
-	_ ->
-	    false
-    end.
+should_skip(_Test,_Config) ->
+    false.
 
 %%-----------------------------------------------------------------
 %% The error_logger handler used.
diff --git a/lib/kernel/test/disk_log_SUITE_data/Makefile.src b/lib/kernel/test/disk_log_SUITE_data/Makefile.src
deleted file mode 100644
index cae2f23d29..0000000000
--- a/lib/kernel/test/disk_log_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,15 +0,0 @@
-CC = @CC@
-LD = @LD@
-CFLAGS = @CFLAGS@ -I@erl_include@ @DEFS@
-CROSSLDFLAGS = @CROSSLDFLAGS@
-
-PROGS = nfs_check@exe@
-
-all: $(PROGS)
-
-nfs_check@exe@: nfs_check@obj@
-	$(LD) $(CROSSLDFLAGS) -o nfs_check nfs_check@obj@ @LIBS@
-
-nfs_check@obj@: nfs_check.c
-	$(CC) -c -o nfs_check@obj@ $(CFLAGS) nfs_check.c
-
diff --git a/lib/kernel/test/disk_log_SUITE_data/nfs_check.c b/lib/kernel/test/disk_log_SUITE_data/nfs_check.c
deleted file mode 100644
index 31e9ba8190..0000000000
--- a/lib/kernel/test/disk_log_SUITE_data/nfs_check.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Author: Patrik Nyblom
- * Purpose: A port program to check the NFS cache size on VxWorks (returns 0
- * for other platforms).
- */
-
-#ifdef VXWORKS
-#include <vxWorks.h>
-#include <taskVarLib.h>
-#include <taskLib.h>
-#include <sysLib.h>
-#include <string.h>
-#include <ioLib.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#ifdef VXWORKS
-extern unsigned nfsCacheSize;
-#define MAIN(argc, argv) nfs_check(argc, argv)
-#else
-#define MAIN(argc, argv) main(argc, argv)
-#endif
-
-
-MAIN(argc, argv)
-int argc;
-char *argv[];
-{
-#ifdef VXWORKS
-    char str[100];
-    sprintf(str,"%d\n", nfsCacheSize);
-    write(1, str, strlen(str));
-#else
-    fprintf(stdout,"0");
-    fflush(stdout);
-#endif
-    return 0;
-}
-
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index 6f4f27d594..35502a1d27 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -110,56 +110,46 @@ get_file(Config) when is_list(Config) ->
 inet_existing(doc) -> ["Start a node using the 'inet' loading method, ",
 		       "from an already started boot server."];
 inet_existing(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "VxWorks: tested separately"};
-	_ ->
-	    ?line Name = erl_prim_test_inet_existing,
-	    ?line Host = host(),
-	    ?line Cookie = atom_to_list(erlang:get_cookie()),
-	    ?line IpStr = ip_str(Host),
-	    ?line LFlag = get_loader_flag(os:type()),
-	    ?line Args = LFlag ++ " -hosts " ++ IpStr ++
-		" -setcookie " ++ Cookie,
-	    ?line {ok, BootPid} = erl_boot_server:start_link([Host]),
-	    ?line {ok, Node} = start_node(Name, Args),
-	    ?line {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
-	    ?line stop_node(Node),
-	    ?line unlink(BootPid),
-	    ?line exit(BootPid, kill),
-	    ok
-    end.
+    Name = erl_prim_test_inet_existing,
+    Host = host(),
+    Cookie = atom_to_list(erlang:get_cookie()),
+    IpStr = ip_str(Host),
+    LFlag = get_loader_flag(os:type()),
+    Args = LFlag ++ " -hosts " ++ IpStr ++
+	" -setcookie " ++ Cookie,
+    {ok, BootPid} = erl_boot_server:start_link([Host]),
+    {ok, Node} = start_node(Name, Args),
+    {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
+    stop_node(Node),
+    unlink(BootPid),
+    exit(BootPid, kill),
+    ok.
 
 inet_coming_up(doc) -> ["Start a node using the 'inet' loading method, ",
 			"but start the boot server afterwards."];
 inet_coming_up(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "VxWorks: tested separately"};
-	_ ->
-	    ?line Name = erl_prim_test_inet_coming_up,
-	    ?line Cookie = atom_to_list(erlang:get_cookie()),
-	    ?line Host = host(),
-	    ?line IpStr = ip_str(Host),
-	    ?line LFlag = get_loader_flag(os:type()),
-	    ?line Args = LFlag ++ 
-		" -hosts " ++ IpStr ++
-		" -setcookie " ++ Cookie,
-	    ?line {ok, Node} = start_node(Name, Args, [{wait, false}]),
-
-	    %% Wait a while, then start boot server, and wait for node to start.
-	    ?line test_server:sleep(test_server:seconds(6)),
-	    io:format("erl_boot_server:start_link([~p]).", [Host]),
-	    ?line {ok, BootPid} = erl_boot_server:start_link([Host]),
-	    ?line wait_really_started(Node, 25),
-
-	    %% Check loader argument, then cleanup.
-	    ?line {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
-	    ?line stop_node(Node),
-	    ?line unlink(BootPid),
-	    ?line exit(BootPid, kill),
-	    ok
-    end.
+    Name = erl_prim_test_inet_coming_up,
+    Cookie = atom_to_list(erlang:get_cookie()),
+    Host = host(),
+    IpStr = ip_str(Host),
+    LFlag = get_loader_flag(os:type()),
+    Args = LFlag ++ 
+	" -hosts " ++ IpStr ++
+	" -setcookie " ++ Cookie,
+    {ok, Node} = start_node(Name, Args, [{wait, false}]),
+
+    %% Wait a while, then start boot server, and wait for node to start.
+    test_server:sleep(test_server:seconds(6)),
+    io:format("erl_boot_server:start_link([~p]).", [Host]),
+    {ok, BootPid} = erl_boot_server:start_link([Host]),
+    wait_really_started(Node, 25),
+
+    %% Check loader argument, then cleanup.
+    {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
+    stop_node(Node),
+    unlink(BootPid),
+    exit(BootPid, kill),
+    ok.
 
 wait_really_started(Node, 0) ->
     test_server:fail({not_booted,Node});
@@ -249,8 +239,6 @@ multiple_slaves(doc) ->
      "verify that the boot server manages"];
 multiple_slaves(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {comment, "VxWorks: tested separately"};
 	{ose,_} ->
 	    {comment, "OSE: multiple nodes not supported"};
 	_ ->
@@ -426,7 +414,9 @@ primary_archive(Config) when is_list(Config) ->
     ExpectedEbins = [Archive, DictDir ++ "/ebin", DummyDir ++ "/ebin"],
     io:format("ExpectedEbins: ~p\n", [ExpectedEbins]),
     ?line {ok, FileInfo} = prim_file:read_file_info(Archive),
-    ?line {ok, Ebins} = rpc:call(Node, erl_prim_loader, set_primary_archive, [Archive, ArchiveBin, FileInfo]),
+    ?line {ok, Ebins} = rpc:call(Node, erl_prim_loader, set_primary_archive,
+				 [Archive, ArchiveBin, FileInfo,
+				  fun escript:parse_file/1]),
     ?line ExpectedEbins = lists:sort(Ebins), % assert
     
     ?line {ok, TopFiles2} = rpc:call(Node, erl_prim_loader, list_dir, [Archive]),
@@ -435,7 +425,9 @@ primary_archive(Config) when is_list(Config) ->
     ?line ok = test_archive(Node, Archive, DictDir, BeamName),
     
     %% Cleanup
-    ?line {ok, []} = rpc:call(Node, erl_prim_loader, set_primary_archive, [undefined, undefined, undefined]),
+    ?line {ok, []} = rpc:call(Node, erl_prim_loader, set_primary_archive,
+			      [undefined, undefined, undefined,
+			       fun escript:parse_file/1]),
     ?line stop_node(Node),
     ?line ok = file:delete(Archive),
     ok.
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 2b6af7e1fb..9c507fd437 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -492,8 +492,6 @@ cur_dir_1(Config) when is_list(Config) ->
     ?line case os:type() of
 	      {unix, _} ->
 		  ?line {error, enotsup} = ?FILE_MODULE:get_cwd("d:");
-	      vxworks ->
-		  ?line {error, enotsup} = ?FILE_MODULE:get_cwd("d:");
 	      {win32, _} ->
 		  win_cur_dir_1(Config)
 	  end,
@@ -1038,32 +1036,29 @@ file_info_basic_file(Config) when is_list(Config) ->
 file_info_basic_directory(suite) -> [];
 file_info_basic_directory(doc) -> [];
 file_info_basic_directory(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
+    Dog = test_server:timetrap(test_server:seconds(5)),
 
     %% Note: filename:join/1 removes any trailing slash,
     %% which is essential for ?FILE_MODULE:file_info/1 to work on
     %% platforms such as Windows95.
-    ?line RootDir = filename:join([?config(priv_dir, Config)]),
+    RootDir = filename:join([?config(priv_dir, Config)]),
 
     %% Test that the RootDir directory has the expected attributes.
-    ?line test_directory(RootDir, read_write),
+    test_directory(RootDir, read_write),
 
     %% Note that on Windows file systems, 
     %% "/" or "c:/" are *NOT* directories.
     %% Therefore, test that ?FILE_MODULE:file_info/1 behaves as if they were
     %% directories.
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line test_directory("/", read_write),
-		  ?line test_directory("c:/", read_write),
-		  ?line test_directory("c:\\", read_write);
-	      {unix, _} ->
-		  ?line test_directory("/", read);
-	      vxworks ->
-		  %% Check is just done for owner
-		  ?line test_directory("/", read_write)
-	  end,
-    ?line test_server:timetrap_cancel(Dog).
+    case os:type() of
+        {win32, _} ->
+            ?line test_directory("/", read_write),
+            ?line test_directory("c:/", read_write),
+            ?line test_directory("c:\\", read_write);
+        {unix, _} ->
+            ?line test_directory("/", read)
+    end,
+    test_server:timetrap_cancel(Dog).
 
 test_directory(Name, ExpectedAccess) ->
     ?line {ok,#file_info{size=Size,type=Type,access=Access,
@@ -1784,9 +1779,7 @@ e_delete(Config) when is_list(Config) ->
 			   Base, #file_info {mode=8#600});
 	      {win32, _} ->
 		  %% Remove a character device.
-		  ?line {error, eacces} = ?FILE_MODULE:delete("nul");
-	      vxworks ->
-		  ok
+		  ?line {error, eacces} = ?FILE_MODULE:delete("nul")
 	  end,
 
     ?line [] = flush(),
@@ -1801,148 +1794,133 @@ e_delete(Config) when is_list(Config) ->
 e_rename(suite) -> [];
 e_rename(doc) -> [];
 e_rename(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "Windriver: dosFs must be fixed first!"};
-	_ ->
-	    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-	    ?line RootDir = ?config(priv_dir, Config),
-	    ?line Base = filename:join(RootDir,
-				       atom_to_list(?MODULE)++"_e_rename"),
-	    ?line ok = ?FILE_MODULE:make_dir(Base),
-	
-	    %% Create an empty directory.
-	    ?line EmptyDir = filename:join(Base, "empty_dir"),
-	    ?line ok = ?FILE_MODULE:make_dir(EmptyDir),
-
-	    %% Create a non-empty directory.
-	    ?line NonEmptyDir = filename:join(Base, "non_empty_dir"),
-	    ?line ok = ?FILE_MODULE:make_dir(NonEmptyDir),
-	    ?line ok = ?FILE_MODULE:write_file(
-			  filename:join(NonEmptyDir, "a_file"),
-			  "hello\n"),
-
-	    %% Create another non-empty directory.
-	    ?line ADirectory = filename:join(Base, "a_directory"),
-	    ?line ok = ?FILE_MODULE:make_dir(ADirectory),
-	    ?line ok = ?FILE_MODULE:write_file(
-			  filename:join(ADirectory, "a_file"),
-			  "howdy\n\n"),
-
-	    %% Create a data file.
-	    ?line File = filename:join(Base, "just_a_file"),
-	    ?line ok = ?FILE_MODULE:write_file(File, "anything goes\n\n"),
-	
-	    %% Move an existing directory to a non-empty directory.
-	    ?line {error, eexist} = 
-		?FILE_MODULE:rename(ADirectory, NonEmptyDir),
-
-	    %% Move a root directory.
-	    ?line {error, einval} = ?FILE_MODULE:rename("/", "arne"),
-
-	    %% Move Base into Base/new_name.
-	    ?line {error, einval} = 
-		?FILE_MODULE:rename(Base, filename:join(Base, "new_name")),
-
-	    %% Overwrite a directory with a file.
-	    ?line expect({error, eexist}, %FreeBSD (?)
-			 {error, eisdir},
-			 ?FILE_MODULE:rename(File, EmptyDir)),
-	    ?line expect({error, eexist}, %FreeBSD (?)
-			 {error, eisdir},
-			 ?FILE_MODULE:rename(File, NonEmptyDir)),
-
-	    %% Move a non-existing file.
-	    ?line NonExistingFile = 
-		filename:join(Base, "non_existing_file"),
-	    ?line {error, enoent} = 
-		?FILE_MODULE:rename(NonExistingFile, NonEmptyDir),
-
-	    %% Overwrite a file with a directory.
-	    ?line expect({error, eexist}, %FreeBSD (?)
-			 {error, enotdir},
-			 ?FILE_MODULE:rename(ADirectory, File)),
-	    
-	    %% Move a file to another filesystem.
-	    %% XXX - This test case is bogus. We cannot be guaranteed that
-	    %%       the source and destination are on 
-	    %%       different filesystems.
-	    %%
-	    %% XXX - Gross hack!
-	    ?line Comment = 
-		case os:type() of
-		    {unix, _} ->
-			OtherFs = "/tmp",
-			?line NameOnOtherFs =
-			    filename:join(OtherFs, filename:basename(File)),
-			?line {ok, Com} = 
-			    case ?FILE_MODULE:rename(File, NameOnOtherFs) of
-				{error, exdev} ->
-				    %% The file could be in 
-				    %% the same filesystem!
-				    {ok, ok};
-				    ok ->
-				    {ok, {comment, 
-					  "Moving between filesystems "
-					  "suceeded, files are probably "
-					  "in the same filesystem!"}};
-				{error, eperm} ->
-				    {ok, {comment, "SBS! You don't "
-					  "have the permission to do "
-					  "this test!"}};
-				Else ->
-				    Else
-			    end,
-			Com;
-		    {win32, _} ->
-			%% At least Windows NT can 
-			%% successfully move a file to
-			%% another drive.
-			ok
-		end,
-	    ?line [] = flush(),
-	    ?line test_server:timetrap_cancel(Dog),
-	    Comment
-    end.
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    RootDir = ?config(priv_dir, Config),
+    Base = filename:join(RootDir,
+	atom_to_list(?MODULE)++"_e_rename"),
+    ok = ?FILE_MODULE:make_dir(Base),
+
+    %% Create an empty directory.
+    EmptyDir = filename:join(Base, "empty_dir"),
+    ok = ?FILE_MODULE:make_dir(EmptyDir),
+
+    %% Create a non-empty directory.
+    NonEmptyDir = filename:join(Base, "non_empty_dir"),
+    ok = ?FILE_MODULE:make_dir(NonEmptyDir),
+    ok = ?FILE_MODULE:write_file(
+	filename:join(NonEmptyDir, "a_file"),
+	"hello\n"),
+
+    %% Create another non-empty directory.
+    ADirectory = filename:join(Base, "a_directory"),
+    ok = ?FILE_MODULE:make_dir(ADirectory),
+    ok = ?FILE_MODULE:write_file(
+	filename:join(ADirectory, "a_file"),
+	"howdy\n\n"),
+
+    %% Create a data file.
+    File = filename:join(Base, "just_a_file"),
+    ok = ?FILE_MODULE:write_file(File, "anything goes\n\n"),
+
+    %% Move an existing directory to a non-empty directory.
+    {error, eexist} = ?FILE_MODULE:rename(ADirectory, NonEmptyDir),
+
+    %% Move a root directory.
+    {error, einval} = ?FILE_MODULE:rename("/", "arne"),
+
+    %% Move Base into Base/new_name.
+    {error, einval} = 
+    ?FILE_MODULE:rename(Base, filename:join(Base, "new_name")),
+
+    %% Overwrite a directory with a file.
+    expect({error, eexist}, %FreeBSD (?)
+	{error, eisdir},
+	?FILE_MODULE:rename(File, EmptyDir)),
+    expect({error, eexist}, %FreeBSD (?)
+	{error, eisdir},
+	?FILE_MODULE:rename(File, NonEmptyDir)),
+
+    %% Move a non-existing file.
+    NonExistingFile = filename:join(Base, "non_existing_file"),
+    {error, enoent} = ?FILE_MODULE:rename(NonExistingFile, NonEmptyDir),
+
+    %% Overwrite a file with a directory.
+    expect({error, eexist}, %FreeBSD (?)
+	{error, enotdir},
+	?FILE_MODULE:rename(ADirectory, File)),
+
+    %% Move a file to another filesystem.
+    %% XXX - This test case is bogus. We cannot be guaranteed that
+    %%       the source and destination are on 
+    %%       different filesystems.
+    %%
+    %% XXX - Gross hack!
+    Comment = case os:type() of
+	{unix, _} ->
+	    OtherFs = "/tmp",
+	    NameOnOtherFs = filename:join(OtherFs, filename:basename(File)),
+	    {ok, Com} = case ?FILE_MODULE:rename(File, NameOnOtherFs) of
+		{error, exdev} ->
+		    %% The file could be in 
+		    %% the same filesystem!
+		    {ok, ok};
+		ok ->
+		    {ok, {comment, 
+			    "Moving between filesystems "
+			    "suceeded, files are probably "
+			    "in the same filesystem!"}};
+		{error, eperm} ->
+		    {ok, {comment, "SBS! You don't "
+			    "have the permission to do "
+			    "this test!"}};
+		Else ->
+		    Else
+	    end,
+	    Com;
+	{win32, _} ->
+	    %% At least Windows NT can 
+	    %% successfully move a file to
+	    %% another drive.
+	    ok
+    end,
+    [] = flush(),
+    test_server:timetrap_cancel(Dog),
+    Comment.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 e_make_dir(suite) -> [];
 e_make_dir(doc) -> [];
 e_make_dir(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line Base = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_e_make_dir"),
-    ?line ok = ?FILE_MODULE:make_dir(Base),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    RootDir = ?config(priv_dir, Config),
+    Base = filename:join(RootDir, 
+          	       atom_to_list(?MODULE)++"_e_make_dir"),
+    ok = ?FILE_MODULE:make_dir(Base),
 
     %% A component of the path does not exist.
-    ?line {error, enoent} = 
-	?FILE_MODULE:make_dir(filename:join([Base, "a", "b"])),
+    {error, enoent} = ?FILE_MODULE:make_dir(filename:join([Base, "a", "b"])),
 
     %% Use a path-name with a non-directory component.
-    ?line Afile = filename:join(Base, "a_directory"),
-    ?line ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
-    ?line case ?FILE_MODULE:make_dir(
-		  filename:join(Afile, "another_directory")) of
-	      {error, enotdir} -> io:format("Result: enotdir");
-	      {error, enoent} -> io:format("Result: enoent")
-	  end,
+    Afile = filename:join(Base, "a_directory"),
+    ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
+    case ?FILE_MODULE:make_dir(
+            filename:join(Afile, "another_directory")) of
+        {error, enotdir} -> io:format("Result: enotdir");
+        {error, enoent} -> io:format("Result: enoent")
+    end,
 
     %% No permission (on Unix only).
     case os:type() of
 	{unix, _} ->
-	    ?line ?FILE_MODULE:write_file_info(Base, #file_info {mode=0}),
-	    ?line {error, eacces} = 
-		?FILE_MODULE:make_dir(filename:join(Base, "xxxx")),
-	    ?line ?FILE_MODULE:write_file_info(
+	    ?FILE_MODULE:write_file_info(Base, #file_info {mode=0}),
+	    {error, eacces} = ?FILE_MODULE:make_dir(filename:join(Base, "xxxx")),
+	    ?FILE_MODULE:write_file_info(
 		     Base, #file_info {mode=8#600});
 	{win32, _} ->
-	    ok;
-	vxworks ->
 	    ok
     end,
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1950,57 +1928,50 @@ e_make_dir(Config) when is_list(Config) ->
 e_del_dir(suite) -> [];
 e_del_dir(doc) -> [];
 e_del_dir(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line Base = test_server:temp_name(filename:join(RootDir, "e_del_dir")),
-    ?line io:format("Base: ~p", [Base]),
-    ?line ok = ?FILE_MODULE:make_dir(Base),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    RootDir = ?config(priv_dir, Config),
+    Base = test_server:temp_name(filename:join(RootDir, "e_del_dir")),
+    io:format("Base: ~p", [Base]),
+    ok = ?FILE_MODULE:make_dir(Base),
 
     %% Delete a non-existent directory.
-    ?line {error, enoent} = 
+    {error, enoent} = 
 	?FILE_MODULE:del_dir(filename:join(Base, "non_existing")),
 
     %% Use a path-name with a non-directory component.
-    ?line Afile = filename:join(Base, "a_directory"),
-    ?line ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
-    ?line {error, E1} = 
-	expect({error, enotdir}, {error, enoent},
-	       ?FILE_MODULE:del_dir(
-		 filename:join(Afile, "another_directory"))),
-    ?line io:format("Result: ~p", [E1]),
+    Afile = filename:join(Base, "a_directory"),
+    ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
+    {error, E1} = expect({error, enotdir}, {error, enoent},
+	?FILE_MODULE:del_dir(
+	    filename:join(Afile, "another_directory"))),
+    io:format("Result: ~p", [E1]),
 
     %% Delete a non-empty directory.
-    ?line {error, E2} = 
-	expect({error, enotempty}, {error, eexist}, {error, eacces},
+    {error, E2} = expect({error, enotempty}, {error, eexist}, {error, eacces},
 	       ?FILE_MODULE:del_dir(Base)),
-    ?line io:format("Result: ~p", [E2]),
+    io:format("Result: ~p", [E2]),
 
     %% Remove the current directory.
-    ?line {error, E3} = 
-	expect({error, einval}, 
+    {error, E3} = expect({error, einval}, 
 	       {error, eperm}, % Linux and DUX
 	       {error, eacces},
 	       {error, ebusy},
 	       ?FILE_MODULE:del_dir(".")),
-    ?line io:format("Result: ~p", [E3]),
+    io:format("Result: ~p", [E3]),
 
     %% No permission.
     case os:type() of
 	{unix, _} ->
-	    ?line ADirectory = filename:join(Base, "no_perm"),
-	    ?line ok = ?FILE_MODULE:make_dir(ADirectory),
-	    ?line ?FILE_MODULE:write_file_info(
-		     Base, #file_info {mode=0}),
-	    ?line {error, eacces} = ?FILE_MODULE:del_dir(ADirectory),
-	    ?line ?FILE_MODULE:write_file_info(
-		     Base, #file_info {mode=8#600});
+	    ADirectory = filename:join(Base, "no_perm"),
+	    ok = ?FILE_MODULE:make_dir(ADirectory),
+	    ?FILE_MODULE:write_file_info( Base, #file_info {mode=0}),
+	    {error, eacces} = ?FILE_MODULE:del_dir(ADirectory),
+	    ?FILE_MODULE:write_file_info( Base, #file_info {mode=8#600});
 	{win32, _} ->
-	    ok;
-	vxworks ->
 	    ok
     end,
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2358,6 +2329,7 @@ symlinks(doc) -> "Test operations on symbolic links (for Unix).";
 symlinks(suite) -> [];
 symlinks(Config) when is_list(Config) ->
     ?line Dog = test_server:timetrap(test_server:seconds(10)),
+    ?line {error, _} = ?FILE_MODULE:read_link(lists:duplicate(10000,$a)),
     ?line RootDir = ?config(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
 				 atom_to_list(?MODULE)
@@ -2563,147 +2535,123 @@ delayed_write(doc) ->
     ["Tests the file open option {delayed_write, Size, Delay}"];
 
 delayed_write(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(20)),
-    %%
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line File = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_delayed_write.txt"),
-    ?line Data1 = "asdfghjkl",
-    ?line Data2 = "qwertyuio",
-    ?line Data3 = "zxcvbnm,.",
-    ?line Size = length(Data1),
-    ?line Size = length(Data2),
-    ?line Size = length(Data3),
-    ?line Data1Data1 = Data1++Data1,
-    ?line Data1Data1Data1 = Data1Data1++Data1,
-    ?line Data1Data1Data1Data1 = Data1Data1++Data1Data1,
+    Dog = ?t:timetrap(?t:seconds(20)),
+    
+    RootDir = ?config(priv_dir, Config),
+    File = filename:join(RootDir, 
+          	       atom_to_list(?MODULE)++"_delayed_write.txt"),
+    Data1 = "asdfghjkl",
+    Data2 = "qwertyuio",
+    Data3 = "zxcvbnm,.",
+    Size = length(Data1),
+    Size = length(Data2),
+    Size = length(Data3),
+    Data1Data1 = Data1++Data1,
+    Data1Data1Data1 = Data1Data1++Data1,
+    Data1Data1Data1Data1 = Data1Data1++Data1Data1,
     %%
     %% Test caching and normal close of non-raw file
-    ?line {ok, Fd1} = 
+    {ok, Fd1} = 
 	?FILE_MODULE:open(File, [write, {delayed_write, Size+1, 2000}]),
-    ?line ok = ?FILE_MODULE:write(Fd1, Data1),
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Fd2} = ?FILE_MODULE:open(File, [read]),
-    ?line case os:type() of
-	      vxworks -> 
-		  io:format("Line ~p skipped on vxworks", [?LINE]);
-	      _ ->
-		  ?line eof = ?FILE_MODULE:read(Fd2, 1)
-	  end,
-    ?line ok = ?FILE_MODULE:write(Fd1, Data1), % Data flush on size
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 2*Size+1),
-    ?line ok = ?FILE_MODULE:write(Fd1, Data1),
-    ?line ?t:sleep(3000), % Wait until data flush on timeout
-    ?line {ok, Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 3*Size+1),
-    ?line ok = ?FILE_MODULE:write(Fd1, Data1),
-    ?line ok = ?FILE_MODULE:close(Fd1), % Data flush on close
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Data1Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 4*Size+1),
-    ?line ok = ?FILE_MODULE:close(Fd2),
+    ok = ?FILE_MODULE:write(Fd1, Data1),
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Fd2} = ?FILE_MODULE:open(File, [read]),
+    eof = ?FILE_MODULE:read(Fd2, 1),
+    ok = ?FILE_MODULE:write(Fd1, Data1), % Data flush on size
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 2*Size+1),
+    ok = ?FILE_MODULE:write(Fd1, Data1),
+    ?t:sleep(3000), % Wait until data flush on timeout
+    {ok, Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 3*Size+1),
+    ok = ?FILE_MODULE:write(Fd1, Data1),
+    ok = ?FILE_MODULE:close(Fd1), % Data flush on close
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Data1Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 4*Size+1),
+    ok = ?FILE_MODULE:close(Fd2),
     %%
     %% Test implicit close through exit by file owning process, 
     %% raw file, default parameters.
-    ?line Parent = self(),
-    ?line Fun = 
-	fun () ->
-		Child = self(),
-		Test = 
-		    fun () ->
-			    ?line {ok, Fd} = 
-				?FILE_MODULE:open(File, 
-						  [raw, write, 
-						   delayed_write]),
-			    ?line ok = ?FILE_MODULE:write(Fd, Data1),
-			    ?line Parent ! {Child, wrote},
-			    ?line receive 
-				      {Parent, continue, Reason} -> 
-					  {ok, Reason}
-				  end
-		    end,
-		case (catch Test()) of
-		    {ok, Reason} ->
-			exit(Reason);
-		    Unknown ->
-			exit({Unknown, get(test_server_loc)})
-		end
-	end,
-    ?line Child1 = spawn(Fun),
-    ?line Mref1 = erlang:monitor(process, Child1),
-    ?line receive 
-	      {Child1, wrote} -> 
-		  ok;
-	      {'DOWN', Mref1, _, _, _} = Down1a ->
-		  ?t:fail(Down1a)
-	  end,
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Fd3} = ?FILE_MODULE:open(File, [read]),
-    ?line case os:type() of
-	      vxworks -> 
-		  io:format("Line ~p skipped on vxworks", [?LINE]);
-	      _ ->
-		  ?line eof = ?FILE_MODULE:read(Fd3, 1)
-	  end,
-    ?line Child1 ! {Parent, continue, normal},
-    ?line receive 
-	      {'DOWN', Mref1, process, Child1, normal} -> 
-		  ok;
-	      {'DOWN', Mref1, _, _, _} = Down1b ->
-		  ?t:fail(Down1b)
-	  end,
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Data1} = ?FILE_MODULE:pread(Fd3, bof, Size+1),
-    ?line ok = ?FILE_MODULE:close(Fd3),
+    Parent = self(),
+    Fun = fun() ->
+	    Child = self(),
+	    Test = 
+	    fun () ->
+		    {ok, Fd} = ?FILE_MODULE:open(File, 
+			[raw, write, delayed_write]),
+		    ok = ?FILE_MODULE:write(Fd, Data1),
+		    Parent ! {Child, wrote},
+		    receive 
+			{Parent, continue, Reason} -> 
+			    {ok, Reason}
+		    end
+	    end,
+	    case (catch Test()) of
+		{ok, Reason} -> exit(Reason);
+		Unknown ->
+		    exit({Unknown, get(test_server_loc)})
+	    end
+    end,
+    Child1 = spawn(Fun),
+    Mref1 = erlang:monitor(process, Child1),
+    receive 
+        {Child1, wrote} -> 
+            ok;
+        {'DOWN', Mref1, _, _, _} = Down1a ->
+            ?t:fail(Down1a)
+    end,
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Fd3} = ?FILE_MODULE:open(File, [read]),
+    eof = ?FILE_MODULE:read(Fd3, 1),
+    Child1 ! {Parent, continue, normal},
+    receive 
+        {'DOWN', Mref1, process, Child1, normal} -> 
+            ok;
+        {'DOWN', Mref1, _, _, _} = Down1b ->
+            ?t:fail(Down1b)
+    end,
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Data1} = ?FILE_MODULE:pread(Fd3, bof, Size+1),
+    ok = ?FILE_MODULE:close(Fd3),
     %%
     %% The same again, but this time with reason 'kill'.
-    ?line Child2 = spawn(Fun),
-    ?line Mref2 = erlang:monitor(process, Child2),
-    ?line receive 
-	      {Child2, wrote} -> 
-		  ok;
-	      {'DOWN', Mref2, _, _, _} = Down2a ->
-		  ?t:fail(Down2a)
-	  end,
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Fd4} = ?FILE_MODULE:open(File, [read]),
-    ?line case os:type() of
-	      vxworks -> 
-		  io:format("Line ~p skipped on vxworks", [?LINE]);
-	      _ ->
-		  ?line eof = ?FILE_MODULE:read(Fd4, 1)
-	  end,
-    ?line Child2 ! {Parent, continue, kill},
-    ?line receive 
-	      {'DOWN', Mref2, process, Child2, kill} -> 
-		  ok;
-	      {'DOWN', Mref2, _, _, _} = Down2b ->
-		  ?t:fail(Down2b)
-	  end,
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line eof = ?FILE_MODULE:pread(Fd4, bof, 1),
-    ?line ok = ?FILE_MODULE:close(Fd4),
+    Child2 = spawn(Fun),
+    Mref2 = erlang:monitor(process, Child2),
+    receive 
+        {Child2, wrote} -> 
+            ok;
+        {'DOWN', Mref2, _, _, _} = Down2a ->
+            ?t:fail(Down2a)
+    end,
+    ?t:sleep(1000), % Just in case the file system is slow
+    {ok, Fd4} = ?FILE_MODULE:open(File, [read]),
+    eof = ?FILE_MODULE:read(Fd4, 1),
+    Child2 ! {Parent, continue, kill},
+    receive 
+        {'DOWN', Mref2, process, Child2, kill} -> 
+            ok;
+        {'DOWN', Mref2, _, _, _} = Down2b ->
+            ?t:fail(Down2b)
+    end,
+    ?t:sleep(1000), % Just in case the file system is slow
+    eof = ?FILE_MODULE:pread(Fd4, bof, 1),
+    ok  = ?FILE_MODULE:close(Fd4),
     %%
     %% Test if file position works with delayed_write
-    ?line {ok, Fd5} = ?FILE_MODULE:open(File, [raw, read, write, 
-					       delayed_write]),
-    ?line ok = ?FILE_MODULE:truncate(Fd5),
-    ?line ok = ?FILE_MODULE:write(Fd5, [Data1|Data2]),
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
-    ?line ok = ?FILE_MODULE:write(Fd5, [Data3]),
-    ?line {ok, Data2} = ?FILE_MODULE:read(Fd5, Size+1),
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
-    ?line Data3Data2 = Data3++Data2,
-    ?line {ok, Data3Data2} = ?FILE_MODULE:read(Fd5, 2*Size+1),
-    ?line ok = ?FILE_MODULE:close(Fd5),
+    {ok, Fd5} = ?FILE_MODULE:open(File, [raw, read, write, 
+          			       delayed_write]),
+    ok = ?FILE_MODULE:truncate(Fd5),
+    ok = ?FILE_MODULE:write(Fd5, [Data1|Data2]),
+    {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
+    ok = ?FILE_MODULE:write(Fd5, [Data3]),
+    {ok, Data2} = ?FILE_MODULE:read(Fd5, Size+1),
+    {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
+    Data3Data2 = Data3++Data2,
+    {ok, Data3Data2} = ?FILE_MODULE:read(Fd5, 2*Size+1),
+    ok = ?FILE_MODULE:close(Fd5),
     %%
-    ?line [] = flush(),
-    ?line ?t:timetrap_cancel(Dog),
-    ?line case os:type() of
-	      vxworks -> 
-		  {comment, "Some lines skipped on vxworks"};
-	      _ ->
-		  ok
-	  end.
+    [] = flush(),
+    ?t:timetrap_cancel(Dog),
+    ok.
 
 
 pid2name(doc) -> "Tests file:pid2name/1.";
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
index 53bcb1162d..3aa010a708 100644
--- a/lib/kernel/test/file_name_SUITE.erl
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -74,7 +74,7 @@
 	 init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2, end_per_testcase/2]).
--export([normal/1,icky/1,very_icky/1,normalize/1]).
+-export([normal/1,icky/1,very_icky/1,normalize/1,home_dir/1]).
 
 
 init_per_testcase(_Func, Config) ->
@@ -88,7 +88,7 @@ end_per_testcase(_Func, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [normal, icky, very_icky, normalize].
+    [normal, icky, very_icky, normalize, home_dir].
 
 groups() -> 
     [].
@@ -105,6 +105,54 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
 	Config.
 
+home_dir(suite) ->
+    [];
+home_dir(doc) ->
+    ["Check that Erlang can be started with unicode named home directory"];
+home_dir(Config) when is_list(Config) ->
+    try
+	Name=[960,945,964,961,953,954],
+	Priv = ?config(priv_dir, Config),
+	UniMode = file:native_name_encoding() =/= latin1,
+	if 
+	    not UniMode ->
+		throw(need_unicode_mode);
+	    true ->
+		ok
+	end,
+	NewHome=filename:join(Priv,Name),
+	file:make_dir(NewHome),
+	{SaveOldName,SaveOldValue} = case os:type() of
+					 {win32,nt} ->
+					     HomePath=re:replace(filename:nativename(NewHome),"^[a-zA-Z]:","",[{return,list},unicode]),
+					     Save = os:getenv("HOMEPATH"),
+					     os:putenv("HOMEPATH",HomePath),
+					     {"HOMEPATH",Save};
+					 {unix,_} ->
+					     Save = os:getenv("HOME"),
+					     os:putenv("HOME",NewHome),
+					     {"HOME",Save};
+					 _ ->
+					     rm_rf(prim_file,NewHome),
+					     throw(unsupported_os)
+				     end,
+	try
+	    {ok,Node} = test_server:start_node(test_unicode_homedir,slave,[{args,"-setcookie "++atom_to_list(erlang:get_cookie())}]),
+	    test_server:stop_node(Node),
+	    ok
+	after
+	    os:putenv(SaveOldName,SaveOldValue),
+	    rm_rf(prim_file,NewHome)
+	end
+    catch
+	throw:need_unicode_mode ->
+	    io:format("Sorry, can only run in unicode mode.~n"),
+	    {skipped,"VM needs to be started in Unicode filename mode"};
+	throw:unsupported_os ->
+	    io:format("Sorry, can only run on Unix/Windows.~n"),
+	    {skipped,"Runs only on Unix/Windows"}
+    end.
+
 normalize(suite) ->
     [];
 normalize(doc) ->
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 8f490b6643..2a886b2efc 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -31,14 +31,24 @@
    [basic/1,
     api_open_close/1,api_listen/1,api_connect_init/1,api_opts/1,
     xfer_min/1,xfer_active/1,def_sndrcvinfo/1,implicit_inet6/1,
-    basic_stream/1, xfer_stream_min/1, peeloff/1, buffers/1]).
+    open_multihoming_ipv4_socket/1,
+    open_unihoming_ipv6_socket/1,
+    open_multihoming_ipv6_socket/1,
+    open_multihoming_ipv4_and_ipv6_socket/1,
+    basic_stream/1, xfer_stream_min/1, peeloff_active_once/1,
+    peeloff_active_true/1, buffers/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [basic, api_open_close, api_listen, api_connect_init,
      api_opts, xfer_min, xfer_active, def_sndrcvinfo, implicit_inet6,
-     basic_stream, xfer_stream_min, peeloff, buffers].
+     open_multihoming_ipv4_socket,
+     open_unihoming_ipv6_socket,
+     open_multihoming_ipv6_socket,
+     open_multihoming_ipv4_and_ipv6_socket,
+     basic_stream, xfer_stream_min, peeloff_active_once,
+     peeloff_active_true, buffers].
 
 groups() -> 
     [].
@@ -915,23 +925,34 @@ do_from_other_process(Fun) ->
     end.
 
 
+peeloff_active_once(doc) ->
+    "Peel off an SCTP stream socket ({active,once})";
+peeloff_active_once(suite) ->
+    [];
+
+peeloff_active_once(Config) ->
+    peeloff(Config, [{active,once}]).
 
-peeloff(doc) ->
-    "Peel off an SCTP stream socket";
-peeloff(suite) ->
+peeloff_active_true(doc) ->
+    "Peel off an SCTP stream socket ({active,true})";
+peeloff_active_true(suite) ->
     [];
-peeloff(Config) when is_list(Config) ->
+
+peeloff_active_true(Config) ->
+    peeloff(Config, [{active,true}]).
+
+peeloff(Config, SockOpts) when is_list(Config) ->
     ?line Addr = {127,0,0,1},
     ?line Stream = 0,
     ?line Timeout = 333,
-    ?line S1 = socket_open([{ifaddr,Addr}], Timeout),
+    ?line S1 = socket_open([{ifaddr,Addr}|SockOpts], Timeout),
     ?line ?LOGVAR(S1),
     ?line P1 = socket_call(S1, get_port),
     ?line ?LOGVAR(P1),
     ?line Socket1 = socket_call(S1, get_socket),
     ?line ?LOGVAR(Socket1),
     ?line socket_call(S1, {listen,true}),
-    ?line S2 = socket_open([{ifaddr,Addr}], Timeout),
+    ?line S2 = socket_open([{ifaddr,Addr}|SockOpts], Timeout),
     ?line ?LOGVAR(S2),
     ?line P2 = socket_call(S2, get_port),
     ?line ?LOGVAR(P2),
@@ -975,7 +996,7 @@ peeloff(Config) when is_list(Config) ->
 		socket_bailout([S1,S2])
 	end,
     %%
-    ?line S3 = socket_peeloff(Socket1, S1Ai, Timeout),
+    ?line S3 = socket_peeloff(Socket1, S1Ai, SockOpts, Timeout),
     ?line ?LOGVAR(S3),
     ?line P3_X = socket_call(S3, get_port),
     ?line ?LOGVAR(P3_X),
@@ -1105,11 +1126,204 @@ mk_data(N, Bytes, Bin) when N < Bytes ->
 mk_data(_, _, Bin) ->
     Bin.
 
+
+
+open_multihoming_ipv4_socket(doc) ->
+    "Test opening a multihoming ipv4 socket";
+open_multihoming_ipv4_socket(suite) ->
+    [];
+open_multihoming_ipv4_socket(Config) when is_list(Config) ->
+    ?line case get_addrs_by_family(inet, 2) of
+	      {ok, [Addr1, Addr2]} ->
+		  ?line do_open_and_connect([Addr1, Addr2], Addr1);
+	      {error, Reason} ->
+		  {skip, Reason}
+	  end.
+
+open_unihoming_ipv6_socket(doc) ->
+    %% This test is mostly aimed to indicate
+    %% whether host has a non-working ipv6 setup
+    "Test opening a unihoming (non-multihoming) ipv6 socket";
+open_unihoming_ipv6_socket(suite) ->
+    [];
+open_unihoming_ipv6_socket(Config) when is_list(Config) ->
+    ?line case get_addrs_by_family(inet6, 1) of
+	      {ok, [Addr]} ->
+		  ?line do_open_and_connect([Addr], Addr);
+	      {error, Reason} ->
+		  {skip, Reason}
+	  end.
+
+
+open_multihoming_ipv6_socket(doc) ->
+    "Test opening a multihoming ipv6 socket";
+open_multihoming_ipv6_socket(suite) ->
+    [];
+open_multihoming_ipv6_socket(Config) when is_list(Config) ->
+    ?line case get_addrs_by_family(inet6, 2) of
+	      {ok, [Addr1, Addr2]} ->
+		  ?line do_open_and_connect([Addr1, Addr2], Addr1);
+	      {error, Reason} ->
+		  {skip, Reason}
+	  end.
+
+open_multihoming_ipv4_and_ipv6_socket(doc) ->
+    "Test opening a multihoming ipv6 socket with ipv4 and ipv6 addresses";
+open_multihoming_ipv4_and_ipv6_socket(suite) ->
+    [];
+open_multihoming_ipv4_and_ipv6_socket(Config) when is_list(Config) ->
+    ?line case get_addrs_by_family(inet_and_inet6, 2) of
+	      {ok, [[InetAddr1, InetAddr2], [Inet6Addr1, Inet6Addr2]]} ->
+		  %% Connect to the first address to test bind
+		  ?line do_open_and_connect([InetAddr1, Inet6Addr1, InetAddr2],
+					    InetAddr1),
+		  ?line do_open_and_connect([Inet6Addr1, InetAddr1],
+					    Inet6Addr1),
+
+		  %% Connect an address, not the first,
+		  %% to test sctp_bindx
+		  ?line do_open_and_connect([Inet6Addr1, Inet6Addr2, InetAddr1],
+					    Inet6Addr2),
+		  ?line do_open_and_connect([Inet6Addr1, Inet6Addr2, InetAddr1],
+					    InetAddr1);
+	      {error, Reason} ->
+		  {skip, Reason}
+	  end.
+
+
+get_addrs_by_family(Family, NumAddrs) ->
+    case os:type() of
+	{unix,linux} ->
+	    get_addrs_by_family_aux(Family, NumAddrs);
+	{unix,freebsd} ->
+	    get_addrs_by_family_aux(Family, NumAddrs);
+	{unix,sunos} ->
+	    case get_addrs_by_family_aux(Family, NumAddrs) of
+		{ok, [InetAddrs, Inet6Addrs]} when Family =:= inet_and_inet6 ->
+		    %% Man page for sctp_bindx on Solaris says: "If sock is an
+		    %% Internet Protocol Version 6 (IPv6) socket, addrs should
+		    %% be an array of sockaddr_in6 structures containing IPv6
+		    %% or IPv4-mapped IPv6 addresses."
+		    {ok, [ipv4_map_addrs(InetAddrs), Inet6Addrs]};
+		{ok, Addrs} ->
+		    {ok, Addrs};
+		{error, Reason} ->
+		    {error, Reason}
+	    end;
+	Os ->
+	    Reason = if Family =:= inet_and_inet6 ->
+			     f("Mixing ipv4 and ipv6 addresses for multihoming "
+			       " has not been verified on ~p", [Os]);
+			true ->
+			     f("Multihoming for ~p has not been verified on ~p",
+			       [Family, Os])
+		     end,
+	    {error, Reason}
+    end.
+
+get_addrs_by_family_aux(Family, NumAddrs) when Family =:= inet;
+					       Family =:= inet6 ->
+    ?line
+	case inet:getaddr(localhost, Family) of
+	    {error,eafnosupport} ->
+		{skip, f("No support for ~p", Family)};
+	    {ok, _} ->
+		?line IfAddrs = ok(inet:getifaddrs()),
+		?line case filter_addrs_by_family(IfAddrs, Family) of
+			  Addrs when length(Addrs) >= NumAddrs ->
+			      {ok, lists:sublist(Addrs, NumAddrs)};
+			  [] ->
+			      {error, f("Need ~p ~p address(es) found none~n",
+					[NumAddrs, Family])};
+			  Addrs ->
+			      {error,
+			       f("Need ~p ~p address(es) found only ~p: ~p~n",
+				 [NumAddrs, Family, length(Addrs), Addrs])}
+		      end
+	end;
+get_addrs_by_family_aux(inet_and_inet6, NumAddrs) ->
+    ?line catch {ok, [case get_addrs_by_family_aux(Family, NumAddrs) of
+			  {ok, Addrs}     -> Addrs;
+			  {error, Reason} -> throw({error, Reason})
+		      end || Family <- [inet, inet6]]}.
+
+filter_addrs_by_family(IfAddrs, Family) ->
+    lists:flatten([[Addr || {addr, Addr} <- Info,
+			    is_good_addr(Addr, Family)]
+		   || {_IfName, Info} <- IfAddrs]).
+
+is_good_addr(Addr, inet) when tuple_size(Addr) =:= 4 ->
+    true;
+is_good_addr({0,0,0,0,0,16#ffff,_,_}, inet6) ->
+    false; %% ipv4 mapped
+is_good_addr({16#fe80,_,_,_,_,_,_,_}, inet6) ->
+    false; %% link-local
+is_good_addr(Addr, inet6) when tuple_size(Addr) =:= 8 ->
+    true;
+is_good_addr(_Addr, _Family) ->
+    false.
+
+ipv4_map_addrs(InetAddrs) ->
+    [begin
+	 <<AB:16>> = <<A,B>>,
+	 <<CD:16>> = <<C,D>>,
+	 {0, 0, 0, 0, 0, 16#ffff, AB, CD}
+     end || {A,B,C,D} <- InetAddrs].
+
+f(F, A) ->
+    lists:flatten(io_lib:format(F, A)).
+
+do_open_and_connect(ServerAddresses, AddressToConnectTo) ->
+    ?line ServerFamily = get_family_by_addrs(ServerAddresses),
+    ?line io:format("Serving ~p addresses: ~p~n",
+		    [ServerFamily, ServerAddresses]),
+    ?line S1 = ok(gen_sctp:open(0, [{ip,Addr} || Addr <- ServerAddresses] ++
+				    [ServerFamily])),
+    ?line ok = gen_sctp:listen(S1, true),
+    ?line P1 = ok(inet:port(S1)),
+    ?line ClientFamily = get_family_by_addr(AddressToConnectTo),
+    ?line io:format("Connecting to ~p ~p~n",
+		    [ClientFamily, AddressToConnectTo]),
+    ?line S2 = ok(gen_sctp:open(0, [ClientFamily])),
+    %% Verify client can connect
+    ?line #sctp_assoc_change{state=comm_up} =
+	ok(gen_sctp:connect(S2, AddressToConnectTo, P1, [])),
+    %% verify server side also receives comm_up from client
+    ?line recv_comm_up_eventually(S1),
+    ?line ok = gen_sctp:close(S2),
+    ?line ok = gen_sctp:close(S1).
+
+%% If at least one of the addresses is an ipv6 address, return inet6, else inet.
+get_family_by_addrs(Addresses) ->
+    ?line case lists:usort([get_family_by_addr(Addr) || Addr <- Addresses]) of
+	      [inet, inet6] -> inet6;
+	      [inet]        -> inet;
+	      [inet6]       -> inet6
+	  end.
+
+get_family_by_addr(Addr) when tuple_size(Addr) =:= 4 -> inet;
+get_family_by_addr(Addr) when tuple_size(Addr) =:= 8 -> inet6.
+
+recv_comm_up_eventually(S) ->
+    ?line case ok(gen_sctp:recv(S)) of
+	      {_Addr, _Port, _Info, #sctp_assoc_change{state=comm_up}} ->
+		  ok;
+	      {_Addr, _Port, _Info, _OtherSctpMsg} ->
+		  ?line recv_comm_up_eventually(S)
+	  end.
+
 %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% socket gen_server ultra light
 
-socket_open(SocketOpts, Timeout) ->
-    Opts = [{type,seqpacket},{active,once},binary|SocketOpts],
+socket_open(SockOpts0, Timeout) ->
+    SockOpts =
+	case lists:keyfind(active,1,SockOpts0) of
+	    false ->
+		[{active,once}|SockOpts0];
+	    _ ->
+		SockOpts0
+	end,
+    Opts = [{type,seqpacket},binary|SockOpts],
     Starter =
 	fun () ->
 		{ok,Socket} =
@@ -1118,8 +1332,8 @@ socket_open(SocketOpts, Timeout) ->
 	end,
     s_start(Starter, Timeout).
 
-socket_peeloff(Socket, AssocId, Timeout) ->
-    Opts = [{active,once},binary],
+socket_peeloff(Socket, AssocId, SocketOpts, Timeout) ->
+    Opts = [binary|SocketOpts],
     Starter =
 	fun () ->
 		{ok,NewSocket} =
diff --git a/lib/kernel/test/gen_tcp_echo_SUITE.erl b/lib/kernel/test/gen_tcp_echo_SUITE.erl
index 5bbaeb02ad..94f95798a0 100644
--- a/lib/kernel/test/gen_tcp_echo_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_echo_SUITE.erl
@@ -190,24 +190,19 @@ echo_test_1(SockOpts, EchoFun, Config0) ->
     ok.
 
 echo_packet(SockOpts, EchoFun, Opts) ->
-    ?line Type =
-	case lists:keysearch(type, 1, Opts) of
-	    {value, {type, T}} ->
-		T;
-	    _ ->
-		{value, {packet, T}} = lists:keysearch(packet, 1, SockOpts),
-		T
-	end,
+    Type = case lists:keysearch(type, 1, Opts) of
+	{value, {type, T}} ->
+	    T;
+	_ ->
+	    {value, {packet, T}} = lists:keysearch(packet, 1, SockOpts),
+	    T
+    end,
 
     %% Connect to the echo server.
-    ?line EchoPort = ?config(echo_port, Opts),
-    ?line {ok, Echo} = gen_tcp:connect(localhost, EchoPort, SockOpts),
+    EchoPort = ?config(echo_port, Opts),
+    {ok, Echo} = gen_tcp:connect(localhost, EchoPort, SockOpts),
 
-    ?line SlowEcho = 
-	case os:type() of
-	    vxworks -> true;
-	    _ -> lists:member(slow_echo, Opts)
-	end,
+    SlowEcho = lists:member(slow_echo, Opts),
 
     case Type of
 	http ->
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index c74a258af9..5d45b91ee5 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -24,7 +24,8 @@
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
-	 controlling_process/1, no_accept/1, close_with_pending_output/1,
+	 controlling_process/1, controlling_process_self/1,
+	 no_accept/1, close_with_pending_output/1,
 	 data_before_close/1, iter_max_socks/1, get_status/1,
 	 passive_sockets/1, accept_closed_by_other_process/1,
 	 init_per_testcase/2, end_per_testcase/2,
@@ -58,7 +59,7 @@ end_per_testcase(_Func, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [controlling_process, no_accept,
+    [controlling_process, controlling_process_self, no_accept,
      close_with_pending_output, data_before_close,
      iter_max_socks, passive_sockets,
      accept_closed_by_other_process, otp_3924, closed_socket,
@@ -307,45 +308,55 @@ not_owner(S) ->
 	    ok
     end.
 
+controlling_process_self(doc) ->
+    ["Open a listen port and assign the controlling process to "
+     "it self, then exit and make sure the port is closed properly."];
+controlling_process_self(Config) when is_list(Config) ->
+    S = self(),
+    process_flag(trap_exit,true),
+    spawn_link(fun() ->
+		       {ok,Sock} = gen_tcp:listen(0,[]),
+		       S ! {socket, Sock},
+		       ok = gen_tcp:controlling_process(Sock,self()),
+		       S ! done
+	       end),
+    receive
+	done ->
+	    receive
+		{socket,Sock} ->
+		    process_flag(trap_exit,false),
+		    %% Make sure the port is invalid after process crash
+		    {error,einval} = inet:port(Sock)
+	    end;
+	Msg when element(1,Msg) /= socket ->
+	    process_flag(trap_exit,false),
+	    exit({unknown_msg,Msg})
+    end.
+    
+
 no_accept(doc) ->
     ["Open a listen port and connect to it, then close the listen port ",
      "without doing any accept.  The connected socket should receive ",
      "a tcp_closed message."];
 no_accept(suite) -> [];
 no_accept(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skip,"Too tough for vxworks"};
-	_ ->
-	    no_accept2()
+    {ok, L} = gen_tcp:listen(0, []),
+    {ok, {_, Port}} = inet:sockname(L),
+    {ok, Client} = gen_tcp:connect(localhost, Port, []),
+    ok = gen_tcp:close(L),
+    receive
+        {tcp_closed, Client} ->
+            ok
+    after 5000 ->
+            ?line test_server:fail(never_closed)
+    
     end.
 
-no_accept2() ->
-    ?line {ok, L} = gen_tcp:listen(0, []),
-    ?line {ok, {_, Port}} = inet:sockname(L),
-    ?line {ok, Client} = gen_tcp:connect(localhost, Port, []),
-    ?line ok = gen_tcp:close(L),
-    ?line receive
-	      {tcp_closed, Client} ->
-		  ok
-	  after 5000 ->
-		  ?line test_server:fail(never_closed)
-	  
-	  end.
-
 close_with_pending_output(doc) ->
     ["Send several packets to a socket and close it.  All packets should arrive ",
      "to the other end."];
 close_with_pending_output(suite) -> [];
 close_with_pending_output(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skipped,"Too tough for vxworks"};
-	_ ->
-	    close_with_pending_output2()
-    end.
-
-close_with_pending_output2() ->
     ?line {ok, L} = gen_tcp:listen(0, [binary, {active, false}]),
     ?line {ok, {_, Port}} = inet:sockname(L),
     ?line Packets = 16,
@@ -396,22 +407,16 @@ otp_3924(doc) ->
 otp_3924(suite) -> [];
 otp_3924(Config) when is_list(Config) ->
     MaxDelay = (case has_superfluous_schedulers() of
-		    true -> 4;
-		    false -> 1
-		end
-		* case {erlang:system_info(debug_compiled),
-			erlang:system_info(lock_checking)} of
-		      {true, _} -> 6;
-		      {_, true} -> 2;
-		      _ -> 1
-		  end * ?OTP_3924_MAX_DELAY),
-    case os:type() of
-	vxworks ->
-%%	    {skip,"Too tough for vxworks"};
-	    otp_3924_1(MaxDelay);
-	_ ->
-	    otp_3924_1(MaxDelay)
-    end.
+	    true -> 4;
+	    false -> 1
+	end
+	* case {erlang:system_info(debug_compiled),
+		erlang:system_info(lock_checking)} of
+	    {true, _} -> 6;
+	    {_, true} -> 2;
+	    _ -> 1
+	end * ?OTP_3924_MAX_DELAY),
+    otp_3924_1(MaxDelay).
 
 otp_3924_1(MaxDelay) ->
     Dog = test_server:timetrap(test_server:seconds(240)),
@@ -532,26 +537,18 @@ otp_3924_sender(Receiver, Host, Port, Data) ->
 data_before_close(doc) ->
     ["Tests that a huge amount of data can be received before a close."];
 data_before_close(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skip,"Too tough for vxworks"};
-	_ ->
-	    data_before_close2()
-    end.
-
-data_before_close2() ->
-    ?line {ok, L} = gen_tcp:listen(0, [binary]),
-    ?line {ok, {_, TcpPort}} = inet:sockname(L),
-    ?line Bytes = 256*1024,
-    ?line spawn_link(fun() -> huge_sender(TcpPort, Bytes) end),
-    ?line {ok, A} = gen_tcp:accept(L),
-    ?line case count_bytes_recv(A, 0) of
-	      {Bytes, Result} ->
-		  io:format("Result: ~p", [Result]);
-	      {Wrong, Result} ->
-		  io:format("Result: ~p", [Result]),
-		  test_server:fail({wrong_count, Wrong})
-	  end,
+    {ok, L} = gen_tcp:listen(0, [binary]),
+    {ok, {_, TcpPort}} = inet:sockname(L),
+    Bytes = 256*1024,
+    spawn_link(fun() -> huge_sender(TcpPort, Bytes) end),
+    {ok, A} = gen_tcp:accept(L),
+    case count_bytes_recv(A, 0) of
+        {Bytes, Result} ->
+            io:format("Result: ~p", [Result]);
+        {Wrong, Result} ->
+            io:format("Result: ~p", [Result]),
+            test_server:fail({wrong_count, Wrong})
+    end,
     ok.
 
 count_bytes_recv(Sock, Total) ->
@@ -584,32 +581,18 @@ get_status(Config) when is_list(Config) ->
     ?line {ok,{socket,Pid,_,_}} = gen_tcp:listen(5678,[]),
     ?line {status,Pid,_,_} = sys:get_status(Pid).
 
+-define(RECOVER_SLEEP, 60000).
+-define(RETRY_SLEEP, 15000).
+
 iter_max_socks(doc) ->
     ["Open as many sockets as possible. Do this several times and check ",
      "that we get the same number of sockets every time."];
 iter_max_socks(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skip,"Too tough for vxworks"};
-	_ ->
-	    iter_max_socks2()
-    end.
-
--define(RECOVER_SLEEP, 60000).
--define(RETRY_SLEEP, 15000).
-
-iter_max_socks2() ->
-    ?line N = 
-	case os:type() of
-	    vxworks ->
-		10;
-	    _ ->
-		20
-	end,
+    N = 20,
     L = do_iter_max_socks(N, initalize),
-    ?line io:format("Result: ~p",[L]),
-    ?line all_equal(L),
-    ?line {comment, "Max sockets: " ++ integer_to_list(hd(L))}.
+    io:format("Result: ~p",[L]),
+    all_equal(L),
+    {comment, "Max sockets: " ++ integer_to_list(hd(L))}.
 
 do_iter_max_socks(0, _) ->
     [];
@@ -2044,7 +2027,7 @@ send_timeout_active(Config) when is_list(Config) ->
 		?line {error,timeout} = 
 		    Loop(fun() ->
 				 receive
-				     {tcp, Sock, _Data} ->
+				     {tcp, _Sock, _Data} ->
 					 inet:setopts(A, [{active, once}]),
 					 Res = gen_tcp:send(A,lists:duplicate(1000, $a)),
 					 %erlang:display(Res),
@@ -2536,7 +2519,7 @@ otp_8102_do(LSocket, PortNum, {Bin,PType}) ->
 otp_9389(doc) -> ["Verify packet_size handles long HTTP header lines"];
 otp_9389(suite) -> [];
 otp_9389(Config) when is_list(Config) ->
-    ?line {ok, LS} = gen_tcp:listen(0, []),
+    ?line {ok, LS} = gen_tcp:listen(0, [{active,false}]),
     ?line {ok, {_, PortNum}} = inet:sockname(LS),
     io:format("Listening on ~w with port number ~p\n", [LS, PortNum]),
     OrigLinkHdr = "/" ++ string:chars($S, 8192),
diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl
index 631a544a21..b40c50f79f 100644
--- a/lib/kernel/test/global_SUITE.erl
+++ b/lib/kernel/test/global_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -168,7 +168,7 @@ end_per_testcase(_Case, Config) ->
 register_1(suite) -> [];
 register_1(Config) when is_list(Config) ->
     Timeout = 15,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),
     P = spawn_link(?MODULE, lock_global, [self(), Config]),
@@ -195,7 +195,6 @@ register_1(Config) when is_list(Config) ->
     ?line _ = global:unregister_name(foo),
     write_high_level_trace(Config),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 lock_global(Parent, Config) ->
@@ -238,7 +237,7 @@ lock_global(Parent, Config) ->
 both_known_1(suite) -> [];
 both_known_1(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),
 
@@ -316,7 +315,6 @@ both_known_1(Config) when is_list(Config) ->
     stop_node(Cp3),
 
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 lost_unregister(suite) -> [];
@@ -324,7 +322,7 @@ lost_unregister(doc) ->
     ["OTP-6428. An unregistered name reappears."];
 lost_unregister(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),
 
@@ -361,7 +359,6 @@ lost_unregister(Config) when is_list(Config) ->
     stop_node(B),
     stop_node(C),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 -define(UNTIL_LOOP, 300).
@@ -448,7 +445,7 @@ lock_global2(Id, Parent) ->
 names(suite) -> [];
 names(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),
     ?line OrigNames = global:registered_names(),
@@ -532,7 +529,6 @@ names(Config) when is_list(Config) ->
 
     ?line ?UNTIL(undefined =:= global:whereis_name(test)),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 names_hidden(suite) -> [];
@@ -541,7 +537,7 @@ names_hidden(doc) ->
      "visible nodes."];
 names_hidden(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -639,13 +635,12 @@ names_hidden(Config) when is_list(Config) ->
     stop_node(Cp3),
 
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 locks(suite) -> [];
 locks(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line {ok, Cp1} = start_node(cp1, Config),
@@ -750,7 +745,6 @@ locks(Config) when is_list(Config) ->
     ?line test_server:sleep(10),
 
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
     
 
@@ -760,7 +754,7 @@ locks_hidden(doc) ->
      "visible nodes."];
 locks_hidden(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNodes = nodes(),
@@ -833,14 +827,13 @@ locks_hidden(Config) when is_list(Config) ->
     stop_node(Cp3),
 
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
     
 
 bad_input(suite) -> [];
 bad_input(Config) when is_list(Config) ->
     Timeout = 15,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     Pid = whereis(global_name_server),
@@ -854,13 +847,12 @@ bad_input(Config) when is_list(Config) ->
     ?line {'EXIT', _} = (catch global:trans({id, self()}, {m,f}, [node()], -1)),
     ?line Pid = whereis(global_name_server),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 names_and_locks(suite) -> [];
 names_and_locks(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -922,7 +914,6 @@ names_and_locks(Config) when is_list(Config) ->
     stop_node(Cp3),
 
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
     
 lock_die(suite) -> [];
@@ -930,7 +921,7 @@ lock_die(doc) ->
     ["OTP-6341. Remove locks using monitors."];
 lock_die(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -964,7 +955,6 @@ lock_die(Config) when is_list(Config) ->
     stop_node(Cp1),
     stop_node(Cp2),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 name_die(suite) -> [];
@@ -972,7 +962,7 @@ name_die(doc) ->
     ["OTP-6341. Remove names using monitors."];
 name_die(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -1027,7 +1017,6 @@ name_die(Config) when is_list(Config) ->
     write_high_level_trace(Config),
     stop_nodes(Cps),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 kill_pid(Pid, File, Config) ->
@@ -1040,7 +1029,7 @@ basic_partition(doc) ->
     ["Tests that two partitioned networks exchange correct info."];
 basic_partition(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -1088,7 +1077,6 @@ basic_partition(Config) when is_list(Config) ->
     stop_node(Cp2),
     stop_node(Cp3),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 basic_name_partition(suite) ->
@@ -1099,7 +1087,7 @@ basic_name_partition(doc) ->
      "during connect phase are handled correctly."];
 basic_name_partition(Config) when is_list(Config) ->
     Timeout = 60,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -1167,7 +1155,6 @@ basic_name_partition(Config) when is_list(Config) ->
     stop_node(Cp2),
     stop_node(Cp3),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 %Peer nodes cp0 - cp6 are started. Break apart the connections from
@@ -1190,7 +1177,7 @@ advanced_partition(doc) ->
      "partitioned networks connect."];
 advanced_partition(Config) when is_list(Config) ->
     Timeout = 60,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -1278,7 +1265,6 @@ advanced_partition(Config) when is_list(Config) ->
     stop_node(Cp5),
     stop_node(Cp6),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
     
 %Peer nodes cp0 - cp6 are started, and partitioned just like in
@@ -1297,7 +1283,7 @@ stress_partition(doc) ->
      "go up/down a bit."];
 stress_partition(Config) when is_list(Config) ->
     Timeout = 90,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -1377,7 +1363,6 @@ stress_partition(Config) when is_list(Config) ->
     stop_node(Cp7),
     stop_node(Cp8),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 
@@ -1408,7 +1393,7 @@ ring(doc) ->
      "Make sure that there's just one winner."];
 ring(Config) when is_list(Config) ->
     Timeout = 60,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -1486,7 +1471,6 @@ ring(Config) when is_list(Config) ->
     stop_node(Cp7),
     stop_node(Cp8),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 simple_ring(suite) ->
@@ -1499,7 +1483,7 @@ simple_ring(doc) ->
      "Make sure that there's just one winner."];
 simple_ring(Config) when is_list(Config) ->
     Timeout = 60,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -1565,7 +1549,6 @@ simple_ring(Config) when is_list(Config) ->
     stop_node(Cp4),
     stop_node(Cp5),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 line(suite) ->
@@ -1576,7 +1559,7 @@ line(doc) ->
      "Make sure that there's just one winner."];
 line(Config) when is_list(Config) ->
     Timeout = 60,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -1655,7 +1638,6 @@ line(Config) when is_list(Config) ->
     stop_node(Cp7),
     stop_node(Cp8),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 
@@ -1669,7 +1651,7 @@ simple_line(doc) ->
      "Make sure that there's just one winner."];
 simple_line(Config) when is_list(Config) ->
     Timeout = 60,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -1735,7 +1717,6 @@ simple_line(Config) when is_list(Config) ->
     stop_node(Cp4),
     stop_node(Cp5),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
     
 otp_1849(suite) -> [];
@@ -1743,7 +1724,7 @@ otp_1849(doc) ->
     ["Test ticket: Global should keep track of all pids that set the same lock."];
 otp_1849(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line {ok, Cp1} = start_node(cp1, Config),
@@ -1822,7 +1803,6 @@ otp_1849(Config) when is_list(Config) ->
     stop_node(Cp2),
     stop_node(Cp3),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
     
 
@@ -1840,7 +1820,7 @@ otp_3162(Config) when is_list(Config) ->
 
 do_otp_3162(StartFun, Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line [Cp1, Cp2, Cp3] = StartFun(),
@@ -1898,7 +1878,6 @@ do_otp_3162(StartFun, Config) ->
     stop_node(Cp2),
     stop_node(Cp3),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
     
 
@@ -1907,7 +1886,7 @@ otp_5640(doc) ->
     ["OTP-5640. 'allow' multiple names for registered processes."];
 otp_5640(Config) when is_list(Config) ->
     Timeout = 25,
-    ?line Dog = test_server:timetrap(test_server:seconds(Timeout)),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     init_condition(Config),
     ?line {ok, B} = start_node(b, Config),
@@ -1965,7 +1944,6 @@ otp_5640(Config) when is_list(Config) ->
     write_high_level_trace(Config),
     stop_node(B),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 otp_5640_proc(_Parent) ->
@@ -1979,7 +1957,7 @@ otp_5737(doc) ->
     ["OTP-5737. set_lock/3 and trans/4 accept Retries = 0."];
 otp_5737(Config) when is_list(Config) ->
     Timeout = 25,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
 
@@ -2000,7 +1978,6 @@ otp_5737(Config) when is_list(Config) ->
 
     write_high_level_trace(Config),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 otp_6931(suite) -> [];
@@ -2025,7 +2002,7 @@ simple_disconnect(suite) -> [];
 simple_disconnect(doc) -> ["OTP-5563. Disconnected nodes (not partitions)"];
 simple_disconnect(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -2075,7 +2052,6 @@ simple_disconnect(Config) when is_list(Config) ->
     write_high_level_trace(Config),
     stop_nodes(Cps),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 %% Not used right now.
@@ -2118,7 +2094,7 @@ simple_resolve(suite) -> [];
 simple_resolve(doc) -> ["OTP-5563. Partitions and names."];
 simple_resolve(Config) when is_list(Config) ->
     Timeout = 360,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -2245,7 +2221,6 @@ simple_resolve(Config) when is_list(Config) ->
     write_high_level_trace(Config),
     stop_nodes(Cps),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 simple_resolve2(suite) -> [];
@@ -2255,7 +2230,7 @@ simple_resolve2(Config) when is_list(Config) ->
     %% always work to re-start z_2. "Cannot be a global bug."
 
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -2283,7 +2258,6 @@ simple_resolve2(Config) when is_list(Config) ->
     write_high_level_trace(Config),
     stop_nodes(Cps), % Not all nodes may be present, but it works anyway.
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 simple_resolve3(suite) -> [];
@@ -2292,7 +2266,7 @@ simple_resolve3(Config) when is_list(Config) ->
     %% Continuation of simple_resolve.
 
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -2320,7 +2294,6 @@ simple_resolve3(Config) when is_list(Config) ->
     write_high_level_trace(Config),
     stop_nodes(Cps), % Not all nodes may be present, but it works anyway.
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 res({Res,Resolver}, [N1, A2, Z2], Cf) ->
@@ -2504,7 +2477,7 @@ leftover_name(suite) -> [];
 leftover_name(doc) -> ["OTP-5563. Bug: nodedown while synching."];
 leftover_name(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -2565,7 +2538,6 @@ leftover_name(Config) when is_list(Config) ->
     write_high_level_trace(Config),
     stop_nodes(Cps),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 %% Runs on n_1
@@ -2604,7 +2576,7 @@ re_register_name(Config) when is_list(Config) ->
     %% occupied by links, that's all.
     %% Later: now monitors are checked.
     Timeout = 15,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     Me = self(),
@@ -2618,7 +2590,6 @@ re_register_name(Config) when is_list(Config) ->
     receive {Pid2, MonitoredBy2} -> [_] = MonitoredBy2 end,
     ?line _ = global:unregister_name(name),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 proc(Parent) ->
@@ -2652,7 +2623,7 @@ do_name_exit(StartFun, Version, Config) ->
     %% The current release uses monitors so this test is not so relevant.
 
     Timeout = 60,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -2692,7 +2663,6 @@ do_name_exit(StartFun, Version, Config) ->
     write_high_level_trace(Config),
     stop_nodes(Cps),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 long_lock(Parent) ->
@@ -2709,7 +2679,7 @@ external_nodes(suite) -> [];
 external_nodes(doc) -> ["OTP-5563. External nodes (cnodes)."];
 external_nodes(Config) when is_list(Config) ->
     Timeout = 30,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -2793,7 +2763,6 @@ external_nodes(Config) when is_list(Config) ->
     ?line ?UNTIL(length(get_ext_names()) =:= 0),
 
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 get_ext_names() ->
@@ -2845,8 +2814,8 @@ many_nodes(suite) ->
 many_nodes(doc) ->
     ["OTP-5770. Start many nodes. Make them connect at the same time."];
 many_nodes(Config) when is_list(Config) ->
-    Timeout = 180,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    Timeout = 240,
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -2902,7 +2871,6 @@ many_nodes(Config) when is_list(Config) ->
     write_high_level_trace(Config),
     ?line stop_nodes(Cps),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     Diff = Time2 - Time,
     Return = lists:flatten(io_lib:format("~w nodes took ~w ms", 
                                          [N_cps, Diff])),
@@ -2988,7 +2956,7 @@ sync_0(doc) ->
     ["OTP-5770. sync/0."];
 sync_0(Config) when is_list(Config) ->
     Timeout = 180,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
 
@@ -3013,7 +2981,6 @@ sync_0(Config) when is_list(Config) ->
     stop_nodes(Cps),
 
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 start_and_sync([]) ->
@@ -3031,7 +2998,7 @@ global_groups_change(suite) -> [];
 global_groups_change(doc) -> ["Test change of global_groups parameter."];
 global_groups_change(Config) ->
     Timeout = 90,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),
     ?line M = from($@, atom_to_list(node())),
@@ -3376,7 +3343,6 @@ global_groups_change(Config) ->
     stop_node(CpE),
 
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 sync_and_wait(Node) ->
@@ -3919,7 +3885,7 @@ global_lost_nodes(doc) ->
     ["Tests that locally loaded nodes do not loose contact with other nodes."];
 global_lost_nodes(Config) when is_list(Config) ->
     Timeout = 60,
-    Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     
@@ -3943,7 +3909,6 @@ global_lost_nodes(Config) when is_list(Config) ->
     ?line stop_node(Node1),
     ?line stop_node(Node2),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.    
 
 global_load(MyName, OtherNode, OtherName) ->
@@ -3994,7 +3959,7 @@ mass_death(doc) ->
     ["Tests the simultaneous death of many processes with registered names"];
 mass_death(Config) when is_list(Config) ->
     Timeout = 90,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line OrigNames = global:registered_names(),
@@ -4023,9 +3988,9 @@ mass_death(Config) when is_list(Config) ->
     {H,M,S} = time(),
     io:format("Started probing: ~.4.0w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w~n",
 	      [YYYY,MM,DD,H,M,S]),
-    wait_mass_death(Dog, Nodes, OrigNames, erlang:now(), Config).
+    wait_mass_death(Nodes, OrigNames, erlang:now(), Config).
 
-wait_mass_death(Dog, Nodes, OrigNames, Then, Config) ->
+wait_mass_death(Nodes, OrigNames, Then, Config) ->
     ?line Names = global:registered_names(),
     ?line 
 	case Names--OrigNames of
@@ -4036,12 +4001,11 @@ wait_mass_death(Dog, Nodes, OrigNames, Then, Config) ->
 				stop_node(Node)
 			end, Nodes),
                 ?line init_condition(Config),
-		?line test_server:timetrap_cancel(Dog),
  		{comment,lists:flatten(io_lib:format("~.3f s~n", [T/1000.0]))};
 	    Ndiff ->
 		?line io:format("Ndiff: ~p~n", [Ndiff]),
 		?line test_server:sleep(1000),
-		?line wait_mass_death(Dog, Nodes, OrigNames, Then, Config)
+		?line wait_mass_death(Nodes, OrigNames, Then, Config)
 	end.
 
 mass_spawn([]) ->
@@ -4213,7 +4177,7 @@ garbage_messages(suite) ->
     [];
 garbage_messages(Config) when is_list(Config) ->
     Timeout = 25,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
+    ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     ?line init_condition(Config),    
     ?line [Slave] = start_nodes([garbage_messages], slave, Config),
@@ -4233,7 +4197,6 @@ garbage_messages(Config) when is_list(Config) ->
     write_high_level_trace(Config),
     ?line stop_node(Slave),
     ?line init_condition(Config),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 wait_for_ready_net(Config) ->
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index 233e438dc9..2ec3b7c297 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -22,7 +22,10 @@
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, start/1, restart/1, 
-	 reboot/1, set_cmd/1, clear_cmd/1, get_cmd/1,
+	 reboot/1,
+	 node_start_immediately_after_crash/1,
+	 node_start_soon_after_crash/1,
+	 set_cmd/1, clear_cmd/1, get_cmd/1,
 	 dont_drop/1, kill_pid/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -38,15 +41,15 @@ init_per_testcase(_Func, Config) ->
 end_per_testcase(_Func, Config) ->
     Nodes = nodes(),
     lists:foreach(fun(X) ->
-			  NNam = list_to_atom(hd(string:tokens(atom_to_list(X),"@"))),
-			  case NNam of
-			      heart_test ->
-				  ?t:format(1, "WARNING: Killed ~p~n", [X]),
-				  rpc:cast(X, erlang, halt, []);
-			      _ ->
-				  ok
-			  end
-		  end, Nodes),
+		NNam = list_to_atom(hd(string:tokens(atom_to_list(X),"@"))),
+		case NNam of
+		    heart_test ->
+			?t:format(1, "WARNING: Killed ~p~n", [X]),
+			rpc:cast(X, erlang, halt, []);
+		    _ ->
+			ok
+		end
+	end, Nodes),
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
@@ -57,8 +60,13 @@ end_per_testcase(_Func, Config) ->
 %%-----------------------------------------------------------------
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
-    [start, restart, reboot, set_cmd, clear_cmd, get_cmd, kill_pid].
+all() -> [
+	start, restart, reboot,
+	node_start_immediately_after_crash,
+	node_start_soon_after_crash,
+	set_cmd, clear_cmd, get_cmd,
+	kill_pid
+    ].
 
 groups() -> 
     [].
@@ -80,17 +88,22 @@ init_per_suite(Config) when is_list(Config) ->
 end_per_suite(Config) when is_list(Config) ->
     Config.
 
+
 start_check(Type, Name) ->
+    start_check(Type, Name, []).
+start_check(Type, Name, Envs) ->
     Args = case ?t:os_type() of
-	       {win32,_} -> "-heart -env HEART_COMMAND no_reboot";
-	       _ -> "-heart"
-	   end,
+	{win32,_} -> 
+	    "-heart " ++ env_encode([{"HEART_COMMAND", no_reboot}|Envs]);
+	_ ->
+	    "-heart " ++ env_encode(Envs)
+    end,
     {ok, Node} = case Type of
-		     loose ->
-			 loose_node:start(Name, Args, ?DEFAULT_TIMEOUT_SECS);
-		     _ ->
-			 ?t:start_node(Name, Type, [{args, Args}])
-		 end,
+	loose ->
+	    loose_node:start(Name, Args, ?DEFAULT_TIMEOUT_SECS);
+	_ ->
+	    ?t:start_node(Name, Type, [{args, Args}])
+    end,
     erlang:monitor_node(Node, true),
     case rpc:call(Node, erlang, whereis, [heart]) of
 	Pid when is_pid(Pid) ->
@@ -103,21 +116,19 @@ start_check(Type, Name) ->
 start(doc) -> [];
 start(suite) -> {req, [{time, 10}]};
 start(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_check(slave, heart_test),
-    ?line rpc:call(Node, init, reboot, []),
+    {ok, Node} = start_check(slave, heart_test),
+    rpc:call(Node, init, reboot, []),
     receive
-	{nodedown, Node} ->
-	    ok
-    after 2000 ->
-	    test_server:fail(node_not_closed)
+	{nodedown, Node} -> ok
+    after 2000 -> test_server:fail(node_not_closed)
     end,
     test_server:sleep(5000),
-    ?line case net_adm:ping(Node) of
-	      pang ->
-		  ok;
-	      _ -> 
-		  test_server:fail(node_rebooted)
-	  end,
+    case net_adm:ping(Node) of
+	pang ->
+	    ok;
+	_ -> 
+	    test_server:fail(node_rebooted)
+    end,
     test_server:stop_node(Node).
 
 %% Also test fixed bug in R1B (it was not possible to
@@ -125,6 +136,10 @@ start(Config) when is_list(Config) ->
 %% Slave executes erlang:halt() on master nodedown.
 %% Therefore the slave process has to be killed
 %% before restart.
+
+%% restart
+%% Purpose:
+%%   Check that a node is up and running after a init:restart/0
 restart(doc) -> [];
 restart(suite) -> 
    case ?t:os_type() of
@@ -134,8 +149,8 @@ restart(suite) ->
 	    {skip, "Only run on unix and win32"}
     end;
 restart(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_check(loose, heart_test),
-    ?line rpc:call(Node, init, restart, []),
+    {ok, Node} = start_check(loose, heart_test),
+    rpc:call(Node, init, restart, []),
     receive
 	{nodedown, Node} ->
 	    ok
@@ -143,32 +158,21 @@ restart(Config) when is_list(Config) ->
 	    test_server:fail(node_not_closed)
     end,
     test_server:sleep(5000),
-
-    ?line case net_adm:ping(Node) of
-	      pong ->
-		  erlang:monitor_node(Node, true),
-		  ?line rpc:call(Node, init, stop, []),
-		  receive
-		      {nodedown, Node} ->
-			  ok
-		  after 2000 ->
-			  test_server:fail(node_not_closed2)
-		  end,
-		  ok;
-	      _ ->
-		  test_server:fail(node_not_restarted)
-	  end,
+    node_check_up_down(Node, 2000),
     loose_node:stop(Node).
 
+%% reboot
+%% Purpose:
+%%   Check that a node is up and running after a init:reboot/0
 reboot(doc) -> [];
 reboot(suite) -> {req, [{time, 10}]};
 reboot(Config) when is_list(Config) ->
     {ok, Node} = start_check(slave, heart_test),
 
-    ?line ok = rpc:call(Node, heart, set_cmd,
+    ok = rpc:call(Node, heart, set_cmd,
 			[atom_to_list(lib:progname()) ++ 
 			 " -noshell -heart " ++ name(Node) ++ "&"]),
-    ?line rpc:call(Node, init, reboot, []),
+    rpc:call(Node, init, reboot, []),
     receive
 	{nodedown, Node} ->
 	    ok
@@ -176,44 +180,119 @@ reboot(Config) when is_list(Config) ->
 	    test_server:fail(node_not_closed)
     end,
     test_server:sleep(5000),
-    ?line case net_adm:ping(Node) of
-	      pong ->
-		  erlang:monitor_node(Node, true),
-		  ?line rpc:call(Node, init, reboot, []),
-		  receive
-		      {nodedown, Node} ->
-			  ok
-		  after 2000 ->
-			  test_server:fail(node_not_closed2)
-		  end,
-		  ok;
-	      _ ->
-		  test_server:fail(node_not_rebooted)
-	  end,
+    node_check_up_down(Node, 2000),
     ok.
 
+%% node_start_immediately_after_crash
+%% Purpose:
+%%   Check that a node is up and running after a crash.
+%%   This test exhausts the atom table on the remote node.
+%%   ERL_CRASH_DUMP_SECONDS=0 will force beam not to dump an erl_crash.dump.
+node_start_immediately_after_crash(suite) -> {req, [{time, 10}]};
+node_start_immediately_after_crash(Config) when is_list(Config) ->
+    {ok, Node} = start_check(loose, heart_test_imm, [{"ERL_CRASH_DUMP_SECONDS", "0"}]),
+
+    ok = rpc:call(Node, heart, set_cmd,
+	[atom_to_list(lib:progname()) ++
+	    " -noshell -heart " ++ name(Node) ++ "&"]),
+
+    Mod  = exhaust_atoms,
+
+    Code = generate(Mod, [], [
+	    "do() -> "
+	    "  Set = lists:seq($a,$z), "
+	    "  [ list_to_atom([A,B,C,D,E]) || "
+	    "  A <- Set, B <- Set, C <- Set, E <- Set, D <- Set ]."
+	]),
+
+    %% crash it with atom exhaustion
+    rpc:call(Node, erlang, load_module, [Mod, Code]),
+    rpc:cast(Node, Mod, do, []),
+
+    T0 = now(),
+
+    receive {nodedown, Node} ->
+	    test_server:format("Took ~.2f s. for node to go down~n", [timer:now_diff(now(), T0)/1000000]),
+	    ok
+    %% timeout is very liberal here. nodedown is received in about 1 s. on linux (palantir)
+    %% and in about 10 s. on solaris (carcharoth)
+    after (15000*test_server:timetrap_scale_factor()) -> test_server:fail(node_not_closed)
+    end,
+    test_server:sleep(3000),
+    node_check_up_down(Node, 2000),
+    loose_node:stop(Node).
+
+%% node_start_soon_after_crash
+%% Purpose:
+%%   Check that a node is up and running after a crash.
+%%   This test exhausts the atom table on the remote node.
+%%   ERL_CRASH_DUMP_SECONDS=10 will force beam
+%%   to only dump an erl_crash.dump for 10 seconds.
+node_start_soon_after_crash(suite) -> {req, [{time, 10}]};
+node_start_soon_after_crash(Config) when is_list(Config) ->
+    {ok, Node} = start_check(loose, heart_test_soon, [{"ERL_CRASH_DUMP_SECONDS", "10"}]),
+
+    ok = rpc:call(Node, heart, set_cmd,
+	[atom_to_list(lib:progname()) ++
+	    " -noshell -heart " ++ name(Node) ++ "&"]),
+
+    Mod  = exhaust_atoms,
+
+    Code = generate(Mod, [], [
+	    "do() -> "
+	    "  Set = lists:seq($a,$z), "
+	    "  [ list_to_atom([A,B,C,D,E]) || "
+	    "  A <- Set, B <- Set, C <- Set, E <- Set, D <- Set ]."
+	]),
+
+    %% crash it with atom exhaustion
+    rpc:call(Node, erlang, load_module, [Mod, Code]),
+    rpc:cast(Node, Mod, do, []),
+
+    receive {nodedown, Node} -> ok
+    after (15000*test_server:timetrap_scale_factor()) -> test_server:fail(node_not_closed)
+    end,
+    test_server:sleep(20000),
+    node_check_up_down(Node, 15000),
+    loose_node:stop(Node).
+
+
+node_check_up_down(Node, Tmo) ->
+    case net_adm:ping(Node) of
+	pong ->
+	    erlang:monitor_node(Node, true),
+	    rpc:call(Node, init, reboot, []),
+	    receive
+		{nodedown, Node} -> ok
+	    after Tmo ->
+		    test_server:fail(node_not_closed2)
+	    end;
+	_ ->
+	    test_server:fail(node_not_rebooted)
+    end.
+
 %% Only tests bad command, correct behaviour is tested in reboot/1.
 set_cmd(suite) -> [];
 set_cmd(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_check(slave, heart_test),
+    {ok, Node} = start_check(slave, heart_test),
     Cmd = wrong_atom,
-    ?line {error, {bad_cmd, Cmd}} = rpc:call(Node, heart, set_cmd, [Cmd]),
+    {error, {bad_cmd, Cmd}} = rpc:call(Node, heart, set_cmd, [Cmd]),
     Cmd1 = lists:duplicate(2047, $a),
-    ?line {error, {bad_cmd, Cmd1}} = rpc:call(Node, heart, set_cmd, [Cmd1]),
+    {error, {bad_cmd, Cmd1}} = rpc:call(Node, heart, set_cmd, [Cmd1]),
     Cmd2 = lists:duplicate(28, $a),
-    ?line ok = rpc:call(Node, heart, set_cmd, [Cmd2]),
+    ok = rpc:call(Node, heart, set_cmd, [Cmd2]),
     Cmd3 = lists:duplicate(2000, $a),
-    ?line ok = rpc:call(Node, heart, set_cmd, [Cmd3]),
+    ok = rpc:call(Node, heart, set_cmd, [Cmd3]),
     stop_node(Node),
     ok.
 
 clear_cmd(suite) -> {req,[{time,15}]};
 clear_cmd(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_check(slave, heart_test),
-    ?line ok = rpc:call(Node, heart, set_cmd,
+    {ok, Node} = start_check(slave, heart_test),
+    ok = rpc:call(Node, heart, set_cmd,
 			[atom_to_list(lib:progname()) ++
 			 " -noshell -heart " ++ name(Node) ++ "&"]),
-    ?line rpc:call(Node, init, reboot, []),
+    rpc:call(Node, init, reboot, []),
     receive
 	{nodedown, Node} ->
 	    ok
@@ -221,16 +300,16 @@ clear_cmd(Config) when is_list(Config) ->
 	    test_server:fail(node_not_closed)
     end,
     test_server:sleep(5000),
-    ?line case net_adm:ping(Node) of
-	      pong ->
-		  erlang:monitor_node(Node, true);
-	      _ ->
-		  test_server:fail(node_not_rebooted)
-	  end,
-    ?line ok = rpc:call(Node, heart, set_cmd,
+    case net_adm:ping(Node) of
+	pong ->
+	    erlang:monitor_node(Node, true);
+	_ ->
+	    test_server:fail(node_not_rebooted)
+    end,
+    ok = rpc:call(Node, heart, set_cmd,
 			["erl -noshell -heart " ++ name(Node) ++ "&"]),
-    ?line ok = rpc:call(Node, heart, clear_cmd, []),
-    ?line rpc:call(Node, init, reboot, []),
+    ok = rpc:call(Node, heart, clear_cmd, []),
+    rpc:call(Node, init, reboot, []),
     receive
 	{nodedown, Node} ->
 	    ok
@@ -238,20 +317,20 @@ clear_cmd(Config) when is_list(Config) ->
 	    test_server:fail(node_not_closed)
     end,
     test_server:sleep(5000),
-    ?line case net_adm:ping(Node) of
-	      pang ->
-		  ok;
-	      _ -> 
-		  test_server:fail(node_rebooted)
-	  end,
+    case net_adm:ping(Node) of
+	pang ->
+	    ok;
+	_ ->
+	    test_server:fail(node_rebooted)
+    end,
     ok.
 
 get_cmd(suite) -> [];
 get_cmd(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_check(slave, heart_test),
+    {ok, Node} = start_check(slave, heart_test),
     Cmd = "test",
-    ?line ok = rpc:call(Node, heart, set_cmd, [Cmd]),
-    ?line {ok, Cmd} = rpc:call(Node, heart, get_cmd, []),
+    ok  = rpc:call(Node, heart, set_cmd, [Cmd]),
+    {ok, Cmd} = rpc:call(Node, heart, get_cmd, []),
     stop_node(Node),
     ok.
 
@@ -266,65 +345,56 @@ dont_drop(doc) ->
      "set just before halt on very high I/O load."];
 dont_drop(Config) when is_list(Config) ->
     %%% Have to do it some times to make it happen...
-    case os:type() of
-	vxworks ->
-	    {comment, "No use to run with slaves on other nodes..."};
-	_ ->
-	    [ok,ok,ok,ok,ok,ok,ok,ok,ok,ok] = do_dont_drop(Config,10),
-	    ok
-    end.
+    [ok,ok,ok,ok,ok,ok,ok,ok,ok,ok] = do_dont_drop(Config,10),
+    ok.
 
-do_dont_drop(_,0) ->
-    [];
+do_dont_drop(_,0) -> [];
 do_dont_drop(Config,N) ->
     %% Name of first slave node
-    ?line NN1 = atom_to_list(?MODULE) ++ "slave_1",
+    NN1 = atom_to_list(?MODULE) ++ "slave_1",
     %% Name of node started by heart on failure
-    ?line NN2 = atom_to_list(?MODULE) ++ "slave_2",
+    NN2 = atom_to_list(?MODULE) ++ "slave_2",
     %% Name of node started by heart on success
-    ?line NN3 = atom_to_list(?MODULE) ++ "slave_3",
-    ?line Host = hd(tl(string:tokens(atom_to_list(node()),"@"))),
+    NN3 = atom_to_list(?MODULE) ++ "slave_3",
+    Host = hd(tl(string:tokens(atom_to_list(node()),"@"))),
     %% The initial heart command
-    ?line FirstCmd = erl() ++ name(NN2 ++ "@" ++ Host),
+    FirstCmd = erl() ++ name(NN2 ++ "@" ++ Host),
     %% Separated the parameters to start_node_run for clarity...
-    ?line Name = list_to_atom(NN1),
-    ?line Env = [{"HEART_COMMAND", FirstCmd}],
-    ?line Func = "start_heart_stress",
-    ?line Arg = NN3 ++ "@" ++ Host ++ " " ++ 
+    Name = list_to_atom(NN1),
+    Env = [{"HEART_COMMAND", FirstCmd}],
+    Func = "start_heart_stress",
+    Arg = NN3 ++ "@" ++ Host ++ " " ++
 	filename:join(?config(data_dir, Config), "simple_echo"),
-    ?line start_node_run(Name,Env,Func,Arg),
-    ?line case wait_for_any_of(list_to_atom(NN2 ++ "@" ++ Host),
-			       list_to_atom(NN3 ++ "@" ++ Host)) of
-	      2 ->
-		  ?line [ok | do_dont_drop(Config,N-1)];
-	      _ ->
-		  ?line false
-	  end.
+    start_node_run(Name,Env,Func,Arg),
+    case wait_for_any_of(list_to_atom(NN2 ++ "@" ++ Host),
+	    list_to_atom(NN3 ++ "@" ++ Host)) of
+	2 ->
+	    [ok | do_dont_drop(Config,N-1)];
+	_ ->
+	    false
+    end.
 
 wait_for_any_of(N1,N2) ->
-    ?line wait_for_any_of(N1,N2,45).
+    wait_for_any_of(N1,N2,45).
 
 wait_for_any_of(_N1,_N2,0) ->
-    ?line false;
+    false;
 
 wait_for_any_of(N1,N2,Times) ->
-    ?line receive 
-	  after 1000 ->
-		  ?line ok
-	  end,
-    ?line case net_adm:ping(N1) of
-	      pang ->
-		  ?line case net_adm:ping(N2) of
-			    pang ->
-				?line wait_for_any_of(N1,N2,Times - 1);
-			    pong ->
-				?line rpc:call(N2,init,stop,[]),  
-				?line 2
-			end;
-	      pong ->
-		  ?line rpc:call(N1,init,stop,[]),  
-		  ?line 1
-	  end.
+    receive after 1000 -> ok end,
+    case net_adm:ping(N1) of
+	pang ->
+	    case net_adm:ping(N2) of
+		pang ->
+		    wait_for_any_of(N1,N2,Times - 1);
+		pong ->
+		    rpc:call(N2,init,stop,[]),
+		    2
+	    end;
+	pong ->
+	    rpc:call(N1,init,stop,[]),
+	    1
+    end.
 
 
 kill_pid(suite) ->
@@ -333,13 +403,7 @@ kill_pid(doc) ->
     ["Tests that heart kills the old erlang node before executing ",
      "heart command."];
 kill_pid(Config) when is_list(Config) ->
-    %%% Have to do it some times to make it happen...
-    case os:type() of
-	vxworks ->
-	    {comment, "No use to run with slaves on other nodes..."};
-	_ ->
-	    ok = do_kill_pid(Config)
-    end.
+    ok = do_kill_pid(Config).
 
 do_kill_pid(_Config) ->
     Name = heart_test,
@@ -347,9 +411,7 @@ do_kill_pid(_Config) ->
     {ok,Node} = start_node_run(Name,Env,suicide_by_heart,[]),
     ok = wait_for_node(Node,15),
     erlang:monitor_node(Node, true),
-    receive
-	{nodedown,Node} ->
-	    ok
+    receive {nodedown,Node} -> ok
     after 30000 ->
 	    false
     end.
@@ -357,23 +419,16 @@ do_kill_pid(_Config) ->
 wait_for_node(_,0) ->
     false;
 wait_for_node(Node,N) ->
-    receive
-    after 1000 ->
-	    ok
-    end,
+    receive after 1000 -> ok end,
     case net_adm:ping(Node) of
-	pong ->
-	    ok;
-	pang ->
-	    wait_for_node(Node,N-1)
+	pong -> ok;
+	pang -> wait_for_node(Node,N-1)
     end.
 
 erl() ->	   
     case os:type() of
-	{win32,_} ->
-	    "werl ";
-	_ ->
-	    "erl "
+	{win32,_} -> "werl ";
+	_ -> "erl "
     end.
     
 name(Node) when is_list(Node) -> name(Node,[]);
@@ -390,15 +445,13 @@ name([H|T], Name) ->
     name(T, [H|Name]).
 
 
-atom_conv(A) when is_atom(A) ->
-    atom_to_list(A);
-atom_conv(A) when is_list(A) ->
-    A.
+enc(A) when is_atom(A) -> atom_to_list(A);
+enc(A) when is_binary(A) -> binary_to_list(A);
+enc(A) when is_list(A) -> A.
 
-env_conv([]) ->
-    [];
-env_conv([{X,Y}|T]) ->
-    atom_conv(X) ++ " \"" ++ atom_conv(Y) ++ "\" " ++ env_conv(T).
+env_encode([]) -> [];
+env_encode([{X,Y}|T]) ->
+    "-env " ++ enc(X) ++ " \"" ++ enc(Y) ++ "\" " ++ env_encode(T).
 
 %%%
 %%% Starts a node and runs a function in this
@@ -409,12 +462,12 @@ env_conv([{X,Y}|T]) ->
 %%% Argument is the argument(s) to send through erl -s
 %%%
 start_node_run(Name, Env, Function, Argument) -> 
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line Params = "-heart -env " ++ env_conv(Env) ++ " -pa " ++ PA ++ 
-	" -s " ++ 
-	atom_conv(?MODULE) ++ " " ++ atom_conv(Function) ++ " " ++
-	atom_conv(Argument),
-    ?line start_node(Name, Params).
+    PA = filename:dirname(code:which(?MODULE)),
+    Params = "-heart " ++ env_encode(Env) ++ " -pa " ++ PA ++
+	" -s " ++
+	enc(?MODULE) ++ " " ++ enc(Function) ++ " " ++
+	enc(Argument),
+    start_node(Name, Params).
 
 start_node(Name, Param) ->
     test_server:start_node(Name, slave, [{args, Param}]).
@@ -480,3 +533,24 @@ suicide_by_heart() ->
 	{makaronipudding} ->
 	    sallad
     end.
+
+
+%% generate a module from binary
+generate(Module, Attributes, FunStrings) ->
+    FunForms = function_forms(FunStrings),
+    Forms    = [
+	{attribute,1,module,Module},
+	{attribute,2,export,[FA || {FA,_} <- FunForms]}
+    ] ++ [{attribute, 3, A, V}|| {A, V} <- Attributes] ++
+    [ Function || {_, Function} <- FunForms],
+    {ok, Module, Bin} = compile:forms(Forms),
+    Bin.
+
+
+function_forms([]) -> [];
+function_forms([S|Ss]) ->
+    {ok, Ts,_} = erl_scan:string(S),
+    {ok, Form} = erl_parse:parse_form(Ts),
+    Fun   = element(3, Form),
+    Arity = element(4, Form),
+    [{{Fun,Arity}, Form}|function_forms(Ss)].
diff --git a/lib/kernel/test/heart_SUITE_data/simple_echo.c b/lib/kernel/test/heart_SUITE_data/simple_echo.c
index 0093dbce9b..a92bb8af95 100644
--- a/lib/kernel/test/heart_SUITE_data/simple_echo.c
+++ b/lib/kernel/test/heart_SUITE_data/simple_echo.c
@@ -2,11 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef VXWORKS
-int simple_echo(void){
-#else
 int main(void){
-#endif
   int x;
   while((x = getchar()) != EOF){
     putchar(x);
@@ -14,4 +10,3 @@ int main(void){
   }
   return 0;
 }
-      
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 7241b093d0..e5e1794514 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -37,7 +37,8 @@
          gethostnative_soft_restart/0, gethostnative_soft_restart/1,
 	 gethostnative_debug_level/0, gethostnative_debug_level/1,
 	 getif/1,
-	 getif_ifr_name_overflow/1,getservbyname_overflow/1, getifaddrs/1]).
+	 getif_ifr_name_overflow/1,getservbyname_overflow/1, getifaddrs/1,
+	 parse_strict_address/1]).
 
 -export([get_hosts/1, get_ipv6_hosts/1, parse_hosts/1, parse_address/1,
 	 kill_gethost/0, parallell_gethost/0]).
@@ -52,7 +53,7 @@ all() ->
      t_gethostnative, gethostnative_parallell, cname_loop,
      gethostnative_debug_level, gethostnative_soft_restart,
      getif, getif_ifr_name_overflow, getservbyname_overflow,
-     getifaddrs].
+     getifaddrs, parse_strict_address].
 
 groups() -> 
     [{parse, [], [parse_hosts, parse_address]}].
@@ -66,7 +67,7 @@ required(v6) ->
      {require, test_dummy_ipv6_host}];
 required(hosts) ->
     case os:type() of
-	{OS, _} when OS =:= win32; OS =:= vxworks ->
+	{OS, _} when OS =:= win32 ->
 	    [{require, hardcoded_hosts},
 	     {require, hardcoded_ipv6_hosts}];
 	_Else ->
@@ -582,16 +583,16 @@ parse_address(Config) when is_list(Config) ->
 	 "fe80::198.168.0.",
 	 "fec0::fFfF:127.0.0.1."],
     t_parse_address
-      (ipv6_address,
+      (parse_ipv6_address,
        V6Strict++V6Sloppy++V6Err++V4Err),
     t_parse_address
-      (ipv6strict_address,
+      (parse_ipv6strict_address,
        V6Strict++V6Err++V4Err++[S || {_,S} <- V6Sloppy]),
     t_parse_address
-      (ipv4_address,
+      (parse_ipv4_address,
        V4Strict++V4Sloppy++V4Err++V6Err++[S || {_,S} <- V6Strict]),
     t_parse_address
-      (ipv4strict_address,
+      (parse_ipv4strict_address,
        V4Strict++V4Err++V6Err++[S || {_,S} <- V4Sloppy++V6Strict]).
 
 t_parse_address(Func, []) ->
@@ -599,14 +600,16 @@ t_parse_address(Func, []) ->
     ok;
 t_parse_address(Func, [{Addr,String}|L]) ->
     io:format("~p = ~p.~n", [Addr,String]),
-    {ok,Addr} = inet_parse:Func(String),
+    {ok,Addr} = inet:Func(String),
     t_parse_address(Func, L);
 t_parse_address(Func, [String|L]) ->
     io:format("~p.~n", [String]),
-    {error,einval} = inet_parse:Func(String),
+    {error,einval} = inet:Func(String),
     t_parse_address(Func, L).
 
-
+parse_strict_address(Config) when is_list(Config) ->
+    {ok, Ipv4} = inet:parse_strict_address("127.0.0.1"),
+    {ok, Ipv6} = inet:parse_strict_address("c11:0c22:5c33:c440:55c0:c66c:77:0088").
 
 t_gethostnative(suite) ->[];
 t_gethostnative(doc) ->[];
@@ -614,17 +617,12 @@ t_gethostnative(Config) when is_list(Config) ->
 %% this will result in 26 bytes sent which causes problem in Windows
 %% if the port-program has not assured stdin to be read in BINARY mode
 %% OTP-2555
-    case os:type() of
-	vxworks ->
-	    {skipped, "VxWorks has no native gethostbyname()"};
-	_ ->
-	    ?line case inet_gethost_native:gethostbyname(
-			 "a23456789012345678901234") of
-		      {error,notfound} ->
-			  ?line ok;
-		      {error,no_data} ->
-			  ?line ok
-		  end
+    ?line case inet_gethost_native:gethostbyname(
+	    "a23456789012345678901234") of
+	{error,notfound} ->
+	    ?line ok;
+	{error,no_data} ->
+	    ?line ok
     end.
 
 gethostnative_parallell(suite) ->    
diff --git a/lib/kernel/test/inet_sockopt_SUITE.erl b/lib/kernel/test/inet_sockopt_SUITE.erl
index 0c63a6d653..75496ce745 100644
--- a/lib/kernel/test/inet_sockopt_SUITE.erl
+++ b/lib/kernel/test/inet_sockopt_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -53,6 +53,8 @@
 	 simple/1, loop_all/1, simple_raw/1, simple_raw_getbin/1, 
 	 doc_examples_raw/1,doc_examples_raw_getbin/1,
 	 large_raw/1,large_raw_getbin/1,combined/1,combined_getbin/1,
+	 ipv6_v6only_udp/1, ipv6_v6only_tcp/1, ipv6_v6only_sctp/1,
+	 use_ipv6_v6only_udp/1,
 	 type_errors/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -64,6 +66,8 @@ all() ->
     [simple, loop_all, simple_raw, simple_raw_getbin,
      doc_examples_raw, doc_examples_raw_getbin, large_raw,
      large_raw_getbin, combined, combined_getbin,
+     ipv6_v6only_udp, ipv6_v6only_tcp, ipv6_v6only_sctp,
+     use_ipv6_v6only_udp,
      type_errors].
 
 groups() -> 
@@ -127,7 +131,7 @@ loop_all(Config) when is_list(Config) ->
 				   io_lib:format("Non mandatory failed:~w",
 						 [Failed]))}
 	  end.
-			
+
 
 
 simple_raw(suite) -> [];
@@ -461,6 +465,153 @@ do_combined(Config,Binary) when is_list(Config) ->
 	    ok
     end.
 
+
+
+ipv6_v6only_udp(suite) -> [];
+ipv6_v6only_udp(doc) -> "Test socket option ipv6_v6only for UDP";
+ipv6_v6only_udp(Config) when is_list(Config) ->
+    ipv6_v6only(Config, gen_udp).
+
+ipv6_v6only_tcp(suite) -> [];
+ipv6_v6only_tcp(doc) -> "Test socket option ipv6_v6only for TCP";
+ipv6_v6only_tcp(Config) when is_list(Config) ->
+    ipv6_v6only(Config, gen_tcp).
+
+ipv6_v6only_sctp(suite) -> [];
+ipv6_v6only_sctp(doc) -> "Test socket option ipv6_v6only for SCTP";
+ipv6_v6only_sctp(Config) when is_list(Config) ->
+    ipv6_v6only(Config, gen_sctp).
+
+ipv6_v6only(Config, Module) when is_list(Config) ->
+    ?line case ipv6_v6only_open(Module, []) of
+	      {ok,S1} ->
+		  ?line case inet:getopts(S1, [ipv6_v6only]) of
+			    {ok,[{ipv6_v6only,Default}]}
+			      when is_boolean(Default) ->
+				?line ok =
+				    ipv6_v6only_close(Module, S1),
+				?line ipv6_v6only(Config, Module, Default);
+			    {ok,[]} ->
+				?line io:format("Not implemented.~n", []),
+				%% This list of OS:es where the option is
+				%% supposed to be not implemented is just
+				%% a guess, and may grow with time.
+				?line case {os:type(),os:version()} of
+					  {{unix,linux},{2,M,_}}
+					  when M =< 4 -> ok
+				      end,
+				%% At least this should work
+				?line {ok,S2} =
+				    ipv6_v6only_open(
+				      Module,
+				      [{ipv6_v6only,true}]),
+				?line ok =
+				    ipv6_v6only_close(Module, S2)
+			end;
+	      {error,_} ->
+		  {skipped,"Socket type not supported"}
+	  end.
+
+ipv6_v6only(Config, Module, Default) when is_list(Config) ->
+    ?line io:format("Default ~w.~n", [Default]),
+    ?line {ok,S1} =
+	ipv6_v6only_open(Module, [{ipv6_v6only,Default}]),
+    ?line {ok,[{ipv6_v6only,Default}]} =
+	inet:getopts(S1, [ipv6_v6only]),
+    ?line ok =
+	ipv6_v6only_close(Module, S1),
+    ?line NotDefault = not Default,
+    ?line case ipv6_v6only_open(Module, [{ipv6_v6only,NotDefault}]) of
+	      {ok,S2} ->
+		  ?line io:format("Read-write.~n", []),
+		  ?line {ok,[{ipv6_v6only,NotDefault}]} =
+		      inet:getopts(S2, [ipv6_v6only]),
+		  ok;
+	      {error,einval} ->
+		  ?line io:format("Read-only.~n", []),
+		  %% This option is known to be read-only and true
+		  %% on Windows and OpenBSD
+		  ?line case os:type() of
+			    {unix,openbsd} when Default =:= true -> ok;
+			    {win32,_} when Default =:= true -> ok
+			end
+	  end.
+
+ipv6_v6only_open(Module, Opts) ->
+    Module:case Module of
+	       gen_tcp -> listen;
+	       _ -> open
+	   end(0, [inet6|Opts]).
+
+ipv6_v6only_close(Module, Socket) ->
+    Module:close(Socket).
+
+
+use_ipv6_v6only_udp(suite) -> [];
+use_ipv6_v6only_udp(doc) -> "Test using socket option ipv6_v6only for UDP";
+use_ipv6_v6only_udp(Config) when is_list(Config) ->
+    ?line case gen_udp:open(0, [inet6,{ipv6_v6only,true}]) of
+	      {ok,S6} ->
+		  ?line case inet:getopts(S6, [ipv6_v6only]) of
+			    {ok,[{ipv6_v6only,true}]} ->
+				use_ipv6_v6only_udp(Config, S6);
+			    {ok,Other} ->
+				{skipped,{getopts,Other}}
+			end;
+	      {error,_} ->
+		  {skipped,"Socket type not supported"}
+	  end.
+
+use_ipv6_v6only_udp(_Config, S6) ->
+    ?line {ok,Port} = inet:port(S6),
+    ?line {ok,S4} = gen_udp:open(Port, [inet]),
+    ?line E6 = " IPv6-echo.",
+    ?line E4 = " IPv4-echo.",
+    ?line Sender =
+	spawn_link(fun () -> use_ipv6_v6only_udp_sender(Port, E6, E4) end),
+    ?line use_ipv6_v6only_udp_listener(
+	    S6, S4, E6, E4, monitor(process, Sender)).
+
+use_ipv6_v6only_udp_listener(S6, S4, E6, E4, Mref) ->
+    ?line receive
+	      {udp,S6,IP,P,Data} ->
+		  ?line ok = gen_udp:send(S6, IP, P, [Data|E6]),
+		  ?line use_ipv6_v6only_udp_listener(S6, S4, E6, E4, Mref);
+	      {udp,S4,IP,P,Data} ->
+		  ?line ok = gen_udp:send(S4, IP, P, [Data|E4]),
+		  ?line use_ipv6_v6only_udp_listener(S6, S4, E6, E4, Mref);
+	      {'DOWN',Mref,_,_,normal} ->
+		  ok;
+	      {'DOWN',Mref,_,_,Result} ->
+		  %% Since we are linked we will never arrive here
+		  Result;
+	      Other ->
+		  ?line exit({failed,{listener_unexpected,Other}})
+	  end.
+
+use_ipv6_v6only_udp_sender(Port, E6, E4) ->
+    D6 = "IPv6-send.",
+    D4 = "IPv4-send.",
+    R6 = D6 ++ E6,
+    R4 = D4 ++ E4,
+    R6 = sndrcv({0,0,0,0,0,0,0,1}, Port, [inet6], D6),
+    R4 = sndrcv({127,0,0,1}, Port, [inet], D4),
+    ok.
+
+sndrcv(Ip, Port, Opts, Data) ->
+    {ok,S} = gen_udp:open(0, Opts),
+    io:format("[~w:~w] ! ~s~n", [Ip,Port,Data]),
+    ok = gen_udp:send(S, Ip, Port, Data),
+    receive
+	{udp,S,Ip,Port,RecData} ->
+	    io:format("[~w:~w] : ~s~n", [Ip,Port,RecData]),
+	    RecData;
+	Other ->
+	    exit({failed,{sndrcv_unexpectec,Other}})
+    end.
+
+
+
 type_errors(suite) ->
     [];
 type_errors(doc) ->
@@ -623,7 +774,6 @@ all_listen_options() ->
      {exit_on_close, true, false, true, true},
      %{high_watermark,4096,8192,true,true}, 
      %{low_watermark,2048,4096,true,true}, 
-     {bit8,on,off,true,true}, 
      {send_timeout,infinity,1000,true,true},
      {send_timeout_close,false,true,true,true},
      {delay_send,false,true,true,true}, 
@@ -647,7 +797,6 @@ all_connect_options() ->
      {exit_on_close, true, false, true, true},
      {high_watermark,4096,8192,false,true}, 
      {low_watermark,2048,4096,false,true}, 
-     {bit8,on,off,true,true}, 
      {send_timeout,infinity,1000,true,true},
      {send_timeout_close,false,true,true,true},
      {delay_send,false,true,true,true}, 
diff --git a/lib/kernel/test/inet_sockopt_SUITE_data/sockopt_helper.c b/lib/kernel/test/inet_sockopt_SUITE_data/sockopt_helper.c
index f24c93edf5..9c8f8eb91a 100644
--- a/lib/kernel/test/inet_sockopt_SUITE_data/sockopt_helper.c
+++ b/lib/kernel/test/inet_sockopt_SUITE_data/sockopt_helper.c
@@ -1,12 +1,3 @@
-#if defined(VXWORKS)
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-int sockopt_helper(void){
-    return 0;
-}
-#else
-
 #if defined(__WIN32__)
 #define WIN32_LEAN_AND_MEAN
 #include <winsock2.h>
@@ -215,5 +206,3 @@ int main(void){
     } while (x != C_QUIT);
     return 0;
 }
-#endif
-      
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index b39fadd65f..6fe97ed04f 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -256,47 +256,42 @@ get_plain_arguments(Config) when is_list(Config) ->
 boot_var(doc) -> [];
 boot_var(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 boot_var(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "Not run on VxWorks"};
+    ?line Dog = ?t:timetrap(?t:seconds(100)),
+
+    {BootScript, TEST_VAR, KernelVsn, StdlibVsn} = create_boot(Config),
+
+    %% Should fail as we have not given -boot_var TEST_VAR
+    ?line {error, timeout} =
+    start_node(init_test, "-boot " ++ BootScript),
+
+    case is_real_system(KernelVsn, StdlibVsn) of
+	true ->
+	    %% Now it should work !!
+	    ?line {ok, Node} =
+	    start_node(init_test,
+		"-boot " ++ BootScript ++
+		" -boot_var TEST_VAR " ++ TEST_VAR),
+	    stop_node(Node),
+	    Res = ok;
 	_ ->
-	    ?line Dog = ?t:timetrap(?t:seconds(100)),
-	    
-	    {BootScript, TEST_VAR, KernelVsn, StdlibVsn} = create_boot(Config),
-
-	    %% Should fail as we have not given -boot_var TEST_VAR
-	    ?line {error, timeout} =
-		start_node(init_test, "-boot " ++ BootScript),
-	    
-	    case is_real_system(KernelVsn, StdlibVsn) of
-		true ->
-		    %% Now it should work !!
-		    ?line {ok, Node} =
-			start_node(init_test,
-				   "-boot " ++ BootScript ++
-				   " -boot_var TEST_VAR " ++ TEST_VAR),
-		    stop_node(Node),
-		    Res = ok;
-		_ ->
-%% What we need is not so much version numbers on the directories, but
-%% for the boot var TEST_VAR to appear in the boot script, and it doesn't
-%% if we give the 'local' option to systools:make_script.
-		    ?t:format(
-		       "Test case not complete as we are not~n"
-		       "running in a real system!~n"
-		       "Probably this test is performed in a "
-		       "clearcase view or source tree.~n"
-		       "Need version numbers on the kernel and "
-		       "stdlib directories!~n",
-		       []),
-		    Res = {skip,
-			   "Test case only partially run since it is run "
-			   "in a clearcase view or in a source tree. "
-			   "Need an installed system to complete this test."}
-	    end,
-	    ?line ?t:timetrap_cancel(Dog),
-	    Res
-    end.
+	    %% What we need is not so much version numbers on the directories, but
+	    %% for the boot var TEST_VAR to appear in the boot script, and it doesn't
+	    %% if we give the 'local' option to systools:make_script.
+	    ?t:format(
+		"Test case not complete as we are not~n"
+		"running in a real system!~n"
+		"Probably this test is performed in a "
+		"clearcase view or source tree.~n"
+		"Need version numbers on the kernel and "
+		"stdlib directories!~n",
+		[]),
+	    Res = {skip,
+		"Test case only partially run since it is run "
+		"in a clearcase view or in a source tree. "
+		"Need an installed system to complete this test."}
+    end,
+    ?line ?t:timetrap_cancel(Dog),
+    Res.
 
 create_boot(Config) ->
     ?line {ok, OldDir} = file:get_cwd(),
@@ -579,55 +574,47 @@ script_id(Config) when is_list(Config) ->
 boot1(doc) -> [];
 boot1(suite) -> {req, [distribution, {local_slave_nodes, 1}, {time, 35}]};
 boot1(Config) when is_list(Config) ->
-    case os:type() of 
-	vxworks ->
-	    {comment, "Not run on VxWorks"};
-	_ ->
-	    ?line Dog = ?t:timetrap(?t:seconds(80)),
-	    Args = args() ++ " -boot start_sasl",
-	    ?line {ok, Node} = start_node(init_test, Args),
-	    ?line stop_node(Node),
-
-	    %% Try to start with non existing boot file.
-	    Args1 = args() ++ " -boot dummy_script",
-	    ?line {error, timeout} = start_node(init_test, Args1),
-	    
-	    ?line ?t:timetrap_cancel(Dog),
-	    ok
-    end.
+    ?line Dog = ?t:timetrap(?t:seconds(80)),
+    Args = args() ++ " -boot start_sasl",
+    ?line {ok, Node} = start_node(init_test, Args),
+    ?line stop_node(Node),
+
+    %% Try to start with non existing boot file.
+    Args1 = args() ++ " -boot dummy_script",
+    ?line {error, timeout} = start_node(init_test, Args1),
+
+    ?line ?t:timetrap_cancel(Dog),
+    ok.
 
 boot2(doc) -> [];
 boot2(suite) -> {req, [distribution, {local_slave_nodes, 1}, {time, 35}]};
 boot2(Config) when is_list(Config) ->
+    Dog = ?t:timetrap(?t:seconds(80)),
+
+    %% Absolute boot file name
+    Boot = filename:join([code:root_dir(), "bin", "start_sasl"]),
+
+    Args = args() ++ " -boot \"" ++ Boot++"\"",
+    {ok, Node} = start_node(init_test, Args),
+    stop_node(Node),
+
     case os:type() of 
-	vxworks ->
-	    {comment, "Not run on VxWorks"};
+	{win32, _} ->
+	    %% Absolute boot file name for Windows -- all slashes are
+	    %% converted to backslashes.
+	    Win_boot = lists:map(fun
+		    ($/) -> $\\;
+		    (C) -> C 
+		end, Boot),
+	    Args2 = args() ++ " -boot \"" ++ Win_boot ++ "\"",
+	    {ok, Node2} = start_node(init_test, Args2),
+	    stop_node(Node2);
 	_ ->
-	    ?line Dog = ?t:timetrap(?t:seconds(80)),
-
-	    %% Absolute boot file name
-	    Boot = filename:join([code:root_dir(), "bin", "start_sasl"]),
-
-	    Args = args() ++ " -boot " ++ Boot,
-	    ?line {ok, Node} = start_node(init_test, Args),
-	    ?line stop_node(Node),
-
-	    case os:type() of 
-		{win32, _} ->
-		    %% Absolute boot file name for Windows -- all slashes are
-		    %% converted to backslashes.
-		    Win_boot = lists:map(fun($/) -> $\\; (C) -> C end,
-					 Boot),
-		    Args2 = args() ++ " -boot " ++ Win_boot,
-		    ?line {ok, Node2} = start_node(init_test, Args2),
-		    ?line stop_node(Node2);
-		_ ->
-		    ok
-	    end,
-
-	    ?line ?t:timetrap_cancel(Dog),
 	    ok
-    end.
+    end,
+
+    ?t:timetrap_cancel(Dog),
+    ok.
 
 %% Misc. functions    
 
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index b2308dd321..36e13cec26 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -29,20 +29,11 @@
 -export([toerl_server/3]).
 
 init_per_testcase(_Func, Config) ->
-    Dog = test_server:timetrap(test_server:seconds(60)),
-    Term = case os:getenv("TERM") of
-	       List when is_list(List) ->
-		   List;
-	       _ ->
-		   "dumb"
-	   end,
-    os:putenv("TERM","vt100"),
-    [{watchdog,Dog},{term,Term}|Config].
+    Dog = test_server:timetrap(test_server:minutes(3)),
+    [{watchdog,Dog}|Config].
 
 end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
-    Term = ?config(term,Config),
-    os:putenv("TERM",Term),
     test_server:timetrap_cancel(Dog).
 
 
@@ -56,9 +47,19 @@ groups() ->
     [].
 
 init_per_suite(Config) ->
-    Config.
+    Term = case os:getenv("TERM") of
+	       List when is_list(List) ->
+		   List;
+	       _ ->
+		   "dumb"
+	   end,
+    os:putenv("TERM","vt100"),
+    DefShell = get_default_shell(),
+    [{default_shell,DefShell},{term,Term}|Config].
 
-end_per_suite(_Config) ->
+end_per_suite(Config) ->
+    Term = ?config(term,Config),
+    os:putenv("TERM",Term),
     ok.
 
 init_per_group(_GroupName, Config) ->
@@ -78,70 +79,118 @@ end_per_group(_GroupName, Config) ->
 get_columns_and_rows(suite) -> [];
 get_columns_and_rows(doc) -> ["Test that the shell can access columns and rows"];
 get_columns_and_rows(Config) when is_list(Config) ->
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline, "2"},
-		  {putline,"io:columns()."},
-%% Behaviour change in R12B-5, returns 80
-%%		  {getline,"{error,enotsup}"},
-		  {getline,"{ok,80}"},
-		  {putline,"io:rows()."},
-%% Behaviour change in R12B-5, returns 24
-%%		  {getline,"{error,enotsup}"}
-		  {getline,"{ok,24}"}
-		  ],[]),
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline, "2"},
-		  {putline,"io:columns()."},
-		  {getline,"{ok,90}"},
-		  {putline,"io:rows()."},
-		  {getline,"{ok,40}"}],
-		 [],
-		 "stty rows 40; stty columns 90; ").
+    case proplists:get_value(default_shell,Config) of
+	old ->
+	    %% Old shell tests
+	    ?dbg(old_shell),
+	    ?line rtnode([{putline,""},
+			  {putline, "2."},
+			  {getline, "2"},
+			  {putline,"io:columns()."},
+			  {getline_re,".*{error,enotsup}"},
+			  {putline,"io:rows()."},
+			  {getline_re,".*{error,enotsup}"}
+
+			 ],[]),
+	    ?line rtnode([{putline,""},
+			  {putline, "2."},
+			  {getline, "2"},
+			  {putline,"io:columns()."},
+			  {getline_re,".*{ok,90}"},
+			  {putline,"io:rows()."},
+			  {getline_re,".*{ok,40}"}],
+			 [],
+			 "stty rows 40; stty columns 90; ");
+	new ->
+	    % New shell tests
+	    ?dbg(new_shell),
+	    ?line rtnode([{putline,""},
+			  {putline, "2."},
+			  {getline, "2"},
+			  {putline,"io:columns()."},
+			  %% Behaviour change in R12B-5, returns 80
+			  %%		  {getline,"{error,enotsup}"},
+			  {getline,"{ok,80}"},
+			  {putline,"io:rows()."},
+			  %% Behaviour change in R12B-5, returns 24
+			  %%		  {getline,"{error,enotsup}"}
+			  {getline,"{ok,24}"}
+			 ],[]),
+	    ?line rtnode([{putline,""},
+			  {putline, "2."},
+			  {getline, "2"},
+			  {putline,"io:columns()."},
+			  {getline,"{ok,90}"},
+			  {putline,"io:rows()."},
+			  {getline,"{ok,40}"}],
+			 [],
+			 "stty rows 40; stty columns 90; ")
+    end.
     
     
 
 exit_initial(suite) -> [];
 exit_initial(doc) -> ["Tests that exit of initial shell restarts shell"];
 exit_initial(Config) when is_list(Config) ->
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline, "2"},
-		  {putline,"exit()."},
-		  {getline,""},
-		  {getline,"Eshell"},
-		  {putline,""},
-		  {putline,"35."},
-		  {getline,"35"}],[]).
+    case proplists:get_value(default_shell,Config) of
+	old ->
+	    rtnode([{putline,""},
+		    {putline, "2."},
+		    {getline_re, ".*2"},
+		    {putline,"exit()."},
+		    {getline,""},
+		    {getline,"Eshell"},
+		    {putline,""},
+		    {putline,"35."},
+		    {getline_re,".*35"}],[]);
+	new ->
+	    rtnode([{putline,""},
+		    {putline, "2."},
+		    {getline, "2"},
+		    {putline,"exit()."},
+		    {getline,""},
+		    {getline,"Eshell"},
+		    {putline,""},
+		    {putline,"35."},
+		    {getline_re,"35"}],[])
+    end.
 
 job_control_local(suite) -> [];
 job_control_local(doc) -> [ "Tests that local shell can be "
 			    "started by means of job control" ];
 job_control_local(Config) when is_list(Config) ->
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline, "2"},
-		  {putline,[7]},
-		  {sleep,timeout(short)},
-		  {putline,""},
-		  {getline," -->"},
-		  {putline,"s"},
-		  {putline,"c"},
-		  {putline_raw,""},
-		  {getline,"Eshell"},
-		  {putline_raw,""},
-		  {getline,"1>"},
-		  {putline,"35."},
-		  {getline,"35"}],[]).
+    case proplists:get_value(default_shell,Config) of
+	old ->
+	    %% Old shell tests
+	    {skip,"No new shell found"};
+	new ->
+	    %% New shell tests
+	    ?line rtnode([{putline,""},
+			  {putline, "2."},
+			  {getline, "2"},
+			  {putline,[7]},
+			  {sleep,timeout(short)},
+			  {putline,""},
+			  {getline," -->"},
+			  {putline,"s"},
+			  {putline,"c"},
+			  {putline_raw,""},
+			  {getline,"Eshell"},
+			  {putline_raw,""},
+			  {getline,"1>"},
+			  {putline,"35."},
+			  {getline,"35"}],[])
+    end.
 
 job_control_remote(suite) -> [];
 job_control_remote(doc) -> [ "Tests that remote shell can be "
 			     "started by means of job control" ];
 job_control_remote(Config) when is_list(Config) ->
-    case node() of
-	nonode@nohost ->
+    case {node(),proplists:get_value(default_shell,Config)} of
+	{nonode@nohost,_} ->
 	    ?line exit(not_distributed);
+	{_,old} ->
+	    {skip,"No new shell found"};
 	_ ->
 	    ?line RNode = create_nodename(),
 	    ?line MyNode = atom_to_list(node()),
@@ -190,9 +239,11 @@ job_control_remote_noshell(doc) ->
     [ "Tests that remote shell can be "
       "started by means of job control to -noshell node" ];
 job_control_remote_noshell(Config) when is_list(Config) ->
-    case node() of
-	nonode@nohost ->
+    case {node(),proplists:get_value(default_shell,Config)} of
+	{nonode@nohost,_} ->
 	    ?line exit(not_distributed);
+	{_,old} ->
+	    {skip,"No new shell found"};
 	_ ->
 	    ?line RNode = create_nodename(),
 	    ?line NSNode = start_noshell_node(interactive_shell_noshell),
@@ -251,7 +302,7 @@ rtnode(Commands,Nodename,ErlPrefix) ->
 				?line {skip, Reason2};
 			    Tempdir ->
 				?line SPid = 
-				    start_runerl_node(RunErl,ErlPrefix++Erl,
+				    start_runerl_node(RunErl,ErlPrefix++"\\\""++Erl++"\\\"",
 						      Tempdir,Nodename),
 				?line CPid = start_toerl_server(ToErl,Tempdir),
 				?line erase(getline_skipped),
@@ -351,6 +402,33 @@ get_and_put(CPid, [{getline, Match}|T],N) ->
 	    end
     end;
 
+%% Hey ho copy paste from stdlib/io_proto_SUITE
+get_and_put(CPid, [{getline_re, Match}|T],N) ->
+    ?dbg({getline_re, Match}),
+    CPid ! {self(), {get_line, timeout(normal)}},
+    receive
+	{get_line, timeout} ->
+	    error_logger:error_msg("~p: getline_re timeout waiting for \"~s\" "
+				   "(command number ~p, skipped: ~p)~n",
+				   [?MODULE, Match,N,get(getline_skipped)]),
+	    {error, timeout};
+	{get_line, Data} ->
+	    ?dbg({data,Data}),
+	    case re:run(Data, Match,[{capture,none}]) of
+		match ->
+		    erase(getline_skipped),
+		    get_and_put(CPid, T,N+1);
+		_ ->
+		    case get(getline_skipped) of
+			undefined ->
+			    put(getline_skipped,[Data]);
+			List ->
+			    put(getline_skipped,List ++ [Data])
+		    end,
+		    get_and_put(CPid,  [{getline_re, Match}|T],N)
+	    end
+    end;
+
 get_and_put(CPid, [{putline_raw, Line}|T],N) ->
     ?dbg({putline_raw, Line}),
     CPid ! {self(), {send_line, Line}},
@@ -487,7 +565,7 @@ start_runerl_node(RunErl,Erl,Tempdir,Nodename) ->
 		       " -setcookie "++atom_to_list(erlang:get_cookie())
 	   end,
     spawn(fun() ->
-		  os:cmd(RunErl++" "++Tempdir++"/ "++Tempdir++" \""++
+		  os:cmd("\""++RunErl++"\" "++Tempdir++"/ "++Tempdir++" \""++
 			 Erl++XArg++"\"")
 	  end).
 
@@ -518,7 +596,7 @@ try_to_erl(Command, N) ->
     end.
 
 toerl_server(Parent,ToErl,Tempdir) ->
-    Port = try_to_erl(ToErl++" "++Tempdir++"/ 2>/dev/null",8),
+    Port = try_to_erl("\""++ToErl++"\" "++Tempdir++"/ 2>/dev/null",8),
     case Port of
 	P when is_port(P) ->
 	    Parent ! {self(),started};
@@ -631,6 +709,13 @@ get_data_within(Port, Timeout, Acc) ->
 	    timeout
     end.
 	    
-	    
-    
-	    
+get_default_shell() ->
+    try
+	rtnode([{putline,""},
+		{putline, "whereis(user_drv)."},
+		{getline, "undefined"}],[]),
+	old
+    catch E:R ->
+	    ?dbg({E,R}),
+	    new
+    end.
diff --git a/lib/kernel/test/kernel.cover b/lib/kernel/test/kernel.cover
index f6967ca651..af1dd7eaad 100644
--- a/lib/kernel/test/kernel.cover
+++ b/lib/kernel/test/kernel.cover
@@ -1,3 +1,3 @@
 %% -*- erlang -*-
-{incl_mods,[gen_udp,inet6_udp,inet_res,inet_dns]}.
+{incl_app,kernel,details}.
 
diff --git a/lib/kernel/test/kernel.spec.wxworks b/lib/kernel/test/kernel.spec.wxworks
deleted file mode 100644
index 370e474e64..0000000000
--- a/lib/kernel/test/kernel.spec.wxworks
+++ /dev/null
@@ -1,63 +0,0 @@
-%% -*- erlang -*-
-{suites,"kernel_test",all}.
-{skip_cases,"kernel_test",bif_SUITE,[spawn_link_race1],"Known bug."}.
-{skip_cases,"kernel_test",file_SUITE,
-            [read_write_file],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [cur_dir_0],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [open1],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [file_info_times],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [file_write_file_info],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [truncate],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [rename],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [e_delete],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [e_rename],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [delayed_write],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [read_ahead],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [segment_write],
-            "VxWorks filesystem would overload"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [segment_read],
-            "VxWorks filesystem would overload"}.
-{skip_cases,"kernel_test",file_SUITE,
-            [compress_errors],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",init_SUITE,[restart],"Uses peer nodes"}.
-{skip_cases,"kernel_test",os_SUITE,[space_in_cwd],"VxWorks can't handle this"}.
-{skip_cases,"kernel_test",os_SUITE,
-            [space_in_name],
-            "VxWorks can't handle this"}.
-{skip_cases,"kernel_test",os_SUITE,[quoting],"VxWorks can't handle this"}.
-{skip_cases,"kernel_test",prim_file_SUITE,
-            [open1],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",prim_file_SUITE,
-            [compress_errors],
-            "VxWorks filesystem can't handle this"}.
-{skip_cases,"kernel_test",seq_trace_SUITE,
-            [distributed_recv],
-            "Test not adopted to slaves on different machine"}.
-{skip_cases,"kernel_test",seq_trace_SUITE,
-            [distributed_exit],
-            "Test not adopted to slaves on different machine"}.
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index ae3410d13f..3f2195b609 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -202,8 +202,6 @@ find_executable(Config) when is_list(Config) ->
 
 	    %% Never return a directory name.
 	    ?line false = os:find_executable("unix", [DataDir]),
-	    ok;
-	vxworks -> 
 	    ok
     end.
 
diff --git a/lib/kernel/test/pdict_SUITE.erl b/lib/kernel/test/pdict_SUITE.erl
index 8afdfc8a47..60b818cbe3 100644
--- a/lib/kernel/test/pdict_SUITE.erl
+++ b/lib/kernel/test/pdict_SUITE.erl
@@ -152,7 +152,6 @@ heavy(Config) when is_list(Config) ->
     time(5000),
     ?M([],get()),
     case {os:type(),?t:is_debug()} of
-	{vxworks,_} -> ok;
 	{_,true} -> ok;	    
 	_ ->
 	    time(50000),
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 3e2202922c..a56746bbc4 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -406,9 +406,6 @@ cur_dir_1(Config, Handle) ->
 	      {unix, _} ->
 		  ?line {error, enotsup} = 
 		      ?PRIM_FILE_call(get_cwd, Handle, ["d:"]);
-	      vxworks ->
-		  ?line {error, enotsup} = 
-		      ?PRIM_FILE_call(get_cwd, Handle,  ["d:"]);
 	      {win32, _} ->
 		  win_cur_dir_1(Config, Handle)
 	  end,
@@ -843,10 +840,7 @@ file_info_basic_directory(Config, Handle) ->
 		  ?line test_directory("c:/", read_write, Handle),
 		  ?line test_directory("c:\\", read_write, Handle);
 	      {unix, _} ->
-		  ?line test_directory("/", read, Handle);
-	      vxworks ->
-		  %% Check is just done for owner
-		  ?line test_directory("/", read_write, Handle)
+		  ?line test_directory("/", read, Handle)
 	  end,
     ?line test_server:timetrap_cancel(Dog).
 
@@ -1508,9 +1502,7 @@ e_delete(Config) when is_list(Config) ->
 			   Base, #file_info {mode=8#600});
 	      {win32, _} ->
 		  %% Remove a character device.
-		  ?line {error, eacces} = ?PRIM_FILE:delete("nul");
-	      vxworks ->
-		  ok
+		  ?line {error, eacces} = ?PRIM_FILE:delete("nul")
 	  end,
 
     ?line test_server:timetrap_cancel(Dog),
@@ -1524,110 +1516,105 @@ e_delete(Config) when is_list(Config) ->
 e_rename(suite) -> [];
 e_rename(doc) -> [];
 e_rename(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "Windriver: dosFs must be fixed first!"};
-	_ ->
-	    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-	    ?line RootDir = ?config(priv_dir, Config),
-	    ?line Base = filename:join(RootDir,
-				       atom_to_list(?MODULE)++"_e_rename"),
-	    ?line ok = ?PRIM_FILE:make_dir(Base),
-	
-	    %% Create an empty directory.
-	    ?line EmptyDir = filename:join(Base, "empty_dir"),
-	    ?line ok = ?PRIM_FILE:make_dir(EmptyDir),
-
-	    %% Create a non-empty directory.
-	    ?line NonEmptyDir = filename:join(Base, "non_empty_dir"),
-	    ?line ok = ?PRIM_FILE:make_dir(NonEmptyDir),
-	    ?line ok = ?PRIM_FILE:write_file(
-			  filename:join(NonEmptyDir, "a_file"),
-			  "hello\n"),
-
-	    %% Create another non-empty directory.
-	    ?line ADirectory = filename:join(Base, "a_directory"),
-	    ?line ok = ?PRIM_FILE:make_dir(ADirectory),
-	    ?line ok = ?PRIM_FILE:write_file(
-			  filename:join(ADirectory, "a_file"),
-			  "howdy\n\n"),
+    ?line Dog = test_server:timetrap(test_server:seconds(10)),
+    ?line RootDir = ?config(priv_dir, Config),
+    ?line Base = filename:join(RootDir,
+	atom_to_list(?MODULE)++"_e_rename"),
+    ?line ok = ?PRIM_FILE:make_dir(Base),
 
-	    %% Create a data file.
-	    ?line File = filename:join(Base, "just_a_file"),
-	    ?line ok = ?PRIM_FILE:write_file(File, "anything goes\n\n"),
-	
-	    %% Move an existing directory to a non-empty directory.
-	    ?line {error, eexist} = 
-		?PRIM_FILE:rename(ADirectory, NonEmptyDir),
-
-	    %% Move a root directory.
-	    ?line {error, einval} = ?PRIM_FILE:rename("/", "arne"),
-
-	    %% Move Base into Base/new_name.
-	    ?line {error, einval} = 
-		?PRIM_FILE:rename(Base, filename:join(Base, "new_name")),
-
-	    %% Overwrite a directory with a file.
-	    ?line expect({error, eexist}, % FreeBSD (?)
-			 {error, eisdir},
-			 ?PRIM_FILE:rename(File, EmptyDir)),
-	    ?line expect({error, eexist}, % FreeBSD (?)
-			 {error, eisdir},
-			 ?PRIM_FILE:rename(File, NonEmptyDir)),
-
-	    %% Move a non-existing file.
-	    ?line NonExistingFile = filename:join(
-				      Base, "non_existing_file"),
-	    ?line {error, enoent} = 
-		?PRIM_FILE:rename(NonExistingFile, NonEmptyDir),
-
-	    %% Overwrite a file with a directory.
-	    ?line expect({error, eexist}, % FreeBSD (?)
-			 {error, enotdir},
-			 ?PRIM_FILE:rename(ADirectory, File)),
-
-	    %% Move a file to another filesystem.
-	    %% XXX - This test case is bogus. We cannot be guaranteed that
-	    %%       the source and destination are on 
-	    %%       different filesystems.
-	    %%
-	    %% XXX - Gross hack!
-	    ?line Comment = 
-		case os:type() of
-		    {unix, _} ->
-			OtherFs = "/tmp",
-			?line NameOnOtherFs =
-			    filename:join(OtherFs, 
-					  filename:basename(File)),
-			?line {ok, Com} = 
-			    case ?PRIM_FILE:rename(
-				    File, NameOnOtherFs) of
-				{error, exdev} ->
-				    %% The file could be in 
-				    %% the same filesystem!
-				    {ok, ok};
-				ok ->
-				    {ok, {comment, 
-					  "Moving between filesystems "
-					  "suceeded, files are probably "
-					  "in the same filesystem!"}};
-				{error, eperm} ->
-				    {ok, {comment, "SBS! You don't "
-					  "have the permission to do "
-					  "this test!"}};
-				Else ->
-				    Else
-			    end,
-			Com;
-		    {win32, _} ->
-			%% At least Windows NT can 
-			%% successfully move a file to
-			%% another drive.
-			ok
-		end,
-	    ?line test_server:timetrap_cancel(Dog),
-	    Comment
-    end.
+    %% Create an empty directory.
+    ?line EmptyDir = filename:join(Base, "empty_dir"),
+    ?line ok = ?PRIM_FILE:make_dir(EmptyDir),
+
+    %% Create a non-empty directory.
+    ?line NonEmptyDir = filename:join(Base, "non_empty_dir"),
+    ?line ok = ?PRIM_FILE:make_dir(NonEmptyDir),
+    ?line ok = ?PRIM_FILE:write_file(
+	filename:join(NonEmptyDir, "a_file"),
+	"hello\n"),
+
+    %% Create another non-empty directory.
+    ?line ADirectory = filename:join(Base, "a_directory"),
+    ?line ok = ?PRIM_FILE:make_dir(ADirectory),
+    ?line ok = ?PRIM_FILE:write_file(
+	filename:join(ADirectory, "a_file"),
+	"howdy\n\n"),
+
+    %% Create a data file.
+    ?line File = filename:join(Base, "just_a_file"),
+    ?line ok = ?PRIM_FILE:write_file(File, "anything goes\n\n"),
+
+    %% Move an existing directory to a non-empty directory.
+    ?line {error, eexist} = 
+    ?PRIM_FILE:rename(ADirectory, NonEmptyDir),
+
+    %% Move a root directory.
+    ?line {error, einval} = ?PRIM_FILE:rename("/", "arne"),
+
+    %% Move Base into Base/new_name.
+    ?line {error, einval} = 
+    ?PRIM_FILE:rename(Base, filename:join(Base, "new_name")),
+
+    %% Overwrite a directory with a file.
+    ?line expect({error, eexist}, % FreeBSD (?)
+	{error, eisdir},
+	?PRIM_FILE:rename(File, EmptyDir)),
+    ?line expect({error, eexist}, % FreeBSD (?)
+	{error, eisdir},
+	?PRIM_FILE:rename(File, NonEmptyDir)),
+
+    %% Move a non-existing file.
+    ?line NonExistingFile = filename:join(
+	Base, "non_existing_file"),
+    ?line {error, enoent} = 
+    ?PRIM_FILE:rename(NonExistingFile, NonEmptyDir),
+
+    %% Overwrite a file with a directory.
+    ?line expect({error, eexist}, % FreeBSD (?)
+	{error, enotdir},
+	?PRIM_FILE:rename(ADirectory, File)),
+
+    %% Move a file to another filesystem.
+    %% XXX - This test case is bogus. We cannot be guaranteed that
+    %%       the source and destination are on 
+    %%       different filesystems.
+    %%
+    %% XXX - Gross hack!
+    ?line Comment = 
+    case os:type() of
+	{unix, _} ->
+	    OtherFs = "/tmp",
+	    ?line NameOnOtherFs =
+	    filename:join(OtherFs, 
+		filename:basename(File)),
+	    ?line {ok, Com} = 
+	    case ?PRIM_FILE:rename(
+		    File, NameOnOtherFs) of
+		{error, exdev} ->
+		    %% The file could be in 
+		    %% the same filesystem!
+		    {ok, ok};
+		ok ->
+		    {ok, {comment, 
+			    "Moving between filesystems "
+			    "suceeded, files are probably "
+			    "in the same filesystem!"}};
+		{error, eperm} ->
+		    {ok, {comment, "SBS! You don't "
+			    "have the permission to do "
+			    "this test!"}};
+		Else ->
+		    Else
+	    end,
+	    Com;
+	{win32, _} ->
+	    %% At least Windows NT can 
+	    %% successfully move a file to
+	    %% another drive.
+	    ok
+    end,
+    ?line test_server:timetrap_cancel(Dog),
+    Comment.
 
 e_make_dir(suite) -> [];
 e_make_dir(doc) -> [];
@@ -1660,8 +1647,6 @@ e_make_dir(Config) when is_list(Config) ->
 	    ?line 
 		?PRIM_FILE:write_file_info(Base, #file_info {mode=8#600});
 	{win32, _} ->
-	    ok;
-	vxworks ->
 	    ok
     end,
     ?line test_server:timetrap_cancel(Dog),
@@ -1716,8 +1701,6 @@ e_del_dir(Config) when is_list(Config) ->
 	    ?line ?PRIM_FILE:write_file_info(
 		     Base, #file_info {mode=8#600});
 	{win32, _} ->
-	    ok;
-	vxworks ->
 	    ok
     end,
     ?line test_server:timetrap_cancel(Dog),
diff --git a/lib/kernel/test/wrap_log_reader_SUITE.erl b/lib/kernel/test/wrap_log_reader_SUITE.erl
index 96dc3e6d33..16b3a7cc1e 100644
--- a/lib/kernel/test/wrap_log_reader_SUITE.erl
+++ b/lib/kernel/test/wrap_log_reader_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -557,7 +557,7 @@ rec(M, Where) ->
         M ->
             ok;
         Else -> ?t:fail({error, {Where, Else}})
-    after 1000 -> ?t:fail({error, {Where, time_out}})
+    after 5000 -> ?t:fail({error, {Where, time_out}})
     end.
 	    
 pps() ->
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 76d3003ff4..46a991eb38 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 2.15.1
+KERNEL_VSN = 2.16
diff --git a/lib/megaco/Makefile b/lib/megaco/Makefile
index 9dc84c122c..3bf502ba1c 100644
--- a/lib/megaco/Makefile
+++ b/lib/megaco/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -49,11 +49,14 @@ VSN=$(MEGACO_VSN)
 
 DIR_NAME = megaco_src-$(VSN)$(PRE_VSN)
 
+nullstring :=
+space := $(nullstring) # a space at the end
+
 ifndef APP_RELEASE_DIR
   ifndef TESTROOT
     APP_RELEASE_DIR = /tmp
   else
-    APP_RELEASE_DIR = $(TESTROOT)
+    APP_RELEASE_DIR = $(subst $(space),\ ,$(TESTROOT))
   endif
 endif
 
@@ -151,7 +154,7 @@ version:
 # Application install (of a app built from source) targets
 # ----------------------------------------------------
 app_install:
-	$(MAKE) TESTROOT=$(APP_INSTALL_DIR) release 
+	$(MAKE) TESTROOT="$(APP_INSTALL_DIR)" release 
 
 
 # ----------------------------------------------------
@@ -185,20 +188,20 @@ TAR.exclude2: Makefile TAR.exclude
 	(cd ..; find megaco -name '.cmake.state' >> megaco/TAR.exclude2)
 
 $(APP_DIR): tar_exclude
-	mkdir -p $(APP_DIR); \
+	mkdir -p "$(subst $(space),\ ,$@)"; \
         (cd ..; tar cfX - megaco/TAR.exclude2 megaco) | \
-        (cd $(APP_DIR); tar xf -); \
-        mv $(APP_DIR)/megaco/* $(APP_DIR)/; \
-	mkdir $(APP_DIR)/autoconf; \
-        cp autoconf/config.guess $(APP_DIR)/autoconf/; \
-        cp autoconf/config.sub $(APP_DIR)/autoconf/; \
-        cp autoconf/install-sh $(APP_DIR)/autoconf/; \
-        rmdir $(APP_DIR)/megaco
+        (cd "$(subst $(space),\ ,$@)"; tar xf -); \
+        mv "$(subst $(space),\ ,$@)"/megaco/* "$(subst $(space),\ ,$@)"/; \
+	mkdir $(subst $(space),\ ,$@)/autoconf; \
+        cp autoconf/config.guess "$(subst $(space),\ ,$@)"/autoconf/; \
+        cp autoconf/config.sub "$(subst $(space),\ ,$@)"/autoconf/; \
+        cp autoconf/install-sh "$(subst $(space),\ ,$@)"/autoconf/; \
+        rmdir "$(subst $(space),\ ,$@)"/megaco
 
 tar: $(APP_TAR_FILE)
 
 $(APP_TAR_FILE): $(APP_DIR)
-	(cd $(APP_RELEASE_DIR); gtar zcf $(APP_TAR_FILE) $(DIR_NAME))
+	(cd "$(APP_RELEASE_DIR)"; gtar zcf "$(subst $(space),\ ,$@)" $(DIR_NAME))
 
 dialyzer_plt: $(DIA_PLT)
 
diff --git a/lib/megaco/configure.in b/lib/megaco/configure.in
index 42c50b8961..722ccc3fb4 100644
--- a/lib/megaco/configure.in
+++ b/lib/megaco/configure.in
@@ -145,7 +145,7 @@ AC_ARG_ENABLE(megaco_flex_scanner_lineno,
 AC_SUBST(ENABLE_MEGACO_FLEX_SCANNER_LINENO)
 
 
-dnl This is the os flavour, should be unix, vxworks or win32
+dnl This is the os flavour, should be unix or win32
 if test "X$host" = "Xwin32"; then
 	ERLANG_OSTYPE=win32
 else
diff --git a/lib/megaco/doc/src/Makefile b/lib/megaco/doc/src/Makefile
index 137f0315d8..f35413a4fd 100644
--- a/lib/megaco/doc/src/Makefile
+++ b/lib/megaco/doc/src/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2000-2011. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -164,16 +164,16 @@ info:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR)  $(RELSYSDIR)/doc/standard
-	$(INSTALL_DATA) $(STANDARDS) $(RELSYSDIR)/doc/standard
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/doc/standard"
+	$(INSTALL_DATA) $(STANDARDS) "$(RELSYSDIR)/doc/standard"
 
 release_spec:
 
diff --git a/lib/megaco/doc/src/megaco_encode.xml b/lib/megaco/doc/src/megaco_encode.xml
index 410e4f3b31..4a9d63c2e3 100644
--- a/lib/megaco/doc/src/megaco_encode.xml
+++ b/lib/megaco/doc/src/megaco_encode.xml
@@ -224,22 +224,11 @@
           messages.</p>
       </item>
       <item>
-        <p>megaco_ber_bin_encoder - encode/decode ASN.1 BER
-          messages. This encoder uses ASN.1 ber_bin which
-          has been optimized using the bit syntax.</p>
-      </item>
-      <item>
         <p>megaco_per_encoder - encode/decode ASN.1 PER
           messages. N.B. that this format is not included in the
           Megaco standard.</p>
       </item>
       <item>
-        <p>megaco_per_bin_encoder - encode/decode ASN.1 PER
-          messages. N.B. that this format is not included in the
-          Megaco standard. This encoder uses ASN.1 per_bin which
-          has been optimized using the bit syntax.</p>
-      </item>
-      <item>
         <p>megaco_erl_dist_encoder - encodes messages into Erlangs
           distribution format. It is rather verbose but encoding and
           decoding is blinding fast. N.B. that this format is not 
@@ -370,18 +359,6 @@
       needs to be specified.</p>
     <list type="bulleted">
       <item>
-        <p><c><![CDATA[[driver|_]]]></c> - make use of the asn1 driver for decode
-          (ber_bin) and encode (per_bin). This option is only available for 
-          encoding modules: <c><![CDATA[megaco_binary_encoder]]></c>, 
-          <c><![CDATA[megaco_ber_bin_encoder]]></c> and <c><![CDATA[megaco_per_bin_encoder]]></c>.</p>
-        <p>If this option is present in the encoding config, it <em>must</em> 
-          to be the <em>first</em>, unless the 
-          <seealso marker="#handling_versions">version3</seealso> encoding 
-          config is present, in which case it must come second, after 
-          the version3 encoding config,  
-          e.g. <c><![CDATA[[{version3,prev3b},driver]]]></c>.</p>
-      </item>
-      <item>
         <p><c><![CDATA[[native]]]></c> - skips the transformation phase, i.e. 
           the decoded message(s) will not be transformed into our internal
           form.</p>
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 393064fbb5..928e3bea82 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -36,6 +36,78 @@
     section is the version number of Megaco.</p>
 
 
+  <section><title>Megaco 3.16.0.2</title>
+
+    <p>Version 3.16.0.2 supports code replacement in runtime from/to
+      version 3.16.0.1, 3.16, 3.15.1.1, 3.15.1 and 3.15.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>Allow whitespaces in installation path. </p>
+          <p>It is now possible to give configure and make an 
+	  installation/release path with whitespaces in it. </p>
+          <p>Own Id: OTP-10107</p>
+        </item>
+
+        <item>
+          <p>Fix parallel make for behaviours. </p>
+        </item>
+
+        <item>
+          <p>Removed use of deprecated system flag, 
+	  <c>global_haeps_size</c>, in the measurement tool 
+	  <c>mstone1</c>. </p>
+        </item>
+
+     </list>
+
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+      
+      <p>-</p>
+      
+ <!--
+      <list type="bulleted">
+	<item>
+	  <p>Fixing miscellaneous things detected by dialyzer. </p>
+	  <p>Own Id: OTP-9075</p>
+	</item>
+	
+      </list>
+ -->
+      
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+	  <p>Due to the change in the flex driver API, 
+	  we may no longer be able to build and/or use 
+	  the flex driver without reentrant support. </p>
+          <p>Own Id: OTP-9795</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+  </section> <!-- 3.16.0.2 -->
+
+
   <section><title>Megaco 3.16.0.1</title>
 
     <p>Version 3.16.0.1 supports code replacement in runtime from/to
diff --git a/lib/megaco/examples/meas/Makefile.in b/lib/megaco/examples/meas/Makefile.in
index 6af7ef6c65..c517fd21cf 100644
--- a/lib/megaco/examples/meas/Makefile.in
+++ b/lib/megaco/examples/meas/Makefile.in
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2002-2011. All Rights Reserved.
+# Copyright Ericsson AB 2002-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -131,12 +131,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR)  $(EXAMPLE_RELSYSDIR)
-	$(INSTALL_DIR)  $(MEAS_RELSYSDIR)
-	$(INSTALL_DATA) $(MESSAGE_PACKAGES) $(MEAS_RELSYSDIR)
-	$(INSTALL_DATA) $(SCRIPT_SKELETONS) $(MEAS_RELSYSDIR)
-	$(INSTALL_DATA) $(TARGET_FILES) $(MEAS_RELSYSDIR)
-	$(INSTALL_DATA) $(ERL_FILES) $(MEAS_RELSYSDIR)
+	$(INSTALL_DIR)  "$(EXAMPLE_RELSYSDIR)"
+	$(INSTALL_DIR)  "$(MEAS_RELSYSDIR)"
+	$(INSTALL_DATA) $(MESSAGE_PACKAGES) "$(MEAS_RELSYSDIR)"
+	$(INSTALL_DATA) $(SCRIPT_SKELETONS) "$(MEAS_RELSYSDIR)"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(MEAS_RELSYSDIR)"
+	$(INSTALL_DATA) $(ERL_FILES) "$(MEAS_RELSYSDIR)"
 
 
 release_docs_spec:
diff --git a/lib/megaco/examples/meas/megaco_codec_meas.erl b/lib/megaco/examples/meas/megaco_codec_meas.erl
index 51ee396338..65b986ccd1 100644
--- a/lib/megaco/examples/meas/megaco_codec_meas.erl
+++ b/lib/megaco/examples/meas/megaco_codec_meas.erl
@@ -176,7 +176,7 @@ display_megaco_info() ->
     io:format("Megaco version:      ~s (~s)~n", [Ver, FlexStr]).
 
 display_asn1_info() ->
-    AI = megaco_ber_bin_drv_media_gateway_control_v1:info(),
+    AI = megaco_ber_media_gateway_control_v1:info(),
     Vsn = 
 	case lists:keysearch(vsn, 1, AI) of
 	    {value, {vsn, V}} when is_atom(V) ->
@@ -281,15 +281,11 @@ expand_codec(Codec) ->
 	    [{Codec, megaco_compact_text_encoder, [flex_scanner], 3000},
 	     {Codec, megaco_compact_text_encoder, [],             1500}];
 	ber ->
-	    [{Codec, megaco_ber_bin_encoder, [driver,native], 4000},
-	     {Codec, megaco_ber_bin_encoder, [native],        3000},
-	     {Codec, megaco_ber_bin_encoder, [driver],        3000},
-	     {Codec, megaco_ber_bin_encoder, [],              1000}];
+	    [{Codec, megaco_ber_encoder, [native],        3000},
+	     {Codec, megaco_ber_encoder, [],              1000}];
 	per ->
-	    [{Codec, megaco_per_bin_encoder, [driver,native], 4000},
-	     {Codec, megaco_per_bin_encoder, [native],        3000},
-	     {Codec, megaco_per_bin_encoder, [driver],        3000},
-	     {Codec, megaco_per_bin_encoder, [],              1000}];
+	    [{Codec, megaco_per_encoder, [native],        3000},
+	     {Codec, megaco_per_encoder, [],              1000}];
 	erlang ->
 	    [
 	     {Codec, megaco_erl_dist_encoder, [megaco_compressed,compressed], 500},
diff --git a/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl b/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
index ca8016d65f..b527ff2e89 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
@@ -100,7 +100,6 @@ display_system_info() ->
     OtpRel        = otp_release(),
     SysVer        = system_version(),
     SysHT         = heap_type(),
-    SysGHSz       = global_heaps_size(),
     SysSMP        = smp_support(),
     SysNumSched   = schedulers(),
     SysProcLimit  = process_limit(),
@@ -113,7 +112,6 @@ display_system_info() ->
     io:format("OTP release:         ~s~n", [OtpRel]),
     io:format("System version:      ~s~n", [SysVer]),
     io:format("Heap type:           ~s~n", [SysHT]),
-    io:format("Global heap size:    ~s~n", [SysGHSz]),
     io:format("Thread support:      ~s~n", [SysThreads]),
     io:format("Thread pool size:    ~s~n", [SysTPSz]),
     io:format("Process limit:       ~s~n", [SysProcLimit]),
@@ -137,9 +135,6 @@ system_version() ->
 heap_type() ->
     system_info(heap_type, any).
 
-global_heaps_size() ->
-    system_info(global_heaps_size, any).
-
 smp_support() ->
     system_info(smp_support, any).
 
@@ -273,7 +268,7 @@ display_megaco_info() ->
     io:format("Megaco version:      ~s~n", [Ver]).
 
 display_asn1_info() ->
-    AI = megaco_ber_bin_drv_media_gateway_control_v1:info(),
+    AI = megaco_ber__media_gateway_control_v1:info(),
     Vsn = 
 	case lists:keysearch(vsn, 1, AI) of
 	    {value, {vsn, V}} when is_atom(V) ->
@@ -366,15 +361,11 @@ expand_codec(Codec, only_drv) ->
 	    [{Codec, megaco_compact_text_encoder, [flex_scanner]},
 	     {Codec, megaco_compact_text_encoder, [flex_scanner]}];
 	ber ->
-	    [{Codec, megaco_ber_bin_encoder, [driver,native]},
-	     {Codec, megaco_ber_bin_encoder, [driver]},
-	     {Codec, megaco_ber_bin_encoder, [driver,native]},
-	     {Codec, megaco_ber_bin_encoder, [driver]}];
+	    [{Codec, megaco_ber_encoder, [native]},
+	     {Codec, megaco_ber_encoder, []}];
 	per ->
-	    [{Codec, megaco_per_bin_encoder, [driver,native]},
-	     {Codec, megaco_per_bin_encoder, [native]},
-	     {Codec, megaco_per_bin_encoder, [driver,native]},
-	     {Codec, megaco_per_bin_encoder, [native]}];
+	    [{Codec, megaco_per_encoder, [native]},
+	     {Codec, megaco_per_encoder, []}];
 	erlang ->
 	    Encoder = megaco_erl_dist_encoder,
 	    [
@@ -395,15 +386,11 @@ expand_codec(Codec, no_drv) ->
 	    [{Codec, megaco_compact_text_encoder, []},
 	     {Codec, megaco_compact_text_encoder, []}];
 	ber ->
-	    [{Codec, megaco_ber_bin_encoder, [native]},
-	     {Codec, megaco_ber_bin_encoder, []},
-	     {Codec, megaco_ber_bin_encoder, [native]},
-	     {Codec, megaco_ber_bin_encoder, []}];
+	    [{Codec, megaco_ber_encoder, [native]},
+	     {Codec, megaco_ber_encoder, []}];
 	per ->
-	    [{Codec, megaco_per_bin_encoder, [native]},
-	     {Codec, megaco_per_bin_encoder, []},
-	     {Codec, megaco_per_bin_encoder, [native]},
-	     {Codec, megaco_per_bin_encoder, []}];
+	    [{Codec, megaco_per_encoder, [native]},
+	     {Codec, megaco_per_encoder, []}];
 	erlang ->
 	    Encoder = megaco_erl_dist_encoder,
 	    [
@@ -424,15 +411,11 @@ expand_codec(Codec, _) ->
 	    [{Codec, megaco_compact_text_encoder, [flex_scanner]},
 	     {Codec, megaco_compact_text_encoder, []}];
 	ber ->
-	    [{Codec, megaco_ber_bin_encoder, [driver,native]},
-	     {Codec, megaco_ber_bin_encoder, [native]},
-	     {Codec, megaco_ber_bin_encoder, [driver]},
-	     {Codec, megaco_ber_bin_encoder, []}];
+	    [{Codec, megaco_ber_encoder, [native]},
+	     {Codec, megaco_ber_encoder, []}];
 	per ->
-	    [{Codec, megaco_per_bin_encoder, [driver,native]},
-	     {Codec, megaco_per_bin_encoder, [native]},
-	     {Codec, megaco_per_bin_encoder, [driver]},
-	     {Codec, megaco_per_bin_encoder, []}];
+	    [{Codec, megaco_per_encoder, [native]},
+	     {Codec, megaco_per_encoder, []}];
 	erlang ->
 	    Encoder = megaco_erl_dist_encoder,
 	    [
diff --git a/lib/megaco/examples/meas/megaco_codec_transform.erl b/lib/megaco/examples/meas/megaco_codec_transform.erl
index cfe832ff26..15db165566 100644
--- a/lib/megaco/examples/meas/megaco_codec_transform.erl
+++ b/lib/megaco/examples/meas/megaco_codec_transform.erl
@@ -213,11 +213,11 @@ decode_message(compact, BinMsg) ->
     Conf = [{version3,?V3}],
     do_decode(Mod, Conf, BinMsg);
 decode_message(ber, BinMsg) ->
-    Mod  = megaco_ber_bin_encoder,
+    Mod  = megaco_ber_encoder,
     Conf = [{version3,?V3}],
     do_decode(Mod, Conf, BinMsg);
 decode_message(per, BinMsg) ->
-    Mod  = megaco_per_bin_encoder,
+    Mod  = megaco_per_encoder,
     Conf = [{version3,?V3}],
     do_decode(Mod, Conf, BinMsg);
 decode_message(erlang, BinMsg) ->
diff --git a/lib/megaco/examples/simple/Makefile b/lib/megaco/examples/simple/Makefile
index f91d1d886f..8ec9db71db 100644
--- a/lib/megaco/examples/simple/Makefile
+++ b/lib/megaco/examples/simple/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -139,9 +139,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/simple
-	$(INSTALL_DATA) $(ERL_FILES) $(TARGET_FILES) $(RELSYSDIR)/examples/simple
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/simple"
+	$(INSTALL_DATA) $(ERL_FILES) $(TARGET_FILES) "$(RELSYSDIR)/examples/simple"
 
 
 release_docs_spec:
diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile
index 01dfb9b860..42030c5b1c 100644
--- a/lib/megaco/src/app/Makefile
+++ b/lib/megaco/src/app/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2007-2009. All Rights Reserved.
+# Copyright Ericsson AB 2007-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -108,14 +108,14 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/app
-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/app
-	$(INSTALL_DIR)  $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/app"
+	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
 
 
 release_docs_spec:
diff --git a/lib/megaco/src/app/megaco.app.src b/lib/megaco/src/app/megaco.app.src
index c0d8218ac8..0ba2a866f9 100644
--- a/lib/megaco/src/app/megaco.app.src
+++ b/lib/megaco/src/app/megaco.app.src
@@ -23,19 +23,6 @@
   {modules,
    [	
 	megaco,
-	megaco_ber_bin_encoder,
-	megaco_ber_bin_drv_media_gateway_control_v1,
-	megaco_ber_bin_drv_media_gateway_control_v2,
-	megaco_ber_bin_drv_media_gateway_control_prev3a,
-	megaco_ber_bin_drv_media_gateway_control_prev3b,
-	megaco_ber_bin_drv_media_gateway_control_prev3c,
-	megaco_ber_bin_drv_media_gateway_control_v3,
-	megaco_ber_bin_media_gateway_control_v1,
-	megaco_ber_bin_media_gateway_control_v2,
-	megaco_ber_bin_media_gateway_control_prev3a,
-	megaco_ber_bin_media_gateway_control_prev3b,
-	megaco_ber_bin_media_gateway_control_prev3c,
-	megaco_ber_bin_media_gateway_control_v3,
 	megaco_ber_encoder,
 	megaco_ber_media_gateway_control_v1,
 	megaco_ber_media_gateway_control_v2,
@@ -87,19 +74,6 @@
 	megaco_per_media_gateway_control_prev3b,
 	megaco_per_media_gateway_control_prev3c,
 	megaco_per_media_gateway_control_v3,
-	megaco_per_bin_encoder,
-	megaco_per_bin_drv_media_gateway_control_v1,
-	megaco_per_bin_drv_media_gateway_control_v2,
-	megaco_per_bin_drv_media_gateway_control_prev3a,
-	megaco_per_bin_drv_media_gateway_control_prev3b,
-	megaco_per_bin_drv_media_gateway_control_prev3c,
-	megaco_per_bin_drv_media_gateway_control_v3,
-	megaco_per_bin_media_gateway_control_v1,
-	megaco_per_bin_media_gateway_control_v2,
-	megaco_per_bin_media_gateway_control_prev3a,
-	megaco_per_bin_media_gateway_control_prev3b,
-	megaco_per_bin_media_gateway_control_prev3c,
-	megaco_per_bin_media_gateway_control_v3,
 	megaco_pretty_text_encoder,
 	megaco_pretty_text_encoder_v1,
 	megaco_pretty_text_encoder_v2,
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index 7f89fa8bc2..a7b38eb107 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -145,10 +145,17 @@
 %%      |
 %%      v
 %%   3.16.0.1
+%%      |
+%%      v
+%%   3.16.0.2
 %%
 %%
 {"%VSN%",
  [
+  {"3.16.0.1", 
+   [
+   ]
+  },
   {"3.16", 
    [
    ]
@@ -170,6 +177,10 @@
   }
  ],
  [
+  {"3.16.0.1", 
+   [
+   ]
+  },
   {"3.16", 
    [
    ]
diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile
index d594f34f43..660713605e 100644
--- a/lib/megaco/src/binary/Makefile
+++ b/lib/megaco/src/binary/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2009. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -50,46 +50,22 @@ ASN1_SPECS = $(ASN1_V1_SPEC) \
 ASN1_FILES = $(ASN1_SPECS:%=%.asn)
 
 V1_SPECS = $(BER_ASN1_V1_SPEC)         \
-           $(BER_BIN_ASN1_V1_SPEC)     \
-           $(BER_BIN_DRV_ASN1_V1_SPEC) \
-           $(PER_ASN1_V1_SPEC)         \
-           $(PER_BIN_ASN1_V1_SPEC)     \
-           $(PER_BIN_DRV_ASN1_V1_SPEC) 
+           $(PER_ASN1_V1_SPEC)
 
 V2_SPECS = $(BER_ASN1_V2_SPEC)         \
-           $(BER_BIN_ASN1_V2_SPEC)     \
-           $(BER_BIN_DRV_ASN1_V2_SPEC) \
-           $(PER_ASN1_V2_SPEC)         \
-           $(PER_BIN_ASN1_V2_SPEC)     \
-           $(PER_BIN_DRV_ASN1_V2_SPEC) 
+           $(PER_ASN1_V2_SPEC)
 
 PREV3A_SPECS = $(BER_ASN1_PREV3A_SPEC)         \
-               $(BER_BIN_ASN1_PREV3A_SPEC)     \
-               $(BER_BIN_DRV_ASN1_PREV3A_SPEC) \
-               $(PER_ASN1_PREV3A_SPEC)         \
-               $(PER_BIN_ASN1_PREV3A_SPEC)     \
-               $(PER_BIN_DRV_ASN1_PREV3A_SPEC) 
+               $(PER_ASN1_PREV3A_SPEC)
 
 PREV3B_SPECS = $(BER_ASN1_PREV3B_SPEC)         \
-               $(BER_BIN_ASN1_PREV3B_SPEC)     \
-               $(BER_BIN_DRV_ASN1_PREV3B_SPEC) \
-               $(PER_ASN1_PREV3B_SPEC)         \
-               $(PER_BIN_ASN1_PREV3B_SPEC)     \
-               $(PER_BIN_DRV_ASN1_PREV3B_SPEC) 
+               $(PER_ASN1_PREV3B_SPEC)
 
 PREV3C_SPECS = $(BER_ASN1_PREV3C_SPEC)         \
-               $(BER_BIN_ASN1_PREV3C_SPEC)     \
-               $(BER_BIN_DRV_ASN1_PREV3C_SPEC) \
-               $(PER_ASN1_PREV3C_SPEC)         \
-               $(PER_BIN_ASN1_PREV3C_SPEC)     \
-               $(PER_BIN_DRV_ASN1_PREV3C_SPEC) 
+               $(PER_ASN1_PREV3C_SPEC)
 
 V3_SPECS = $(BER_ASN1_V3_SPEC)         \
-           $(BER_BIN_ASN1_V3_SPEC)     \
-           $(BER_BIN_DRV_ASN1_V3_SPEC) \
            $(PER_ASN1_V3_SPEC)         \
-           $(PER_BIN_ASN1_V3_SPEC)     \
-           $(PER_BIN_DRV_ASN1_V3_SPEC) \
            $(PREV3A_SPECS) $(PREV3B_SPECS) $(PREV3C_SPECS)
 
 SPECS = $(V1_SPECS) $(V2_SPECS) $(V3_SPECS)
@@ -194,11 +170,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/binary
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) $(RELSYSDIR)/src/binary
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/binary"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) "$(RELSYSDIR)/src/binary"
 
 
 release_docs_spec:
diff --git a/lib/megaco/src/binary/depend.mk b/lib/megaco/src/binary/depend.mk
index c9ca34bcf6..a1318079be 100644
--- a/lib/megaco/src/binary/depend.mk
+++ b/lib/megaco/src/binary/depend.mk
@@ -19,17 +19,8 @@
 
 # Flag description:
 # 
-# +optimize
-# For ber_bin this means "optimize" (whatever that is),
-# but for per_bin it means that a stage in the encode
-# is done in the asn1 driver.
-#
-# +nif
-# For ber_bin this means that part of the decode is done
-# in the asn1 nif.
-#
 # +asn1config
-# This is only used by the ber_bin, and means that 
+# This is only used by the ber, and means that
 # some partial decode functions will be created 
 # (as described by the asn1config file).
 # 
@@ -43,42 +34,18 @@ ifeq ($(MEGACO_INLINE_ASN1_RT),true)
 ASN1_CT_OPTS += +inline
 endif
 
-BER_V1_FLAGS             = $(ASN1_CT_OPTS)
-BER_BIN_V1_FLAGS         = $(ASN1_CT_OPTS) +asn1config +optimize
-BER_BIN_DRV_V1_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize +nif
-BER_V2_FLAGS             = $(ASN1_CT_OPTS)
-BER_BIN_V2_FLAGS         = $(ASN1_CT_OPTS) +asn1config +optimize
-BER_BIN_DRV_V2_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize +nif
-BER_PREV3A_FLAGS         = $(ASN1_CT_OPTS)
-BER_BIN_PREV3A_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize
-BER_BIN_DRV_PREV3A_FLAGS = $(ASN1_CT_OPTS) +asn1config +optimize +nif
-BER_PREV3B_FLAGS         = $(ASN1_CT_OPTS)
-BER_BIN_PREV3B_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize
-BER_BIN_DRV_PREV3B_FLAGS = $(ASN1_CT_OPTS) +asn1config +optimize +nif
-BER_PREV3C_FLAGS         = $(ASN1_CT_OPTS)
-BER_BIN_PREV3C_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize
-BER_BIN_DRV_PREV3C_FLAGS = $(ASN1_CT_OPTS) +asn1config +optimize +nif
-BER_V3_FLAGS             = $(ASN1_CT_OPTS)
-BER_BIN_V3_FLAGS         = $(ASN1_CT_OPTS) +asn1config +optimize
-BER_BIN_DRV_V3_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize +nif
+BER_V1_FLAGS             = $(ASN1_CT_OPTS) +asn1config
+BER_V2_FLAGS             = $(ASN1_CT_OPTS) +asn1config
+BER_PREV3A_FLAGS         = $(ASN1_CT_OPTS) +asn1config
+BER_PREV3B_FLAGS         = $(ASN1_CT_OPTS) +asn1config
+BER_PREV3C_FLAGS         = $(ASN1_CT_OPTS) +asn1config
+BER_V3_FLAGS             = $(ASN1_CT_OPTS) +asn1config
 PER_V1_FLAGS             = $(ASN1_CT_OPTS)
-PER_BIN_V1_FLAGS         = $(ASN1_CT_OPTS)
-PER_BIN_DRV_V1_FLAGS     = $(ASN1_CT_OPTS) +optimize
 PER_V2_FLAGS             = $(ASN1_CT_OPTS)
-PER_BIN_V2_FLAGS         = $(ASN1_CT_OPTS)
-PER_BIN_DRV_V2_FLAGS     = $(ASN1_CT_OPTS) +optimize
 PER_PREV3A_FLAGS         = $(ASN1_CT_OPTS)
-PER_BIN_PREV3A_FLAGS     = $(ASN1_CT_OPTS)
-PER_BIN_DRV_PREV3A_FLAGS = $(ASN1_CT_OPTS) +optimize
 PER_PREV3B_FLAGS         = $(ASN1_CT_OPTS)
-PER_BIN_PREV3B_FLAGS     = $(ASN1_CT_OPTS)
-PER_BIN_DRV_PREV3B_FLAGS = $(ASN1_CT_OPTS) +optimize
 PER_PREV3C_FLAGS         = $(ASN1_CT_OPTS)
-PER_BIN_PREV3C_FLAGS     = $(ASN1_CT_OPTS)
-PER_BIN_DRV_PREV3C_FLAGS = $(ASN1_CT_OPTS) +optimize
 PER_V3_FLAGS             = $(ASN1_CT_OPTS)
-PER_BIN_V3_FLAGS         = $(ASN1_CT_OPTS)
-PER_BIN_DRV_V3_FLAGS     = $(ASN1_CT_OPTS) +optimize
 
 
 # --- Version 1 ---
@@ -92,26 +59,6 @@ $(BER_ASN1_V1_SPEC).erl: \
 $(EBIN)/$(BER_ASN1_V1_SPEC).$(EMULATOR): \
 	$(BER_ASN1_V1_SPEC).erl
 
-$(BER_BIN_ASN1_V1_SPEC).erl: \
-	$(BER_BIN_ASN1_V1_SPEC).set.asn \
-	$(BER_BIN_ASN1_V1_SPEC).asn1config \
-	$(ASN1_V1_SPEC).asn
-	@echo "$(BER_BIN_ASN1_V1_SPEC):"
-	$(ERLC) -bber_bin $(BER_BIN_V1_FLAGS) $(BER_BIN_ASN1_V1_SPEC).set.asn
-
-$(EBIN)/$(BER_BIN_ASN1_V1_SPEC).$(EMULATOR): \
-	$(BER_BIN_ASN1_V1_SPEC).erl
-
-$(BER_BIN_DRV_ASN1_V1_SPEC).erl: \
-	$(BER_BIN_DRV_ASN1_V1_SPEC).set.asn \
-	$(BER_BIN_DRV_ASN1_V1_SPEC).asn1config \
-	$(ASN1_V1_SPEC).asn
-	@echo "$(BER_BIN_DRV_ASN1_V1_SPEC):"
-	$(ERLC) -bber_bin $(BER_BIN_DRV_V1_FLAGS) $(BER_BIN_DRV_ASN1_V1_SPEC).set.asn
-
-$(EBIN)/$(BER_BIN_DRV_ASN1_V1_SPEC).$(EMULATOR): \
-	$(BER_BIN_DRV_ASN1_V1_SPEC).erl
-
 $(PER_ASN1_V1_SPEC).erl: \
 	$(PER_ASN1_V1_SPEC).set.asn \
 	$(ASN1_V1_SPEC).asn
@@ -121,24 +68,6 @@ $(PER_ASN1_V1_SPEC).erl: \
 $(EBIN)/$(PER_ASN1_V1_SPEC).$(EMULATOR): \
 	$(PER_ASN1_V1_SPEC).erl
 
-$(PER_BIN_ASN1_V1_SPEC).erl: \
-	$(PER_BIN_ASN1_V1_SPEC).set.asn \
-	$(ASN1_V1_SPEC).asn
-	@echo "$(PER_BIN_ASN1_V1_SPEC):"
-	$(ERLC) -bper_bin $(PER_BIN_V1_FLAGS) $(PER_BIN_ASN1_V1_SPEC).set.asn
-
-$(EBIN)/$(PER_BIN_ASN1_V1_SPEC).$(EMULATOR): \
-	$(PER_BIN_ASN1_V1_SPEC).erl
-
-$(PER_BIN_DRV_ASN1_V1_SPEC).erl: \
-	$(PER_BIN_DRV_ASN1_V1_SPEC).set.asn \
-	$(ASN1_V1_SPEC).asn
-	@echo "$(PER_BIN_DRV_ASN1_V1_SPEC):"
-	$(ERLC) -bper_bin $(PER_BIN_DRV_V1_FLAGS) $(PER_BIN_DRV_ASN1_V1_SPEC).set.asn
-
-$(EBIN)/$(PER_BIN_DRV_ASN1_V1_SPEC).$(EMULATOR): \
-	$(PER_BIN_DRV_ASN1_V1_SPEC).erl
-
 
 # --- Version 2 ---
 
@@ -151,26 +80,6 @@ $(BER_ASN1_V2_SPEC).erl: \
 $(EBIN)/$(BER_ASN1_V2_SPEC).$(EMULATOR): \
 	$(BER_ASN1_V2_SPEC).erl
 
-$(BER_BIN_ASN1_V2_SPEC).erl: \
-	$(BER_BIN_ASN1_V2_SPEC).set.asn \
-	$(BER_BIN_ASN1_V2_SPEC).asn1config \
-	$(ASN1_V2_SPEC).asn
-	@echo "$(BER_BIN_ASN1_V2_SPEC):"
-	$(ERLC) -bber_bin $(BER_BIN_V2_FLAGS) $(BER_BIN_ASN1_V2_SPEC).set.asn
-
-$(EBIN)/$(BER_BIN_ASN1_V2_SPEC).$(EMULATOR): \
-	$(BER_BIN_ASN1_V2_SPEC).erl
-
-$(BER_BIN_DRV_ASN1_V2_SPEC).erl: \
-	$(BER_BIN_DRV_ASN1_V2_SPEC).set.asn \
-	$(BER_BIN_DRV_ASN1_V2_SPEC).asn1config \
-	$(ASN1_V2_SPEC).asn
-	@echo "$(BER_BIN_DRV_ASN1_V2_SPEC):"
-	$(ERLC) -bber_bin $(BER_BIN_DRV_V2_FLAGS) $(BER_BIN_DRV_ASN1_V2_SPEC).set.asn
-
-$(EBIN)/$(BER_BIN_DRV_ASN1_V2_SPEC).$(EMULATOR): \
-	$(BER_BIN_DRV_ASN1_V2_SPEC).erl
-
 $(PER_ASN1_V2_SPEC).erl: \
 	$(PER_ASN1_V2_SPEC).set.asn \
 	$(ASN1_V2_SPEC).asn
@@ -180,25 +89,6 @@ $(PER_ASN1_V2_SPEC).erl: \
 $(EBIN)/$(PER_ASN1_V2_SPEC).$(EMULATOR): \
 	$(PER_ASN1_V2_SPEC).erl
 
-$(PER_BIN_ASN1_V2_SPEC).erl: \
-	$(PER_BIN_ASN1_V2_SPEC).set.asn \
-	$(ASN1_V2_SPEC).asn
-	@echo "$(PER_BIN_ASN1_V2_SPEC):"
-	$(ERLC) -bper_bin $(PER_BIN_V2_FLAGS) $(PER_BIN_ASN1_V2_SPEC).set.asn
-
-$(EBIN)/$(PER_BIN_ASN1_V2_SPEC).$(EMULATOR): \
-	$(PER_BIN_ASN1_V2_SPEC).erl
-
-$(PER_BIN_DRV_ASN1_V2_SPEC).erl: \
-	$(PER_BIN_DRV_ASN1_V2_SPEC).set.asn \
-	$(ASN1_V2_SPEC).asn
-	@echo "$(PER_BIN_DRV_ASN1_V2_SPEC):"
-	$(ERLC) -bper_bin $(PER_BIN_DRV_V2_FLAGS) $(PER_BIN_DRV_ASN1_V2_SPEC).set.asn
-
-$(EBIN)/$(PER_BIN_DRV_ASN1_V2_SPEC).$(EMULATOR): \
-	$(PER_BIN_DRV_ASN1_V2_SPEC).erl
-
-
 # --- Version 3 ---
 
 # -- (prev3a) --
@@ -212,26 +102,6 @@ $(BER_ASN1_PREV3A_SPEC).erl: \
 $(EBIN)/$(BER_ASN1_PREV3A_SPEC).$(EMULATOR): \
 	$(BER_ASN1_PREV3A_SPEC).erl
 
-$(BER_BIN_ASN1_PREV3A_SPEC).erl: \
-	$(BER_BIN_ASN1_PREV3A_SPEC).set.asn \
-	$(BER_BIN_ASN1_PREV3A_SPEC).asn1config \
-	$(ASN1_PREV3A_SPEC).asn
-	@echo "$(BER_BIN_ASN1_PREV3A_SPEC):"
-	$(ERLC) -bber_bin $(BER_BIN_PREV3A_FLAGS) $(BER_BIN_ASN1_PREV3A_SPEC).set.asn
-
-$(EBIN)/$(BER_BIN_ASN1_PREV3A_SPEC).$(EMULATOR): \
-	$(BER_BIN_ASN1_PREV3A_SPEC).erl
-
-$(BER_BIN_DRV_ASN1_PREV3A_SPEC).erl: \
-	$(BER_BIN_DRV_ASN1_PREV3A_SPEC).set.asn \
-	$(BER_BIN_DRV_ASN1_PREV3A_SPEC).asn1config \
-	$(ASN1_PREV3A_SPEC).asn
-	@echo "$(BER_BIN_DRV_ASN1_PREV3A_SPEC):"
-	$(ERLC) -bber_bin $(BER_BIN_DRV_PREV3A_FLAGS) $(BER_BIN_DRV_ASN1_PREV3A_SPEC).set.asn
-
-$(EBIN)/$(BER_BIN_DRV_ASN1_PREV3A_SPEC).$(EMULATOR): \
-	$(BER_BIN_DRV_ASN1_PREV3A_SPEC).erl
-
 $(PER_ASN1_PREV3A_SPEC).erl: \
 	$(PER_ASN1_PREV3A_SPEC).set.asn \
 	$(ASN1_PREV3A_SPEC).asn
@@ -241,23 +111,6 @@ $(PER_ASN1_PREV3A_SPEC).erl: \
 $(EBIN)/$(PER_ASN1_PREV3A_SPEC).$(EMULATOR): \
 	$(PER_ASN1_PREV3A_SPEC).erl
 
-$(PER_BIN_ASN1_PREV3A_SPEC).erl: \
-	$(PER_BIN_ASN1_PREV3A_SPEC).set.asn \
-	$(ASN1_PREV3A_SPEC).asn
-	@echo "$(PER_BIN_ASN1_PREV3A_SPEC):"
-	$(ERLC) -bper_bin $(PER_BIN_PREV3A_FLAGS) $(PER_BIN_ASN1_PREV3A_SPEC).set.asn
-
-$(EBIN)/$(PER_BIN_ASN1_PREV3A_SPEC).$(EMULATOR): \
-	$(PER_BIN_ASN1_PREV3A_SPEC).erl
-
-$(PER_BIN_DRV_ASN1_PREV3A_SPEC).erl: \
-	$(PER_BIN_DRV_ASN1_PREV3A_SPEC).set.asn \
-	$(ASN1_PREV3A_SPEC).asn
-	@echo "$(PER_BIN_DRV_ASN1_PREV3A_SPEC):"
-	$(ERLC) -bper_bin $(PER_BIN_DRV_PREV3A_FLAGS) $(PER_BIN_DRV_ASN1_PREV3A_SPEC).set.asn
-
-$(EBIN)/$(PER_BIN_DRV_ASN1_PREV3A_SPEC).$(EMULATOR): \
-	$(PER_BIN_DRV_ASN1_PREV3A_SPEC).erl
 
 # -- (prev3b) --
 
@@ -270,26 +123,6 @@ $(BER_ASN1_PREV3B_SPEC).erl: \
 $(EBIN)/$(BER_ASN1_PREV3B_SPEC).$(EMULATOR): \
 	$(BER_ASN1_PREV3B_SPEC).erl
 
-$(BER_BIN_ASN1_PREV3B_SPEC).erl: \
-	$(BER_BIN_ASN1_PREV3B_SPEC).set.asn \
-	$(BER_BIN_ASN1_PREV3B_SPEC).asn1config \
-	$(ASN1_PREV3B_SPEC).asn
-	@echo "$(BER_BIN_ASN1_PREV3B_SPEC):"
-	$(ERLC) -bber_bin $(BER_BIN_PREV3B_FLAGS) $(BER_BIN_ASN1_PREV3B_SPEC).set.asn
-
-$(EBIN)/$(BER_BIN_ASN1_PREV3B_SPEC).$(EMULATOR): \
-	$(BER_BIN_ASN1_PREV3B_SPEC).erl
-
-$(BER_BIN_DRV_ASN1_PREV3B_SPEC).erl: \
-	$(BER_BIN_DRV_ASN1_PREV3B_SPEC).set.asn \
-	$(BER_BIN_DRV_ASN1_PREV3B_SPEC).asn1config \
-	$(ASN1_PREV3B_SPEC).asn
-	@echo "$(BER_BIN_DRV_ASN1_PREV3B_SPEC):"
-	$(ERLC) -bber_bin $(BER_BIN_DRV_PREV3B_FLAGS) $(BER_BIN_DRV_ASN1_PREV3B_SPEC).set.asn
-
-$(EBIN)/$(BER_BIN_DRV_ASN1_PREV3B_SPEC).$(EMULATOR): \
-	$(BER_BIN_DRV_ASN1_PREV3B_SPEC).erl
-
 $(PER_ASN1_PREV3B_SPEC).erl: \
 	$(PER_ASN1_PREV3B_SPEC).set.asn \
 	$(ASN1_PREV3B_SPEC).asn
@@ -299,24 +132,6 @@ $(PER_ASN1_PREV3B_SPEC).erl: \
 $(EBIN)/$(PER_ASN1_PREV3B_SPEC).$(EMULATOR): \
 	$(PER_ASN1_PREV3B_SPEC).erl
 
-$(PER_BIN_ASN1_PREV3B_SPEC).erl: \
-	$(PER_BIN_ASN1_PREV3B_SPEC).set.asn \
-	$(ASN1_PREV3B_SPEC).asn
-	@echo "$(PER_BIN_ASN1_PREV3B_SPEC):"
-	$(ERLC) -bper_bin $(PER_BIN_PREV3B_FLAGS) $(PER_BIN_ASN1_PREV3B_SPEC).set.asn
-
-$(EBIN)/$(PER_BIN_ASN1_PREV3B_SPEC).$(EMULATOR): \
-	$(PER_BIN_ASN1_PREV3B_SPEC).erl
-
-$(PER_BIN_DRV_ASN1_PREV3B_SPEC).erl: \
-	$(PER_BIN_DRV_ASN1_PREV3B_SPEC).set.asn \
-	$(ASN1_PREV3B_SPEC).asn
-	@echo "$(PER_BIN_DRV_ASN1_PREV3B_SPEC):"
-	$(ERLC) -bper_bin $(PER_BIN_DRV_PREV3B_FLAGS) $(PER_BIN_DRV_ASN1_PREV3B_SPEC).set.asn
-
-$(EBIN)/$(PER_BIN_DRV_ASN1_PREV3B_SPEC).$(EMULATOR): \
-	$(PER_BIN_DRV_ASN1_PREV3B_SPEC).erl
-
 
 # -- (prev3c) --
 
@@ -329,26 +144,6 @@ $(BER_ASN1_PREV3C_SPEC).erl: \
 $(EBIN)/$(BER_ASN1_PREV3C_SPEC).$(EMULATOR): \
 	$(BER_ASN1_PREV3C_SPEC).erl
 
-$(BER_BIN_ASN1_PREV3C_SPEC).erl: \
-	$(BER_BIN_ASN1_PREV3C_SPEC).set.asn \
-	$(BER_BIN_ASN1_PREV3C_SPEC).asn1config \
-	$(ASN1_PREV3C_SPEC).asn
-	@echo "$(BER_BIN_ASN1_PREV3C_SPEC):"
-	$(ERLC) -bber_bin $(BER_BIN_PREV3C_FLAGS) $(BER_BIN_ASN1_PREV3C_SPEC).set.asn
-
-$(EBIN)/$(BER_BIN_ASN1_PREV3C_SPEC).$(EMULATOR): \
-	$(BER_BIN_ASN1_PREV3C_SPEC).erl
-
-$(BER_BIN_DRV_ASN1_PREV3C_SPEC).erl: \
-	$(BER_BIN_DRV_ASN1_PREV3C_SPEC).set.asn \
-	$(BER_BIN_DRV_ASN1_PREV3C_SPEC).asn1config \
-	$(ASN1_PREV3C_SPEC).asn
-	@echo "$(BER_BIN_DRV_ASN1_PREV3C_SPEC):"
-	$(ERLC) -bber_bin $(BER_BIN_DRV_PREV3C_FLAGS) $(BER_BIN_DRV_ASN1_PREV3C_SPEC).set.asn
-
-$(EBIN)/$(BER_BIN_DRV_ASN1_PREV3C_SPEC).$(EMULATOR): \
-	$(BER_BIN_DRV_ASN1_PREV3C_SPEC).erl
-
 $(PER_ASN1_PREV3C_SPEC).erl: \
 	$(PER_ASN1_PREV3C_SPEC).set.asn \
 	$(ASN1_PREV3C_SPEC).asn
@@ -358,24 +153,6 @@ $(PER_ASN1_PREV3C_SPEC).erl: \
 $(EBIN)/$(PER_ASN1_PREV3C_SPEC).$(EMULATOR): \
 	$(PER_ASN1_PREV3C_SPEC).erl
 
-$(PER_BIN_ASN1_PREV3C_SPEC).erl: \
-	$(PER_BIN_ASN1_PREV3C_SPEC).set.asn \
-	$(ASN1_PREV3C_SPEC).asn
-	@echo "$(PER_BIN_ASN1_PREV3C_SPEC):"
-	$(ERLC) -bper_bin $(PER_BIN_PREV3C_FLAGS) $(PER_BIN_ASN1_PREV3C_SPEC).set.asn
-
-$(EBIN)/$(PER_BIN_ASN1_PREV3C_SPEC).$(EMULATOR): \
-	$(PER_BIN_ASN1_PREV3C_SPEC).erl
-
-$(PER_BIN_DRV_ASN1_PREV3C_SPEC).erl: \
-	$(PER_BIN_DRV_ASN1_PREV3C_SPEC).set.asn \
-	$(ASN1_PREV3C_SPEC).asn
-	@echo "$(PER_BIN_DRV_ASN1_PREV3C_SPEC):"
-	$(ERLC) -bper_bin $(PER_BIN_DRV_PREV3C_FLAGS) $(PER_BIN_DRV_ASN1_PREV3C_SPEC).set.asn
-
-$(EBIN)/$(PER_BIN_DRV_ASN1_PREV3C_SPEC).$(EMULATOR): \
-	$(PER_BIN_DRV_ASN1_PREV3C_SPEC).erl
-
 
 # -- (v3) --
 
@@ -388,26 +165,6 @@ $(BER_ASN1_V3_SPEC).erl: \
 $(EBIN)/$(BER_ASN1_V3_SPEC).$(EMULATOR): \
 	$(BER_ASN1_V3_SPEC).erl
 
-$(BER_BIN_ASN1_V3_SPEC).erl: \
-	$(BER_BIN_ASN1_V3_SPEC).set.asn \
-	$(BER_BIN_ASN1_V3_SPEC).asn1config \
-	$(ASN1_V3_SPEC).asn
-	@echo "$(BER_BIN_ASN1_V3_SPEC):"
-	$(ERLC) -bber_bin $(BER_BIN_V3_FLAGS) $(BER_BIN_ASN1_V3_SPEC).set.asn
-
-$(EBIN)/$(BER_BIN_ASN1_V3_SPEC).$(EMULATOR): \
-	$(BER_BIN_ASN1_V3_SPEC).erl
-
-$(BER_BIN_DRV_ASN1_V3_SPEC).erl: \
-	$(BER_BIN_DRV_ASN1_V3_SPEC).set.asn \
-	$(BER_BIN_DRV_ASN1_V3_SPEC).asn1config \
-	$(ASN1_V3_SPEC).asn
-	@echo "$(BER_BIN_DRV_ASN1_V3_SPEC):"
-	$(ERLC) -bber_bin $(BER_BIN_DRV_V3_FLAGS) $(BER_BIN_DRV_ASN1_V3_SPEC).set.asn
-
-$(EBIN)/$(BER_BIN_DRV_ASN1_V3_SPEC).$(EMULATOR): \
-	$(BER_BIN_DRV_ASN1_V3_SPEC).erl
-
 $(PER_ASN1_V3_SPEC).erl: \
 	$(PER_ASN1_V3_SPEC).set.asn \
 	$(ASN1_V3_SPEC).asn
@@ -417,39 +174,15 @@ $(PER_ASN1_V3_SPEC).erl: \
 $(EBIN)/$(PER_ASN1_V3_SPEC).$(EMULATOR): \
 	$(PER_ASN1_V3_SPEC).erl
 
-$(PER_BIN_ASN1_V3_SPEC).erl: \
-	$(PER_BIN_ASN1_V3_SPEC).set.asn \
-	$(ASN1_V3_SPEC).asn
-	@echo "$(PER_BIN_ASN1_V3_SPEC):"
-	$(ERLC) -bper_bin $(PER_BIN_V3_FLAGS) $(PER_BIN_ASN1_V3_SPEC).set.asn
-
-$(EBIN)/$(PER_BIN_ASN1_V3_SPEC).$(EMULATOR): \
-	$(PER_BIN_ASN1_V3_SPEC).erl
-
-$(PER_BIN_DRV_ASN1_V3_SPEC).erl: \
-	$(PER_BIN_DRV_ASN1_V3_SPEC).set.asn \
-	$(ASN1_V3_SPEC).asn
-	@echo "$(PER_BIN_DRV_ASN1_V3_SPEC):"
-	$(ERLC) -bper_bin $(PER_BIN_DRV_V3_FLAGS) $(PER_BIN_DRV_ASN1_V3_SPEC).set.asn
-
-$(EBIN)/$(PER_BIN_DRV_ASN1_V3_SPEC).$(EMULATOR): \
-	$(PER_BIN_DRV_ASN1_V3_SPEC).erl
-
 
 # -------------
 
 $(EBIN)/megaco_ber_encoder.$(EMULATOR): megaco_ber_encoder.erl \
         $(MEGACO_ENGINEDIR)/megaco_message_internal.hrl
 
-$(EBIN)/megaco_ber_bin_encoder.$(EMULATOR): megaco_ber_bin_encoder.erl \
-        $(MEGACO_ENGINEDIR)/megaco_message_internal.hrl
-
 $(EBIN)/megaco_per_encoder.$(EMULATOR): megaco_per_encoder.erl \
         $(MEGACO_ENGINEDIR)/megaco_message_internal.hrl
 
-$(EBIN)/megaco_per_bin_encoder.$(EMULATOR): megaco_per_bin_encoder.erl \
-        $(MEGACO_ENGINEDIR)/megaco_message_internal.hrl
-
 $(EBIN)/megaco_binary_encoder_lib.$(EMULATOR): megaco_binary_encoder_lib.erl \
         $(MEGACO_ENGINEDIR)/megaco_message_internal.hrl
 
diff --git a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3a.asn1config b/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3a.asn1config
deleted file mode 100644
index 179473717d..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3a.asn1config
+++ /dev/null
@@ -1,43 +0,0 @@
-{exclusive_decode,
- {'megaco_ber_bin_drv_media_gateway_control_prev3a',
-  [
-   {decode_message_trans_partial,
-    [
-     'MegacoMessage',[{mess,[{messageBody,[{transactions,parts}]}]}]
-    ]
-   },
-   {decode_message_acts_partial,
-    ['Transaction',
-     [
-      {transactionRequest,
-       [
-        {actions,parts}
-       ]
-      },
-      {transactionReply,  
-       [
-        {transactionResult, [{actionReplies,parts}]}
-       ]
-      }
-     ]
-    ]
-   },
-   {decode_message_version,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{mId,undecoded},{messageBody,undecoded}]}
-     ]
-    ]
-   },
-   {decode_message_mId,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{messageBody,undecoded}]}
-     ]
-    ]
-   }
-  ]
- }
-}.
diff --git a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3a.set.asn b/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3a.set.asn
deleted file mode 100644
index b9ba7ffdb4..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3a.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-prev3a.asn
diff --git a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3b.asn1config b/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3b.asn1config
deleted file mode 100644
index ceda97fbd1..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3b.asn1config
+++ /dev/null
@@ -1,43 +0,0 @@
-{exclusive_decode,
- {'megaco_ber_bin_drv_media_gateway_control_prev3b',
-  [
-   {decode_message_trans_partial,
-    [
-     'MegacoMessage',[{mess,[{messageBody,[{transactions,parts}]}]}]
-    ]
-   },
-   {decode_message_acts_partial,
-    ['Transaction',
-     [
-      {transactionRequest,
-       [
-        {actions,parts}
-       ]
-      },
-      {transactionReply,  
-       [
-        {transactionResult, [{actionReplies,parts}]}
-       ]
-      }
-     ]
-    ]
-   },
-   {decode_message_version,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{mId,undecoded},{messageBody,undecoded}]}
-     ]
-    ]
-   },
-   {decode_message_mId,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{messageBody,undecoded}]}
-     ]
-    ]
-   }
-  ]
- }
-}.
diff --git a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3b.set.asn b/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3b.set.asn
deleted file mode 100644
index 0437bde310..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3b.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-prev3b.asn
diff --git a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3c.asn1config b/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3c.asn1config
deleted file mode 100644
index d181ef44bd..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3c.asn1config
+++ /dev/null
@@ -1,43 +0,0 @@
-{exclusive_decode,
- {'megaco_ber_bin_drv_media_gateway_control_prev3c',
-  [
-   {decode_message_trans_partial,
-    [
-     'MegacoMessage',[{mess,[{messageBody,[{transactions,parts}]}]}]
-    ]
-   },
-   {decode_message_acts_partial,
-    ['Transaction',
-     [
-      {transactionRequest,
-       [
-        {actions,parts}
-       ]
-      },
-      {transactionReply,  
-       [
-        {transactionResult, [{actionReplies,parts}]}
-       ]
-      }
-     ]
-    ]
-   },
-   {decode_message_version,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{mId,undecoded},{messageBody,undecoded}]}
-     ]
-    ]
-   },
-   {decode_message_mId,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{messageBody,undecoded}]}
-     ]
-    ]
-   }
-  ]
- }
-}.
diff --git a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3c.set.asn b/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3c.set.asn
deleted file mode 100644
index e78055fbad..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3c.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-prev3c.asn
diff --git a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v1.set.asn b/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v1.set.asn
deleted file mode 100644
index 0f5a92dba1..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v1.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-v1.asn
diff --git a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v2.asn1config b/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v2.asn1config
deleted file mode 100644
index 3d0cb9a019..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v2.asn1config
+++ /dev/null
@@ -1,43 +0,0 @@
-{exclusive_decode,
- {'megaco_ber_bin_drv_media_gateway_control_v2',
-  [
-   {decode_message_trans_partial,
-    [
-     'MegacoMessage',[{mess,[{messageBody,[{transactions,parts}]}]}]
-    ]
-   },
-   {decode_message_acts_partial,
-    ['Transaction',
-     [
-      {transactionRequest,
-       [
-        {actions,parts}
-       ]
-      },
-      {transactionReply,  
-       [
-        {transactionResult, [{actionReplies,parts}]}
-       ]
-      }
-     ]
-    ]
-   },
-   {decode_message_version,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{mId,undecoded},{messageBody,undecoded}]}
-     ]
-    ]
-   },
-   {decode_message_mId,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{messageBody,undecoded}]}
-     ]
-    ]
-   }
-  ]
- }
-}.
diff --git a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v2.set.asn b/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v2.set.asn
deleted file mode 100644
index 7fc82b127f..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v2.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-v2.asn
diff --git a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v3.asn1config b/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v3.asn1config
deleted file mode 100644
index cc662c0145..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v3.asn1config
+++ /dev/null
@@ -1,43 +0,0 @@
-{exclusive_decode,
- {'megaco_ber_bin_drv_media_gateway_control_v3',
-  [
-   {decode_message_trans_partial,
-    [
-     'MegacoMessage',[{mess,[{messageBody,[{transactions,parts}]}]}]
-    ]
-   },
-   {decode_message_acts_partial,
-    ['Transaction',
-     [
-      {transactionRequest,
-       [
-        {actions,parts}
-       ]
-      },
-      {transactionReply,  
-       [
-        {transactionResult, [{actionReplies,parts}]}
-       ]
-      }
-     ]
-    ]
-   },
-   {decode_message_version,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{mId,undecoded},{messageBody,undecoded}]}
-     ]
-    ]
-   },
-   {decode_message_mId,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{messageBody,undecoded}]}
-     ]
-    ]
-   }
-  ]
- }
-}.
diff --git a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v3.set.asn b/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v3.set.asn
deleted file mode 100644
index 1d7950a283..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v3.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-v3.asn
diff --git a/lib/megaco/src/binary/megaco_ber_bin_encoder.erl b/lib/megaco/src/binary/megaco_ber_bin_encoder.erl
deleted file mode 100644
index bf9926c7e5..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_encoder.erl
+++ /dev/null
@@ -1,716 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose : Handle ASN.1 BER encoding of Megaco/H.248
-%%----------------------------------------------------------------------
-
--module(megaco_ber_bin_encoder).
-
--behaviour(megaco_encoder).
-
--export([encode_message/3, decode_message/3,
-	 decode_mini_message/3, 
-
-	 encode_transaction/3,
-	 encode_action_requests/3,
-	 encode_action_request/3,
-	 encode_action_reply/3,
-
-	 version_of/2]).
-
-%% Backward compatible functions:
--export([encode_message/2, decode_message/2]).
-
--include_lib("megaco/src/engine/megaco_message_internal.hrl").
-
--define(V1_ASN1_MOD,         megaco_ber_bin_media_gateway_control_v1).
--define(V2_ASN1_MOD,         megaco_ber_bin_media_gateway_control_v2).
--define(V3_ASN1_MOD,         megaco_ber_bin_media_gateway_control_v3).
--define(PREV3A_ASN1_MOD,     megaco_ber_bin_media_gateway_control_prev3a).
--define(PREV3B_ASN1_MOD,     megaco_ber_bin_media_gateway_control_prev3b).
--define(PREV3C_ASN1_MOD,     megaco_ber_bin_media_gateway_control_prev3c).
--define(V1_ASN1_MOD_DRV,     megaco_ber_bin_drv_media_gateway_control_v1).
--define(V2_ASN1_MOD_DRV,     megaco_ber_bin_drv_media_gateway_control_v2).
--define(V3_ASN1_MOD_DRV,     megaco_ber_bin_drv_media_gateway_control_v3).
--define(PREV3A_ASN1_MOD_DRV, megaco_ber_bin_drv_media_gateway_control_prev3a).
--define(PREV3B_ASN1_MOD_DRV, megaco_ber_bin_drv_media_gateway_control_prev3b).
--define(PREV3C_ASN1_MOD_DRV, megaco_ber_bin_drv_media_gateway_control_prev3c).
-
--define(V1_TRANS_MOD,     megaco_binary_transformer_v1).
--define(V2_TRANS_MOD,     megaco_binary_transformer_v2).
--define(V3_TRANS_MOD,     megaco_binary_transformer_v3).
--define(PREV3A_TRANS_MOD, megaco_binary_transformer_prev3a).
--define(PREV3B_TRANS_MOD, megaco_binary_transformer_prev3b).
--define(PREV3C_TRANS_MOD, megaco_binary_transformer_prev3c).
-
--define(BIN_LIB, megaco_binary_encoder_lib).
-
-
-%%----------------------------------------------------------------------
-%% Detect (check/get) message version
-%% Return {ok, Version} | {error, Reason}
-%%----------------------------------------------------------------------
-
-version_of([{version3,v3},driver|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD_DRV, ?V2_ASN1_MOD_DRV, ?V3_ASN1_MOD_DRV], 
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-version_of([{version3,prev3c},driver|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD_DRV, ?V2_ASN1_MOD_DRV, ?PREV3C_ASN1_MOD_DRV], 
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-version_of([{version3,prev3b},driver|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD_DRV, ?V2_ASN1_MOD_DRV, ?PREV3B_ASN1_MOD_DRV], 
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-version_of([{version3,prev3a},driver|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD_DRV, ?V2_ASN1_MOD_DRV, ?PREV3A_ASN1_MOD_DRV], 
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-version_of([{version3,v3}|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?V3_ASN1_MOD],
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-version_of([{version3,prev3c}|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?PREV3C_ASN1_MOD],
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-version_of([{version3,prev3b}|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?PREV3B_ASN1_MOD],
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-version_of([{version3,prev3a}|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?PREV3A_ASN1_MOD],
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-version_of([driver|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD_DRV, ?V2_ASN1_MOD_DRV, ?V3_ASN1_MOD_DRV], 
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-version_of(EC, Binary) ->
-    Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?V3_ASN1_MOD],
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders).
-    
-
-%%----------------------------------------------------------------------
-%% Convert a 'MegacoMessage' record into a binary
-%% Return {ok, Binary} | {error, Reason}
-%%----------------------------------------------------------------------
-
-
-encode_message(EC,  
-	       #'MegacoMessage'{mess = #'Message'{version = V}} = MegaMsg) ->
-    encode_message(EC, V, MegaMsg).
-
-
-%% -- Version 1 --
-
-encode_message([{version3, _},driver|EC], 1, MegaMsg) ->
-    AsnMod   = ?V1_ASN1_MOD_DRV, 
-    TransMod = ?V1_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([driver|EC], 1, MegaMsg) ->
-    AsnMod   = ?V1_ASN1_MOD_DRV, 
-    TransMod = ?V1_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,_}|EC], 1, MegaMsg) ->
-    AsnMod   = ?V1_ASN1_MOD, 
-    TransMod = ?V1_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-encode_message(EC, 1, MegaMsg) ->
-    AsnMod   = ?V1_ASN1_MOD, 
-    TransMod = ?V1_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-
-
-%% -- Version 2 --
-
-encode_message([{version3,_},driver|EC], 2, MegaMsg) ->
-    AsnMod   = ?V2_ASN1_MOD_DRV, 
-    TransMod = ?V2_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([driver|EC], 2, MegaMsg) ->
-    AsnMod   = ?V2_ASN1_MOD_DRV, 
-    TransMod = ?V2_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,_}|EC], 2, MegaMsg) ->
-    AsnMod   = ?V2_ASN1_MOD, 
-    TransMod = ?V2_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-encode_message(EC, 2, MegaMsg) ->
-    AsnMod   = ?V2_ASN1_MOD, 
-    TransMod = ?V2_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-
-
-%% -- Version 3 --
-
-encode_message([{version3,v3},driver|EC], 3, MegaMsg) ->
-    AsnMod   = ?V3_ASN1_MOD_DRV, 
-    TransMod = ?V3_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,prev3c},driver|EC], 3, MegaMsg) ->
-    AsnMod   = ?PREV3C_ASN1_MOD_DRV, 
-    TransMod = ?PREV3C_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,prev3b},driver|EC], 3, MegaMsg) ->
-    AsnMod   = ?PREV3B_ASN1_MOD_DRV, 
-    TransMod = ?PREV3B_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,prev3a},driver|EC], 3, MegaMsg) ->
-    AsnMod   = ?PREV3A_ASN1_MOD_DRV, 
-    TransMod = ?PREV3A_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,v3}|EC], 3, MegaMsg) ->
-    AsnMod   = ?V3_ASN1_MOD, 
-    TransMod = ?V3_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,prev3c}|EC], 3, MegaMsg) ->
-    AsnMod   = ?PREV3C_ASN1_MOD, 
-    TransMod = ?PREV3C_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,prev3b}|EC], 3, MegaMsg) ->
-    AsnMod   = ?PREV3B_ASN1_MOD, 
-    TransMod = ?PREV3B_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,prev3a}|EC], 3, MegaMsg) ->
-    AsnMod   = ?PREV3A_ASN1_MOD, 
-    TransMod = ?PREV3A_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([driver|EC], 3, MegaMsg) ->
-    AsnMod   = ?V3_ASN1_MOD_DRV, 
-    TransMod = ?V3_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-encode_message(EC, 3, MegaMsg) ->
-    AsnMod   = ?V3_ASN1_MOD, 
-    TransMod = ?V3_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list).
-
-
-%%----------------------------------------------------------------------
-%% Convert a transaction (or transactions in the case of ack) record(s) 
-%% into a binary
-%% Return {ok, Binary} | {error, Reason}
-%%----------------------------------------------------------------------
-
-%% encode_transaction([] = EC, 1, Trans) ->
-%%     AsnMod   = ?V1_ASN1_MOD, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, 
-%% 					     io_list);
-%% encode_transaction([native] = EC, 1, Trans) ->
-%%     AsnMod   = ?V1_ASN1_MOD, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, 
-%% 					     io_list);
-%% encode_transaction([driver|EC], 1, Trans) ->
-%%     AsnMod   = ?V1_ASN1_MOD_DRV, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, 
-%% 					     io_list);
-%% encode_transaction(_EC, 1, _Trans) ->
-%%     AsnMod   = ?V1_ASN1_MOD, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, 
-%% 					     io_list);
-%% encode_transaction([] = EC, 2, Trans) ->
-%%     AsnMod   = ?V2_ASN1_MOD, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%% 					     io_list);
-%% encode_transaction([native] = EC, 2, Trans) ->
-%%     AsnMod   = ?V2_ASN1_MOD, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%% 					     io_list);
-%% encode_transaction([driver|EC], 2, Trans) ->
-%%     AsnMod   = ?V2_ASN1_MOD_DRV, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%% 					     io_list);
-%%encode_transaction(_EC, 2, _Trans) ->
-%%     AsnMod   = ?V2_ASN1_MOD, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%% 					     io_list).
-%% encode_transaction([] = EC, 3, Trans) ->
-%%     AsnMod   = ?V3_ASN1_MOD, 
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%% 					     io_list);
-%% encode_transaction([native] = EC, 3, Trans) ->
-%%     AsnMod   = ?V3_ASN1_MOD, 
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%% 					     io_list);
-%% encode_transaction([driver|EC], 3, Trans) ->
-%%     AsnMod   = ?V3_ASN1_MOD_DRV, 
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%% 					     io_list);
-%%encode_transaction(_EC, 3, _Trans) ->
-%%     AsnMod   = ?V3_ASN1_MOD, 
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%% 					     io_list).
-encode_transaction(_EC, _V, _Trans) ->
-    {error, not_implemented}.
-
-
-%%----------------------------------------------------------------------
-%% Convert a list of ActionRequest record's into a binary
-%% Return {ok, DeepIoList} | {error, Reason}
-%%----------------------------------------------------------------------
-%% encode_action_requests([] = EC, 1, ActReqs) when is_list(ActReqs) ->
-%%     AsnMod   = ?V1_ASN1_MOD, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-%% 						 AsnMod, TransMod, 
-%% 						 io_list);
-%% encode_action_requests([native] = EC, 1, ActReqs) when is_list(ActReqs) ->
-%%     AsnMod   = ?V1_ASN1_MOD, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-%% 						 AsnMod, TransMod, 
-%% 						 io_list);
-%% encode_action_requests([driver|EC], 1, ActReqs) when is_list(ActReqs) ->
-%%     AsnMod   = ?V1_ASN1_MOD_DRV, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-%% 						 AsnMod, TransMod, 
-%% 						 io_list);
-%% encode_action_requests(_EC, 1, ActReqs) when is_list(ActReqs) ->
-%%     AsnMod   = ?V1_ASN1_MOD, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-%% 						 AsnMod, TransMod, 
-%% 						 io_list);
-%% encode_action_requests([] = EC, 2, ActReqs) when is_list(ActReqs) ->
-%%     AsnMod   = ?V2_ASN1_MOD, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-%% 						 AsnMod, TransMod, 
-%% 						 io_list);
-%% encode_action_requests([native] = EC, 2, ActReqs) when is_list(ActReqs) ->
-%%     AsnMod   = ?V2_ASN1_MOD, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-%% 						 AsnMod, TransMod, 
-%% 						 io_list);
-%% encode_action_requests([driver|EC], 2, ActReqs) when is_list(ActReqs) ->
-%%     AsnMod   = ?V2_ASN1_MOD_DRV, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-%% 						 AsnMod, TransMod, 
-%% 						 io_list);
-%% encode_action_requests(_EC, 2, ActReqs) when is_list(ActReqs) ->
-%%     AsnMod   = ?V2_ASN1_MOD, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-%% 						 AsnMod, TransMod, 
-%% 						 io_list);
-%% encode_action_requests([] = EC, 3, ActReqs) when is_list(ActReqs) ->
-%%     AsnMod   = ?V3_ASN1_MOD, 
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-%% 						 AsnMod, TransMod, 
-%% 						 io_list);
-%% encode_action_requests([native] = EC, 3, ActReqs) when is_list(ActReqs) ->
-%%     AsnMod   = ?V3_ASN1_MOD, 
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-%% 						 AsnMod, TransMod, 
-%% 						 io_list);
-%% encode_action_requests([driver|EC], 3, ActReqs) when is_list(ActReqs) ->
-%%     AsnMod   = ?V3_ASN1_MOD_DRV, 
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-%% 						 AsnMod, TransMod, 
-%% 						 io_list);
-%%encode_action_requests(_EC, 3, ActReqs) when is_list(ActReqs) ->
-%%     AsnMod   = ?V3_ASN1_MOD, 
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-%% 						 AsnMod, TransMod, 
-%% 						 io_list);
-%% encode_action_requests(_EC, V, _ActReqs) ->
-%%     {error, {bad_version, V}}.
-encode_action_requests(_EC, _V, _ActReqs) ->
-    {error, not_implemented}.
-
-
-%%----------------------------------------------------------------------
-%% Convert a ActionRequest record into a binary
-%% Return {ok, DeepIoList} | {error, Reason}
-%%----------------------------------------------------------------------
-%% encode_action_request([] = EC, 1, ActReq) ->
-%%     AsnMod   = ?V1_ASN1_MOD, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_request(EC, ActReq,
-%% 						AsnMod, TransMod, 
-%% 						io_list);
-%% encode_action_request([native] = EC, 1, ActReq) ->
-%%     AsnMod   = ?V1_ASN1_MOD, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_request(EC, ActReq,
-%% 						AsnMod, TransMod, 
-%% 						io_list);
-%% encode_action_request([driver|EC], 1, ActReq) ->
-%%     AsnMod   = ?V1_ASN1_MOD_DRV, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_request(EC, ActReq,
-%% 						AsnMod, TransMod, 
-%% 						io_list);
-%% encode_action_request(_EC, 1, ActReq) ->
-%%     AsnMod   = ?V1_ASN1_MOD, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_request(EC, ActReq,
-%% 						AsnMod, TransMod, 
-%% 						io_list);
-%% encode_action_request([] = EC, 2, ActReq) ->
-%%     AsnMod   = ?V2_ASN1_MOD, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_request(EC, ActReq,
-%% 						AsnMod, TransMod, 
-%% 						io_list);
-%% encode_action_request([native] = EC, 2, ActReq) ->
-%%     AsnMod   = ?V2_ASN1_MOD, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_request(EC, ActReq,
-%% 						AsnMod, TransMod, 
-%% 						io_list);
-%% encode_action_request([driver|EC], 2, ActReq) ->
-%%     AsnMod   = ?V2_ASN1_MOD_DRV, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_request(EC, ActReq,
-%% 						AsnMod, TransMod, 
-%% 						io_list);
-%% encode_action_request(_EC, 2, ActReq) ->
-%%     AsnMod   = ?V2_ASN1_MOD, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_request(EC, ActReq,
-%% 						AsnMod, TransMod, 
-%% 						io_list);
-%% encode_action_request([] = EC, 3, ActReq) ->
-%%     AsnMod   = ?V3_ASN1_MOD, 
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_request(EC, ActReq,
-%% 						AsnMod, TransMod, 
-%% 						io_list);
-%% encode_action_request([native] = EC, 3, ActReq) ->
-%%     AsnMod   = ?V3_ASN1_MOD, 
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_request(EC, ActReq,
-%% 						AsnMod, TransMod, 
-%% 						io_list);
-%% encode_action_request([driver|EC], 3, ActReq) ->
-%%     AsnMod   = ?V3_ASN1_MOD_DRV, 
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_request(EC, ActReq,
-%% 						AsnMod, TransMod, 
-%% 						io_list);
-%% encode_action_request(_EC, 3, ActReq) ->
-%%     AsnMod   = ?V3_ASN1_MOD, 
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_action_request(EC, ActReq,
-%% 						AsnMod, TransMod, 
-%% 						io_list);
-encode_action_request(_EC, _V, _ActReq) ->
-    {error, not_implemented}.
-
-
-%%----------------------------------------------------------------------
-%% Convert a action reply into a deep io list
-%% Not yest supported by this binary codec!
-%% Return {ok, DeepIoList} | {error, Reason}
-%%----------------------------------------------------------------------
-
-encode_action_reply(_EC, _V, _AcionReply) ->
-    {error, not_implemented}.
-
-
-%%----------------------------------------------------------------------
-%% Convert a binary into a 'MegacoMessage' record
-%% Return {ok, MegacoMessageRecord} | {error, Reason}
-%%----------------------------------------------------------------------
-
-%% Old decode function
-decode_message(EC, Binary) ->
-    decode_message(EC, 1, Binary).
-
-%% -- Dynamic version detection --
-
-%% Select from message
-decode_message([{version3,v3},driver|EC], dynamic, Binary) ->
-    Mods = [{?V1_ASN1_MOD_DRV, ?V1_TRANS_MOD},
-	    {?V2_ASN1_MOD_DRV, ?V2_TRANS_MOD}, 
-	    {?V3_ASN1_MOD_DRV, ?V3_TRANS_MOD}], 
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Mods, binary);
-decode_message([{version3,prev3c},driver|EC], dynamic, Binary) ->
-    Mods = [{?V1_ASN1_MOD_DRV,     ?V1_TRANS_MOD},
-	    {?V2_ASN1_MOD_DRV,     ?V2_TRANS_MOD}, 
-	    {?PREV3C_ASN1_MOD_DRV, ?PREV3C_TRANS_MOD}], 
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Mods, binary);
-decode_message([{version3,prev3b},driver|EC], dynamic, Binary) ->
-    Mods = [{?V1_ASN1_MOD_DRV,     ?V1_TRANS_MOD},
-	    {?V2_ASN1_MOD_DRV,     ?V2_TRANS_MOD}, 
-	    {?PREV3B_ASN1_MOD_DRV, ?PREV3B_TRANS_MOD}], 
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Mods, binary);
-decode_message([{version3,prev3a},driver|EC], dynamic, Binary) ->
-    Mods = [{?V1_ASN1_MOD_DRV,     ?V1_TRANS_MOD},
-	    {?V2_ASN1_MOD_DRV,     ?V2_TRANS_MOD}, 
-	    {?PREV3A_ASN1_MOD_DRV, ?PREV3A_TRANS_MOD}], 
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Mods, binary);
-decode_message([{version3,v3}|EC], dynamic, Binary) ->
-    Mods = [{?V1_ASN1_MOD, ?V1_TRANS_MOD},
-	    {?V2_ASN1_MOD, ?V2_TRANS_MOD}, 
-	    {?V3_ASN1_MOD, ?V3_TRANS_MOD}], 
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Mods, binary);
-decode_message([{version3,prev3c}|EC], dynamic, Binary) ->
-    Mods = [{?V1_ASN1_MOD,     ?V1_TRANS_MOD},
-	    {?V2_ASN1_MOD,     ?V2_TRANS_MOD}, 
-	    {?PREV3C_ASN1_MOD, ?PREV3C_TRANS_MOD}], 
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Mods, binary);
-decode_message([{version3,prev3b}|EC], dynamic, Binary) ->
-    Mods = [{?V1_ASN1_MOD,     ?V1_TRANS_MOD},
-	    {?V2_ASN1_MOD,     ?V2_TRANS_MOD}, 
-	    {?PREV3B_ASN1_MOD, ?PREV3B_TRANS_MOD}], 
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Mods, binary);
-decode_message([{version3,prev3a}|EC], dynamic, Binary) ->
-    Mods = [{?V1_ASN1_MOD,     ?V1_TRANS_MOD},
-	    {?V2_ASN1_MOD,     ?V2_TRANS_MOD}, 
-	    {?PREV3A_ASN1_MOD, ?PREV3A_TRANS_MOD}], 
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Mods, binary);
-decode_message([driver|EC], dynamic, Binary) ->
-    Mods = [{?V1_ASN1_MOD_DRV, ?V1_TRANS_MOD},
-	    {?V2_ASN1_MOD_DRV, ?V2_TRANS_MOD}, 
-	    {?V3_ASN1_MOD_DRV, ?V3_TRANS_MOD}], 
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Mods, binary);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-decode_message(EC, dynamic, Binary) ->
-    Mods = [{?V1_ASN1_MOD, ?V1_TRANS_MOD},
-	    {?V2_ASN1_MOD, ?V2_TRANS_MOD}, 
-	    {?V3_ASN1_MOD, ?V3_TRANS_MOD}], 
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Mods, binary);
-
-
-%% -- Version 1 --
-
-decode_message([{version3,_},driver|EC], 1, Binary) ->
-    AsnMod   = ?V1_ASN1_MOD_DRV, 
-    TransMod = ?V1_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([driver|EC], 1, Binary) ->
-    AsnMod   = ?V1_ASN1_MOD_DRV, 
-    TransMod = ?V1_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,_}|EC], 1, Binary) ->
-    AsnMod   = ?V1_ASN1_MOD, 
-    TransMod = ?V1_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-decode_message(EC, 1, Binary) ->
-    AsnMod   = ?V1_ASN1_MOD, 
-    TransMod = ?V1_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-
-%% -- Version 2 --
-
-decode_message([{version3,_},driver|EC], 2, Binary) ->
-    AsnMod   = ?V2_ASN1_MOD_DRV, 
-    TransMod = ?V2_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([driver|EC], 2, Binary) ->
-    AsnMod   = ?V2_ASN1_MOD_DRV, 
-    TransMod = ?V2_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,_}|EC], 2, Binary) ->
-    AsnMod   = ?V2_ASN1_MOD, 
-    TransMod = ?V2_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-decode_message(EC, 2, Binary) ->
-    AsnMod   = ?V2_ASN1_MOD, 
-    TransMod = ?V2_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-
-%% -- Version 3 --
-
-decode_message([{version3,v3},driver|EC], 3, Binary) ->
-    AsnMod   = ?V3_ASN1_MOD_DRV, 
-    TransMod = ?V3_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3c},driver|EC], 3, Binary) ->
-    AsnMod   = ?PREV3C_ASN1_MOD_DRV, 
-    TransMod = ?PREV3C_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3b},driver|EC], 3, Binary) ->
-    AsnMod   = ?PREV3B_ASN1_MOD_DRV, 
-    TransMod = ?PREV3B_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3a},driver|EC], 3, Binary) ->
-    AsnMod   = ?PREV3A_ASN1_MOD_DRV, 
-    TransMod = ?PREV3A_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,v3}|EC], 3, Binary) ->
-    AsnMod   = ?V3_ASN1_MOD, 
-    TransMod = ?V3_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3c}|EC], 3, Binary) ->
-    AsnMod   = ?PREV3C_ASN1_MOD, 
-    TransMod = ?PREV3C_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3b}|EC], 3, Binary) ->
-    AsnMod   = ?PREV3B_ASN1_MOD, 
-    TransMod = ?PREV3B_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3a}|EC], 3, Binary) ->
-    AsnMod   = ?PREV3A_ASN1_MOD, 
-    TransMod = ?PREV3A_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([driver|EC], 3, Binary) ->
-    AsnMod   = ?V3_ASN1_MOD_DRV, 
-    TransMod = ?V3_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-decode_message(EC, 3, Binary) ->
-    AsnMod   = ?V3_ASN1_MOD, 
-    TransMod = ?V3_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary).
-
-
-decode_mini_message([{version3,v3},driver|EC], dynamic, Bin) ->
-    Mods = [?V1_ASN1_MOD_DRV, 
-	    ?V2_ASN1_MOD_DRV, 
-	    ?V3_ASN1_MOD_DRV], 
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([{version3,prev3c},driver|EC], dynamic, Bin) ->
-    Mods = [?V1_ASN1_MOD_DRV, 
-	    ?V2_ASN1_MOD_DRV, 
-	    ?PREV3C_ASN1_MOD_DRV], 
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([{version3,prev3b},driver|EC], dynamic, Bin) ->
-    Mods = [?V1_ASN1_MOD_DRV, 
-	    ?V2_ASN1_MOD_DRV, 
-	    ?PREV3B_ASN1_MOD_DRV], 
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([{version3,prev3a},driver|EC], dynamic, Bin) ->
-    Mods = [?V1_ASN1_MOD_DRV, 
-	    ?V2_ASN1_MOD_DRV, 
-	    ?PREV3A_ASN1_MOD_DRV], 
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([{version3,v3}|EC], dynamic, Bin) ->
-    Mods = [?V1_ASN1_MOD, 
-	    ?V2_ASN1_MOD, 
-	    ?V3_ASN1_MOD], 
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([{version3,prev3c}|EC], dynamic, Bin) ->
-    Mods = [?V1_ASN1_MOD, 
-	    ?V2_ASN1_MOD, 
-	    ?PREV3C_ASN1_MOD], 
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([{version3,prev3b}|EC], dynamic, Bin) ->
-    Mods = [?V1_ASN1_MOD, 
-	    ?V2_ASN1_MOD, 
-	    ?PREV3B_ASN1_MOD], 
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([{version3,prev3a}|EC], dynamic, Bin) ->
-    Mods = [?V1_ASN1_MOD, 
-	    ?V2_ASN1_MOD, 
-	    ?PREV3A_ASN1_MOD], 
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([driver|EC], dynamic, Bin) ->
-    Mods = [?V1_ASN1_MOD_DRV, 
-	    ?V2_ASN1_MOD_DRV, 
-	    ?V3_ASN1_MOD_DRV], 
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message(EC, dynamic, Bin) ->
-    Mods = [?V1_ASN1_MOD, 
-	    ?V2_ASN1_MOD, 
-	    ?V3_ASN1_MOD], 
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([{version3,_},driver|EC], 1, Bin) ->
-    AsnMod = ?V1_ASN1_MOD_DRV, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,_}|EC], 1, Bin) ->
-    AsnMod = ?V1_ASN1_MOD, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([driver|EC], 1, Bin) ->
-    AsnMod = ?V1_ASN1_MOD_DRV, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message(EC, 1, Bin) ->
-    AsnMod = ?V1_ASN1_MOD, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,_},driver|EC], 2, Bin) ->
-    AsnMod = ?V2_ASN1_MOD_DRV, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,_}|EC], 2, Bin) ->
-    AsnMod = ?V2_ASN1_MOD, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([driver|EC], 2, Bin) ->
-    AsnMod = ?V2_ASN1_MOD_DRV, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message(EC, 2, Bin) ->
-    AsnMod = ?V2_ASN1_MOD, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,v3},driver|EC], 3, Bin) ->
-    AsnMod = ?V3_ASN1_MOD_DRV, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,prev3c},driver|EC], 3, Bin) ->
-    AsnMod = ?PREV3C_ASN1_MOD_DRV, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,prev3b},driver|EC], 3, Bin) ->
-    AsnMod = ?PREV3B_ASN1_MOD_DRV, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,prev3a},driver|EC], 3, Bin) ->
-    AsnMod = ?PREV3A_ASN1_MOD_DRV, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,v3}|EC], 3, Bin) ->
-    AsnMod = ?V3_ASN1_MOD, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,prev3c}|EC], 3, Bin) ->
-    AsnMod = ?PREV3C_ASN1_MOD, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,prev3b}|EC], 3, Bin) ->
-    AsnMod = ?PREV3B_ASN1_MOD, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,prev3a}|EC], 3, Bin) ->
-    AsnMod = ?PREV3A_ASN1_MOD, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([driver|EC], 3, Bin) ->
-    AsnMod = ?V3_ASN1_MOD_DRV, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message(EC, 3, Bin) ->
-    AsnMod = ?V3_ASN1_MOD, 
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary).
diff --git a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3a.set.asn b/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3a.set.asn
deleted file mode 100644
index b9ba7ffdb4..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3a.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-prev3a.asn
diff --git a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3b.set.asn b/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3b.set.asn
deleted file mode 100644
index 0437bde310..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3b.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-prev3b.asn
diff --git a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3c.asn1config b/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3c.asn1config
deleted file mode 100644
index c74422b9a2..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3c.asn1config
+++ /dev/null
@@ -1,43 +0,0 @@
-{exclusive_decode,
- {'megaco_ber_bin_media_gateway_control_prev3c',
-  [
-   {decode_message_trans_partial,
-    [
-     'MegacoMessage',[{mess,[{messageBody,[{transactions,parts}]}]}]
-    ]
-   },
-   {decode_message_acts_partial,
-    ['Transaction',
-     [
-      {transactionRequest,
-       [
-        {actions,parts}
-       ]
-      },
-      {transactionReply,  
-       [
-        {transactionResult, [{actionReplies,parts}]}
-       ]
-      }
-     ]
-    ]
-   },
-   {decode_message_version,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{mId,undecoded},{messageBody,undecoded}]}
-     ]
-    ]
-   },
-   {decode_message_mId,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{messageBody,undecoded}]}
-     ]
-    ]
-   }
-  ]
- }
-}.
diff --git a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3c.set.asn b/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3c.set.asn
deleted file mode 100644
index e78055fbad..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3c.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-prev3c.asn
diff --git a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v1.asn1config b/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v1.asn1config
deleted file mode 100644
index e815e90948..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v1.asn1config
+++ /dev/null
@@ -1,44 +0,0 @@
-{exclusive_decode,
- {'megaco_ber_bin_media_gateway_control_v1',
-  [
-   {decode_message_trans_partial,
-    [
-     'MegacoMessage',[{mess,[{messageBody,[{transactions,parts}]}]}]
-    ]
-   },
-   {decode_message_acts_partial,
-    ['Transaction',
-     [
-      {transactionRequest,
-       [
-        {actions,parts}
-       ]
-      },
-      {transactionReply,  
-       [
-        {transactionResult, [{actionReplies,parts}]}
-       ]
-      }
-     ]
-    ]
-   },
-   {decode_message_version,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{mId,undecoded},{messageBody,undecoded}]}
-     ]
-    ]
-   },
-   {decode_message_mId,
-    ['MegacoMessage',
-     [
-      {authHeader,undecoded},
-      {mess,[{messageBody,undecoded}]}
-     ]
-    ]
-   }
-   
-  ]
- }
-}.
diff --git a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v1.set.asn b/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v1.set.asn
deleted file mode 100644
index 0f5a92dba1..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v1.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-v1.asn
diff --git a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v2.set.asn b/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v2.set.asn
deleted file mode 100644
index 7fc82b127f..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v2.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-v2.asn
diff --git a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v3.set.asn b/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v3.set.asn
deleted file mode 100644
index 1d7950a283..0000000000
--- a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v3.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-v3.asn
diff --git a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v2.asn1config b/lib/megaco/src/binary/megaco_ber_media_gateway_control_prev3a.asn1config
index cc072b30ee..da67561f1b 100644
--- a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v2.asn1config
+++ b/lib/megaco/src/binary/megaco_ber_media_gateway_control_prev3a.asn1config
@@ -1,5 +1,5 @@
 {exclusive_decode,
- {'megaco_ber_bin_media_gateway_control_v2',
+ {'megaco_ber_media_gateway_control_prev3a',
   [
    {decode_message_trans_partial,
     [
@@ -14,7 +14,7 @@
         {actions,parts}
        ]
       },
-      {transactionReply,  
+      {transactionReply,
        [
         {transactionResult, [{actionReplies,parts}]}
        ]
diff --git a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v3.asn1config b/lib/megaco/src/binary/megaco_ber_media_gateway_control_prev3b.asn1config
index deeb2b2da9..2f25f03d97 100644
--- a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_v3.asn1config
+++ b/lib/megaco/src/binary/megaco_ber_media_gateway_control_prev3b.asn1config
@@ -1,5 +1,5 @@
 {exclusive_decode,
- {'megaco_ber_bin_media_gateway_control_v3',
+ {'megaco_ber_media_gateway_control_prev3b',
   [
    {decode_message_trans_partial,
     [
@@ -14,7 +14,7 @@
         {actions,parts}
        ]
       },
-      {transactionReply,  
+      {transactionReply,
        [
         {transactionResult, [{actionReplies,parts}]}
        ]
diff --git a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3a.asn1config b/lib/megaco/src/binary/megaco_ber_media_gateway_control_prev3c.asn1config
index 456ce750ad..23c343eed0 100644
--- a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3a.asn1config
+++ b/lib/megaco/src/binary/megaco_ber_media_gateway_control_prev3c.asn1config
@@ -1,5 +1,5 @@
 {exclusive_decode,
- {'megaco_ber_bin_media_gateway_control_prev3a',
+ {'megaco_ber_media_gateway_control_prev3c',
   [
    {decode_message_trans_partial,
     [
@@ -14,7 +14,7 @@
         {actions,parts}
        ]
       },
-      {transactionReply,  
+      {transactionReply,
        [
         {transactionResult, [{actionReplies,parts}]}
        ]
diff --git a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v1.asn1config b/lib/megaco/src/binary/megaco_ber_media_gateway_control_v1.asn1config
index ea10a7d527..951825c0aa 100644
--- a/lib/megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_v1.asn1config
+++ b/lib/megaco/src/binary/megaco_ber_media_gateway_control_v1.asn1config
@@ -1,5 +1,5 @@
 {exclusive_decode,
- {'megaco_ber_bin_drv_media_gateway_control_v1',
+ {'megaco_ber_media_gateway_control_v1',
   [
    {decode_message_trans_partial,
     [
@@ -14,7 +14,7 @@
         {actions,parts}
        ]
       },
-      {transactionReply,  
+      {transactionReply,
        [
         {transactionResult, [{actionReplies,parts}]}
        ]
@@ -38,7 +38,7 @@
      ]
     ]
    }
+
   ]
  }
 }.
-
diff --git a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3b.asn1config b/lib/megaco/src/binary/megaco_ber_media_gateway_control_v3.asn1config
index fa5cd80baf..e4b1f9ece9 100644
--- a/lib/megaco/src/binary/megaco_ber_bin_media_gateway_control_prev3b.asn1config
+++ b/lib/megaco/src/binary/megaco_ber_media_gateway_control_v3.asn1config
@@ -1,5 +1,5 @@
 {exclusive_decode,
- {'megaco_ber_bin_media_gateway_control_prev3b',
+ {'megaco_ber_media_gateway_control_v3',
   [
    {decode_message_trans_partial,
     [
@@ -14,7 +14,7 @@
         {actions,parts}
        ]
       },
-      {transactionReply,  
+      {transactionReply,
        [
         {transactionResult, [{actionReplies,parts}]}
        ]
diff --git a/lib/megaco/src/binary/megaco_binary_encoder.erl b/lib/megaco/src/binary/megaco_binary_encoder.erl
index f825f91a45..51e167590d 100644
--- a/lib/megaco/src/binary/megaco_binary_encoder.erl
+++ b/lib/megaco/src/binary/megaco_binary_encoder.erl
@@ -241,55 +241,30 @@ encode_action_reply(_EC, _V, _AcionReply) ->
 %% Return {ok, Version} | {error, Reason}
 %%----------------------------------------------------------------------
 
-version_of([{version3,v3},driver|EC], Binary) ->
-    Decoders = [megaco_ber_bin_drv_media_gateway_control_v1,
-		megaco_ber_bin_drv_media_gateway_control_v2,
-		megaco_ber_bin_drv_media_gateway_control_v3],
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-version_of([{version3,prev3c},driver|EC], Binary) ->
-    Decoders = [megaco_ber_bin_drv_media_gateway_control_v1,
-		megaco_ber_bin_drv_media_gateway_control_v2,
-		megaco_ber_bin_drv_media_gateway_control_prev3c],
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-version_of([{version3,prev3b},driver|EC], Binary) ->
-    Decoders = [megaco_ber_bin_drv_media_gateway_control_v1,
-		megaco_ber_bin_drv_media_gateway_control_v2,
-		megaco_ber_bin_drv_media_gateway_control_prev3b],
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-version_of([{version3,prev3a},driver|EC], Binary) ->
-    Decoders = [megaco_ber_bin_drv_media_gateway_control_v1,
-		megaco_ber_bin_drv_media_gateway_control_v2,
-		megaco_ber_bin_drv_media_gateway_control_prev3a],
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
-version_of([driver|EC], Binary) ->
-    Decoders = [megaco_ber_bin_drv_media_gateway_control_v1,
-		megaco_ber_bin_drv_media_gateway_control_v2,
-		megaco_ber_bin_drv_media_gateway_control_v3],
-    ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
 version_of([{version3,v3}|EC], Binary) ->
-    Decoders = [megaco_ber_bin_media_gateway_control_v1,
-		megaco_ber_bin_media_gateway_control_v2,
-		megaco_ber_bin_media_gateway_control_v3],
+    Decoders = [megaco_ber_media_gateway_control_v1,
+		megaco_ber_media_gateway_control_v2,
+		megaco_ber_media_gateway_control_v3],
     ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
 version_of([{version3,prev3c}|EC], Binary) ->
-    Decoders = [megaco_ber_bin_media_gateway_control_v1,
-		megaco_ber_bin_media_gateway_control_v2,
-		megaco_ber_bin_media_gateway_control_prev3c],
+    Decoders = [megaco_ber_media_gateway_control_v1,
+		megaco_ber_media_gateway_control_v2,
+		megaco_ber_media_gateway_control_prev3c],
     ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
 version_of([{version3,prev3b}|EC], Binary) ->
-    Decoders = [megaco_ber_bin_media_gateway_control_v1,
-		megaco_ber_bin_media_gateway_control_v2,
-		megaco_ber_bin_media_gateway_control_prev3b],
+    Decoders = [megaco_ber_media_gateway_control_v1,
+		megaco_ber_media_gateway_control_v2,
+		megaco_ber_media_gateway_control_prev3b],
     ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
 version_of([{version3,prev3a}|EC], Binary) ->
-    Decoders = [megaco_ber_bin_media_gateway_control_v1,
-		megaco_ber_bin_media_gateway_control_v2,
-		megaco_ber_bin_media_gateway_control_prev3a],
+    Decoders = [megaco_ber_media_gateway_control_v1,
+		megaco_ber_media_gateway_control_v2,
+		megaco_ber_media_gateway_control_prev3a],
     ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders);
 version_of(EC, Binary) ->
-    Decoders = [megaco_ber_bin_media_gateway_control_v1,
-		megaco_ber_bin_media_gateway_control_v2,
-		megaco_ber_bin_media_gateway_control_v3],
+    Decoders = [megaco_ber_media_gateway_control_v1,
+		megaco_ber_media_gateway_control_v2,
+		megaco_ber_media_gateway_control_v3],
     ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders).
 
 	    
@@ -301,287 +276,153 @@ version_of(EC, Binary) ->
 decode_message(EC, Binary) ->
     decode_message(EC, 1, Binary).
 
-decode_message([{version3,v3},driver|EC], dynamic, Binary) ->
-    Decoders = [{megaco_ber_bin_drv_media_gateway_control_v1,
-		 megaco_binary_transformer_v1},
-		{megaco_ber_bin_drv_media_gateway_control_v2,
-		 megaco_binary_transformer_v2},
-		{megaco_ber_bin_drv_media_gateway_control_v3,
-		 megaco_binary_transformer_v3}],
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary);
-decode_message([{version3,prev3c},driver|EC], dynamic, Binary) ->
-    Decoders = [{megaco_ber_bin_drv_media_gateway_control_v1,
-		 megaco_binary_transformer_v1},
-		{megaco_ber_bin_drv_media_gateway_control_v2,
-		 megaco_binary_transformer_v2},
-		{megaco_ber_bin_drv_media_gateway_control_prev3c,
-		 megaco_binary_transformer_prev3c}],
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary);
-decode_message([{version3,prev3b},driver|EC], dynamic, Binary) ->
-    Decoders = [{megaco_ber_bin_drv_media_gateway_control_v1,
-		 megaco_binary_transformer_v1},
-		{megaco_ber_bin_drv_media_gateway_control_v2,
-		 megaco_binary_transformer_v2},
-		{megaco_ber_bin_drv_media_gateway_control_prev3b,
-		 megaco_binary_transformer_prev3b}],
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary);
-decode_message([{version3,prev3a},driver|EC], dynamic, Binary) ->
-    Decoders = [{megaco_ber_bin_drv_media_gateway_control_v1,
-		 megaco_binary_transformer_v1},
-		{megaco_ber_bin_drv_media_gateway_control_v2,
-		 megaco_binary_transformer_v2},
-		{megaco_ber_bin_drv_media_gateway_control_prev3a,
-		 megaco_binary_transformer_prev3a}],
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary);
-decode_message([driver|EC], dynamic, Binary) ->
-    Decoders = [{megaco_ber_bin_drv_media_gateway_control_v1,
-		 megaco_binary_transformer_v1},
-		{megaco_ber_bin_drv_media_gateway_control_v2,
-		 megaco_binary_transformer_v2},
-		{megaco_ber_bin_drv_media_gateway_control_v3,
-		 megaco_binary_transformer_v3}],
-    ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary);
 decode_message([{version3,v3}|EC], dynamic, Binary) ->
-    Decoders = [{megaco_ber_bin_media_gateway_control_v1,
+    Decoders = [{megaco_ber_media_gateway_control_v1,
 		 megaco_binary_transformer_v1},
-		{megaco_ber_bin_media_gateway_control_v2,
+		{megaco_ber_media_gateway_control_v2,
 		 megaco_binary_transformer_v2},
-		{megaco_ber_bin_media_gateway_control_v3,
+		{megaco_ber_media_gateway_control_v3,
 		 megaco_binary_transformer_v3}],
     ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary);
 decode_message([{version3,prev3c}|EC], dynamic, Binary) ->
-    Decoders = [{megaco_ber_bin_media_gateway_control_v1,
+    Decoders = [{megaco_ber_media_gateway_control_v1,
 		 megaco_binary_transformer_v1},
-		{megaco_ber_bin_media_gateway_control_v2,
+		{megaco_ber_media_gateway_control_v2,
 		 megaco_binary_transformer_v2},
-		{megaco_ber_bin_media_gateway_control_prev3c,
+		{megaco_ber_media_gateway_control_prev3c,
 		 megaco_binary_transformer_prev3c}],
     ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary);
 decode_message([{version3,prev3b}|EC], dynamic, Binary) ->
-    Decoders = [{megaco_ber_bin_media_gateway_control_v1,
+    Decoders = [{megaco_ber_media_gateway_control_v1,
 		 megaco_binary_transformer_v1},
-		{megaco_ber_bin_media_gateway_control_v2,
+		{megaco_ber_media_gateway_control_v2,
 		 megaco_binary_transformer_v2},
-		{megaco_ber_bin_media_gateway_control_prev3b,
+		{megaco_ber_media_gateway_control_prev3b,
 		 megaco_binary_transformer_prev3b}],
     ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary);
 decode_message([{version3,prev3a}|EC], dynamic, Binary) ->
-    Decoders = [{megaco_ber_bin_media_gateway_control_v1,
+    Decoders = [{megaco_ber_media_gateway_control_v1,
 		 megaco_binary_transformer_v1},
-		{megaco_ber_bin_media_gateway_control_v2,
+		{megaco_ber_media_gateway_control_v2,
 		 megaco_binary_transformer_v2},
-		{megaco_ber_bin_media_gateway_control_prev3a,
+		{megaco_ber_media_gateway_control_prev3a,
 		 megaco_binary_transformer_prev3a}],
     ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary);
 decode_message(EC, dynamic, Binary) ->
-    Decoders = [{megaco_ber_bin_media_gateway_control_v1,
+    Decoders = [{megaco_ber_media_gateway_control_v1,
 		 megaco_binary_transformer_v1},
-		{megaco_ber_bin_media_gateway_control_v2,
+		{megaco_ber_media_gateway_control_v2,
 		 megaco_binary_transformer_v2},
-		{megaco_ber_bin_media_gateway_control_v3,
+		{megaco_ber_media_gateway_control_v3,
 		 megaco_binary_transformer_v3}],
     ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary);
 
 
 %% -- Version 1 --
  
-decode_message([{version3,_},driver|EC], 1, Binary) ->
-    AsnMod   = megaco_ber_bin_drv_media_gateway_control_v1,
-    TransMod = megaco_binary_transformer_v1,
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-decode_message([driver|EC], 1, Binary) ->
-    AsnMod   = megaco_ber_bin_drv_media_gateway_control_v1,
-    TransMod = megaco_binary_transformer_v1,
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
 decode_message([{version3,_}|EC], 1, Binary) ->
-    AsnMod   = megaco_ber_bin_media_gateway_control_v1,
+    AsnMod   = megaco_ber_media_gateway_control_v1,
     TransMod = megaco_binary_transformer_v1,
     ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
 
 decode_message(EC, 1, Binary) ->
-    AsnMod   = megaco_ber_bin_media_gateway_control_v1,
+    AsnMod   = megaco_ber_media_gateway_control_v1,
     TransMod = megaco_binary_transformer_v1,
     ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
 
 
 %% -- Version 2 --
  
-decode_message([{version3,_},driver|EC], 2, Binary) ->
-    AsnMod   = megaco_ber_bin_drv_media_gateway_control_v2,
-    TransMod = megaco_binary_transformer_v2,
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-decode_message([driver|EC], 2, Binary) ->
-    AsnMod   = megaco_ber_bin_drv_media_gateway_control_v2,
-    TransMod = megaco_binary_transformer_v2,
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
 decode_message([{version3,_}|EC], 2, Binary) ->
-    AsnMod   = megaco_ber_bin_media_gateway_control_v2,
+    AsnMod   = megaco_ber_media_gateway_control_v2,
     TransMod = megaco_binary_transformer_v2,
     ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
 
 decode_message(EC, 2, Binary) ->
-    AsnMod   = megaco_ber_bin_media_gateway_control_v2,
+    AsnMod   = megaco_ber_media_gateway_control_v2,
     TransMod = megaco_binary_transformer_v2,
     ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
 
 
 %% -- Version 3 --
  
-decode_message([{version3,v3},driver|EC], 3, Binary) ->
-    AsnMod   = megaco_ber_bin_drv_media_gateway_control_v3,
-    TransMod = megaco_binary_transformer_v3,
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3c},driver|EC], 3, Binary) ->
-    AsnMod   = megaco_ber_bin_drv_media_gateway_control_prev3c,
-    TransMod = megaco_binary_transformer_prev3c,
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3b},driver|EC], 3, Binary) ->
-    AsnMod   = megaco_ber_bin_drv_media_gateway_control_prev3b,
-    TransMod = megaco_binary_transformer_prev3b,
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3a},driver|EC], 3, Binary) ->
-    AsnMod   = megaco_ber_bin_drv_media_gateway_control_prev3a,
-    TransMod = megaco_binary_transformer_prev3a,
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-decode_message([driver|EC], 3, Binary) ->
-    AsnMod   = megaco_ber_bin_drv_media_gateway_control_v3,
-    TransMod = megaco_binary_transformer_v3,
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
 decode_message([{version3,v3}|EC], 3, Binary) ->
-    AsnMod   = megaco_ber_bin_media_gateway_control_v3,
+    AsnMod   = megaco_ber_media_gateway_control_v3,
     TransMod = megaco_binary_transformer_v3,
     ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
 decode_message([{version3,prev3c}|EC], 3, Binary) ->
-    AsnMod   = megaco_ber_bin_media_gateway_control_prev3c,
+    AsnMod   = megaco_ber_media_gateway_control_prev3c,
     TransMod = megaco_binary_transformer_prev3c,
     ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
 decode_message([{version3,prev3b}|EC], 3, Binary) ->
-    AsnMod   = megaco_ber_bin_media_gateway_control_prev3b,
+    AsnMod   = megaco_ber_media_gateway_control_prev3b,
     TransMod = megaco_binary_transformer_prev3b,
     ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
 decode_message([{version3,prev3a}|EC], 3, Binary) ->
-    AsnMod   = megaco_ber_bin_media_gateway_control_prev3a,
+    AsnMod   = megaco_ber_media_gateway_control_prev3a,
     TransMod = megaco_binary_transformer_prev3a,
     ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
 
 decode_message(EC, 3, Binary) ->
-    AsnMod   = megaco_ber_bin_media_gateway_control_v3,
+    AsnMod   = megaco_ber_media_gateway_control_v3,
     TransMod = megaco_binary_transformer_v3,
     ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary).
 
 
-decode_mini_message([{version3,v3},driver|EC], dynamic, Bin) ->
-    Mods = [megaco_ber_bin_drv_media_gateway_control_v1,
-	    megaco_ber_bin_drv_media_gateway_control_v2,
-	    megaco_ber_bin_drv_media_gateway_control_v3],
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([{version3,prev3c},driver|EC], dynamic, Bin) ->
-    Mods = [megaco_ber_bin_drv_media_gateway_control_v1,
-	    megaco_ber_bin_drv_media_gateway_control_v2,
-	    megaco_ber_bin_drv_media_gateway_control_prev3c],
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([{version3,prev3b},driver|EC], dynamic, Bin) ->
-    Mods = [megaco_ber_bin_drv_media_gateway_control_v1,
-	    megaco_ber_bin_drv_media_gateway_control_v2,
-	    megaco_ber_bin_drv_media_gateway_control_prev3b],
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([{version3,prev3a},driver|EC], dynamic, Bin) ->
-    Mods = [megaco_ber_bin_drv_media_gateway_control_v1,
-	    megaco_ber_bin_drv_media_gateway_control_v2,
-	    megaco_ber_bin_drv_media_gateway_control_prev3a],
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
-decode_mini_message([driver|EC], dynamic, Bin) ->
-    Mods = [megaco_ber_bin_drv_media_gateway_control_v1,
-	    megaco_ber_bin_drv_media_gateway_control_v2,
-	    megaco_ber_bin_drv_media_gateway_control_v3],
-    ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
 decode_mini_message([{version3,v3}|EC], dynamic, Bin) ->
-    Mods = [megaco_ber_bin_media_gateway_control_v1,
-	    megaco_ber_bin_media_gateway_control_v2,
-	    megaco_ber_bin_media_gateway_control_v3],
+    Mods = [megaco_ber_media_gateway_control_v1,
+	    megaco_ber_media_gateway_control_v2,
+	    megaco_ber_media_gateway_control_v3],
     ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
 decode_mini_message([{version3,prev3c}|EC], dynamic, Bin) ->
-    Mods = [megaco_ber_bin_media_gateway_control_v1,
-	    megaco_ber_bin_media_gateway_control_v2,
-	    megaco_ber_bin_media_gateway_control_prev3c],
+    Mods = [megaco_ber_media_gateway_control_v1,
+	    megaco_ber_media_gateway_control_v2,
+	    megaco_ber_media_gateway_control_prev3c],
     ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
 decode_mini_message([{version3,prev3b}|EC], dynamic, Bin) ->
-    Mods = [megaco_ber_bin_media_gateway_control_v1,
-	    megaco_ber_bin_media_gateway_control_v2,
-	    megaco_ber_bin_media_gateway_control_prev3b],
+    Mods = [megaco_ber_media_gateway_control_v1,
+	    megaco_ber_media_gateway_control_v2,
+	    megaco_ber_media_gateway_control_prev3b],
     ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
 decode_mini_message([{version3,prev3a}|EC], dynamic, Bin) ->
-    Mods = [megaco_ber_bin_media_gateway_control_v1,
-	    megaco_ber_bin_media_gateway_control_v2,
-	    megaco_ber_bin_media_gateway_control_prev3a],
+    Mods = [megaco_ber_media_gateway_control_v1,
+	    megaco_ber_media_gateway_control_v2,
+	    megaco_ber_media_gateway_control_prev3a],
     ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
 decode_mini_message(EC, dynamic, Bin) ->
-    Mods = [megaco_ber_bin_media_gateway_control_v1,
-	    megaco_ber_bin_media_gateway_control_v2,
-	    megaco_ber_bin_media_gateway_control_v3],
+    Mods = [megaco_ber_media_gateway_control_v1,
+	    megaco_ber_media_gateway_control_v2,
+	    megaco_ber_media_gateway_control_v3],
     ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary);
 
-decode_mini_message([{version3,_},driver|EC], 1, Bin) ->
-    AsnMod = megaco_ber_bin_drv_media_gateway_control_v1,
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([driver|EC], 1, Bin) ->
-    AsnMod = megaco_ber_bin_drv_media_gateway_control_v1,
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
 decode_mini_message([{version3,_}|EC], 1, Bin) ->
-    AsnMod = megaco_ber_bin_media_gateway_control_v1,
+    AsnMod = megaco_ber_media_gateway_control_v1,
     ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
 decode_mini_message(EC, 1, Bin) ->
-    AsnMod = megaco_ber_bin_media_gateway_control_v1,
+    AsnMod = megaco_ber_media_gateway_control_v1,
     ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
 
-decode_mini_message([{version3,_},driver|EC], 2, Bin) ->
-    AsnMod = megaco_ber_bin_drv_media_gateway_control_v2,
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([driver|EC], 2, Bin) ->
-    AsnMod = megaco_ber_bin_drv_media_gateway_control_v2,
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
 decode_mini_message([{version3,_}|EC], 2, Bin) ->
-    AsnMod = megaco_ber_bin_media_gateway_control_v2,
+    AsnMod = megaco_ber_media_gateway_control_v2,
     ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
 decode_mini_message(EC, 2, Bin) ->
-    AsnMod = megaco_ber_bin_media_gateway_control_v2,
+    AsnMod = megaco_ber_media_gateway_control_v2,
     ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
 
-decode_mini_message([{version3,v3},driver|EC], 3, Bin) ->
-    AsnMod = megaco_ber_bin_drv_media_gateway_control_v3,
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,prev3c},driver|EC], 3, Bin) ->
-    AsnMod = megaco_ber_bin_drv_media_gateway_control_prev3c,
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,prev3b},driver|EC], 3, Bin) ->
-    AsnMod = megaco_ber_bin_drv_media_gateway_control_prev3b,
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([{version3,prev3a},driver|EC], 3, Bin) ->
-    AsnMod = megaco_ber_bin_drv_media_gateway_control_prev3a,
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
-decode_mini_message([driver|EC], 3, Bin) ->
-    AsnMod = megaco_ber_bin_drv_media_gateway_control_v3,
-    ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
 decode_mini_message([{version3,v3}|EC], 3, Bin) ->
-    AsnMod = megaco_ber_bin_media_gateway_control_v3,
+    AsnMod = megaco_ber_media_gateway_control_v3,
     ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
 decode_mini_message([{version3,prev3c}|EC], 3, Bin) ->
-    AsnMod = megaco_ber_bin_media_gateway_control_prev3c,
+    AsnMod = megaco_ber_media_gateway_control_prev3c,
     ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
 decode_mini_message([{version3,prev3b}|EC], 3, Bin) ->
-    AsnMod = megaco_ber_bin_media_gateway_control_prev3b,
+    AsnMod = megaco_ber_media_gateway_control_prev3b,
     ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
 decode_mini_message([{version3,prev3a}|EC], 3, Bin) ->
-    AsnMod = megaco_ber_bin_media_gateway_control_prev3a,
+    AsnMod = megaco_ber_media_gateway_control_prev3a,
     ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary);
 decode_mini_message(EC, 3, Bin) ->
-    AsnMod = megaco_ber_bin_media_gateway_control_v3,
+    AsnMod = megaco_ber_media_gateway_control_v3,
     ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary).
 
 
diff --git a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
index 967ee93935..262889db39 100644
--- a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
+++ b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
@@ -275,7 +275,7 @@ decode_message_dynamic(_EC, _BadBin, _Mods, _Type) ->
     {error, no_binary}.
 
 
-decode_message(EC, Bin, AsnMod, TransMod, binary) ->
+decode_message(EC, Bin, AsnMod, TransMod, _) ->
     case asn1rt:decode(AsnMod, 'MegacoMessage', Bin) of
 	{ok, MegaMsg} ->
 	    case EC of
@@ -286,19 +286,6 @@ decode_message(EC, Bin, AsnMod, TransMod, binary) ->
 	    end;
 	{error, Reason} ->
 	    {error, Reason}
-    end;
-decode_message(EC, Bin, AsnMod, TransMod, io_list) ->
-    ShallowIoList = erlang:binary_to_list(Bin),
-    case asn1rt:decode(AsnMod, 'MegacoMessage', ShallowIoList) of
-	{ok, MegaMsg} ->
-	    case EC of
-		[native] ->
-		    {ok, MegaMsg};
-		_ ->
-		    {ok, TransMod:tr_message(MegaMsg, decode, EC)}
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
     end.
 
 
diff --git a/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_prev3a.set.asn b/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_prev3a.set.asn
deleted file mode 100644
index b9ba7ffdb4..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_prev3a.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-prev3a.asn
diff --git a/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_prev3b.set.asn b/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_prev3b.set.asn
deleted file mode 100644
index 0437bde310..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_prev3b.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-prev3b.asn
diff --git a/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_prev3c.set.asn b/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_prev3c.set.asn
deleted file mode 100644
index e78055fbad..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_prev3c.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-prev3c.asn
diff --git a/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_v1.set.asn b/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_v1.set.asn
deleted file mode 100644
index 0f5a92dba1..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_v1.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-v1.asn
diff --git a/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_v2.set.asn b/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_v2.set.asn
deleted file mode 100644
index 7fc82b127f..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_v2.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-v2.asn
diff --git a/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_v3.set.asn b/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_v3.set.asn
deleted file mode 100644
index 1d7950a283..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_drv_media_gateway_control_v3.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-v3.asn
diff --git a/lib/megaco/src/binary/megaco_per_bin_encoder.erl b/lib/megaco/src/binary/megaco_per_bin_encoder.erl
deleted file mode 100644
index f7280f4e04..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_encoder.erl
+++ /dev/null
@@ -1,447 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose : Handle ASN.1 PER encoding of Megaco/H.248
-%%----------------------------------------------------------------------
-
--module(megaco_per_bin_encoder).
-
--behaviour(megaco_encoder).
-
--export([encode_message/3, decode_message/3,
-	 decode_mini_message/3, 
-
-	 encode_transaction/3,
-	 encode_action_requests/3,
-	 encode_action_request/3,
-	 encode_action_reply/3,
-
-	 version_of/2]).
-
-%% Backward compatible functions:
--export([encode_message/2, decode_message/2]).
-
--include_lib("megaco/src/engine/megaco_message_internal.hrl").
-
--define(V1_ASN1_MOD,         megaco_per_bin_media_gateway_control_v1).
--define(V2_ASN1_MOD,         megaco_per_bin_media_gateway_control_v2).
--define(V3_ASN1_MOD,         megaco_per_bin_media_gateway_control_v3).
--define(PREV3A_ASN1_MOD,     megaco_per_bin_media_gateway_control_prev3a).
--define(PREV3B_ASN1_MOD,     megaco_per_bin_media_gateway_control_prev3b).
--define(PREV3C_ASN1_MOD,     megaco_per_bin_media_gateway_control_prev3c).
--define(V1_ASN1_MOD_DRV,     megaco_per_bin_drv_media_gateway_control_v1).
--define(V2_ASN1_MOD_DRV,     megaco_per_bin_drv_media_gateway_control_v2).
--define(V3_ASN1_MOD_DRV,     megaco_per_bin_drv_media_gateway_control_v3).
--define(PREV3A_ASN1_MOD_DRV, megaco_per_bin_drv_media_gateway_control_prev3a).
--define(PREV3B_ASN1_MOD_DRV, megaco_per_bin_drv_media_gateway_control_prev3b).
--define(PREV3C_ASN1_MOD_DRV, megaco_per_bin_drv_media_gateway_control_prev3c).
-
--define(V1_TRANS_MOD,     megaco_binary_transformer_v1).
--define(V2_TRANS_MOD,     megaco_binary_transformer_v2).
--define(V3_TRANS_MOD,     megaco_binary_transformer_v3).
--define(PREV3A_TRANS_MOD, megaco_binary_transformer_prev3a).
--define(PREV3B_TRANS_MOD, megaco_binary_transformer_prev3b).
--define(PREV3C_TRANS_MOD, megaco_binary_transformer_prev3c).
-
--define(BIN_LIB, megaco_binary_encoder_lib).
-
-
-%%----------------------------------------------------------------------
-%% Detect (check/get) message version
-%% Return {ok, Version} | {error, Reason}
-%%----------------------------------------------------------------------
-
-version_of([{version3,v3},driver|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD_DRV, ?V2_ASN1_MOD_DRV, ?V3_ASN1_MOD_DRV],
-    ?BIN_LIB:version_of(EC, Binary, 1, Decoders);
-version_of([{version3,prev3c},driver|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD_DRV, ?V2_ASN1_MOD_DRV, ?PREV3C_ASN1_MOD_DRV],
-    ?BIN_LIB:version_of(EC, Binary, 1, Decoders);
-version_of([{version3,prev3b},driver|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD_DRV, ?V2_ASN1_MOD_DRV, ?PREV3B_ASN1_MOD_DRV],
-    ?BIN_LIB:version_of(EC, Binary, 1, Decoders);
-version_of([{version3,prev3a},driver|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD_DRV, ?V2_ASN1_MOD_DRV, ?PREV3A_ASN1_MOD_DRV],
-    ?BIN_LIB:version_of(EC, Binary, 1, Decoders);
-version_of([driver|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD_DRV, ?V2_ASN1_MOD_DRV, ?V3_ASN1_MOD_DRV],
-    ?BIN_LIB:version_of(EC, Binary, 1, Decoders);
-version_of([{version3,v3}|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?V3_ASN1_MOD],
-    ?BIN_LIB:version_of(EC, Binary, 1, Decoders);
-version_of([{version3,prev3c}|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?PREV3C_ASN1_MOD],
-    ?BIN_LIB:version_of(EC, Binary, 1, Decoders);
-version_of([{version3,prev3b}|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?PREV3B_ASN1_MOD],
-    ?BIN_LIB:version_of(EC, Binary, 1, Decoders);
-version_of([{version3,prev3a}|EC], Binary) ->
-    Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?PREV3A_ASN1_MOD],
-    ?BIN_LIB:version_of(EC, Binary, 1, Decoders);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-version_of(EC, Binary) ->
-    Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?V3_ASN1_MOD],
-    ?BIN_LIB:version_of(EC, Binary, 1, Decoders).
-
-
-%%----------------------------------------------------------------------
-%% Convert a 'MegacoMessage' record into a binary
-%% Return {ok, Binary} | {error, Reason}
-%%----------------------------------------------------------------------
-
-encode_message(EC, 
-	       #'MegacoMessage'{mess = #'Message'{version = V}} = MegaMsg) ->
-    encode_message(EC, V, MegaMsg).
-
-
-%% -- Version 1 --
-
-encode_message([{version3, _},driver|EC], 1, MegaMsg) ->
-    AsnMod   = ?V1_ASN1_MOD_DRV, 
-    TransMod = ?V1_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([driver|EC], 1, MegaMsg) ->
-    AsnMod   = ?V1_ASN1_MOD_DRV, 
-    TransMod = ?V1_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,_}|EC], 1, MegaMsg) ->
-    AsnMod   = ?V1_ASN1_MOD, 
-    TransMod = ?V1_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-encode_message(EC, 1, MegaMsg) ->
-    AsnMod   = ?V1_ASN1_MOD, 
-    TransMod = ?V1_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-
-
-%% -- Version 2 --
-
-encode_message([{version3,_},driver|EC], 2, MegaMsg) ->
-    AsnMod   = ?V2_ASN1_MOD_DRV, 
-    TransMod = ?V2_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([driver|EC], 2, MegaMsg) ->
-    AsnMod   = ?V2_ASN1_MOD_DRV, 
-    TransMod = ?V2_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,_}|EC], 2, MegaMsg) ->
-    AsnMod   = ?V2_ASN1_MOD, 
-    TransMod = ?V2_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-encode_message(EC, 2, MegaMsg) ->
-    AsnMod   = ?V2_ASN1_MOD, 
-    TransMod = ?V2_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-
-
-%% -- Version 3 --
-
-encode_message([{version3,v3},driver|EC], 3, MegaMsg) ->
-    AsnMod   = ?V3_ASN1_MOD_DRV, 
-    TransMod = ?V3_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,prev3c},driver|EC], 3, MegaMsg) ->
-    AsnMod   = ?PREV3C_ASN1_MOD_DRV, 
-    TransMod = ?PREV3C_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,prev3b},driver|EC], 3, MegaMsg) ->
-    AsnMod   = ?PREV3B_ASN1_MOD_DRV, 
-    TransMod = ?PREV3B_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,prev3a},driver|EC], 3, MegaMsg) ->
-    AsnMod   = ?PREV3A_ASN1_MOD_DRV, 
-    TransMod = ?PREV3A_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([driver|EC], 3, MegaMsg) ->
-    AsnMod   = ?V3_ASN1_MOD_DRV, 
-    TransMod = ?V3_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,v3}|EC], 3, MegaMsg) ->
-    AsnMod   = ?V3_ASN1_MOD, 
-    TransMod = ?V3_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,prev3c}|EC], 3, MegaMsg) ->
-    AsnMod   = ?PREV3C_ASN1_MOD, 
-    TransMod = ?PREV3C_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,prev3b}|EC], 3, MegaMsg) ->
-    AsnMod   = ?PREV3B_ASN1_MOD, 
-    TransMod = ?PREV3B_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-encode_message([{version3,prev3a}|EC], 3, MegaMsg) ->
-    AsnMod   = ?PREV3A_ASN1_MOD, 
-    TransMod = ?PREV3A_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-encode_message(EC, 3, MegaMsg) ->
-    AsnMod   = ?V3_ASN1_MOD, 
-    TransMod = ?V3_TRANS_MOD,
-    ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list).
-
-
-%%----------------------------------------------------------------------
-%% Convert a transaction (or transactions in the case of ack) record(s) 
-%% into a binary
-%% Return {ok, Binary} | {error, Reason}
-%%----------------------------------------------------------------------
-
-%% encode_transaction([] = EC, 1, Trans) ->
-%%     AsnMod   = ?V1_ASN1_MOD, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, 
-%% 					     io_list);
-%% encode_transaction([native] = EC, 1, Trans) ->
-%%     AsnMod   = ?V1_ASN1_MOD, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, 
-%% 					     io_list);
-%% encode_transaction([driver|EC], 1, Trans) ->
-%%     AsnMod   = ?V1_ASN1_MOD_DRV, 
-%%     TransMod = ?V1_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, 
-%% 					     io_list);
-encode_transaction(_EC, 1, _Trans) ->
-    %%     AsnMod   = ?V1_ASN1_MOD, 
-    %%     TransMod = ?V1_TRANS_MOD,
-    %%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, 
-    %% 					     io_list);
-    {error, not_implemented};
-
-%% encode_transaction([] = EC, 2, Trans) ->
-%%     AsnMod   = ?V2_ASN1_MOD, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%% 					     io_list);
-%% encode_transaction([native] = EC, 2, Trans) ->
-%%     AsnMod   = ?V2_ASN1_MOD, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%% 					     io_list);
-%% encode_transaction([driver|EC], 2, Trans) ->
-%%     AsnMod   = ?V2_ASN1_MOD_DRV, 
-%%     TransMod = ?V2_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%% 					     io_list);
-encode_transaction(_EC, 2, _Trans) ->
-    %%     AsnMod   = ?V2_ASN1_MOD, 
-    %%     TransMod = ?V2_TRANS_MOD,
-    %%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-    %% 					     io_list).
-    {error, not_implemented};
-                                                                                
-%% encode_transaction([] = EC, 3, Trans) ->
-%%     AsnMod   = ?V3_ASN1_MOD,
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%%                                           io_list);
-%% encode_transaction([native] = EC, 3, Trans) ->
-%%     AsnMod   = ?V3_ASN1_MOD,
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%%                                           io_list);
-%% encode_transaction([driver|EC], 3, Trans) ->
-%%     AsnMod   = ?V3_ASN1_MOD_DRV,
-%%     TransMod = ?V3_TRANS_MOD,
-%%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,
-%%                                           io_list);
-encode_transaction(_EC, 3, _Trans) ->
-    %%     AsnMod   = ?V3_ASN1_MOD,
-    %%     TransMod = ?V3_TRANS_MOD,
-    %%     ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod,    %%                                       io_list).
-    {error, not_implemented}.
-
-
-%%----------------------------------------------------------------------
-%% Convert a list of ActionRequest record's into a binary
-%% Return {ok, DeepIoList} | {error, Reason}
-%%----------------------------------------------------------------------
-encode_action_requests(_EC, 1, ActReqs) when is_list(ActReqs) ->
-    %%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-    %% 						 ?V1_ASN1_MOD, 
-    %% 						 ?V1_TRANS_MOD,
-    %% 						 io_list);
-    {error, not_implemented};
-encode_action_requests(_EC, 2, ActReqs) when is_list(ActReqs) ->
-    %%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-    %% 						 ?V1_ASN1_MOD, 
-    %% 						 ?V1_TRANS_MOD,
-    %% 						 io_list).
-    {error, not_implemented};
-encode_action_requests(_EC, 3, ActReqs) when is_list(ActReqs) ->
-    %%     ?BIN_LIB:encode_action_requests(EC, ActReqs,
-    %% 						 ?V1_ASN1_MOD, 
-    %% 						 ?V1_TRANS_MOD,
-    %% 						 io_list).
-    {error, not_implemented}.
-
-
-%%----------------------------------------------------------------------
-%% Convert a ActionRequest record into a binary
-%% Return {ok, DeepIoList} | {error, Reason}
-%%----------------------------------------------------------------------
-encode_action_request(_EC, 1, _ActReq) ->
-    %%     ?BIN_LIB:encode_action_request(EC, ActReq,
-    %% 						?V1_ASN1_MOD, 
-    %% 						?V1_TRANS_MOD,
-    %% 						io_list);
-    {error, not_implemented};
-encode_action_request(_EC, 2, _ActReq) ->
-    %%     ?BIN_LIB:encode_action_request(EC, ActReq,
-    %% 						?V1_ASN1_MOD, 
-    %% 						?V1_TRANS_MOD,
-    %% 						io_list).
-    {error, not_implemented};
-encode_action_request(_EC, 3, _ActReq) ->
-    %%     ?BIN_LIB:encode_action_request(EC, ActReq,
-    %% 						?V1_ASN1_MOD, 
-    %% 						?V1_TRANS_MOD,
-    %% 						io_list).
-    {error, not_implemented}.
-
-
-%%----------------------------------------------------------------------
-%% Convert a action reply into a deep io list
-%% Not yest supported by this binary codec!
-%% Return {ok, DeepIoList} | {error, Reason}
-%%----------------------------------------------------------------------
-
-encode_action_reply(_EC, _V, _AcionReply) ->
-    {error, not_implemented}.
-
-
-%%----------------------------------------------------------------------
-%% Convert a binary into a 'MegacoMessage' record
-%% Return {ok, MegacoMessageRecord} | {error, Reason}
-%%----------------------------------------------------------------------
-
-decode_message(EC, Binary) ->
-    decode_message(EC, 1, Binary).
-
-%% PER does not support partial decode, so this means V1
-decode_message(EC, dynamic, Binary) ->
-    decode_message(EC, 1, Binary);
-
-
-%% -- Version 1 --
-
-decode_message([{version3,_},driver|EC], 1, Binary) ->
-    AsnMod   = ?V1_ASN1_MOD_DRV, 
-    TransMod = ?V1_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([driver|EC], 1, Binary) ->
-    AsnMod   = ?V1_ASN1_MOD_DRV, 
-    TransMod = ?V1_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,_}|EC], 1, Binary) ->
-    AsnMod   = ?V1_ASN1_MOD, 
-    TransMod = ?V1_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-decode_message(EC, 1, Binary) ->
-    AsnMod   = ?V1_ASN1_MOD, 
-    TransMod = ?V1_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-
-%% -- Version 2 --
-
-decode_message([{version3,_},driver|EC], 2, Binary) ->
-    AsnMod   = ?V2_ASN1_MOD_DRV, 
-    TransMod = ?V2_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([driver|EC], 2, Binary) ->
-    AsnMod   = ?V2_ASN1_MOD_DRV, 
-    TransMod = ?V2_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,_}|EC], 2, Binary) ->
-    AsnMod   = ?V2_ASN1_MOD, 
-    TransMod = ?V2_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-decode_message(EC, 2, Binary) ->
-    AsnMod   = ?V2_ASN1_MOD, 
-    TransMod = ?V2_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-
-%% -- Version 3 --
-
-decode_message([{version3,v3},driver|EC], 3, Binary) ->
-    AsnMod   = ?V3_ASN1_MOD_DRV, 
-    TransMod = ?V3_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3c},driver|EC], 3, Binary) ->
-    AsnMod   = ?PREV3C_ASN1_MOD_DRV, 
-    TransMod = ?PREV3C_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3b},driver|EC], 3, Binary) ->
-    AsnMod   = ?PREV3B_ASN1_MOD_DRV, 
-    TransMod = ?PREV3B_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3a},driver|EC], 3, Binary) ->
-    AsnMod   = ?PREV3A_ASN1_MOD_DRV, 
-    TransMod = ?PREV3A_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([driver|EC], 3, Binary) ->
-    AsnMod   = ?V3_ASN1_MOD_DRV, 
-    TransMod = ?V3_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,v3}|EC], 3, Binary) ->
-    AsnMod   = ?V3_ASN1_MOD, 
-    TransMod = ?V3_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3c}|EC], 3, Binary) ->
-    AsnMod   = ?PREV3C_ASN1_MOD, 
-    TransMod = ?PREV3C_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3b}|EC], 3, Binary) ->
-    AsnMod   = ?PREV3B_ASN1_MOD, 
-    TransMod = ?PREV3B_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-decode_message([{version3,prev3a}|EC], 3, Binary) ->
-    AsnMod   = ?PREV3A_ASN1_MOD, 
-    TransMod = ?PREV3A_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary);
-
-%% All values we need to take (special) care of has been delt with, 
-%% so just pass the rest on
-decode_message(EC, 3, Binary) ->
-    AsnMod   = ?V3_ASN1_MOD, 
-    TransMod = ?V3_TRANS_MOD, 
-    ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary).
-
-
-decode_mini_message(_EC, _Vsn, _Bin) ->
-    {error, not_implemented}.
diff --git a/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_prev3a.set.asn b/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_prev3a.set.asn
deleted file mode 100644
index b9ba7ffdb4..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_prev3a.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-prev3a.asn
diff --git a/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_prev3b.set.asn b/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_prev3b.set.asn
deleted file mode 100644
index 0437bde310..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_prev3b.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-prev3b.asn
diff --git a/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_prev3c.set.asn b/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_prev3c.set.asn
deleted file mode 100644
index e78055fbad..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_prev3c.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-prev3c.asn
diff --git a/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_v1.set.asn b/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_v1.set.asn
deleted file mode 100644
index 0f5a92dba1..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_v1.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-v1.asn
diff --git a/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_v2.set.asn b/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_v2.set.asn
deleted file mode 100644
index 7fc82b127f..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_v2.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-v2.asn
diff --git a/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_v3.set.asn b/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_v3.set.asn
deleted file mode 100644
index 1d7950a283..0000000000
--- a/lib/megaco/src/binary/megaco_per_bin_media_gateway_control_v3.set.asn
+++ /dev/null
@@ -1 +0,0 @@
-MEDIA-GATEWAY-CONTROL-v3.asn
diff --git a/lib/megaco/src/binary/modules.mk b/lib/megaco/src/binary/modules.mk
index a86ce2aecc..bbaf087ceb 100644
--- a/lib/megaco/src/binary/modules.mk
+++ b/lib/megaco/src/binary/modules.mk
@@ -27,19 +27,6 @@ MODULES = \
 	megaco_ber_media_gateway_control_prev3b \
 	megaco_ber_media_gateway_control_prev3c \
 	megaco_ber_media_gateway_control_v3 \
-	megaco_ber_bin_encoder \
-	megaco_ber_bin_media_gateway_control_v1 \
-	megaco_ber_bin_media_gateway_control_v2 \
-	megaco_ber_bin_media_gateway_control_prev3a \
-	megaco_ber_bin_media_gateway_control_prev3b \
-	megaco_ber_bin_media_gateway_control_prev3c \
-	megaco_ber_bin_media_gateway_control_v3 \
-	megaco_ber_bin_drv_media_gateway_control_v1 \
-	megaco_ber_bin_drv_media_gateway_control_v2 \
-	megaco_ber_bin_drv_media_gateway_control_prev3a \
-	megaco_ber_bin_drv_media_gateway_control_prev3b \
-	megaco_ber_bin_drv_media_gateway_control_prev3c \
-	megaco_ber_bin_drv_media_gateway_control_v3 \
 	megaco_per_encoder \
 	megaco_per_media_gateway_control_v1 \
 	megaco_per_media_gateway_control_v2 \
@@ -47,19 +34,6 @@ MODULES = \
 	megaco_per_media_gateway_control_prev3b \
 	megaco_per_media_gateway_control_prev3c \
 	megaco_per_media_gateway_control_v3 \
-	megaco_per_bin_encoder \
-	megaco_per_bin_media_gateway_control_v1 \
-	megaco_per_bin_media_gateway_control_v2 \
-	megaco_per_bin_media_gateway_control_prev3a \
-	megaco_per_bin_media_gateway_control_prev3b \
-	megaco_per_bin_media_gateway_control_prev3c \
-	megaco_per_bin_media_gateway_control_v3 \
-	megaco_per_bin_drv_media_gateway_control_v1 \
-	megaco_per_bin_drv_media_gateway_control_v2 \
-	megaco_per_bin_drv_media_gateway_control_prev3a \
-	megaco_per_bin_drv_media_gateway_control_prev3b \
-	megaco_per_bin_drv_media_gateway_control_prev3c \
-	megaco_per_bin_drv_media_gateway_control_v3 \
 	megaco_binary_name_resolver_v1 \
 	megaco_binary_name_resolver_v2 \
 	megaco_binary_name_resolver_prev3a \
@@ -85,44 +59,20 @@ ASN1_PREV3C_SPEC  = MEDIA-GATEWAY-CONTROL-prev3c
 ASN1_V3_SPEC      = MEDIA-GATEWAY-CONTROL-v3
 
 BER_ASN1_V1_SPEC         = megaco_ber_media_gateway_control_v1
-BER_BIN_ASN1_V1_SPEC     = megaco_ber_bin_media_gateway_control_v1
-BER_BIN_DRV_ASN1_V1_SPEC = megaco_ber_bin_drv_media_gateway_control_v1
 PER_ASN1_V1_SPEC         = megaco_per_media_gateway_control_v1
-PER_BIN_ASN1_V1_SPEC     = megaco_per_bin_media_gateway_control_v1
-PER_BIN_DRV_ASN1_V1_SPEC = megaco_per_bin_drv_media_gateway_control_v1
 
 BER_ASN1_V2_SPEC         = megaco_ber_media_gateway_control_v2
-BER_BIN_ASN1_V2_SPEC     = megaco_ber_bin_media_gateway_control_v2
-BER_BIN_DRV_ASN1_V2_SPEC = megaco_ber_bin_drv_media_gateway_control_v2
 PER_ASN1_V2_SPEC         = megaco_per_media_gateway_control_v2
-PER_BIN_ASN1_V2_SPEC     = megaco_per_bin_media_gateway_control_v2
-PER_BIN_DRV_ASN1_V2_SPEC = megaco_per_bin_drv_media_gateway_control_v2
 
 BER_ASN1_PREV3A_SPEC         = megaco_ber_media_gateway_control_prev3a
-BER_BIN_ASN1_PREV3A_SPEC     = megaco_ber_bin_media_gateway_control_prev3a
-BER_BIN_DRV_ASN1_PREV3A_SPEC = megaco_ber_bin_drv_media_gateway_control_prev3a
 PER_ASN1_PREV3A_SPEC         = megaco_per_media_gateway_control_prev3a
-PER_BIN_ASN1_PREV3A_SPEC     = megaco_per_bin_media_gateway_control_prev3a
-PER_BIN_DRV_ASN1_PREV3A_SPEC = megaco_per_bin_drv_media_gateway_control_prev3a
 
 BER_ASN1_PREV3B_SPEC         = megaco_ber_media_gateway_control_prev3b
-BER_BIN_ASN1_PREV3B_SPEC     = megaco_ber_bin_media_gateway_control_prev3b
-BER_BIN_DRV_ASN1_PREV3B_SPEC = megaco_ber_bin_drv_media_gateway_control_prev3b
 PER_ASN1_PREV3B_SPEC         = megaco_per_media_gateway_control_prev3b
-PER_BIN_ASN1_PREV3B_SPEC     = megaco_per_bin_media_gateway_control_prev3b
-PER_BIN_DRV_ASN1_PREV3B_SPEC = megaco_per_bin_drv_media_gateway_control_prev3b
 
 BER_ASN1_PREV3C_SPEC         = megaco_ber_media_gateway_control_prev3c
-BER_BIN_ASN1_PREV3C_SPEC     = megaco_ber_bin_media_gateway_control_prev3c
-BER_BIN_DRV_ASN1_PREV3C_SPEC = megaco_ber_bin_drv_media_gateway_control_prev3c
 PER_ASN1_PREV3C_SPEC         = megaco_per_media_gateway_control_prev3c
-PER_BIN_ASN1_PREV3C_SPEC     = megaco_per_bin_media_gateway_control_prev3c
-PER_BIN_DRV_ASN1_PREV3C_SPEC = megaco_per_bin_drv_media_gateway_control_prev3c
 
 BER_ASN1_V3_SPEC         = megaco_ber_media_gateway_control_v3
-BER_BIN_ASN1_V3_SPEC     = megaco_ber_bin_media_gateway_control_v3
-BER_BIN_DRV_ASN1_V3_SPEC = megaco_ber_bin_drv_media_gateway_control_v3
 PER_ASN1_V3_SPEC         = megaco_per_media_gateway_control_v3
-PER_BIN_ASN1_V3_SPEC     = megaco_per_bin_media_gateway_control_v3
-PER_BIN_DRV_ASN1_V3_SPEC = megaco_per_bin_drv_media_gateway_control_v3
 
diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile
index 3943f4b957..7cecef1444 100644
--- a/lib/megaco/src/engine/Makefile
+++ b/lib/megaco/src/engine/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2009. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -42,9 +42,14 @@ RELSYSDIR = $(RELEASE_PATH)/lib/megaco-$(VSN)
 
 include modules.mk
 
-ERL_FILES = $(MODULES:%=%.erl)	
+ERL_FILES = \
+	$(MODULES:%=%.erl) \
+	$(BEHAVIOUR_MODULES:%=%.erl)
 
-TARGET_FILES =  \
+BEHAVIOUR_TARGET_FILES= \
+	$(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+TARGET_FILES = \
 	$(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 
@@ -65,19 +70,23 @@ ERL_COMPILE_FLAGS += \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
+
+$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
+
 debug:
 	@${MAKE} TYPE=debug opt
 
 opt: $(TARGET_FILES) 
 
 clean:
-	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
+	rm -f $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 	rm -f errs core *~
 
 docs:
 
 info:
 	@echo "MODULES = $(MODULES)"
+	@echo "BEHAVIOUR_MODULES = $(BEHAVIOUR_MODULES)"
 	@echo ""
 
 
@@ -88,12 +97,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/engine
-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/engine
-	$(INSTALL_DIR)  $(RELSYSDIR)/include
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/engine"
+	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
 
 
 release_docs_spec:
diff --git a/lib/megaco/src/engine/modules.mk b/lib/megaco/src/engine/modules.mk
index 4bc57cd63e..e6e5e29829 100644
--- a/lib/megaco/src/engine/modules.mk
+++ b/lib/megaco/src/engine/modules.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2011. All Rights Reserved.
+# Copyright Ericsson AB 2001-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -23,7 +23,6 @@ BEHAVIOUR_MODULES = \
 	megaco_transport
 
 MODULES = \
-	$(BEHAVIOUR_MODULES) \
 	megaco_config_misc \
 	megaco_config \
 	megaco_digit_map \
diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
index 7d82644246..cb5f5412f4 100644
--- a/lib/megaco/src/flex/Makefile.in
+++ b/lib/megaco/src/flex/Makefile.in
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2001-2011. All Rights Reserved.
+# Copyright Ericsson AB 2001-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -104,10 +104,6 @@ ENABLE_MEGACO_FLEX_SCANNER_LINENO = @ENABLE_MEGACO_FLEX_SCANNER_LINENO@
 endif
 endif
 
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-        DED_INCLUDES += -I$(ERL_TOP)/erts/etc/vxworks
-endif
-
 PRIVDIR = ../../priv
 LIBDIR  = $(PRIVDIR)/lib/$(TARGET)
 OBJDIR  = $(PRIVDIR)/obj/$(TARGET)
@@ -146,15 +142,10 @@ ifeq ($(findstring win32,$(TARGET)), win32)
 FLEX_SCANNER_SO = 
 SOLIBS = $(FLEX_SCANNER_SO)
 else
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-FLEX_SCANNER_SO = 
-SOLIBS = $(FLEX_SCANNER_SO)
-else
 FLEX_SCANNER_SO = $(LIBDIR)/$(STD_DRV).$(DED_EXT) 
 FLEX_SCANNER_MT_SO = $(LIBDIR)/$(MT_DRV).$(DED_EXT) 
 SOLIBS = $(FLEX_SCANNER_SO) $(FLEX_SCANNER_MT_SO) 
 endif
-endif
 
 
 # ----------------------------------------------------
@@ -271,16 +262,16 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/flex
-	$(INSTALL_DIR)  $(RELSYSDIR)/priv/lib
-	$(INSTALL_DIR)  $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/flex
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/flex"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/lib"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
-	$(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex
-	$(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib
+	$(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) "$(RELSYSDIR)/src/flex"
+	$(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
 endif
 
 
diff --git a/lib/megaco/src/rules.mk b/lib/megaco/src/rules.mk
index 20fbed2a76..a59060032d 100644
--- a/lib/megaco/src/rules.mk
+++ b/lib/megaco/src/rules.mk
@@ -29,10 +29,6 @@ PERL   = perl
 #	Erlang language section
 # ----------------------------------------------------
 EMULATOR = beam
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-# VxWorks jam object files should be compressed
-ERL_COMPILE_FLAGS += +compressed
-endif
 ERLC_WFLAGS = -W
 ERLC = erlc $(ERLC_WFLAGS) $(ERLC_FLAGS)
 ERL.beam =  erl.beam -boot start_clean
diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile
index 0bd4b7c4ee..0c30abae2c 100644
--- a/lib/megaco/src/tcp/Makefile
+++ b/lib/megaco/src/tcp/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2009. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -89,11 +89,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/tcp
-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/tcp
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/tcp"
+	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp"
 
 
 release_docs_spec:
diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile
index b2e8e762dd..cab4256e68 100644
--- a/lib/megaco/src/text/Makefile
+++ b/lib/megaco/src/text/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2009. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -130,11 +130,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(BEAM_TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/text
-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/text
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/text"
+	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text"
 
 
 release_docs_spec:
diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile
index 64b6478c2c..9486804d38 100644
--- a/lib/megaco/src/udp/Makefile
+++ b/lib/megaco/src/udp/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2009. All Rights Reserved.
+# Copyright Ericsson AB 2000-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -89,11 +89,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/udp
-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/udp
+	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/src/udp"
+	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp"
 
 
 release_docs_spec:
diff --git a/lib/megaco/test/Makefile b/lib/megaco/test/Makefile
index 88f6f06e73..b78f21f608 100644
--- a/lib/megaco/test/Makefile
+++ b/lib/megaco/test/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2010. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -748,11 +748,11 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR)  $(RELSYSDIR)
-	$(INSTALL_DATA) $(RELTEST_FILES) $(RELSYSDIR)
+	$(INSTALL_DIR)  "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(RELTEST_FILES) "$(RELSYSDIR)"
 #	$(INSTALL_DATA) $(TEST_SPEC_FILE) $(COVER_SPEC_FILE) \
 #                        $(HRL_FILES) $(ERL_FILES) \
-#                        $(RELSYSDIR)
+#                        "$(RELSYSDIR)"
 #
-	chmod -R u+w $(RELSYSDIR)
+	chmod -R u+w "$(RELSYSDIR)"
 
diff --git a/lib/megaco/test/megaco.spec.vxworks b/lib/megaco/test/megaco.spec.vxworks
deleted file mode 100644
index 2ac250e443..0000000000
--- a/lib/megaco/test/megaco.spec.vxworks
+++ /dev/null
@@ -1,5 +0,0 @@
-{topcase, {dir, "../megaco_test"}}.
-{require_nodenames, 1}.
-{skip, {megaco_digit_map_test, all, "Not yet implemented"}}.
-{skip, {megaco_measure_test, all, "Not yet implemented"}}.
-%{skip, {M, F, "Not yet implemented"}}.
diff --git a/lib/megaco/test/megaco_actions_test.erl b/lib/megaco/test/megaco_actions_test.erl
index 2efb6e834a..6d0e80281d 100644
--- a/lib/megaco/test/megaco_actions_test.erl
+++ b/lib/megaco/test/megaco_actions_test.erl
@@ -80,8 +80,7 @@ end_per_testcase(Case, Config) ->
 
 all() -> 
     [pretty_text, flex_pretty_text, compact_text,
-     flex_compact_text, erl_dist, erl_dist_mc, ber_bin,
-     ber_bin_drv, ber_bin_native, ber_bin_drv_native].
+     flex_compact_text, erl_dist, erl_dist_mc].
 
 groups() -> 
     [].
@@ -170,39 +169,6 @@ erl_dist_mc(Config) when is_list(Config) ->
     req_and_rep(Config, Codec, Version, EncodingConfig).
 
 
-ber_bin(suite) ->
-    [];
-ber_bin(doc) ->
-    [];
-ber_bin(Config) when is_list(Config) ->
-    ?SKIP(currently_not_supported_by_asn1).
-
-
-ber_bin_drv(suite) ->
-    [];
-ber_bin_drv(doc) ->
-    [];
-ber_bin_drv(Config) when is_list(Config) ->
-    ?SKIP(currently_not_supported_by_asn1).
-
-
-ber_bin_native(suite) ->
-    [];
-ber_bin_native(doc) ->
-    [];
-ber_bin_native(Config) when is_list(Config) ->
-    ?SKIP(currently_not_supported_by_asn1).
-
-
-ber_bin_drv_native(suite) ->
-    [];
-ber_bin_drv_native(doc) ->
-    [];
-ber_bin_drv_native(Config) when is_list(Config) ->
-    ?SKIP(currently_not_supported_by_asn1).
-
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 req_and_rep(Config, Codec, _Version, EC) when is_list(Config) ->
diff --git a/lib/megaco/test/megaco_call_flow_test.erl b/lib/megaco/test/megaco_call_flow_test.erl
index b9d64ca8b2..d5888018cd 100644
--- a/lib/megaco/test/megaco_call_flow_test.erl
+++ b/lib/megaco/test/megaco_call_flow_test.erl
@@ -25,7 +25,6 @@
 %% megaco_call_flow_test:compact_text().
 %% megaco_call_flow_test:bin().
 %% megaco_call_flow_test:asn1_ber().
-%% megaco_call_flow_test:asn1_ber_bin().
 %% megaco_call_flow_test:asn1_per().
 %% megaco_call_flow_test:erl_dist().
 %% megaco_call_flow_test:compressed_erl_dist().
@@ -62,7 +61,7 @@ all() ->
 groups() -> 
     [{text, [], [pretty, compact]},
      {flex, [], [pretty_flex, compact_flex]},
-     {binary, [], [bin, ber, ber_bin, per]}].
+     {binary, [], [bin, ber, per]}].
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -106,12 +105,6 @@ ber(Config) when is_list(Config) ->
     ?ACQUIRE_NODES(1, Config),
     asn1_ber().
 
-ber_bin(suite) ->
-    [];
-ber_bin(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    asn1_ber_bin().
-
 per(suite) ->
     [];
 per(Config) when is_list(Config) ->
@@ -1198,8 +1191,7 @@ encoders() ->
      {megaco_pretty_text_encoder,  [], 	         []},
      {megaco_compact_text_encoder, [], 	         []},
      {megaco_binary_encoder,       [], 	         [native]},
-     %% {megaco_ber_encoder,       [],           [native]},
-     %% {megaco_ber_bin_encoder,   [],           [native]},
+     {megaco_ber_encoder,          [],           [native]},
      {megaco_per_encoder,          [], 	         [native]},
      {megaco_erl_dist_encoder,     [],      	 []},
      {megaco_erl_dist_encoder,     [compressed], [compressed]}
@@ -1214,7 +1206,6 @@ pretty_mod({Mod, Opt, _Opt2}) ->
 	megaco_compact_text_encoder -> compact_text;
 	megaco_binary_encoder       -> asn1_ber;
 	megaco_ber_encoder          -> asn1_ber_old;
-	megaco_ber_bin_encoder      -> asn1_ber_bin;
 	megaco_per_encoder          -> asn1_per;
 	megaco_erl_dist_encoder when Opt == []           -> standard_erl;
 	megaco_erl_dist_encoder when Opt == [compressed] -> compressed_erl;
@@ -1263,13 +1254,6 @@ asn1_ber() ->
     All = [encode(Slogan, Msg, Encoder) || {Slogan, Msg} <- messages()],
     compute_res(All).
 
-asn1_ber_bin() ->
-    Default = [],
-    Native = [native],
-    Encoder = {megaco_ber_bin_encoder, Default, Native},
-    All = [encode(Slogan, Msg, Encoder) || {Slogan, Msg} <- messages()],
-    compute_res(All).
-
 asn1_per() ->
     Default = [],
     Native = [native],
@@ -1634,7 +1618,7 @@ gen_ber_header() ->
 %% Generate headerfile for asn.1 BER test in C
 %%----------------------------------------------------------------------
 gen_ber_bin_header() ->
-    Encoder = {megaco_ber_bin_encoder, [], []},
+    Encoder = {megaco_ber_encoder, [], []},
     L = [{S, gen_byte_msg(Msg, Encoder)} ||  {S, Msg} <- messages()],
     gen_header_file_binary(L).
 
diff --git a/lib/megaco/test/megaco_codec_prev3a_test.erl b/lib/megaco/test/megaco_codec_prev3a_test.erl
index d50e72aef1..4f1160b93f 100644
--- a/lib/megaco/test/megaco_codec_prev3a_test.erl
+++ b/lib/megaco/test/megaco_codec_prev3a_test.erl
@@ -63,12 +63,8 @@
 	 
 	 ber_test_msgs/1, 
 	 
-	 ber_bin_test_msgs/1, 
-	
 	 per_test_msgs/1,
 	
-	 per_bin_test_msgs/1,
-	
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
@@ -280,17 +276,14 @@ groups() ->
       [{group, pretty}, {group, flex_pretty},
        {group, compact}, {group, flex_compact}]},
      {binary, [],
-      [{group, bin}, {group, ber}, {group, ber_bin},
-       {group, per}, {group, per_bin}]},
+      [{group, bin}, {group, ber}, {group, per}]},
      {erl_dist, [], [{group, erl_dist_m}]},
      {pretty, [], [pretty_test_msgs]},
      {compact, [], [compact_test_msgs]},
      {flex_pretty, [], flex_pretty_cases()},
      {flex_compact, [], flex_compact_cases()},
      {bin, [], [bin_test_msgs]}, {ber, [], [ber_test_msgs]},
-     {ber_bin, [], [ber_bin_test_msgs]},
      {per, [], [per_test_msgs]},
-     {per_bin, [], [per_bin_test_msgs]},
      {erl_dist_m, [], [erl_dist_m_test_msgs]},
      {tickets, [],
       [{group, compact_tickets},
@@ -1106,17 +1099,6 @@ ber_test_msgs(Config) when is_list(Config) ->
    
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-ber_bin_test_msgs(suite) ->
-    [];
-ber_bin_test_msgs(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    Msgs = msgs1(binary) ++ msgs4(binary) ++ msgs5(binary) ++ msgs6(binary),
-    DynamicDecode = true,
-    test_msgs(megaco_ber_bin_encoder, DynamicDecode, ?EC, Msgs).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 per_test_msgs(suite) ->
     [];
 per_test_msgs(Config) when is_list(Config) ->
@@ -1128,17 +1110,6 @@ per_test_msgs(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-per_bin_test_msgs(suite) ->
-    [];
-per_bin_test_msgs(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    Msgs = msgs1(binary) ++ msgs4(binary) ++ msgs5(binary) ++ msgs6(binary),
-    DynamicDecode = false,
-    test_msgs(megaco_per_bin_encoder, DynamicDecode, ?EC, Msgs).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 erl_dist_m_test_msgs(suite) ->
     [];
 erl_dist_m_test_msgs(Config) when is_list(Config) ->
diff --git a/lib/megaco/test/megaco_codec_prev3b_test.erl b/lib/megaco/test/megaco_codec_prev3b_test.erl
index eaab8f37c1..4bd49365e7 100644
--- a/lib/megaco/test/megaco_codec_prev3b_test.erl
+++ b/lib/megaco/test/megaco_codec_prev3b_test.erl
@@ -63,12 +63,8 @@
 	 
 	 ber_test_msgs/1, 
 	 
-	 ber_bin_test_msgs/1, 
-	
 	 per_test_msgs/1,
 	
-	 per_bin_test_msgs/1,
-	
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
@@ -296,17 +292,14 @@ groups() ->
       [{group, pretty}, {group, flex_pretty},
        {group, compact}, {group, flex_compact}]},
      {binary, [],
-      [{group, bin}, {group, ber}, {group, ber_bin},
-       {group, per}, {group, per_bin}]},
+      [{group, bin}, {group, ber}, {group, per}]},
      {erl_dist, [], [{group, erl_dist_m}]},
      {pretty, [], [pretty_test_msgs]},
      {compact, [], [compact_test_msgs]},
      {flex_pretty, [], flex_pretty_cases()},
      {flex_compact, [], flex_compact_cases()},
      {bin, [], [bin_test_msgs]}, {ber, [], [ber_test_msgs]},
-     {ber_bin, [], [ber_bin_test_msgs]},
      {per, [], [per_test_msgs]},
-     {per_bin, [], [per_bin_test_msgs]},
      {erl_dist_m, [], [erl_dist_m_test_msgs]},
      {tickets, [],
       [{group, compact_tickets},
@@ -1171,16 +1164,6 @@ ber_test_msgs(Config) when is_list(Config) ->
    
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-ber_bin_test_msgs(suite) ->
-    [];
-ber_bin_test_msgs(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    Msgs = msgs1(binary) ++ msgs4(binary) ++ msgs5(binary) ++ msgs6(binary),
-    DynamicDecode = true,
-    test_msgs(megaco_ber_bin_encoder, DynamicDecode, ?EC, Msgs).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 per_test_msgs(suite) ->
     [];
@@ -1193,17 +1176,6 @@ per_test_msgs(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-per_bin_test_msgs(suite) ->
-    [];
-per_bin_test_msgs(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    Msgs = msgs1(binary) ++ msgs4(binary) ++ msgs5(binary) ++ msgs6(binary),
-    DynamicDecode = false,
-    test_msgs(megaco_per_bin_encoder, DynamicDecode, ?EC, Msgs).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 erl_dist_m_test_msgs(suite) ->
     [];
 erl_dist_m_test_msgs(Config) when is_list(Config) ->
diff --git a/lib/megaco/test/megaco_codec_prev3c_test.erl b/lib/megaco/test/megaco_codec_prev3c_test.erl
index 7f9c0fe4e7..baa1c7f547 100644
--- a/lib/megaco/test/megaco_codec_prev3c_test.erl
+++ b/lib/megaco/test/megaco_codec_prev3c_test.erl
@@ -65,12 +65,8 @@
 	 
 	 ber_test_msgs/1, 
 	 
-	 ber_bin_test_msgs/1, 
-	
 	 per_test_msgs/1,
 	
-	 per_bin_test_msgs/1,
-	
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
@@ -301,17 +297,14 @@ groups() ->
       [{group, pretty}, {group, flex_pretty},
        {group, compact}, {group, flex_compact}]},
      {binary, [],
-      [{group, bin}, {group, ber}, {group, ber_bin},
-       {group, per}, {group, per_bin}]},
+      [{group, bin}, {group, ber}, {group, per}]},
      {erl_dist, [], [{group, erl_dist_m}]},
      {pretty, [], [pretty_test_msgs]},
      {compact, [], [compact_test_msgs]},
      {flex_pretty, [], flex_pretty_cases()},
      {flex_compact, [], flex_compact_cases()},
      {bin, [], [bin_test_msgs]}, {ber, [], [ber_test_msgs]},
-     {ber_bin, [], [ber_bin_test_msgs]},
      {per, [], [per_test_msgs]},
-     {per_bin, [], [per_bin_test_msgs]},
      {erl_dist_m, [], [erl_dist_m_test_msgs]},
      {tickets, [],
       [{group, compact_tickets},
@@ -823,21 +816,6 @@ ber_test_msgs(Config) when is_list(Config) ->
    
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-ber_bin_test_msgs(suite) ->
-    [];
-ber_bin_test_msgs(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    Msgs = 
-	msgs1a(binary) ++ 
-	msgs5(binary) ++ 
-	msgs6(binary) ++ 
-	msgs7(binary),
-    DynamicDecode = true,
-    test_msgs(megaco_ber_bin_encoder, DynamicDecode, ?EC, Msgs).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 per_test_msgs(suite) ->
     [];
 per_test_msgs(Config) when is_list(Config) ->
@@ -853,21 +831,6 @@ per_test_msgs(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-per_bin_test_msgs(suite) ->
-    [];
-per_bin_test_msgs(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    Msgs = 
-	msgs1a(binary) ++ 
-	msgs5(binary) ++ 
-	msgs6(binary) ++ 
-	msgs7(binary),
-    DynamicDecode = false,
-    test_msgs(megaco_per_bin_encoder, DynamicDecode, ?EC, Msgs).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 erl_dist_m_test_msgs(suite) ->
     [];
 erl_dist_m_test_msgs(Config) when is_list(Config) ->
diff --git a/lib/megaco/test/megaco_codec_v1_test.erl b/lib/megaco/test/megaco_codec_v1_test.erl
index e9c19605dd..86f332fde0 100644
--- a/lib/megaco/test/megaco_codec_v1_test.erl
+++ b/lib/megaco/test/megaco_codec_v1_test.erl
@@ -66,12 +66,8 @@
 	 
 	 ber_test_msgs/1, 
 	 
-	 ber_bin_test_msgs/1, 
-	
 	 per_test_msgs/1,
 	
-	 per_bin_test_msgs/1,
-	
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
@@ -476,9 +472,7 @@ groups() ->
 			    {group, flex_compact}]},
      {binary,          [], [{group, bin}, 
 			    {group, ber}, 
-			    {group, ber_bin},
-			    {group, per}, 
-			    {group, per_bin}]},
+			    {group, per}]},
      {erl_dist,        [], [{group, erl_dist_m}]},
      {pretty,          [], [pretty_test_msgs]},
      {compact,         [], [compact_test_msgs]},
@@ -486,9 +480,7 @@ groups() ->
      {flex_compact,    [], flex_compact_cases()},
      {bin,             [], [bin_test_msgs]}, 
      {ber,             [], [ber_test_msgs]},
-     {ber_bin,         [], [ber_bin_test_msgs]},
      {per,             [], [per_test_msgs]},
-     {per_bin,         [], [per_bin_test_msgs]},
      {erl_dist_m,      [], [erl_dist_m_test_msgs]},
      {tickets,         [], [{group, compact_tickets}, 
 			    {group, pretty_tickets},
@@ -1266,17 +1258,6 @@ ber_test_msgs(Config) when is_list(Config) ->
    
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-ber_bin_test_msgs(suite) ->
-    [];
-ber_bin_test_msgs(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    Msgs = msgs1(),
-    DynamicDecode = true,
-    test_msgs(megaco_ber_bin_encoder, DynamicDecode, [], Msgs).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 per_test_msgs(suite) ->
     [];
 per_test_msgs(Config) when is_list(Config) ->
@@ -1288,17 +1269,6 @@ per_test_msgs(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-per_bin_test_msgs(suite) ->
-    [];
-per_bin_test_msgs(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    Msgs = msgs1(),
-    DynamicDecode = false,
-    test_msgs(megaco_per_bin_encoder, DynamicDecode, [], Msgs).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 erl_dist_m_test_msgs(suite) ->
     [];
 erl_dist_m_test_msgs(Config) when is_list(Config) ->
diff --git a/lib/megaco/test/megaco_codec_v2_test.erl b/lib/megaco/test/megaco_codec_v2_test.erl
index a44f74166c..e8db9e1cb1 100644
--- a/lib/megaco/test/megaco_codec_v2_test.erl
+++ b/lib/megaco/test/megaco_codec_v2_test.erl
@@ -64,12 +64,8 @@
 
 	 ber_test_msgs/1, 
 	 
-	 ber_bin_test_msgs/1, 
-	
 	 per_test_msgs/1,
 	
-	 per_bin_test_msgs/1,
-	
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
@@ -447,17 +443,14 @@ groups() ->
   [{group, pretty}, {group, flex_pretty},
    {group, compact}, {group, flex_compact}]},
  {binary, [],
-  [{group, bin}, {group, ber}, {group, ber_bin},
-   {group, per}, {group, per_bin}]},
+  [{group, bin}, {group, ber}, {group, per}]},
  {erl_dist, [], [{group, erl_dist_m}]},
  {pretty, [], [pretty_test_msgs]},
  {compact, [], [compact_test_msgs]},
  {flex_pretty, [], flex_pretty_cases()},
  {flex_compact, [], flex_compact_cases()},
  {bin, [], [bin_test_msgs]}, {ber, [], [ber_test_msgs]},
- {ber_bin, [], [ber_bin_test_msgs]},
  {per, [], [per_test_msgs]},
- {per_bin, [], [per_bin_test_msgs]},
  {erl_dist_m, [], [erl_dist_m_test_msgs]},
  {tickets, [],
   [{group, compact_tickets}, {group, pretty_tickets},
@@ -1285,17 +1278,6 @@ ber_test_msgs(Config) when is_list(Config) ->
    
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-ber_bin_test_msgs(suite) ->
-    [];
-ber_bin_test_msgs(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    Msgs = msgs1() ++ msgs4(),
-    DynamicDecode = true,
-    test_msgs(megaco_ber_bin_encoder, DynamicDecode, [], Msgs).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 per_test_msgs(suite) ->
     [];
 per_test_msgs(Config) when is_list(Config) ->
@@ -1307,17 +1289,6 @@ per_test_msgs(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-per_bin_test_msgs(suite) ->
-    [];
-per_bin_test_msgs(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    Msgs = msgs1() ++ msgs4(),
-    DynamicDecode = false,
-    test_msgs(megaco_per_bin_encoder, DynamicDecode, [], Msgs).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 erl_dist_m_test_msgs(suite) ->
     [];
 erl_dist_m_test_msgs(Config) when is_list(Config) ->
diff --git a/lib/megaco/test/megaco_codec_v3_test.erl b/lib/megaco/test/megaco_codec_v3_test.erl
index 2c35ce13b3..67805479f9 100644
--- a/lib/megaco/test/megaco_codec_v3_test.erl
+++ b/lib/megaco/test/megaco_codec_v3_test.erl
@@ -56,9 +56,7 @@
 	 flex_compact_dm_timers8/1, 
 	 bin_test_msgs/1,
 	 ber_test_msgs/1, 
-	 ber_bin_test_msgs/1, 
 	 per_test_msgs/1,
-	 per_bin_test_msgs/1,
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
@@ -288,17 +286,14 @@ groups() ->
       [{group, pretty}, {group, flex_pretty},
        {group, compact}, {group, flex_compact}]},
      {binary, [],
-      [{group, bin}, {group, ber}, {group, ber_bin},
-       {group, per}, {group, per_bin}]},
+      [{group, bin}, {group, ber}, {group, per}]},
      {erl_dist, [], [{group, erl_dist_m}]},
      {pretty, [], [pretty_test_msgs]},
      {compact, [], [compact_test_msgs]},
      {flex_pretty, [], flex_pretty_cases()},
      {flex_compact, [], flex_compact_cases()},
      {bin, [], [bin_test_msgs]}, {ber, [], [ber_test_msgs]},
-     {ber_bin, [], [ber_bin_test_msgs]},
      {per, [], [per_test_msgs]},
-     {per_bin, [], [per_bin_test_msgs]},
      {erl_dist_m, [], [erl_dist_m_test_msgs]},
      {tickets, [],
       [{group, compact_tickets},
@@ -823,22 +818,6 @@ ber_test_msgs(Config) when is_list(Config) ->
    
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-ber_bin_test_msgs(suite) ->
-    [];
-ber_bin_test_msgs(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    Msgs = 
-	msgs1a(binary) ++ 
-	msgs5(binary) ++ 
-	msgs6(binary) ++ 
-	msgs7(binary) ++ 
-	msgs8(binary),
-    DynamicDecode = true,
-    test_msgs(megaco_ber_bin_encoder, DynamicDecode, ?EC, Msgs).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 per_test_msgs(suite) ->
     [];
 per_test_msgs(Config) when is_list(Config) ->
@@ -855,22 +834,6 @@ per_test_msgs(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-per_bin_test_msgs(suite) ->
-    [];
-per_bin_test_msgs(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    Msgs = 
-	msgs1a(binary) ++ 
-	msgs5(binary) ++ 
-	msgs6(binary) ++ 
-	msgs7(binary) ++ 
-	msgs8(binary),
-    DynamicDecode = false,
-    test_msgs(megaco_per_bin_encoder, DynamicDecode, ?EC, Msgs).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 erl_dist_m_test_msgs(suite) ->
     [];
 erl_dist_m_test_msgs(Config) when is_list(Config) ->
diff --git a/lib/megaco/test/megaco_mess_test.erl b/lib/megaco/test/megaco_mess_test.erl
index 663ac8c329..f8be96c254 100644
--- a/lib/megaco/test/megaco_mess_test.erl
+++ b/lib/megaco/test/megaco_mess_test.erl
@@ -1393,7 +1393,7 @@ rarpaop_mgc_event_sequence(text, tcp) ->
 rarpaop_mgc_event_sequence(binary, tcp) ->
     Port      = 2945, 
     TranspMod = megaco_tcp, 
-    EncMod    = megaco_ber_bin_encoder,
+    EncMod    = megaco_ber_encoder,
     EncConf   = [], 
     rarpaop_mgc_event_sequence(Port, TranspMod, EncMod, EncConf).
 
@@ -1680,7 +1680,7 @@ rarpaop_mg_event_sequence(text, tcp) ->
     rarpaop_mg_event_sequence(Port, EncMod, EncConf);
 rarpaop_mg_event_sequence(binary, tcp) ->
     Port      = 2945, 
-    EncMod    = megaco_ber_bin_encoder,
+    EncMod    = megaco_ber_encoder,
     EncConf   = [], 
     rarpaop_mg_event_sequence(Port, EncMod, EncConf).
 
diff --git a/lib/megaco/test/megaco_mib_test.erl b/lib/megaco/test/megaco_mib_test.erl
index 52d99d1442..ddc74ab741 100644
--- a/lib/megaco/test/megaco_mib_test.erl
+++ b/lib/megaco/test/megaco_mib_test.erl
@@ -647,13 +647,13 @@ mk_recv_info([{text,udp}|ET], Acc) ->
 	  {port, 2944}],
     mk_recv_info(ET, [RI|Acc]);
 mk_recv_info([{binary,tcp}|ET], Acc) ->
-    RI = [{encoding_module, megaco_ber_bin_encoder},
+    RI = [{encoding_module, megaco_ber_encoder},
 	  {encoding_config, []},
 	  {transport_module, megaco_tcp},
 	  {port, 2945}],
     mk_recv_info(ET, [RI|Acc]);
 mk_recv_info([{binary,udp}|ET], Acc) ->
-    RI = [{encoding_module, megaco_ber_bin_encoder},
+    RI = [{encoding_module, megaco_ber_encoder},
 	  {encoding_config, []},
 	  {transport_module, megaco_udp},
 	  {port, 2945}],
@@ -1013,7 +1013,7 @@ start_mg(Node, Mid, Encoding, Transport, Verbosity) ->
 		 {encoding_config, []},
 		 {port,2944}];
 	    binary ->
-		[{encoding_module, megaco_ber_bin_encoder},
+		[{encoding_module, megaco_ber_encoder},
 		 {encoding_config, []},
 		 {port,2945}]
 	end,
diff --git a/lib/megaco/test/megaco_test_mg.erl b/lib/megaco/test/megaco_test_mg.erl
index ecb3cedc83..947f0eebbb 100644
--- a/lib/megaco/test/megaco_test_mg.erl
+++ b/lib/megaco/test/megaco_test_mg.erl
@@ -158,7 +158,7 @@ select_encoding(pretty_text) ->
 select_encoding(compact_text) ->
     {megaco_compact_text_encoder, 2944};
 select_encoding(binary) ->
-    {megaco_ber_bin_encoder, 2945};
+    {megaco_ber_encoder, 2945};
 select_encoding(erl_dist) ->
     {megaco_erl_dist_encoder, 2946};
 select_encoding(Encoding) ->
diff --git a/lib/megaco/test/megaco_test_mgc.erl b/lib/megaco/test/megaco_test_mgc.erl
index 13c1cebe56..a964983861 100644
--- a/lib/megaco/test/megaco_test_mgc.erl
+++ b/lib/megaco/test/megaco_test_mgc.erl
@@ -135,7 +135,7 @@ select_encoding(pretty_text) ->
 select_encoding(compact_text) ->
     {megaco_compact_text_encoder, 2944};
 select_encoding(binary) ->
-    {megaco_ber_bin_encoder, 2945};
+    {megaco_ber_encoder, 2945};
 select_encoding(erl_dist) ->
     {megaco_erl_dist_encoder, 2946};
 select_encoding(Encoding) ->
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index 11a951a23e..5e72ade769 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.16.0.1
+MEGACO_VSN  = 3.16.0.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/mnesia/doc/src/Makefile b/lib/mnesia/doc/src/Makefile
index 1ac5760510..6a72b98ebc 100644
--- a/lib/mnesia/doc/src/Makefile
+++ b/lib/mnesia/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -142,13 +142,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 612ccb5ee8..04b8c106fd 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -38,7 +38,37 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.7</title>
+  <section><title>Mnesia 4.7.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Add tests showing that trying to delete non-existing
+	    object may corrupt the </p>
+          <p>
+	    In case of bag tables, trying to delete a non-existing
+	    object leads to the index becoming corrupt. This happens
+	    if the non-existing object we try to delete happens to
+	    share its key and index field value with a single
+	    existing object in the table. Result: The index entry
+	    corresponding to the existing object is removed.</p>
+          <p>
+	    Prevent index from being corrupted if a nonexistent item
+	    is deleted</p>
+          <p>
+	    We have to ensure that we actually delete the last object
+	    with a given (key, index) pair before removing the index.
+	    Thanks to Bartlomiej Puzon</p>
+          <p>
+	    Own Id: OTP-10220</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/mnesia/examples/Makefile b/lib/mnesia/examples/Makefile
index ff00ee76a5..d9e6def283 100644
--- a/lib/mnesia/examples/Makefile
+++ b/lib/mnesia/examples/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -78,9 +78,9 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(ERL_FILES) $(DATA_FILES) $(HRL_FILES) $(RELSYSDIR)/examples
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/bench
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(ERL_FILES) $(DATA_FILES) $(HRL_FILES) "$(RELSYSDIR)/examples"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/bench"
 	(cd bench; $(INSTALL_DATA) \
           Makefile \
           README \
@@ -96,8 +96,8 @@ release_spec: opt
           bench.config5 \
           bench.config6 \
           bench.config7 \
-          $(RELSYSDIR)/examples/bench)
-	(cd bench; $(INSTALL_SCRIPT) bench.sh $(RELSYSDIR)/examples/bench)
+          "$(RELSYSDIR)/examples/bench")
+	(cd bench; $(INSTALL_SCRIPT) bench.sh "$(RELSYSDIR)/examples/bench")
 
 release_docs_spec:
 
diff --git a/lib/mnesia/examples/mnesia_tpcb.erl b/lib/mnesia/examples/mnesia_tpcb.erl
index 903c53a21c..f36b43a495 100644
--- a/lib/mnesia/examples/mnesia_tpcb.erl
+++ b/lib/mnesia/examples/mnesia_tpcb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -99,9 +99,13 @@
 	 replica_test/1,
 	 sticky_replica_test/1,
 	 remote_test/1,
-	 remote_frag2_test/1
+	 remote_frag2_test/1,
+
+	 conflict_benchmark/1
 	]).
 
+-include_lib("common_test/include/ct_event.hrl").
+
 -define(SECOND, 1000000).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -191,8 +195,10 @@
 	  driver_nodes = [node()],
 	  n_drivers_per_node = 1,
 	  use_running_mnesia = false,
+	  seed,
 	  stop_after = timer:minutes(15), % Minimum 15 min
 	  report_interval = timer:minutes(1),
+	  send_bench_report = false,
 	  use_sticky_locks = false,
 	  spawn_near_branch = false,
 	  activity_type = transaction,
@@ -397,8 +403,30 @@ config(remote_frag2_test, ReplicaType) ->
      {stop_after, timer:minutes(1)},
      {report_interval, timer:seconds(10)},
      {reuse_history_id, true}
+    ];
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Ten drivers per node, tables replicated to all nodes, single branch
+
+config(conflict_benchmark, ReplicaType) ->
+    Remote = nodes(),
+    Local = node(),
+    Nodes = [Local | Remote], 
+    [{seed, {1326,448637,337711}},
+     {db_nodes, Nodes},
+     {driver_nodes, Nodes},
+     {replica_nodes, Nodes},
+     {n_drivers_per_node, 10},
+     {n_branches, 1},
+     {n_accounts_per_branch, 10},
+     {replica_type, ReplicaType},
+     {stop_after, timer:minutes(1)},
+     {report_interval, timer:seconds(10)},
+     {send_bench_report, true},
+     {reuse_history_id, true}
     ].
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 start(What, ReplicaType) ->
@@ -422,6 +450,9 @@ remote_test(ReplicaType) ->
 remote_frag2_test(ReplicaType) ->
     start(remote_frag2_test, ReplicaType).
 
+conflict_benchmark(ReplicaType) ->
+    start(config(conflict_benchmark, ReplicaType)).
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Args is a list of {Key, Val} tuples where Key is a field name
 %% in either the record tab_config or run_config. Unknown keys are ignored.
@@ -866,6 +897,7 @@ add_time(Acc, New) ->
 show_report(State) ->
     Now    = now_to_micros(erlang:now()),
     Iters  = State#reporter_state.n_iters,
+    Cfg    = State#reporter_state.run_config,
     Time   = State#reporter_state.curr,
     Max    = Time#time.max_time,
     N      = Time#time.n_trans,
@@ -888,7 +920,17 @@ show_report(State) ->
 		      "duration of longest transaction was ~p milliseconds~n",
 		      [Tps, BruttoTps, Max div 1000])
     end,
-    State#reporter_state{prev_tps = Tps, prev_micros = Now}.
+    case Cfg#run_config.send_bench_report of
+	true ->
+	    ct_event:notify(
+	      #event{name = benchmark_data, 
+		     data = [{suite,"mnesia_tpcb"},
+			     {value,Tps}]});
+	_ ->
+	    ok
+    end,
+
+    State#reporter_state{prev_tps = Tps, prev_micros = Now}.	    
 
 signed_diff(Iters, Curr, Prev) ->
     case Iters > 1 of
@@ -955,7 +997,13 @@ alloc_local_branches([], Specs, OrphanBranches) ->
     {Specs, OrphanBranches}.
     
 driver_init(DS, AllBranches) ->
-    Seed = erlang:now(),
+    case (DS#driver_state.run_config)#run_config.seed of
+	undefined ->
+	    Seed = erlang:now();
+	Seed ->
+	    Seed
+    end,
+    
     DS2 =
 	if
 	    DS#driver_state.n_local_branches =:= 0 ->
diff --git a/lib/mnesia/include/Makefile b/lib/mnesia/include/Makefile
index f9b7d72abe..eea28045ea 100644
--- a/lib/mnesia/include/Makefile
+++ b/lib/mnesia/include/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1998-2009. All Rights Reserved.
+# Copyright Ericsson AB 1998-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -54,8 +54,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec:
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-#	$(INSTALL_DATA) $(INCLUDE_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+#	$(INSTALL_DATA) $(INCLUDE_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
 
diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile
index 1c8ec54605..6f289433ff 100644
--- a/lib/mnesia/src/Makefile
+++ b/lib/mnesia/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2011. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -132,10 +132,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/mnesia/src/mnesia.appup.src b/lib/mnesia/src/mnesia.appup.src
index 304a15242f..355aafb215 100644
--- a/lib/mnesia/src/mnesia.appup.src
+++ b/lib/mnesia/src/mnesia.appup.src
@@ -1,6 +1,9 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
+  {"4.7.1",  [{restart_application, mnesia}]},
+  {"4.7",  [{restart_application, mnesia}]},
+  {"4.6",  [{restart_application, mnesia}]},
   {"4.5.1",  [{restart_application, mnesia}]},
   {"4.5",    [{restart_application, mnesia}]},
   {"4.4.19", [{restart_application, mnesia}]},
@@ -9,6 +12,9 @@
   {"4.4.16", [{restart_application, mnesia}]}
  ],
  [
+  {"4.7.1",  [{restart_application, mnesia}]},
+  {"4.7",  [{restart_application, mnesia}]},
+  {"4.6",  [{restart_application, mnesia}]},
   {"4.5.1",  [{restart_application, mnesia}]},
   {"4.5",    [{restart_application, mnesia}]},
   {"4.4.19", [{restart_application, mnesia}]},
diff --git a/lib/mnesia/src/mnesia_index.erl b/lib/mnesia/src/mnesia_index.erl
index 61210d7e55..f9f3ce2ea4 100644
--- a/lib/mnesia/src/mnesia_index.erl
+++ b/lib/mnesia/src/mnesia_index.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -120,9 +120,9 @@ del_object_bag(Tab, Key, Obj, Pos, Ixt, undefined) ->
     IxKey = element(Pos, Obj),
     Old = [X || X <-  mnesia_lib:db_get(Tab, Key), element(Pos, X) =:= IxKey],
     del_object_bag(Tab, Key, Obj, Pos, Ixt, Old);
-%% If Tab type is bag we need remove index identifier if Tab 
-%% contains less than 2 elements. 
-del_object_bag(_Tab, Key, Obj, Pos, Ixt, Old) when length(Old) < 2 ->
+%% If Tab type is bag we need remove index identifier if the object being
+%% deleted was the last one
+del_object_bag(_Tab, Key, Obj, Pos, Ixt, Old) when Old =:= [Obj] ->
     del_ixes(Ixt, [Obj], Pos, Key);
 del_object_bag(_Tab, _Key, _Obj, _Pos, _Ixt, _Old) -> ok.
 
diff --git a/lib/mnesia/test/Makefile b/lib/mnesia/test/Makefile
index ae4c9626c7..45ce5b1983 100644
--- a/lib/mnesia/test/Makefile
+++ b/lib/mnesia/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2011. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -26,6 +26,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 MODULES= \
 	mt \
 	mnesia_SUITE \
+	mnesia_bench_SUITE \
 	mnesia_test_lib \
 	mnesia_install_test \
 	mnesia_registry_test \
@@ -52,24 +53,29 @@ MODULES= \
 	mnesia_cost \
 	mnesia_dbn_meters 
 
-MnesiaExamplesDir := ../examples
+DocExamplesDir := ../doc/src/
 
-ExampleModules =  \
+DocExampleModules =  \
 	company \
 	company_o \
-	bup \
-	mnesia_meter \
-	mnesia_tpcb       
-ExamplesHrl = \
+	bup
+
+DocExamplesHrl = \
 	company.hrl \
 	company_o.hrl
 
-ERL_FILES= $(MODULES:%=%.erl) $(ExampleModules:%=$(MnesiaExamplesDir)/%.erl)
+ExamplesDir := ../examples/
+
+ExampleModules = \
+	mnesia_meter \
+	mnesia_tpcb
 
-HRL_FILES= mnesia_test_lib.hrl $(ExamplesHrl:%=$(MnesiaExamplesDir)/%)
+ERL_FILES= $(MODULES:%=%.erl) $(DocExampleModules:%=$(DocExamplesDir)/%.erl) $(ExampleModules:%=$(ExamplesDir)/%.erl)
+
+HRL_FILES= mnesia_test_lib.hrl $(DocExamplesHrl:%=$(DocExamplesDir)/%)
 
 TARGET_FILES= \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(ExampleModules:%=$(EBIN)/%.$(EMULATOR)) 
+	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(DocExampleModules:%=$(EBIN)/%.$(EMULATOR)) $(ExampleModules:%=$(EBIN)/%.$(EMULATOR))
 
 INSTALL_PROGS= $(TARGET_FILES)
 
@@ -91,7 +97,10 @@ EBIN = .
 
 tests debug opt: $(TARGET_FILES)
 
-$(EBIN)/%.beam: $(MnesiaExamplesDir)/%.erl
+$(EBIN)/%.beam: $(DocExamplesDir)/%.erl
+	$(ERLC) -bbeam $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+
+$(EBIN)/%.beam: $(ExamplesDir)/%.erl
 	$(ERLC) -bbeam $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 clean:
@@ -108,11 +117,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) mnesia.spec mnesia.cover $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
-	$(INSTALL_SCRIPT) mt $(INSTALL_PROGS) $(RELSYSDIR)
-#	chmod -R u+w $(RELSYSDIR)
-#	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) mnesia.spec mnesia_bench.spec mnesia.cover $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_SCRIPT) mt $(INSTALL_PROGS) "$(RELSYSDIR)"
+#	chmod -R u+w "$(RELSYSDIR)"
+#	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
 
diff --git a/lib/mnesia/test/mnesia.spec.vxworks b/lib/mnesia/test/mnesia.spec.vxworks
deleted file mode 100644
index 11c01ea3fe..0000000000
--- a/lib/mnesia/test/mnesia.spec.vxworks
+++ /dev/null
@@ -1,362 +0,0 @@
-{topcase, {dir, "../mnesia_test"}}.
-{require_nodenames, 3}.
-{diskless, true}.
-{skip, {mnesia_measure_test, all, "Too heavy"}}.
-%{mnesia_install_test, silly_durability} 'IMPL'
-%{mnesia_install_test, silly_move} 'IMPL'
-{skip, {mnesia_install_test, silly_upgrade, "Uses disk"}}.
-%{mnesia_install_test, conflict} 'IMPL'
-%{mnesia_install_test, dist} 'IMPL'
-{skip, {mnesia_examples_test, all, "Uses disk"}}.
-{skip, {mnesia_nice_coverage_test, all, "Uses disk"}}.
-
-%{mnesia_evil_coverage_test, system_info} 'IMPL'
-%{mnesia_evil_coverage_test, table_info} 'IMPL'
-%{mnesia_evil_coverage_test, error_description} 'IMPL'
-{skip, {mnesia_evil_coverage_test, db_node_lifecycle, "Uses disk"}}.
-{skip, {mnesia_evil_coverage_test, local_content, "Uses disk"}}.
-%{mnesia_evil_coverage_test, start_and_stop} 'IMPL'
-%{mnesia_evil_coverage_test, transaction} 'IMPL'
-{skip, {mnesia_evil_coverage_test, checkpoint, "Uses disk"}}.
-{skip, {mnesia_evil_backup, backup, "Uses disk"}}.
-{skip, {mnesia_evil_backup, global_backup_checkpoint, "Uses disk"}}.
-{skip, {mnesia_evil_backup, incremental_backup_checkpoint, "Uses disk"}}.
-{skip, {mnesia_evil_backup, local_backup_checkpoint, "Uses disk"}}.
-{skip, {mnesia_evil_backup, selective_backup_checkpoint, "Uses disk"}}.
-{skip, {mnesia_evil_backup, restore_errors, "Uses disk"}}.
-{skip, {mnesia_evil_backup, restore_clear, "Uses disk"}}.
-{skip, {mnesia_evil_backup, restore_keep, "Uses disk"}}.
-{skip, {mnesia_evil_backup, restore_recreate, "Uses disk"}}.
-{skip, {mnesia_evil_backup, traverse_backup, "Uses disk"}}.
-{skip, {mnesia_evil_backup, install_fallback, "Uses disk"}}.
-{skip, {mnesia_evil_backup, uninstall_fallback, "Uses disk"}}.
-{skip, {mnesia_evil_backup, local_fallback, "Uses disk"}}.
-%{mnesia_evil_coverage_test, table_lifecycle} 'IMPL'
-{skip, {mnesia_evil_coverage_test, replica_management, "Uses disk"}}.
-%{mnesia_evil_coverage_test, change_table_access_mode} 'IMPL'
-%{mnesia_evil_coverage_test, change_table_load_order} 'IMPL'
-{skip, {mnesia_evil_coverage_test, set_master_nodes, "Uses disk"}}.
-{skip, {mnesia_evil_coverage_test, offline_set_master_nodes, "Uses disk"}}.
-{skip, {mnesia_evil_coverage_test, replica_location, "Uses disk"}}.
-%{mnesia_evil_coverage_test, add_table_index_ram} 'IMPL'
-{skip, {mnesia_trans_access_test, add_table_index_disc, "Uses disc"}}.
-{skip, {mnesia_trans_access_test, add_table_index_disc_only, "Uses disc"}}.
-%{mnesia_evil_coverage_test, create_live_table_index_ram} 'IMPL'
-{skip, {mnesia_trans_access_test, create_live_table_index_disc, "Uses disc"}}.
-{skip, {mnesia_trans_access_test, create_live_table_index_disc_only, "Uses disc"}}.
-%{mnesia_evil_coverage_test, del_table_index_ram} 'IMPL'
-{skip, {mnesia_trans_access_test, del_table_index_disc, "Uses disc"}}.
-{skip, {mnesia_trans_access_test, del_table_index_disc_only, "Uses disc"}}.
-{skip, {mnesia_trans_access_test, idx_schema_changes_ram, "Uses disk"}}.
-{skip, {mnesia_trans_access_test, idx_schema_changes_disc, "Uses disc"}}.
-{skip, {mnesia_trans_access_test, idx_schema_changes_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_write_ram} 'IMPL'
-
-{skip, {mnesia_dirty_access_test, dirty_write_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_write_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_read_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_read_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_read_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_update_counter_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_update_counter_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_update_counter_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_delete_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_delete_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_delete_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_delete_object_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_delete_object_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_delete_object_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_match_object_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_match_object_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_match_object_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_index_match_object_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_index_match_object_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_index_match_object_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_index_read_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_index_read_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_index_read_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_index_update_set_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_index_update_set_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_index_update_set_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_index_update_bag_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_index_update_bag_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_index_update_bag_disc_only, "Uses disc"}}.
-%{mnesia_dirty_access_test, dirty_iter_ram} 'IMPL'
-{skip, {mnesia_dirty_access_test, dirty_iter_disc, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, dirty_iter_disc_only, "Uses disc"}}.
-{skip, {mnesia_dirty_access_test, admin_tests, "Uses disk"}}.
-
-%{mnesia_trans_access_test, write} 'IMPL'
-%{mnesia_trans_access_test, read} 'IMPL'
-%{mnesia_trans_access_test, wread} 'IMPL'
-%{mnesia_trans_access_test, delete} 'IMPL'
-%{mnesia_trans_access_test, delete_object} 'IMPL'
-%{mnesia_trans_access_test, match_object} 'IMPL'
-%{mnesia_trans_access_test, all_keys} 'IMPL'
-%{mnesia_trans_access_test, index_match_object} 'IMPL'
-%{mnesia_trans_access_test, index_read} 'IMPL'
-%{mnesia_trans_access_test, index_update_set} 'IMPL'
-%{mnesia_trans_access_test, index_update_bag} 'IMPL'
-{skip, {mnesia_evil_coverage_test, dump_tables, "Uses disk"}}.
-{skip, {mnesia_evil_coverage_test, dump_log, "Uses disk"}}.
-%{mnesia_evil_coverage_test, wait_for_tables} 'IMPL'
-{skip, {mnesia_evil_coverage_test, force_load_table, "Uses disk"}}.
-%{mnesia_evil_coverage_test, user_properties} 'IMPL'
-%{mnesia_evil_coverage_test, record_name_dirty_access_ram} 'IMPL'
-{skip, {mnesia_evil_coverage_test, record_name_dirty_access_disc, "Uses disc"}}.
-{skip, {mnesia_evil_coverage_test, record_name_dirty_access_disc_only, "Uses disc"}}.
-%{mnesia_evil_coverage_test, snmp_open_table} 'IMPL'
-%{mnesia_evil_coverage_test, snmp_close_table} 'IMPL'
-%{mnesia_evil_coverage_test, snmp_get_next_index} 'IMPL'
-%{mnesia_evil_coverage_test, snmp_get_row} 'IMPL'
-%{mnesia_evil_coverage_test, snmp_get_mnesia_key} 'IMPL'
-%{mnesia_evil_coverage_test, snmp_update_counter} 'IMPL'
-%{mnesia_evil_coverage_test, info} 'IMPL'
-%{mnesia_evil_coverage_test, schema_0} 'IMPL'
-%{mnesia_evil_coverage_test, schema_1} 'IMPL'
-%{mnesia_evil_coverage_test, view_0} 'IMPL'
-{skip, {mnesia_evil_coverage_test, view_1, "Uses disk"}}.
-{skip, {mnesia_evil_coverage_test, view_2, "Uses disk"}}.
-%{mnesia_evil_coverage_test, lkill} 'IMPL'
-%{mnesia_evil_coverage_test, kill} 'IMPL'
-
-%{mnesia_config_test, access_module} 'IMPL'
-%{mnesia_config_test, auto_repair} 'IMPL'
-{skip, {mnesia_config_test, backup_module, "Uses disk"}}.
-{skip, {mnesia_config_test, dynamic_connect, "Uses disk"}}.
-%{mnesia_config_test, debug} 'IMPL'
-%{mnesia_config_test, dir} 'IMPL'
-{skip, {mnesia_config_test, dump_log_load_regulation, "Uses disk"}}.
-{skip, {mnesia_config_test, dump_log_time_threshold, "Uses disk"}}.
-{skip, {mnesia_config_test, dump_log_write_threshold, "Uses disk"}}.
-{skip, {mnesia_config_test, dump_log_update_in_place, "Uses disk"}}.
-{skip, {mnesia_config_test, embedded_mnemosyne, "Uses Mnemosyne"}}.
-%{mnesia_config_test, event_module} 'IMPL'
-{skip, {mnesia_config_test, ignore_fallback_at_startup, "Not Yet impl"}}.
-%{mnesia_config_test, inconsistent_database} 'IMPL'
-{skip, {mnesia_config_test, max_wait_for_decision, "Not Yet impl"}}.
-{skip, {mnesia_config_test, start_one_disc_full_then_one_disc_less, "Uses disc"}}.
-{skip, {mnesia_config_test, start_first_one_disc_less_then_one_disc_full, "Uses disc"}}.
-%%{skip, {mnesia_config_test, start_first_one_disc_less_then_two_more_disc_less, "Uses disc"}}.
-{skip, {mnesia_config_test, schema_location_and_extra_db_nodes_combinations, "Uses disk"}}.
-{skip, {mnesia_config_test, table_load_to_disc_less_nodes, "Uses disc"}}.
-{skip, {mnesia_config_test, schema_merge, "Uses Disc"}}.
-%{mnesia_config_test, unknown_config} 'IMPL'
-%{mnesia_registry_test, good_dump} 'IMPL'
-%{mnesia_registry_test, bad_dump} 'IMPL'
-
-%{mnesia_atomicity_test, explicit_abort_in_middle_of_trans} 'IMPL'
-%{mnesia_atomicity_test, runtime_error_in_middle_of_trans} 'IMPL'
-%{mnesia_atomicity_test, kill_self_in_middle_of_trans} 'IMPL'
-%{mnesia_atomicity_test, throw_in_middle_of_trans} 'IMPL'
-%{mnesia_atomicity_test, mnesia_down_during_infinite_trans} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_sw_rt} 'IMPL' 
-%{mnesia_atomicity_test, lock_waiter_sw_wt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wr_r} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_sw_sw} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_sw_w} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_sw_wr} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wr_wt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wr_sw} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wr_w} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_r_sw} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_r_w} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_r_wt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_rt_sw} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_rt_w} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_rt_wt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wt_r} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wt_w} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wt_rt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wt_wt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wt_wr} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_wt_sw} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_w_wr} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_w_sw} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_w_r} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_w_w} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_w_rt} 'IMPL'
-%{mnesia_atomicity_test, lock_waiter_w_wt} 'IMPL'
-%{mnesia_atomicity_test, restart_r_one} 'IMPL'
-%{mnesia_atomicity_test, restart_w_one} 'IMPL'
-%{mnesia_atomicity_test, restart_rt_one} 'IMPL'
-%{mnesia_atomicity_test, restart_wt_one} 'IMPL'
-%{mnesia_atomicity_test, restart_wr_one} 'IMPL'
-%{mnesia_atomicity_test, restart_sw_one} 'IMPL'
-%{mnesia_atomicity_test, restart_r_two} 'IMPL'
-%{mnesia_atomicity_test, restart_w_two} 'IMPL'
-%{mnesia_atomicity_test, restart_rt_two} 'IMPL'
-%{mnesia_atomicity_test, restart_wt_two} 'IMPL'
-%{mnesia_atomicity_test, restart_wr_two} 'IMPL'
-%{mnesia_atomicity_test, restart_sw_two} 'IMPL'
-
-%{mnesia_isolation_test, no_conflict} 'IMPL'
-%{mnesia_isolation_test, simple_queue_conflict} 'IMPL'
-%{mnesia_isolation_test, advanced_queue_conflict} 'IMPL'
-%{mnesia_isolation_test, simple_deadlock_conflict} 'IMPL'
-%{mnesia_isolation_test, advanced_deadlock_conflict} 'IMPL'
-%{mnesia_isolation_test, lock_burst} 'IMPL'
-%{mnesia_isolation_test, basic_sticky_functionality} 'IMPL'
-%{mnesia_isolation_test, create_table} 'IMPL'
-%{mnesia_isolation_test, delete_table} 'IMPL'
-%{mnesia_isolation_test, move_table_copy} 'IMPL'
-%{mnesia_isolation_test, add_table_index} 'IMPL'
-%{mnesia_isolation_test, del_table_index} 'IMPL'
-%{mnesia_isolation_test, transform_table} 'IMPL'
-%{mnesia_isolation_test, snmp_open_table} 'IMPL'
-%{mnesia_isolation_test, snmp_close_table} 'IMPL'
-{skip, {mnesia_isolation_test, change_table_copy_type, "Uses disk"}}.
-%{mnesia_isolation_test, change_table_access} 'IMPL'
-%{mnesia_isolation_test, add_table_copy} 'IMPL'
-%{mnesia_isolation_test, del_table_copy} 'IMPL'
-{skip, {mnesia_isolation_test, dump_tables, "Uses disk"}}.
-{skip, {mnesia_isolation_test, extra_admin_tests, "Uses disk"}}.
-%{mnesia_isolation_test, del_table_copy_1} 'IMPL'
-%{mnesia_isolation_test, del_table_copy_2} 'IMPL'
-%{mnesia_isolation_test, del_table_copy_3} 'IMPL'
-%{mnesia_isolation_test, add_table_copy_1} 'IMPL'
-%{mnesia_isolation_test, add_table_copy_2} 'IMPL'
-%{mnesia_isolation_test, add_table_copy_3} 'IMPL'
-%{mnesia_isolation_test, add_table_copy_4} 'IMPL'
-%{mnesia_isolation_test, move_table_copy_1} 'IMPL'
-%{mnesia_isolation_test, move_table_copy_2} 'IMPL'
-%{mnesia_isolation_test, move_table_copy_3} 'IMPL'
-%{mnesia_isolation_test, move_table_copy_4} 'IMPL'
-%{mnesia_isolation_test, dirty_updates_visible_direct} 'IMPL'
-%{mnesia_isolation_test, dirty_reads_regardless_of_trans} 'IMPL'
-%{mnesia_isolation_test, trans_update_invisibible_outside_trans} 'IMPL'
-%{mnesia_isolation_test, trans_update_visible_inside_trans} 'IMPL'
-%{mnesia_isolation_test, write_shadows} 'IMPL'
-%{mnesia_isolation_test, delete_shadows} 'IMPL'
-%{mnesia_isolation_test, write_delete_shadows_bag} 'IMPL'
-
-{skip, {mnesia_durability_test, all, "Uses disk "}}.
-%{mnesia_durability_test, load_local_contents_directly} 'IMPL'
-%{mnesia_durability_test, load_directly_when_all_are_ram_copiesA} 'IMPL'
-%{mnesia_durability_test, load_directly_when_all_are_ram_copiesB} 'IMPL'
-%{skip, {mnesia_durability_test, late_load_when_all_are_ram_copies_on_ram_nodes1, "Uses disk schema"}}.
-%{skip, {mnesia_durability_test, late_load_when_all_are_ram_copies_on_ram_nodes2, "Uses disk schema"}}.
-%{skip, {mnesia_durability_test, load_when_last_replica_becomes_available, "Uses disk"}}.
-%{skip, {mnesia_durability_test, load_when_we_have_down_from_all_other_replica_nodes, "Uses disk"}}.
-%{skip, {mnesia_durability_test, late_load_transforms_into_disc_load, "Uses disc"}}.
-%{mnesia_durability_test, late_load_leads_to_hanging} 'IMPL'
-%{mnesia_durability_test, force_load_when_nobody_intents_to_load} 'IMPL'
-%{mnesia_durability_test, force_load_when_someone_has_decided_to_load} 'IMPL'
-%{mnesia_durability_test, force_load_when_someone_else_already_has_loaded} 'IMPL'
-%{mnesia_durability_test, force_load_when_we_has_loaded} 'IMPL'
-%{mnesia_durability_test, force_load_on_a_non_local_table} 'IMPL'
-%{mnesia_durability_test, force_load_when_the_table_does_not_exist} 'IMPL'
-%{mnesia_durability_test, master_nodes} 'IMPL'
-%{mnesia_durability_test, master_on_non_local_tables} 'IMPL'
-%{mnesia_durability_test, remote_force_load_with_local_master_node} 'IMPL'
-%{mnesia_durability_test, dump_ram_copies} 'IMPL'
-%{skip, {mnesia_durability_test, dump_disc_copies, "Uses disc"}}.
-%{skip, {mnesia_durability_test, dump_disc_only, "Uses disc"}}.
-%{skip, {mnesia_durability_test, durability_of_disc_copies, "Uses disc"}}.
-%{skip, {mnesia_durability_test, durability_of_disc_only_copies, "Uses disc"}}.
-
-{skip, {mnesia_recovery_test, mnesia_down, "Uses Disk"}}.
-%{mnesia_recovery_test, no_master_2} 'IMPL'
-%{mnesia_recovery_test, no_master_3} 'IMPL'
-%{mnesia_recovery_test, one_master_2} 'IMPL'
-%{mnesia_recovery_test, one_master_3} 'IMPL'
-%{mnesia_recovery_test, two_master_2} 'IMPL'
-%{mnesia_recovery_test, two_master_3} 'IMPL'
-%{mnesia_recovery_test, all_master_2} 'IMPL'
-%{mnesia_recovery_test, all_master_3} 'IMPL'
-{skip, {mnesia_recovery_test, mnesia_down_during_startup_disk_ram, "Uses disk"}}.
-%{mnesia_recovery_test, mnesia_down_during_startup_init_ram} 'IMPL'
-{skip, {mnesia_recovery_test, mnesia_down_during_startup_init_disc, "Uses disc"}}.
-{skip, {mnesia_recovery_test, mnesia_down_during_startup_init_disc_only, "Uses disc"}}.
-%{mnesia_recovery_test, mnesia_down_during_startup_tm_ram} 'IMPL'
-{skip, {mnesia_recovery_test, mnesia_down_during_startup_tm_disc, "Uses disc"}}.
-{skip, {mnesia_recovery_test, mnesia_down_during_startup_tm_disc_only, "Uses disc"}}.
-%{mnesia_recovery_test, explicit_stop_during_snmp} 'IMPL'
-
-{skip, {mnesia_recovery_test, schema_trans, "Uses Disk, needs disk log"}}.
-{skip, {mnesia_recovery_test, async_dirty, "Uses disc"}}.
-{skip, {mnesia_recovery_test, sync_dirty, "Uses disc"}}.
-{skip, {mnesia_recovery_test, sym_trans, "Uses disc"}}.
-{skip, {mnesia_recovery_test, asym_trans, "Uses disc"}}.
-
-{skip, {mnesia_recovery_test, after_full_disc_partition, "Not Yet impl"}}.
-{skip, {mnesia_recovery_test, after_corrupt_files, "Uses disk"}}.
-
-%{mnesia_evil_coverage_test, subscriptions} 'IMPL'
-%{mnesia_evil_coverage_test, nested_trans_both_ok} 'IMPL'
-%{mnesia_evil_coverage_test, nested_trans_child_dies} 'IMPL'
-%{mnesia_evil_coverage_test, nested_trans_parent_dies} 'IMPL'
-%{mnesia_evil_coverage_test, nested_trans_both_dies} 'IMPL'
-%{mnesia_evil_coverage_test, mix_of_trans_sync_dirty} 'IMPL'
-%{mnesia_evil_coverage_test, mix_of_trans_async_dirty} 'IMPL'
-%{mnesia_evil_coverage_test, mix_of_trans_ets} 'IMPL'
-
-{skip, {mnesia_recovery_test, disc_less, "Uses disc (on the other nodes)"}}.
-{skip, {mnesia_recovery_test, system_upgrade, "Not Yet impl"}}.
-%{mnesia_consistency_test, consistency_after_restart_1_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_restart_1_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_restart_1_disc_only, "Uses disc"}}.
-%{mnesia_consistency_test, consistency_after_restart_2_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_restart_2_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_restart_2_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_dump_tables_1_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, consistency_after_dump_tables_2_ram, "Uses disk"}}.
-%{mnesia_consistency_test, consistency_after_add_replica_2_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_add_replica_2_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_add_replica_2_disc_only, "Uses disc"}}.
-%{mnesia_consistency_test, consistency_after_add_replica_3_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_add_replica_3_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_add_replica_3_disc_only, "Uses disc"}}.
-%{mnesia_consistency_test, consistency_after_del_replica_2_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_del_replica_2_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_del_replica_2_disc_only, "Uses disc"}}.
-%{mnesia_consistency_test, consistency_after_del_replica_3_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_del_replica_3_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_del_replica_3_disc_only, "Uses disc"}}.
-%{mnesia_consistency_test, consistency_after_move_replica_2_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_move_replica_2_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_move_replica_2_disc_only, "Uses disc"}}.
-%{mnesia_consistency_test, consistency_after_move_replica_3_ram} 'IMPL'
-{skip, {mnesia_consistency_test, consistency_after_move_replica_3_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_move_replica_3_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_transform_table, "Not yet implemented"}}.
-{skip, {mnesia_consistency_test, consistency_after_change_table_copy_type, "Not yet implemented"}}.
-{skip, {mnesia_consistency_test, consistency_after_fallback_2_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, consistency_after_fallback_2_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_fallback_2_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_fallback_3_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, consistency_after_fallback_3_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_fallback_3_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_restore_clear_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, consistency_after_restore_clear_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_restore_clear_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_restore_recreate_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, consistency_after_restore_recreate_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_restore_recreate_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, consistency_after_rename_of_node, "Not yet implemented"}}.
-{skip, {mnesia_consistency_test, updates_during_checkpoint_activation, "Uses disk"}}.
-%{skip, {mnesia_consistency_test, updates_during_checkpoint_activation_2_disc, "Uses disc"}}.
-%{skip, {mnesia_consistency_test, updates_during_checkpoint_activation_2_disc_only, "Uses disc"}}.
-%%{mnesia_consistency_test, updates_during_checkpoint_activation_3_ram} 'IMPL'
-%{skip, {mnesia_consistency_test, updates_during_checkpoint_activation_3_disc, "Uses disc"}}.
-%{skip, {mnesia_consistency_test, updates_during_checkpoint_activation_3_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, updates_during_checkpoint_iteration, "Uses disk"}}.
-%{skip, {mnesia_consistency_test, updates_during_checkpoint_iteration_2_disc, "Uses disc"}}.
-%{skip, {mnesia_consistency_test, updates_during_checkpoint_iteration_2_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, load_table_with_activated_checkpoint_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, load_table_with_activated_checkpoint_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, load_table_with_activated_checkpoint_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, add_table_copy_to_table_with_activated_checkpoint_ram, "Uses disk"}}.
-{skip, {mnesia_consistency_test, add_table_copy_to_table_with_activated_checkpoint_disc, "Uses disc"}}.
-{skip, {mnesia_consistency_test, add_table_copy_to_table_with_activated_checkpoint_disc_only, "Uses disc"}}.
-{skip, {mnesia_consistency_test, inst_fallback_process_dies, "Uses disk"}}.
-{skip, {mnesia_consistency_test, fatal_when_inconsistency, "Uses disk"}}.
-{skip, {mnesia_consistency_test, after_delete, "Uses disk"}}.
-{skip, {mnesia_consistency_test, mnesia_down_during_backup_causes_switch, "Uses disk"}}.
-{skip, {mnesia_consistency_test, mnesia_down_during_backup_causes_abort, "Uses disk"}}.
-%{mnesia_consistency_test, cause_switch_after} 'IMPL'
-%{mnesia_consistency_test, cause_abort_before} 'IMPL'
-%{mnesia_consistency_test, cause_abort_after} 'IMPL'
-%{mnesia_consistency_test, change_schema_before} 'IMPL'
-%{mnesia_consistency_test, change_schema_after} 'IMPL'
-
diff --git a/lib/mnesia/test/mnesia_bench.spec b/lib/mnesia/test/mnesia_bench.spec
new file mode 100644
index 0000000000..7b17cb5c4e
--- /dev/null
+++ b/lib/mnesia/test/mnesia_bench.spec
@@ -0,0 +1 @@
+{suites,"../mnesia_test",[mnesia_bench_SUITE]}.
\ No newline at end of file
diff --git a/lib/mnesia/test/mnesia_bench_SUITE.erl b/lib/mnesia/test/mnesia_bench_SUITE.erl
new file mode 100644
index 0000000000..7cbf77f046
--- /dev/null
+++ b/lib/mnesia/test/mnesia_bench_SUITE.erl
@@ -0,0 +1,69 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+-module(mnesia_bench_SUITE).
+-author('[email protected]').
+-compile(export_all).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+suite() -> [{ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}].
+
+
+all() -> 
+    [{group,tpcb}].
+
+groups() -> 
+    [{tpcb,[{repeat,2}],[tpcb_conflict_ramcopies,
+			 tpcb_conflict_disk_only_copies]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    Config.
+
+init_per_testcase(_Func, Conf) ->
+    Conf.
+
+end_per_testcase(_Func, _Conf) ->
+    ok.
+
+    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+tpcb_conflict_ramcopies(_Config) ->
+    mnesia_tpcb:conflict_benchmark(ram_copies).
+
+tpcb_conflict_disk_only_copies(_Config) ->
+    mnesia_tpcb:conflict_benchmark(disc_only_copies).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+    
+
+
diff --git a/lib/mnesia/test/mnesia_consistency_test.erl b/lib/mnesia/test/mnesia_consistency_test.erl
index f38e13f3a2..922b89ec2b 100644
--- a/lib/mnesia/test/mnesia_consistency_test.erl
+++ b/lib/mnesia/test/mnesia_consistency_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -100,7 +100,7 @@ groups() ->
        {group, updates_during_checkpoint_iteration},
        {group, load_table_with_activated_checkpoint},
        {group,
-	add_table_copy_to_table_with_activated_checkpoint}]},
+	add_table_copy_to_table_checkpoint}]},
      {updates_during_checkpoint_activation, [],
       [updates_during_checkpoint_activation_2_ram,
        updates_during_checkpoint_activation_2_disc,
@@ -116,10 +116,10 @@ groups() ->
       [load_table_with_activated_checkpoint_ram,
        load_table_with_activated_checkpoint_disc,
        load_table_with_activated_checkpoint_disc_only]},
-     {add_table_copy_to_table_with_activated_checkpoint, [],
-      [add_table_copy_to_table_with_activated_checkpoint_ram,
-       add_table_copy_to_table_with_activated_checkpoint_disc,
-       add_table_copy_to_table_with_activated_checkpoint_disc_only]},
+     {add_table_copy_to_table_checkpoint, [],
+      [add_table_copy_to_table_checkpoint_ram,
+       add_table_copy_to_table_checkpoint_disc,
+       add_table_copy_to_table_checkpoint_disc_only]},
      {backup_consistency, [],
       [{group, interupted_install_fallback},
        {group, interupted_uninstall_fallback},
@@ -952,16 +952,16 @@ view(Source, Mod) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-add_table_copy_to_table_with_activated_checkpoint_ram(suite) -> [];
-add_table_copy_to_table_with_activated_checkpoint_ram(Config) when is_list(Config) ->
+add_table_copy_to_table_checkpoint_ram(suite) -> [];
+add_table_copy_to_table_checkpoint_ram(Config) when is_list(Config) ->
     add_table_copy_to_table_with_activated_checkpoint(ram_copies, Config).
 
-add_table_copy_to_table_with_activated_checkpoint_disc(suite) -> [];
-add_table_copy_to_table_with_activated_checkpoint_disc(Config) when is_list(Config) ->
+add_table_copy_to_table_checkpoint_disc(suite) -> [];
+add_table_copy_to_table_checkpoint_disc(Config) when is_list(Config) ->
     add_table_copy_to_table_with_activated_checkpoint(disc_copies, Config).
 
-add_table_copy_to_table_with_activated_checkpoint_disc_only(suite) -> [];
-add_table_copy_to_table_with_activated_checkpoint_disc_only(Config) when is_list(Config) ->
+add_table_copy_to_table_checkpoint_disc_only(suite) -> [];
+add_table_copy_to_table_checkpoint_disc_only(Config) when is_list(Config) ->
     add_table_copy_to_table_with_activated_checkpoint(disc_only_copies, Config).
 
 add_table_copy_to_table_with_activated_checkpoint(Type,Config) -> 
diff --git a/lib/mnesia/test/mnesia_dirty_access_test.erl b/lib/mnesia/test/mnesia_dirty_access_test.erl
index abbdab48c0..6017092095 100644
--- a/lib/mnesia/test/mnesia_dirty_access_test.erl
+++ b/lib/mnesia/test/mnesia_dirty_access_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -527,6 +527,9 @@ dirty_index_update_bag(Config, Storage) ->
     ?match(ok, mnesia:dirty_write(Rec1)),
     ?match([Rec1], mnesia:dirty_index_read(Tab, 2, ValPos)),
 
+    ?match(ok, mnesia:dirty_delete_object(Rec5)),
+    ?match([Rec1], mnesia:dirty_index_read(Tab, 2, ValPos)),
+
     ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec2) end)), 
     R1 = mnesia:dirty_index_read(Tab, 2, ValPos),
     ?match([Rec1, Rec2], lists:sort(R1)),
diff --git a/lib/mnesia/test/mnesia_recovery_test.erl b/lib/mnesia/test/mnesia_recovery_test.erl
index 625e6e824c..c4910a4b11 100644
--- a/lib/mnesia/test/mnesia_recovery_test.erl
+++ b/lib/mnesia/test/mnesia_recovery_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -99,21 +99,21 @@ groups() ->
        async_dirty_post_kill_coord_node,
        async_dirty_post_kill_coord_pid]},
      {asym_trans, [],
-      [asym_trans_kill_part_ask,
-       asym_trans_kill_part_commit_vote,
-       asym_trans_kill_part_pre_commit,
-       asym_trans_kill_part_log_commit,
-       asym_trans_kill_part_do_commit,
-       asym_trans_kill_coord_got_votes,
-       asym_trans_kill_coord_pid_got_votes,
-       asym_trans_kill_coord_log_commit_rec,
-       asym_trans_kill_coord_pid_log_commit_rec,
-       asym_trans_kill_coord_log_commit_dec,
-       asym_trans_kill_coord_pid_log_commit_dec,
-       asym_trans_kill_coord_rec_acc_pre_commit_log_commit,
-       asym_trans_kill_coord_pid_rec_acc_pre_commit_log_commit,
-       asym_trans_kill_coord_rec_acc_pre_commit_done_commit,
-       asym_trans_kill_coord_pid_rec_acc_pre_commit_done_commit]},
+      [asymtrans_part_ask,
+       asymtrans_part_commit_vote,
+       asymtrans_part_pre_commit,
+       asymtrans_part_log_commit,
+       asymtrans_part_do_commit,
+       asymtrans_coord_got_votes,
+       asymtrans_coord_pid_got_votes,
+       asymtrans_coord_log_commit_rec,
+       asymtrans_coord_pid_log_commit_rec,
+       asymtrans_coord_log_commit_dec,
+       asymtrans_coord_pid_log_commit_dec,
+       asymtrans_coord_rec_acc_pre_commit_log_commit,
+       asymtrans_coord_pid_rec_acc_pre_commit_log_commit,
+       asymtrans_coord_rec_acc_pre_commit_done_commit,
+       asymtrans_coord_pid_rec_acc_pre_commit_done_commit]},
      {after_corrupt_files, [],
       [after_corrupt_files_decision_log_head,
        after_corrupt_files_decision_log_tail,
@@ -978,8 +978,8 @@ do_async_dirty([Tab], _Fahter) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-asym_trans_kill_part_ask(suite) -> [];
-asym_trans_kill_part_ask(Config) when is_list(Config) -> 
+asymtrans_part_ask(suite) -> [];
+asymtrans_part_ask(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -989,8 +989,8 @@ asym_trans_kill_part_ask(Config) when is_list(Config) ->
     kill_after_debug_point(Part1, {Part1, {mnesia_tm, doit_ask_commit}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_part_commit_vote(suite) -> [];
-asym_trans_kill_part_commit_vote(Config) when is_list(Config) -> 
+asymtrans_part_commit_vote(suite) -> [];
+asymtrans_part_commit_vote(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1000,8 +1000,8 @@ asym_trans_kill_part_commit_vote(Config) when is_list(Config) ->
     kill_after_debug_point(Part1, {Part1, {mnesia_tm, commit_participant, vote_yes}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_part_pre_commit(suite) -> [];
-asym_trans_kill_part_pre_commit(Config) when is_list(Config) -> 
+asymtrans_part_pre_commit(suite) -> [];
+asymtrans_part_pre_commit(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1011,8 +1011,8 @@ asym_trans_kill_part_pre_commit(Config) when is_list(Config) ->
     kill_after_debug_point(Part1, {Part1, {mnesia_tm, commit_participant, pre_commit}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_part_log_commit(suite) -> [];
-asym_trans_kill_part_log_commit(Config) when is_list(Config) -> 
+asymtrans_part_log_commit(suite) -> [];
+asymtrans_part_log_commit(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1022,8 +1022,8 @@ asym_trans_kill_part_log_commit(Config) when is_list(Config) ->
     kill_after_debug_point(Part1, {Part1, {mnesia_tm, commit_participant, log_commit}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_part_do_commit(suite) -> [];
-asym_trans_kill_part_do_commit(Config) when is_list(Config) -> 
+asymtrans_part_do_commit(suite) -> [];
+asymtrans_part_do_commit(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1033,8 +1033,8 @@ asym_trans_kill_part_do_commit(Config) when is_list(Config) ->
     kill_after_debug_point(Part1, {Part1, {mnesia_tm, commit_participant, do_commit}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_coord_got_votes(suite) -> [];
-asym_trans_kill_coord_got_votes(Config) when is_list(Config) -> 
+asymtrans_coord_got_votes(suite) -> [];
+asymtrans_coord_got_votes(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1044,8 +1044,8 @@ asym_trans_kill_coord_got_votes(Config) when is_list(Config) ->
     kill_after_debug_point(Coord, {Coord, {mnesia_tm, multi_commit_asym_got_votes}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_coord_pid_got_votes(suite) -> [];
-asym_trans_kill_coord_pid_got_votes(Config) when is_list(Config) -> 
+asymtrans_coord_pid_got_votes(suite) -> [];
+asymtrans_coord_pid_got_votes(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1055,8 +1055,8 @@ asym_trans_kill_coord_pid_got_votes(Config) when is_list(Config) ->
     kill_after_debug_point(coord_pid, {Coord, {mnesia_tm, multi_commit_asym_got_votes}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_coord_log_commit_rec(suite) -> [];
-asym_trans_kill_coord_log_commit_rec(Config) when is_list(Config) -> 
+asymtrans_coord_log_commit_rec(suite) -> [];
+asymtrans_coord_log_commit_rec(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1066,8 +1066,8 @@ asym_trans_kill_coord_log_commit_rec(Config) when is_list(Config) ->
     kill_after_debug_point(Coord, {Coord, {mnesia_tm, multi_commit_asym_log_commit_rec}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_coord_pid_log_commit_rec(suite) -> [];
-asym_trans_kill_coord_pid_log_commit_rec(Config) when is_list(Config) -> 
+asymtrans_coord_pid_log_commit_rec(suite) -> [];
+asymtrans_coord_pid_log_commit_rec(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1077,8 +1077,8 @@ asym_trans_kill_coord_pid_log_commit_rec(Config) when is_list(Config) ->
     kill_after_debug_point(coord_pid, {Coord, {mnesia_tm, multi_commit_asym_log_commit_rec}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_coord_log_commit_dec(suite) -> [];
-asym_trans_kill_coord_log_commit_dec(Config) when is_list(Config) -> 
+asymtrans_coord_log_commit_dec(suite) -> [];
+asymtrans_coord_log_commit_dec(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1088,8 +1088,8 @@ asym_trans_kill_coord_log_commit_dec(Config) when is_list(Config) ->
     kill_after_debug_point(Coord, {Coord, {mnesia_tm, multi_commit_asym_log_commit_dec}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_coord_pid_log_commit_dec(suite) -> [];
-asym_trans_kill_coord_pid_log_commit_dec(Config) when is_list(Config) -> 
+asymtrans_coord_pid_log_commit_dec(suite) -> [];
+asymtrans_coord_pid_log_commit_dec(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1099,8 +1099,8 @@ asym_trans_kill_coord_pid_log_commit_dec(Config) when is_list(Config) ->
     kill_after_debug_point(coord_pid, {Coord, {mnesia_tm, multi_commit_asym_log_commit_dec}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_coord_rec_acc_pre_commit_log_commit(suite) -> [];
-asym_trans_kill_coord_rec_acc_pre_commit_log_commit(Config) when is_list(Config) -> 
+asymtrans_coord_rec_acc_pre_commit_log_commit(suite) -> [];
+asymtrans_coord_rec_acc_pre_commit_log_commit(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1110,8 +1110,8 @@ asym_trans_kill_coord_rec_acc_pre_commit_log_commit(Config) when is_list(Config)
     kill_after_debug_point(Coord, {Coord, {mnesia_tm, rec_acc_pre_commit_log_commit}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_coord_pid_rec_acc_pre_commit_log_commit(suite) -> [];
-asym_trans_kill_coord_pid_rec_acc_pre_commit_log_commit(Config) when is_list(Config) -> 
+asymtrans_coord_pid_rec_acc_pre_commit_log_commit(suite) -> [];
+asymtrans_coord_pid_rec_acc_pre_commit_log_commit(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1121,8 +1121,8 @@ asym_trans_kill_coord_pid_rec_acc_pre_commit_log_commit(Config) when is_list(Con
     kill_after_debug_point(coord_pid, {Coord, {mnesia_tm, rec_acc_pre_commit_log_commit}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_coord_rec_acc_pre_commit_done_commit(suite) -> [];
-asym_trans_kill_coord_rec_acc_pre_commit_done_commit(Config) when is_list(Config) -> 
+asymtrans_coord_rec_acc_pre_commit_done_commit(suite) -> [];
+asymtrans_coord_rec_acc_pre_commit_done_commit(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
@@ -1132,8 +1132,8 @@ asym_trans_kill_coord_rec_acc_pre_commit_done_commit(Config) when is_list(Config
     kill_after_debug_point(Coord, {Coord, {mnesia_tm, rec_acc_pre_commit_done_commit}}, 
 			   TransFun, [Tab1, Tab2], Nodes).
 
-asym_trans_kill_coord_pid_rec_acc_pre_commit_done_commit(suite) -> [];
-asym_trans_kill_coord_pid_rec_acc_pre_commit_done_commit(Config) when is_list(Config) -> 
+asymtrans_coord_pid_rec_acc_pre_commit_done_commit(suite) -> [];
+asymtrans_coord_pid_rec_acc_pre_commit_done_commit(Config) when is_list(Config) -> 
     ?is_debug_compiled,
     Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
     [Coord, Part1, Part2] = Nodes,
diff --git a/lib/mnesia/test/mnesia_test_lib.erl b/lib/mnesia/test/mnesia_test_lib.erl
index ba5bf84e24..57cbc61495 100644
--- a/lib/mnesia/test/mnesia_test_lib.erl
+++ b/lib/mnesia/test/mnesia_test_lib.erl
@@ -272,25 +272,13 @@ slave_start_link(Host, Name, Retries) ->
     end.
 
 starter(Host, Name, Args) ->
-    case os:type() of
-	vxworks ->
-	    X = test_server:start_node(Name, slave, [{args,Args}]),
-	    timer:sleep(5000),
-	    X;
-	_ ->
-	    slave:start(Host, Name, Args)
-    end.
+    slave:start(Host, Name, Args).
 
 slave_sup() ->
     process_flag(trap_exit, true),
     receive
 	{'EXIT', _, _} ->
-	    case os:type() of
-		vxworks ->
-		    erlang:halt();
-		_  ->
-		    ignore
-	    end
+	    ignore
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/mnesia/test/mnesia_trans_access_test.erl b/lib/mnesia/test/mnesia_trans_access_test.erl
index c040d0ca3f..157e441b27 100644
--- a/lib/mnesia/test/mnesia_trans_access_test.erl
+++ b/lib/mnesia/test/mnesia_trans_access_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -896,6 +896,10 @@ index_update_bag(Config)when is_list(Config) ->
     ?match({atomic, [Rec1]},
 	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end)),
 
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete_object(Rec5) end)),
+    ?match({atomic, [Rec1]},
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end)),
+
     ?match({atomic, ok},
 	   mnesia:transaction(fun() -> mnesia:write(Rec2) end)),
     {atomic, R1} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index da292cbb43..6d5df448c9 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.7
+MNESIA_VSN = 4.7.1
diff --git a/lib/observer/doc/src/Makefile b/lib/observer/doc/src/Makefile
index cd9f9466ca..0f564d3299 100644
--- a/lib/observer/doc/src/Makefile
+++ b/lib/observer/doc/src/Makefile
@@ -133,16 +133,16 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6_FILES) $(RELEASE_PATH)/man/man6
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6_FILES) "$(RELEASE_PATH)/man/man6"
 
 
 release_spec:
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index a9554a08f4..4ec03782a7 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,75 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
+<section><title>Observer 1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The module name in the link to the detail page for each
+	    loaded module was earlier not URL encoded. If the module
+	    name contained e.g. a # this could cause the crashdump
+	    viewer to crash when opening the link. This has been
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-10090 Aux Id: seq12068 </p>
+        </item>
+        <item>
+          <p>
+	    Escape control characters in Table Viewer</p>
+          <p>
+	    Similar behaviour to old tv. Objects in tables supposed
+	    to be printed in a single line and it looks ugly when a
+	    [...,10,...] integer list creates a new-line. Fix Table
+	    Viewer search crash on new|changed|deleted rows.</p>
+          <p>
+	    Fix Table Viewer crash after a 'Found' -&gt; 'Not found'
+	    search sequence</p>
+          <p>
+	    Start position was lost after a 'Found' -&gt; 'Not found'
+	    search sequence leading an undefined position in the next
+	    search. Thanks to Peti G�mori</p>
+          <p>
+	    Own Id: OTP-10218</p>
+        </item>
+        <item>
+          <p>
+	    observer: fix app file (Noticed-by: Motiejus Jakstys)</p>
+          <p>
+	    Add missing observer modules to observer.app.src. Thanks
+	    to Tuncer Ayaz.</p>
+          <p>
+	    Own Id: OTP-10221</p>
+        </item>
+        <item>
+          <p>
+	    Make Table Viewer search a bit faster</p>
+          <p>
+	    Edit table row in a multiline text dialog. Thanks to Peti
+	    Gomori.</p>
+          <p>
+	    Own Id: OTP-10225</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Allow tracing on bifs.</p> <p>Ask epmd for local
+	    nodes, and remember users last input in connect.</p>
+	    <p>Fix crashes when a table or process information could
+	    not be retrieved.</p>
+          <p>
+	    Own Id: OTP-10075</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 1.0</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index 91a4c656ad..7135a6abd5 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -129,20 +129,20 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
-	$(INSTALL_SCRIPT) $(EXECUTABLES) $(RELSYSDIR)/priv/bin
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/crashdump_viewer
-	$(INSTALL_DATA) $(WEBTOOLFILES) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(GIF_FILES) $(RELSYSDIR)/priv/crashdump_viewer
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
+	$(INSTALL_SCRIPT) $(EXECUTABLES) "$(RELSYSDIR)/priv/bin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/crashdump_viewer"
+	$(INSTALL_DATA) $(WEBTOOLFILES) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(GIF_FILES) "$(RELSYSDIR)/priv/crashdump_viewer"
 
 release_docs_spec:
 
diff --git a/lib/observer/src/crashdump_viewer_html.erl b/lib/observer/src/crashdump_viewer_html.erl
index 24a80b1916..3151b83bfb 100644
--- a/lib/observer/src/crashdump_viewer_html.erl
+++ b/lib/observer/src/crashdump_viewer_html.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1394,7 +1394,7 @@ timers_table(Timer) ->
        td("ALIGN=right",Time)]).
 
 loaded_mods_table(#loaded_mod{mod=Mod,current_size=CS,old_size=OS}) ->
-    tr([td(href(["loaded_mod_details?mod=",Mod],Mod)),
+    tr([td(href(["loaded_mod_details?mod=",http_uri:encode(Mod)],Mod)),
 	td("ALIGN=right",CS),
 	td("ALIGN=right",OS)]).
 
diff --git a/lib/observer/src/observer.app.src b/lib/observer/src/observer.app.src
index 5c65ea5c8f..e881cb3c97 100644
--- a/lib/observer/src/observer.app.src
+++ b/lib/observer/src/observer.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -25,6 +25,18 @@
 	       etop_gui,
 	       etop_tr,
 	       etop_txt,
+	       observer,
+	       observer_app_wx,
+	       observer_lib,
+	       observer_perf_wx,
+	       observer_pro_wx,
+	       observer_procinfo,
+	       observer_sys_wx,
+	       observer_trace_wx,
+	       observer_traceoptions_wx,
+	       observer_tv_table,
+	       observer_tv_wx,
+	       observer_wx,
 	       ttb,
 	       ttb_et]},
     {registered, []},
diff --git a/lib/observer/src/observer_app_wx.erl b/lib/observer/src/observer_app_wx.erl
index 7eac2b8fab..380532e90c 100644
--- a/lib/observer/src/observer_app_wx.erl
+++ b/lib/observer/src/observer_app_wx.erl
@@ -147,11 +147,11 @@ setup_scrollbar({CW, CH}, AppWin, #app{dim={W0,H0}}) ->
     H = max(H0,CH),
     PPC = 20,
     if W0 =< CW, H0 =< CH ->
-	    wxScrolledWindow:setScrollbars(AppWin, W, H, 1, 1);
+	    wxScrolledWindow:setScrollbars(AppWin, W, H, 0, 0);
        H0 =< CH ->
-	    wxScrolledWindow:setScrollbars(AppWin, PPC, H, W div PPC+1, 1);
+	    wxScrolledWindow:setScrollbars(AppWin, PPC, H, W div PPC+1, 0);
        W0 =< CW ->
-	    wxScrolledWindow:setScrollbars(AppWin, W, PPC, 1, H div PPC+1);
+	    wxScrolledWindow:setScrollbars(AppWin, W, PPC, 0, H div PPC+1);
        true ->
 	    wxScrolledWindow:setScrollbars(AppWin, PPC, PPC, W div PPC+1, H div PPC+1)
     end;
@@ -204,7 +204,7 @@ handle_event(#wx{id=?ID_PROC_MSG, event=#wxCommand{type=command_menu_selected}},
 
 handle_event(#wx{id=?ID_PROC_KILL, event=#wxCommand{type=command_menu_selected}},
 	     State = #state{panel=Panel, sel={#box{s1=#str{pid=Pid}},_}}) ->
-    case observer_lib:user_term(Panel, "Enter Exit Reason", "") of
+    case observer_lib:user_term(Panel, "Enter Exit Reason", "kill") of
 	cancel ->         ok;
 	{ok, Term} ->     exit(Pid, Term);
 	{error, Error} -> observer_lib:display_info_dialog(Error)
@@ -269,22 +269,21 @@ handle_cast(Event, _State) ->
 %%%%%%%%%%
 handle_info({active, Node}, State = #state{parent=Parent, current=Curr, appmon=Appmon}) ->
     create_menus(Parent, []),
-    {ok, Pid} = appmon_info:start_link(Node, self(), []),
-    case Appmon of
-	undefined -> ok;
-	Pid -> ok;
-	_ -> %% Deregister me as client (and stop appmon if last)
-	    exit(Appmon, normal)
-    end,
+    Pid = try
+	      Node = node(Appmon),
+	      Appmon
+	  catch _:_ ->
+		  {ok, P} = appmon_info:start_link(Node, self(), []),
+		  P
+	  end,
     appmon_info:app_ctrl(Pid, Node, true, []),
     (Curr =/= undefined) andalso appmon_info:app(Pid, Curr, true, []),
     {noreply, State#state{appmon=Pid}};
-
-handle_info(not_active, State = #state{appmon=AppMon, current=Prev}) ->
+handle_info(not_active, State = #state{appmon=AppMon}) ->
     appmon_info:app_ctrl(AppMon, node(AppMon), false, []),
-    (Prev =/= undefined) andalso appmon_info:app(AppMon, Prev, false, []),
-    {noreply, State};
-
+    lists:member(node(AppMon), nodes()) andalso exit(AppMon, normal),
+    observer_wx:set_status(""),
+    {noreply, State#state{appmon=undefined}};
 handle_info({delivery, Pid, app_ctrl, _, Apps0},
 	    State = #state{appmon=Pid, apps_w=LBox, current=Curr0}) ->
     Apps = [atom_to_list(App) || {_, App, {_, _, _}} <- Apps0],
@@ -341,6 +340,7 @@ handle_mouse_click(Node = {#box{s1=#str{pid=Pid}},_}, Type,
 	right_down ->    popup_menu(Panel);
 	_ ->           ok
     end,
+    observer_wx:set_status(io_lib:format("Pid: ~p", [Pid])),
     wxWindow:refresh(AppWin),
     State#state{sel=Node};
 handle_mouse_click(_, _, State = #state{sel=undefined}) ->
@@ -349,6 +349,7 @@ handle_mouse_click(_, right_down, State=#state{panel=Panel}) ->
     popup_menu(Panel),
     State;
 handle_mouse_click(_, _, State=#state{app_w=AppWin}) ->
+    observer_wx:set_status(""),
     wxWindow:refresh(AppWin),
     State#state{sel=undefined}.
 
@@ -376,10 +377,11 @@ popup_menu(Panel) ->
     wxMenu:append(Menu, ?ID_TRACE_NAME, "Trace named process"),
     wxMenu:append(Menu, ?ID_TRACE_TREE_PIDS, "Trace process tree"),
     wxMenu:append(Menu, ?ID_TRACE_TREE_NAMES, "Trace named process tree"),
+    wxMenu:append(Menu, ?ID_PROC_MSG,   "Send Msg"),
+    wxMenu:append(Menu, ?ID_PROC_KILL,  "Kill process"),
     wxWindow:popupMenu(Panel, Menu),
     wxMenu:destroy(Menu).
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 locate_node(X, _Y, [{Box=#box{x=BX}, _Chs}|_Rest])
   when X < BX ->
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index 3b924d46cf..4077f8371a 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -19,7 +19,7 @@
 -module(observer_lib).
 
 -export([get_wx_parent/1,
-	 display_info_dialog/1, user_term/3,
+	 display_info_dialog/1, user_term/3, user_term_multiline/3,
 	 interval_dialog/4, start_timer/1, stop_timer/1,
 	 display_info/2, fill_info/2, update_info/2, to_str/1,
 	 create_menus/3, create_menu_item/3,
@@ -347,6 +347,58 @@ user_term(Parent, Title, Default) ->
 	    cancel
     end.
 
+user_term_multiline(Parent, Title, Default) ->
+    Dialog = wxDialog:new(Parent, ?wxID_ANY, Title,
+			  [{style, ?wxDEFAULT_DIALOG_STYLE bor
+			    ?wxRESIZE_BORDER}]),
+    Panel = wxPanel:new(Dialog),
+
+    TextCtrl = wxTextCtrl:new(Panel, ?wxID_ANY,
+			      [{value, Default},
+			       {style, ?wxDEFAULT bor ?wxTE_MULTILINE}]),
+    Line = wxStaticLine:new(Panel, [{style, ?wxLI_HORIZONTAL}]),
+
+    Buttons = wxDialog:createButtonSizer(Dialog, ?wxOK bor ?wxCANCEL),
+
+    InnerSizer = wxBoxSizer:new(?wxVERTICAL),
+    wxSizer:add(InnerSizer, TextCtrl,
+		[{flag, ?wxEXPAND bor ?wxALL},{proportion, 1},{border, 5}]),
+    wxSizer:add(InnerSizer, Line,
+		[{flag, ?wxEXPAND},{proportion, 0},{border, 5}]),
+    wxPanel:setSizer(Panel, InnerSizer),
+
+    TopSizer = wxBoxSizer:new(?wxVERTICAL),
+    wxSizer:add(TopSizer, Panel,
+		[{flag, ?wxEXPAND bor ?wxALL},{proportion, 1},{border, 5}]),
+    wxSizer:add(TopSizer, Buttons,
+		[{flag, ?wxEXPAND bor ?wxBOTTOM bor ?wxRIGHT},{border, 10}]),
+
+    % calculate the size of TopSizer when the whole user_term
+    % fits in the TextCtrl
+    DC = wxClientDC:new(Panel),
+    W = wxDC:getCharWidth(DC),
+    H = wxDC:getCharHeight(DC),
+    {EW, EH} = wxDC:getMultiLineTextExtent(DC, Default),
+    wxSizer:setItemMinSize(InnerSizer, 0, EW+2*W, EH+H),
+    TopSize = wxSizer:getMinSize(TopSizer),
+    % reset min size of TextCtrl to 40 chararacters * 4 lines
+    wxSizer:setItemMinSize(InnerSizer, 0, 40*W, 4*H),
+
+    wxWindow:setSizerAndFit(Dialog, TopSizer),
+    wxSizer:setSizeHints(TopSizer, Dialog),
+
+    wxWindow:setClientSize(Dialog, TopSize),
+
+    case wxDialog:showModal(Dialog) of
+	?wxID_OK ->
+	    Str = wxTextCtrl:getValue(TextCtrl),
+	    wxDialog:destroy(Dialog),
+	    parse_string(ensure_last_is_dot(Str));
+	?wxID_CANCEL ->
+	    wxDialog:destroy(Dialog),
+	    cancel
+    end.
+
 parse_string(Str) ->
     try
 	Tokens = case erl_scan:string(Str) of
diff --git a/lib/observer/src/observer_perf_wx.erl b/lib/observer/src/observer_perf_wx.erl
index fa867e12f6..abf90ac612 100644
--- a/lib/observer/src/observer_perf_wx.erl
+++ b/lib/observer/src/observer_perf_wx.erl
@@ -123,7 +123,7 @@ init([Notebook, Parent]) ->
 		  }}
    catch _:Err ->
 	   io:format("~p crashed ~p: ~p~n",[?MODULE, Err, erlang:get_stacktrace()]),
-	   {error, Err}
+	   {stop, Err}
    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/observer/src/observer_pro_wx.erl b/lib/observer/src/observer_pro_wx.erl
index 7578215ff9..ee67664539 100644
--- a/lib/observer/src/observer_pro_wx.erl
+++ b/lib/observer/src/observer_pro_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -191,13 +191,20 @@ dump_to_file(Parent, FileName, Holder) ->
 start_procinfo(undefined, _Frame, Opened) ->
     Opened;
 start_procinfo(Pid, Frame, Opened) ->
-    case lists:member(Pid, Opened) of
-	true ->
-	    Opened;
-	false ->
-	    observer_procinfo:start(Pid, Frame, self()),
-	    [Pid | Opened]
+    %% This code doesn't work until we collect which windows have been
+    %% closed maybe it should moved to observer_wx.erl
+    %% and add a global menu which remembers windows.
+    %% case lists:keyfind(Pid, 1, Opened) of
+    %% 	false ->
+    case observer_procinfo:start(Pid, Frame, self()) of
+	{error, _} -> Opened;
+	PI -> [{Pid, PI} | Opened]
     end.
+    %%;
+    %% 	{_, PI} ->
+    %% 	    wxFrame:raise(PI),
+    %% 	    Opened
+    %% end.
 
 call(Holder, What) ->
     Ref = erlang:monitor(process, Holder),
@@ -251,8 +258,7 @@ terminate(_Reason, #state{holder=Holder}) ->
     ok.
 
 code_change(_, _, State) ->
-    {stop, not_yet_implemented, State}.
-
+    {ok, State}.
 
 handle_call(Msg, _From, State) ->
     io:format("~p:~p: Unhandled call ~p~n",[?MODULE, ?LINE, Msg]),
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl
index ec08d3aff1..45218c177b 100644
--- a/lib/observer/src/observer_procinfo.erl
+++ b/lib/observer/src/observer_procinfo.erl
@@ -49,7 +49,8 @@ init([Pid, ParentFrame, Parent]) ->
     try
 	Title=case observer_wx:try_rpc(node(Pid), erlang, process_info, [Pid, registered_name]) of
 		  [] -> io_lib:format("~p",[Pid]);
-		  {registered_name, Registered} -> atom_to_list(Registered)
+		  {registered_name, Registered} -> io_lib:format("~p (~p)",[Registered, Pid]);
+		  undefined -> throw(process_undefined)
 	      end,
 	Frame=wxFrame:new(ParentFrame, ?wxID_ANY, [atom_to_list(node(Pid)), $:, Title],
 			  [{style, ?wxDEFAULT_FRAME_STYLE}, {size, {850,600}}]),
@@ -75,7 +76,10 @@ init([Pid, ParentFrame, Parent]) ->
 		      }}
     catch error:{badrpc, _} ->
 	    observer_wx:return_to_localnode(ParentFrame, node(Pid)),
-	    {stop, badrpc, #state{parent=Parent, pid=Pid}}
+	    {stop, badrpc};
+	  process_undefined ->
+	    observer_lib:display_info_dialog("No such alive process"),
+	    {stop, normal}
     end.
 
 init_panel(Notebook, Str, Pid, Fun) ->
@@ -94,8 +98,11 @@ handle_event(#wx{event=#wxClose{type=close_window}}, State) ->
 handle_event(#wx{id=?wxID_CLOSE, event=#wxCommand{type=command_menu_selected}}, State) ->
     {stop, normal, State};
 
-handle_event(#wx{id=?REFRESH}, #state{pages=Pages}=State) ->
-    [(W#worker.callback)() || W <- Pages],
+handle_event(#wx{id=?REFRESH}, #state{frame=Frame, pid=Pid, pages=Pages}=State) ->
+    try [(W#worker.callback)() || W <- Pages]
+    catch process_undefined ->
+	    wxFrame:setTitle(Frame, io_lib:format("*DEAD* ~p",[Pid]))
+    end,
     {noreply, State};
 
 handle_event(Event, _State) ->
@@ -120,17 +127,15 @@ terminate(_Reason, #state{parent=Parent,pid=Pid,frame=Frame}) ->
     ok.
 
 code_change(_, _, State) ->
-    {stop, not_yet_implemented, State}.
+    {ok, State}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 init_process_page(Panel, Pid) ->
     Fields0 = process_info_fields(Pid),
     {FPanel, _, UpFields} = observer_lib:display_info(Panel, Fields0),
-    {FPanel, fun() -> case process_info_fields(Pid) of
-			  Fields when is_list(Fields) ->
-			      observer_lib:update_info(UpFields, Fields);
-			  _ -> ok
-		      end
+    {FPanel, fun() ->
+		     Fields = process_info_fields(Pid),
+		     observer_lib:update_info(UpFields, Fields)
 	     end}.
 
 init_text_page(Parent) ->
@@ -162,7 +167,8 @@ init_message_page(Parent, Pid) ->
 				 false ->
 				     wxTextCtrl:writeText(Text, Messages)
 			     end;
-			 _ -> ok
+			 _ ->
+			     throw(process_undefined)
 		     end
 	     end,
     Update(),
@@ -178,7 +184,8 @@ init_dict_page(Parent, Pid) ->
 			     Last = wxTextCtrl:getLastPosition(Text),
 			     wxTextCtrl:remove(Text, 0, Last),
 			     wxTextCtrl:writeText(Text, Dict);
-			 _ -> ok
+			 _ ->
+			     throw(process_undefined)
 		     end
 	     end,
     Update(),
@@ -216,7 +223,8 @@ init_stack_page(Parent, Pid) ->
 					      wxListCtrl:setItem(LCtrl, Row, 1, FileLine),
 					      Row+1
 				      end, 0, RawBt);
-			 _ -> ok
+			 _ ->
+			     throw(process_undefined)
 		     end
 	     end,
     Resize = fun(#wx{event=#wxSize{size={W,_}}},Ev) ->
@@ -266,7 +274,7 @@ process_info_fields(Pid) ->
 	RawInfo when is_list(RawInfo) ->
 	    observer_lib:fill_info(Struct, RawInfo);
 	_ ->
-	    ok
+	    throw(process_undefined)
     end.
 
 item_list() ->
diff --git a/lib/observer/src/observer_sys_wx.erl b/lib/observer/src/observer_sys_wx.erl
index 09602bbd9e..f00a666a35 100644
--- a/lib/observer/src/observer_sys_wx.erl
+++ b/lib/observer/src/observer_sys_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -147,7 +147,7 @@ terminate(_Reason, _State) ->
     ok.
 
 code_change(_, _, State) ->
-    {stop, not_yet_implemented, State}.
+    {ok, State}.
 
 handle_call(Msg, _From, State) ->
     io:format("~p~p: Unhandled Call ~p~n",[?MODULE, ?LINE, Msg]),
diff --git a/lib/observer/src/observer_trace_wx.erl b/lib/observer/src/observer_trace_wx.erl
index d0b6a1e063..f2a1084f85 100644
--- a/lib/observer/src/observer_trace_wx.erl
+++ b/lib/observer/src/observer_trace_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -489,7 +489,7 @@ terminate(_Reason, #state{nodes=_Nodes}) ->
     ok.
 
 code_change(_, _, State) ->
-    {stop, not_yet_implemented, State}.
+    {ok, State}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 do_add_patterns({Module, NewPs}, State=#state{tpatterns=TPs0, m_view=Mview, f_view=Fview}) ->
diff --git a/lib/observer/src/observer_traceoptions_wx.erl b/lib/observer/src/observer_traceoptions_wx.erl
index 6a634e06f0..e27f565abc 100644
--- a/lib/observer/src/observer_traceoptions_wx.erl
+++ b/lib/observer/src/observer_traceoptions_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -167,8 +167,10 @@ module_selector(Parent, Node) ->
 
 function_selector(Parent, Node, Module) ->
     Functions = observer_wx:try_rpc(Node, Module, module_info, [functions]),
-    Choices = lists:sort([{Name, Arity} || {Name, Arity} <- Functions,
-					   not(erl_internal:guard_bif(Name, Arity))]),
+    Externals = observer_wx:try_rpc(Node, Module, module_info, [exports]),
+
+    Choices = lists:usort([{Name, Arity} || {Name, Arity} <- Externals ++ Functions,
+					    not(erl_internal:guard_bif(Name, Arity))]),
     ParsedChoices = parse_function_names(Choices),
     case check_selector(Parent, ParsedChoices) of
 	[] -> [{Module, '_', '_'}];
diff --git a/lib/observer/src/observer_tv_table.erl b/lib/observer/src/observer_tv_table.erl
index f432173f57..c41f0f006a 100644
--- a/lib/observer/src/observer_tv_table.erl
+++ b/lib/observer/src/observer_tv_table.erl
@@ -24,6 +24,8 @@
 -export([init/1, handle_info/2, terminate/2, code_change/3, handle_call/3,
 	 handle_event/2, handle_sync_event/3, handle_cast/2]).
 
+-export([format/1]).
+
 -include("observer_defs.hrl").
 -import(observer_lib, [to_str/1]).
 
@@ -218,8 +220,8 @@ search_area(Parent) ->
 	    search=TC1,goto=TC2,radio={Nbtn,Pbtn,Cbtn}}.
 
 edit(Index, #state{pid=Pid, frame=Frame}) ->
-    Str = get_row(Pid, Index, all),
-    case observer_lib:user_term(Frame, "Edit object:", Str) of
+    Str = get_row(Pid, Index, all_multiline),
+    case observer_lib:user_term_multiline(Frame, "Edit object:", Str) of
 	cancel -> ok;
 	{ok, Term} -> Pid ! {edit, Index, Term};
 	Err = {error, _} -> self() ! Err
@@ -265,7 +267,8 @@ handle_event(#wx{id=?ID_DELETE},
     wxStatusBar:setStatusText(StatusBar, io_lib:format("Deleted object: ~s",[Str])),
     {noreply, State};
 
-handle_event(#wx{id=?wxID_CLOSE}, State) ->
+handle_event(#wx{id=?wxID_CLOSE}, State = #state{frame=Frame}) ->
+    wxFrame:destroy(Frame),
     {stop, normal, State};
 
 handle_event(Help = #wx{id=?wxID_HELP}, State) ->
@@ -321,7 +324,7 @@ handle_event(#wx{id=?SEARCH_ENTRY, event=#wxCommand{type=command_text_enter,cmdS
 	    wxStatusBar:setStatusText(SB, "Not found"),
 	    Pid ! {mark_search_hit, Find#find.start},
 	    wxListCtrl:refreshItem(Grid, Find#find.start),
-	    {noreply, State#state{search=Search#search{find=#find{found=false}}}};
+	    {noreply, State#state{search=Search#search{find=Find#find{found=false}}}};
 	Row ->
 	    wxListCtrl:ensureVisible(Grid, Row),
 	    wxListCtrl:refreshItem(Grid, Row),
@@ -453,7 +456,7 @@ get_attr(Table, Item) ->
     Ref = erlang:monitor(process, Table),
     Table ! {get_attr, self(), Item},
     receive
-	{'DOWN', Ref, _, _, _} -> "";
+	{'DOWN', Ref, _, _, _} -> wx:null();
 	{Table, Res} ->
 	    erlang:demonitor(Ref),
 	    Res
@@ -594,7 +597,7 @@ keysort(Col, Table) ->
     lists:sort(Sort, Table).
 
 search([Str, Row, Dir0, CaseSens],
-       S=#holder{parent=Parent, table=Table}) ->
+       S=#holder{parent=Parent, table=Table0}) ->
     Opt = case CaseSens of
 	      true -> [];
 	      false -> [caseless]
@@ -605,29 +608,35 @@ search([Str, Row, Dir0, CaseSens],
 	  end,
     Res = case re:compile(Str, Opt) of
 	      {ok, Re} ->
+		  Table =
+		      case Dir0 of
+			  true ->
+			      lists:nthtail(Row, Table0);
+			  false ->
+			      lists:reverse(lists:sublist(Table0, Row+1))
+		      end,
 		  search(Row, Dir, Re, Table);
 	      {error, _} -> false
 	  end,
     Parent ! {self(), Res},
     S#holder{search=Res}.
 
-search(Row, Dir, Re, Table) ->
-    Res = try lists:nth(Row+1, Table) of
-	      Term ->
-		  Str = format(Term),
-		  re:run(Str, Re)
-	  catch _:_ -> no_more
-	  end,
+search(Row, Dir, Re, [ [Term|_] |Table]) ->
+    Str = format(Term),
+    Res = re:run(Str, Re),
     case Res of
 	nomatch -> search(Row+Dir, Dir, Re, Table);
-	no_more -> false;
 	{match,_} -> Row
-    end.
+    end;
+search(_, _, _, []) ->
+    false.
 
 get_row(From, Row, Col, Table) ->
     case lists:nth(Row+1, Table) of
 	[Object|_] when Col =:= all ->
 	    From ! {self(), format(Object)};
+	[Object|_] when Col =:= all_multiline ->
+	    From ! {self(), io_lib:format("~p", [Object])};
 	[Object|_] when tuple_size(Object) >= Col ->
 	    From ! {self(), format(element(Col, Object))};
 	_ ->
@@ -747,6 +756,13 @@ format(List) when is_list(List) ->
     format_list(List);
 format(Bin) when is_binary(Bin), byte_size(Bin) > 100 ->
     io_lib:format("<<#Bin:~w>>", [byte_size(Bin)]);
+format(Bin) when is_binary(Bin) ->
+    try
+	true = printable_list(unicode:characters_to_list(Bin)),
+	io_lib:format("<<\"~ts\">>", [Bin])
+    catch _:_ ->
+	    io_lib:format("~w", [Bin])
+    end;
 format(Float) when is_float(Float) ->
     io_lib:format("~.3g", [Float]);
 format(Term) ->
@@ -762,7 +778,7 @@ format_tuple(_Tuple, 1, 0) ->
 format_list([]) -> "[]";
 format_list(List) ->
     case printable_list(List) of
-	true ->  io_lib:format("\"~ts\"", [List]);
+	true ->  io_lib:format("\"~ts\"", [map_printable_list(List)]);
 	false -> [$[ | make_list(List)]
     end.
 
@@ -771,6 +787,24 @@ make_list([Last]) ->
 make_list([Head|Tail]) ->
     [format(Head), $,|make_list(Tail)].
 
+map_printable_list([$\n|Cs]) ->
+    [$\\, $n|map_printable_list(Cs)];
+map_printable_list([$\r|Cs]) ->
+    [$\\, $r|map_printable_list(Cs)];
+map_printable_list([$\t|Cs]) ->
+    [$\\, $t|map_printable_list(Cs)];
+map_printable_list([$\v|Cs]) ->
+    [$\\, $v|map_printable_list(Cs)];
+map_printable_list([$\b|Cs]) ->
+    [$\\, $b|map_printable_list(Cs)];
+map_printable_list([$\f|Cs]) ->
+    [$\\, $f|map_printable_list(Cs)];
+map_printable_list([$\e|Cs]) ->
+    [$\\, $e|map_printable_list(Cs)];
+map_printable_list([]) -> [];
+map_printable_list([C|Cs]) ->
+    [C|map_printable_list(Cs)].
+
 %% printable_list([Char]) -> bool()
 %%  Return true if CharList is a list of printable characters, else
 %%  false.
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index e2b256d768..e433bea8c2 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -20,7 +20,7 @@
 -behaviour(wx_object).
 
 -export([start/0]).
--export([create_menus/2, get_attrib/1, get_tracer/0,
+-export([create_menus/2, get_attrib/1, get_tracer/0, set_status/1,
 	 create_txt_dialog/4, try_rpc/4, return_to_localnode/2]).
 
 -export([init/1, handle_event/2, handle_cast/2, terminate/2, code_change/3,
@@ -58,7 +58,8 @@
 	 perf_panel,
 	 active_tab,
 	 node,
-	 nodes
+	 nodes,
+	 prev_node=""
 	}).
 
 start() ->
@@ -73,6 +74,9 @@ create_menus(Object, Menus) when is_list(Menus) ->
 get_attrib(What) ->
     wx_object:call(observer, {get_attrib, What}).
 
+set_status(What) ->
+    wx_object:cast(observer, {status_bar, What}).
+
 get_tracer() ->
     wx_object:call(observer, get_tracer).
 
@@ -191,10 +195,13 @@ setup(#state{frame = Frame} = State) ->
 %%Callbacks
 handle_event(#wx{event=#wxNotebook{type=command_notebook_page_changing}},
 	     #state{active_tab=Previous, node=Node} = State) ->
-    Pid = get_active_pid(State),
-    Previous ! not_active,
-    Pid ! {active, Node},
-    {noreply, State#state{active_tab=Pid}};
+    case get_active_pid(State) of
+	Previous -> {noreply, State};
+	Pid ->
+	    Previous ! not_active,
+	    Pid ! {active, Node},
+	    {noreply, State#state{active_tab=Pid}}
+    end;
 
 handle_event(#wx{event = #wxClose{}}, State) ->
     {stop, normal, State};
@@ -258,20 +265,21 @@ handle_event(#wx{id = ?ID_CONNECT, event = #wxCommand{type = command_menu_select
 handle_event(#wx{id = ?ID_PING, event = #wxCommand{type = command_menu_selected}},
 	     #state{frame = Frame} = State) ->
     UpdState = case create_connect_dialog(ping, State) of
-		   cancel ->  State;
+		   cancel -> State;
 		   {value, Value} when is_list(Value) ->
 		       try
 			   Node = list_to_atom(Value),
 			   case net_adm:ping(Node) of
 			       pang ->
 				   create_txt_dialog(Frame, "Connect failed", "Pang", ?wxICON_EXCLAMATION),
-				   State;
+				   State#state{prev_node=Value};
 			       pong ->
-				   change_node_view(Node, State)
+				   State1 = change_node_view(Node, State),
+				   State1#state{prev_node=Value}
 			   end
 		       catch _:_ ->
 			       create_txt_dialog(Frame, "Connect failed", "Pang", ?wxICON_EXCLAMATION),
-			       State
+			       State#state{prev_node=Value}
 		       end
 	       end,
     {noreply, UpdState};
@@ -288,6 +296,10 @@ handle_event(Event, State) ->
     Pid ! Event,
     {noreply, State}.
 
+handle_cast({status_bar, Msg}, State=#state{status_bar=SB}) ->
+    wxStatusBar:setStatusText(SB, Msg),
+    {noreply, State};
+
 handle_cast(_Cast, State) ->
     {noreply, State}.
 
@@ -341,7 +353,7 @@ terminate(_Reason, #state{frame = Frame}) ->
     ok.
 
 code_change(_, _, State) ->
-    {stop, not_yet_implemented, State}.
+    {ok, State}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -401,7 +413,9 @@ connect2(NodeName, Opts, Cookie) ->
     end.
 
 change_node_view(Node, State) ->
-    get_active_pid(State) ! {active, Node},
+    Tab = get_active_pid(State),
+    Tab ! not_active,
+    Tab ! {active, Node},
     StatusText = ["Observer - " | atom_to_list(Node)],
     wxFrame:setTitle(State#state.frame, StatusText),
     wxStatusBar:setStatusText(State#state.status_bar, StatusText),
@@ -439,8 +453,8 @@ pid2panel(Pid, #state{pro_panel=Pro, sys_panel=Sys,
     end.
 
 
-create_connect_dialog(ping, #state{frame = Frame}) ->
-    Dialog = wxTextEntryDialog:new(Frame, "Connect to node"),
+create_connect_dialog(ping, #state{frame = Frame, prev_node=Prev}) ->
+    Dialog = wxTextEntryDialog:new(Frame, "Connect to node", [{value, Prev}]),
     case wxDialog:showModal(Dialog) of
 	?wxID_OK ->
 	    Value = wxTextEntryDialog:getValue(Dialog),
@@ -560,7 +574,16 @@ remove_menu_items([], _MB) ->
     ok.
 
 get_nodes() ->
-    Nodes = [node()| nodes()],
+    Nodes0 = case erlang:is_alive() of
+		false -> [];
+		true  ->
+		    case net_adm:names() of
+			{error, _} -> nodes();
+			{ok, Names} ->
+			    epmd_nodes(Names) ++ nodes()
+		    end
+	     end,
+    Nodes = lists:usort(Nodes0),
     {_, Menues} =
 	lists:foldl(fun(Node, {Id, Acc}) when Id < ?LAST_NODES_MENU_ID ->
 			    {Id + 1, [#create_menu{id=Id + ?FIRST_NODES_MENU_ID,
@@ -568,6 +591,10 @@ get_nodes() ->
 		    end, {1, []}, Nodes),
     {Nodes, lists:reverse(Menues)}.
 
+epmd_nodes(Names) ->
+    [_, Host] = string:tokens(atom_to_list(node()),"@"),
+    [list_to_atom(Name ++ [$@|Host]) || {Name, _} <- Names].
+
 update_node_list(State = #state{menubar=MenuBar}) ->
     {Nodes, NodesMenuItems} = get_nodes(),
     NodeMenuId = wxMenuBar:findMenu(MenuBar, "Nodes"),
diff --git a/lib/observer/test/Makefile b/lib/observer/test/Makefile
index bf99f07081..9df0591da5 100644
--- a/lib/observer/test/Makefile
+++ b/lib/observer/test/Makefile
@@ -82,11 +82,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) observer.spec $(EMAKEFILE) \
 		$(COVERFILE) $(ERL_FILES) \
-		$(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+		"$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
 
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 5bbce9d076..6f882d0be9 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -414,6 +414,10 @@ special(Port,File) ->
 		_ ->
 		    ok
 	    end;
+	".strangemodname" ->
+	    AllMods = contents(Port,"loaded_modules"),
+	    open_all_modules(Port,AllMods),
+	    ok;
 	%%! No longer needed - all atoms are shown on one page!!
 	%% ".250atoms" ->
 	%%     Html1 = contents(Port,"atoms"),
@@ -496,6 +500,26 @@ expand_binary_link(Html) ->
 	    expand_binary_link(T)
     end.
 
+open_all_modules(Port,Modules) ->
+    case get_first_module(Modules) of
+	{Module,Rest} ->
+	    ModuleDetails = contents(Port,"loaded_mod_details?mod=" ++ Module),
+            ModTitle = http_uri:decode(Module),
+	    ModTitle = title(ModuleDetails),
+	    open_all_modules(Port,Rest);
+	false ->
+	    ok
+    end.
+
+get_first_module([]) ->
+    false;
+get_first_module(Html) ->
+    case Html of
+	"<TD><A HREF=\"loaded_mod_details?mod=" ++ Rest ->
+	    {string:sub_word(Rest,1,$"),Rest};
+	 [_H|T] ->
+	    get_first_module(T)
+    end.
 
 %% next_link(Html) ->
 %%     case Html of
@@ -565,7 +589,7 @@ create_dumps(DataDir,[Rel|Rels],Acc) ->
     Fun = fun() -> do_create_dumps(DataDir,Rel) end,
     Pa = filename:dirname(code:which(?MODULE)),
     {SlAllocDumps,Dumps,DosDump} = 
-	?t:run_on_shielded_node(Fun, compat_rel(Rel) ++ "-pa " ++ Pa),
+	?t:run_on_shielded_node(Fun, compat_rel(Rel) ++ "-pa \"" ++ Pa ++ "\""),
     create_dumps(DataDir,Rels,SlAllocDumps ++ Dumps ++ Acc ++ DosDump);
 create_dumps(_DataDir,[],Acc) ->
     Acc.
@@ -590,7 +614,8 @@ do_create_dumps(DataDir,Rel) ->
     case Rel of
 	current ->
 	    CD3 = dump_with_args(DataDir,Rel,"instr","+Mim true"),
-	    {SlAllocDumps, [CD1,CD2,CD3], DosDump};
+	    CD4 = dump_with_strange_module_name(DataDir,Rel,"strangemodname"),
+	    {SlAllocDumps, [CD1,CD2,CD3,CD4], DosDump};
 	_ ->
 	    {SlAllocDumps, [CD1,CD2], DosDump}
     end.
@@ -600,7 +625,7 @@ do_create_dumps(DataDir,Rel) ->
 %% not connected node, and with monitors and links between nodes.
 full_dist_dump(DataDir,Rel) ->
     Opt = rel_opt(Rel),
-    Pz = "-pz " ++ filename:dirname(code:which(?MODULE)),
+    Pz = "-pz \"" ++ filename:dirname(code:which(?MODULE)) ++ "\"",
     PzOpt = [{args,Pz}],
     {ok,N1} = ?t:start_node(n1,peer,Opt ++ PzOpt),
     {ok,N2} = ?t:start_node(n2,peer,Opt ++ PzOpt),
@@ -648,7 +673,22 @@ dump_with_args(DataDir,Rel,DumpName,Args) ->
     ?t:stop_node(n1),
     CD.
 
+%% This dump is added to test OTP-10090 - regarding URL encoding of
+%% module names in the module detail link.
+dump_with_strange_module_name(DataDir,Rel,DumpName) ->
+    Opt = rel_opt(Rel),
+    {ok,N1} = ?t:start_node(n1,peer,Opt),
 
+    Mod = '<mod ule#with?strange%name>',
+    File = atom_to_list(Mod) ++ ".erl",
+    Forms = [{attribute,1,file,{File,1}},
+	     {attribute,1,module,Mod},
+	     {eof,4}],
+    {ok,Mod,Bin} = rpc:call(N1,compile,forms,[Forms,[binary]]),
+    {module,Mod} = rpc:call(N1,code,load_binary,[Mod,File,Bin]),
+    CD = dump(N1,DataDir,Rel,DumpName),
+    ?t:stop_node(n1),
+    CD.
 
 dump(Node,DataDir,Rel,DumpName) ->
     rpc:call(Node,erlang,halt,[DumpName]),
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index 4eb10ae4e8..32e13004b6 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 1.1
+OBSERVER_VSN = 1.2
diff --git a/lib/odbc/aclocal.m4 b/lib/odbc/aclocal.m4
index 339a15a2bb..9578cd35c4 100644
--- a/lib/odbc/aclocal.m4
+++ b/lib/odbc/aclocal.m4
@@ -1,7 +1,7 @@
 dnl
 dnl %CopyrightBegin%
 dnl
-dnl Copyright Ericsson AB 1998-2011. All Rights Reserved.
+dnl Copyright Ericsson AB 1998-2012. All Rights Reserved.
 dnl
 dnl The contents of this file are subject to the Erlang Public License,
 dnl Version 1.1, (the "License"); you may not use this file except in
@@ -59,6 +59,7 @@ AC_ARG_VAR(erl_xcomp_isysroot, [Absolute cross system root include path (only us
 
 dnl Cross compilation variables
 AC_ARG_VAR(erl_xcomp_bigendian, [big endian system: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_double_middle_endian, [double-middle-endian system: yes|no (only used when cross compiling)])
 AC_ARG_VAR(erl_xcomp_linux_clock_gettime_correction, [clock_gettime() can be used for time correction: yes|no (only used when cross compiling)])
 AC_ARG_VAR(erl_xcomp_linux_nptl, [have Native POSIX Thread Library: yes|no (only used when cross compiling)])
 AC_ARG_VAR(erl_xcomp_linux_usable_sigusrx, [SIGUSR1 and SIGUSR2 can be used: yes|no (only used when cross compiling)])
@@ -606,6 +607,103 @@ ifelse([$5], , , [$5
 fi
 ])
 
+dnl ----------------------------------------------------------------------
+dnl
+dnl AC_DOUBLE_MIDDLE_ENDIAN
+dnl
+dnl Checks whether doubles are represented in "middle-endian" format.
+dnl Sets ac_cv_double_middle_endian={no,yes,unknown} accordingly,
+dnl as well as DOUBLE_MIDDLE_ENDIAN.
+dnl
+dnl
+
+AC_DEFUN([AC_C_DOUBLE_MIDDLE_ENDIAN],
+[AC_CACHE_CHECK(whether double word ordering is middle-endian, ac_cv_c_double_middle_endian,
+[# It does not; compile a test program.
+AC_RUN_IFELSE(
+[AC_LANG_SOURCE([[#include <stdlib.h>
+
+int
+main(void)
+{
+  int i = 0;
+  int zero = 0;
+  int bigendian;
+  int zero_index = 0;
+
+  union
+  {
+    long int l;
+    char c[sizeof (long int)];
+  } u;
+
+  /* we'll use the one with 32-bit words */
+  union
+  {
+    double d;
+    unsigned int c[2];
+  } vint;
+
+  union
+  {
+    double d;
+    unsigned long c[2];
+  } vlong;
+
+  union
+  {
+    double d;
+    unsigned short c[2];
+  } vshort;
+
+
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  u.l = 1;
+  bigendian = (u.c[sizeof (long int) - 1] == 1);
+
+  zero_index = bigendian ? 1 : 0;
+
+  vint.d = 1.0;
+  vlong.d = 1.0;
+  vshort.d = 1.0;
+
+  if (sizeof(unsigned int) == 4)
+    {
+      if (vint.c[zero_index] != 0)
+	zero = 1;
+    }
+  else if (sizeof(unsigned long) == 4)
+    {
+      if (vlong.c[zero_index] != 0)
+	zero = 1;
+    }
+  else if (sizeof(unsigned short) == 4)
+    {
+      if (vshort.c[zero_index] != 0)
+	zero = 1;
+    }
+
+  exit (zero);
+}
+]])],
+	      [ac_cv_c_double_middle_endian=no],
+	      [ac_cv_c_double_middle_endian=yes],
+	      [ac_cv_c_double_middle=unknown])])
+case $ac_cv_c_double_middle_endian in
+  yes)
+    m4_default([$1],
+      [AC_DEFINE([DOUBLE_MIDDLE_ENDIAN], 1,
+	[Define to 1 if your processor stores the words in a double in
+	 middle-endian format (like some ARMs).])]) ;;
+  no)
+    $2 ;;
+  *)
+    m4_default([$3],
+      [AC_MSG_WARN([unknown double endianness
+presetting ac_cv_c_double_middle_endian=no (or yes) will help])]) ;;
+esac
+])# AC_C_DOUBLE_MIDDLE_ENDIAN
+
 
 dnl ----------------------------------------------------------------------
 dnl
@@ -642,11 +740,16 @@ dnl Try to find POSIX threads
 dnl The usual pthread lib...
     AC_CHECK_LIB(pthread, pthread_create, THR_LIBS="-lpthread")
 
-dnl FreeBSD has pthreads in special c library, c_r...
+dnl Very old versions of FreeBSD have pthreads in special c library, c_r...
     if test "x$THR_LIBS" = "x"; then
 	AC_CHECK_LIB(c_r, pthread_create, THR_LIBS="-lc_r")
     fi
 
+dnl QNX has pthreads in standard C library
+    if test "x$THR_LIBS" = "x"; then
+	AC_CHECK_FUNC(pthread_create, THR_LIBS="none_needed")
+    fi
+
 dnl On ofs1 the '-pthread' switch should be used
     if test "x$THR_LIBS" = "x"; then
 	AC_MSG_CHECKING([if the '-pthread' switch can be used])
@@ -667,6 +770,9 @@ dnl On ofs1 the '-pthread' switch should be used
     if test "x$THR_LIBS" != "x"; then
 	THR_DEFS="$THR_DEFS -D_THREAD_SAFE -D_REENTRANT -DPOSIX_THREADS"
 	THR_LIB_NAME=pthread
+	if test "x$THR_LIBS" = "xnone_needed"; then
+	    THR_LIBS=
+	fi
 	case $host_os in
 	    solaris*)
 		THR_DEFS="$THR_DEFS -D_POSIX_PTHREAD_SEMANTICS" ;;
@@ -1337,6 +1443,14 @@ if test "$ac_cv_c_bigendian" = "yes"; then
     AC_DEFINE(ETHR_BIGENDIAN, 1, [Define if bigendian])
 fi
 
+case X$erl_xcomp_double_middle_endian in
+    X) ;;
+    Xyes|Xno|Xunknown) ac_cv_c_double_middle_endian=$erl_xcomp_double_middle_endian;;
+    *) AC_MSG_ERROR([Bad erl_xcomp_double_middle_endian value: $erl_xcomp_double_middle_endian]);;
+esac
+
+AC_C_DOUBLE_MIDDLE_ENDIAN
+
 AC_ARG_ENABLE(native-ethr-impls,
 	      AS_HELP_STRING([--disable-native-ethr-impls],
                              [disable native ethread implementations]),
diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
index 3a96a53ef8..026da39e6f 100644
--- a/lib/odbc/c_src/Makefile.in
+++ b/lib/odbc/c_src/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -128,12 +128,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 ifdef EXE_TARGET
-	$(INSTALL_DIR) $(RELSYSDIR)/c_src
-	$(INSTALL_DATA) $(C_FILES) $(H_FILES) $(RELSYSDIR)/c_src
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
-	$(INSTALL_PROGRAM) $(EXE_TARGET) $(RELSYSDIR)/priv/bin
+	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+	$(INSTALL_DATA) $(C_FILES) $(H_FILES) "$(RELSYSDIR)/c_src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+	$(INSTALL_PROGRAM) $(EXE_TARGET) "$(RELSYSDIR)/priv/bin"
 endif
 
 release_docs_spec:
diff --git a/lib/odbc/c_src/odbcserver.c b/lib/odbc/c_src/odbcserver.c
index ab2d7fe210..4a7a5224e5 100644
--- a/lib/odbc/c_src/odbcserver.c
+++ b/lib/odbc/c_src/odbcserver.c
@@ -104,6 +104,7 @@
 
 #ifdef UNIX
 #include <unistd.h>
+#include <netinet/tcp.h>
 #endif 
 
 #if defined WIN32
@@ -152,7 +153,7 @@ static db_result_msg db_describe_table(byte *sql, db_state *state);
 /* ------------- Encode/decode functions -------- ------------------------*/
 
 static db_result_msg encode_empty_message(void);
-static db_result_msg encode_error_message(char *reason);
+static db_result_msg encode_error_message(char *reason, char *errCode, SQLINTEGER nativeError);
 static db_result_msg encode_atom_message(char *atom);
 static db_result_msg encode_result(db_state *state);
 static db_result_msg encode_result_set(SQLSMALLINT num_of_columns,
@@ -176,7 +177,7 @@ static void encode_column_dyn(db_column column, int column_nr,
 static void encode_data_type(SQLSMALLINT sql_type, SQLINTEGER size,
 			     SQLSMALLINT decimal_digits, db_state *state);
 static Boolean decode_params(db_state *state, byte *buffer, int *index, param_array **params,
-			  int i, int j);
+			     int i, int j, int num_param_values);
 
 /*------------- Erlang port communication functions ----------------------*/
 
@@ -201,6 +202,7 @@ static byte *receive_msg(int socket);
 static Boolean receive_msg_part(int socket, byte * buffer, size_t msg_len);
 static Boolean send_msg_part(int socket, byte * buffer, size_t msg_len);
 static void close_socket(int socket); 
+static void tcp_nodelay(int sock);
 #endif
 static void clean_socket_lib(void);
 
@@ -212,6 +214,7 @@ static db_column * alloc_column_buffer(int n);
 static void free_column_buffer(db_column **columns, int n);
 static void free_params(param_array **params, int cols);
 static void clean_state(db_state *state);
+static SQLLEN* alloc_strlen_indptr(int n, int val);
 
 /* ------------- Init/map/bind/retrive functions -------------------------*/
 
@@ -227,7 +230,7 @@ static void init_param_statement(int cols,
 
 static void map_dec_num_2_c_column(col_type *type, int precision,
 				   int scale);
-static db_result_msg map_sql_2_c_column(db_column* column);
+static db_result_msg map_sql_2_c_column(db_column* column, db_state *state);
 
 
 static param_array * bind_parameter_arrays(byte *buffer, int *index,
@@ -243,7 +246,7 @@ static db_result_msg retrive_scrollable_cursor_support_info(db_state
 static int num_out_params(int num_of_params, param_array* params);
 /* ------------- Error handling functions --------------------------------*/
 
-static diagnos get_diagnos(SQLSMALLINT handleType, SQLHANDLE handle);
+static diagnos get_diagnos(SQLSMALLINT handleType, SQLHANDLE handle, Boolean extendedErrors);
 
 /* ------------- Boolean functions ---------------------------------------*/
 
@@ -346,7 +349,7 @@ DWORD WINAPI database_handler(const char *port)
     byte *request_buffer = NULL;
     db_state state =
     {NULL, NULL, NULL, NULL, 0, {NULL, 0, 0},
-     FALSE, FALSE, FALSE, FALSE, FALSE, FALSE};
+     FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE};
     byte request_id;
 #ifdef WIN32
     SOCKET socket;
@@ -435,14 +438,16 @@ static db_result_msg db_connect(byte *args, db_state *state)
     diagnos diagnos;
     byte *connStrIn; 
     int erl_auto_commit_mode, erl_trace_driver,
-	    use_srollable_cursors, tuple_row_state, binary_strings;
+	    use_srollable_cursors, tuple_row_state, binary_strings,
+	    extended_errors;
   
     erl_auto_commit_mode = args[0];
     erl_trace_driver = args[1];
     use_srollable_cursors = args[2];
     tuple_row_state = args[3];
     binary_strings = args[4];
-    connStrIn = args + 5 * sizeof(byte);
+    extended_errors = args[5];
+    connStrIn = args + 6 * sizeof(byte);
 
     if(tuple_row_state == ON) {
 	    tuple_row(state) = TRUE;  
@@ -462,6 +467,12 @@ static db_result_msg db_connect(byte *args, db_state *state)
 	    use_srollable_cursors(state) = FALSE;
     }
 
+    if(extended_errors == ON) {
+	    extended_errors(state) = TRUE;
+    } else {
+	    extended_errors(state) = FALSE;
+    }
+
     init_driver(erl_auto_commit_mode, erl_trace_driver, state); 
       
     connlen = (SQLSMALLINT)strlen((const char*)connStrIn);
@@ -472,10 +483,10 @@ static db_result_msg db_connect(byte *args, db_state *state)
 			      &stringlength2ptr, SQL_DRIVER_NOPROMPT);
   
     if (!sql_success(result)) {
-	diagnos = get_diagnos(SQL_HANDLE_DBC, connection_handle(state));
+	diagnos = get_diagnos(SQL_HANDLE_DBC, connection_handle(state), extended_errors(state));
 	strcat((char *)diagnos.error_msg,
 	       " Connection to database failed.");
-	msg = encode_error_message(diagnos.error_msg);
+	msg = encode_error_message(diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError );
     
 	if(!sql_success(SQLFreeHandle(SQL_HANDLE_DBC,
 				      connection_handle(state))))
@@ -506,8 +517,8 @@ static db_result_msg db_close_connection(db_state *state)
     result = SQLDisconnect(connection_handle(state));
                        
     if (!sql_success(result)) {
-	diagnos = get_diagnos(SQL_HANDLE_DBC, connection_handle(state));
-	return encode_error_message(diagnos.error_msg);
+	diagnos = get_diagnos(SQL_HANDLE_DBC, connection_handle(state), extended_errors(state));
+	return encode_error_message(diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError);
     }
 
     if(!sql_success(SQLFreeHandle(SQL_HANDLE_DBC,
@@ -533,8 +544,8 @@ static db_result_msg db_end_tran(byte compleationtype, db_state *state)
 			(SQLSMALLINT)compleationtype);
 
     if (!sql_success(result)) {
-	diagnos = get_diagnos(SQL_HANDLE_DBC, connection_handle(state));
-	return encode_error_message(diagnos.error_msg);
+	diagnos = get_diagnos(SQL_HANDLE_DBC, connection_handle(state), extended_errors(state));
+	return encode_error_message(diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError);
     } else {
 	return encode_atom_message("ok");
     }
@@ -569,7 +580,7 @@ static db_result_msg db_query(byte *sql, db_state *state)
     
     /* SQL_SUCCESS_WITH_INFO at this point may indicate an error in user input. */
     if (result != SQL_SUCCESS && result != SQL_NO_DATA_FOUND) {
-	    diagnos =  get_diagnos(SQL_HANDLE_STMT, statement_handle(state));
+	    diagnos =  get_diagnos(SQL_HANDLE_STMT, statement_handle(state), extended_errors(state));
 	    if(strcmp((char *)diagnos.sqlState, INFO) == 0) { 
 		    is_error[0] = 0;
 		    strncat((char *)is_error, (char *)diagnos.error_msg, 
@@ -580,12 +591,12 @@ static db_result_msg db_query(byte *sql, db_state *state)
 		       it as we want a nice and clean Erlang API  */
 		    if((strcmp((char *)is_error, "error") == 0))
 		    { 
- 			    msg = encode_error_message((char *)diagnos.error_msg); 
+			    msg = encode_error_message((char *)diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError);
  			    clean_state(state); 
 			    return msg;
 		    }  
 	    } else {
-		    msg = encode_error_message((char *)diagnos.error_msg); 
+		    msg = encode_error_message((char *)diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError);
 		    clean_state(state); 
 		    return msg;   
 	    }	    
@@ -658,9 +669,9 @@ static db_result_msg db_select_count(byte *sql, db_state *state)
     }
     
     if(!sql_success(SQLExecDirect(statement_handle(state), sql, SQL_NTS))) {
-	diagnos = get_diagnos(SQL_HANDLE_STMT, statement_handle(state));
+	diagnos = get_diagnos(SQL_HANDLE_STMT, statement_handle(state), extended_errors(state));
 	clean_state(state);
-	return encode_error_message(diagnos.error_msg);
+	return encode_error_message(diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError);
     }
   
     if(!sql_success(SQLNumResultCols(statement_handle(state),
@@ -800,13 +811,13 @@ static db_result_msg db_param_query(byte *buffer, db_state *state)
 
 	result = SQLExecDirect(statement_handle(state), sql, SQL_NTS);
 	if (!sql_success(result) || result == SQL_NO_DATA) {
-		diagnos = get_diagnos(SQL_HANDLE_STMT, statement_handle(state));
+		diagnos = get_diagnos(SQL_HANDLE_STMT, statement_handle(state), extended_errors(state));
 	}
 	/* SQL_NO_DATA and SQLSTATE 00000 indicate success for
 	   updates/deletes that affect no rows */
 	if(!sql_success(result) &&
 	   !(result == SQL_NO_DATA && !strcmp((char *)diagnos.sqlState, INFO))) {
-		msg = encode_error_message(diagnos.error_msg);
+		msg = encode_error_message(diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError);
 	} else {
 	    for (i = 0; i < param_status.params_processed; i++) {
 		switch (param_status.param_status_array[i]) {
@@ -820,8 +831,8 @@ static db_result_msg db_param_query(byte *buffer, db_state *state)
 		break;
 		default:
 		    diagnos =
-			get_diagnos(SQL_HANDLE_STMT, statement_handle(state));
-		    msg = encode_error_message(diagnos.error_msg);
+			get_diagnos(SQL_HANDLE_STMT, statement_handle(state), extended_errors(state));
+		    msg = encode_error_message(diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError);
 		    i = param_status.params_processed;
 		    break;
 		}
@@ -890,16 +901,16 @@ static db_result_msg db_describe_table(byte *sql, db_state *state)
 	DO_EXIT(EXIT_ALLOC);
     
     if (!sql_success(SQLPrepare(statement_handle(state), sql, SQL_NTS))){
-	diagnos =  get_diagnos(SQL_HANDLE_STMT, statement_handle(state));
-	msg = encode_error_message(diagnos.error_msg);
+	diagnos =  get_diagnos(SQL_HANDLE_STMT, statement_handle(state), extended_errors(state));
+	msg = encode_error_message(diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError);
 	clean_state(state);
 	return msg;
     }
     
     if(!sql_success(SQLNumResultCols(statement_handle(state),
 				     &num_of_columns))) {
-	diagnos =  get_diagnos(SQL_HANDLE_STMT, statement_handle(state));
-	msg = encode_error_message(diagnos.error_msg);
+	diagnos =  get_diagnos(SQL_HANDLE_STMT, statement_handle(state), extended_errors(state));
+	msg = encode_error_message(diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError);
 	clean_state(state);
 	return msg;
     }
@@ -948,7 +959,7 @@ static db_result_msg encode_empty_message(void)
 }
 
 /* Description: Encode an error-message to send back to erlang*/
-static db_result_msg encode_error_message(char *reason)
+static db_result_msg encode_error_message(char *reason, char *errCode, SQLINTEGER nativeError )
 {
     int index;
     db_result_msg msg;
@@ -957,6 +968,12 @@ static db_result_msg encode_error_message(char *reason)
     ei_encode_version(NULL, &index);
     ei_encode_tuple_header(NULL, &index, 2);
     ei_encode_atom(NULL, &index, "error");
+    if (errCode)
+    {
+        ei_encode_tuple_header(NULL, &index, 3);
+        ei_encode_string(NULL, &index, errCode);
+        ei_encode_long(NULL, &index, nativeError);
+    }
     ei_encode_string(NULL, &index, reason);
   
     msg.length = index;
@@ -967,6 +984,12 @@ static db_result_msg encode_error_message(char *reason)
     ei_encode_version((char *)msg.buffer, &index);
     ei_encode_tuple_header((char *)msg.buffer, &index, 2);
     ei_encode_atom((char *)msg.buffer, &index, "error");
+    if (errCode)
+    {
+        ei_encode_tuple_header((char *)msg.buffer, &index, 3);
+        ei_encode_string((char *)msg.buffer, &index, errCode);
+        ei_encode_long((char *)msg.buffer, &index, nativeError);
+    }
     ei_encode_string((char *)msg.buffer, &index, reason);
   
     return msg;
@@ -1010,8 +1033,8 @@ static db_result_msg encode_result(db_state *state)
     
     if(!sql_success(SQLNumResultCols(statement_handle(state), 
   				     &num_of_columns))) { 
-	    diagnos =  get_diagnos(SQL_HANDLE_STMT, statement_handle(state));
-	    msg = encode_error_message(diagnos.error_msg);
+	    diagnos =  get_diagnos(SQL_HANDLE_STMT, statement_handle(state), extended_errors(state));
+	    msg = encode_error_message(diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError);
 	    clean_state(state);
 	    return msg;
     } 
@@ -1027,8 +1050,8 @@ static db_result_msg encode_result(db_state *state)
     }
     
     if(!sql_success(SQLRowCount(statement_handle(state), &RowCountPtr))) { 
-	    diagnos =  get_diagnos(SQL_HANDLE_STMT, statement_handle(state));
-	    msg = encode_error_message(diagnos.error_msg);
+	    diagnos =  get_diagnos(SQL_HANDLE_STMT, statement_handle(state), extended_errors(state));
+	    msg = encode_error_message(diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError);
 	    clean_state(state);
 	    return msg;
     }
@@ -1157,7 +1180,7 @@ static db_result_msg encode_out_params(db_state *state,
                     break;
                 case SQL_C_BIT:
                     ei_x_encode_atom(&dynamic_buffer(state),
-                                     ((Boolean*)values)[j]==TRUE?"true":"false");
+                                     ((byte*)values)[j]==TRUE?"true":"false");
                     break;
                 default:
                     ei_x_encode_atom(&dynamic_buffer(state), "error");
@@ -1236,7 +1259,7 @@ static db_result_msg encode_column_name_list(SQLSMALLINT num_of_columns,
 	(columns(state)[i]).type.sql = sql_type;
 	(columns(state)[i]).type.col_size = size;
       
-	msg = map_sql_2_c_column(&columns(state)[i]);
+	msg = map_sql_2_c_column(&columns(state)[i], state);
 	if (msg.length > 0) {
 	    return msg; /* An error has occurred */
 	} else {
@@ -1579,37 +1602,48 @@ static void encode_data_type(SQLSMALLINT sql_type, SQLINTEGER size,
 }
 
 static Boolean decode_params(db_state *state, byte *buffer, int *index, param_array **params,
-			  int i, int j)
+			     int i, int j, int num_param_values)
 {
     int erl_type, size;
     long bin_size, l64;
     long val;
     param_array* param;
     TIMESTAMP_STRUCT* ts;
+    char atomarray[MAXATOMLEN+1];
     
     ei_get_type(buffer, index, &erl_type, &size);
     param = &(*params)[i];
 
+    if(erl_type == ERL_ATOM_EXT) {
+	ei_decode_atom(buffer, index, atomarray);
+	if(strncmp(atomarray, "null", 4) == 0 ) {
+	    param->offset += param->type.len;
+
+	    if(!param->type.strlen_or_indptr_array)
+		param->type.strlen_or_indptr_array = alloc_strlen_indptr(num_param_values, param->type.len);
+
+	    param->type.strlen_or_indptr_array[j] = SQL_NULL_DATA;
+	    return TRUE;
+	}
+    }
+
     switch (param->type.c) {
     case SQL_C_CHAR:
 	    if (binary_strings(state)) {
 		    ei_decode_binary(buffer, index,
 				     &(param->values.string[param->offset]), &bin_size);
 		    param->offset += param->type.len;
-		    param->type.strlen_or_indptr_array[j] = SQL_NTS;
 	    } else {
 		    if(erl_type != ERL_STRING_EXT) {
 			    return FALSE;
 		    }
 		    ei_decode_string(buffer, index, &(param->values.string[param->offset]));
 		    param->offset += param->type.len;
-		    param->type.strlen_or_indptr_array[j] = SQL_NTS;
 	    }
 	    break;
     case SQL_C_WCHAR:
 	    ei_decode_binary(buffer, index, &(param->values.string[param->offset]), &bin_size);
 	    param->offset += param->type.len;
-	    param->type.strlen_or_indptr_array[j] = SQL_NTS;
 	    break;
     case SQL_C_TYPE_TIMESTAMP:
 	    ts = (TIMESTAMP_STRUCT*) param->values.string;
@@ -1661,9 +1695,13 @@ static Boolean decode_params(db_state *state, byte *buffer, int *index, param_ar
 	if((erl_type != ERL_ATOM_EXT)) {
 		return FALSE;
 	}
-	ei_decode_boolean(buffer, index, &(param->values.bool[j]));
+	if (strncmp((char*)atomarray,"true",4) == 0)
+	    param->values.bool[j] = TRUE;
+	else if (strncmp((char*)atomarray,"false",5) == 0)
+	    param->values.bool[j] = FALSE;
+	else
+	    return -1;
 	break;
-	
     default:
 	    return FALSE;
     }
@@ -1766,6 +1804,10 @@ static int connect_to_erlang(const char *port)
 	sin6.sin6_addr = in6addr_loopback;
     
 	if (connect(sock, (struct sockaddr*)&sin6, sizeof(sin6)) == 0) {
+		/* Enable TCP_NODELAY to disable Nagel's socket algorithm. (Removes ~40ms delay on Redhat ES 6). */
+		#ifdef UNIX
+		tcp_nodelay(sock);
+		#endif
 		return sock;
 	}
 	close_socket(sock);
@@ -1781,9 +1823,24 @@ static int connect_to_erlang(const char *port)
 		close_socket(sock);
 		DO_EXIT(EXIT_SOCKET_CONNECT);
 	}
+
+	/* Enable TCP_NODELAY to disable Nagel's socket algorithm. (Removes ~40ms delay on Redhat ES 6). */
+	#ifdef UNIX
+	tcp_nodelay(sock);
+	#endif
 	return sock;
 }
 
+#ifdef UNIX
+static void tcp_nodelay(int sock)
+{
+	int flag = 1;
+        int result = setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int));
+	if (result < 0) {
+		DO_EXIT(EXIT_SOCKET_CONNECT);
+	}
+}
+#endif
 #ifdef WIN32
 static void close_socket(SOCKET socket)
 {
@@ -2014,6 +2071,18 @@ static void clean_state(db_state *state)
     nr_of_columns(state) = 0;
 }
  
+/* Allocates and fill with default value StrLen_or_IndPtr array */
+static SQLLEN* alloc_strlen_indptr(int n, int val)
+{
+    int i;
+    SQLLEN* arr = (SQLLEN*)safe_malloc(n * sizeof(SQLLEN));
+
+    for( i=0; i < n; ++i )
+	arr[i] = val;
+
+    return arr;
+}
+
 /* ------------- Init/map/bind/retrive functions  ------------------------*/
 
 /* Prepare the state for a connection */
@@ -2118,7 +2187,7 @@ static void init_param_column(param_array *params, byte *buffer, int *index,
 		(double *)safe_malloc(num_param_values * params->type.len);
 	} else if(params->type.c == SQL_C_CHAR) {
 	    params->type.strlen_or_indptr_array
-		= (SQLLEN*)safe_malloc(num_param_values * sizeof(SQLINTEGER));
+		= alloc_strlen_indptr(num_param_values, SQL_NTS);
 	    params->values.string =
 		(byte *)safe_malloc(num_param_values *
 				    sizeof(byte)* params->type.len);
@@ -2136,8 +2205,8 @@ static void init_param_column(param_array *params, byte *buffer, int *index,
 	 params->type.len = length+1;
 	 params->type.c = SQL_C_CHAR;
 	 params->type.col_size = (SQLUINTEGER)length;
-	 params->type.strlen_or_indptr_array =
-	     (SQLLEN*)safe_malloc(num_param_values * sizeof(SQLINTEGER));
+	 params->type.strlen_or_indptr_array
+	     = alloc_strlen_indptr(num_param_values, SQL_NTS);
 	 params->values.string =
 	    (byte *)safe_malloc(num_param_values *
 				sizeof(byte)* params->type.len);
@@ -2159,8 +2228,8 @@ static void init_param_column(param_array *params, byte *buffer, int *index,
 	params->type.len = (length+1)*sizeof(SQLWCHAR);
         params->type.c = SQL_C_WCHAR;
         params->type.col_size = (SQLUINTEGER)length;
-        params->type.strlen_or_indptr_array =
-          (SQLLEN*)safe_malloc(num_param_values * sizeof(SQLINTEGER));
+	params->type.strlen_or_indptr_array
+	    = alloc_strlen_indptr(num_param_values, SQL_NTS);
         params->values.string =
           (byte *)safe_malloc(num_param_values * sizeof(byte) * params->type.len);
 	
@@ -2201,10 +2270,10 @@ static void init_param_column(param_array *params, byte *buffer, int *index,
     case USER_BOOLEAN:
 	params->type.sql = SQL_BIT;
 	params->type.c = SQL_C_BIT;
-	params->type.len = sizeof(Boolean);
+	params->type.len = sizeof(byte);
 	params->type.col_size = params->type.len;
 	params->values.bool =
-	    (Boolean *)safe_malloc(num_param_values * params->type.len);
+		(byte *)safe_malloc(num_param_values * params->type.len);
 	break;
     }
     params->offset = 0;
@@ -2297,7 +2366,7 @@ static void map_dec_num_2_c_column(col_type *type, int precision, int scale)
 
 /* Description: Transform SQL columntype to C columntype. Returns a dummy
  db_result_msg with length 0 on success and an errormessage otherwise.*/
-static db_result_msg map_sql_2_c_column(db_column* column)
+static db_result_msg map_sql_2_c_column(db_column* column, db_state *state)
 {
     db_result_msg msg;
 
@@ -2366,10 +2435,10 @@ static db_result_msg map_sql_2_c_column(db_column* column)
 	column -> type.strlen_or_indptr = (SQLLEN)NULL;
 	break;
     case SQL_UNKNOWN_TYPE:
-	msg = encode_error_message("Unknown column type");
+	msg = encode_error_message("Unknown column type", extended_error(state, ""), 0);
 	break;
     default:
-	msg = encode_error_message("Column type not supported");
+	msg = encode_error_message("Column type not supported", extended_error(state, ""), 0);
 	break;
     }
     return msg;
@@ -2411,7 +2480,7 @@ static param_array * bind_parameter_arrays(byte *buffer, int *index,
 	}
   
 	for (j = 0; j < num_param_values; j++) {
-	    if(!decode_params(state, buffer, index, &params, i, j)) {
+	    if(!decode_params(state, buffer, index, &params, i, j, num_param_values)) {
 		/* An input parameter was not of the expected type */  
 		free_params(&params, i);
 		return params;
@@ -2478,7 +2547,7 @@ static db_column retrive_binary_data(db_column column, int column_nr,
 
     while (result == SQL_SUCCESS_WITH_INFO) {
 
-	diagnos = get_diagnos(SQL_HANDLE_STMT, statement_handle(state));
+	diagnos = get_diagnos(SQL_HANDLE_STMT, statement_handle(state), extended_errors(state));
     
 	if(strcmp((char *)diagnos.sqlState, TRUNCATED) == 0) {
 	    outputlen = column.type.len - 1;
@@ -2565,10 +2634,10 @@ static db_result_msg more_result_sets(db_state *state)
 	/* As we found an error we do not care about any potential more result
 	   sets */
 	exists_more_result_sets(state) = FALSE;
-	diagnos = get_diagnos(SQL_HANDLE_STMT, statement_handle(state));
+	diagnos = get_diagnos(SQL_HANDLE_STMT, statement_handle(state), extended_errors(state));
 	strcat((char *)diagnos.error_msg,
 	       "Failed to create on of the result sets");
-	msg = encode_error_message(diagnos.error_msg);
+	msg = encode_error_message(diagnos.error_msg, extended_error(state, diagnos.sqlState), diagnos.nativeError);
 	return msg;
     }
 }
@@ -2585,7 +2654,7 @@ static Boolean sql_success(SQLRETURN result)
    diagnostic records scaning for error messages and the sqlstate.
    If this function is called when no error has ocurred only the sqlState
    field may be referenced.*/
-static diagnos get_diagnos(SQLSMALLINT handleType, SQLHANDLE handle)
+static diagnos get_diagnos(SQLSMALLINT handleType, SQLHANDLE handle, Boolean extendedErrors)
 {
     diagnos diagnos;
     SQLINTEGER nativeError;
@@ -2609,17 +2678,16 @@ static diagnos get_diagnos(SQLSMALLINT handleType, SQLHANDLE handle)
         result = SQLGetDiagRec(handleType, handle, record_nr, current_sql_state,
 			 &nativeError, current_errmsg_pos,
 							   (SQLSMALLINT)errmsg_buffer_size, &errmsg_size);
-	if(result != SQL_SUCCESS && result != SQL_NO_DATA) {
-
-      
-	    break;
-	} else {
+	if(result == SQL_SUCCESS) {
 	    /* update the sqlstate in the diagnos record, because the SQLGetDiagRec
 	       call succeeded */
 	    memcpy(diagnos.sqlState, current_sql_state, SQL_STATE_SIZE);
+	    diagnos.nativeError = nativeError;
 	    errmsg_buffer_size = errmsg_buffer_size - errmsg_size;
 	    acc_errmsg_size = acc_errmsg_size + errmsg_size;
 	    current_errmsg_pos = current_errmsg_pos + errmsg_size;
+	} else {
+	    break;
 	}
     }
     
@@ -2627,7 +2695,7 @@ static diagnos get_diagnos(SQLSMALLINT handleType, SQLHANDLE handle)
 	strcat((char *)diagnos.error_msg,
 	       "No SQL-driver information available.");
     }
-    else {
+    else if (!extendedErrors){
 	strcat(strcat((char *)diagnos.error_msg, " SQLSTATE IS: "),
 	       (char *)diagnos.sqlState);
     }
diff --git a/lib/odbc/c_src/odbcserver.h b/lib/odbc/c_src/odbcserver.h
index 56b6148777..71760189e7 100644
--- a/lib/odbc/c_src/odbcserver.h
+++ b/lib/odbc/c_src/odbcserver.h
@@ -145,6 +145,7 @@ typedef struct {
 
 typedef struct {
     SQLCHAR sqlState[SQL_STATE_SIZE];
+    SQLINTEGER nativeError;
     byte error_msg[MAX_ERR_MSG];
 } diagnos;
 
@@ -156,7 +157,7 @@ typedef struct {
 	byte *string;
 	SQLINTEGER *integer;
 	double *floating;
-	Boolean *bool;
+	byte *bool;
     }values;
 } param_array;
 
@@ -179,6 +180,7 @@ typedef struct {
     Boolean exists_more_result_sets;
     Boolean param_query;
     Boolean out_params;
+    Boolean extended_errors;
 } db_state;
 
 typedef enum {
@@ -198,3 +200,5 @@ typedef enum {
 #define exists_more_result_sets(db_state) (db_state -> exists_more_result_sets)
 #define param_query(db_state) (db_state -> param_query)
 #define out_params(db_state) (db_state -> out_params)
+#define extended_errors(db_state) (db_state -> extended_errors)
+#define extended_error(db_state, errorcode) ( extended_errors(state) ? errorcode : NULL )
diff --git a/lib/odbc/doc/src/Makefile b/lib/odbc/doc/src/Makefile
index 0d456085f3..53a855f182 100644
--- a/lib/odbc/doc/src/Makefile
+++ b/lib/odbc/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -125,13 +125,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml
index 08763163b8..7ba0307a45 100644
--- a/lib/odbc/doc/src/notes.xml
+++ b/lib/odbc/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,7 +31,27 @@
   <p>This document describes the changes made to the odbc application.
   </p>
 
-  <section><title>ODBC 2.10.12</title>
+  <section><title>ODBC 2.10.13</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Add support for NULL value in odbc:param_query</p>
+          <p>
+	    Support atom 'null' in odbc:param_query as database NULL
+	    value Fix "ODBC: received unexpected info:{tcp_closed,
+	    ...}" when connection is terminated. Fix possible access
+	    violation with 64bit ODBC. Thanks to Maxim Zrazhevskiy</p>
+          <p>
+	    Own Id: OTP-10206</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ODBC 2.10.12</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/odbc/doc/src/odbc.xml b/lib/odbc/doc/src/odbc.xml
index 8a58dc2848..0e3386b11f 100644
--- a/lib/odbc/doc/src/odbc.xml
+++ b/lib/odbc/doc/src/odbc.xml
@@ -74,8 +74,12 @@
     <code type="none">
  milliseconds() = integer() >= 0     </code>
     <code type="none">
- common_reason() = connection_closed | term() - some kind of
-                 explanation of what went wrong    </code>
+ common_reason() = connection_closed | extended_error() | term() - some kind of
+ explanation of what went wrong    </code>
+    <code type="none">
+ extended_error() = {string(), integer(), Reason} - extended error type with ODBC
+ and native database error codes, as well as the base reason that would have been
+ returned had extended_errors not been enabled. </code>
     <code type="none">
  string() = list of ASCII characters    </code>
     <code type="none">
@@ -143,7 +147,7 @@
         <d>All options has default values. </d>
         <v>option() = {auto_commit, on | off} | {timeout, milliseconds()}
 	| {binary_strings, on | off} | {tuple_row, on | off} | {scrollable_cursors, on | off} |
-	{trace_driver, on | off} </v>
+	{trace_driver, on | off} | {extended_errors, on | off} </v>
         <v>Ref = connection_reference() - should be used to access the connection. </v>
         <v>Reason = port_program_executable_not_found | common_reason()</v>
       </type>
@@ -196,6 +200,19 @@
           <p>For more information about the <c>ConnectStr</c> see
             description of the function SQLDriverConnect in [1].</p>
         </note>
+
+		  <p>The <c>extended_errors</c> option enables extended ODBC error
+			  information when an operation fails. Rather than returning <c>{error, Reason}</c>,
+			  the failing function will reutrn <c>{error, {ODBCErrorCode, NativeErrorCode, Reason}}</c>.
+			  Note that this information is probably of little use when writing database-independent code,
+			  but can be of assistance in providing more sophisticated error handling when dealing with
+			  a known underlying database.
+			 <list type="bulleted">
+				  <item><c>ODBCErrorCode</c> is the ODBC error string returned by the ODBC driver.</item>
+				  <item><c>NativeErrorCode</c> is the numberic error code returned by the underlying database. The possible values
+					  and their meanings are dependent on the database being used.</item>
+				  <item><c>Reason</c> is as per the <c>Reason</c> field when extended errors are not enabled.</item>
+		  </list></p>
       </desc>
     </func>
     <func>
@@ -203,7 +220,7 @@
       <fsummary>Closes a connection to a database. </fsummary>
       <type>
         <v>Ref = connection_reference()</v>
-        <v>Reason = process_not_owner_of_odbc_connection</v>
+        <v>Reason = process_not_owner_of_odbc_connection | extended_error()</v>
       </type>
       <desc>
         <p>Closes a connection to a database. This will also
diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile
index b48dd768c8..2af65cc757 100644
--- a/lib/odbc/src/Makefile
+++ b/lib/odbc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2009. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -108,13 +108,13 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXT_HRL_FILES) $(RELSYSDIR)/include 
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin	
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
-	$(RELSYSDIR)/ebin
+	"$(RELSYSDIR)/ebin"
 
 
 release_docs_spec:
diff --git a/lib/odbc/src/odbc.appup.src b/lib/odbc/src/odbc.appup.src
index 853323da09..c7c83ea079 100644
--- a/lib/odbc/src/odbc.appup.src
+++ b/lib/odbc/src/odbc.appup.src
@@ -1,12 +1,8 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
-  {"2.10.11", [{restart_application, odbc}]},
-  {"2.10.10", [{restart_application, odbc}]},
-  {"2.10.9", [{restart_application, odbc}]}
+  {<<"2\\.*">>,  [{restart_application, odbc}]}
  ],
  [
-  {"2.10.11", [{restart_application, odbc}]},
-  {"2.10.10", [{restart_application, odbc}]},
-  {"2.10.9", [{restart_application, odbc}]}
+  {<<"2\\.*">>,  [{restart_application, odbc}]}
  ]}.
diff --git a/lib/odbc/src/odbc.erl b/lib/odbc/src/odbc.erl
index 36afd1abcf..3eabec9ec3 100644
--- a/lib/odbc/src/odbc.erl
+++ b/lib/odbc/src/odbc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -451,7 +451,7 @@ init(Args) ->
     %% Start the port program (a c program) that utilizes the odbc driver 
     case os:find_executable(?SERVERPROG, ?SERVERDIR) of
 	FileName when is_list(FileName)->
-	    Port  = open_port({spawn, FileName},
+	    Port  = open_port({spawn, "\""++FileName++"\""},
 			      [{packet, ?LENGTH_INDICATOR_SIZE}, binary,
 			       exit_status]),
 	    State = #state{listen_sockets = 
@@ -755,7 +755,10 @@ handle_info({'DOWN', _Ref, _Type, _Process, shutdown}, State) ->
 handle_info({'DOWN', _Ref, _Type, Process, Reason}, State) ->
     {stop, {stopped, {'EXIT', Process, Reason}}, 
      State#state{reply_to = undefined}};
-    
+
+handle_info({tcp_closed, Socket}, State = #state{odbc_socket=Socket,
+						 state = disconnecting}) ->
+    {stop, normal, State};
 %---------------------------------------------------------------------------
 %% Catch all - throws away unknown messages (This could happen by "accident"
 %% so we do not want to crash, but we make a log entry as it is an
@@ -807,10 +810,11 @@ connect(ConnectionReferense, ConnectionStr, Options) ->
     {C_TupleRow, _} = 
 	connection_config(tuple_row, Options),
     {BinaryStrings, _} = connection_config(binary_strings, Options),
+    {ExtendedErrors, _} = connection_config(extended_errors, Options),
 
     ODBCCmd = 
 	[?OPEN_CONNECTION, C_AutoCommitMode, C_TraceDriver, 
-	 C_SrollableCursors, C_TupleRow, BinaryStrings, ConnectionStr],
+	 C_SrollableCursors, C_TupleRow, BinaryStrings, ExtendedErrors, ConnectionStr],
     
     %% Send request, to open a database connection, to the control process.
     case call(ConnectionReferense, 
@@ -857,6 +861,8 @@ connection_default(trace_driver) ->
 connection_default(scrollable_cursors) ->
     {?ON, on};
 connection_default(binary_strings) ->
+    {?OFF, off};
+connection_default(extended_errors) ->
     {?OFF, off}.
 
 %%-------------------------------------------------------------------------
@@ -942,9 +948,11 @@ fix_params({sql_bit, InOut, Values}) ->
 fix_params({'sql_timestamp', InOut, Values}) ->
     NewValues =
  	case (catch 
-		  lists:map(fun({{Year,Month,Day},{Hour,Minute,Second}}) -> 
-                                {Year,Month,Day,Hour,Minute,Second}
-                        end, Values)) of
+		  lists:map(
+		    fun({{Year,Month,Day},{Hour,Minute,Second}}) ->
+			    {Year,Month,Day,Hour,Minute,Second};
+		       (null) -> null
+		    end, Values)) of
  	    Result ->
  		Result
  	end,
@@ -960,15 +968,15 @@ fix_inout(out) ->
 fix_inout(inout) ->
     ?INOUT.
 
-string_terminate([Value| _ ] = Values) when is_list(Value)->
-    case (catch 
- 	      lists:map(fun(Str) -> Str ++ [?STR_TERMINATOR] end, Values)) of
-	Result ->
-	    Result
-    end;
-string_terminate([Value| _ ] = Values) when is_binary(Value)->
-    case (catch 
-  	      lists:map(fun(B) -> <<B/binary,0:16>> end, Values)) of
+string_terminate(Values) ->
+    case (catch lists:map(fun string_terminate_value/1, Values)) of
 	Result ->
 	    Result
     end.
+
+string_terminate_value(String) when is_list(String) ->
+    String ++ [?STR_TERMINATOR];
+string_terminate_value(Binary) when is_binary(Binary) ->
+    <<Binary/binary,0:16>>;
+string_terminate_value(null) ->
+    null.
diff --git a/lib/odbc/test/Makefile b/lib/odbc/test/Makefile
index bc6449242e..d45073281b 100644
--- a/lib/odbc/test/Makefile
+++ b/lib/odbc/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin% 
 # 
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -101,8 +101,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SPEC_FILES) $(COVER_FILE) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SPEC_FILES) $(COVER_FILE) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
 
 
 release_docs_spec:
diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index a076c4dfff..7d732f20f7 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -51,7 +51,7 @@ all() ->
 	     {group, client_dies}, connect_timeout, timeout,
 	     many_timeouts, timeout_reset, disconnect_on_timeout,
 	     connection_closed, disable_scrollable_cursors,
-	     return_rows_as_lists, api_missuse];
+	     return_rows_as_lists, api_missuse, extended_errors];
 	Other -> {skip, Other}
     end.
 
@@ -838,3 +838,33 @@ transaction_support_str(mysql) ->
     "ENGINE = InnoDB";
 transaction_support_str(_) ->
     "".
+
+
+%%-------------------------------------------------------------------------
+extended_errors(doc)->
+    ["Test the extended errors connection option: When off; the old behaviour of just an error "
+     "string is returned on error. When on, the error string is replaced by a 3 element tuple "
+     "that also exposes underlying ODBC provider error codes."];
+extended_errors(suite)  -> [];
+extended_errors(Config) when is_list(Config)->
+    Table = ?config(tableName, Config),
+    {ok, Ref} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
+    {updated, _} = odbc:sql_query(Ref, "create table " ++ Table ++" ( id integer, data varchar(10))"),
+
+    % Error case WITHOUT extended errors on...
+    case odbc:sql_query(Ref, "create table " ++ Table ++" ( id integer, data varchar(10))") of
+        {error, ErrorString} when is_list(ErrorString) -> ok
+    end,
+
+    % Now the test case with extended errors on - This should return a tuple, not a list/string now.
+    % The first element is a string that is the ODBC error string; the 2nd element is a native integer error
+    % code passed from the underlying provider driver. The last is the familiar old error string.
+    % We can't check the actual error code; as each different underlying provider will return
+    % a different value - So we just check the return types at least.
+    {ok, RefExtended} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options() ++ [{extended_errors, on}]),
+    case odbc:sql_query(RefExtended, "create table " ++ Table ++" ( id integer, data varchar(10))") of
+        {error, {ODBCCodeString, NativeCodeNum, ShortErrorString}} when is_list(ODBCCodeString), is_number(NativeCodeNum), is_list(ShortErrorString) -> ok
+    end,
+
+    ok = odbc:disconnect(Ref),
+    ok = odbc:disconnect(RefExtended).
diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl
index a8439d5fb6..e814cd2aca 100644
--- a/lib/odbc/test/odbc_test_lib.erl
+++ b/lib/odbc/test/odbc_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -29,6 +29,7 @@
 
 unique_table_name() ->                              
     lists:reverse(lists:foldl(fun($@, Acc) -> [$t, $A |Acc] ;
+				 ($-,Acc) -> Acc;
 				 (X, Acc) -> [X |Acc] end, 
 			      [], atom_to_list(node()))).
 
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index fb6e208a52..585b92b2d2 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1 +1 @@
-ODBC_VSN = 2.10.12
+ODBC_VSN = 2.10.14
diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile
index 064447f148..769c08a9e9 100644
--- a/lib/orber/COSS/CosNaming/Makefile
+++ b/lib/orber/COSS/CosNaming/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -141,11 +141,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/COSS/CosNaming
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) $(RELSYSDIR)/COSS/CosNaming
-	$(INSTALL_DATA) $(GEN_FILES) $(RELSYSDIR)/COSS/CosNaming
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
+	$(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming"
 
 
 release_docs_spec:
diff --git a/lib/orber/c_src/Makefile.in b/lib/orber/c_src/Makefile.in
index 56f0d57545..9970642a9f 100644
--- a/lib/orber/c_src/Makefile.in
+++ b/lib/orber/c_src/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -58,15 +58,9 @@ ifeq ($(findstring win32,$(TARGET)),win32)
 orber: 
 	echo "Nothing to build on NT"
 else
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-orber: 
-	echo "Nothing to build for VxWorks"
-
-else
 orber: 
 	echo "Nothing to build"	
 endif
-endif
 
 clean:
 
@@ -89,24 +83,16 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 ifeq ($(findstring win32,$(TARGET)),win32)
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/src
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/include
-	$(INSTALL_PROGRAM) $(CC_FILES) $(RELSYSDIR)/priv/src
-	$(INSTALL_PROGRAM) $(HH_FILES) $(RELSYSDIR)/priv/include
-else
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-release_spec:
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/src
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/include
-	$(INSTALL_PROGRAM) $(CC_FILES) $(RELSYSDIR)/priv/src
-	$(INSTALL_PROGRAM) $(HH_FILES) $(RELSYSDIR)/priv/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/include"
+	$(INSTALL_PROGRAM) $(CC_FILES) "$(RELSYSDIR)/priv/src"
+	$(INSTALL_PROGRAM) $(HH_FILES) "$(RELSYSDIR)/priv/include"
 else
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/src
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/include
-	$(INSTALL_DATA) $(CC_FILES) $(RELSYSDIR)/priv/src
-	$(INSTALL_DATA) $(HH_FILES) $(RELSYSDIR)/priv/include
-endif
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/include"
+	$(INSTALL_DATA) $(CC_FILES) "$(RELSYSDIR)/priv/src"
+	$(INSTALL_DATA) $(HH_FILES) "$(RELSYSDIR)/priv/include"
 endif
 
 
diff --git a/lib/orber/doc/src/Makefile b/lib/orber/doc/src/Makefile
index 68fbe3dce0..4cd7c45437 100644
--- a/lib/orber/doc/src/Makefile
+++ b/lib/orber/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -164,13 +164,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index 72cd808d20..d561199998 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/examples/Stack/Makefile b/lib/orber/examples/Stack/Makefile
index b985f348fa..f1a5106a7b 100644
--- a/lib/orber/examples/Stack/Makefile
+++ b/lib/orber/examples/Stack/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -118,8 +118,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/Stack
-	$(INSTALL_DATA) $(ERL_FILES) $(JAVA_FILES) $(CPP_FILES) $(IDL_FILES) $(RELSYSDIR)/examples/Stack
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/Stack"
+	$(INSTALL_DATA) $(ERL_FILES) $(JAVA_FILES) $(CPP_FILES) $(IDL_FILES) "$(RELSYSDIR)/examples/Stack"
 
 
 release_docs_spec:
diff --git a/lib/orber/java_src/Orber/Makefile b/lib/orber/java_src/Orber/Makefile
index 49da975a8b..f7f7336622 100644
--- a/lib/orber/java_src/Orber/Makefile
+++ b/lib/orber/java_src/Orber/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -63,8 +63,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/java_src/Orber
-	$(INSTALL_DATA) $(JAVA_FILES) $(RELSYSDIR)/java_src/Orber
+	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/Orber"
+	$(INSTALL_DATA) $(JAVA_FILES) "$(RELSYSDIR)/java_src/Orber"
 
 release_docs_spec:
 
diff --git a/lib/orber/priv/Makefile b/lib/orber/priv/Makefile
index af82177466..cd361e3f0a 100644
--- a/lib/orber/priv/Makefile
+++ b/lib/orber/priv/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2011. All Rights Reserved.
+# Copyright Ericsson AB 2001-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -58,8 +58,8 @@ clean:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(HELP_FILES) $(HTML_FILES) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(HELP_FILES) $(HTML_FILES) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
index d2e98686da..6eb659407d 100644
--- a/lib/orber/src/Makefile
+++ b/lib/orber/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -200,8 +200,7 @@ ERL_COMPILE_FLAGS += $(ERL_IDL_FLAGS) \
 	+'{attribute,insert,app_vsn,"orber_$(ORBER_VSN)"}' \
 	-D'ORBVSN="$(ORBER_VSN)"'
 
-ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize \
-	+nowarn_unused_record
+ASN_FLAGS = -bber +der +compact_bit_string +nowarn_unused_record
 
 # ----------------------------------------------------
 # Targets
@@ -254,12 +253,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include"
 
 
 release_docs_spec:
diff --git a/lib/orber/test/Makefile b/lib/orber/test/Makefile
index d4be009af3..2f8777c773 100644
--- a/lib/orber/test/Makefile
+++ b/lib/orber/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -209,12 +209,12 @@ release_spec:
 release_docs_spec:
 
 release_tests_spec: tests
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) $(COVER_FILE) \
-		$(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELSYSDIR)/$(IDLOUTDIR)
+		$(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
 	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-		$(RELSYSDIR)/$(IDLOUTDIR)
+		"$(RELSYSDIR)/$(IDLOUTDIR)"
 
diff --git a/lib/orber/test/csiv2_SUITE.erl b/lib/orber/test/csiv2_SUITE.erl
index 60ffa1eb09..b89bf0a56c 100644
--- a/lib/orber/test/csiv2_SUITE.erl
+++ b/lib/orber/test/csiv2_SUITE.erl
@@ -668,67 +668,57 @@ code_OpenSSL509_api(_Config) ->
 ssl_server_peercert_api(doc) -> ["Test ssl:peercert (server side)"];
 ssl_server_peercert_api(suite) -> [];
 ssl_server_peercert_api(_Config) ->
-    case os:type() of
-	vxworks ->
- 	    {skipped, "No SSL-support for VxWorks."};
-	_ ->
- 	    Options = orber_test_lib:get_options(iiop_ssl, server,
- 						 2, [{iiop_ssl_port, 0}]),
- 	    {ok, ServerNode, ServerHost} =
- 		?match({ok,_,_}, orber_test_lib:js_node(Options)),
- 	    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
- 	    SSLOptions = orber_test_lib:get_options(ssl, client),
-  	    {ok, Socket} =
- 		?match({ok, _}, fake_client_ORB(ssl, ServerHost, ServerPort, SSLOptions)),
- 	    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
-	    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
-	    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
-						%	    ?match({ok, #'Certificate'{}},
-						%		   'OrberCSIv2':decode('Certificate', PeerCert)),
- 	    destroy_fake_ORB(ssl, Socket),
- 	    ok
-    end.
+    Options = orber_test_lib:get_options(iiop_ssl, server,
+	2, [{iiop_ssl_port, 0}]),
+    {ok, ServerNode, ServerHost} =
+    ?match({ok,_,_}, orber_test_lib:js_node(Options)),
+    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
+    SSLOptions = orber_test_lib:get_options(ssl, client),
+    {ok, Socket} =
+    ?match({ok, _}, fake_client_ORB(ssl, ServerHost, ServerPort, SSLOptions)),
+    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
+    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
+    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
+    %	    ?match({ok, #'Certificate'{}},
+    %		   'OrberCSIv2':decode('Certificate', PeerCert)),
+    destroy_fake_ORB(ssl, Socket),
+    ok.
 
 ssl_client_peercert_api(doc) -> ["Test ssl:peercert (client side)"];
 ssl_client_peercert_api(suite) -> [];
 ssl_client_peercert_api(_Config) ->
-    case os:type() of
-	vxworks ->
- 	    {skipped, "No SSL-support for VxWorks."};
-	_ ->
- 	    Options = orber_test_lib:get_options(iiop_ssl, client,
- 						 2, [{iiop_ssl_port, 0}]),
- 	    {ok, ClientNode, _ClientHost} =
- 		?match({ok,_,_}, orber_test_lib:js_node(Options)),
- 	    crypto:start(),
- 	    ssl:start(),
- 	    SSLOptions = orber_test_lib:get_options(ssl, server),
- 	    {ok, LSock} = ?match({ok, _}, ssl:listen(0, SSLOptions)),
- 	    {ok, {_Address, LPort}} = ?match({ok, {_, _}}, ssl:sockname(LSock)),
- 	    IOR = ?match({'IOP_IOR',_,_},
- 			 iop_ior:create_external({1, 2}, "IDL:FAKE:1.0",
- 						 "localhost", 6004, "FAKE",
- 						 [#'IOP_TaggedComponent'
- 						  {tag=?TAG_SSL_SEC_TRANS,
- 						   component_data=#'SSLIOP_SSL'
- 						   {target_supports = 2,
- 						    target_requires = 2,
- 						    port = LPort}}])),
- 	    spawn(orber_test_lib, remote_apply,
- 		  [ClientNode, corba_object, non_existent, [IOR]]),
- 	    {ok, Socket} = ?match({ok, _}, ssl:transport_accept(LSock)),
- 	    ?match(ok, ssl:ssl_accept(Socket)),
-
- 	    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
-	    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
-	    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
-						%	    ?match({ok, #'Certificate'{}},
-						%		   'OrberCSIv2':decode('Certificate', PeerCert)),
- 	    ssl:close(Socket),
- 	    ssl:close(LSock),
- 	    ssl:stop(),
- 	    ok
-    end.
+    Options = orber_test_lib:get_options(iiop_ssl, client,
+	2, [{iiop_ssl_port, 0}]),
+    {ok, ClientNode, _ClientHost} =
+    ?match({ok,_,_}, orber_test_lib:js_node(Options)),
+    crypto:start(),
+    ssl:start(),
+    SSLOptions = orber_test_lib:get_options(ssl, server),
+    {ok, LSock} = ?match({ok, _}, ssl:listen(0, SSLOptions)),
+    {ok, {_Address, LPort}} = ?match({ok, {_, _}}, ssl:sockname(LSock)),
+    IOR = ?match({'IOP_IOR',_,_},
+	iop_ior:create_external({1, 2}, "IDL:FAKE:1.0",
+	    "localhost", 6004, "FAKE",
+	    [#'IOP_TaggedComponent'
+		{tag=?TAG_SSL_SEC_TRANS,
+		    component_data=#'SSLIOP_SSL'
+		    {target_supports = 2,
+			target_requires = 2,
+			port = LPort}}])),
+    spawn(orber_test_lib, remote_apply,
+	[ClientNode, corba_object, non_existent, [IOR]]),
+    {ok, Socket} = ?match({ok, _}, ssl:transport_accept(LSock)),
+    ?match(ok, ssl:ssl_accept(Socket)),
+
+    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
+    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
+    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
+    %	    ?match({ok, #'Certificate'{}},
+    %		   'OrberCSIv2':decode('Certificate', PeerCert)),
+    ssl:close(Socket),
+    ssl:close(LSock),
+    ssl:stop(),
+    ok.
 
 %%-----------------------------------------------------------------
 %% Local functions.
diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl
index 0ddde49cd6..6824d25aef 100644
--- a/lib/orber/test/orber_test_lib.erl
+++ b/lib/orber/test/orber_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -278,23 +278,13 @@ check_options(Options) ->
     end.
 
 starter(Host, Name, Args) ->
-    case os:type() of
-        vxworks ->
-            test_server:start_node(Name, slave, [{args,Args}]);
-        _ ->
-            slave:start_link(Host, Name, Args)
-    end.
+    io:format("slave:start_link(~p,~p,~p).~n",[Host,Name,Args]),
+    slave:start_link(Host, Name, Args).
 
 slave_sup() ->
     process_flag(trap_exit, true),
     receive
-        {'EXIT', _, _} ->
-            case os:type() of
-                vxworks ->
-                    erlang:halt();
-                _  ->
-                    ignore
-            end
+        {'EXIT', _, _} -> ignore
     end.
 
 start_ssl(true, Node) ->
@@ -403,8 +393,8 @@ create_paths() ->
         filename:join(Path, "idl_output") ++
 	" -pa " ++
         filename:join(Path, "all_SUITE_data") ++
-        " -pa " ++
-        filename:dirname(code:which(orber)).
+        " -pa \"" ++
+        filename:dirname(code:which(orber))++"\"".
 
 %%------------------------------------------------------------
 %% function : destroy_node
@@ -418,12 +408,7 @@ destroy_node(Node, Type) ->
     stopper(Node, Type).
 
 stopper(Node, _Type) ->
-    case os:type() of
-        vxworks ->
-            test_server:stop_node(Node);
-        _ ->
-            slave:stop(Node)
-    end.
+    slave:stop(Node).
 
 
 %%------------------------------------------------------------
diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
index bac0413ece..e728e43a09 100644
--- a/lib/os_mon/c_src/Makefile.in
+++ b/lib/os_mon/c_src/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -63,14 +63,10 @@ ENTRY_OBJ=$(ERL_TOP)/erts/obj/$(TARGET)/port_entry.o
 PORT_ENTRY_POINT=erl_port_entry
 ENTRY_LDFLAGS=-entry:$(PORT_ENTRY_POINT)
 else
-ifeq ($(findstring vxworks_simso,$(TARGET)),vxworks_simso)
-PROGRAMS =
-else
 PROGRAMS = \
 	memsup @os_mon_programs@
 C_FILES= $(PROGRAMS:%=%.c)
 endif
-endif
 
 TARGET_FILES= $(PROGRAMS:%=$(BINDIR)/%)
 
@@ -127,14 +123,10 @@ $(OBJDIR)/memsup.o: memsup.h
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifeq ($(findstring vxworks_simso,$(TARGET)),vxworks_simso)
-release_spec:
-else
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
-	$(INSTALL_PROGRAM) $(TARGET_FILES) $(RELSYSDIR)/priv/bin
-endif
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(C_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
+	$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"
 
 release_docs_spec:
diff --git a/lib/os_mon/c_src/cpu_sup.c b/lib/os_mon/c_src/cpu_sup.c
index 9c5f9a6aa5..7372d5b0e8 100644
--- a/lib/os_mon/c_src/cpu_sup.c
+++ b/lib/os_mon/c_src/cpu_sup.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2012. All Rights Reserved.
  * 
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -458,8 +458,18 @@ static void error(char* err_msg) {
    * if we get error here we have trouble,
    * silence unnecessary warnings
    */
-  if(write(FD_ERR, err_msg, strlen(err_msg)));
-  if(write(FD_ERR, "\n", 1));
+  char buffer[256] = "[os_mon] cpu supervisor port (cpu_sup): ";
+  int i = strlen(buffer), j = 0;
+  int n = strlen(err_msg);
+
+  while(i < 253 && j < n) {
+      buffer[i++] = err_msg[j++];
+  }
+  buffer[i++] = '\r';
+  buffer[i++] = '\n';
+
+  /* try to use one write only */
+  if(write(FD_ERR, buffer, i));
   exit(-1);
 }
 
diff --git a/lib/os_mon/c_src/memsup.c b/lib/os_mon/c_src/memsup.c
index 078f20ff98..3a1a8e9444 100644
--- a/lib/os_mon/c_src/memsup.c
+++ b/lib/os_mon/c_src/memsup.c
@@ -31,7 +31,7 @@
  *
  *  This program is started from Erlang as follows,
  *
- *      Port = open_port({spawn, 'memsup'}, [{packet,1}]) for UNIX and VxWorks
+ *      Port = open_port({spawn, 'memsup'}, [{packet,1}]) for UNIX
  *
  *  Erlang sends one of the request condes defined in memsup.h and this program
  *  answers in one of two ways:
@@ -75,10 +75,6 @@
  *  that there is no process at the other end of the connection
  *  having the connection open for writing (end-of-file).
  *
- *  COMPILING
- *
- *  When the target is VxWorks the identifier VXWORKS must be defined for
- *  the preprocessor (usually by a -D option).
  */
 
 #if defined(sgi) || defined(__sgi) || defined(__sgi__)
@@ -90,9 +86,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#ifndef VXWORKS
 #include <unistd.h>
-#endif
 
 #if (defined(__unix__) || defined(unix)) && !defined(USG)
 #include <sys/param.h>
@@ -104,12 +98,6 @@
 #include <time.h>
 #include <errno.h>
 
-#ifdef VXWORKS
-#include <vxWorks.h>
-#include <ioLib.h>
-#include <memLib.h>
-#endif
-
 #ifdef BSD4_4
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@ -143,20 +131,8 @@
 /*  prototypes */
 
 static void print_error(const char *,...);
-#ifdef VXWORKS
-extern int erl_mem_info_get(MEM_PART_STATS *);
-#endif
-
-#ifdef VXWORKS
-#define MAIN memsup
 
-static MEM_PART_STATS latest;
-static unsigned long latest_system_total; /* does not fit in the struct */
-
-#else
 #define MAIN main
-#endif
-
 
 /*
  * example, we want procfs information, now give them something equivalent: 
@@ -282,16 +258,6 @@ send_tag(int value){
     }
 }
 
-
-#ifdef VXWORKS
-static void load_statistics(void){
-    if(memPartInfoGet(memSysPartId,&latest) != OK)
-	memset(&latest,0,sizeof(latest));
-    latest_system_total = latest.numBytesFree + latest.numBytesAlloc;
-    erl_mem_info_get(&latest); /* if it fails, latest is untouched */
-}
-#endif
-
 #ifdef BSD4_4
 static int
 get_vmtotal(struct vmtotal *vt) {
@@ -358,19 +324,6 @@ get_mem_procfs(memory_ext *me){
 
 /* arch specific functions */
 
-#if defined(VXWORKS)
-static int
-get_extended_mem_vxwork(memory_ext *me) {
-    load_statistics();
-    me->total    = (latest.numBytesFree + latest.numBytesAlloc);
-    me->free     = latest.numBytesFree;
-    me->pagesize = 1;
-    me->flag     = F_MEM_TOTAL | F_MEM_FREE;
-    return 1;
-}
-#endif
-
-
 #if defined(__linux__) /* ifdef SYSINFO */
 /* sysinfo does not include cached memory which is a problem. */
 static int
@@ -442,12 +395,8 @@ get_extended_mem_sgi(memory_ext *me) {
 
 static void
 get_extended_mem(memory_ext *me) {
-/* vxworks */
-#if defined(VXWORKS)
-    if (get_extended_mem_vxworks(me)) return;
-
 /* linux */
-#elif defined(__linux__)
+#if defined(__linux__)
     if (get_mem_procfs(me))  return;
     if (get_extended_mem_sysinfo(me)) return;
 
@@ -477,12 +426,7 @@ get_extended_mem(memory_ext *me) {
 
 static void 
 get_basic_mem(unsigned long *tot, unsigned long *used, unsigned long *pagesize){
-#if defined(VXWORKS)
-    load_statistics();
-    *tot = (latest.numBytesFree + latest.numBytesAlloc);
-    *used = latest.numBytesAlloc;
-    *pagesize = 1;
-#elif defined(_SC_AVPHYS_PAGES)	/* Does this exist on others than Solaris2? */
+#if defined(_SC_AVPHYS_PAGES)	/* Does this exist on others than Solaris2? */
     unsigned long avPhys, phys, pgSz;
     
     phys = sysconf(_SC_PHYS_PAGES);
@@ -493,7 +437,7 @@ get_basic_mem(unsigned long *tot, unsigned long *used, unsigned long *pagesize){
 #elif defined(__linux__) && !defined(_SC_AVPHYS_PAGES)
     memory_ext me;
     if (get_mem_procfs(&me) < 0) {
-        print_error("ProcFS read error.");
+        print_error("ProcFS read error");
         exit(1);
     }
     *tot      = me.total;
@@ -557,17 +501,8 @@ extended_show_mem(void){
     if (me.flag & F_SWAP_TOTAL) { send_tag(SWAP_TOTAL);       send(me.total_swap, ps); }
     if (me.flag & F_SWAP_FREE)  { send_tag(SWAP_FREE);        send(me.free_swap, ps);  }
     
-#ifdef VXWORKS
-    send_tag(SM_SYSTEM_TOTAL);
-    send(latest_system_total, 1);
-    send_tag(SM_LARGEST_FREE);
-    send(latest.maxBlockSizeFree, 1);
-    send_tag(SM_NUMBER_OF_FREE);
-    send(latest.numBlocksFree, 1);
-#else
     /* total is system total*/
     if (me.flag & F_MEM_TOTAL)  { send_tag(MEM_SYSTEM_TOTAL); send(me.total, ps);     }
-#endif
     send_tag(SHOW_SYSTEM_MEM_END);
 }    
 
@@ -582,7 +517,7 @@ message_loop(int erlin_fd)
 	 *  Wait for command from Erlang
 	 */
 	if ((res = read(erlin_fd, &cmdLen, 1)) < 0) {
-	    print_error("Error reading from Erlang.");
+	    print_error("Error reading from Erlang");
 	    return;
 	}
 
@@ -603,19 +538,19 @@ message_loop(int erlin_fd)
 		  break;
 		  
 		case 0:
-		  print_error("Erlang has closed.");
+		  print_error("Erlang has closed");
 		  return;
 
 		default:
-		  print_error("Error reading from Erlang.");
+		  print_error("Error reading from Erlang");
 		  return;
 		} /* switch() */
 	    } else { /* cmdLen != 1 */
-		print_error("Invalid command length (%d) received.", cmdLen);
+		print_error("Invalid command length (%d) received", cmdLen);
 		return;
 	    }
 	} else {		/* Erlang end closed */
-	    print_error("Erlang has closed.");
+	    print_error("Erlang has closed");
 	    return;
 	}
     }
@@ -641,15 +576,12 @@ static void
 print_error(const char *format,...)
 {
   va_list args;
+  char buffer[256];
 
   va_start(args, format);
-  fprintf(stderr, "%s: ", program_name);
-  vfprintf(stderr, format, args);
+  vsnprintf(buffer, 256, format, args);
   va_end(args);
-  fprintf(stderr, " \n");
+  /* try to use one write only */
+  fprintf(stderr, "[os_mon] memory supervisor port (memsup): %s\r\n", buffer);
+  fflush(stderr);
 }
-
-
-
-
-
diff --git a/lib/os_mon/c_src/win32sysinfo.c b/lib/os_mon/c_src/win32sysinfo.c
index 2a155aae87..f02ae637b2 100644
--- a/lib/os_mon/c_src/win32sysinfo.c
+++ b/lib/os_mon/c_src/win32sysinfo.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2012. All Rights Reserved.
  * 
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -89,6 +89,7 @@ typedef BOOL (WINAPI *tfpGetDiskFreeSpaceEx)(LPCTSTR, PULARGE_INTEGER,PULARGE_IN
 
 static  tfpGetDiskFreeSpaceEx fpGetDiskFreeSpaceEx;
 
+static void print_error(const char *msg);
 static void
 return_answer(char* value)
 {
@@ -98,7 +99,7 @@ return_answer(char* value)
 
     res = write(1,(char*) &bytes,1);
     if (res != 1) {
-	fprintf(stderr,"win32sysinfo:Error writing to pipe");
+	print_error("Error writing to pipe");
 	exit(1);
     }
 
@@ -107,9 +108,8 @@ return_answer(char* value)
     while (left > 0)
     {
 	res = write(1, value+bytes-left, left);
-	if (res <= 0)
-	{
-	    fprintf(stderr,"win32sysinfo:Error writing to pipe");
+	if (res <= 0) {
+	    print_error("Error writing to pipe");
 	    exit(1);
 	}
 	left -= res;
@@ -248,7 +248,6 @@ message_loop()
     char cmd[512];
     int res;
     
-    fprintf(stderr,"in message_loop\n");
     /* Startup ACK. */
     return_answer(OK);
     while (1)
@@ -257,12 +256,12 @@ message_loop()
 	 *  Wait for command from Erlang
 	 */
 	if ((res = read(0, &cmdLen, 1)) < 0) {
-	    fprintf(stderr,"win32sysinfo:Error reading from Erlang.");
+	    print_error("Error reading from Erlang");
 	    return;
 	}
 	
 	if (res != 1){	/* Exactly one byte read ? */ 
-	    fprintf(stderr,"win32sysinfo:Erlang has closed.");
+	    print_error("Erlang has closed");
 	    return;
 	}
 	if ((res = read(0, &cmd, cmdLen)) == cmdLen){
@@ -291,11 +290,11 @@ message_loop()
 		    return_answer("xEND");
 	}    
 	else if (res == 0) {
-	    fprintf(stderr,"win32sysinfo:Erlang has closed.");
+	    print_error("Erlang has closed");
 	    return;
 	}
 	else {
-	    fprintf(stderr,"win32sysinfo:Error reading from Erlang.");
+	    print_error("Error reading from Erlang");
 	    return;
 	} 
     }
@@ -309,10 +308,9 @@ int main(int argc, char ** argv){
     message_loop();
     return 0;    
 }
-
-
-
-
-
-
-
+static void
+print_error(const char *msg) {
+  /* try to use one write only */
+  fprintf(stderr, "[os_mon] win32 supervisor port (win32sysinfo): %s\r\n", msg);
+  fflush(stderr);
+}
diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile
index c9765749c9..08fd23ec92 100644
--- a/lib/os_mon/doc/src/Makefile
+++ b/lib/os_mon/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -109,16 +109,16 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6DIR)/* $(RELEASE_PATH)/man/man6
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6DIR)/* "$(RELEASE_PATH)/man/man6"
 
 release_spec:
 
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index 6674d7b722..061183e51c 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,6 +30,27 @@
   </header>
   <p>This document describes the changes made to the OS_Mon application.</p>
 
+<section><title>Os_Mon 2.2.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Infinity timeout added to internal calls in disksup to
+	    allow it to work properly under very heavy load.</p>
+          <p>
+	    Own Id: OTP-10100</p>
+        </item>
+        <item>
+	    <p>Clarify error messages from os_mon port programs</p>
+          <p>
+	    Own Id: OTP-10161</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Os_Mon 2.2.9</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/os_mon/mibs/Makefile b/lib/os_mon/mibs/Makefile
index 655190edf4..3e24c3d373 100644
--- a/lib/os_mon/mibs/Makefile
+++ b/lib/os_mon/mibs/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -88,13 +88,13 @@ $(SNMP_BIN_TARGET_DIR)/OTP-OS-MON-MIB.bin: \
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/mibs
-	$(INSTALL_DIR) $(RELSYSDIR)/mibs/v1
-	$(INSTALL_DATA) $(MIB_FILES) $(FUNCS_FILES) $(RELSYSDIR)/mibs
-	$(INSTALL_DATA) $(V1_MIB_FILES) $(RELSYSDIR)/mibs/v1
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_TARGETS) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/mibs
-	$(INSTALL_DATA) $(BIN_TARGETS) $(RELSYSDIR)/priv/mibs
+	$(INSTALL_DIR) "$(RELSYSDIR)/mibs"
+	$(INSTALL_DIR) "$(RELSYSDIR)/mibs/v1"
+	$(INSTALL_DATA) $(MIB_FILES) $(FUNCS_FILES) "$(RELSYSDIR)/mibs"
+	$(INSTALL_DATA) $(V1_MIB_FILES) "$(RELSYSDIR)/mibs/v1"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_TARGETS) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/mibs"
+	$(INSTALL_DATA) $(BIN_TARGETS) "$(RELSYSDIR)/priv/mibs"
 
 release_docs_spec:
diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
index 9a75446a89..864d7a09d4 100644
--- a/lib/os_mon/src/Makefile
+++ b/lib/os_mon/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -94,11 +94,11 @@ $(EBIN)/memsup.$(EMULATOR): $(MEMSUP_HRL)
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/os_mon/src/disksup.erl b/lib/os_mon/src/disksup.erl
index 308cd1b7fa..f5f76f1488 100644
--- a/lib/os_mon/src/disksup.erl
+++ b/lib/os_mon/src/disksup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -43,24 +43,24 @@ start_link() ->
     gen_server:start_link({local, disksup}, disksup, [], []).
 
 get_disk_data() ->
-    os_mon:call(disksup, get_disk_data).
+    os_mon:call(disksup, get_disk_data, infinity).
 
 get_check_interval() ->
-    os_mon:call(disksup, get_check_interval).
+    os_mon:call(disksup, get_check_interval, infinity).
 set_check_interval(Minutes) ->
     case param_type(disk_space_check_interval, Minutes) of
 	true ->
-	    os_mon:call(disksup, {set_check_interval, Minutes});
+	    os_mon:call(disksup, {set_check_interval, Minutes}, infinity);
 	false ->
 	    erlang:error(badarg)
     end.
 
 get_almost_full_threshold() ->
-    os_mon:call(disksup, get_almost_full_threshold).
+    os_mon:call(disksup, get_almost_full_threshold, infinity).
 set_almost_full_threshold(Float) ->
     case param_type(disk_almost_full_threshold, Float) of
 	true ->
-	    os_mon:call(disksup, {set_almost_full_threshold, Float});
+	    os_mon:call(disksup, {set_almost_full_threshold, Float}, infinity);
 	false ->
 	    erlang:error(badarg)
     end.
diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl
index 5ef240f128..a1b8591c8c 100644
--- a/lib/os_mon/src/memsup.erl
+++ b/lib/os_mon/src/memsup.erl
@@ -112,7 +112,7 @@ get_helper_timeout() ->
 set_helper_timeout(Seconds) ->
     case param_type(memsup_helper_timeout, Seconds) of
 	true ->
-	    os_mon:call(memsup, {set_helper_timeout, Seconds});
+	    os_mon:call(memsup, {set_helper_timeout, Seconds}, infinity);
 	false ->
 	    erlang:error(badarg)
     end.
@@ -185,7 +185,6 @@ init([]) ->
 		   {unix, irix} -> true;
 		   {unix, sunos} -> true;
 		   {win32, _OSname} -> false;
-		   vxworks -> true;
 		   _ ->
 		       exit({unsupported_os, OS})
 	       end,
@@ -617,8 +616,7 @@ code_change(Vsn, PrevState, "1.8") ->
 			   {unix, openbsd} -> true;
 			   {unix, netbsd} -> true;
 			   {unix, sunos} -> true;
-			   {win32, _OSname} -> false;
-			   vxworks -> true
+			   {win32, _OSname} -> false
 		       end,
 	    Pid = if
 		      PortMode -> spawn_link(fun() -> port_init() end);
diff --git a/lib/os_mon/src/os_mon.erl b/lib/os_mon/src/os_mon.erl
index 3098c38808..df1eccb064 100644
--- a/lib/os_mon/src/os_mon.erl
+++ b/lib/os_mon/src/os_mon.erl
@@ -85,13 +85,13 @@ open_port(Name, Opts) ->
     %% Check os_mon*/priv/bin/Name
     case filelib:is_regular(ReleasedPath) of
 	true ->
-	    erlang:open_port({spawn, ReleasedPath}, Opts);
+	    erlang:open_port({spawn, "\""++ReleasedPath++"\""}, Opts);
 	false ->
 	    %% Use os_mon*/priv/bin/Arch/Name
 	    ArchPath =
 		filename:join(
 		  [PrivDir,"bin",erlang:system_info(system_architecture),Name]),
-	    erlang:open_port({spawn, ArchPath}, Opts)
+	    erlang:open_port({spawn, "\""++ArchPath++"\""}, Opts)
     end.
 
 
@@ -177,8 +177,6 @@ services({unix, _}) -> % Other unix.
     [cpu_sup, disksup, memsup];
 services({win32, _}) ->
     [disksup, memsup, os_sup, sysinfo];
-services(vxworks) ->
-    [memsup];
 services(_) ->
     [].
 
diff --git a/lib/os_mon/test/Makefile b/lib/os_mon/test/Makefile
index a240640f92..461bebc102 100644
--- a/lib/os_mon/test/Makefile
+++ b/lib/os_mon/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -84,9 +84,10 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec:
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) os_mon.spec os_mon.cover $(EMAKEFILE) $(SOURCE) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) os_mon.spec os_mon.cover $(EMAKEFILE) $(SOURCE) "$(RELSYSDIR)"
+	$(INSTALL_DATA) os_mon_mib_SUITE.cfg "$(RELSYSDIR)"
 
-##	tar chf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+##	tar chf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/os_mon/test/os_mon.spec b/lib/os_mon/test/os_mon.spec
index d292b258f3..4b4286b313 100644
--- a/lib/os_mon/test/os_mon.spec
+++ b/lib/os_mon/test/os_mon.spec
@@ -1 +1,2 @@
 {suites,"../os_mon_test",all}.
+{config,"os_mon_mib_SUITE.cfg"}.
\ No newline at end of file
diff --git a/lib/os_mon/test/os_mon_mib_SUITE.cfg b/lib/os_mon/test/os_mon_mib_SUITE.cfg
new file mode 100644
index 0000000000..a33c23530b
--- /dev/null
+++ b/lib/os_mon/test/os_mon_mib_SUITE.cfg
@@ -0,0 +1,8 @@
+%% -*- erlang -*-
+{snmp, [{start_agent,true},
+	{users,[{os_mon_mib_test,[snmpm_user_default,[]]}]},
+	{managed_agents,[{os_mon_mib_test,
+			  [os_mon_mib_test, {127,0,0,1}, 4000, []]}]},
+	{agent_sysname,"Test os_mon_mibs"},
+	{mgr_port,5001}
+       ]}.
diff --git a/lib/os_mon/test/os_mon_mib_SUITE.erl b/lib/os_mon/test/os_mon_mib_SUITE.erl
index a137efc441..08f5532d50 100644
--- a/lib/os_mon/test/os_mon_mib_SUITE.erl
+++ b/lib/os_mon/test/os_mon_mib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -18,16 +18,20 @@
 %%
 -module(os_mon_mib_SUITE).
 
-%-define(STANDALONE,1).
+%%-----------------------------------------------------------------
+%% This suite can no longer be executed standalone, i.e. it must be
+%% executed with common test. The reason is that ct_snmp is used
+%% instead of the snmp application directly. The suite requires a
+%% config file, os_mon_mib_SUITE.cfg, found in the same directory as
+%% the suite.
+%%
+%% Execute with:
+%% > ct_run -suite os_mon_mib_SUITE -config os_mon_mib_SUITE.cfg
+%%-----------------------------------------------------------------
 
--ifdef(STANDALONE).
--define(line,erlang:display({line,?LINE}),).
--define(config(A,B), config(A,B)).
--else.
 -include_lib("test_server/include/test_server.hrl").
 -include_lib("os_mon/include/OTP-OS-MON-MIB.hrl").
 -include_lib("snmp/include/snmp_types.hrl").
--endif.
 
 % Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
@@ -60,15 +64,6 @@
 -define(MGR_PORT, 5001).
 
 %%---------------------------------------------------------------------
--ifdef(STANDALONE).
--export([run/0]).
-run() ->
-    catch init_per_suite([]),
-    Ret = (catch update_load_table([])),
-    catch end_per_suite([]),
-    Ret.
--else.
-
 init_per_testcase(_Case, Config) when is_list(Config) ->
     Dog = test_server:timetrap(test_server:minutes(6)),
     [{watchdog, Dog}|Config].
@@ -78,7 +73,8 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
     test_server:timetrap_cancel(Dog),
     Config.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() -> [{ct_hooks,[ts_install_cth]},
+	    {require, snmp_mgr_agent, snmp}].
 
 all() -> 
     [load_unload, get_mem_sys_mark, get_mem_proc_mark,
@@ -104,8 +100,6 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-
--endif.
 %%---------------------------------------------------------------------
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
@@ -121,50 +115,13 @@ init_per_suite(Config) ->
     ?line application:start(mnesia),
     ?line application:start(os_mon),
 
-    %% Create initial configuration data for the snmp application
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line ConfDir = filename:join(PrivDir, "conf"),
-    ?line DbDir = filename:join(PrivDir,"db"),
-    ?line MgrDir =  filename:join(PrivDir,"mgr"),
-
-    ?line file:make_dir(ConfDir),
-    ?line file:make_dir(DbDir),
-    ?line file:make_dir(MgrDir),
-
-    {ok, HostName} = inet:gethostname(),
-    {ok, Addr} = inet:getaddr(HostName, inet),
-
-    ?line snmp_config:write_agent_snmp_files(ConfDir, ?CONF_FILE_VER,
-					     tuple_to_list(Addr), ?TRAP_UDP,
-					     tuple_to_list(Addr),
-					     ?AGENT_UDP, ?SYS_NAME),
-
-    ?line snmp_config:write_manager_snmp_files(MgrDir, tuple_to_list(Addr),
-					       ?MGR_PORT, ?MAX_MSG_SIZE,
-					       ?ENGINE_ID, [], [], []),
-
-    %% To make sure application:set_env is not overwritten by any
-    %% app-file settings.
-    ?line ok = application:load(snmp),
-
-    ?line application:set_env(snmp, agent, [{db_dir, DbDir},
-					    {config, [{dir, ConfDir}]},
-					    {agent_type, master},
-					    {agent_verbosity, trace},
-					    {net_if, [{verbosity, trace}]}]),
-    ?line application:set_env(snmp, manager, [{config, [{dir, MgrDir},
-							{db_dir, MgrDir},
-							{verbosity, trace}]},
-					      {server, [{verbosity, trace}]},
-					      {net_if, [{verbosity, trace}]},
-					      {versions, [v1, v2, v3]}]),
-    application:start(snmp),
+    ok = ct_snmp:start(Config,snmp_mgr_agent),
 
     %% Load the mibs that should be tested
     otp_mib:load(snmp_master_agent),
     os_mon_mib:load(snmp_master_agent),
 
-    [{agent_ip, Addr}| Config].
+    Config.
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
 %% Config - [tuple()]
@@ -197,7 +154,7 @@ end_per_suite(Config) ->
 load_unload(doc) ->
     ["Test to unload and the reload the OTP.mib "];
 load_unload(suite) -> [];
-load_unload(Config) when list(Config) ->
+load_unload(Config) when is_list(Config) ->
     ?line os_mon_mib:unload(snmp_master_agent),
     ?line os_mon_mib:load(snmp_master_agent),
     ok.
@@ -424,7 +381,7 @@ cpu_load(doc) ->
     [];
 cpu_load(suite) ->
     [];
-cpu_load(Config) when list(Config) ->
+cpu_load(Config) when is_list(Config) ->
     ?line [{[?loadCpuLoad, Len | NodeStr], Load}] =
 	os_mon_mib:load_table(get_next,[], [?loadCpuLoad]),
     ?line Len = length(NodeStr),
@@ -640,32 +597,24 @@ disk_capacity(Config) when is_list(Config) ->
 
 %%---------------------------------------------------------------------
 real_snmp_request(doc) ->
-    ["Starts an snmp manager and sends a real snmp-reques. i.e. "
+    ["Starts an snmp manager and sends a real snmp-request. i.e. "
      "sends a udp message on the correct format."];
 real_snmp_request(suite) -> [];
-real_snmp_request(Config) when list(Config) ->
-    Agent_ip = ?config(agent_ip, Config),
-
-    ?line ok = snmpm:register_user(os_mon_mib_test, snmpm_user_default, []),
-    ?line ok = snmpm:register_agent(os_mon_mib_test, Agent_ip, ?AGENT_UDP),
-
+real_snmp_request(Config) when is_list(Config) ->
     NodStr = atom_to_list(node()),
     Len = length(NodStr),
     {_, _, {Pid, _}} = memsup:get_memory_data(),
     PidStr = lists:flatten(io_lib:format("~w", [Pid])),
     io:format("FOO: ~p~n", [PidStr]),
-    ?line ok = snmp_get(Agent_ip,
-			[?loadEntry ++
+    ?line ok = snmp_get([?loadEntry ++
 			 [?loadLargestErlProcess, Len | NodStr]],
 			PidStr),
-    ?line ok = snmp_get_next(Agent_ip,
-			     [?loadEntry ++
+    ?line ok = snmp_get_next([?loadEntry ++
 			      [?loadSystemUsedMemory, Len | NodStr]],
 			     ?loadEntry ++ [?loadSystemUsedMemory + 1, Len
 					    | NodStr], PidStr),
-    ?line ok = snmp_set(Agent_ip, [?loadEntry ++
-				   [?loadLargestErlProcess,  Len | NodStr]],
-			s, "<0.101.0>"),
+    ?line ok = snmp_set([?loadEntry ++ [?loadLargestErlProcess,  Len | NodStr]],
+			s, "<0.101.0>", Config),
     ok.
 
 otp_7441(doc) ->
@@ -674,34 +623,17 @@ otp_7441(doc) ->
 otp_7441(suite) ->
     [];
 otp_7441(Config) when is_list(Config) ->
-    Agent_ip = ?config(agent_ip, Config),
-
-
     NodStr = atom_to_list(node()),
     Len = length(NodStr),
     Oids = [Oid|_] = [?loadEntry ++ [?loadSystemTotalMemory, Len | NodStr]],
-    ?line { ok, {noError,0,[#varbind{oid = Oid, variabletype = 'Unsigned32'}]}, _} =
-	snmpm:g(os_mon_mib_test, Agent_ip, ?AGENT_UDP, Oids),
+    {noError,0,[#varbind{oid = Oid, variabletype = 'Unsigned32'}]} =
+	ct_snmp:get_values(os_mon_mib_test, Oids, snmp_mgr_agent),
 
     ok.
 
 %%---------------------------------------------------------------------
 %% Internal functions
 %%---------------------------------------------------------------------
--ifdef(STANDALONE).
-config(priv_dir,_) ->
-    "/tmp".
-
-start_node() ->
-    Host = hd(tl(string:tokens(atom_to_list(node()),"@"))),
-    {ok,Node} = slave:start(Host,testnisse),
-    net_adm:ping(testnisse),
-    Node.
-
-
-stop_node(Node) ->
-   rpc:call(Node,erlang,halt,[]).
--else.
 start_node() ->
     ?line Pa = filename:dirname(code:which(?MODULE)),
     ?line {ok,Node} = test_server:start_node(testnisse, slave,
@@ -711,8 +643,6 @@ start_node() ->
 stop_node(Node) ->
     test_server:stop_node(Node).
 
--endif.
-
 del_dir(Dir) ->
     io:format("Deleting: ~s~n",[Dir]),
     {ok, Files} = file:list_dir(Dir),
@@ -722,21 +652,22 @@ del_dir(Dir) ->
     file:del_dir(Dir).
 
 %%---------------------------------------------------------------------
-snmp_get(Agent_ip, Oids = [Oid |_], Result) ->
-    ?line {ok,{noError,0,[#varbind{oid = Oid,
-				   variabletype = 'OCTET STRING',
-				   value = Result}]}, _} =
-	snmpm:g(os_mon_mib_test, Agent_ip, ?AGENT_UDP, Oids),
+snmp_get(Oids = [Oid |_], Result) ->
+    {noError,0,[#varbind{oid = Oid,
+			 variabletype = 'OCTET STRING',
+			 value = Result}]} =
+	ct_snmp:get_values(os_mon_mib_test, Oids, snmp_mgr_agent),
     ok.
 
-snmp_get_next(Agent_ip, Oids, NextOid, Result) ->
-    ?line {ok,{noError,0,[#varbind{oid = NextOid,
-				   variabletype = 'OCTET STRING',
-				   value = Result}]},_} =
-	snmpm:gn(os_mon_mib_test, Agent_ip, ?AGENT_UDP, Oids),
+snmp_get_next(Oids, NextOid, Result) ->
+    {noError,0,[#varbind{oid = NextOid,
+			 variabletype = 'OCTET STRING',
+			 value = Result}]} =
+	ct_snmp:get_next_values(os_mon_mib_test, Oids, snmp_mgr_agent),
     ok.
 
-snmp_set(Agent_ip, Oid, ValuType, Value) ->
-    ?line {ok, {notWritable, _, _}, _} =
-	snmpm:s(os_mon_mib_test,Agent_ip,?AGENT_UDP,[{Oid, ValuType, Value}]),
+snmp_set(Oid, ValuType, Value, Config) ->
+    {notWritable, _, _} =
+	ct_snmp:set_values(os_mon_mib_test, [{Oid, ValuType, Value}],
+			   snmp_mgr_agent, Config),
     ok.
diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk
index b92bdf3c1a..180906127c 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.2.9
+OS_MON_VSN = 2.2.10
diff --git a/lib/otp_mibs/doc/src/Makefile b/lib/otp_mibs/doc/src/Makefile
index bd2810034b..6b8610bc23 100644
--- a/lib/otp_mibs/doc/src/Makefile
+++ b/lib/otp_mibs/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
+# Copyright Ericsson AB 2003-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -102,14 +102,14 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/otp_mibs/mibs/Makefile b/lib/otp_mibs/mibs/Makefile
index 5e59824d3f..703c4b3ed4 100644
--- a/lib/otp_mibs/mibs/Makefile
+++ b/lib/otp_mibs/mibs/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -76,13 +76,13 @@ v1/%.mib.v1: %.mib
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/mibs
-	$(INSTALL_DIR) $(RELSYSDIR)/mibs/v1
-	$(INSTALL_DATA) $(MIB_FILES) $(FUNCS_FILES) $(RELSYSDIR)/mibs
-	$(INSTALL_DATA) $(V1_MIB_FILES) $(RELSYSDIR)/mibs/v1
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_TARGETS) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/mibs
-	$(INSTALL_DATA) $(BIN_TARGETS) $(RELSYSDIR)/priv/mibs
+	$(INSTALL_DIR) "$(RELSYSDIR)/mibs"
+	$(INSTALL_DIR) "$(RELSYSDIR)/mibs/v1"
+	$(INSTALL_DATA) $(MIB_FILES) $(FUNCS_FILES) "$(RELSYSDIR)/mibs"
+	$(INSTALL_DATA) $(V1_MIB_FILES) "$(RELSYSDIR)/mibs/v1"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_TARGETS) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/mibs"
+	$(INSTALL_DATA) $(BIN_TARGETS) "$(RELSYSDIR)/priv/mibs"
 
 release_docs_spec:
diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile
index 833a439adb..03298d39d5 100644
--- a/lib/otp_mibs/src/Makefile
+++ b/lib/otp_mibs/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
+# Copyright Ericsson AB 2003-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -95,10 +95,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGETS) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/parsetools/doc/src/Makefile b/lib/parsetools/doc/src/Makefile
index 6e693e0cf0..96879084d8 100644
--- a/lib/parsetools/doc/src/Makefile
+++ b/lib/parsetools/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -105,14 +105,14 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 
 release_spec:
diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile
index 89e079e411..4f199da8ee 100644
--- a/lib/parsetools/src/Makefile
+++ b/lib/parsetools/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -89,12 +89,12 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
 
diff --git a/lib/parsetools/test/Makefile b/lib/parsetools/test/Makefile
index 624c4e6975..6455f6ade7 100644
--- a/lib/parsetools/test/Makefile
+++ b/lib/parsetools/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2005-2011. All Rights Reserved.
+# Copyright Ericsson AB 2005-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -70,9 +70,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) parsetools.spec parsetools.cover $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	# @tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) parsetools.spec parsetools.cover $(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	# @tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/percept/doc/src/Makefile b/lib/percept/doc/src/Makefile
index f0d43c5a01..3182dc2954 100644
--- a/lib/percept/doc/src/Makefile
+++ b/lib/percept/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2007-2010. All Rights Reserved.
+# Copyright Ericsson AB 2007-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -175,15 +175,15 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTML_EXAMPLE_FILES) $(HTML_STYLESHEET_FILES) \
 		$(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/percept/doc/src/notes.xml b/lib/percept/doc/src/notes.xml
index 1ac1a5ab62..dd70cfe994 100644
--- a/lib/percept/doc/src/notes.xml
+++ b/lib/percept/doc/src/notes.xml
@@ -32,6 +32,21 @@
   </header>
   <p>This document describes the changes made to the Percept application.</p>
 
+<section><title>Percept 0.8.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Add missing modules in app-file</p>
+          <p>
+	    Own Id: OTP-10439</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Percept 0.8.6.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/percept/priv/Makefile b/lib/percept/priv/Makefile
index 7c37ccd98b..b82b51ed4b 100644
--- a/lib/percept/priv/Makefile
+++ b/lib/percept/priv/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2007-2009. All Rights Reserved.
+# Copyright Ericsson AB 2007-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -77,20 +77,20 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	# Finished
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/logs
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/server_root
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/server_root/htdocs
-	$(INSTALL_DATA) $(HTDOCS_FILES) $(RELSYSDIR)/priv/server_root/htdocs
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/server_root/conf
-	$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/priv/server_root/conf
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/server_root/scripts
-	$(INSTALL_DATA) $(SCRIPT_FILES) $(RELSYSDIR)/priv/server_root/scripts
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/server_root/css
-	$(INSTALL_DATA) $(CSS_FILES) $(RELSYSDIR)/priv/server_root/css
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/server_root/images
-	$(INSTALL_DATA) $(IMAGE_FILES) $(RELSYSDIR)/priv/server_root/images
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/fonts
-	$(INSTALL_DATA) $(FONT_FILES) $(RELSYSDIR)/priv/fonts
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/logs"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/server_root"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/server_root/htdocs"
+	$(INSTALL_DATA) $(HTDOCS_FILES) "$(RELSYSDIR)/priv/server_root/htdocs"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/server_root/conf"
+	$(INSTALL_DATA) $(CONF_FILES) "$(RELSYSDIR)/priv/server_root/conf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/server_root/scripts"
+	$(INSTALL_DATA) $(SCRIPT_FILES) "$(RELSYSDIR)/priv/server_root/scripts"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/server_root/css"
+	$(INSTALL_DATA) $(CSS_FILES) "$(RELSYSDIR)/priv/server_root/css"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/server_root/images"
+	$(INSTALL_DATA) $(IMAGE_FILES) "$(RELSYSDIR)/priv/server_root/images"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/fonts"
+	$(INSTALL_DATA) $(FONT_FILES) "$(RELSYSDIR)/priv/fonts"
 	
 release_docs_spec:
 
diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile
index 5dfc72575a..253a8c2da3 100644
--- a/lib/percept/src/Makefile
+++ b/lib/percept/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2007-2009. All Rights Reserved.
+# Copyright Ericsson AB 2007-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -93,12 +93,12 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-#	$(INSTALL_DIR) $(RELSYSDIR)/include
-#	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+#	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+#	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/percept/src/percept.app.src b/lib/percept/src/percept.app.src
index c70fede721..cf4a9fc438 100644
--- a/lib/percept/src/percept.app.src
+++ b/lib/percept/src/percept.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -17,14 +17,26 @@
 %% %CopyrightEnd%
 %%
 
-{application,percept,
-	[{description, 	"PERCEPT Erlang Concurrency Profiling Tool"},
-	 {vsn,		"%VSN%"},
-	 {modules,	[percept,percept_db,percept_html,percept_graph,percept_analyzer]},
-	 {registered,	[percept_db,percept_port]},
-	 {applications,	[kernel,stdlib]},
-	 {env,		[]}
-	]}.
-
+{application,percept, [
+    {description, "PERCEPT Erlang Concurrency Profiling Tool"},
+    {vsn, "%VSN%"},
+    {modules, [
+	egd,
+	egd_font,
+	egd_png,
+	egd_primitives,
+	egd_render,
+	percept,
+	percept_analyzer,
+	percept_db,
+	percept_graph,
+	percept_html,
+	percept_image
+    ]},
+    {registered, [percept_db,percept_port]},
+    {applications, [kernel,stdlib]},
+    {env,[]}
+]}.
 
 
+%% vim: syntax=erlang
diff --git a/lib/percept/test/Makefile b/lib/percept/test/Makefile
index d927386d1c..156ef5dd0a 100644
--- a/lib/percept/test/Makefile
+++ b/lib/percept/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2007-2011. All Rights Reserved.
+# Copyright Ericsson AB 2007-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -81,10 +81,10 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) percept.spec percept.cover $(EMAKEFILE) $(SOURCE) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) percept.spec percept.cover $(EMAKEFILE) $(SOURCE) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
 
diff --git a/lib/percept/vsn.mk b/lib/percept/vsn.mk
index 9267a41055..f868246f7b 100644
--- a/lib/percept/vsn.mk
+++ b/lib/percept/vsn.mk
@@ -1 +1 @@
-PERCEPT_VSN = 0.8.6.1
+PERCEPT_VSN = 0.8.7
diff --git a/lib/pman/doc/src/Makefile b/lib/pman/doc/src/Makefile
index 4e116cb23e..d9e0317f05 100644
--- a/lib/pman/doc/src/Makefile
+++ b/lib/pman/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -103,14 +103,14 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 
 release_spec:
diff --git a/lib/pman/priv/Makefile b/lib/pman/priv/Makefile
index 43f9d45d94..a89278fd3a 100644
--- a/lib/pman/priv/Makefile
+++ b/lib/pman/priv/Makefile
@@ -50,8 +50,8 @@ clean:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(TOOLBAR_FILES) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(TOOLBAR_FILES) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/pman/src/Makefile b/lib/pman/src/Makefile
index e573e57220..fa01fe7238 100644
--- a/lib/pman/src/Makefile
+++ b/lib/pman/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -103,10 +103,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/public_key/asn1/AuthenticationFramework.asn1 b/lib/public_key/asn1/AuthenticationFramework.asn1
new file mode 100644
index 0000000000..3754486473
--- /dev/null
+++ b/lib/public_key/asn1/AuthenticationFramework.asn1
@@ -0,0 +1,367 @@
+AuthenticationFramework {joint-iso-itu-t ds(5) module(1)
+  authenticationFramework(7) 6} DEFINITIONS ::=
+BEGIN
+
+-- EXPORTS All
+-- The types and values defined in this module are exported for use in the other ASN.1 modules contained
+-- within the Directory Specifications, and for the use of other applications which will use them to access
+-- Directory services. Other applications may use them for their own purposes, but this will not constrain
+-- extensions and modifications needed to maintain or improve the Directory service.
+IMPORTS
+  id-at, id-nf, id-oc, informationFramework, selectedAttributeTypes,
+    basicAccessControl, certificateExtensions
+    FROM UsefulDefinitions {joint-iso-itu-t ds(5) module(1)
+      usefulDefinitions(0) 6}
+  Name, ATTRIBUTE, OBJECT-CLASS, NAME-FORM, top
+    FROM InformationFramework informationFramework
+  UniqueIdentifier, octetStringMatch, commonName, UnboundedDirectoryString
+    FROM SelectedAttributeTypes selectedAttributeTypes
+  certificateExactMatch, certificatePairExactMatch, certificateListExactMatch,
+    KeyUsage, GeneralNames, CertificatePoliciesSyntax,
+    algorithmIdentifierMatch, CertPolicyId
+    FROM CertificateExtensions certificateExtensions;
+
+-- parameterized types
+ENCRYPTED{ToBeEnciphered} ::=
+  BIT STRING
+    (CONSTRAINED BY {
+       -- shall be the result of applying an encipherment procedure
+       -- to the BER-encoded octets of a value of --ToBeEnciphered})
+
+HASH{ToBeHashed} ::= SEQUENCE {
+  algorithmIdentifier  AlgorithmIdentifier{{SupportedAlgorithms}},
+  hashValue
+    BIT STRING
+      (CONSTRAINED BY {
+         -- shall be the result of applying a hashing procedure to the DER-encoded octets
+         -- of a value of -- ToBeHashed})
+}
+
+ENCRYPTED-HASH{ToBeSigned} ::=
+  BIT STRING
+    (CONSTRAINED BY {
+       -- shall be the result of applying a hashing procedure to the DER-encoded (see 6.1) octets
+       -- of a value of --ToBeSigned -- and then applying an encipherment procedure to those octets --})
+
+SIGNATURE{ToBeSigned} ::= SEQUENCE {
+  algorithmIdentifier  AlgorithmIdentifier{{SupportedAlgorithms}},
+  encrypted            ENCRYPTED-HASH{ToBeSigned}
+}
+
+SIGNED{ToBeSigned} ::= SEQUENCE {
+  toBeSigned  ToBeSigned,
+  COMPONENTS OF SIGNATURE{ToBeSigned}
+}
+
+-- public-key certificate definition
+Certificate ::= SIGNED{CertificateContent}
+
+CertificateContent ::= SEQUENCE {
+  version                  [0]  Version DEFAULT v1,
+  serialNumber             CertificateSerialNumber,
+  signature                AlgorithmIdentifier{{SupportedAlgorithms}},
+  issuer                   Name,
+  validity                 Validity,
+  subject                  Name,
+  subjectPublicKeyInfo     SubjectPublicKeyInfo,
+  issuerUniqueIdentifier   [1] IMPLICIT UniqueIdentifier OPTIONAL,
+  -- if present, version shall be v2 or v3
+  subjectUniqueIdentifier  [2] IMPLICIT UniqueIdentifier OPTIONAL,
+  -- if present, version shall be v2 or v3
+  extensions               [3]  Extensions OPTIONAL
+  -- If present, version shall be v3
+}
+
+Version ::= INTEGER {v1(0), v2(1), v3(2)}
+
+CertificateSerialNumber ::= INTEGER
+
+AlgorithmIdentifier{ALGORITHM:SupportedAlgorithms} ::= SEQUENCE {
+  algorithm   ALGORITHM.&id({SupportedAlgorithms}),
+  parameters  ALGORITHM.&Type({SupportedAlgorithms}{@algorithm}) OPTIONAL
+}
+
+-- Definition of the following information object set is deferred, perhaps to standardized
+-- profiles or to protocol implementation conformance statements. The set is required to
+-- specify a table constraint on the parameters component of AlgorithmIdentifier.
+SupportedAlgorithms ALGORITHM ::=
+  {...}
+
+Validity ::= SEQUENCE {notBefore  Time,
+                       notAfter   Time
+}
+
+SubjectPublicKeyInfo ::= SEQUENCE {
+  algorithm         AlgorithmIdentifier{{SupportedAlgorithms}},
+  subjectPublicKey  BIT STRING
+}
+
+Time ::= CHOICE {utcTime          UTCTime,
+                 generalizedTime  GeneralizedTime
+}
+
+Extensions ::= SEQUENCE OF Extension
+
+-- For those extensions where ordering of individual extensions within the SEQUENCE is significant, the
+-- specification of those individual extensions shall include the rules for the significance of the order therein
+Extension ::= SEQUENCE {
+  extnId     EXTENSION.&id({ExtensionSet}),
+  critical   BOOLEAN DEFAULT FALSE,
+  extnValue
+    OCTET STRING
+      (CONTAINING EXTENSION.&ExtnType({ExtensionSet}{@extnId})
+       ENCODED BY
+       der)
+}
+
+der OBJECT IDENTIFIER ::=
+  {joint-iso-itu-t asn1(1) ber-derived(2) distinguished-encoding(1)}
+
+ExtensionSet EXTENSION ::=
+  {...}
+
+EXTENSION ::= CLASS {&id        OBJECT IDENTIFIER UNIQUE,
+                     &ExtnType
+}WITH SYNTAX {SYNTAX &ExtnType
+              IDENTIFIED BY &id
+}
+
+ALGORITHM ::= CLASS {&Type  OPTIONAL,
+                     &id    OBJECT IDENTIFIER UNIQUE
+}WITH SYNTAX {[&Type]
+              IDENTIFIED BY &id
+}
+
+-- other PKI certificate constructs
+Certificates ::= SEQUENCE {
+  userCertificate    Certificate,
+  certificationPath  ForwardCertificationPath OPTIONAL
+}
+
+CertificationPath ::= SEQUENCE {
+  userCertificate    Certificate,
+  theCACertificates  SEQUENCE OF CertificatePair OPTIONAL
+}
+
+ForwardCertificationPath ::= SEQUENCE OF CrossCertificates
+
+CrossCertificates ::= SET OF Certificate
+
+PkiPath ::= SEQUENCE OF Certificate
+
+-- certificate revocation list (CRL)
+CertificateList ::=
+  SIGNED{CertificateListContent}
+
+CertificateListContent ::= SEQUENCE {
+  version              Version OPTIONAL,
+  -- if present, version shall be v2
+  signature            AlgorithmIdentifier{{SupportedAlgorithms}},
+  issuer               Name,
+  thisUpdate           Time,
+  nextUpdate           Time OPTIONAL,
+  revokedCertificates
+    SEQUENCE OF
+      SEQUENCE {serialNumber        CertificateSerialNumber,
+                revocationDate      Time,
+                crlEntryExtensions  Extensions OPTIONAL} OPTIONAL,
+  crlExtensions        [0]  Extensions OPTIONAL
+}
+
+-- PKI object classes
+pkiUser OBJECT-CLASS ::= {
+  SUBCLASS OF  {top}
+  KIND         auxiliary
+  MAY CONTAIN  {userCertificate}
+  ID           id-oc-pkiUser
+}
+
+pkiCA OBJECT-CLASS ::= {
+  SUBCLASS OF  {top}
+  KIND         auxiliary
+  MAY CONTAIN
+    {cACertificate | certificateRevocationList | authorityRevocationList |
+      crossCertificatePair}
+  ID           id-oc-pkiCA
+}
+
+cRLDistributionPoint OBJECT-CLASS ::= {
+  SUBCLASS OF   {top}
+  KIND          structural
+  MUST CONTAIN  {commonName}
+  MAY CONTAIN
+    {certificateRevocationList | authorityRevocationList | deltaRevocationList}
+  ID            id-oc-cRLDistributionPoint
+}
+
+cRLDistPtNameForm NAME-FORM ::= {
+  NAMES            cRLDistributionPoint
+  WITH ATTRIBUTES  {commonName}
+  ID               id-nf-cRLDistPtNameForm
+}
+
+deltaCRL OBJECT-CLASS ::= {
+  SUBCLASS OF  {top}
+  KIND         auxiliary
+  MAY CONTAIN  {deltaRevocationList}
+  ID           id-oc-deltaCRL
+}
+
+cpCps OBJECT-CLASS ::= {
+  SUBCLASS OF  {top}
+  KIND         auxiliary
+  MAY CONTAIN  {certificatePolicy | certificationPracticeStmt}
+  ID           id-oc-cpCps
+}
+
+pkiCertPath OBJECT-CLASS ::= {
+  SUBCLASS OF  {top}
+  KIND         auxiliary
+  MAY CONTAIN  {pkiPath}
+  ID           id-oc-pkiCertPath
+}
+
+-- PKI directory attributes
+userCertificate ATTRIBUTE ::= {
+  WITH SYNTAX             Certificate
+  EQUALITY MATCHING RULE  certificateExactMatch
+  ID                      id-at-userCertificate
+}
+
+cACertificate ATTRIBUTE ::= {
+  WITH SYNTAX             Certificate
+  EQUALITY MATCHING RULE  certificateExactMatch
+  ID                      id-at-cAcertificate
+}
+
+crossCertificatePair ATTRIBUTE ::= {
+  WITH SYNTAX             CertificatePair
+  EQUALITY MATCHING RULE  certificatePairExactMatch
+  ID                      id-at-crossCertificatePair
+}
+
+CertificatePair ::= SEQUENCE {
+  forward  [0]  Certificate OPTIONAL,
+  reverse  [1]  Certificate OPTIONAL
+  -- at least one of the pair shall be present
+}
+(WITH COMPONENTS {
+   ...,
+   forward  PRESENT
+ } | WITH COMPONENTS {
+       ...,
+       reverse  PRESENT
+     })
+
+certificateRevocationList ATTRIBUTE ::= {
+  WITH SYNTAX             CertificateList
+  EQUALITY MATCHING RULE  certificateListExactMatch
+  ID                      id-at-certificateRevocationList
+}
+
+authorityRevocationList ATTRIBUTE ::= {
+  WITH SYNTAX             CertificateList
+  EQUALITY MATCHING RULE  certificateListExactMatch
+  ID                      id-at-authorityRevocationList
+}
+
+deltaRevocationList ATTRIBUTE ::= {
+  WITH SYNTAX             CertificateList
+  EQUALITY MATCHING RULE  certificateListExactMatch
+  ID                      id-at-deltaRevocationList
+}
+
+supportedAlgorithms ATTRIBUTE ::= {
+  WITH SYNTAX             SupportedAlgorithm
+  EQUALITY MATCHING RULE  algorithmIdentifierMatch
+  ID                      id-at-supportedAlgorithms
+}
+
+SupportedAlgorithm ::= SEQUENCE {
+  algorithmIdentifier          AlgorithmIdentifier{{SupportedAlgorithms}},
+  intendedUsage                [0]  KeyUsage OPTIONAL,
+  intendedCertificatePolicies  [1]  CertificatePoliciesSyntax OPTIONAL
+}
+
+certificationPracticeStmt ATTRIBUTE ::= {
+  WITH SYNTAX  InfoSyntax
+  ID           id-at-certificationPracticeStmt
+}
+
+InfoSyntax ::= CHOICE {
+  content  UnboundedDirectoryString,
+  pointer  SEQUENCE {name  GeneralNames,
+                     hash  HASH{HashedPolicyInfo} OPTIONAL}
+}
+
+POLICY ::= TYPE-IDENTIFIER
+
+HashedPolicyInfo ::= POLICY.&Type({Policies})
+
+Policies POLICY ::=
+  {...} -- Defined by implementors
+
+certificatePolicy ATTRIBUTE ::= {
+  WITH SYNTAX  PolicySyntax
+  ID           id-at-certificatePolicy
+}
+
+PolicySyntax ::= SEQUENCE {
+  policyIdentifier  PolicyID,
+  policySyntax      InfoSyntax
+}
+
+PolicyID ::= CertPolicyId
+
+pkiPath ATTRIBUTE ::= {WITH SYNTAX  PkiPath
+                       ID           id-at-pkiPath
+}
+
+userPassword ATTRIBUTE ::= {
+  WITH SYNTAX             OCTET STRING(SIZE (0..MAX))
+  EQUALITY MATCHING RULE  octetStringMatch
+  ID                      id-at-userPassword
+}
+
+-- object identifier assignments
+-- object classes
+id-oc-cRLDistributionPoint OBJECT IDENTIFIER ::=
+  {id-oc 19}
+
+id-oc-pkiUser OBJECT IDENTIFIER ::= {id-oc 21}
+
+id-oc-pkiCA OBJECT IDENTIFIER ::= {id-oc 22}
+
+id-oc-deltaCRL OBJECT IDENTIFIER ::= {id-oc 23}
+
+id-oc-cpCps OBJECT IDENTIFIER ::= {id-oc 30}
+
+id-oc-pkiCertPath OBJECT IDENTIFIER ::= {id-oc 31}
+
+-- name forms
+id-nf-cRLDistPtNameForm OBJECT IDENTIFIER ::= {id-nf 14}
+
+-- directory attributes
+id-at-userPassword OBJECT IDENTIFIER ::= {id-at 35}
+
+id-at-userCertificate OBJECT IDENTIFIER ::= {id-at 36}
+
+id-at-cAcertificate OBJECT IDENTIFIER ::= {id-at 37}
+
+id-at-authorityRevocationList OBJECT IDENTIFIER ::= {id-at 38}
+
+id-at-certificateRevocationList OBJECT IDENTIFIER ::= {id-at 39}
+
+id-at-crossCertificatePair OBJECT IDENTIFIER ::= {id-at 40}
+
+id-at-supportedAlgorithms OBJECT IDENTIFIER ::= {id-at 52}
+
+id-at-deltaRevocationList OBJECT IDENTIFIER ::= {id-at 53}
+
+id-at-certificationPracticeStmt OBJECT IDENTIFIER ::= {id-at 68}
+
+id-at-certificatePolicy OBJECT IDENTIFIER ::= {id-at 69}
+
+id-at-pkiPath OBJECT IDENTIFIER ::= {id-at 70}
+
+END -- AuthenticationFramework
diff --git a/lib/public_key/asn1/InformationFramework.asn1 b/lib/public_key/asn1/InformationFramework.asn1
new file mode 100644
index 0000000000..4aed43a39e
--- /dev/null
+++ b/lib/public_key/asn1/InformationFramework.asn1
@@ -0,0 +1,682 @@
+InformationFramework {joint-iso-itu-t ds(5) module(1) informationFramework(1)
+  6} DEFINITIONS ::=
+BEGIN
+
+-- EXPORTS All
+-- The types and values defined in this module are exported for use in the other ASN.1 modules contained
+-- within the Directory Specifications, and for the use of other applications which will use them to access
+-- Directory services. Other applications may use them for their own purposes, but this will not constrain
+-- extensions and modifications needed to maintain or improve the Directory service.
+IMPORTS
+  -- from ITU-T Rec. X.501 | ISO/IEC 9594-2
+  directoryAbstractService, id-ar, id-at, id-mr, id-nf, id-oa, id-oc,
+    id-sc, selectedAttributeTypes, serviceAdministration
+    FROM UsefulDefinitions {joint-iso-itu-t ds(5) module(1)
+      usefulDefinitions(0) 6}
+  SearchRule
+    FROM ServiceAdministration serviceAdministration
+  -- from ITU-T Rec. X.511 | ISO/IEC 9594-3
+  TypeAndContextAssertion
+    FROM DirectoryAbstractService directoryAbstractService
+  -- from ITU-T Rec. X.520 | ISO/IEC 9594-6
+  booleanMatch, commonName, generalizedTimeMatch, generalizedTimeOrderingMatch,
+    integerFirstComponentMatch, integerMatch, integerOrderingMatch,
+    objectIdentifierFirstComponentMatch, UnboundedDirectoryString
+    FROM SelectedAttributeTypes selectedAttributeTypes;
+
+-- attribute data types
+Attribute{ATTRIBUTE:SupportedAttributes} ::= SEQUENCE {
+  type               ATTRIBUTE.&id({SupportedAttributes}),
+  values
+    SET SIZE (0..MAX) OF ATTRIBUTE.&Type({SupportedAttributes}{@type}),
+  valuesWithContext
+    SET SIZE (1..MAX) OF
+      SEQUENCE {value        ATTRIBUTE.&Type({SupportedAttributes}{@type}),
+                contextList  SET SIZE (1..MAX) OF Context} OPTIONAL
+}
+
+AttributeType ::= ATTRIBUTE.&id
+
+AttributeValue ::= ATTRIBUTE.&Type
+
+Context ::= SEQUENCE {
+  contextType    CONTEXT.&id({SupportedContexts}),
+  contextValues
+    SET SIZE (1..MAX) OF CONTEXT.&Type({SupportedContexts}{@contextType}),
+  fallback       BOOLEAN DEFAULT FALSE
+}
+
+AttributeValueAssertion ::= SEQUENCE {
+  type              ATTRIBUTE.&id({SupportedAttributes}),
+  assertion
+    ATTRIBUTE.&equality-match.&AssertionType
+      ({SupportedAttributes}{@type}),
+  assertedContexts
+    CHOICE {allContexts       [0]  NULL,
+            selectedContexts  [1]  SET SIZE (1..MAX) OF ContextAssertion
+  } OPTIONAL
+}
+
+ContextAssertion ::= SEQUENCE {
+  contextType    CONTEXT.&id({SupportedContexts}),
+  contextValues
+    SET SIZE (1..MAX) OF
+      CONTEXT.&Assertion({SupportedContexts}{@contextType})
+}
+
+AttributeTypeAssertion ::= SEQUENCE {
+  type              ATTRIBUTE.&id({SupportedAttributes}),
+  assertedContexts  SEQUENCE SIZE (1..MAX) OF ContextAssertion OPTIONAL
+}
+
+-- Definition of the following information object set is deferred, perhaps to standardized
+-- profiles or to protocol implementation conformance statements. The set is required to
+-- specify a table constraint on the values component of Attribute, the value component
+-- of AttributeTypeAndValue, and the assertion component of AttributeValueAssertion.
+SupportedAttributes ATTRIBUTE ::=
+  {objectClass | aliasedEntryName, ...}
+
+-- Definition of the following information object set is deferred, perhaps to standardized
+-- profiles or to protocol implementation conformance statements. The set is required to
+-- specify a table constraint on the context specifications
+SupportedContexts CONTEXT ::=
+  {...}
+
+-- naming data types
+Name ::= CHOICE { -- only one possibility for now --rdnSequence  RDNSequence
+}
+
+RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
+
+DistinguishedName ::= RDNSequence
+
+RelativeDistinguishedName ::=
+  SET SIZE (1..MAX) OF AttributeTypeAndDistinguishedValue
+
+AttributeTypeAndDistinguishedValue ::= SEQUENCE {
+  type                  ATTRIBUTE.&id({SupportedAttributes}),
+  value                 ATTRIBUTE.&Type({SupportedAttributes}{@type}),
+  primaryDistinguished  BOOLEAN DEFAULT TRUE,
+  valuesWithContext
+    SET SIZE (1..MAX) OF
+      SEQUENCE {distingAttrValue
+                  [0]  ATTRIBUTE.&Type({SupportedAttributes}{@type})
+                    OPTIONAL,
+                contextList       SET SIZE (1..MAX) OF Context} OPTIONAL
+}
+
+-- subtree data types
+SubtreeSpecification ::= SEQUENCE {
+  base                 [0]  LocalName DEFAULT {},
+  COMPONENTS OF ChopSpecification,
+  specificationFilter  [4]  Refinement OPTIONAL
+}
+
+-- empty sequence specifies whole administrative area
+LocalName ::= RDNSequence
+
+ChopSpecification ::= SEQUENCE {
+  specificExclusions
+    [1]  SET SIZE (1..MAX) OF
+           CHOICE {chopBefore  [0]  LocalName,
+                   chopAfter   [1]  LocalName} OPTIONAL,
+  minimum             [2]  BaseDistance DEFAULT 0,
+  maximum             [3]  BaseDistance OPTIONAL
+}
+
+BaseDistance ::= INTEGER(0..MAX)
+
+Refinement ::= CHOICE {
+  item  [0]  OBJECT-CLASS.&id,
+  and   [1]  SET SIZE (1..MAX) OF Refinement,
+  or    [2]  SET SIZE (1..MAX) OF Refinement,
+  not   [3]  Refinement
+}
+
+-- OBJECT-CLASS information object class specification
+OBJECT-CLASS ::= CLASS {
+  &Superclasses         OBJECT-CLASS OPTIONAL,
+  &kind                 ObjectClassKind DEFAULT structural,
+  &MandatoryAttributes  ATTRIBUTE OPTIONAL,
+  &OptionalAttributes   ATTRIBUTE OPTIONAL,
+  &id                   OBJECT IDENTIFIER UNIQUE
+}
+WITH SYNTAX {
+  [SUBCLASS OF &Superclasses]
+  [KIND &kind]
+  [MUST CONTAIN &MandatoryAttributes]
+  [MAY CONTAIN &OptionalAttributes]
+  ID &id
+}
+
+ObjectClassKind ::= ENUMERATED {abstract(0), structural(1), auxiliary(2)}
+
+-- object classes
+top OBJECT-CLASS ::= {
+  KIND          abstract
+  MUST CONTAIN  {objectClass}
+  ID            id-oc-top
+}
+
+alias OBJECT-CLASS ::= {
+  SUBCLASS OF   {top}
+  MUST CONTAIN  {aliasedEntryName}
+  ID            id-oc-alias
+}
+
+parent OBJECT-CLASS ::= {KIND  abstract
+                         ID    id-oc-parent
+}
+
+child OBJECT-CLASS ::= {KIND  auxiliary
+                        ID    id-oc-child
+}
+
+-- ATTRIBUTE information object class specification
+ATTRIBUTE ::= CLASS {
+  &derivation            ATTRIBUTE OPTIONAL,
+  &Type                  OPTIONAL, -- either &Type or &derivation required
+  &equality-match        MATCHING-RULE OPTIONAL,
+  &ordering-match        MATCHING-RULE OPTIONAL,
+  &substrings-match      MATCHING-RULE OPTIONAL,
+  &single-valued         BOOLEAN DEFAULT FALSE,
+  &collective            BOOLEAN DEFAULT FALSE,
+  &dummy                 BOOLEAN DEFAULT FALSE,
+  -- operational extensions
+  &no-user-modification  BOOLEAN DEFAULT FALSE,
+  &usage                 AttributeUsage DEFAULT userApplications,
+  &id                    OBJECT IDENTIFIER UNIQUE
+}
+WITH SYNTAX {
+  [SUBTYPE OF &derivation]
+  [WITH SYNTAX &Type]
+  [EQUALITY MATCHING RULE &equality-match]
+  [ORDERING MATCHING RULE &ordering-match]
+  [SUBSTRINGS MATCHING RULE &substrings-match]
+  [SINGLE VALUE &single-valued]
+  [COLLECTIVE &collective]
+  [DUMMY &dummy]
+  [NO USER MODIFICATION &no-user-modification]
+  [USAGE &usage]
+  ID &id
+}
+
+AttributeUsage ::= ENUMERATED {
+  userApplications(0), directoryOperation(1), distributedOperation(2),
+  dSAOperation(3)}
+
+-- attributes
+objectClass ATTRIBUTE ::= {
+  WITH SYNTAX             OBJECT IDENTIFIER
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  ID                      id-at-objectClass
+}
+
+aliasedEntryName ATTRIBUTE ::= {
+  WITH SYNTAX             DistinguishedName
+  EQUALITY MATCHING RULE  distinguishedNameMatch
+  SINGLE VALUE            TRUE
+  ID                      id-at-aliasedEntryName
+}
+
+-- MATCHING-RULE information object class specification
+MATCHING-RULE ::= CLASS {
+  &ParentMatchingRules   MATCHING-RULE OPTIONAL,
+  &AssertionType         OPTIONAL,
+  &uniqueMatchIndicator  ATTRIBUTE OPTIONAL,
+  &id                    OBJECT IDENTIFIER UNIQUE
+}
+WITH SYNTAX {
+  [PARENT &ParentMatchingRules]
+  [SYNTAX &AssertionType]
+  [UNIQUE-MATCH-INDICATOR &uniqueMatchIndicator]
+  ID &id
+}
+
+-- matching rules
+objectIdentifierMatch MATCHING-RULE ::= {
+  SYNTAX  OBJECT IDENTIFIER
+  ID      id-mr-objectIdentifierMatch
+}
+
+distinguishedNameMatch MATCHING-RULE ::= {
+  SYNTAX  DistinguishedName
+  ID      id-mr-distinguishedNameMatch
+}
+
+MAPPING-BASED-MATCHING{SelectedBy, BOOLEAN:combinable, MappingResult,
+                       OBJECT IDENTIFIER:matchingRule} ::= CLASS {
+  &selectBy          SelectedBy OPTIONAL,
+  &ApplicableTo      ATTRIBUTE,
+  &subtypesIncluded  BOOLEAN DEFAULT TRUE,
+  &combinable        BOOLEAN(combinable),
+  &mappingResults    MappingResult OPTIONAL,
+  &userControl       BOOLEAN DEFAULT FALSE,
+  &exclusive         BOOLEAN DEFAULT TRUE,
+  &matching-rule     MATCHING-RULE.&id(matchingRule),
+  &id                OBJECT IDENTIFIER UNIQUE
+}
+WITH SYNTAX {
+  [SELECT BY &selectBy]
+  APPLICABLE TO &ApplicableTo
+  [SUBTYPES INCLUDED &subtypesIncluded]
+  COMBINABLE &combinable
+  [MAPPING RESULTS &mappingResults]
+  [USER CONTROL &userControl]
+  [EXCLUSIVE &exclusive]
+  MATCHING RULE &matching-rule
+  ID &id
+}
+
+-- NAME-FORM information object class specification
+NAME-FORM ::= CLASS {
+  &namedObjectClass     OBJECT-CLASS,
+  &MandatoryAttributes  ATTRIBUTE,
+  &OptionalAttributes   ATTRIBUTE OPTIONAL,
+  &id                   OBJECT IDENTIFIER UNIQUE
+}
+WITH SYNTAX {
+  NAMES &namedObjectClass
+  WITH ATTRIBUTES &MandatoryAttributes
+  [AND OPTIONALLY &OptionalAttributes]
+  ID &id
+}
+
+-- STRUCTURE-RULE class and DIT structure rule data types
+DITStructureRule ::= SEQUENCE {
+  ruleIdentifier          RuleIdentifier,
+  -- shall be unique within the scope of the subschema
+  nameForm                NAME-FORM.&id,
+  superiorStructureRules  SET SIZE (1..MAX) OF RuleIdentifier OPTIONAL
+}
+
+RuleIdentifier ::= INTEGER
+
+STRUCTURE-RULE ::= CLASS {
+  &nameForm                NAME-FORM,
+  &SuperiorStructureRules  STRUCTURE-RULE OPTIONAL,
+  &id                      RuleIdentifier
+}
+WITH SYNTAX {
+  NAME FORM &nameForm
+  [SUPERIOR RULES &SuperiorStructureRules]
+  ID &id
+}
+
+-- DIT content rule data type and CONTENT-RULE class
+DITContentRule ::= SEQUENCE {
+  structuralObjectClass  OBJECT-CLASS.&id,
+  auxiliaries            SET SIZE (1..MAX) OF OBJECT-CLASS.&id OPTIONAL,
+  mandatory              [1]  SET SIZE (1..MAX) OF ATTRIBUTE.&id OPTIONAL,
+  optional               [2]  SET SIZE (1..MAX) OF ATTRIBUTE.&id OPTIONAL,
+  precluded              [3]  SET SIZE (1..MAX) OF ATTRIBUTE.&id OPTIONAL
+}
+
+CONTENT-RULE ::= CLASS {
+  &structuralClass  OBJECT-CLASS.&id UNIQUE,
+  &Auxiliaries      OBJECT-CLASS OPTIONAL,
+  &Mandatory        ATTRIBUTE OPTIONAL,
+  &Optional         ATTRIBUTE OPTIONAL,
+  &Precluded        ATTRIBUTE OPTIONAL
+}
+WITH SYNTAX {
+  STRUCTURAL OBJECT-CLASS &structuralClass
+  [AUXILIARY OBJECT-CLASSES &Auxiliaries]
+  [MUST CONTAIN &Mandatory]
+  [MAY CONTAIN &Optional]
+  [MUST-NOT CONTAIN &Precluded]
+}
+
+CONTEXT ::= CLASS {
+  &Type          ,
+  &DefaultValue  OPTIONAL,
+  &Assertion     OPTIONAL,
+  &absentMatch   BOOLEAN DEFAULT TRUE,
+  &id            OBJECT IDENTIFIER UNIQUE
+}
+WITH SYNTAX {
+  WITH SYNTAX &Type
+  [DEFAULT-VALUE &DefaultValue]
+  [ASSERTED AS &Assertion]
+  [ABSENT-MATCH &absentMatch]
+  ID &id
+}
+
+DITContextUse ::= SEQUENCE {
+  attributeType      ATTRIBUTE.&id,
+  mandatoryContexts  [1]  SET SIZE (1..MAX) OF CONTEXT.&id OPTIONAL,
+  optionalContexts   [2]  SET SIZE (1..MAX) OF CONTEXT.&id OPTIONAL
+}
+
+DIT-CONTEXT-USE-RULE ::= CLASS {
+  &attributeType  ATTRIBUTE.&id UNIQUE,
+  &Mandatory      CONTEXT OPTIONAL,
+  &Optional       CONTEXT OPTIONAL
+}
+WITH SYNTAX {
+  ATTRIBUTE TYPE &attributeType
+  [MANDATORY CONTEXTS &Mandatory]
+  [OPTIONAL CONTEXTS &Optional]
+}
+
+FRIENDS ::= CLASS {
+  &anchor   ATTRIBUTE.&id UNIQUE,
+  &Friends  ATTRIBUTE
+}WITH SYNTAX {ANCHOR &anchor
+              FRIENDS &Friends
+}
+
+-- system schema information objects
+-- object classes
+subentry OBJECT-CLASS ::= {
+  SUBCLASS OF   {top}
+  KIND          structural
+  MUST CONTAIN  {commonName | subtreeSpecification}
+  ID            id-sc-subentry
+}
+
+subentryNameForm NAME-FORM ::= {
+  NAMES            subentry
+  WITH ATTRIBUTES  {commonName}
+  ID               id-nf-subentryNameForm
+}
+
+subtreeSpecification ATTRIBUTE ::= {
+  WITH SYNTAX  SubtreeSpecification
+  USAGE        directoryOperation
+  ID           id-oa-subtreeSpecification
+}
+
+administrativeRole ATTRIBUTE ::= {
+  WITH SYNTAX             OBJECT-CLASS.&id
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  USAGE                   directoryOperation
+  ID                      id-oa-administrativeRole
+}
+
+createTimestamp ATTRIBUTE ::= {
+  WITH SYNTAX             GeneralizedTime
+  -- as per 46.3 b) or c) of ITU-T Rec. X.680 | ISO/IEC 8824-1
+  EQUALITY MATCHING RULE  generalizedTimeMatch
+  ORDERING MATCHING RULE  generalizedTimeOrderingMatch
+  SINGLE VALUE            TRUE
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-createTimestamp
+}
+
+modifyTimestamp ATTRIBUTE ::= {
+  WITH SYNTAX             GeneralizedTime
+  -- as per 46.3 b) or c) of ITU-T Rec. X.680 | ISO/IEC 8824-1
+  EQUALITY MATCHING RULE  generalizedTimeMatch
+  ORDERING MATCHING RULE  generalizedTimeOrderingMatch
+  SINGLE VALUE            TRUE
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-modifyTimestamp
+}
+
+subschemaTimestamp ATTRIBUTE ::= {
+  WITH SYNTAX             GeneralizedTime
+  -- as per 46.3 b) or c) of ITU-T Rec. X.680 | ISO/IEC 8824-1
+  EQUALITY MATCHING RULE  generalizedTimeMatch
+  ORDERING MATCHING RULE  generalizedTimeOrderingMatch
+  SINGLE VALUE            TRUE
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-subschemaTimestamp
+}
+
+creatorsName ATTRIBUTE ::= {
+  WITH SYNTAX             DistinguishedName
+  EQUALITY MATCHING RULE  distinguishedNameMatch
+  SINGLE VALUE            TRUE
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-creatorsName
+}
+
+modifiersName ATTRIBUTE ::= {
+  WITH SYNTAX             DistinguishedName
+  EQUALITY MATCHING RULE  distinguishedNameMatch
+  SINGLE VALUE            TRUE
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-modifiersName
+}
+
+subschemaSubentryList ATTRIBUTE ::= {
+  WITH SYNTAX             DistinguishedName
+  EQUALITY MATCHING RULE  distinguishedNameMatch
+  SINGLE VALUE            TRUE
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-subschemaSubentryList
+}
+
+accessControlSubentryList ATTRIBUTE ::= {
+  WITH SYNTAX             DistinguishedName
+  EQUALITY MATCHING RULE  distinguishedNameMatch
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-accessControlSubentryList
+}
+
+collectiveAttributeSubentryList ATTRIBUTE ::= {
+  WITH SYNTAX             DistinguishedName
+  EQUALITY MATCHING RULE  distinguishedNameMatch
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-collectiveAttributeSubentryList
+}
+
+contextDefaultSubentryList ATTRIBUTE ::= {
+  WITH SYNTAX             DistinguishedName
+  EQUALITY MATCHING RULE  distinguishedNameMatch
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-contextDefaultSubentryList
+}
+
+serviceAdminSubentryList ATTRIBUTE ::= {
+  WITH SYNTAX             DistinguishedName
+  EQUALITY MATCHING RULE  distinguishedNameMatch
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-serviceAdminSubentryList
+}
+
+hasSubordinates ATTRIBUTE ::= {
+  WITH SYNTAX             BOOLEAN
+  EQUALITY MATCHING RULE  booleanMatch
+  SINGLE VALUE            TRUE
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-hasSubordinates
+}
+
+accessControlSubentry OBJECT-CLASS ::= {
+  KIND  auxiliary
+  ID    id-sc-accessControlSubentry
+}
+
+collectiveAttributeSubentry OBJECT-CLASS ::= {
+  KIND  auxiliary
+  ID    id-sc-collectiveAttributeSubentry
+}
+
+collectiveExclusions ATTRIBUTE ::= {
+  WITH SYNTAX             OBJECT IDENTIFIER
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  USAGE                   directoryOperation
+  ID                      id-oa-collectiveExclusions
+}
+
+contextAssertionSubentry OBJECT-CLASS ::= {
+  KIND          auxiliary
+  MUST CONTAIN  {contextAssertionDefaults}
+  ID            id-sc-contextAssertionSubentry
+}
+
+contextAssertionDefaults ATTRIBUTE ::= {
+  WITH SYNTAX             TypeAndContextAssertion
+  EQUALITY MATCHING RULE  objectIdentifierFirstComponentMatch
+  USAGE                   directoryOperation
+  ID                      id-oa-contextAssertionDefault
+}
+
+serviceAdminSubentry OBJECT-CLASS ::= {
+  KIND          auxiliary
+  MUST CONTAIN  {searchRules}
+  ID            id-sc-serviceAdminSubentry
+}
+
+searchRules ATTRIBUTE ::= {
+  WITH SYNTAX             SearchRuleDescription
+  EQUALITY MATCHING RULE  integerFirstComponentMatch
+  USAGE                   directoryOperation
+  ID                      id-oa-searchRules
+}
+
+SearchRuleDescription ::= SEQUENCE {
+  COMPONENTS OF SearchRule,
+  name         [28]  SET SIZE (1..MAX) OF UnboundedDirectoryString OPTIONAL,
+  description  [29]  UnboundedDirectoryString OPTIONAL
+}
+
+hierarchyLevel ATTRIBUTE ::= {
+  WITH SYNTAX             HierarchyLevel
+  EQUALITY MATCHING RULE  integerMatch
+  ORDERING MATCHING RULE  integerOrderingMatch
+  SINGLE VALUE            TRUE
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-hierarchyLevel
+}
+
+HierarchyLevel ::= INTEGER
+
+hierarchyBelow ATTRIBUTE ::= {
+  WITH SYNTAX             HierarchyBelow
+  EQUALITY MATCHING RULE  booleanMatch
+  SINGLE VALUE            TRUE
+  NO USER MODIFICATION    TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-hierarchyBelow
+}
+
+HierarchyBelow ::= BOOLEAN
+
+hierarchyParent ATTRIBUTE ::= {
+  WITH SYNTAX             DistinguishedName
+  EQUALITY MATCHING RULE  distinguishedNameMatch
+  SINGLE VALUE            TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-hierarchyParent
+}
+
+hierarchyTop ATTRIBUTE ::= {
+  WITH SYNTAX             DistinguishedName
+  EQUALITY MATCHING RULE  distinguishedNameMatch
+  SINGLE VALUE            TRUE
+  USAGE                   directoryOperation
+  ID                      id-oa-hierarchyTop
+}
+
+-- object identifier assignments
+-- object classes
+id-oc-top OBJECT IDENTIFIER ::=
+  {id-oc 0}
+
+id-oc-alias OBJECT IDENTIFIER ::= {id-oc 1}
+
+id-oc-parent OBJECT IDENTIFIER ::= {id-oc 28}
+
+id-oc-child OBJECT IDENTIFIER ::= {id-oc 29}
+
+-- attributes
+id-at-objectClass OBJECT IDENTIFIER ::= {id-at 0}
+
+id-at-aliasedEntryName OBJECT IDENTIFIER ::= {id-at 1}
+
+-- matching rules
+id-mr-objectIdentifierMatch OBJECT IDENTIFIER ::= {id-mr 0}
+
+id-mr-distinguishedNameMatch OBJECT IDENTIFIER ::= {id-mr 1}
+
+-- operational attributes
+id-oa-excludeAllCollectiveAttributes OBJECT IDENTIFIER ::=
+  {id-oa 0}
+
+id-oa-createTimestamp OBJECT IDENTIFIER ::= {id-oa 1}
+
+id-oa-modifyTimestamp OBJECT IDENTIFIER ::= {id-oa 2}
+
+id-oa-creatorsName OBJECT IDENTIFIER ::= {id-oa 3}
+
+id-oa-modifiersName OBJECT IDENTIFIER ::= {id-oa 4}
+
+id-oa-administrativeRole OBJECT IDENTIFIER ::= {id-oa 5}
+
+id-oa-subtreeSpecification OBJECT IDENTIFIER ::= {id-oa 6}
+
+id-oa-collectiveExclusions OBJECT IDENTIFIER ::= {id-oa 7}
+
+id-oa-subschemaTimestamp OBJECT IDENTIFIER ::= {id-oa 8}
+
+id-oa-hasSubordinates OBJECT IDENTIFIER ::= {id-oa 9}
+
+id-oa-subschemaSubentryList OBJECT IDENTIFIER ::= {id-oa 10}
+
+id-oa-accessControlSubentryList OBJECT IDENTIFIER ::= {id-oa 11}
+
+id-oa-collectiveAttributeSubentryList OBJECT IDENTIFIER ::= {id-oa 12}
+
+id-oa-contextDefaultSubentryList OBJECT IDENTIFIER ::= {id-oa 13}
+
+id-oa-contextAssertionDefault OBJECT IDENTIFIER ::= {id-oa 14}
+
+id-oa-serviceAdminSubentryList OBJECT IDENTIFIER ::= {id-oa 15}
+
+id-oa-searchRules OBJECT IDENTIFIER ::= {id-oa 16}
+
+id-oa-hierarchyLevel OBJECT IDENTIFIER ::= {id-oa 17}
+
+id-oa-hierarchyBelow OBJECT IDENTIFIER ::= {id-oa 18}
+
+id-oa-hierarchyParent OBJECT IDENTIFIER ::= {id-oa 19}
+
+id-oa-hierarchyTop OBJECT IDENTIFIER ::= {id-oa 20}
+
+-- subentry classes
+id-sc-subentry OBJECT IDENTIFIER ::= {id-sc 0}
+
+id-sc-accessControlSubentry OBJECT IDENTIFIER ::= {id-sc 1}
+
+id-sc-collectiveAttributeSubentry OBJECT IDENTIFIER ::= {id-sc 2}
+
+id-sc-contextAssertionSubentry OBJECT IDENTIFIER ::= {id-sc 3}
+
+id-sc-serviceAdminSubentry OBJECT IDENTIFIER ::= {id-sc 4}
+
+--  Name forms
+id-nf-subentryNameForm OBJECT IDENTIFIER ::= {id-nf 16}
+
+-- administrative roles
+id-ar-autonomousArea OBJECT IDENTIFIER ::= {id-ar 1}
+
+id-ar-accessControlSpecificArea OBJECT IDENTIFIER ::= {id-ar 2}
+
+id-ar-accessControlInnerArea OBJECT IDENTIFIER ::= {id-ar 3}
+
+id-ar-subschemaAdminSpecificArea OBJECT IDENTIFIER ::= {id-ar 4}
+
+id-ar-collectiveAttributeSpecificArea OBJECT IDENTIFIER ::= {id-ar 5}
+
+id-ar-collectiveAttributeInnerArea OBJECT IDENTIFIER ::= {id-ar 6}
+
+id-ar-contextDefaultSpecificArea OBJECT IDENTIFIER ::= {id-ar 7}
+
+id-ar-serviceSpecificArea OBJECT IDENTIFIER ::= {id-ar 8}
+
+END -- InformationFramework
diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
index 943d97bdb8..763b788e53 100644
--- a/lib/public_key/asn1/Makefile
+++ b/lib/public_key/asn1/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2008-2011. All Rights Reserved.
+# Copyright Ericsson AB 2008-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -40,7 +40,8 @@ RELSYSDIR = $(RELEASE_PATH)/lib/public_key-$(VSN)
 
 ASN_TOP = OTP-PUB-KEY PKCS-FRAME
 ASN_MODULES = PKIX1Explicit88 PKIX1Implicit88 PKIX1Algorithms88 \
-	PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-8 PKCS5v2-0  OTP-PKIX 
+	PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-7 PKCS-8 PKCS-10 PKCS5v2-0 OTP-PKIX \
+	InformationFramework
 ASN_ASNS = $(ASN_MODULES:%=%.asn1)
 ASN_ERLS = $(ASN_TOP:%=%.erl)
 ASN_HRLS = $(ASN_TOP:%=%.hrl)
@@ -65,7 +66,7 @@ EBIN = ../ebin
 EXTRA_ERLC_FLAGS = 
 ERL_COMPILE_FLAGS += $(EXTRA_ERLC_FLAGS)
 
-ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj +asn1config +inline +nif
+ASN_FLAGS = -bber +der +compact_bit_string +noobj +asn1config +inline
 
 # ----------------------------------------------------
 # Targets
@@ -91,13 +92,13 @@ $(INCLUDE)/%.hrl: %.hrl
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/asn1
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
 	$(INSTALL_DATA) $(ASN_ASNS) $(ASN_ERLS) $(ASN_HRLS) $(ASN_CONFIGS) \
-		 $(GEN_ERLS) $(RELSYSDIR)/asn1
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+		 $(GEN_ERLS) "$(RELSYSDIR)/asn1"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
@@ -112,9 +113,12 @@ OTP-PUB-KEY.asn1db:		PKIX1Algorithms88.asn1 \
 				PKIXAttributeCertificate.asn1 \
 				PKCS-1.asn1\
 				PKCS-3.asn1\
+		                PKCS-7.asn1\
+				PKCS-10.asn1\
+				InformationFramework.asn1\
 				OTP-PKIX.asn1
 
 $(EBIN)/PKCS-FRAME.beam: 	        PKCS-FRAME.erl PKCS-FRAME.hrl
-PKCS-FRAME.erl PKCS-FRAME.hrl:			PKCS-FRAME.asn1db
-PKCS-FRAME.asn1db:			PKCS-8.asn1\
-					PKCS5v2-0.asn1
\ No newline at end of file
+PKCS-FRAME.erl PKCS-FRAME.hrl:	        PKCS-FRAME.asn1db
+PKCS-FRAME.asn1db:			PKCS5v2-0.asn1\
+					PKCS-8.asn1\
diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1
index fbf531df40..4f20208bce 100644
--- a/lib/public_key/asn1/OTP-PKIX.asn1
+++ b/lib/public_key/asn1/OTP-PKIX.asn1
@@ -119,6 +119,7 @@ IMPORTS
        md2WithRSAEncryption,
        md5WithRSAEncryption,
        sha1WithRSAEncryption,
+       sha224WithRSAEncryption,
        sha256WithRSAEncryption,
        sha384WithRSAEncryption,
        sha512WithRSAEncryption	     
@@ -225,7 +226,17 @@ dnQualifier ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
 
 countryName ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
 	ID id-at-countryName
-	TYPE X520countryName }
+        TYPE X520countryName } -- this is currently not used when decoding
+ -- The decoding and mapping between ID and Type is done in the code
+ -- in module publickey_cert_records via the function attribute_type
+ -- To be more forgiving and compatible with other SSL implementations
+ -- regarding how to handle and sometimes accept incorrect certificates
+ -- we define and use the type below instead of X520countryName
+
+ OTP-X520countryname ::= CHOICE {
+       printableString   PrintableString (SIZE (2)),
+       utf8String        UTF8String      (SIZE (2))
+}
 
 serialNumber ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
 	ID id-at-serialNumber
@@ -307,6 +318,7 @@ PublicKeyAlgorithm ::=  SEQUENCE  {
 SupportedSignatureAlgorithms SIGNATURE-ALGORITHM-CLASS ::= { 
 		    dsa-with-sha1 | md2-with-rsa-encryption |
 		    md5-with-rsa-encryption | sha1-with-rsa-encryption |
+		    sha224-with-rsa-encryption |
 		    sha256-with-rsa-encryption |
 		    sha384-with-rsa-encryption |
 		    sha512-with-rsa-encryption |
@@ -355,6 +367,10 @@ SupportedPublicKeyAlgorithms PUBLIC-KEY-ALGORITHM-CLASS ::= {
 			    ID sha1WithRSAEncryption 
 			    TYPE NULL }
 
+   sha224-with-rsa-encryption SIGNATURE-ALGORITHM-CLASS ::= {
+			    ID sha224WithRSAEncryption 
+			    TYPE NULL }
+
    sha256-with-rsa-encryption SIGNATURE-ALGORITHM-CLASS ::= {
 			    ID sha256WithRSAEncryption 
 			    TYPE NULL }
diff --git a/lib/public_key/asn1/OTP-PUB-KEY.set.asn b/lib/public_key/asn1/OTP-PUB-KEY.set.asn
index 5c76d13115..f8fb318c93 100644
--- a/lib/public_key/asn1/OTP-PUB-KEY.set.asn
+++ b/lib/public_key/asn1/OTP-PUB-KEY.set.asn
@@ -6,3 +6,5 @@ PKIX1Algorithms88.asn1
 PKCS-1.asn1
 PKCS-3.asn1
 DSS.asn1
+PKCS-7.asn1
+PKCS-10.asn1
diff --git a/lib/public_key/asn1/PKCS-1.asn1 b/lib/public_key/asn1/PKCS-1.asn1
index b06f5efa9d..c83289e779 100644
--- a/lib/public_key/asn1/PKCS-1.asn1
+++ b/lib/public_key/asn1/PKCS-1.asn1
@@ -33,6 +33,9 @@ sha1WithRSAEncryption      OBJECT IDENTIFIER ::= { pkcs-1 5 }
 sha256WithRSAEncryption    OBJECT IDENTIFIER ::= { pkcs-1 11 }
 sha384WithRSAEncryption    OBJECT IDENTIFIER ::= { pkcs-1 12 }
 sha512WithRSAEncryption    OBJECT IDENTIFIER ::= { pkcs-1 13 }
+sha224WithRSAEncryption    OBJECT IDENTIFIER  ::=  { pkcs-1 14 }
+
+
 
 id-sha1    OBJECT IDENTIFIER ::= {
     iso(1) identified-organization(3) oiw(14) secsig(3)
diff --git a/lib/public_key/asn1/PKCS-10.asn1 b/lib/public_key/asn1/PKCS-10.asn1
new file mode 100644
index 0000000000..333104d230
--- /dev/null
+++ b/lib/public_key/asn1/PKCS-10.asn1
@@ -0,0 +1,70 @@
+PKCS-10 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1)
+pkcs-10(10) modules(1) pkcs-10(1)}
+
+-- $Revision: 1.3 $ --
+
+DEFINITIONS IMPLICIT TAGS ::=
+
+BEGIN
+
+-- EXPORTS All --
+-- All types and values defined in this module are exported for use
+-- in other ASN.1 modules.
+
+IMPORTS
+
+--informationFramework, authenticationFramework
+--    FROM UsefulDefinitions {joint-iso-itu-t(2) ds(5) module(1)
+--    usefulDefinitions(0) 3}
+
+    ATTRIBUTE
+    FROM InformationFramework informationFramework
+
+    Name
+    FROM PKIX1Explicit88 --InformationFramework informationFramework
+
+    ALGORITHM
+       FROM PKCS-7; --AuthenticationFramework authenticationFramework;
+
+-- Certificate requests
+
+CertificationRequestInfo ::= SEQUENCE {
+    version       INTEGER { v1(0) } (v1,...),
+    subject       Name,
+    subjectPKInfo SubjectPublicKeyInfo-PKCS-10{{ PKInfoAlgorithms }},
+    attributes    [0] Attributes{{ CRIAttributes }}
+}
+
+SubjectPublicKeyInfo-PKCS-10 {ALGORITHM: IOSet} ::= SEQUENCE {
+    algorithm		AlgorithmIdentifierPKCS-10{{IOSet}},
+    subjectPublicKey 	BIT STRING
+}
+
+PKInfoAlgorithms ALGORITHM ::= {
+    ... -- add any locally defined algorithms here -- }
+
+Attributes { ATTRIBUTE:IOSet } ::= SET OF AttributePKCS-10{{ IOSet }}
+
+CRIAttributes  ATTRIBUTE  ::= {
+... -- add any locally defined attributes here -- }
+
+AttributePKCS-10 { ATTRIBUTE:IOSet } ::= SEQUENCE {
+    type   	ATTRIBUTE.&id({IOSet}),
+    values 	SET SIZE(1..MAX) OF ATTRIBUTE.&Type({IOSet}{@type})
+}
+
+CertificationRequest ::= SEQUENCE {
+    certificationRequestInfo CertificationRequestInfo,
+    signatureAlgorithm	     AlgorithmIdentifierPKCS-10{{ SignatureAlgorithms }},
+    signature                BIT STRING
+}
+
+AlgorithmIdentifierPKCS-10 {ALGORITHM:IOSet } ::= SEQUENCE {
+    algorithm  	ALGORITHM.&id({IOSet}),
+    parameters 	ALGORITHM.&Type({IOSet}{@algorithm}) OPTIONAL
+}
+
+SignatureAlgorithms ALGORITHM ::= {
+    ... -- add any locally defined algorithms here -- }
+
+END
diff --git a/lib/public_key/asn1/PKCS-7.asn1 b/lib/public_key/asn1/PKCS-7.asn1
new file mode 100644
index 0000000000..a6dfd57d80
--- /dev/null
+++ b/lib/public_key/asn1/PKCS-7.asn1
@@ -0,0 +1,387 @@
+PKCS-7 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-7(7)
+        modules(0) pkcs-7(1)}
+
+DEFINITIONS EXPLICIT TAGS ::=
+BEGIN
+
+--
+-- 3. Definitions
+--
+
+-- EXPORTS All;
+
+IMPORTS
+
+informationFramework, authenticationFramework
+    FROM UsefulDefinitions {joint-iso-itu-t ds(5) module(1)
+                            usefulDefinitions(0) 3}
+
+  ATTRIBUTE
+    FROM InformationFramework informationFramework
+
+  Name, Certificate, CertificateSerialNumber,
+    CertificateList, Time
+    FROM PKIX1Explicit88; -- AuthenticationFramework authenticationFramework;
+
+--  contentType, messageDigest, signingTime
+-- , counterSignature
+--    FROM PKCS-9 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1)
+--                 pkcs-9(9) modules(0) pkcs-9(1)};
+--
+-- 6. Useful types
+--
+
+-- inlined from AuthenticationFramework
+
+ALGORITHM ::= CLASS {&Type  OPTIONAL,
+                     &id    OBJECT IDENTIFIER UNIQUE
+}WITH SYNTAX {[&Type]
+              IDENTIFIED BY &id
+}
+
+-- inlined from PKCS-9
+
+pkcs-9 OBJECT IDENTIFIER ::= {iso(1) member-body(2) us(840)
+                              rsadsi(113549) pkcs(1) 9}
+
+contentType ATTRIBUTE ::= {
+        WITH SYNTAX ContentType
+--        EQUALITY MATCHING RULE objectIdentifierMatch
+        SINGLE VALUE TRUE
+        ID pkcs-9-at-contentType
+}
+
+pkcs-9-at-contentType                   OBJECT IDENTIFIER ::= {pkcs-9 3}
+pkcs-9-at-messageDigest                 OBJECT IDENTIFIER ::= {pkcs-9 4}
+pkcs-9-at-signingTime                   OBJECT IDENTIFIER ::= {pkcs-9 5}
+pkcs-9-at-counterSignature              OBJECT IDENTIFIER ::= {pkcs-9 6}
+
+counterSignature ATTRIBUTE ::= {
+        WITH SYNTAX SignerInfo
+        ID pkcs-9-at-counterSignature
+}
+messageDigest ATTRIBUTE ::= {
+        WITH SYNTAX MessageDigest
+--        EQUALITY MATCHING RULE octetStringMatch
+        SINGLE VALUE TRUE
+        ID pkcs-9-at-messageDigest
+}
+
+MessageDigest ::= OCTET STRING
+
+signingTime ATTRIBUTE ::= {
+        WITH SYNTAX SigningTime
+--        EQUALITY MATCHING RULE signingTimeMatch
+        SINGLE VALUE TRUE
+        ID pkcs-9-at-signingTime
+}
+
+SigningTime ::= Time -- imported from ISO/IEC 9594-8
+
+
+-- Also defined in X.509
+-- Redeclared here as a parameterized type
+AlgorithmIdentifierPKSC-7 {ALGORITHM:IOSet} ::= SEQUENCE {
+   algorithm   ALGORITHM.&id({IOSet}),
+   parameters  ALGORITHM.&Type({IOSet}{@algorithm}) OPTIONAL
+}
+
+-- Also defined in X.501
+-- Redeclared here as a parameterized type
+AttributePKCS-7 { ATTRIBUTE:IOSet } ::= SEQUENCE {
+   type    ATTRIBUTE.&id({IOSet}),
+   values  SET SIZE (1..MAX) OF ATTRIBUTE.&Type({IOSet}{@type})
+}
+
+CertificateRevocationLists ::=
+  SET OF CertificateList
+
+Certificates ::=
+  SEQUENCE OF Certificate
+
+CRLSequence ::=
+  SEQUENCE OF CertificateList
+
+ContentEncryptionAlgorithmIdentifier ::=
+  AlgorithmIdentifierPKSC-7 {{ContentEncryptionAlgorithms}}
+
+ContentEncryptionAlgorithms ALGORITHM ::= {
+  ...  -- add any application-specific algorithms here
+}
+
+DigestAlgorithmIdentifier ::=
+  AlgorithmIdentifierPKSC-7 {{DigestAlgorithms}}
+
+DigestAlgorithms ALGORITHM ::= {
+   ...  -- add any application-specific algorithms here
+}
+
+DigestEncryptionAlgorithmIdentifier ::=
+  AlgorithmIdentifierPKSC-7 {{DigestEncryptionAlgorithms}}
+
+DigestEncryptionAlgorithms ALGORITHM ::= {
+  ...  -- add any application-specific algorithms here
+}
+
+ExtendedCertificateOrCertificate ::= CHOICE {
+  certificate          Certificate,                      -- X.509
+  extendedCertificate  [0] IMPLICIT ExtendedCertificate  -- PKCS#6
+}
+
+ExtendedCertificate ::= Certificate -- cheating
+
+ExtendedCertificatesAndCertificates ::=
+  SET OF ExtendedCertificateOrCertificate
+
+IssuerAndSerialNumber ::= SEQUENCE {
+  issuer        Name,
+  serialNumber  CertificateSerialNumber
+}
+
+KeyEncryptionAlgorithmIdentifier ::=
+  AlgorithmIdentifierPKSC-7 {{KeyEncryptionAlgorithms}}
+
+KeyEncryptionAlgorithms ALGORITHM ::= {
+  ...  -- add any application-specific algorithms here
+}
+
+--
+-- 7. General syntax
+--
+
+ContentInfo ::= SEQUENCE {
+--  contentType  ContentType,
+  contentType  CONTENTS.&id({Contents}),
+  content      [0] EXPLICIT CONTENTS.&Type({Contents}{@contentType})
+OPTIONAL
+}
+
+CONTENTS ::= TYPE-IDENTIFIER
+
+Contents CONTENTS ::= {
+  {Data                    IDENTIFIED BY data}                   |
+  {SignedData              IDENTIFIED BY signedData}             |
+  {EnvelopedData           IDENTIFIED BY envelopedData}          |
+  {SignedAndEnvelopedData  IDENTIFIED BY signedAndEnvelopedData} |
+  {DigestedData            IDENTIFIED BY digestedData}           |
+  {EncryptedData           IDENTIFIED BY encryptedData},
+  ...  -- add any application-specific types/contents here
+}
+
+ContentType ::= CONTENTS.&id({Contents})
+
+--
+-- 8. Data content type
+--
+
+Data ::= OCTET STRING
+
+--
+-- 9. Signed-data content type
+--
+
+SignedData ::= SEQUENCE {
+--  version         INTEGER {sdVer1(1), sdVer2(2)} (sdVer1 | sdVer2),
+  version         INTEGER {sdVer1(1), sdVer2(2)},
+  digestAlgorithms
+                  DigestAlgorithmIdentifiers,
+  contentInfo     ContentInfo,
+  certificates CHOICE {
+    certSet       [0] IMPLICIT ExtendedCertificatesAndCertificates,
+    certSequence  [2] IMPLICIT Certificates
+  } OPTIONAL,
+  crls CHOICE {
+    crlSet        [1] IMPLICIT CertificateRevocationLists,
+    crlSequence   [3] IMPLICIT CRLSequence
+  } OPTIONAL,
+  signerInfos     SignerInfos
+} (WITH COMPONENTS { ..., version (sdVer1),
+     digestAlgorithms   (WITH COMPONENTS { ..., daSet PRESENT }),
+     certificates       (WITH COMPONENTS { ..., certSequence ABSENT }),
+     crls               (WITH COMPONENTS { ..., crlSequence ABSENT }),
+     signerInfos        (WITH COMPONENTS { ..., siSet PRESENT })
+   } |
+   WITH COMPONENTS { ..., version (sdVer2),
+      digestAlgorithms  (WITH COMPONENTS { ..., daSequence PRESENT }),
+      certificates      (WITH COMPONENTS { ..., certSet ABSENT }),
+      crls              (WITH COMPONENTS { ..., crlSet ABSENT }),
+      signerInfos       (WITH COMPONENTS { ..., siSequence PRESENT })
+})
+
+SignerInfos ::= CHOICE {
+    siSet         SET OF SignerInfo,
+    siSequence    SEQUENCE OF SignerInfo
+}
+
+DigestAlgorithmIdentifiers ::= CHOICE {
+  daSet           SET OF DigestAlgorithmIdentifier,
+  daSequence      SEQUENCE OF DigestAlgorithmIdentifier
+}
+
+SignerInfo ::= SEQUENCE {
+--  version         INTEGER {siVer1(1), siVer2(2)} (siVer1 | siVer2),
+  version         INTEGER {siVer1(1), siVer2(2)},
+  issuerAndSerialNumber
+                  IssuerAndSerialNumber,
+  digestAlgorithm DigestAlgorithmIdentifier,
+  authenticatedAttributes CHOICE {
+    aaSet         [0] IMPLICIT SET OF AttributePKCS-7 {{Authenticated}},
+    aaSequence    [2] EXPLICIT SEQUENCE OF AttributePKCS-7 {{Authenticated}}
+    -- Explicit because easier to compute digest on sequence of attributes and then reuse
+    -- encoded sequence in aaSequence.
+  } OPTIONAL,
+  digestEncryptionAlgorithm
+                  DigestEncryptionAlgorithmIdentifier,
+  encryptedDigest EncryptedDigest,
+  unauthenticatedAttributes CHOICE {
+    uaSet         [1] IMPLICIT SET OF AttributePKCS-7 {{Unauthenticated}},
+    uaSequence    [3] IMPLICIT SEQUENCE OF AttributePKCS-7 {{Unauthenticated}}
+  } OPTIONAL
+} (WITH COMPONENTS { ..., version (siVer1),
+  authenticatedAttributes       (WITH COMPONENTS { ..., aaSequence ABSENT }),
+  unauthenticatedAttributes     (WITH COMPONENTS { ..., uaSequence ABSENT })
+} | WITH COMPONENTS { ..., version (siVer2),
+  authenticatedAttributes       (WITH COMPONENTS { ..., aaSet ABSENT }),
+  unauthenticatedAttributes     (WITH COMPONENTS { ..., uaSet ABSENT })
+})
+
+Authenticated ATTRIBUTE ::= {
+  contentType |
+  messageDigest,
+  ...,  -- add application-specific attributes here
+  signingTime
+}
+
+Unauthenticated ATTRIBUTE ::= {
+  contentType |
+  messageDigest,
+  ...,  -- add application-specific attributes here
+  counterSignature
+--  ...,  add application-specific attributes here
+--  counterSignature
+}
+
+EncryptedDigest ::= OCTET STRING
+
+DigestInfo ::= SEQUENCE {
+  digestAlgorithm DigestAlgorithmIdentifier,
+  digest          Digest
+}
+
+Digest ::= OCTET STRING
+
+--
+-- 10. Enveloped-data content type
+--
+
+EnvelopedData ::= SEQUENCE {
+--  version         INTEGER {edVer0(0), edVer1(1)} (edVer0 | edVer1),
+  version         INTEGER {edVer0(0), edVer1(1)},
+  recipientInfos  RecipientInfos,
+  encryptedContentInfo
+                  EncryptedContentInfo
+} (WITH COMPONENTS { ..., version (edVer0),
+    recipientInfos      (WITH COMPONENTS { ..., riSet PRESENT })
+} | WITH COMPONENTS { ..., version (edVer1),
+    recipientInfos      (WITH COMPONENTS { ..., riSequence PRESENT })
+})
+
+RecipientInfos ::= CHOICE {
+  riSet           SET OF RecipientInfo,
+  riSequence      SEQUENCE OF RecipientInfo
+}
+
+EncryptedContentInfo ::= SEQUENCE {
+  contentType     ContentType,
+  contentEncryptionAlgorithm
+                  ContentEncryptionAlgorithmIdentifier,
+  encryptedContent
+                  [0] IMPLICIT EncryptedContent OPTIONAL
+}
+
+EncryptedContent ::= OCTET STRING
+
+RecipientInfo ::= SEQUENCE {
+--  version         INTEGER {riVer0(0)} (riVer0),
+  version         INTEGER {riVer0(0)},
+  issuerAndSerialNumber
+                  IssuerAndSerialNumber,
+  keyEncryptionAlgorithm
+                  KeyEncryptionAlgorithmIdentifier,
+  encryptedKey    EncryptedKey
+}
+
+EncryptedKey ::= OCTET STRING
+
+--
+-- 11. Signed-and-enveloped-data content type
+--
+
+SignedAndEnvelopedData ::= SEQUENCE {
+--  version         INTEGER {seVer1(1), seVer2(2)} (seVer1 | seVer2),
+  version         INTEGER {seVer1(1), seVer2(2)},
+  recipientInfos  RecipientInfos,
+  digestAlgorithms
+                  DigestAlgorithmIdentifiers,
+  encryptedContentInfo
+                  EncryptedContentInfo,
+  certificates CHOICE {
+    certSet       [0] IMPLICIT ExtendedCertificatesAndCertificates,
+    certSequence  [2] IMPLICIT Certificates
+  } OPTIONAL,
+  crls CHOICE {
+    crlSet        [1] IMPLICIT CertificateRevocationLists,
+    crlSequence   [3] IMPLICIT CRLSequence
+  } OPTIONAL,
+  signerInfos     SignerInfos
+} (WITH COMPONENTS { ..., version (seVer1),
+    recipientInfos   (WITH COMPONENTS { ..., riSet PRESENT }),
+    digestAlgorithms (WITH COMPONENTS { ..., daSet PRESENT }),
+    certificates     (WITH COMPONENTS { ..., certSequence ABSENT }),
+    crls             (WITH COMPONENTS { ..., crlSequence ABSENT }),
+    signerInfos      (WITH COMPONENTS { ..., siSet PRESENT })
+} |
+  WITH COMPONENTS { ..., version (seVer2),
+    recipientInfos   (WITH COMPONENTS { ..., riSequence PRESENT }),
+    digestAlgorithms (WITH COMPONENTS { ..., daSequence PRESENT }),
+    certificates     (WITH COMPONENTS { ..., certSet ABSENT }),
+    crls             (WITH COMPONENTS { ..., crlSet ABSENT }),
+    signerInfos      (WITH COMPONENTS { ..., siSequence PRESENT })
+})
+
+--
+-- 12. Digested-data content type
+--pbeWithSHAAnd3-KeyTripleDES-CBC
+
+DigestedData ::= SEQUENCE {
+--  version         INTEGER {ddVer0(0)} (ddVer0),
+  version         INTEGER {ddVer0(0)},
+  digestAlgorithm DigestAlgorithmIdentifier,
+  contentInfo     ContentInfo,
+  digest          Digest
+}
+
+--
+-- 13. Encrypted-data content type
+--
+
+EncryptedData ::= SEQUENCE {
+--  version		INTEGER {edVer0(0)} (edVer0),
+  version		INTEGER {edVer0(0)},
+  encryptedContentInfo  EncryptedContentInfo
+}
+
+--
+-- 14. Object Identifiers
+--
+
+pkcs-7                  OBJECT IDENTIFIER ::=
+  { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 7 }
+data                    OBJECT IDENTIFIER ::= { pkcs-7 1 }
+signedData              OBJECT IDENTIFIER ::= { pkcs-7 2 }
+envelopedData           OBJECT IDENTIFIER ::= { pkcs-7 3 }
+signedAndEnvelopedData  OBJECT IDENTIFIER ::= { pkcs-7 4 }
+digestedData            OBJECT IDENTIFIER ::= { pkcs-7 5 }
+encryptedData           OBJECT IDENTIFIER ::= { pkcs-7 6 }
+
+END
diff --git a/lib/public_key/asn1/PKIX1Explicit88.asn1 b/lib/public_key/asn1/PKIX1Explicit88.asn1
index 03e9da3e05..91758d7269 100644
--- a/lib/public_key/asn1/PKIX1Explicit88.asn1
+++ b/lib/public_key/asn1/PKIX1Explicit88.asn1
@@ -206,13 +206,12 @@ DomainComponent ::=     IA5String
 
 -- Legacy attributes
 
-pkcs-9 OBJECT IDENTIFIER ::=
-       { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 9 }
-
 id-emailAddress          AttributeType ::= { pkcs-9 1 }
 
 EmailAddress ::=         IA5String (SIZE (1..ub-emailaddress-length))
 
+-- Legacy attributes
+
 -- naming data types --
 
 Name ::= CHOICE { -- only one possibility for now --
diff --git a/lib/public_key/asn1/SelectedAttributeTypes.asn1 b/lib/public_key/asn1/SelectedAttributeTypes.asn1
new file mode 100644
index 0000000000..3ef7077370
--- /dev/null
+++ b/lib/public_key/asn1/SelectedAttributeTypes.asn1
@@ -0,0 +1,1575 @@
+SelectedAttributeTypes {joint-iso-itu-t ds(5) module(1)
+  selectedAttributeTypes(5) 6} DEFINITIONS ::=
+BEGIN
+
+-- EXPORTS All
+-- The types and values defined in this module are exported for use in the other ASN.1 modules contained
+-- within the Directory Specifications, and for the use of other applications which will use them to access
+-- Directory services. Other applications may use them for their own purposes, but this will not constrain
+-- extensions and modifications needed to maintain or improve the Directory service.
+IMPORTS
+  -- from ITU-T Rec. X.501 | ISO/IEC 9594-2
+  directoryAbstractService, id-at, id-avc, id-cat, id-mr, id-not, id-pr,
+    informationFramework, serviceAdministration
+    FROM UsefulDefinitions {joint-iso-itu-t ds(5) module(1)
+      usefulDefinitions(0) 6}
+  Attribute{}, ATTRIBUTE, AttributeType, AttributeValueAssertion, CONTEXT,
+    ContextAssertion, DistinguishedName, distinguishedNameMatch,
+    MAPPING-BASED-MATCHING{}, MATCHING-RULE, OBJECT-CLASS,
+    objectIdentifierMatch, SupportedAttributes
+    FROM InformationFramework informationFramework
+  AttributeCombination, ContextCombination, MRMapping
+    FROM ServiceAdministration serviceAdministration
+  -- from ITU-T Rec. X.511 | ISO/IEC 9594-3
+  FilterItem, HierarchySelections, SearchControlOptions, ServiceControlOptions
+    FROM DirectoryAbstractService directoryAbstractService
+  -- from ITU-T Rec. X.411 | ISO/IEC 10021-4
+  G3FacsimileNonBasicParameters
+    FROM MTSAbstractService {joint-iso-itu-t mhs(6) mts(3) modules(0)
+      mts-abstract-service(1) version-1999(1)};
+
+/*from IETF RFC 3727
+
+The following import is provided for information only (see 7.2.16), it is not referenced by any ASN.1 construct within these Directory Specifications. Note that the ASN.1 module in RFC 3727 imports from the InformationFramework module of edition 4 of ITU-T Rec. X.501 | ISO/IEC 9594-2. A specification importing from both these Directory Specifications and from RFC 3727 should take corrective actions, e.g., by making a copy of the ASN.1 module of
+RFC 3727 and then update the IMPORT statement.
+
+	allComponentsMatch, componentFilterMatch, directoryComponentsMatch, presentMatch, rdnMatch
+		FROM ComponentMatching {iso(1) 2 36 79672281 xed(3) module (0)
+		component-matching(4)} */
+-- Directory string type
+UnboundedDirectoryString ::= CHOICE {
+  teletexString    TeletexString(SIZE (1..MAX)),
+  printableString  PrintableString(SIZE (1..MAX)),
+  bmpString        BMPString(SIZE (1..MAX)),
+  universalString  UniversalString(SIZE (1..MAX)),
+  uTF8String       UTF8String(SIZE (1..MAX))
+}
+
+DirectoryString{INTEGER:maxSize} ::= CHOICE {
+  teletexString    TeletexString(SIZE (1..maxSize)),
+  printableString  PrintableString(SIZE (1..maxSize)),
+  bmpString        BMPString(SIZE (1..maxSize)),
+  universalString  UniversalString(SIZE (1..maxSize)),
+  uTF8String       UTF8String(SIZE (1..maxSize))
+}
+
+-- Attribute types
+knowledgeInformation ATTRIBUTE ::= {
+  WITH SYNTAX             UnboundedDirectoryString
+  EQUALITY MATCHING RULE  caseIgnoreMatch
+  ID                      id-at-knowledgeInformation
+}
+
+name ATTRIBUTE ::= {
+  WITH SYNTAX               UnboundedDirectoryString
+  EQUALITY MATCHING RULE    caseIgnoreMatch
+  SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+  ID                        id-at-name
+}
+
+commonName ATTRIBUTE ::= {
+  SUBTYPE OF   name
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-commonName
+}
+
+surname ATTRIBUTE ::= {
+  SUBTYPE OF   name
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-surname
+}
+
+givenName ATTRIBUTE ::= {
+  SUBTYPE OF   name
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-givenName
+}
+
+initials ATTRIBUTE ::= {
+  SUBTYPE OF   name
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-initials
+}
+
+generationQualifier ATTRIBUTE ::= {
+  SUBTYPE OF   name
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-generationQualifier
+}
+
+uniqueIdentifier ATTRIBUTE ::= {
+  WITH SYNTAX             UniqueIdentifier
+  EQUALITY MATCHING RULE  bitStringMatch
+  ID                      id-at-uniqueIdentifier
+}
+
+UniqueIdentifier ::= BIT STRING
+
+dnQualifier ATTRIBUTE ::= {
+  WITH SYNTAX               PrintableString
+  EQUALITY MATCHING RULE    caseIgnoreMatch
+  ORDERING MATCHING RULE    caseIgnoreOrderingMatch
+  SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+  ID                        id-at-dnQualifier
+}
+
+serialNumber ATTRIBUTE ::= {
+  WITH SYNTAX               PrintableString(SIZE (1..MAX))
+  EQUALITY MATCHING RULE    caseIgnoreMatch
+  SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+  ID                        id-at-serialNumber
+}
+
+pseudonym ATTRIBUTE ::= {
+  SUBTYPE OF   name
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-pseudonym
+}
+
+uUIDPair ATTRIBUTE ::= {
+  WITH SYNTAX             UUIDPair
+  EQUALITY MATCHING RULE  uUIDPairMatch
+  ID                      id-at-uuidpair
+}
+
+UUIDPair ::= SEQUENCE {issuerUUID   UUID,
+                       subjectUUID  UUID
+}
+
+UUID ::= OCTET STRING(SIZE (16)) -- UUID format only
+
+
+countryName ATTRIBUTE ::= {
+  SUBTYPE OF    name
+  WITH SYNTAX   CountryName
+  SINGLE VALUE  TRUE
+  ID            id-at-countryName
+}
+
+CountryName ::= PrintableString(SIZE (2)) -- ISO 3166 codes only
+
+
+localityName ATTRIBUTE ::= {
+  SUBTYPE OF   name
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-localityName
+}
+
+collectiveLocalityName ATTRIBUTE ::= {
+  SUBTYPE OF  localityName
+  COLLECTIVE  TRUE
+  ID          id-at-collectiveLocalityName
+}
+
+stateOrProvinceName ATTRIBUTE ::= {
+  SUBTYPE OF   name
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-stateOrProvinceName
+}
+
+collectiveStateOrProvinceName ATTRIBUTE ::= {
+  SUBTYPE OF  stateOrProvinceName
+  COLLECTIVE  TRUE
+  ID          id-at-collectiveStateOrProvinceName
+}
+
+streetAddress ATTRIBUTE ::= {
+  WITH SYNTAX               UnboundedDirectoryString
+  EQUALITY MATCHING RULE    caseIgnoreMatch
+  SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+  ID                        id-at-streetAddress
+}
+
+collectiveStreetAddress ATTRIBUTE ::= {
+  SUBTYPE OF  streetAddress
+  COLLECTIVE  TRUE
+  ID          id-at-collectiveStreetAddress
+}
+
+houseIdentifier ATTRIBUTE ::= {
+  WITH SYNTAX               UnboundedDirectoryString
+  EQUALITY MATCHING RULE    caseIgnoreMatch
+  SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+  ID                        id-at-houseIdentifier
+}
+
+organizationName ATTRIBUTE ::= {
+  SUBTYPE OF   name
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-organizationName
+}
+
+collectiveOrganizationName ATTRIBUTE ::= {
+  SUBTYPE OF  organizationName
+  COLLECTIVE  TRUE
+  ID          id-at-collectiveOrganizationName
+}
+
+organizationalUnitName ATTRIBUTE ::= {
+  SUBTYPE OF   name
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-organizationalUnitName
+}
+
+collectiveOrganizationalUnitName ATTRIBUTE ::= {
+  SUBTYPE OF  organizationalUnitName
+  COLLECTIVE  TRUE
+  ID          id-at-collectiveOrganizationalUnitName
+}
+
+title ATTRIBUTE ::= {
+  SUBTYPE OF   name
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-title
+}
+
+description ATTRIBUTE ::= {
+  WITH SYNTAX               UnboundedDirectoryString
+  EQUALITY MATCHING RULE    caseIgnoreMatch
+  SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+  ID                        id-at-description
+}
+
+searchGuide ATTRIBUTE ::= {WITH SYNTAX  Guide
+                           ID           id-at-searchGuide
+}
+
+Guide ::= SET {
+  objectClass  [0]  OBJECT-CLASS.&id OPTIONAL,
+  criteria     [1]  Criteria
+}
+
+Criteria ::= CHOICE {
+  type  [0]  CriteriaItem,
+  and   [1]  SET OF Criteria,
+  or    [2]  SET OF Criteria,
+  not   [3]  Criteria
+}
+
+CriteriaItem ::= CHOICE {
+  equality          [0]  AttributeType,
+  substrings        [1]  AttributeType,
+  greaterOrEqual    [2]  AttributeType,
+  lessOrEqual       [3]  AttributeType,
+  approximateMatch  [4]  AttributeType
+}
+
+enhancedSearchGuide ATTRIBUTE ::= {
+  WITH SYNTAX  EnhancedGuide
+  ID           id-at-enhancedSearchGuide
+}
+
+EnhancedGuide ::= SEQUENCE {
+  objectClass  [0]  OBJECT-CLASS.&id,
+  criteria     [1]  Criteria,
+  subset
+    [2]  INTEGER {baseObject(0), oneLevel(1), wholeSubtree(2)} DEFAULT oneLevel
+}
+
+businessCategory ATTRIBUTE ::= {
+  WITH SYNTAX               UnboundedDirectoryString
+  EQUALITY MATCHING RULE    caseIgnoreMatch
+  SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+  ID                        id-at-businessCategory
+}
+
+postalAddress ATTRIBUTE ::= {
+  WITH SYNTAX               PostalAddress
+  EQUALITY MATCHING RULE    caseIgnoreListMatch
+  SUBSTRINGS MATCHING RULE  caseIgnoreListSubstringsMatch
+  ID                        id-at-postalAddress
+}
+
+PostalAddress ::= SEQUENCE SIZE (1..MAX) OF UnboundedDirectoryString
+
+collectivePostalAddress ATTRIBUTE ::= {
+  SUBTYPE OF  postalAddress
+  COLLECTIVE  TRUE
+  ID          id-at-collectivePostalAddress
+}
+
+postalCode ATTRIBUTE ::= {
+  WITH SYNTAX               UnboundedDirectoryString
+  EQUALITY MATCHING RULE    caseIgnoreMatch
+  SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+  ID                        id-at-postalCode
+}
+
+collectivePostalCode ATTRIBUTE ::= {
+  SUBTYPE OF  postalCode
+  COLLECTIVE  TRUE
+  ID          id-at-collectivePostalCode
+}
+
+postOfficeBox ATTRIBUTE ::= {
+  WITH SYNTAX               UnboundedDirectoryString
+  EQUALITY MATCHING RULE    caseIgnoreMatch
+  SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+  ID                        id-at-postOfficeBox
+}
+
+collectivePostOfficeBox ATTRIBUTE ::= {
+  SUBTYPE OF  postOfficeBox
+  COLLECTIVE  TRUE
+  ID          id-at-collectivePostOfficeBox
+}
+
+physicalDeliveryOfficeName ATTRIBUTE ::= {
+  WITH SYNTAX               UnboundedDirectoryString
+  EQUALITY MATCHING RULE    caseIgnoreMatch
+  SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+  ID                        id-at-physicalDeliveryOfficeName
+}
+
+collectivePhysicalDeliveryOfficeName ATTRIBUTE ::= {
+  SUBTYPE OF  physicalDeliveryOfficeName
+  COLLECTIVE  TRUE
+  ID          id-at-collectivePhysicalDeliveryOfficeName
+}
+
+telephoneNumber ATTRIBUTE ::= {
+  WITH SYNTAX               TelephoneNumber
+  EQUALITY MATCHING RULE    telephoneNumberMatch
+  SUBSTRINGS MATCHING RULE  telephoneNumberSubstringsMatch
+  ID                        id-at-telephoneNumber
+}
+
+TelephoneNumber ::= PrintableString(SIZE (1..ub-telephone-number))
+
+-- String complying with ITU-T Rec. E.123 only
+ub-telephone-number INTEGER ::=
+  32
+
+collectiveTelephoneNumber ATTRIBUTE ::= {
+  SUBTYPE OF  telephoneNumber
+  COLLECTIVE  TRUE
+  ID          id-at-collectiveTelephoneNumber
+}
+
+telexNumber ATTRIBUTE ::= {
+  WITH SYNTAX  TelexNumber
+  ID           id-at-telexNumber
+}
+
+TelexNumber ::= SEQUENCE {
+  telexNumber  PrintableString(SIZE (1..ub-telex-number)),
+  countryCode  PrintableString(SIZE (1..ub-country-code)),
+  answerback   PrintableString(SIZE (1..ub-answerback))
+}
+
+ub-telex-number INTEGER ::= 14
+
+ub-country-code INTEGER ::= 4
+
+ub-answerback INTEGER ::= 8
+
+collectiveTelexNumber ATTRIBUTE ::= {
+  SUBTYPE OF  telexNumber
+  COLLECTIVE  TRUE
+  ID          id-at-collectiveTelexNumber
+}
+
+facsimileTelephoneNumber ATTRIBUTE ::= {
+  WITH SYNTAX               FacsimileTelephoneNumber
+  EQUALITY MATCHING RULE    facsimileNumberMatch
+  SUBSTRINGS MATCHING RULE  facsimileNumberSubstringsMatch
+  ID                        id-at-facsimileTelephoneNumber
+}
+
+FacsimileTelephoneNumber ::= SEQUENCE {
+  telephoneNumber  TelephoneNumber,
+  parameters       G3FacsimileNonBasicParameters OPTIONAL
+}
+
+collectiveFacsimileTelephoneNumber ATTRIBUTE ::= {
+  SUBTYPE OF  facsimileTelephoneNumber
+  COLLECTIVE  TRUE
+  ID          id-at-collectiveFacsimileTelephoneNumber
+}
+
+x121Address ATTRIBUTE ::= {
+  WITH SYNTAX               X121Address
+  EQUALITY MATCHING RULE    numericStringMatch
+  SUBSTRINGS MATCHING RULE  numericStringSubstringsMatch
+  ID                        id-at-x121Address
+}
+
+X121Address ::= NumericString(SIZE (1..ub-x121-address))
+
+-- String as defined by ITU-T Rec. X.121
+ub-x121-address INTEGER ::= 15
+
+internationalISDNNumber ATTRIBUTE ::= {
+  WITH SYNTAX               InternationalISDNNumber
+  EQUALITY MATCHING RULE    numericStringMatch
+  SUBSTRINGS MATCHING RULE  numericStringSubstringsMatch
+  ID                        id-at-internationalISDNNumber
+}
+
+InternationalISDNNumber ::=
+  NumericString(SIZE (1..ub-international-isdn-number))
+
+-- String complying with ITU-T Rec. E.164 only
+ub-international-isdn-number INTEGER ::=
+  16
+
+collectiveInternationalISDNNumber ATTRIBUTE ::= {
+  SUBTYPE OF  internationalISDNNumber
+  COLLECTIVE  TRUE
+  ID          id-at-collectiveInternationalISDNNumber
+}
+
+registeredAddress ATTRIBUTE ::= {
+  SUBTYPE OF   postalAddress
+  WITH SYNTAX  PostalAddress
+  ID           id-at-registeredAddress
+}
+
+destinationIndicator ATTRIBUTE ::= {
+  WITH SYNTAX               DestinationIndicator
+  EQUALITY MATCHING RULE    caseIgnoreMatch
+  SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+  ID                        id-at-destinationIndicator
+}
+
+DestinationIndicator ::= PrintableString(SIZE (1..MAX))
+
+-- alphabetical characters only
+communicationsService ATTRIBUTE ::= {
+  WITH SYNTAX             CommunicationsService
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  ID                      id-at-communicationsService
+}
+
+CommunicationsService ::= OBJECT IDENTIFIER
+
+communicationsNetwork ATTRIBUTE ::= {
+  WITH SYNTAX             CommunicationsNetwork
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  SINGLE VALUE            TRUE
+  ID                      id-at-communicationsNetwork
+}
+
+CommunicationsNetwork ::= OBJECT IDENTIFIER
+
+preferredDeliveryMethod ATTRIBUTE ::= {
+  WITH SYNTAX   PreferredDeliveryMethod
+  SINGLE VALUE  TRUE
+  ID            id-at-preferredDeliveryMethod
+}
+
+PreferredDeliveryMethod ::=
+  SEQUENCE OF
+    INTEGER {any-delivery-method(0), mhs-delivery(1), physical-delivery(2),
+             telex-delivery(3), teletex-delivery(4), g3-facsimile-delivery(5),
+             g4-facsimile-delivery(6), ia5-terminal-delivery(7),
+             videotex-delivery(8), telephone-delivery(9)}
+
+presentationAddress ATTRIBUTE ::= {
+  WITH SYNTAX             PresentationAddress
+  EQUALITY MATCHING RULE  presentationAddressMatch
+  SINGLE VALUE            TRUE
+  ID                      id-at-presentationAddress
+}
+
+PresentationAddress ::= SEQUENCE {
+  pSelector   [0]  OCTET STRING OPTIONAL,
+  sSelector   [1]  OCTET STRING OPTIONAL,
+  tSelector   [2]  OCTET STRING OPTIONAL,
+  nAddresses  [3]  SET SIZE (1..MAX) OF OCTET STRING
+}
+
+supportedApplicationContext ATTRIBUTE ::= {
+  WITH SYNTAX             OBJECT IDENTIFIER
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  ID                      id-at-supportedApplicationContext
+}
+
+protocolInformation ATTRIBUTE ::= {
+  WITH SYNTAX             ProtocolInformation
+  EQUALITY MATCHING RULE  protocolInformationMatch
+  ID                      id-at-protocolInformation
+}
+
+ProtocolInformation ::= SEQUENCE {
+  nAddress  OCTET STRING,
+  profiles  SET OF OBJECT IDENTIFIER
+}
+
+distinguishedName ATTRIBUTE ::= {
+  WITH SYNTAX             DistinguishedName
+  EQUALITY MATCHING RULE  distinguishedNameMatch
+  ID                      id-at-distinguishedName
+}
+
+member ATTRIBUTE ::= {SUBTYPE OF  distinguishedName
+                      ID          id-at-member
+}
+
+uniqueMember ATTRIBUTE ::= {
+  WITH SYNTAX             NameAndOptionalUID
+  EQUALITY MATCHING RULE  uniqueMemberMatch
+  ID                      id-at-uniqueMember
+}
+
+NameAndOptionalUID ::= SEQUENCE {
+  dn   DistinguishedName,
+  uid  UniqueIdentifier OPTIONAL
+}
+
+owner ATTRIBUTE ::= {SUBTYPE OF  distinguishedName
+                     ID          id-at-owner
+}
+
+roleOccupant ATTRIBUTE ::= {
+  SUBTYPE OF  distinguishedName
+  ID          id-at-roleOccupant
+}
+
+seeAlso ATTRIBUTE ::= {SUBTYPE OF  distinguishedName
+                       ID          id-at-seeAlso
+}
+
+dmdName ATTRIBUTE ::= {
+  SUBTYPE OF   name
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-dmdName
+}
+
+--  Attributes for tag-based identification
+tagOid ATTRIBUTE ::= {
+  WITH SYNTAX             OBJECT IDENTIFIER
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  SINGLE VALUE            TRUE
+  ID                      id-at-tagOid
+}
+
+uiiFormat ATTRIBUTE ::= {
+  WITH SYNTAX   UnboundedDirectoryString
+  SINGLE VALUE  TRUE
+  ID            id-at-uiiFormat
+}
+
+uiiInUrn ATTRIBUTE ::= {
+  WITH SYNTAX             UTF8String
+  EQUALITY MATCHING RULE  caseExactMatch
+  SINGLE VALUE            TRUE
+  ID                      id-at-uiiInUrn
+}
+
+contentUri ATTRIBUTE ::= {
+  WITH SYNTAX  UnboundedDirectoryString
+  ID           id-at-contentUri
+}
+
+-- Notification attributes
+dSAProblem ATTRIBUTE ::= {
+  WITH SYNTAX             OBJECT IDENTIFIER
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  ID                      id-not-dSAProblem
+}
+
+searchServiceProblem ATTRIBUTE ::= {
+  WITH SYNTAX             OBJECT IDENTIFIER
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  SINGLE VALUE            TRUE
+  ID                      id-not-searchServiceProblem
+}
+
+serviceType ATTRIBUTE ::= {
+  WITH SYNTAX             OBJECT IDENTIFIER
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  SINGLE VALUE            TRUE
+  ID                      id-not-serviceType
+}
+
+attributeTypeList ATTRIBUTE ::= {
+  WITH SYNTAX             OBJECT IDENTIFIER
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  ID                      id-not-attributeTypeList
+}
+
+matchingRuleList ATTRIBUTE ::= {
+  WITH SYNTAX             OBJECT IDENTIFIER
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  ID                      id-not-matchingRuleList
+}
+
+filterItem ATTRIBUTE ::= {
+  WITH SYNTAX  FilterItem
+  ID           id-not-filterItem
+}
+
+attributeCombinations ATTRIBUTE ::= {
+  WITH SYNTAX  AttributeCombination
+  ID           id-not-attributeCombinations
+}
+
+contextTypeList ATTRIBUTE ::= {
+  WITH SYNTAX             OBJECT IDENTIFIER
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  ID                      id-not-contextTypeList
+}
+
+contextList ATTRIBUTE ::= {
+  WITH SYNTAX  ContextAssertion
+  ID           id-not-contextList
+}
+
+contextCombinations ATTRIBUTE ::= {
+  WITH SYNTAX  ContextCombination
+  ID           id-not-contextCombinations
+}
+
+hierarchySelectList ATTRIBUTE ::= {
+  WITH SYNTAX   HierarchySelections
+  SINGLE VALUE  TRUE
+  ID            id-not-hierarchySelectList
+}
+
+searchControlOptionsList ATTRIBUTE ::= {
+  WITH SYNTAX   SearchControlOptions
+  SINGLE VALUE  TRUE
+  ID            id-not-searchControlOptionsList
+}
+
+serviceControlOptionsList ATTRIBUTE ::= {
+  WITH SYNTAX   ServiceControlOptions
+  SINGLE VALUE  TRUE
+  ID            id-not-serviceControlOptionsList
+}
+
+multipleMatchingLocalities ATTRIBUTE ::= {
+  WITH SYNTAX  MultipleMatchingLocalities
+  ID           id-not-multipleMatchingLocalities
+}
+
+MultipleMatchingLocalities ::= SEQUENCE {
+  matchingRuleUsed  MATCHING-RULE.&id OPTIONAL,
+  attributeList     SEQUENCE OF AttributeValueAssertion
+}
+
+proposedRelaxation ATTRIBUTE ::= {
+  WITH SYNTAX  MRMappings
+  ID           id-not-proposedRelaxation
+}
+
+MRMappings ::= SEQUENCE OF MRMapping
+
+appliedRelaxation ATTRIBUTE ::= {
+  WITH SYNTAX             OBJECT IDENTIFIER
+  EQUALITY MATCHING RULE  objectIdentifierMatch
+  ID                      id-not-appliedRelaxation
+}
+
+-- Matching rules
+caseExactMatch MATCHING-RULE ::= {
+  SYNTAX  UnboundedDirectoryString
+  ID      id-mr-caseExactMatch
+}
+
+caseIgnoreMatch MATCHING-RULE ::= {
+  SYNTAX  UnboundedDirectoryString
+  ID      id-mr-caseIgnoreMatch
+}
+
+caseExactOrderingMatch MATCHING-RULE ::= {
+  SYNTAX  UnboundedDirectoryString
+  ID      id-mr-caseExactOrderingMatch
+}
+
+caseIgnoreOrderingMatch MATCHING-RULE ::= {
+  SYNTAX  UnboundedDirectoryString
+  ID      id-mr-caseIgnoreOrderingMatch
+}
+
+caseExactSubstringsMatch MATCHING-RULE ::= {
+  SYNTAX  SubstringAssertion -- only the PrintableString choice
+  ID      id-mr-caseExactSubstringsMatch
+}
+
+caseIgnoreSubstringsMatch MATCHING-RULE ::= {
+  SYNTAX  SubstringAssertion
+  ID      id-mr-caseIgnoreSubstringsMatch
+}
+
+SubstringAssertion ::=
+  SEQUENCE OF
+    CHOICE {initial  [0]  UnboundedDirectoryString,
+            any      [1]  UnboundedDirectoryString,
+            final    [2]  UnboundedDirectoryString,
+            control  Attribute{{SupportedAttributes}}
+    } --  Used to specify interpretation of the following items
+
+-- at most one initial and one final component
+numericStringMatch MATCHING-RULE ::= {
+  SYNTAX  NumericString
+  ID      id-mr-numericStringMatch
+}
+
+numericStringOrderingMatch MATCHING-RULE ::= {
+  SYNTAX  NumericString
+  ID      id-mr-numericStringOrderingMatch
+}
+
+numericStringSubstringsMatch MATCHING-RULE ::= {
+  SYNTAX  SubstringAssertion
+  ID      id-mr-numericStringSubstringsMatch
+}
+
+caseIgnoreListMatch MATCHING-RULE ::= {
+  SYNTAX  CaseIgnoreList
+  ID      id-mr-caseIgnoreListMatch
+}
+
+CaseIgnoreList ::= SEQUENCE OF UnboundedDirectoryString
+
+caseIgnoreListSubstringsMatch MATCHING-RULE ::= {
+  SYNTAX  SubstringAssertion
+  ID      id-mr-caseIgnoreListSubstringsMatch
+}
+
+storedPrefixMatch MATCHING-RULE ::= {
+  SYNTAX  UnboundedDirectoryString
+  ID      id-mr-storedPrefixMatch
+}
+
+booleanMatch MATCHING-RULE ::= {SYNTAX  BOOLEAN
+                                ID      id-mr-booleanMatch
+}
+
+integerMatch MATCHING-RULE ::= {SYNTAX  INTEGER
+                                ID      id-mr-integerMatch
+}
+
+integerOrderingMatch MATCHING-RULE ::= {
+  SYNTAX  INTEGER
+  ID      id-mr-integerOrderingMatch
+}
+
+bitStringMatch MATCHING-RULE ::= {
+  SYNTAX  BIT STRING
+  ID      id-mr-bitStringMatch
+}
+
+octetStringMatch MATCHING-RULE ::= {
+  SYNTAX  OCTET STRING
+  ID      id-mr-octetStringMatch
+}
+
+octetStringOrderingMatch MATCHING-RULE ::= {
+  SYNTAX  OCTET STRING
+  ID      id-mr-octetStringOrderingMatch
+}
+
+octetStringSubstringsMatch MATCHING-RULE ::= {
+  SYNTAX  OctetSubstringAssertion
+  ID      id-mr-octetStringSubstringsMatch
+}
+
+OctetSubstringAssertion ::=
+  SEQUENCE OF
+    CHOICE {initial  [0]  OCTET STRING,
+            any      [1]  OCTET STRING,
+            final    [2]  OCTET STRING}
+
+-- at most one initial and one final component
+telephoneNumberMatch MATCHING-RULE ::= {
+  SYNTAX  TelephoneNumber
+  ID      id-mr-telephoneNumberMatch
+}
+
+telephoneNumberSubstringsMatch MATCHING-RULE ::= {
+  SYNTAX  SubstringAssertion
+  ID      id-mr-telephoneNumberSubstringsMatch
+}
+
+presentationAddressMatch MATCHING-RULE ::= {
+  SYNTAX  PresentationAddress
+  ID      id-mr-presentationAddressMatch
+}
+
+uniqueMemberMatch MATCHING-RULE ::= {
+  SYNTAX  NameAndOptionalUID
+  ID      id-mr-uniqueMemberMatch
+}
+
+protocolInformationMatch MATCHING-RULE ::= {
+  SYNTAX  OCTET STRING
+  ID      id-mr-protocolInformationMatch
+}
+
+facsimileNumberMatch MATCHING-RULE ::= {
+  SYNTAX  TelephoneNumber
+  ID      id-mr-facsimileNumberMatch
+}
+
+facsimileNumberSubstringsMatch MATCHING-RULE ::= {
+  SYNTAX  SubstringAssertion
+  ID      id-mr-facsimileNumberSubstringsMatch
+}
+
+uUIDPairMatch MATCHING-RULE ::= {SYNTAX  UUIDPair
+                                 ID      id-mr-uuidpairmatch
+}
+
+uTCTimeMatch MATCHING-RULE ::= {SYNTAX  UTCTime
+                                ID      id-mr-uTCTimeMatch
+}
+
+uTCTimeOrderingMatch MATCHING-RULE ::= {
+  SYNTAX  UTCTime
+  ID      id-mr-uTCTimeOrderingMatch
+}
+
+generalizedTimeMatch MATCHING-RULE ::= {
+  SYNTAX  GeneralizedTime
+  -- as per 46.3 b) or c) of ITU-T Rec. X.680 | ISO/IEC 8824-1
+  ID      id-mr-generalizedTimeMatch
+}
+
+generalizedTimeOrderingMatch MATCHING-RULE ::= {
+  SYNTAX  GeneralizedTime
+  -- as per 46.3 b) or c) of ITU-T Rec. X.680 | ISO/IEC 8824-1
+  ID      id-mr-generalizedTimeOrderingMatch
+}
+
+systemProposedMatch MATCHING-RULE ::= {ID  id-mr-systemProposedMatch
+}
+
+integerFirstComponentMatch MATCHING-RULE ::= {
+  SYNTAX  INTEGER
+  ID      id-mr-integerFirstComponentMatch
+}
+
+objectIdentifierFirstComponentMatch MATCHING-RULE ::= {
+  SYNTAX  OBJECT IDENTIFIER
+  ID      id-mr-objectIdentifierFirstComponentMatch
+}
+
+directoryStringFirstComponentMatch MATCHING-RULE ::= {
+  SYNTAX  UnboundedDirectoryString
+  ID      id-mr-directoryStringFirstComponentMatch
+}
+
+wordMatch MATCHING-RULE ::= {
+  SYNTAX  UnboundedDirectoryString
+  ID      id-mr-wordMatch
+}
+
+keywordMatch MATCHING-RULE ::= {
+  SYNTAX  UnboundedDirectoryString
+  ID      id-mr-keywordMatch
+}
+
+generalWordMatch MATCHING-RULE ::= {
+  SYNTAX  SubstringAssertion
+  ID      id-mr-generalWordMatch
+}
+
+sequenceMatchType ATTRIBUTE ::= {
+  WITH SYNTAX   SequenceMatchType
+  SINGLE VALUE  TRUE
+  ID            id-cat-sequenceMatchType
+} -- defaulting to sequenceExact
+
+SequenceMatchType ::= ENUMERATED {
+  sequenceExact(0), sequenceDeletion(1), sequenceRestrictedDeletion(2),
+  sequencePermutation(3), sequencePermutationAndDeletion(4),
+  sequenceProviderDefined(5)}
+
+wordMatchTypes ATTRIBUTE ::= {
+  WITH SYNTAX   WordMatchTypes
+  SINGLE VALUE  TRUE
+  ID            id-cat-wordMatchType
+} -- defaulting to wordExact
+
+WordMatchTypes ::= ENUMERATED {
+  wordExact(0), wordTruncated(1), wordPhonetic(2), wordProviderDefined(3)
+}
+
+characterMatchTypes ATTRIBUTE ::= {
+  WITH SYNTAX   CharacterMatchTypes
+  SINGLE VALUE  TRUE
+  ID            id-cat-characterMatchTypes
+}
+
+CharacterMatchTypes ::= ENUMERATED {
+  characterExact(0), characterCaseIgnore(1), characterMapped(2)}
+
+selectedContexts ATTRIBUTE ::= {
+  WITH SYNTAX  ContextAssertion
+  ID           id-cat-selectedContexts
+}
+
+approximateStringMatch MATCHING-RULE ::= {ID  id-mr-approximateStringMatch
+}
+
+ignoreIfAbsentMatch MATCHING-RULE ::= {ID  id-mr-ignoreIfAbsentMatch
+}
+
+nullMatch MATCHING-RULE ::= {ID  id-mr-nullMatch
+}
+
+ZONAL-MATCHING ::=
+  MAPPING-BASED-MATCHING{ZonalSelect, TRUE, ZonalResult, zonalMatch.&id}
+
+ZonalSelect ::= SEQUENCE OF AttributeType
+
+ZonalResult ::= ENUMERATED {
+  cannot-select-mapping(0), zero-mappings(2), multiple-mappings(3)}
+
+zonalMatch MATCHING-RULE ::= {
+  UNIQUE-MATCH-INDICATOR  multipleMatchingLocalities
+  ID                      id-mr-zonalMatch
+}
+
+-- Contexts
+languageContext CONTEXT ::= {
+  WITH SYNTAX  LanguageContextSyntax
+  ID           id-avc-language
+}
+
+LanguageContextSyntax ::= PrintableString(SIZE (2..3)) -- ISO 639-2 codes only
+
+
+temporalContext CONTEXT ::= {
+  WITH SYNTAX  TimeSpecification
+  ASSERTED AS  TimeAssertion
+  ID           id-avc-temporal
+}
+
+TimeSpecification ::= SEQUENCE {
+  time
+    CHOICE {absolute
+              SEQUENCE {startTime  [0]  GeneralizedTime OPTIONAL,
+                        endTime    [1]  GeneralizedTime OPTIONAL},
+            periodic  SET SIZE (1..MAX) OF Period},
+  notThisTime  BOOLEAN DEFAULT FALSE,
+  timeZone     TimeZone OPTIONAL
+}
+
+Period ::= SEQUENCE {
+  timesOfDay  [0]  SET SIZE (1..MAX) OF DayTimeBand OPTIONAL,
+  days
+    [1]  CHOICE {intDay  SET OF INTEGER,
+                 bitDay
+                   BIT STRING {sunday(0), monday(1), tuesday(2), wednesday(3),
+                               thursday(4), friday(5), saturday(6)},
+                 dayOf   XDayOf} OPTIONAL,
+  weeks
+    [2]  CHOICE {allWeeks  NULL,
+                 intWeek   SET OF INTEGER,
+                 bitWeek
+                   BIT STRING {week1(0), week2(1), week3(2), week4(3), week5(4)}
+  } OPTIONAL,
+  months
+    [3]  CHOICE {allMonths  NULL,
+                 intMonth   SET OF INTEGER,
+                 bitMonth
+                   BIT STRING {january(0), february(1), march(2), april(3),
+                               may(4), june(5), july(6), august(7),
+                               september(8), october(9), november(10),
+                               december(11)}} OPTIONAL,
+  years       [4]  SET OF INTEGER(1000..MAX) OPTIONAL
+}
+
+XDayOf ::= CHOICE {
+  first   [1]  NamedDay,
+  second  [2]  NamedDay,
+  third   [3]  NamedDay,
+  fourth  [4]  NamedDay,
+  fifth   [5]  NamedDay
+}
+
+NamedDay ::= CHOICE {
+  intNamedDays
+    ENUMERATED {sunday(1), monday(2), tuesday(3), wednesday(4), thursday(5),
+                friday(6), saturday(7)},
+  bitNamedDays
+    BIT STRING {sunday(0), monday(1), tuesday(2), wednesday(3), thursday(4),
+                friday(5), saturday(6)}
+}
+
+DayTimeBand ::= SEQUENCE {
+  startDayTime  [0]  DayTime DEFAULT {hour 0},
+  endDayTime    [1]  DayTime DEFAULT {hour 23, minute 59, second 59}
+}
+
+DayTime ::= SEQUENCE {
+  hour    [0]  INTEGER(0..23),
+  minute  [1]  INTEGER(0..59) DEFAULT 0,
+  second  [2]  INTEGER(0..59) DEFAULT 0
+}
+
+TimeZone ::= INTEGER(-12..12)
+
+TimeAssertion ::= CHOICE {
+  now      NULL,
+  at       GeneralizedTime,
+  between
+    SEQUENCE {startTime  [0]  GeneralizedTime,
+              endTime    [1]  GeneralizedTime OPTIONAL,
+              entirely   BOOLEAN DEFAULT FALSE}
+}
+
+localeContext CONTEXT ::= {
+  WITH SYNTAX  LocaleContextSyntax
+  ID           id-avc-locale
+}
+
+LocaleContextSyntax ::= CHOICE {
+  localeID1  OBJECT IDENTIFIER,
+  localeID2  UnboundedDirectoryString
+}
+
+ldapAttributeOptionContext CONTEXT ::= {
+  WITH SYNTAX   AttributeOptionList
+  ASSERTED AS   AttributeOptionList
+  ABSENT-MATCH  FALSE
+  ID            id-avc-ldapAttributeOption
+}
+
+AttributeOptionList ::= SEQUENCE OF UTF8String
+
+-- Object identifier assignments
+-- object identifiers assigned in other modules are shown in comments
+-- Attributes
+-- id-at-objectClass							OBJECT IDENTIFIER	::=	{id-at 0}
+-- id-at-aliasedEntryName					OBJECT IDENTIFIER	::=	{id-at 1}
+-- id-at-encryptedAliasedEntryName				OBJECT IDENTIFIER	::=	{id-at 1 2}
+id-at-knowledgeInformation OBJECT IDENTIFIER ::=
+  {id-at 2}
+
+id-at-commonName OBJECT IDENTIFIER ::= {id-at 3}
+
+-- id-at-encryptedCommonName 				OBJECT IDENTIFIER	::=	{id-at 3 2}
+id-at-surname OBJECT IDENTIFIER ::=
+  {id-at 4}
+
+-- id-at-encryptedSurname 					OBJECT IDENTIFIER	::=	{id-at 4 2}
+id-at-serialNumber OBJECT IDENTIFIER ::=
+  {id-at 5}
+
+-- id-at-encryptedSerialNumbe   r				OBJECT IDENTIFIER	::=	{id-at 5 2}
+id-at-countryName OBJECT IDENTIFIER ::=
+  {id-at 6}
+
+-- id-at-encryptedCountryName   				OBJECT IDENTIFIER	::=	{id-at 6 2}
+id-at-localityName OBJECT IDENTIFIER ::=
+  {id-at 7}
+
+-- id-at-encryptedLocalityName    	 			OBJECT IDENTIFIER	::=	{id-at 7 2}
+id-at-collectiveLocalityName OBJECT IDENTIFIER ::=
+  {id-at 7 1}
+
+-- id-at-encryptedCollectiveLocalityName			OBJECT IDENTIFIER	::=	{id-at 7 1 2}
+id-at-stateOrProvinceName OBJECT IDENTIFIER ::=
+  {id-at 8}
+
+-- id-at-encryptedStateOrProvinceName			OBJECT IDENTIFIER	::=	{id-at 8 2}
+id-at-collectiveStateOrProvinceName OBJECT IDENTIFIER ::=
+  {id-at 8 1}
+
+-- id-at-encryptedCollectiveStateOrProvinceName   	OBJECT IDENTIFIER	::=	{id-at 8 1 2}
+id-at-streetAddress OBJECT IDENTIFIER ::=
+  {id-at 9}
+
+-- id-at-encryptedStreetAddress    				OBJECT IDENTIFIER	::=	{id-at 9 2}
+id-at-collectiveStreetAddress OBJECT IDENTIFIER ::=
+  {id-at 9 1}
+
+-- id-at-encryptedCollectiveStreetAddress			OBJECT IDENTIFIER	::=	{id-at 9 1 2}
+id-at-organizationName OBJECT IDENTIFIER ::=
+  {id-at 10}
+
+-- id-at-encryptedOrganizationName				OBJECT IDENTIFIER	::=	{id-at 10 2}
+id-at-collectiveOrganizationName OBJECT IDENTIFIER ::=
+  {id-at 10 1}
+
+-- id-at-encryptedCollectiveOrganizationName		OBJECT IDENTIFIER	::=	{id-at 10 1 2}
+id-at-organizationalUnitName OBJECT IDENTIFIER ::=
+  {id-at 11}
+
+-- id-at-encryptedOrganizationalUnitName			OBJECT IDENTIFIER	::=	{id-at 11 2}
+id-at-collectiveOrganizationalUnitName OBJECT IDENTIFIER ::=
+  {id-at 11 1}
+
+-- id-at-encryptedCollectiveOrganizationalUnitNam    	OBJECT IDENTIFIER	::=	{id-at 11 1 2}
+id-at-title OBJECT IDENTIFIER ::=
+  {id-at 12}
+
+-- id-at-encryptedTitle						OBJECT IDENTIFIER	::=	{id-at 12 2}
+id-at-description OBJECT IDENTIFIER ::=
+  {id-at 13}
+
+-- id-at-encryptedDescription					OBJECT IDENTIFIER	::=	{id-at 13 2}
+id-at-searchGuide OBJECT IDENTIFIER ::=
+  {id-at 14}
+
+-- id-at-encryptedSearchGuide					OBJECT IDENTIFIER	::=	{id-at 14 2}
+id-at-businessCategory OBJECT IDENTIFIER ::=
+  {id-at 15}
+
+-- id-at-encryptedBusinessCategory				OBJECT IDENTIFIER	::=	{id-at 15 2}
+id-at-postalAddress OBJECT IDENTIFIER ::=
+  {id-at 16}
+
+-- id-at-encryptedPostalAddress					OBJECT IDENTIFIER	::=	{id-at 16 2}
+id-at-collectivePostalAddress OBJECT IDENTIFIER ::=
+  {id-at 16 1}
+
+-- id-at-encryptedCollectivePostalAddress			OBJECT IDENTIFIER	::=	{id-at 16 1 2}
+id-at-postalCode OBJECT IDENTIFIER ::=
+  {id-at 17}
+
+-- id-at-encryptedPostalCode					OBJECT IDENTIFIER	::=	{id-at 17 2}
+id-at-collectivePostalCode OBJECT IDENTIFIER ::=
+  {id-at 17 1}
+
+-- id-at-encryptedCollectivePostalCode			OBJECT IDENTIFIER	::=	{id-at 17 1 2}
+id-at-postOfficeBox OBJECT IDENTIFIER ::=
+  {id-at 18}
+
+id-at-collectivePostOfficeBox OBJECT IDENTIFIER ::= {id-at 18 1}
+
+-- id-at-encryptedPostOfficeBox   				OBJECT IDENTIFIER	::=	{id-at 18 2}
+-- id-at-encryptedCollectivePostOfficeBox			OBJECT IDENTIFIER	::=	{id-at 18 1 2}
+id-at-physicalDeliveryOfficeName OBJECT IDENTIFIER ::=
+  {id-at 19}
+
+id-at-collectivePhysicalDeliveryOfficeName OBJECT IDENTIFIER ::= {id-at 19 1}
+
+-- id-at-encryptedPhysicalDeliveryOfficeName		OBJECT IDENTIFIER	::=	{id-at 19 2}
+-- id-at-encryptedCollectivePhysicalDeliveryOfficeName	OBJECT IDENTIFIER	::=	{id-at 19 1 2}
+id-at-telephoneNumber OBJECT IDENTIFIER ::=
+  {id-at 20}
+
+-- id-at-encryptedTelephoneNumber				OBJECT IDENTIFIER	::=	{id-at 20 2}
+id-at-collectiveTelephoneNumber OBJECT IDENTIFIER ::=
+  {id-at 20 1}
+
+-- id-at-encryptedCollectiveTelephoneNumber		OBJECT IDENTIFIER	::=	{id-at 20 1 2}
+id-at-telexNumber OBJECT IDENTIFIER ::=
+  {id-at 21}
+
+-- id-at-encryptedTelexNumber					OBJECT IDENTIFIER	::=	{id-at 21 2}
+id-at-collectiveTelexNumber OBJECT IDENTIFIER ::=
+  {id-at 21 1}
+
+-- id-at-encryptedCollectiveTelexNumber			OBJECT IDENTIFIER	::=	{id-at 21 1 2}
+-- id-at-teletexTerminalIdentifier   				OBJECT IDENTIFIER	::=	{id-at 22}
+-- id-at-encryptedTeletexTerminalIdentifier			OBJECT IDENTIFIER	::=	{id-at 22 2}
+-- id-at-collectiveTeletexTerminalIdentifier			OBJECT IDENTIFIER	::=	{id-at 22 1}
+-- id-at-encryptedCollectiveTeletexTerminalIdentifier	OBJECT IDENTIFIER	::=	{id-at 22 1 2}
+id-at-facsimileTelephoneNumber OBJECT IDENTIFIER ::=
+  {id-at 23}
+
+-- id-at-encryptedFacsimileTelephoneNumber		OBJECT IDENTIFIER	::=	{id-at 23 2}
+id-at-collectiveFacsimileTelephoneNumber OBJECT IDENTIFIER ::=
+  {id-at 23 1}
+
+-- id-at-encryptedCollectiveFacsimileTelephoneNumber	OBJECT IDENTIFIER	::=	{id-at 23 1 2}
+id-at-x121Address OBJECT IDENTIFIER ::=
+  {id-at 24}
+
+-- id-at-encryptedX121Address    	 			OBJECT IDENTIFIER	::=	{id-at 24 2}
+id-at-internationalISDNNumber OBJECT IDENTIFIER ::=
+  {id-at 25}
+
+-- id-at-encryptedInternationalISDNNumber			OBJECT IDENTIFIER	::=	{id-at 25 2}
+id-at-collectiveInternationalISDNNumber OBJECT IDENTIFIER ::=
+  {id-at 25 1}
+
+-- id-at-encryptedCollectiveInternationalISDNNumber	OBJECT IDENTIFIER	::=	{id-at 25 1 2}
+id-at-registeredAddress OBJECT IDENTIFIER ::=
+  {id-at 26}
+
+-- id-at-encryptedRegisteredAddress				OBJECT IDENTIFIER	::=	{id-at 26 2}
+id-at-destinationIndicator OBJECT IDENTIFIER ::=
+  {id-at 27}
+
+-- id-at-encryptedDestinationIndicator   			OBJECT IDENTIFIER	::=	{id-at 27 2}
+id-at-preferredDeliveryMethod OBJECT IDENTIFIER ::=
+  {id-at 28}
+
+-- id-at-encryptedPreferredDeliveryMethod			OBJECT IDENTIFIER	::=	{id-at 28 2}
+id-at-presentationAddress OBJECT IDENTIFIER ::=
+  {id-at 29}
+
+-- id-at-encryptedPresentationAddress				OBJECT IDENTIFIER	::=	{id-at 29 2}
+id-at-supportedApplicationContext OBJECT IDENTIFIER ::=
+  {id-at 30}
+
+-- id-at-encryptedSupportedApplicationContext		OBJECT IDENTIFIER	::=	{id-at 30 2}
+id-at-member OBJECT IDENTIFIER ::=
+  {id-at 31}
+
+-- id-at-encryptedMember						OBJECT IDENTIFIER	::=	{id-at 31 2}
+id-at-owner OBJECT IDENTIFIER ::=
+  {id-at 32}
+
+-- id-at-encryptedOwner						OBJECT IDENTIFIER	::=	{id-at 32 2}
+id-at-roleOccupant OBJECT IDENTIFIER ::=
+  {id-at 33}
+
+-- id-at-encryptedRoleOccupant   				OBJECT IDENTIFIER	::=	{id-at 33 2}
+id-at-seeAlso OBJECT IDENTIFIER ::=
+  {id-at 34}
+
+-- id-at-encryptedSeeAlso	 					OBJECT IDENTIFIER	::=	{id-at 34 2}
+-- id-at-userPassword						OBJECT IDENTIFIER	::=	{id-at 35}	X.509|Part8
+-- id-at-encryptedUserPassword					OBJECT IDENTIFIER	::=	{id-at 35 2}
+-- id-at-userCertificate						OBJECT IDENTIFIER	::=	{id-at 36} 	X.509|Part8
+-- id-at-encryptedUserCertificate				OBJECT IDENTIFIER	::=	{id-at 36 2}
+-- id-at-cACertificate						OBJECT IDENTIFIER	::=	{id-at 37} 	X.509|Part8
+-- id-at-encryptedCACertificate    	 			OBJECT IDENTIFIER	::=	{id-at 37 2}
+-- id-at-authorityRevocationList    				OBJECT IDENTIFIER	::=	{id-at 38} 	X.509|Part8
+-- id-at-encryptedAuthorityRevocationList			OBJECT IDENTIFIER	::=	{id-at 38 2}
+-- id-at-certificateRevocationList   				OBJECT IDENTIFIER	::=	{id-at 39} 	X.509|Part8
+-- id-at-encryptedCertificateRevocationList	 		OBJECT IDENTIFIER	::=	{id-at 39 2}
+-- id-at-crossCertificatePair					OBJECT IDENTIFIER	::=	{id-at 40} 	X.509|Part8
+-- id-at-encryptedCrossCertificatePair   			OBJECT IDENTIFIER	::=	{id-at 40 2}
+id-at-name OBJECT IDENTIFIER ::=
+  {id-at 41}
+
+id-at-givenName OBJECT IDENTIFIER ::= {id-at 42}
+
+-- id-at-encryptedGivenName					OBJECT IDENTIFIER	::=	{id-at 42 2}
+id-at-initials OBJECT IDENTIFIER ::=
+  {id-at 43}
+
+-- id-at-encryptedInitials						OBJECT IDENTIFIER	::=	{id-at 43 2}
+id-at-generationQualifier OBJECT IDENTIFIER ::=
+  {id-at 44}
+
+-- id-at-encryptedGenerationQualifier    	 		OBJECT IDENTIFIER	::=	{id-at 44 2}
+id-at-uniqueIdentifier OBJECT IDENTIFIER ::=
+  {id-at 45}
+
+-- id-at-encryptedUniqueIdentifier				OBJECT IDENTIFIER	::=	{id-at 45 2}
+id-at-dnQualifier OBJECT IDENTIFIER ::=
+  {id-at 46}
+
+-- id-at-encryptedDnQualifier					OBJECT IDENTIFIER	::=	{id-at 46 2}
+id-at-enhancedSearchGuide OBJECT IDENTIFIER ::=
+  {id-at 47}
+
+-- id-at-encryptedEnhancedSearchGuide			OBJECT IDENTIFIER	::=	{id-at 47 2}
+id-at-protocolInformation OBJECT IDENTIFIER ::=
+  {id-at 48}
+
+-- id-at-encryptedProtocolInformation				OBJECT IDENTIFIER	::=	{id-at 48 2}
+id-at-distinguishedName OBJECT IDENTIFIER ::=
+  {id-at 49}
+
+-- id-at-encryptedDistinguishedName   			OBJECT IDENTIFIER	::=	{id-at 49 2}
+id-at-uniqueMember OBJECT IDENTIFIER ::=
+  {id-at 50}
+
+-- id-at-encryptedUniqueMember				OBJECT IDENTIFIER	::=	{id-at 50 2}
+id-at-houseIdentifier OBJECT IDENTIFIER ::=
+  {id-at 51}
+
+-- id-at-encryptedHouseIdentifier				OBJECT IDENTIFIER	::=	{id-at 51 2}
+-- id-at-supportedAlgorithms					OBJECT IDENTIFIER	::=	{id-at 52} 	X.509|Part8
+-- id-at-encryptedSupportedAlgorithms				OBJECT IDENTIFIER	::=	{id-at 52 2}
+-- id-at-deltaRevocationList					OBJECT IDENTIFIER	::=	{id-at 53} 	X.509|Part8
+-- id-at-encryptedDeltaRevocationList    			OBJECT IDENTIFIER	::=	{id-at 53 2}
+id-at-dmdName OBJECT IDENTIFIER ::=
+  {id-at 54}
+
+-- id-at-encryptedDmdName					OBJECT IDENTIFIER	::=	{id-at 54 2}
+-- id-at-clearance	 						OBJECT IDENTIFIER	::=	{id-at 55}
+-- id-at-encryptedClearance					OBJECT IDENTIFIER	::=	{id-at 55 2}
+-- id-at-defaultDirQop						OBJECT IDENTIFIER	::=	{id-at 56}
+-- id-at-encryptedDefaultDirQop   				OBJECT IDENTIFIER	::=	{id-at 56 2}
+-- id-at-attributeIntegrityInfo					OBJECT IDENTIFIER	::=	{id-at 57}
+-- id-at-encryptedAttributeIntegrityInfo   			OBJECT IDENTIFIER	::=	{id-at 57 2}
+-- id-at-attributeCertificate						OBJECT IDENTIFIER	::=	{id-at 58} 	X.509|Part8
+-- id-at-encryptedAttributeCertificate				OBJECT IDENTIFIER	::=	{id-at 58 2}
+-- id-at-attributeCertificateRevocationList			OBJECT IDENTIFIER	::=	{id-at 59} 	X.509|Part8
+-- id-at-encryptedAttributeCertificateRevocationList   	OBJECT IDENTIFIER	::=	{id-at 59 2}
+-- id-at-confKeyInfo							OBJECT IDENTIFIER	::=	{id-at 60}
+-- id-at-encryptedConfKeyInfo					OBJECT IDENTIFIER	::=	{id-at 60 2}
+-- id-at-aACertificate						OBJECT IDENTIFIER	::=	{id-at 61} 	X.509|Part8
+-- id-at-attributeDescriptorCertificate				OBJECT IDENTIFIER	::=	{id-at 62} 	X.509|Part8
+-- id-at-attributeAuthorityRevocationList			OBJECT IDENTIFIER	::=	{id-at 63} 	X.509|Part8
+-- id-at-family-information	 					OBJECT IDENTIFIER	::=	{id-at 64}
+id-at-pseudonym OBJECT IDENTIFIER ::=
+  {id-at 65}
+
+id-at-communicationsService OBJECT IDENTIFIER ::= {id-at 66}
+
+id-at-communicationsNetwork OBJECT IDENTIFIER ::= {id-at 67}
+
+-- id-at-certificationPracticeStmt   				OBJECT IDENTIFIER	::=	{id-at 68} 	X.509|Part8
+-- id-at-certificatePolicy						OBJECT IDENTIFIER	::=	{id-at 69} 	X.509|Part8
+-- id-at-pkiPath							OBJECT IDENTIFIER	::=	{id-at 70} 	X.509|Part8
+-- id-at-privPolicy							OBJECT IDENTIFIER	::=	{id-at 71} 	X.509|Part8
+-- id-at-role    							OBJECT IDENTIFIER	::=	{id-at 72} 	X.509|Part8
+-- id-at-delegationPath						OBJECT IDENTIFIER	::=	{id-at 73} 	X.509|Part8
+-- id-at-protPrivPolicy						OBJECT IDENTIFIER	::=	{id-at 74} 	X.509|Part8
+-- id-at-xMLPrivilegeInfo 						OBJECT IDENTIFIER	::=	{id-at 75} 	X.509|Part8
+-- id-at-xmlPrivPolicy						OBJECT IDENTIFIER	::=	{id-at 76} 	X.509|Part8
+id-at-uuidpair OBJECT IDENTIFIER ::=
+  {id-at 77}
+
+id-at-tagOid OBJECT IDENTIFIER ::= {id-at 78}
+
+id-at-uiiFormat OBJECT IDENTIFIER ::= {id-at 79}
+
+id-at-uiiInUrn OBJECT IDENTIFIER ::= {id-at 80}
+
+id-at-contentUri OBJECT IDENTIFIER ::= {id-at 81}
+
+-- id-at-permission   						OBJECT IDENTIFIER	::=	{id-at 82} 	X.509|Part8
+-- Control  attributes
+id-cat-sequenceMatchType OBJECT IDENTIFIER ::=
+  {id-cat 1}
+
+id-cat-wordMatchType OBJECT IDENTIFIER ::= {id-cat 2}
+
+id-cat-characterMatchTypes OBJECT IDENTIFIER ::= {id-cat 3}
+
+id-cat-selectedContexts OBJECT IDENTIFIER ::= {id-cat 4}
+
+-- Notification attributes
+id-not-dSAProblem OBJECT IDENTIFIER ::= {id-not 0}
+
+id-not-searchServiceProblem OBJECT IDENTIFIER ::= {id-not 1}
+
+id-not-serviceType OBJECT IDENTIFIER ::= {id-not 2}
+
+id-not-attributeTypeList OBJECT IDENTIFIER ::= {id-not 3}
+
+id-not-matchingRuleList OBJECT IDENTIFIER ::= {id-not 4}
+
+id-not-filterItem OBJECT IDENTIFIER ::= {id-not 5}
+
+id-not-attributeCombinations OBJECT IDENTIFIER ::= {id-not 6}
+
+id-not-contextTypeList OBJECT IDENTIFIER ::= {id-not 7}
+
+id-not-contextList OBJECT IDENTIFIER ::= {id-not 8}
+
+id-not-contextCombinations OBJECT IDENTIFIER ::= {id-not 9}
+
+id-not-hierarchySelectList OBJECT IDENTIFIER ::= {id-not 10}
+
+id-not-searchControlOptionsList OBJECT IDENTIFIER ::= {id-not 11}
+
+id-not-serviceControlOptionsList OBJECT IDENTIFIER ::= {id-not 12}
+
+id-not-multipleMatchingLocalities OBJECT IDENTIFIER ::= {id-not 13}
+
+id-not-proposedRelaxation OBJECT IDENTIFIER ::= {id-not 14}
+
+id-not-appliedRelaxation OBJECT IDENTIFIER ::= {id-not 15}
+
+-- Problem definitions
+id-pr-targetDsaUnavailable OBJECT IDENTIFIER ::=
+  {id-pr 1}
+
+id-pr-dataSourceUnavailable OBJECT IDENTIFIER ::= {id-pr 2}
+
+id-pr-unidentifiedOperation OBJECT IDENTIFIER ::= {id-pr 3}
+
+id-pr-unavailableOperation OBJECT IDENTIFIER ::= {id-pr 4}
+
+id-pr-searchAttributeViolation OBJECT IDENTIFIER ::= {id-pr 5}
+
+id-pr-searchAttributeCombinationViolation OBJECT IDENTIFIER ::= {id-pr 6}
+
+id-pr-searchValueNotAllowed OBJECT IDENTIFIER ::= {id-pr 7}
+
+id-pr-missingSearchAttribute OBJECT IDENTIFIER ::= {id-pr 8}
+
+id-pr-searchValueViolation OBJECT IDENTIFIER ::= {id-pr 9}
+
+id-pr-attributeNegationViolation OBJECT IDENTIFIER ::= {id-pr 10}
+
+id-pr-searchValueRequired OBJECT IDENTIFIER ::= {id-pr 11}
+
+id-pr-invalidSearchValue OBJECT IDENTIFIER ::= {id-pr 12}
+
+id-pr-searchContextViolation OBJECT IDENTIFIER ::= {id-pr 13}
+
+id-pr-searchContextCombinationViolation OBJECT IDENTIFIER ::= {id-pr 14}
+
+id-pr-missingSearchContext OBJECT IDENTIFIER ::= {id-pr 15}
+
+id-pr-searchContextValueViolation OBJECT IDENTIFIER ::= {id-pr 16}
+
+id-pr-searchContextValueRequired OBJECT IDENTIFIER ::= {id-pr 17}
+
+id-pr-invalidContextSearchValue OBJECT IDENTIFIER ::= {id-pr 18}
+
+id-pr-unsupportedMatchingRule OBJECT IDENTIFIER ::= {id-pr 19}
+
+id-pr-attributeMatchingViolation OBJECT IDENTIFIER ::= {id-pr 20}
+
+id-pr-unsupportedMatchingUse OBJECT IDENTIFIER ::= {id-pr 21}
+
+id-pr-matchingUseViolation OBJECT IDENTIFIER ::= {id-pr 22}
+
+id-pr-hierarchySelectForbidden OBJECT IDENTIFIER ::= {id-pr 23}
+
+id-pr-invalidHierarchySelect OBJECT IDENTIFIER ::= {id-pr 24}
+
+id-pr-unavailableHierarchySelect OBJECT IDENTIFIER ::= {id-pr 25}
+
+id-pr-invalidSearchControlOptions OBJECT IDENTIFIER ::= {id-pr 26}
+
+id-pr-invalidServiceControlOptions OBJECT IDENTIFIER ::= {id-pr 27}
+
+id-pr-searchSubsetViolation OBJECT IDENTIFIER ::= {id-pr 28}
+
+id-pr-unmatchedKeyAttributes OBJECT IDENTIFIER ::= {id-pr 29}
+
+id-pr-ambiguousKeyAttributes OBJECT IDENTIFIER ::= {id-pr 30}
+
+id-pr-unavailableRelaxationLevel OBJECT IDENTIFIER ::= {id-pr 31}
+
+id-pr-emptyHierarchySelection OBJECT IDENTIFIER ::= {id-pr 32}
+
+id-pr-administratorImposedLimit OBJECT IDENTIFIER ::= {id-pr 33}
+
+id-pr-permanentRestriction OBJECT IDENTIFIER ::= {id-pr 34}
+
+id-pr-temporaryRestriction OBJECT IDENTIFIER ::= {id-pr 35}
+
+id-pr-relaxationNotSupported OBJECT IDENTIFIER ::= {id-pr 36}
+
+-- Matching rules
+-- id-mr-objectIdentifierMatch 					OBJECT IDENTIFIER	::=	{id-mr 0} 	X.501|Part2
+-- id-mr-distinguishedNameMatch				OBJECT IDENTIFIER	::=	{id-mr 1} 	X.501|Part2
+id-mr-caseIgnoreMatch OBJECT IDENTIFIER ::=
+  {id-mr 2}
+
+id-mr-caseIgnoreOrderingMatch OBJECT IDENTIFIER ::= {id-mr 3}
+
+id-mr-caseIgnoreSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 4}
+
+id-mr-caseExactMatch OBJECT IDENTIFIER ::= {id-mr 5}
+
+id-mr-caseExactOrderingMatch OBJECT IDENTIFIER ::= {id-mr 6}
+
+id-mr-caseExactSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 7}
+
+id-mr-numericStringMatch OBJECT IDENTIFIER ::= {id-mr 8}
+
+id-mr-numericStringOrderingMatch OBJECT IDENTIFIER ::= {id-mr 9}
+
+id-mr-numericStringSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 10}
+
+id-mr-caseIgnoreListMatch OBJECT IDENTIFIER ::= {id-mr 11}
+
+id-mr-caseIgnoreListSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 12}
+
+id-mr-booleanMatch OBJECT IDENTIFIER ::= {id-mr 13}
+
+id-mr-integerMatch OBJECT IDENTIFIER ::= {id-mr 14}
+
+id-mr-integerOrderingMatch OBJECT IDENTIFIER ::= {id-mr 15}
+
+id-mr-bitStringMatch OBJECT IDENTIFIER ::= {id-mr 16}
+
+id-mr-octetStringMatch OBJECT IDENTIFIER ::= {id-mr 17}
+
+id-mr-octetStringOrderingMatch OBJECT IDENTIFIER ::= {id-mr 18}
+
+id-mr-octetStringSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 19}
+
+id-mr-telephoneNumberMatch OBJECT IDENTIFIER ::= {id-mr 20}
+
+id-mr-telephoneNumberSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 21}
+
+id-mr-presentationAddressMatch OBJECT IDENTIFIER ::= {id-mr 22}
+
+id-mr-uniqueMemberMatch OBJECT IDENTIFIER ::= {id-mr 23}
+
+id-mr-protocolInformationMatch OBJECT IDENTIFIER ::= {id-mr 24}
+
+id-mr-uTCTimeMatch OBJECT IDENTIFIER ::= {id-mr 25}
+
+id-mr-uTCTimeOrderingMatch OBJECT IDENTIFIER ::= {id-mr 26}
+
+id-mr-generalizedTimeMatch OBJECT IDENTIFIER ::= {id-mr 27}
+
+id-mr-generalizedTimeOrderingMatch OBJECT IDENTIFIER ::= {id-mr 28}
+
+id-mr-integerFirstComponentMatch OBJECT IDENTIFIER ::= {id-mr 29}
+
+id-mr-objectIdentifierFirstComponentMatch OBJECT IDENTIFIER ::= {id-mr 30}
+
+id-mr-directoryStringFirstComponentMatch OBJECT IDENTIFIER ::= {id-mr 31}
+
+id-mr-wordMatch OBJECT IDENTIFIER ::= {id-mr 32}
+
+id-mr-keywordMatch OBJECT IDENTIFIER ::= {id-mr 33}
+
+-- id-mr-certificateExactMatch					OBJECT IDENTIFIER	::=	{id-mr 34} 	X.509|Part8
+-- id-mr-certificateMatch						OBJECT IDENTIFIER	::=	{id-mr 35} 	X.509|Part8
+-- id-mr-certificatePairExactMatch				OBJECT IDENTIFIER	::=	{id-mr 36} 	X.509|Part8
+-- id-mr-certificatePairMatch					OBJECT IDENTIFIER	::=	{id-mr 37} 	X.509|Part8
+-- id-mr-certificateListExactMatch				OBJECT IDENTIFIER	::=	{id-mr 38} 	X.509|Part8
+-- id-mr-certificateListMatch					OBJECT IDENTIFIER	::=	{id-mr 39} 	X.509|Part8
+-- id-mr-algorithmIdentifierMatch				OBJECT IDENTIFIER	::=	{id-mr 40} 	X.509|Part8
+id-mr-storedPrefixMatch OBJECT IDENTIFIER ::=
+  {id-mr 41}
+
+-- id-mr-attributeCertificateMatch				OBJECT IDENTIFIER	::=	{id-mr 42} 	X.509|Part8
+-- id-mr-readerAndKeyIDMatch   				OBJECT IDENTIFIER	::=	{id-mr 43}
+-- id-mr-attributeIntegrityMatch					OBJECT IDENTIFIER	::=	{id-mr 44}
+-- id-mr-attributeCertificateExactMatch   			OBJECT IDENTIFIER	::=	{id-mr 45} 	X.509|Part8
+-- id-mr-holderIssuerMatch					OBJECT IDENTIFIER	::=	{id-mr 46} 	X.509|Part8
+id-mr-systemProposedMatch OBJECT IDENTIFIER ::=
+  {id-mr 47}
+
+id-mr-generalWordMatch OBJECT IDENTIFIER ::= {id-mr 48}
+
+id-mr-approximateStringMatch OBJECT IDENTIFIER ::= {id-mr 49}
+
+id-mr-ignoreIfAbsentMatch OBJECT IDENTIFIER ::= {id-mr 50}
+
+id-mr-nullMatch OBJECT IDENTIFIER ::= {id-mr 51}
+
+id-mr-zonalMatch OBJECT IDENTIFIER ::= {id-mr 52}
+
+-- id-mr-authAttIdMatch						OBJECT IDENTIFIER	::=	{id-mr 53} 	X.509|Part8
+-- id-mr-roleSpecCertIdMatch					OBJECT IDENTIFIER	::=	{id-mr 54} 	X.509|Part8
+-- id-mr-basicAttConstraintsMatch				OBJECT IDENTIFIER	::=	{id-mr 55} 	X.509|Part8
+-- id-mr-delegatedNameConstraintsMatch			OBJECT IDENTIFIER	::=	{id-mr 56} 	X.509|Part8
+-- id-mr-timeSpecMatch						OBJECT IDENTIFIER	::=	{id-mr 57} 	X.509|Part8
+-- id-mr-attDescriptorMatch					OBJECT IDENTIFIER	::=	{id-mr 58} 	X.509|Part8
+-- id-mr-acceptableCertPoliciesMatch    			OBJECT IDENTIFIER	::=	{id-mr 59} 	X.509|Part8
+-- id-mr-policyMatch						OBJECT IDENTIFIER	::=	{id-mr 60} 	X.509|Part8
+-- id-mr-delegationPathMatch					OBJECT IDENTIFIER	::=	{id-mr 61} 	X.509|Part8
+-- id-mr-pkiPathMatch						OBJECT IDENTIFIER	::=	{id-mr 62} 	X.509|Part8
+id-mr-facsimileNumberMatch OBJECT IDENTIFIER ::=
+  {id-mr 63}
+
+id-mr-facsimileNumberSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 64}
+
+-- id-mr-enhancedCertificateMatch				OBJECT IDENTIFIER	::=	{id-mr 65} 	X.509|Part8
+-- id-mr-sOAIdentifierMatch					OBJECT IDENTIFIER	::=	{id-mr 66} 	X.509|Part8
+-- id-mr-extensionPresenceMatch				OBJECT IDENTIFIER	::=	{id-mr 67} 	X.509|Part8
+id-mr-uuidpairmatch OBJECT IDENTIFIER ::=
+  {id-mr 68}
+
+-- id-mr-dualStringMatch   					OBJECT IDENTIFIER	::=	{id-mr 69} 	X.509|Part8
+-- contexts
+id-avc-language OBJECT IDENTIFIER ::=
+  {id-avc 0}
+
+id-avc-temporal OBJECT IDENTIFIER ::= {id-avc 1}
+
+id-avc-locale OBJECT IDENTIFIER ::= {id-avc 2}
+
+-- id-avc-attributeValueSecurityLabelContext 		OBJECT IDENTIFIER	::=	{id-avc 3}
+-- id-avc-attributeValueIntegrityInfoContext			OBJECT IDENTIFIER	::=	{id-avc 4}
+id-avc-ldapAttributeOption OBJECT IDENTIFIER ::=
+  {id-avc 5}
+
+END -- SelectedAttributeTypes
diff --git a/lib/public_key/asn1/UsefulDefinitions.asn1 b/lib/public_key/asn1/UsefulDefinitions.asn1
new file mode 100644
index 0000000000..a200aac6e2
--- /dev/null
+++ b/lib/public_key/asn1/UsefulDefinitions.asn1
@@ -0,0 +1,234 @@
+UsefulDefinitions {joint-iso-itu-t ds(5) module(1) usefulDefinitions(0) 3}
+DEFINITIONS ::=
+BEGIN
+
+-- EXPORTS All -
+-- The types and values defined in this module are exported for use in the other ASN.1 modules contained
+-- within the Directory Specifications, and for the use of other applications which will use them to access
+-- Directory services. Other applications may use them for their own purposes, but this will not constrain
+-- extensions and modifications needed to maintain or improve the Directory service.
+ID ::= OBJECT IDENTIFIER
+
+ds ID ::= {joint-iso-itu-t ds(5)}
+
+-- categories of information object
+module ID ::= {ds  1}
+
+serviceElement ID ::= {ds  2}
+
+applicationContext ID ::= {ds  3}
+
+attributeType ID ::= {ds  4}
+
+attributeSyntax ID ::= {ds  5}
+
+objectClass ID ::= {ds  6}
+
+-- attributeSet			ID	::=	{ds 7}
+algorithm ID ::= {ds  8}
+
+abstractSyntax ID ::= {ds  9}
+
+-- object			ID	::= 	{ds 10}
+-- port				ID	::= 	{ds 11}
+dsaOperationalAttribute ID ::=
+  {ds  12}
+
+matchingRule ID ::= {ds  13}
+
+knowledgeMatchingRule ID ::= {ds  14}
+
+nameForm ID ::= {ds  15}
+
+group ID ::= {ds  16}
+
+subentry ID ::= {ds  17}
+
+operationalAttributeType ID ::= {ds  18}
+
+operationalBinding ID ::= {ds  19}
+
+schemaObjectClass ID ::= {ds  20}
+
+schemaOperationalAttribute ID ::= {ds  21}
+
+administrativeRoles ID ::= {ds  23}
+
+accessControlAttribute ID ::= {ds  24}
+
+rosObject ID ::= {ds  25}
+
+contract ID ::= {ds  26}
+
+package ID ::= {ds  27}
+
+accessControlSchemes ID ::= {ds  28}
+
+certificateExtension ID ::= {ds  29}
+
+managementObject ID ::= {ds  30}
+
+attributeValueContext ID ::= {ds  31}
+
+-- securityExchange		ID	::=	{ds 32}
+idmProtocol ID ::= {ds  33}
+
+problem ID ::= {ds  34}
+
+notification ID ::= {ds  35}
+
+matchingRestriction ID ::=
+  {ds  36} -- None are currently defined by this specification
+
+controlAttributeType ID ::= {ds  37}
+
+-- modules
+usefulDefinitions ID ::= {module usefulDefinitions(0) 3}
+
+informationFramework ID ::= {module informationFramework(1) 3}
+
+directoryAbstractService ID ::= {module directoryAbstractService(2) 3}
+
+distributedOperations ID ::= {module distributedOperations(3) 3}
+
+protocolObjectIdentifiers ID ::= {module protocolObjectIdentifiers(4) 3}
+
+selectedAttributeTypes ID ::= {module selectedAttributeTypes(5) 3}
+
+selectedObjectClasses ID ::= {module selectedObjectClasses(6) 3}
+
+authenticationFramework ID ::= {module authenticationFramework(7) 3}
+
+algorithmObjectIdentifiers ID ::= {module algorithmObjectIdentifiers(8) 3}
+
+directoryObjectIdentifiers ID ::= {module directoryObjectIdentifiers(9) 3}
+
+upperBounds ID ::= {module upperBounds(10) 3}
+
+dap ID ::= {module dap(11) 3}
+
+dsp ID ::= {module dsp(12) 3}
+
+distributedDirectoryOIDs ID ::= {module distributedDirectoryOIDs(13) 3}
+
+directoryShadowOIDs ID ::= {module directoryShadowOIDs(14) 3}
+
+directoryShadowAbstractService ID ::=
+  {module directoryShadowAbstractService(15) 3}
+
+disp ID ::= {module disp(16) 3}
+
+dop ID ::= {module dop(17) 3}
+
+opBindingManagement ID ::= {module opBindingManagement(18) 3}
+
+opBindingOIDs ID ::= {module opBindingOIDs(19) 3}
+
+hierarchicalOperationalBindings ID ::=
+  {module hierarchicalOperationalBindings(20) 3}
+
+dsaOperationalAttributeTypes ID ::= {module dsaOperationalAttributeTypes(22) 3}
+
+schemaAdministration ID ::= {module schemaAdministration(23) 3}
+
+basicAccessControl ID ::= {module basicAccessControl(24) 3}
+
+directoryOperationalBindingTypes ID ::=
+  {module directoryOperationalBindingTypes(25) 3}
+
+certificateExtensions ID ::= {module certificateExtensions(26) 0}
+
+directoryManagement ID ::= {module directoryManagement(27) 1}
+
+enhancedSecurity ID ::= {module enhancedSecurity(28) 1}
+
+iDMProtocolSpecification ID ::= {module iDMProtocolSpecification(30) 4}
+
+directoryIDMProtocols ID ::= {module directoryIDMProtocols(31) 4}
+
+-- directorySecurityExchanges			ID	::=	{module directorySecurityExchanges (29) 1}
+-- synonyms
+id-oc ID ::=
+  objectClass
+
+id-at ID ::= attributeType
+
+id-as ID ::= abstractSyntax
+
+id-mr ID ::= matchingRule
+
+id-nf ID ::= nameForm
+
+id-sc ID ::= subentry
+
+id-oa ID ::= operationalAttributeType
+
+id-ob ID ::= operationalBinding
+
+id-doa ID ::= dsaOperationalAttribute
+
+id-kmr ID ::= knowledgeMatchingRule
+
+id-soc ID ::= schemaObjectClass
+
+id-soa ID ::= schemaOperationalAttribute
+
+id-ar ID ::= administrativeRoles
+
+id-aca ID ::= accessControlAttribute
+
+id-ac ID ::= applicationContext
+
+id-rosObject ID ::= rosObject
+
+id-contract ID ::= contract
+
+id-package ID ::= package
+
+id-acScheme ID ::= accessControlSchemes
+
+id-ce ID ::= certificateExtension
+
+id-mgt ID ::= managementObject
+
+id-idm ID ::= idmProtocol
+
+id-avc ID ::= attributeValueContext
+
+-- id-se   					ID	::=	securityExchange
+id-pr ID ::= problem
+
+id-not ID ::= notification
+
+id-mre ID ::= matchingRestriction
+
+id-cat ID ::= controlAttributeType
+
+-- obsolete module identifiers
+--	usefulDefinition	 			ID	::=	{module 0}
+--	informationFramework				ID	::=	{module 1}
+-- 	directoryAbstractService  			ID	::=	{module 2}
+-- 	distributedOperations				ID	::=	{module 3}
+--	protocolObjectIdentifiers  			ID	::=	{module 4}
+-- 	selectedAttributeTypes				ID	::=	{module 5}
+-- 	selectedObjectClasses				ID	::=	{module 6}
+--	authenticationFramework			ID	::=	{module 7}
+--	algorithmObjectIdentifiers			ID	::=	{module 8}
+--	directoryObjectIdentifiers			ID	::=	{module 9}
+--	upperBounds					ID	::=	{module 10}
+--	dap							ID	::=	{module 11}
+--	dsp							ID	::=	{module 12}
+--	distributedDirectoryObjectIdentifiers	ID	::=	{module 13}
+-- unused module identifiers
+--	directoryShadowOIDs				ID	::=	{module 14}
+--	directoryShadowAbstractService		ID	::=	{module 15}
+--	disp							ID	::=	{module 16}
+--	dop							ID	::=	{module 17}
+--	opBindingManagement			ID	::=	{module 18}
+--	opBindingOIDs					ID	::=	{module 19}
+--	hierarchicalOperationalBindings		ID	::=	{module 20}
+--	dsaOperationalAttributeTypes		ID	::=	{module 22}
+--	schemaAdministration				ID	::=	{module 23}
+--	basicAccessControl				ID	::=	{module 24}
+--	operationalBindingOIDs			ID	::=	{module 25}
+END -- UsefulDefinitions
diff --git a/lib/public_key/doc/src/Makefile b/lib/public_key/doc/src/Makefile
index 9616a96195..17fb67e95c 100644
--- a/lib/public_key/doc/src/Makefile
+++ b/lib/public_key/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2008-2011. All Rights Reserved.
+# Copyright Ericsson AB 2008-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -114,14 +114,14 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 release_spec:
 
 info:
diff --git a/lib/public_key/doc/src/cert_records.xml b/lib/public_key/doc/src/cert_records.xml
index ad4f5812cb..94c7c46350 100644
--- a/lib/public_key/doc/src/cert_records.xml
+++ b/lib/public_key/doc/src/cert_records.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -37,7 +37,10 @@
   <p>This chapter briefly describes erlang records derived from asn1
   specifications used to handle X509 certificates. The intent is to
   describe the data types and not to specify the meaning of each
-  component for this we refer you to RFC 5280.
+  component for this we refer you to <url
+  href="http://www.ietf.org/rfc/rfc5280.txt">RFC 5280</url>. Also
+  descirbed is <p>CertificationRequest</p> that is defined by 
+  <url href="http://www.rsa.com/rsalabs/node.asp?id=2124">PKCS-10</url>.
   </p>
 
   <p>Use the following include directive to get access to the
@@ -630,6 +633,40 @@ oid names see table below. Ex: ?'id-dsa-with-sha1'</p>
 	 aACompromise        
        </c></p>
  </section>
- 
+
+ <section>
+   <marker id="PKCS10"></marker>
+   <title>PKCS#10 Certification Request</title>
+   <code>
+#'CertificationRequest'{
+          certificationRequestInfo #'CertificationRequestInfo'{},
+	  signatureAlgorithm	   #'CertificationRequest_signatureAlgorithm'{}}.
+	  signature                {0, binary()} - asn1 compact bitstring
+	  }
+
+#'CertificationRequestInfo'{
+	  version       atom(),
+	  subject       {rdnSequence, [#AttributeTypeAndValue'{}]} ,
+	  subjectPKInfo #'CertificationRequestInfo_subjectPKInfo'{},
+	  attributes    [#AttributeTypeAndValue'{}]
+	  }
+
+#'CertificationRequestInfo_subjectPKInfo'{
+          algorithm		#'CertificationRequestInfo_subjectPKInfo_algorithm'{}
+	  subjectPublicKey 	 {0, binary()} - asn1 compact bitstring
+	  }
+
+#'CertificationRequestInfo_subjectPKInfo_algorithm'{
+     algorithm = oid(),
+     parameters = asn1_der_encoded()
+}	  
+
+#'CertificationRequest_signatureAlgorithm'{
+     algorithm = oid(),
+     parameters = asn1_der_encoded()
+     }  
+   </code> 
+ </section>
+
 </section>
 </chapter>
diff --git a/lib/public_key/doc/src/introduction.xml b/lib/public_key/doc/src/introduction.xml
index a21fcf3576..e0dd5603f7 100644
--- a/lib/public_key/doc/src/introduction.xml
+++ b/lib/public_key/doc/src/introduction.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -37,15 +37,16 @@
   <section>
     <title>Purpose</title>
     <p> This application provides an API to public key infrastructure
-    from  RFC 3280 (X.509 certificates) and public key formats defined
-    by the PKCS-standard.</p>
+    from <url href="http://www.ietf.org/rfc/rfc5280.txt">RFC
+    5280</url> (X.509 certificates) and public key formats defined by
+    the <url href="http://www.rsa.com/rsalabs/node.asp?id=2124">
+    PKCS-standard</url></p>
   </section>
 
   <section>
     <title>Prerequisites</title>
-    <p>It is assumed that the reader is familiar with the Erlang
-    programming language, concepts of OTP and has a basic understanding
-    of the concepts of using public keys.</p>
+    <p>It is assumed that the reader has a basic understanding
+    of the concepts of using public keys and digital certificates.</p>
   </section>
 
   <section>
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 4d3a9856eb..a5e8beedf0 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -34,6 +34,66 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Public_Key 0.17</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    ssh_decode now handles comments, at the end of the line,
+	    containing withe spaces correctly</p>
+          <p>
+	    Own Id: OTP-9361</p>
+        </item>
+        <item>
+          <p>
+	    Add missing references to sha224 and sha384</p>
+          <p>
+	    Own Id: OTP-9362 Aux Id: seq12116 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    public_key now supports PKCS-10 and includes exprimental
+	    support for PKCS-7</p>
+          <p>
+	    Own Id: OTP-10509 Aux Id: kunagi-291 [202] </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Public_Key 0.16</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add crypto and public_key support for the hash functions
+	    SHA224, SHA256, SHA384 and SHA512 and also hmac and
+	    rsa_sign/verify support using these hash functions.
+	    Thanks to Andreas Schultz for making a prototype.</p>
+          <p>
+	    Own Id: OTP-9908</p>
+        </item>
+        <item>
+          <p>
+	    Optimize RSA private key handling in <c>crypto</c> and
+	    <c>public_key</c>.</p>
+          <p>
+	    Own Id: OTP-10065</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 0.15</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 0b6673e826..2ec1fcff9d 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -34,7 +34,7 @@
   <modulesummary> API module for public key infrastructure.</modulesummary>
   <description>
     <p>This module provides functions to handle public key infrastructure
-    from RFC 5280 - X.509 certificates and some parts of the PKCS-standard.
+    from <url href="http://www.ietf.org/rfc/rfc5280.txt">RFC 5280</url>- X.509 certificates and some parts of the PKCS-standard.
     </p>
   </description>
 
@@ -61,7 +61,7 @@
     <p><code>string = [bytes()]</code></p>
    
     <p><code>pki_asn1_type() = 'Certificate' | 'RSAPrivateKey'| 'RSAPublicKey'
-    'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo'| 'PrivateKeyInfo'</code></p>
+    'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo'| 'PrivateKeyInfo' | 'CertificationRequest'</code></p>
     
     <p><code>pem_entry () = {pki_asn1_type(), binary(), %% DER or encrypted DER
           not_encrypted | cipher_info()} </code></p>
@@ -82,9 +82,9 @@
     <p><code> rsa_padding() =  'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding'
     | 'rsa_no_padding'</code></p>
     
-    <p><code> rsa_digest_type()  = 'md5' | 'sha' </code></p>
+    <p><code> rsa_digest_type()  = 'md5' | 'sha' | 'sha224' | 'sha256' | 'sha384' | 'sha512' </code></p>
 
-    <p><code> dss_digest_type()  = 'none' | 'sha' </code></p>
+    <p><code> dss_digest_type()  = 'sha' </code></p>
 
     <p><code> ssh_file()  = openssh_public_key | rfc4716_public_key |
     known_hosts | auth_keys </code></p>
@@ -396,14 +396,14 @@
     <name>sign(Msg, DigestType, Key) -> binary()</name>
     <fsummary> Create digital signature.</fsummary>
     <type>
-       <v>Msg = binary()</v>
+       <v>Msg = binary() | {digest,binary()}</v>
        <d>The msg is either the binary "plain text" data to be
-       signed or in the case that digest type is <c>none</c>
-       it is the hashed value of "plain text" i.e. the digest.</d>
-       <v>DigestType = rsa_digest_type() | dsa_digest_type()</v>
+       signed or it is the hashed value of "plain text" i.e. the
+       digest.</d>
+       <v>DigestType = rsa_digest_type() | dss_digest_type()</v>
        <v>Key = rsa_private_key() | dsa_private_key()</v>
-  </type> 
-  <desc> 
+  </type>
+  <desc>
     <p> Creates a digital signature.</p> 
   </desc> 
   </func>   
@@ -461,11 +461,10 @@
     <name>verify(Msg, DigestType, Signature, Key) -> boolean()</name>
     <fsummary>Verifies a digital signature.</fsummary>
     <type>
-      <v>Msg = binary()</v>
+      <v>Msg = binary() | {digest,binary()}</v>
        <d>The msg is either the binary "plain text" data 
-        or in the case that digest type is <c>none</c>
-	it is the hashed value of "plain text" i.e. the digest.</d>
-      <v>DigestType = rsa_digest_type() | dsa_digest_type()</v>
+        or it is the hashed value of "plain text" i.e. the digest.</d>
+      <v>DigestType = rsa_digest_type() | dss_digest_type()</v>
       <v>Signature = binary()</v>
       <v>Key = rsa_public_key() | dsa_public_key()</v> 
   </type> 
diff --git a/lib/public_key/include/public_key.hrl b/lib/public_key/include/public_key.hrl
index 2475295974..90ca7256ea 100644
--- a/lib/public_key/include/public_key.hrl
+++ b/lib/public_key/include/public_key.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -78,7 +78,7 @@
 -type dsa_public_key()       :: {integer(), #'Dss-Parms'{}}.
 -type pki_asn1_type()        ::  'Certificate' | 'RSAPrivateKey' | 'RSAPublicKey'
 			       | 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter'
-                               | 'SubjectPublicKeyInfo'.
+                               | 'SubjectPublicKeyInfo' | 'CertificationRequest'.
 -type pem_entry()            :: {pki_asn1_type(), binary(), %% DER or Encrypted DER
 				 not_encrypted | {Cipher :: string(), Salt :: binary()}}.
 -type asn1_type()            :: atom(). %% see "OTP-PUB-KEY.hrl
diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile
index 062c495a65..d5cd13d81a 100644
--- a/lib/public_key/src/Makefile
+++ b/lib/public_key/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2008-2011. All Rights Reserved.
+# Copyright Ericsson AB 2008-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -102,11 +102,11 @@ $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl
index b76e32a2a0..f9e2025479 100644
--- a/lib/public_key/src/pubkey_cert.erl
+++ b/lib/public_key/src/pubkey_cert.erl
@@ -376,8 +376,12 @@ encoded_tbs_cert(Cert) ->
 
 digest_type(?sha1WithRSAEncryption) ->
     sha;
+digest_type(?sha224WithRSAEncryption) ->
+    sha224;
 digest_type(?sha256WithRSAEncryption) ->
     sha256;
+digest_type(?sha384WithRSAEncryption) ->
+    sha384;
 digest_type(?sha512WithRSAEncryption) ->
     sha512;
 digest_type(?md5WithRSAEncryption) ->
diff --git a/lib/public_key/src/pubkey_cert_records.erl b/lib/public_key/src/pubkey_cert_records.erl
index b86d7a1f0c..98004c71a3 100644
--- a/lib/public_key/src/pubkey_cert_records.erl
+++ b/lib/public_key/src/pubkey_cert_records.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -57,6 +57,15 @@ transform(#'OTPTBSCertificate'{}= TBS, decode) ->
 transform(#'AttributeTypeAndValue'{type=Id,value=Value0} = ATAV, Func) ->
     {ok, Value} =
         case attribute_type(Id) of
+	    'X520countryName'when Func == decode ->
+		%% Workaround that some certificates break the ASN-1 spec
+		%% and encode countryname as utf8
+		case 'OTP-PUB-KEY':Func('OTP-X520countryname', Value0) of
+		    {ok, {utf8String, Utf8Value}} ->
+			{ok, unicode:characters_to_list(Utf8Value)};
+		    {ok, {printableString, ASCCI}} ->
+			{ok, ASCCI}
+		end;
             Type when is_atom(Type) -> 'OTP-PUB-KEY':Func(Type, Value0);
             _UnknownType            -> {ok, Value0}
         end,
@@ -110,7 +119,7 @@ encode_supportedPublicKey(#'OTPSubjectPublicKeyInfo'{algorithm= PA =
 						     subjectPublicKey = SPK0}) ->
     Type = supportedPublicKeyAlgorithms(Algo),
     {ok, SPK} = 'OTP-PUB-KEY':encode(Type, SPK0),
-    #'OTPSubjectPublicKeyInfo'{subjectPublicKey = {0,list_to_binary(SPK)}, algorithm=PA}.
+    #'OTPSubjectPublicKeyInfo'{subjectPublicKey = {0,SPK}, algorithm=PA}.
 
 %%% Extensions
 
@@ -152,7 +161,7 @@ decode_extensions(Exts) ->
 		      case extension_id(Id) of
 			  undefined -> Ext;
 			  Type ->
-			      {ok, Value} = 'OTP-PUB-KEY':decode(Type, list_to_binary(Value0)),
+			      {ok, Value} = 'OTP-PUB-KEY':decode(Type, iolist_to_binary(Value0)),
 			      Ext#'Extension'{extnValue=transform(Value,decode)}
 		      end
 	      end, Exts).
@@ -167,7 +176,7 @@ encode_extensions(Exts) ->
 			  Type ->
 			      Value1 = transform(Value0,encode),
 			      {ok, Value} = 'OTP-PUB-KEY':encode(Type, Value1),
-			      Ext#'Extension'{extnValue=list_to_binary(Value)}
+			      Ext#'Extension'{extnValue=Value}
 		      end
 	      end, Exts).
 
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl
index 910473d629..4012825f20 100644
--- a/lib/public_key/src/pubkey_pem.erl
+++ b/lib/public_key/src/pubkey_pem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -194,7 +194,12 @@ pem_start('SubjectPublicKeyInfo') ->
 pem_start('DSAPrivateKey') ->
     <<"-----BEGIN DSA PRIVATE KEY-----">>;
 pem_start('DHParameter') ->
-    <<"-----BEGIN DH PARAMETERS-----">>.
+    <<"-----BEGIN DH PARAMETERS-----">>;
+pem_start('CertificationRequest') ->
+    <<"-----BEGIN CERTIFICATE REQUEST-----">>;
+pem_start('ContentInfo') ->
+    <<"-----BEGIN PKCS7-----">>.
+
 pem_end(<<"-----BEGIN CERTIFICATE-----">>) ->
     <<"-----END CERTIFICATE-----">>;
 pem_end(<<"-----BEGIN RSA PRIVATE KEY-----">>) ->
@@ -211,6 +216,10 @@ pem_end(<<"-----BEGIN PRIVATE KEY-----">>) ->
     <<"-----END PRIVATE KEY-----">>;
 pem_end(<<"-----BEGIN ENCRYPTED PRIVATE KEY-----">>) ->
     <<"-----END ENCRYPTED PRIVATE KEY-----">>;
+pem_end(<<"-----BEGIN CERTIFICATE REQUEST-----">>) ->
+    <<"-----END CERTIFICATE REQUEST-----">>;
+pem_end(<<"-----BEGIN PKCS7-----">>) ->
+    <<"-----END PKCS7-----">>;
 pem_end(_) ->
     undefined.
 
@@ -229,7 +238,11 @@ asn1_type(<<"-----BEGIN DH PARAMETERS-----">>) ->
 asn1_type(<<"-----BEGIN PRIVATE KEY-----">>) ->
     'PrivateKeyInfo';
 asn1_type(<<"-----BEGIN ENCRYPTED PRIVATE KEY-----">>) ->
-    'EncryptedPrivateKeyInfo'.
+    'EncryptedPrivateKeyInfo';
+asn1_type(<<"-----BEGIN CERTIFICATE REQUEST-----">>) ->
+    'CertificationRequest';
+asn1_type(<<"-----BEGIN PKCS7-----">>) ->
+    'ContentInfo'.
 
 pem_decrypt() ->
     <<"Proc-Type: 4,ENCRYPTED">>.
diff --git a/lib/public_key/src/pubkey_ssh.erl b/lib/public_key/src/pubkey_ssh.erl
index f0c94e29a5..008ea96dd3 100644
--- a/lib/public_key/src/pubkey_ssh.erl
+++ b/lib/public_key/src/pubkey_ssh.erl
@@ -47,7 +47,7 @@ decode(Bin, public_key)->
 	    rfc4716_decode(Bin)
     end;
 decode(Bin, rfc4716_public_key) ->
-     rfc4716_decode(Bin);
+    rfc4716_decode(Bin);
 decode(Bin, Type) ->
     openssh_decode(Bin, Type).
 
@@ -58,7 +58,7 @@ decode(Bin, Type) ->
 %% Description: Encodes a list of ssh file entries.
 %%--------------------------------------------------------------------
 encode(Entries, Type) ->
-    erlang:iolist_to_binary(lists:map(fun({Key, Attributes}) ->
+    iolist_to_binary(lists:map(fun({Key, Attributes}) ->
 					      do_encode(Type, Key, Attributes)
 				      end, Entries)).
 
@@ -106,7 +106,7 @@ rfc4716_decode_line(Line, Lines, Acc) ->
 	_ ->
 	    {Body, Rest} = join_entry([Line | Lines], []),
 	    {lists:reverse(Acc), rfc4716_pubkey_decode(base64:mime_decode(Body)), Rest}
-      end.
+    end.
 
 join_entry([<<"---- END SSH2 PUBLIC KEY ----", _/binary>>| Lines], Entry) ->
     {lists:reverse(Entry), Lines};
@@ -115,16 +115,16 @@ join_entry([Line | Lines], Entry) ->
 
 
 rfc4716_pubkey_decode(<<?UINT32(Len), Type:Len/binary,
-	      ?UINT32(SizeE), E:SizeE/binary,
-	      ?UINT32(SizeN), N:SizeN/binary>>) when Type == <<"ssh-rsa">> ->
+			?UINT32(SizeE), E:SizeE/binary,
+			?UINT32(SizeN), N:SizeN/binary>>) when Type == <<"ssh-rsa">> ->
     #'RSAPublicKey'{modulus = erlint(SizeN, N),
 		    publicExponent = erlint(SizeE, E)};
 
 rfc4716_pubkey_decode(<<?UINT32(Len), Type:Len/binary,
-	      ?UINT32(SizeP), P:SizeP/binary,
-	      ?UINT32(SizeQ), Q:SizeQ/binary,
-	      ?UINT32(SizeG), G:SizeG/binary,
-	      ?UINT32(SizeY), Y:SizeY/binary>>) when Type == <<"ssh-dss">> ->
+			?UINT32(SizeP), P:SizeP/binary,
+			?UINT32(SizeQ), Q:SizeQ/binary,
+			?UINT32(SizeG), G:SizeG/binary,
+			?UINT32(SizeY), Y:SizeY/binary>>) when Type == <<"ssh-dss">> ->
     {erlint(SizeY, Y),
      #'Dss-Parms'{p = erlint(SizeP, P),
 		  q = erlint(SizeQ, Q),
@@ -143,94 +143,63 @@ do_openssh_decode(FileType, [<<>> | Lines], Acc) ->
 do_openssh_decode(FileType,[<<"#", _/binary>> | Lines], Acc) ->
     do_openssh_decode(FileType, Lines, Acc);
 do_openssh_decode(auth_keys = FileType, [Line | Lines], Acc) ->
-    Split = binary:split(Line, <<" ">>, [global]),
-    case mend_split(Split, []) of
-	%% ssh2
-	[KeyType, Base64Enc, Comment] ->
+    case decode_auth_keys(Line) of
+	{ssh2,  {options, [Options, KeyType, Base64Enc| Comment]}} ->
 	    do_openssh_decode(FileType, Lines,
-			      [{openssh_pubkey_decode(KeyType, Base64Enc),
-				[{comment, string_decode(Comment)}]} | Acc]);
-	%% ssh1
-	[Options, Bits, Exponent, Modulus, Comment] ->
+			      [{openssh_pubkey_decode(KeyType, Base64Enc), 
+				decode_comment(Comment) ++ [{options, comma_list_decode(Options)}]} | Acc]);
+	{ssh2, {no_options, [KeyType, Base64Enc| Comment]}} ->
+	    do_openssh_decode(FileType, Lines,
+			      [{openssh_pubkey_decode(KeyType, Base64Enc), 
+				decode_comment(Comment)} | Acc]);
+	{ssh1, {options, [Options, Bits, Exponent, Modulus | Comment]}} ->
 	    do_openssh_decode(FileType, Lines,
 			      [{ssh1_rsa_pubkey_decode(Modulus, Exponent),
-				[{comment, string_decode(Comment)},
-				 {options, comma_list_decode(Options)},
-				 {bits, integer_decode(Bits)}]} | Acc]);
-	[A, B, C, D]  ->
-	    ssh_2_or_1(FileType, Lines, Acc, A,B,C,D)
+				decode_comment(Comment) ++ [{options, comma_list_decode(Options)},
+							    {bits, integer_decode(Bits)}]
+			       } | Acc]);
+	{ssh1, {no_options, [Bits, Exponent, Modulus | Comment]}} ->
+	    do_openssh_decode(FileType, Lines,
+			      [{ssh1_rsa_pubkey_decode(Modulus, Exponent),
+				decode_comment(Comment) ++ [{bits, integer_decode(Bits)}]
+			       } | Acc])
     end;
 
 do_openssh_decode(known_hosts = FileType, [Line | Lines], Acc) ->
-    Split = binary:split(Line, <<" ">>, [global]),
-    case mend_split(Split, []) of
-	%% ssh 2
-	[HostNames, KeyType, Base64Enc] ->
+    case decode_known_hosts(Line) of
+	{ssh2, [HostNames, KeyType, Base64Enc| Comment]} ->
 	    do_openssh_decode(FileType, Lines,
-			      [{openssh_pubkey_decode(KeyType, Base64Enc),
-				[{hostnames, comma_list_decode(HostNames)}]}| Acc]);
-	[A, B, C, D] ->
-	    ssh_2_or_1(FileType, Lines, Acc, A, B, C, D);			  
-	%% ssh 1
-	[HostNames, Bits, Exponent, Modulus, Comment] ->
+			      [{openssh_pubkey_decode(KeyType, Base64Enc), 
+				decode_comment(Comment) ++ 
+				    [{hostnames, comma_list_decode(HostNames)}]}| Acc]);
+	{ssh1, [HostNames, Bits, Exponent, Modulus | Comment]} ->
 	    do_openssh_decode(FileType, Lines,
-			      [{ssh1_rsa_pubkey_decode(Modulus, Exponent),
-				[{comment, string_decode(Comment)},
-				 {hostnames, comma_list_decode(HostNames)},
-				 {bits, integer_decode(Bits)}]} | Acc])
-	end;
+			      [{ssh1_rsa_pubkey_decode(Modulus, Exponent), 
+				decode_comment(Comment) ++ 
+				    [{hostnames, comma_list_decode(HostNames)},
+				     {bits, integer_decode(Bits)}]} 
+			       | Acc])
+    end;
 
 do_openssh_decode(openssh_public_key = FileType, [Line | Lines], Acc) ->
-    Split = binary:split(Line, <<" ">>, [global]),
-    case mend_split(Split, []) of
-	[KeyType, Base64Enc, Comment0] when KeyType == <<"ssh-rsa">>;
-					    KeyType == <<"ssh-dss">> ->
-	    Comment = string:strip(binary_to_list(Comment0), right, $\n),
+    case split_n(2, Line, []) of
+	[KeyType, Base64Enc] when KeyType == <<"ssh-rsa">>;
+				  KeyType == <<"ssh-dss">> ->
+	    do_openssh_decode(FileType, Lines,
+			      [{openssh_pubkey_decode(KeyType, Base64Enc),
+				[]} | Acc]);
+	[KeyType, Base64Enc | Comment0] when KeyType == <<"ssh-rsa">>;
+					     KeyType == <<"ssh-dss">> ->
+	    Comment = string:strip(string_decode(iolist_to_binary(Comment0)), right, $\n),
 	    do_openssh_decode(FileType, Lines,
 			      [{openssh_pubkey_decode(KeyType, Base64Enc),
 				[{comment, Comment}]} | Acc])
     end.
 
-ssh_2_or_1(known_hosts = FileType, Lines, Acc, A, B, C, D) ->
-    try integer_decode(B) of
-	Int -> 
-	    file_type_decode_ssh1(FileType, Lines, Acc, A, Int, C,D)
-    catch
-	error:badarg  ->
-	    file_type_decode_ssh2(FileType, Lines, Acc, A,B,C,D)
-    end;
-ssh_2_or_1(auth_keys = FileType, Lines, Acc, A, B, C, D) ->
-  try integer_decode(A) of
-	Int -> 
-	    file_type_decode_ssh1(FileType, Lines, Acc, Int, B, C,D)
-    catch
-	error:badarg  ->
-	    file_type_decode_ssh2(FileType, Lines, Acc, A,B,C,D)
-    end.
-
-file_type_decode_ssh1(known_hosts = FileType, Lines, Acc, HostNames, Bits, Exponent, Modulus) ->
-    do_openssh_decode(FileType, Lines,
-		      [{ssh1_rsa_pubkey_decode(Modulus, Exponent),
-			[{comment, []},
-			 {hostnames, comma_list_decode(HostNames)},
-			 {bits, Bits}]} | Acc]);  
-file_type_decode_ssh1(auth_keys = FileType, Lines, Acc, Bits, Exponent, Modulus, Comment) ->
-    do_openssh_decode(FileType, Lines,
-		      [{ssh1_rsa_pubkey_decode(Modulus, Exponent),
-			[{comment, string_decode(Comment)},
-			 {bits, Bits}]} | Acc]).
-
-file_type_decode_ssh2(known_hosts = FileType, Lines, Acc, HostNames, KeyType, Base64Enc, Comment) ->
-    do_openssh_decode(FileType, Lines,
-		      [{openssh_pubkey_decode(KeyType, Base64Enc),
-			[{comment, string_decode(Comment)},
-			 {hostnames, comma_list_decode(HostNames)}]} | Acc]);
-file_type_decode_ssh2(auth_keys = FileType, Lines, Acc, Options, KeyType, Base64Enc, Comment) ->
-    do_openssh_decode(FileType, Lines,
-		      [{openssh_pubkey_decode(KeyType, Base64Enc),
-			[{comment, string_decode(Comment)},
-			 {options, comma_list_decode(Options)}]}
-		       | Acc]).
+decode_comment([]) ->
+    [];
+decode_comment(Comment) ->
+    [{comment, string_decode(iolist_to_binary(Comment))}].
 
 openssh_pubkey_decode(<<"ssh-rsa">>, Base64Enc) ->
     <<?UINT32(StrLen), _:StrLen/binary,
@@ -267,7 +236,7 @@ integer_decode(BinStr) ->
     list_to_integer(binary_to_list(BinStr)).
 
 string_decode(BinStr) ->
-    binary_to_list(BinStr).
+    unicode_decode(BinStr).
 
 unicode_decode(BinStr) ->
     unicode:characters_to_list(BinStr).
@@ -285,11 +254,11 @@ do_encode(Type, Key, Attributes) ->
     openssh_encode(Type, Key, Attributes).
 
 rfc4716_encode(Key, [],[]) ->
-    erlang:iolist_to_binary([begin_marker(),"\n",
+    iolist_to_binary([begin_marker(),"\n",
 			     split_lines(base64:encode(ssh2_pubkey_encode(Key))),
 			     "\n", end_marker(), "\n"]);
 rfc4716_encode(Key, [], [_|_] = Acc) ->
-    erlang:iolist_to_binary([begin_marker(), "\n",
+    iolist_to_binary([begin_marker(), "\n",
 			     lists:reverse(Acc),
 			     split_lines(base64:encode(ssh2_pubkey_encode(Key))),
 			     "\n", end_marker(), "\n"]);
@@ -319,9 +288,9 @@ rfc4716_encode_value(Value) ->
     end.
 
 openssh_encode(openssh_public_key, Key, Attributes) ->
-    Comment = proplists:get_value(comment, Attributes),
+    Comment = proplists:get_value(comment, Attributes, ""),
     Enc = base64:encode(ssh2_pubkey_encode(Key)),
-    erlang:iolist_to_binary([key_type(Key), " ",  Enc,  " ", Comment, "\n"]);
+    iolist_to_binary([key_type(Key), " ",  Enc,  " ", Comment, "\n"]);
 
 openssh_encode(auth_keys, Key, Attributes) ->
     Comment = proplists:get_value(comment, Attributes, ""),
@@ -345,30 +314,30 @@ openssh_encode(known_hosts, Key, Attributes) ->
     end.
 
 openssh_ssh2_auth_keys_encode(undefined, Key, Comment) ->
-    erlang:iolist_to_binary([key_type(Key)," ",  base64:encode(ssh2_pubkey_encode(Key)), line_end(Comment)]);
+    iolist_to_binary([key_type(Key)," ",  base64:encode(ssh2_pubkey_encode(Key)), line_end(Comment)]);
 openssh_ssh2_auth_keys_encode(Options, Key, Comment) ->
-    erlang:iolist_to_binary([comma_list_encode(Options, []), " ",
+    iolist_to_binary([comma_list_encode(Options, []), " ",
 			     key_type(Key)," ", base64:encode(ssh2_pubkey_encode(Key)), line_end(Comment)]).
 
 openssh_ssh1_auth_keys_encode(undefined, Bits,
 			      #'RSAPublicKey'{modulus = N, publicExponent = E},
 			      Comment) ->
-    erlang:iolist_to_binary([integer_to_list(Bits), " ", integer_to_list(E), " ", integer_to_list(N),
+    iolist_to_binary([integer_to_list(Bits), " ", integer_to_list(E), " ", integer_to_list(N),
 			     line_end(Comment)]);
 openssh_ssh1_auth_keys_encode(Options, Bits,
 			      #'RSAPublicKey'{modulus = N, publicExponent = E},
 			      Comment) ->
-    erlang:iolist_to_binary([comma_list_encode(Options, []), " ", integer_to_list(Bits),
+    iolist_to_binary([comma_list_encode(Options, []), " ", integer_to_list(Bits),
 			     " ", integer_to_list(E), " ", integer_to_list(N), line_end(Comment)]).
 
 openssh_ssh2_know_hosts_encode(Hostnames, Key, Comment) ->
-    erlang:iolist_to_binary([comma_list_encode(Hostnames, []), " ",
+    iolist_to_binary([comma_list_encode(Hostnames, []), " ",
 			     key_type(Key)," ",  base64:encode(ssh2_pubkey_encode(Key)), line_end(Comment)]).
 
 openssh_ssh1_known_hosts_encode(Hostnames, Bits,
-			      #'RSAPublicKey'{modulus = N, publicExponent = E},
-			      Comment) ->
-    erlang:iolist_to_binary([comma_list_encode(Hostnames, [])," ", integer_to_list(Bits)," ",
+				#'RSAPublicKey'{modulus = N, publicExponent = E},
+				Comment) ->
+    iolist_to_binary([comma_list_encode(Hostnames, [])," ", integer_to_list(Bits)," ",
 			     integer_to_list(E)," ", integer_to_list(N), line_end(Comment)]).
 
 line_end("") ->
@@ -411,24 +380,6 @@ ssh2_pubkey_encode({Y,  #'Dss-Parms'{p = P, q = Q, g = G}}) ->
       GBin/binary,
       YBin/binary>>.
 
-mend_split([Part1, Part2 | Rest] = List, Acc) ->
-    case option_end(Part1, Part2) of
-	true ->
-	    lists:reverse(Acc) ++ List;
-	false ->
-	    case length(binary:matches(Part1, <<"\"">>)) of
-		N  when N rem 2 == 0 ->
-		    mend_split(Rest, [Part1 | Acc]);
-		_ ->
-		    mend_split([<<Part1/binary, Part2/binary>> | Rest], Acc)
-	    end
-    end.
-
-option_end(Part1, Part2) ->
-    (is_key_field(Part1) orelse is_bits_field(Part1))
-	orelse
-	  (is_key_field(Part2) orelse is_bits_field(Part2)).
-
 is_key_field(<<"ssh-dss">>) ->
     true;
 is_key_field(<<"ssh-rsa">>) ->
@@ -456,3 +407,72 @@ split_lines(<<Text:?ENCODED_LINE_LENGTH/binary, Rest/binary>>) ->
     [Text, $\n | split_lines(Rest)];
 split_lines(Bin) ->
     [Bin].
+
+decode_auth_keys(Line) ->
+    [First, Rest] = binary:split(Line, <<" ">>, []),
+    case is_key_field(First) of
+	true  ->
+	    {ssh2, decode_auth_keys_ssh2(First, Rest)};
+	false ->
+	    case is_bits_field(First) of
+		true ->
+		    {ssh1, decode_auth_keys_ssh1(First, Rest)};
+		false ->
+		    decode_auth_keys(First, Rest)
+	    end
+    end.
+
+decode_auth_keys(First, Line) ->
+    [Second, Rest] = binary:split(Line, <<" ">>, []),
+    case is_key_field(Second) of
+	true -> 
+	    {ssh2, decode_auth_keys_ssh2(First, Second, Rest)};
+	false ->
+	    case is_bits_field(Second) of
+		true -> 
+		    {ssh1, decode_auth_keys_ssh1(First, Second, Rest)};
+		false ->
+		    decode_auth_keys(<<First/binary, Second/binary>>, Rest)
+	    end
+    end.
+
+decode_auth_keys_ssh2(KeyType, Rest) ->
+    {no_options, [KeyType | split_n(1, Rest,  [])]}.
+
+decode_auth_keys_ssh2(Options, Next, Rest) ->
+    {options, [Options, Next | split_n(1, Rest,  [])]}.
+
+decode_auth_keys_ssh1(Options, Next, Rest) ->
+    {options, [Options, Next | split_n(2, Rest,  [])]}.
+
+decode_auth_keys_ssh1(First, Rest) ->
+    {no_options, [First | split_n(2, Rest, [])]}.
+
+decode_known_hosts(Line) ->
+    [First, Rest] = binary:split(Line, <<" ">>, []),
+    [Second, Rest1] = binary:split(Rest, <<" ">>, []),
+
+    case is_bits_field(Second) of
+	true ->
+	    {ssh1, decode_known_hosts_ssh1(First, Second, Rest1)};
+	false ->
+	    {ssh2, decode_known_hosts_ssh2(First, Second, Rest1)}
+    end.
+
+decode_known_hosts_ssh1(Hostnames, Bits, Rest) ->
+    [Hostnames, Bits | split_n(2, Rest,  [])].
+
+decode_known_hosts_ssh2(Hostnames, KeyType, Rest) ->
+    [Hostnames, KeyType | split_n(1, Rest,  [])].
+
+split_n(0, <<>>, Acc) ->
+    lists:reverse(Acc);
+split_n(0, Bin, Acc) ->
+    lists:reverse([Bin | Acc]);
+split_n(N, Bin, Acc) ->
+    case binary:split(Bin, <<" ">>, []) of
+	[First, Rest] ->
+	    split_n(N-1, Rest, [First | Acc]);
+	[Last] ->
+	    split_n(0, <<>>, [Last | Acc])
+    end.
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index 2e2a6cd296..d5df53e848 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -48,8 +48,8 @@
 -type rsa_padding()          :: 'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding' 
 			      | 'rsa_no_padding'.
 -type public_crypt_options() :: [{rsa_pad, rsa_padding()}].
--type rsa_digest_type()      :: 'md5' | 'sha'| 'sha256' | 'sha512'.
--type dss_digest_type()      :: 'none' | 'sha'.
+-type rsa_digest_type()      :: 'md5' | 'sha'| 'sha224' | 'sha256' | 'sha384' | 'sha512'.
+-type dss_digest_type()      :: 'none' | 'sha'. %% None is for backwards compatibility
 
 -define(UINT32(X), X:32/unsigned-big-integer).
 -define(DER_NULL, <<5, 0>>).
@@ -241,15 +241,15 @@ pkix_encode(Asn1Type, Term0, otp) when is_atom(Asn1Type) ->
 decrypt_private(CipherText, Key) ->
     decrypt_private(CipherText, Key, []).
 
-decrypt_private(CipherText, 
-		#'RSAPrivateKey'{modulus = N,publicExponent = E,
-				 privateExponent = D}, 
-		Options)  when is_binary(CipherText), 
-			       is_list(Options) ->
+decrypt_private(CipherText,
+		#'RSAPrivateKey'{modulus = N, publicExponent = E,
+				 privateExponent = D} = Key,
+		Options)
+  when is_binary(CipherText),
+       is_integer(N), is_integer(E), is_integer(D),  
+       is_list(Options) ->
     Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
-    crypto:rsa_private_decrypt(CipherText, 
-			       [crypto:mpint(E), crypto:mpint(N),
-				crypto:mpint(D)], Padding).
+    crypto:rsa_private_decrypt(CipherText, format_rsa_private_key(Key), Padding).
 
 %%--------------------------------------------------------------------
 -spec decrypt_public(CipherText :: binary(), rsa_public_key() | rsa_private_key()) ->
@@ -307,72 +307,86 @@ encrypt_public(PlainText, #'RSAPrivateKey'{modulus=N,publicExponent=E},
 encrypt_private(PlainText, Key) ->
     encrypt_private(PlainText, Key, []).
 
-encrypt_private(PlainText, #'RSAPrivateKey'{modulus = N,
-					    publicExponent = E, 
-					    privateExponent = D}, 
-		Options) when is_binary(PlainText), is_list(Options) ->		
+encrypt_private(PlainText,
+		#'RSAPrivateKey'{modulus = N, publicExponent = E,
+				 privateExponent = D} = Key,
+		Options)
+  when is_binary(PlainText),
+       is_integer(N), is_integer(E), is_integer(D),
+       is_list(Options) ->		
     Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
-    crypto:rsa_private_encrypt(PlainText, [crypto:mpint(E), 
-					   crypto:mpint(N), 
-					   crypto:mpint(D)], Padding).
+    crypto:rsa_private_encrypt(PlainText, format_rsa_private_key(Key), Padding).
+
+
+format_rsa_private_key(#'RSAPrivateKey'{modulus = N, publicExponent = E,
+					privateExponent = D,
+					prime1 = P1, prime2 = P2,
+					exponent1 = E1, exponent2 = E2,
+					coefficient = C})
+  when is_integer(P1), is_integer(P2), 
+       is_integer(E1), is_integer(E2), is_integer(C) ->
+   [crypto:mpint(K) || K <- [E, N, D, P1, P2, E1, E2, C]];
+
+format_rsa_private_key(#'RSAPrivateKey'{modulus = N, publicExponent = E,
+					privateExponent = D}) ->
+   [crypto:mpint(K) || K <- [E, N, D]].
 
 %%--------------------------------------------------------------------
--spec sign(PlainTextOrDigest :: binary(), rsa_digest_type() | dss_digest_type(), 
-	   rsa_private_key() | 
+-spec sign(binary() | {digest, binary()},  rsa_digest_type() | dss_digest_type(),
+	   rsa_private_key() |
 	   dsa_private_key()) -> Signature :: binary().
-%%
 %% Description: Create digital signature.
 %%--------------------------------------------------------------------
-sign(PlainText, DigestType,  #'RSAPrivateKey'{modulus = N,  publicExponent = E,
-					      privateExponent = D}) 
-  when is_binary(PlainText),
-       (DigestType == md5 orelse
-	DigestType == sha) ->
-    
-    crypto:rsa_sign(DigestType, sized_binary(PlainText), [crypto:mpint(E),
-							  crypto:mpint(N),
-							  crypto:mpint(D)]);
-
-sign(Digest, none, #'DSAPrivateKey'{p = P, q = Q, g = G, x = X}) 
-  when is_binary(Digest)->
-    crypto:dss_sign(none, Digest, 
-		    [crypto:mpint(P), crypto:mpint(Q), 
+sign({digest,_}=Digest, DigestType, Key = #'RSAPrivateKey'{}) ->
+    crypto:rsa_sign(DigestType, Digest, format_rsa_private_key(Key));
+
+sign(PlainText, DigestType, Key = #'RSAPrivateKey'{}) ->
+    crypto:rsa_sign(DigestType, sized_binary(PlainText), format_rsa_private_key(Key));
+
+sign({digest,_}=Digest, sha, #'DSAPrivateKey'{p = P, q = Q, g = G, x = X}) ->
+    crypto:dss_sign(Digest,
+		    [crypto:mpint(P), crypto:mpint(Q),
 		     crypto:mpint(G), crypto:mpint(X)]);
-  
-sign(PlainText, sha, #'DSAPrivateKey'{p = P, q = Q, g = G, x = X}) 
-  when is_binary(PlainText) ->
-    crypto:dss_sign(sized_binary(PlainText), 
-		    [crypto:mpint(P), crypto:mpint(Q), 
-		     crypto:mpint(G), crypto:mpint(X)]).
+
+sign(PlainText, sha, #'DSAPrivateKey'{p = P, q = Q, g = G, x = X}) ->
+    crypto:dss_sign(sized_binary(PlainText),
+          [crypto:mpint(P), crypto:mpint(Q),
+           crypto:mpint(G), crypto:mpint(X)]);
+
+%% Backwards compatible
+sign(Digest, none, #'DSAPrivateKey'{} = Key) ->
+    sign({digest,Digest}, sha, Key).
 
 %%--------------------------------------------------------------------
--spec verify(PlainTextOrDigest :: binary(), rsa_digest_type() | dss_digest_type(), 
-	     Signature :: binary(), rsa_public_key() 
+-spec verify(binary() | {digest, binary()}, rsa_digest_type() | dss_digest_type(),
+	     Signature :: binary(), rsa_public_key()
 	     | dsa_public_key()) -> boolean().
-%%
 %% Description: Verifies a digital signature.
 %%--------------------------------------------------------------------
-verify(PlainText, DigestType, Signature, 
-       #'RSAPublicKey'{modulus = Mod, publicExponent = Exp}) 
-  when is_binary (PlainText) and (DigestType == sha orelse
-				  DigestType == sha256 orelse 
-				  DigestType == sha512 orelse 
-				  DigestType == md5) ->
+verify({digest,_}=Digest, DigestType, Signature,
+       #'RSAPublicKey'{modulus = Mod, publicExponent = Exp}) ->
+    crypto:rsa_verify(DigestType, Digest,
+		      sized_binary(Signature),
+		      [crypto:mpint(Exp), crypto:mpint(Mod)]);
+
+verify(PlainText, DigestType, Signature,
+       #'RSAPublicKey'{modulus = Mod, publicExponent = Exp}) ->
     crypto:rsa_verify(DigestType,
 		      sized_binary(PlainText), 
 		      sized_binary(Signature), 
 		      [crypto:mpint(Exp), crypto:mpint(Mod)]);
 
-verify(Digest, none, Signature, {Key,  #'Dss-Parms'{p = P, q = Q, g = G}}) 
-  when is_integer(Key),  is_binary(Digest), is_binary(Signature) ->
-    crypto:dss_verify(none, 
-		      Digest, 
-		      sized_binary(Signature), 
+verify({digest,_}=Digest, sha, Signature, {Key,  #'Dss-Parms'{p = P, q = Q, g = G}})
+  when is_integer(Key), is_binary(Signature) ->
+    crypto:dss_verify(Digest, sized_binary(Signature),
 		      [crypto:mpint(P), crypto:mpint(Q), 
 		       crypto:mpint(G), crypto:mpint(Key)]);
-    
+%% Backwards compatibility
+verify(Digest, none, Signature, {_,  #'Dss-Parms'{}} = Key ) ->
+    verify({digest,Digest}, sha, Signature, Key);
+
 verify(PlainText, sha, Signature, {Key,  #'Dss-Parms'{p = P, q = Q, g = G}}) 
-  when is_integer(Key),  is_binary(PlainText), is_binary(Signature) ->
+  when is_integer(Key), is_binary(PlainText), is_binary(Signature) ->
     crypto:dss_verify(sized_binary(PlainText), 
 		      sized_binary(Signature), 
 		      [crypto:mpint(P), crypto:mpint(Q), 
diff --git a/lib/public_key/test/Makefile b/lib/public_key/test/Makefile
index b7f91981a5..929d321d69 100644
--- a/lib/public_key/test/Makefile
+++ b/lib/public_key/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2008-2011. All Rights Reserved.
+# Copyright Ericsson AB 2008-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -21,7 +21,7 @@ include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 
-INCLUDES= -I. -I ../include
+INCLUDES= -I. -I ../include -pa $(ERL_TOP)/lib/public_key/ebin
 
 # ----------------------------------------------------
 # Target Specs
@@ -78,11 +78,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SPEC_FILES) $(ERL_FILES) $(COVER_FILE) $(HRL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(SPEC_FILES) $(ERL_FILES) $(COVER_FILE) $(HRL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 release_docs_spec:
 
 
diff --git a/lib/public_key/test/erl_make_certs.erl b/lib/public_key/test/erl_make_certs.erl
index 254aa6d2f9..d6bdd05d01 100644
--- a/lib/public_key/test/erl_make_certs.erl
+++ b/lib/public_key/test/erl_make_certs.erl
@@ -137,10 +137,10 @@ decode_key(PemBin, Pw) ->
 
 encode_key(Key = #'RSAPrivateKey'{}) ->
     {ok, Der} = 'OTP-PUB-KEY':encode('RSAPrivateKey', Key),
-    {'RSAPrivateKey', list_to_binary(Der), not_encrypted};   
+    {'RSAPrivateKey', Der, not_encrypted};
 encode_key(Key = #'DSAPrivateKey'{}) ->
     {ok, Der} = 'OTP-PUB-KEY':encode('DSAPrivateKey', Key),
-    {'DSAPrivateKey', list_to_binary(Der), not_encrypted}.
+    {'DSAPrivateKey', Der, not_encrypted}.
 
 make_tbs(SubjectKey, Opts) ->    
     Version = list_to_atom("v"++integer_to_list(proplists:get_value(version, Opts, 3))),
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index a91dcfa029..2b83bc0a5c 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -107,11 +107,11 @@ all() ->
      {group, ssh_public_key_decode_encode},
      encrypt_decrypt,
      {group, sign_verify},
-     pkix, pkix_path_validation].
+     pkix, pkix_countryname, pkix_path_validation].
 
 groups() -> 
     [{pem_decode_encode, [], [dsa_pem, rsa_pem, encrypted_pem,
-			      dh_pem, cert_pem]},
+			      dh_pem, cert_pem, pkcs10_pem]},
      {ssh_public_key_decode_encode, [],
       [ssh_rsa_public_key, ssh_dsa_public_key, ssh_rfc4716_rsa_comment,
        ssh_rfc4716_dsa_comment, ssh_rfc4716_rsa_subject, ssh_known_hosts,
@@ -249,7 +249,42 @@ dh_pem(Config) when is_list(Config) ->
     DHParameter = public_key:pem_entry_decode(Entry),
 
     Entry = public_key:pem_entry_encode('DHParameter', DHParameter).
-   
+
+%%--------------------------------------------------------------------
+
+pkcs10_pem(doc) ->
+    [""];
+pkcs10_pem(suite) ->
+    [];
+pkcs10_pem(Config) when is_list(Config) ->
+    Datadir = ?config(data_dir, Config),
+    [{'CertificationRequest', DerPKCS10, not_encrypted} = Entry] =
+	erl_make_certs:pem_to_der(filename:join(Datadir, "req.pem")),
+
+    erl_make_certs:der_to_pem(filename:join(Datadir, "new_req.pem"), [Entry]),
+
+    PKCS10 = public_key:der_decode('CertificationRequest', DerPKCS10),
+    PKCS10 = public_key:pem_entry_decode(Entry),
+
+    Entry = public_key:pem_entry_encode('CertificationRequest', PKCS10).
+
+%%--------------------------------------------------------------------
+pkcs7_pem(doc) ->
+    [""];
+pkcs7_pem(suite) ->
+    [];
+pkcs7_pem(Config) when is_list(Config) ->
+    Datadir = ?config(data_dir, Config),
+    [{'ContentInfo', DerPKCS7, not_encrypted} = Entry] =
+	erl_make_certs:pem_to_der(filename:join(Datadir, "pkcs7_cert.pem")),
+
+    erl_make_certs:der_to_pem(filename:join(Datadir, "new_pkcs7_cert.pem"), [Entry]),
+
+    PKCS7 = public_key:der_decode('ContentInfo', DerPKCS7),
+    PKCS7 = public_key:pem_entry_decode(Entry),
+
+    Entry = public_key:pem_entry_encode('ContentInfo', PKCS7).
+
 %%--------------------------------------------------------------------
 cert_pem(doc) ->
     [""];
@@ -405,9 +440,20 @@ ssh_known_hosts(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
     {ok, SshKnownHosts} = file:read_file(filename:join(Datadir, "known_hosts")),
-    [{#'RSAPublicKey'{}, Attributes1}, {#'RSAPublicKey'{}, Attributes2}] = Decoded =
+    [{#'RSAPublicKey'{}, Attributes1}, {#'RSAPublicKey'{}, Attributes2},
+     {#'RSAPublicKey'{}, Attributes3}, {#'RSAPublicKey'{}, Attributes4}] = Decoded =
         public_key:ssh_decode(SshKnownHosts, known_hosts),
 
+    Comment1 = undefined,
+    Comment2 = "[email protected]",
+    Comment3 = "Comment with whitespaces",
+    Comment4 = "[email protected] Comment with whitespaces",
+    	
+    Comment1 = proplists:get_value(comment, Attributes1, undefined),
+    Comment2 = proplists:get_value(comment, Attributes2),
+    Comment3 = proplists:get_value(comment, Attributes3),
+    Comment4 = proplists:get_value(comment, Attributes4),	
+
     Value1 = proplists:get_value(hostnames, Attributes1, undefined),
     Value2 = proplists:get_value(hostnames, Attributes2, undefined),
     true = (Value1 =/= undefined) and (Value2 =/= undefined),
@@ -425,13 +471,16 @@ ssh1_known_hosts(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
     {ok, SshKnownHosts} = file:read_file(filename:join(Datadir, "ssh1_known_hosts")),
-    [{#'RSAPublicKey'{}, Attributes1}, {#'RSAPublicKey'{}, Attributes2}] = Decoded =
-        public_key:ssh_decode(SshKnownHosts, known_hosts),
+    [{#'RSAPublicKey'{}, Attributes1}, {#'RSAPublicKey'{}, Attributes2},{#'RSAPublicKey'{}, Attributes3}] 
+	= Decoded = public_key:ssh_decode(SshKnownHosts, known_hosts),
 
     Value1 = proplists:get_value(hostnames, Attributes1, undefined),
     Value2 = proplists:get_value(hostnames, Attributes2, undefined),
     true = (Value1 =/= undefined) and (Value2 =/= undefined),
 
+    Comment ="dhopson@VMUbuntu-DSH comment with whitespaces",
+    Comment = proplists:get_value(comment, Attributes3),
+
     Encoded = public_key:ssh_encode(Decoded, known_hosts),
     Decoded = public_key:ssh_decode(Encoded, known_hosts).
 
@@ -444,12 +493,22 @@ ssh_auth_keys(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
     {ok, SshAuthKeys} = file:read_file(filename:join(Datadir, "auth_keys")),
-    [{#'RSAPublicKey'{}, Attributes1}, {{_, #'Dss-Parms'{}}, _Attributes2}] = Decoded =
+    [{#'RSAPublicKey'{}, Attributes1}, {{_, #'Dss-Parms'{}}, Attributes2},
+     {#'RSAPublicKey'{}, Attributes3}, {{_, #'Dss-Parms'{}}, Attributes4}
+    ] = Decoded =
         public_key:ssh_decode(SshAuthKeys, auth_keys),
 
     Value1 = proplists:get_value(options, Attributes1, undefined),
     true = Value1 =/= undefined,
 
+    Comment1 = Comment2 = "dhopson@VMUbuntu-DSH",
+    Comment3 = Comment4 ="dhopson@VMUbuntu-DSH comment with whitespaces",
+    
+    Comment1 = proplists:get_value(comment, Attributes1),
+    Comment2 = proplists:get_value(comment, Attributes2),
+    Comment3 = proplists:get_value(comment, Attributes3),
+    Comment4 = proplists:get_value(comment, Attributes4),
+
     Encoded = public_key:ssh_encode(Decoded, auth_keys),
     Decoded = public_key:ssh_decode(Encoded, auth_keys).
 
@@ -462,13 +521,24 @@ ssh1_auth_keys(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
     {ok, SshAuthKeys} = file:read_file(filename:join(Datadir, "ssh1_auth_keys")),
-    [{#'RSAPublicKey'{}, Attributes1}, {#'RSAPublicKey'{}, Attributes2}] = Decoded =
+    [{#'RSAPublicKey'{}, Attributes1},
+     {#'RSAPublicKey'{}, Attributes2}, {#'RSAPublicKey'{}, Attributes3},
+     {#'RSAPublicKey'{}, Attributes4}, {#'RSAPublicKey'{}, Attributes5}] = Decoded =
         public_key:ssh_decode(SshAuthKeys, auth_keys),
 
-    Value1 = proplists:get_value(bits, Attributes1, undefined),
-    Value2 = proplists:get_value(bits, Attributes2, undefined),
+    Value1 = proplists:get_value(bits, Attributes2, undefined),
+    Value2 = proplists:get_value(bits, Attributes3, undefined),
     true = (Value1 =/= undefined) and (Value2 =/= undefined),
 
+    Comment2 = Comment3 = "dhopson@VMUbuntu-DSH",
+    Comment4 = Comment5 ="dhopson@VMUbuntu-DSH comment with whitespaces",
+    
+    undefined = proplists:get_value(comment, Attributes1, undefined),
+    Comment2 = proplists:get_value(comment, Attributes2),
+    Comment3 = proplists:get_value(comment, Attributes3),
+    Comment4 = proplists:get_value(comment, Attributes4),
+    Comment5 = proplists:get_value(comment, Attributes5),
+
     Encoded = public_key:ssh_encode(Decoded, auth_keys),
     Decoded = public_key:ssh_decode(Encoded, auth_keys).
 
@@ -626,6 +696,34 @@ pkix(Config) when is_list(Config) ->
     VerifyStr = public_key:pkix_normalize_name(TestStr),
 
     ok.
+
+%%--------------------------------------------------------------------
+pkix_countryname(doc) ->
+    "Test workaround for certs that code x509countryname as utf8";
+pkix_countryname(suite) ->
+    [];
+pkix_countryname(Config) when is_list(Config) ->
+    Cert = incorrect_pkix_cert(),
+    OTPCert = public_key:pkix_decode_cert(Cert, otp),
+    TBSCert = OTPCert#'OTPCertificate'.tbsCertificate,
+    Issuer = TBSCert#'OTPTBSCertificate'.issuer,
+    Subj   = TBSCert#'OTPTBSCertificate'.subject,
+    check_countryname(Issuer),
+    check_countryname(Subj).
+
+check_countryname({rdnSequence,DirName}) ->
+    do_check_countryname(DirName).
+do_check_countryname([]) ->
+    ok;
+do_check_countryname([#'AttributeTypeAndValue'{type = ?'id-at-countryName',
+					       value = "US"}|_]) ->
+    ok;
+do_check_countryname([#'AttributeTypeAndValue'{type = ?'id-at-countryName',
+					       value =  Value}|_]) ->
+    test_server:fail({incorrect_cuntry_name, Value});
+do_check_countryname([_| Rest]) ->
+    do_check_countryname(Rest).
+
 %%--------------------------------------------------------------------
 pkix_path_validation(doc) ->
     "Misc pkix tests not covered elsewhere";
@@ -716,3 +814,6 @@ check_entry_type(_,_) ->
 
 strip_ending_newlines(Bin) ->
     string:strip(binary_to_list(Bin), right, 10).
+
+incorrect_pkix_cert() ->
+    <<48,130,5,186,48,130,4,162,160,3,2,1,2,2,7,7,250,61,63,6,140,137,48,13,6,9,42, 134,72,134,247,13,1,1,5,5,0,48,129,220,49,11,48,9,6,3,85,4,6,19,2,85,83,49, 16,48,14,6,3,85,4,8,19,7,65,114,105,122,111,110,97,49,19,48,17,6,3,85,4,7,19, 10,83,99,111,116,116,115,100,97,108,101,49,37,48,35,6,3,85,4,10,19,28,83,116, 97,114,102,105,101,108,100,32,84,101,99,104,110,111,108,111,103,105,101,115, 44,32,73,110,99,46,49,57,48,55,6,3,85,4,11,19,48,104,116,116,112,58,47,47,99, 101,114,116,105,102,105,99,97,116,101,115,46,115,116,97,114,102,105,101,108, 100,116,101,99,104,46,99,111,109,47,114,101,112,111,115,105,116,111,114,121, 49,49,48,47,6,3,85,4,3,19,40,83,116,97,114,102,105,101,108,100,32,83,101,99, 117,114,101,32,67,101,114,116,105,102,105,99,97,116,105,111,110,32,65,117, 116,104,111,114,105,116,121,49,17,48,15,6,3,85,4,5,19,8,49,48,54,56,56,52,51, 53,48,30,23,13,49,48,49,48,50,51,48,49,51,50,48,53,90,23,13,49,50,49,48,50, 51,48,49,51,50,48,53,90,48,122,49,11,48,9,6,3,85,4,6,12,2,85,83,49,11,48,9,6, 3,85,4,8,12,2,65,90,49,19,48,17,6,3,85,4,7,12,10,83,99,111,116,116,115,100, 97,108,101,49,38,48,36,6,3,85,4,10,12,29,83,112,101,99,105,97,108,32,68,111, 109,97,105,110,32,83,101,114,118,105,99,101,115,44,32,73,110,99,46,49,33,48, 31,6,3,85,4,3,12,24,42,46,108,111,103,105,110,46,115,101,99,117,114,101,115, 101,114,118,101,114,46,110,101,116,48,130,1,34,48,13,6,9,42,134,72,134,247, 13,1,1,1,5,0,3,130,1,15,0,48,130,1,10,2,130,1,1,0,185,136,240,80,141,36,124, 245,182,130,73,19,188,74,166,117,72,228,185,209,43,129,244,40,44,193,231,11, 209,12,234,88,43,142,1,162,48,122,17,95,230,105,171,131,12,147,46,204,36,80, 250,171,33,253,35,62,83,22,71,212,186,141,14,198,89,89,121,204,224,122,246, 127,110,188,229,162,67,95,6,74,231,127,99,131,7,240,85,102,203,251,50,58,58, 104,245,103,181,183,134,32,203,121,232,54,32,188,139,136,112,166,126,14,91, 223,153,172,164,14,61,38,163,208,215,186,210,136,213,143,70,147,173,109,217, 250,169,108,31,211,104,238,103,93,182,59,165,43,196,189,218,241,30,148,240, 109,90,69,176,194,52,116,173,151,135,239,10,209,179,129,192,102,75,11,25,168, 223,32,174,84,223,134,70,167,55,172,143,27,130,123,226,226,7,34,142,166,39, 48,246,96,231,150,84,220,106,133,193,55,95,159,227,24,249,64,36,1,142,171,16, 202,55,126,7,156,15,194,22,116,53,113,174,104,239,203,120,45,131,57,87,84, 163,184,27,83,57,199,91,200,34,43,98,61,180,144,76,65,170,177,2,3,1,0,1,163, 130,1,224,48,130,1,220,48,15,6,3,85,29,19,1,1,255,4,5,48,3,1,1,0,48,29,6,3, 85,29,37,4,22,48,20,6,8,43,6,1,5,5,7,3,1,6,8,43,6,1,5,5,7,3,2,48,14,6,3,85, 29,15,1,1,255,4,4,3,2,5,160,48,56,6,3,85,29,31,4,49,48,47,48,45,160,43,160, 41,134,39,104,116,116,112,58,47,47,99,114,108,46,115,116,97,114,102,105,101, 108,100,116,101,99,104,46,99,111,109,47,115,102,115,50,45,48,46,99,114,108, 48,83,6,3,85,29,32,4,76,48,74,48,72,6,11,96,134,72,1,134,253,110,1,7,23,2,48, 57,48,55,6,8,43,6,1,5,5,7,2,1,22,43,104,116,116,112,115,58,47,47,99,101,114, 116,115,46,115,116,97,114,102,105,101,108,100,116,101,99,104,46,99,111,109, 47,114,101,112,111,115,105,116,111,114,121,47,48,129,141,6,8,43,6,1,5,5,7,1, 1,4,129,128,48,126,48,42,6,8,43,6,1,5,5,7,48,1,134,30,104,116,116,112,58,47, 47,111,99,115,112,46,115,116,97,114,102,105,101,108,100,116,101,99,104,46,99, 111,109,47,48,80,6,8,43,6,1,5,5,7,48,2,134,68,104,116,116,112,58,47,47,99, 101,114,116,105,102,105,99,97,116,101,115,46,115,116,97,114,102,105,101,108, 100,116,101,99,104,46,99,111,109,47,114,101,112,111,115,105,116,111,114,121, 47,115,102,95,105,110,116,101,114,109,101,100,105,97,116,101,46,99,114,116, 48,31,6,3,85,29,35,4,24,48,22,128,20,73,75,82,39,209,27,188,242,161,33,106, 98,123,81,66,122,138,215,213,86,48,59,6,3,85,29,17,4,52,48,50,130,24,42,46, 108,111,103,105,110,46,115,101,99,117,114,101,115,101,114,118,101,114,46,110, 101,116,130,22,108,111,103,105,110,46,115,101,99,117,114,101,115,101,114,118, 101,114,46,110,101,116,48,29,6,3,85,29,14,4,22,4,20,138,233,191,208,157,203, 249,85,242,239,20,195,48,10,148,49,144,101,255,116,48,13,6,9,42,134,72,134, 247,13,1,1,5,5,0,3,130,1,1,0,82,31,121,162,49,50,143,26,167,202,143,61,71, 189,201,199,57,81,122,116,90,192,88,24,102,194,174,48,157,74,27,87,210,223, 253,93,3,91,150,109,120,1,110,27,11,200,198,141,222,246,14,200,71,105,41,138, 13,114,122,106,63,17,197,181,234,121,61,89,74,65,41,231,248,219,129,83,176, 219,55,107,55,211,112,98,38,49,69,77,96,221,108,123,152,12,210,159,157,141, 43,226,55,187,129,3,82,49,136,66,81,196,91,234,196,10,82,48,6,80,163,83,71, 127,102,177,93,209,129,26,104,2,84,24,255,248,161,3,244,169,234,92,122,110, 43,4,17,113,185,235,108,219,210,236,132,216,177,227,17,169,58,162,159,182, 162,93,160,229,200,9,163,229,110,121,240,168,232,14,91,214,188,196,109,210, 164,222,0,109,139,132,113,91,16,118,173,178,176,80,132,34,41,199,51,206,250, 224,132,60,115,192,94,107,163,219,212,226,225,65,169,148,108,213,46,174,173, 103,110,189,229,166,149,254,31,51,44,144,108,187,182,11,251,201,206,86,138, 208,59,51,86,132,235,81,225,88,34,190,8,184>>.
diff --git a/lib/public_key/test/public_key_SUITE_data/auth_keys b/lib/public_key/test/public_key_SUITE_data/auth_keys
index 0c4b47edde..8be7357a06 100644
--- a/lib/public_key/test/public_key_SUITE_data/auth_keys
+++ b/lib/public_key/test/public_key_SUITE_data/auth_keys
@@ -1,3 +1,7 @@
 command="dump /home",no-pty,no-port-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAwrr66r8n6B8Y0zMF3dOpXEapIQD9DiYQ6D6/zwor9o39jSkHNiMMER/GETBbzP83LOcekm02aRjo55ArO7gPPVvCXbrirJu9pkm4AC4BBre5xSLS7soyzwbigFruM8G63jSXqpHqJ/ooi168sKMC2b0Ncsi+JlTfNYlDXJVLKEeZgZOInQyMmtisaDTUQWTIv1snAizf4iIYENuAkGYGNCL77u5Y5VOu5eQipvFajTnps9QvUx/zdSFYn9e2sulWM3Bxc/S4IJ67JWHVRpfJxGi3hinRBH8WQdXuUwdJJTiJHKPyYrrM7Q6Xq4TOMFtcRuLDC6u3BXM1L0gBvHPNOnD5l2Lp5EjUkQ9CBf2j4A4gfH+iWQZyk08esAG/iwArAVxkl368+dkbMWOXL8BN4x5zYgdzoeypQZZ2RKH780MCTSo4WQ19DP8pw+9q3bSFC9H3xYAxrKAJNWjeTUJOTrTe+mWXXU770gYyQTxa2ycnYrlZucn1S3vsvn6eq7NZZ8NRbyv1n15Ocg+nHK4fuKOrwPhU3NbKQwtjb0Wsxx1gAmQqIOLTpAdsrAauPxC7TPYA5qQVCphvimKuhQM/1gMV225JrnjspVlthCzuFYUjXOKC3wxz6FFEtwnXu3uC5bVVkmkNadJmD21gD23yk4BraGXVYpRMIB+X+OTUUI8= dhopson@VMUbuntu-DSH
 
 ssh-dss AAAAB3NzaC1kc3MAAACBAPY8ZOHY2yFSJA6XYC9HRwNHxaehvx5wOJ0rzZdzoSOXxbETW6ToHv8D1UJ/z+zHo9Fiko5XybZnDIaBDHtblQ+Yp7StxyltHnXF1YLfKD1G4T6JYrdHYI14Om1eg9e4NnCRleaqoZPF3UGfZia6bXrGTQf3gJq2e7Yisk/gF+1VAAAAFQDb8D5cvwHWTZDPfX0D2s9Rd7NBvQAAAIEAlN92+Bb7D4KLYk3IwRbXblwXdkPggA4pfdtW9vGfJ0/RHd+NjB4eo1D+0dix6tXwYGN7PKS5R/FXPNwxHPapcj9uL1Jn2AWQ2dsknf+i/FAAvioUPkmdMc0zuWoSOEsSNhVDtX3WdvVcGcBq9cetzrtOKWOocJmJ80qadxTRHtUAAACBAN7CY+KKv1gHpRzFwdQm7HK9bb1LAo2KwaoXnadFgeptNBQeSXG1vO+JsvphVMBJc9HSn24VYtYtsMu74qXviYjziVucWKjjKEb11juqnF0GDlB3VVmxHLmxnAz643WK42Z7dLM5sY29ouezv4Xz2PuMch5VGPP+CDqzCM4loWgV dhopson@VMUbuntu-DSH
+
+command="dump /home",no-pty,no-port-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAwrr66r8n6B8Y0zMF3dOpXEapIQD9DiYQ6D6/zwor9o39jSkHNiMMER/GETBbzP83LOcekm02aRjo55ArO7gPPVvCXbrirJu9pkm4AC4BBre5xSLS7soyzwbigFruM8G63jSXqpHqJ/ooi168sKMC2b0Ncsi+JlTfNYlDXJVLKEeZgZOInQyMmtisaDTUQWTIv1snAizf4iIYENuAkGYGNCL77u5Y5VOu5eQipvFajTnps9QvUx/zdSFYn9e2sulWM3Bxc/S4IJ67JWHVRpfJxGi3hinRBH8WQdXuUwdJJTiJHKPyYrrM7Q6Xq4TOMFtcRuLDC6u3BXM1L0gBvHPNOnD5l2Lp5EjUkQ9CBf2j4A4gfH+iWQZyk08esAG/iwArAVxkl368+dkbMWOXL8BN4x5zYgdzoeypQZZ2RKH780MCTSo4WQ19DP8pw+9q3bSFC9H3xYAxrKAJNWjeTUJOTrTe+mWXXU770gYyQTxa2ycnYrlZucn1S3vsvn6eq7NZZ8NRbyv1n15Ocg+nHK4fuKOrwPhU3NbKQwtjb0Wsxx1gAmQqIOLTpAdsrAauPxC7TPYA5qQVCphvimKuhQM/1gMV225JrnjspVlthCzuFYUjXOKC3wxz6FFEtwnXu3uC5bVVkmkNadJmD21gD23yk4BraGXVYpRMIB+X+OTUUI8= dhopson@VMUbuntu-DSH comment with whitespaces
+
+ssh-dss AAAAB3NzaC1kc3MAAACBAPY8ZOHY2yFSJA6XYC9HRwNHxaehvx5wOJ0rzZdzoSOXxbETW6ToHv8D1UJ/z+zHo9Fiko5XybZnDIaBDHtblQ+Yp7StxyltHnXF1YLfKD1G4T6JYrdHYI14Om1eg9e4NnCRleaqoZPF3UGfZia6bXrGTQf3gJq2e7Yisk/gF+1VAAAAFQDb8D5cvwHWTZDPfX0D2s9Rd7NBvQAAAIEAlN92+Bb7D4KLYk3IwRbXblwXdkPggA4pfdtW9vGfJ0/RHd+NjB4eo1D+0dix6tXwYGN7PKS5R/FXPNwxHPapcj9uL1Jn2AWQ2dsknf+i/FAAvioUPkmdMc0zuWoSOEsSNhVDtX3WdvVcGcBq9cetzrtOKWOocJmJ80qadxTRHtUAAACBAN7CY+KKv1gHpRzFwdQm7HK9bb1LAo2KwaoXnadFgeptNBQeSXG1vO+JsvphVMBJc9HSn24VYtYtsMu74qXviYjziVucWKjjKEb11juqnF0GDlB3VVmxHLmxnAz643WK42Z7dLM5sY29ouezv4Xz2PuMch5VGPP+CDqzCM4loWgV dhopson@VMUbuntu-DSH comment with whitespaces
diff --git a/lib/public_key/test/public_key_SUITE_data/known_hosts b/lib/public_key/test/public_key_SUITE_data/known_hosts
index 30fc3b1fe8..3c3af68178 100644
--- a/lib/public_key/test/public_key_SUITE_data/known_hosts
+++ b/lib/public_key/test/public_key_SUITE_data/known_hosts
@@ -1,3 +1,8 @@
 hostname.domain.com,192.168.0.1 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1XY18+zA8VNK2YkzygOkMqUxHSTfxT1Xxx8CgDZgcQH8HUhPssW5ttvG8nKetlPQZAVk1C4WkWS1y5b3ekBhZTIxocp9Joc6V1+f2EOfO2mSLRwB16RGrdw6q7msrBXTC/dl+hF45kMMzVNzqxnSMVOa0sEPK2zK6Sg3Vi9fCSM=
 
 |1|BWO5qDxk/cFH0wa05JLdHn+j6xQ=|rXQvIxh5cDD3C43k5DPDamawVNA= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1XY18+zA8VNK2YkzygOkMqUxHSTfxT1Xxx8CgDZgcQH8HUhPssW5ttvG8nKetlPQZAVk1C4WkWS1y5b3ekBhZTIxocp9Joc6V1+f2EOfO2mSLRwB16RGrdw6q7msrBXTC/dl+hF45kMMzVNzqxnSMVOa0sEPK2zK6Sg3Vi9fCSM= [email protected]
+
+hostname.domain.com,192.168.0.1 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1XY18+zA8VNK2YkzygOkMqUxHSTfxT1Xxx8CgDZgcQH8HUhPssW5ttvG8nKetlPQZAVk1C4WkWS1y5b3ekBhZTIxocp9Joc6V1+f2EOfO2mSLRwB16RGrdw6q7msrBXTC/dl+hF45kMMzVNzqxnSMVOa0sEPK2zK6Sg3Vi9fCSM= Comment with whitespaces
+
+|1|BWO5qDxk/cFH0wa05JLdHn+j6xQ=|rXQvIxh5cDD3C43k5DPDamawVNA= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1XY18+zA8VNK2YkzygOkMqUxHSTfxT1Xxx8CgDZgcQH8HUhPssW5ttvG8nKetlPQZAVk1C4WkWS1y5b3ekBhZTIxocp9Joc6V1+f2EOfO2mSLRwB16RGrdw6q7msrBXTC/dl+hF45kMMzVNzqxnSMVOa0sEPK2zK6Sg3Vi9fCSM= [email protected] Comment with whitespaces
+
diff --git a/lib/public_key/test/public_key_SUITE_data/pkcs7_cert.pem b/lib/public_key/test/public_key_SUITE_data/pkcs7_cert.pem
new file mode 100644
index 0000000000..9b450a22c5
--- /dev/null
+++ b/lib/public_key/test/public_key_SUITE_data/pkcs7_cert.pem
@@ -0,0 +1,23 @@
+-----BEGIN PKCS7-----
+MIID6QYJKoZIhvcNAQcCoIID2jCCA9YCAQExADALBgkqhkiG9w0BBwGgggO8MIID
+uDCCAyGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBgzEOMAwGA1UEAxMFb3RwQ0Ex
+EzARBgNVBAsTCkVybGFuZyBPVFAxFDASBgNVBAoTC0VyaWNzc29uIEFCMQswCQYD
+VQQGEwJTRTESMBAGA1UEBxMJU3RvY2tob2xtMSUwIwYJKoZIhvcNAQkBFhZwZXRl
+ckBlcml4LmVyaWNzc29uLnNlMB4XDTA4MDEwOTA4MjkzMFoXDTE3MTExNzA4Mjkz
+MFowgYQxDzANBgNVBAMTBnNlcnZlcjETMBEGA1UECxMKRXJsYW5nIE9UUDEUMBIG
+A1UEChMLRXJpY3Nzb24gQUIxCzAJBgNVBAYTAlNFMRIwEAYDVQQHEwlTdG9ja2hv
+bG0xJTAjBgkqhkiG9w0BCQEWFnBldGVyQGVyaXguZXJpY3Nzb24uc2UwgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBAKR20HPrkDGdiavHUyWwFEQwta2dmtF2eQZZ
+i9Xk68UJYbuU7CikHs2srkrwzj0OPIqbp/xOBNzJ7Kch0o4yO6vcEAiSCJ6AB4uS
+M742hrYW4qXgc18K6PqTwSuKr94sn3qQuo4hF/ymCxLrnSicrNpzGOz9A0Lf2+Vk
+6hV0BtdHAgMBAAGjggE3MIIBMzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
+HQ4EFgQUi19l/qhEwHP/CUeaEjWy4GhOBRIwgbMGA1UdIwSBqzCBqIAUBquANDqk
+uHayvZ0uKOVtkd59AZuhgYykgYkwgYYxETAPBgNVBAMTCGVybGFuZ0NBMRMwEQYD
+VQQLEwpFcmxhbmcgT1RQMRQwEgYDVQQKEwtFcmljc3NvbiBBQjESMBAGA1UEBxMJ
+U3RvY2tob2xtMQswCQYDVQQGEwJTRTElMCMGCSqGSIb3DQEJARYWcGV0ZXJAZXJp
+eC5lcmljc3Nvbi5zZYIBATAhBgNVHREEGjAYgRZwZXRlckBlcml4LmVyaWNzc29u
+LnNlMCEGA1UdEgQaMBiBFnBldGVyQGVyaXguZXJpY3Nzb24uc2UwDQYJKoZIhvcN
+AQEFBQADgYEAzHGutrGMSeC3Di7Z8d65SM7jZLrkkusmL+D2oPVIOGrfZbVuyfDK
+U/nImm99z+lhC/N3JEEpB6PgAYSskfVdBL3LoxbUTaCn/+G3A/G8NfRVIYyANTBe
+NW6ueNpjnauLzcwpyXpu3vp1VBg8wBePtGTBIbRHRgtwwHRXAddE/WuhADEA
+-----END PKCS7-----
diff --git a/lib/public_key/test/public_key_SUITE_data/ssh1_auth_keys b/lib/public_key/test/public_key_SUITE_data/ssh1_auth_keys
index c91f4e4679..ac3d61b4c7 100644
--- a/lib/public_key/test/public_key_SUITE_data/ssh1_auth_keys
+++ b/lib/public_key/test/public_key_SUITE_data/ssh1_auth_keys
@@ -1,3 +1,9 @@
+1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663
+
 1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663 dhopson@VMUbuntu-DSH
 
 command="dump /home",no-pty,no-port-forwarding 1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663 dhopson@VMUbuntu-DSH
+
+1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663 dhopson@VMUbuntu-DSH comment with whitespaces
+
+command="dump /home",no-pty,no-port-forwarding 1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663 dhopson@VMUbuntu-DSH comment with whitespaces
diff --git a/lib/public_key/test/public_key_SUITE_data/ssh1_known_hosts b/lib/public_key/test/public_key_SUITE_data/ssh1_known_hosts
index ec668fe05b..835b16ab67 100644
--- a/lib/public_key/test/public_key_SUITE_data/ssh1_known_hosts
+++ b/lib/public_key/test/public_key_SUITE_data/ssh1_known_hosts
@@ -1,2 +1,3 @@
 hostname.domain.com,192.168.0.1 1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663 dhopson@VMUbuntu-DSH
 hostname2.domain.com,192.168.0.2 1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663
+hostname3.domain.com,192.168.0.3 1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663 dhopson@VMUbuntu-DSH comment with whitespaces
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index ab4ee8b0ff..b8af89d040 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 0.15
+PUBLIC_KEY_VSN = 0.17
diff --git a/lib/reltool/doc/src/Makefile b/lib/reltool/doc/src/Makefile
index 8bc1488f77..2373b5e507 100644
--- a/lib/reltool/doc/src/Makefile
+++ b/lib/reltool/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2009-2010. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -97,13 +97,13 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(HTMLDIR)/* $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(HTMLDIR)/* "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
index 0aae128c2b..66ec7e9035 100644
--- a/lib/reltool/doc/src/notes.xml
+++ b/lib/reltool/doc/src/notes.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2009</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -37,7 +37,28 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Reltool.</p>
 
-  <section><title>Reltool 0.6</title>
+  <section><title>Reltool 0.6.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A new sys level configuration parameter
+	    <c>{excl_lib,otp_root}</c> is added. When this is set,
+	    the target system will not contain anything from
+	    <c>$OTP_ROOT</c>. It will only contain a releases
+	    directory with rel, script and boot files, and a lib
+	    directory with applications found outside of
+	    <c>$OTP_ROOT</c> (i.e. "your own" applications).</p>
+          <p>
+	    Own Id: OTP-9743</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Reltool 0.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/reltool/doc/src/reltool.xml b/lib/reltool/doc/src/reltool.xml
index 9a4e2d130e..fbe29753be 100644
--- a/lib/reltool/doc/src/reltool.xml
+++ b/lib/reltool/doc/src/reltool.xml
@@ -51,8 +51,18 @@
     defines library directories where additional applications
     may reside and it defaults to the directories
     listed by the operating system environment variable
-    <c>ERL_LIBS</c>. See the module <c>code</c> for more info.
-    Finally single modules and entire applications may be read from
+    <c>ERL_LIBS</c>. See the module <c>code</c> for more info.</p>
+
+    <p>An application directory <c>AppDir</c> under a library
+    directory is recognized by the existence of an <c>AppDir/ebin</c>
+    directory. If this does not exist, <c>reltool</c> will not
+    consider <c>AppDir</c> at all when looking for applications.</p>
+
+    <p>It is recommended that application directories are named as the
+    application, possibly followed by a dash and the version
+    number. For example <c>myapp</c> or <c>myapp-1.1</c>.</p>
+
+    <p>Finally single modules and entire applications may be read from
     Escripts.</p>
 
     <p>Some configuration parameters control the behavior of Reltool
@@ -144,7 +154,7 @@
         value <c>include</c> implies that all applications and
         escripts that do not have any explicit <c>incl_cond</c>
         setting will be included. <c>exclude</c> implies that all
-        applications and escripts) that do not have any explicit
+        applications and escripts that do not have any explicit
         <c>incl_cond</c> setting will be excluded.</p>
       </item>
 
@@ -221,6 +231,52 @@
         system.</p>
       </item>
 
+      <tag><c>excl_lib</c></tag>
+      <item>
+	<warning><p>This option is experimental.</p></warning>
+        <p>If the <c>excl_lib</c> option is set to <c>otp_root</c>
+        then reltool will not copy anything from the Erlang/OTP
+        installation ($OTP_ROOT) into the target structure. The goal
+        is to create a "slim" release which can be used together with
+        an existing Erlang/OTP installation. The target structure will
+        therefore only contain a <c>lib</c> directory with the
+        applications that were found outside of $OTP_ROOT (typically
+        your own applications), and a <c>releases</c> directory with
+        the generated <c>.rel,</c> <c>.script</c> and <c>.boot</c>
+        files.</p>
+
+	<p>When starting this release, three things must be specified:</p>
+	<taglist>
+	  <tag><b>Which <c>releases</c> directory to use</b></tag>
+	  <item>Tell the release handler to use the <c>releases</c>
+	  directory in our target structure instead of
+	  <c>$OTP_ROOT/releases</c>. This is done by setting the SASL
+	  environment variable <c>releases_dir</c>, either from the
+	  command line (<c>-sasl releases_dir
+	  &lt;target-dir&gt;/releases</c>) or in
+	  <c>sys.config</c>.</item>
+
+	  <tag><b>Which boot file to use</b></tag>
+	  <item>The default boot file is <c>$OTP_ROOT/bin/start</c>,
+	  but in this case we need to specify a boot file from our
+	  target structure, typically
+	  <c>&lt;target-dir&gt;/releases/&lt;vsn&gt;/&lt;RelName&gt;</c>. This
+	  is done with the <c>-boot</c> command line option to
+	  <c>erl</c></item>
+
+	  <tag><b>The location of our applications</b></tag>
+	  <item>The generated .script (and .boot) file uses the
+	  environment variable <c>$RELTOOL_EXT_LIB</c> as prefix for
+	  the paths to all applications. The <c>-boot_var</c> option
+	  to <c>erl</c> can be used for specifying the value of this
+	  variable, typically <c>-boot_var RELTOOL_EXT_LIB
+	  &lt;target-dir&gt;/lib</c>.</item>
+	</taglist>
+
+	<p>Example:</p>
+	<p><code>erl -sasl releases_dir \"mytarget/releases\" -boot mytarget/releases/1.0/myrel -boot_var RELTOOL_EXT_LIB mytarget/lib</code></p>
+      </item>
+
       <tag><c>incl_sys_filters</c></tag>
       <item>
         <p>This parameter normally contains a list of regular
@@ -326,6 +382,11 @@
 	<p>This parameter is mutual exclusive with <c>lib_dir</c>. If
 	<c>vsn</c> and <c>lib_dir</c> are both omitted, the latest version
 	will be chosen.</p>
+	<p>Note that in order for reltool to sort application versions
+	and thereby be able to select the latest, it is required that
+	the version id for the application consits of integers and
+	dots only, for example <c>1</c>, <c>2.0</c> or
+	<c>3.17.1</c>.</p>
       </item>
       <tag><c>lib_dir</c></tag>
       <item>
@@ -337,6 +398,11 @@
 	<p>This parameter is mutual exclusive with <c>vsn</c>. If
 	<c>vsn</c> and <c>lib_dir</c> are both omitted, the latest version
 	will be chosen.</p>
+	<p>Note that in order for reltool to sort application versions
+	and thereby be able to select the latest, it is required that
+	the version id for the application consits of integers and
+	dots only, for example <c>1</c>, <c>2.0</c> or
+	<c>3.17.1</c>.</p>
       </item>
       <tag><c>mod</c></tag>
       <item>
@@ -400,7 +466,7 @@
       <tag><c>incl_cond</c></tag>
       <item>
         <p>This parameter controls whether the module is included or not. By
-        default the <c>mod_incl</c> parameter on application and system level
+        default the <c>mod_cond</c> parameter on application and system level
         will be used to control whether the module is included or not. The
         value of <c>incl_cond</c> overrides the module inclusion policy.
         <c>include</c> implies that the module is included, while
@@ -452,6 +518,7 @@ app()               = {vsn, app_vsn()}
                     | {incl_cond, incl_cond()}
                     | {debug_info, debug_info()}
                     | {app_file, app_file()}
+		    | {excl_lib, excl_lib()}
                     | {incl_sys_filters, incl_sys_filters()}
                     | {excl_sys_filters, excl_sys_filters()}
                     | {incl_app_filters, incl_app_filters()}
@@ -477,6 +544,7 @@ escript()           = {incl_cond, incl_cond()}
 escript_file()      = file()
 excl_app_filters()  = regexps()
 excl_archive_filters() = regexps()
+excl_lib()          = otp_root
 excl_sys_filters()  = regexps()
 file()              = string()
 incl_app()          = app_name()
diff --git a/lib/reltool/doc/src/reltool_usage.xml b/lib/reltool/doc/src/reltool_usage.xml
index d128e80a77..0041e60d8f 100644
--- a/lib/reltool/doc/src/reltool_usage.xml
+++ b/lib/reltool/doc/src/reltool_usage.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2009</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -257,6 +257,11 @@
     policy</c> part of the page. By default the latest version of the
     application is selected, but it is possible to override this by
     explicitly selecting another version.</p>
+
+    <p>Note that in order for reltool to sort application versions and
+    thereby be able to select the latest, it is required that the
+    version id for the application consits of integers and dots only,
+    for example <c>1</c>, <c>2.0</c> or <c>3.17.1</c>.</p>
     
     <p>By default the <c>Application inclusion policy</c> on system
     level is used for all applications. Set the value to
@@ -335,7 +340,7 @@
 
     <p>There are two categories of modules on the <c>Module
     dependencies</c> page. If the module is used by other modules,
-    these are listed under <c>Modules used by others</c>. If the
+    these are listed under <c>Modules using this</c>. If the
     module uses other modules, these are listed under <c>Used
     modules</c>.</p>
 
@@ -365,7 +370,7 @@
 
     <p>There are two categories of modules on the <c>Dependencies</c>
     page. If the module is used by other modules, these are listed
-    under <c>Modules used by others</c>. If the module uses other
+    under <c>Modules using this</c>. If the module uses other
     modules, these are listed under <c>Used modules</c>.</p>
 
     <p>Double click on an module name to launch a module window.</p>
diff --git a/lib/reltool/examples/Makefile b/lib/reltool/examples/Makefile
index dacfd4e7d4..0b495b14b7 100644
--- a/lib/reltool/examples/Makefile
+++ b/lib/reltool/examples/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2009. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -72,8 +72,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(ERL_FILES) $(DATA_FILES) $(HRL_FILES) $(RELSYSDIR)/examples
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(ERL_FILES) $(DATA_FILES) $(HRL_FILES) "$(RELSYSDIR)/examples"
 
 release_docs_spec:
 
diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile
index 4e6a112b7e..a7e34053f1 100644
--- a/lib/reltool/src/Makefile
+++ b/lib/reltool/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2009-2010. All Rights Reserved.
+# Copyright Ericsson AB 2009-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -97,11 +97,11 @@ $(TARGET_FILES): $(HRL_FILES) $(INTERNAL_HRL_FILES)
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/reltool/src/reltool.hrl b/lib/reltool/src/reltool.hrl
index 26dcd82447..f0d8b38519 100644
--- a/lib/reltool/src/reltool.hrl
+++ b/lib/reltool/src/reltool.hrl
@@ -79,6 +79,7 @@
                           | {debug_info, debug_info()}
                           | {app_file, app_file()}
                           | {profile, profile()}
+			  | {excl_lib, excl_lib()}
                           | {incl_sys_filters, incl_sys_filters()}
                           | {excl_sys_filters, excl_sys_filters()}
                           | {incl_app_filters, incl_app_filters()}
@@ -123,6 +124,7 @@
 -type incl_defaults()    :: boolean().
 -type incl_derived()     :: boolean().
 -type status()           :: missing | ok.
+-type excl_lib()         :: otp_root.
 
 -record(common,
         {
@@ -233,6 +235,7 @@
           rels     	       :: [#rel{}],
           emu_name 	       :: emu_name(),
           profile  	       :: profile(),
+	  excl_lib             :: excl_lib(),
           incl_sys_filters     :: [#regexp{}],
           excl_sys_filters     :: [#regexp{}],
           incl_app_filters     :: [#regexp{}],
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index 034a42e1e2..c56e29152d 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -674,6 +674,8 @@ mod_init_is_included(ModTab, M, ModCond, AppCond, Default, Status) ->
                         true;
                     exclude ->
                         false;
+		    derived ->
+			undefined;
                     undefined ->
                         %% print(M#mod.name, hipe, "mod_cond -> ~p\n",
 			%%       [ModCond]),
@@ -693,6 +695,8 @@ mod_init_is_included(ModTab, M, ModCond, AppCond, Default, Status) ->
                         true;
                     exclude ->
                         false;
+		    derived ->
+			undefined;
                     undefined ->
                         Default
                 end
@@ -783,9 +787,10 @@ mod_mark_is_included(#state{app_tab=AppTab, mod_tab=ModTab, sys=Sys} = S,
                                     M#mod{is_pre_included = true,
 					  is_included = true};
                                 exclude ->
-                                    M#mod{is_pre_included = true,
-					  is_included = true};
-                                undefined ->
+                                    M#mod{is_pre_included = false,
+					  is_included = false};
+				ModInclCond when ModInclCond==undefined;
+						 ModInclCond==derived  ->
                                     M#mod{is_included = true}
                             end,
                         ets:insert(ModTab, M2),
@@ -979,7 +984,7 @@ refresh_app(#app{name = AppName,
 
                         %% Add info from .app file
                         Base = get_base(AppName, ActiveDir),
-                        {_, DefaultVsn} = reltool_utils:split_app_name(Base),
+                        DefaultVsn = get_vsn_from_dir(AppName,Base),
                         Ebin = filename:join([ActiveDir, "ebin"]),
                         AppFile =
 			    filename:join([Ebin,
@@ -1408,6 +1413,8 @@ decode(#sys{} = Sys, [{Key, Val} | KeyVals]) ->
 						  ExclApp,
 						  Sys#sys.excl_app_filters),
 			embedded_app_type = AppType};
+	    excl_lib when Val =:= otp_root ->
+		Sys#sys{excl_lib=Val};
             incl_sys_filters ->
                 Sys#sys{incl_sys_filters =
 			    dec_re(Key, Val, Sys#sys.incl_sys_filters)};
@@ -1678,8 +1685,7 @@ app_dirs2([Lib | Libs], Acc) ->
                         EbinDir = filename:join([AppDir, "ebin"]),
                         case filelib:is_dir(EbinDir, erl_prim_loader) of
                             true ->
-                                {Name, _Vsn} =
-				    reltool_utils:split_app_name(Base),
+				Name = find_app_name(Base,EbinDir),
                                 case Name of
                                     erts -> false;
                                     _    -> {true, {Name, AppDir}}
@@ -1697,17 +1703,74 @@ app_dirs2([Lib | Libs], Acc) ->
 app_dirs2([], Acc) ->
     lists:sort(lists:append(Acc)).
 
+find_app_name(Base,EbinDir) ->
+    {ok,EbinFiles} = erl_prim_loader:list_dir(EbinDir),
+    AppFile =
+	case [F || F <- EbinFiles, filename:extension(F)=:=".app"] of
+	    [AF] ->
+		AF;
+	    _ ->
+		undefined
+	end,
+    find_app_name1(Base,AppFile).
+
+find_app_name1(Base,undefined) ->
+    {Name,_} = reltool_utils:split_app_name(Base),
+    Name;
+find_app_name1(_Base,AppFile) ->
+    list_to_atom(filename:rootname(AppFile)).
+
+get_vsn_from_dir(AppName,Base) ->
+    Prefix = atom_to_list(AppName) ++ "-",
+    case lists:prefix(Prefix,Base) of
+	true ->
+	    lists:nthtail(length(Prefix),Base);
+	false ->
+	    ""
+    end.
+
+
 escripts_to_apps([Escript | Escripts], Apps, Status) ->
     {EscriptAppName, _Label} = split_escript_name(Escript),
     Ext = code:objfile_extension(),
+
+    %% First find all .app files and associate the app name to the app
+    %% label - this is in order to now which application a module
+    %% belongs to in the next round.
+    AppFun = fun(FullName, _GetInfo, _GetBin, AppFiles) ->
+		     Components = filename:split(FullName),
+		     case Components of
+			 [AppLabel, "ebin", File] ->
+			     case filename:extension(File) of
+				 ".app" ->
+				     [{AppLabel,File}|AppFiles];
+				 _ ->
+				     AppFiles
+			     end;
+			 _ ->
+			     AppFiles
+		     end
+	     end,
+    AppFiles =
+	case reltool_utils:escript_foldl(AppFun, [], Escript) of
+	    {ok, AF} ->
+		AF;
+	    {error, Reason1} ->
+		reltool_utils:throw_error("Illegal escript ~p: ~p",
+					  [Escript,Reason1])
+	end,
+
+    %% Next, traverse all files...
     Fun = fun(FullName, _GetInfo, GetBin, {FileAcc, StatusAcc}) ->
                   Components = filename:split(FullName),
                   case Components of
                       [AppLabel, "ebin", File] ->
                           case filename:extension(File) of
                               ".app" ->
-                                  {AppName, DefaultVsn} =
-				      reltool_utils:split_app_name(AppLabel),
+				  AppName =
+				      list_to_atom(filename:rootname(File)),
+                                  DefaultVsn =
+				      get_vsn_from_dir(AppName,AppLabel),
                                   AppFileName =
 				      filename:join([Escript, FullName]),
                                   {Info, StatusAcc2} =
@@ -1720,8 +1783,9 @@ escripts_to_apps([Escript | Escripts], Apps, Status) ->
                                   {[{AppName, app, Dir, Info} | FileAcc],
 				   StatusAcc2};
                               E when E =:= Ext ->
-                                  {AppName, _} =
-				      reltool_utils:split_app_name(AppLabel),
+				  AppFile =
+				      proplists:get_value(AppLabel,AppFiles),
+				  AppName = find_app_name1(AppLabel,AppFile),
                                   Mod = init_mod(AppName,
 						 File,
 						 {File, GetBin()},
@@ -1758,6 +1822,7 @@ escripts_to_apps([Escript | Escripts], Apps, Status) ->
                           {FileAcc, StatusAcc}
                   end
           end,
+
     case reltool_utils:escript_foldl(Fun, {[], Status}, Escript) of
 	{ok, {Files, Status2}} ->
 	    EscriptApp =
@@ -1772,8 +1837,9 @@ escripts_to_apps([Escript | Escripts], Apps, Status) ->
 				      Apps,
 				      Status2),
 	    escripts_to_apps(Escripts, Apps2, Status3);
-	{error, Reason} ->
-	    reltool_utils:throw_error("Illegal escript ~p: ~p", [Escript,Reason])
+	{error, Reason2} ->
+	    reltool_utils:throw_error("Illegal escript ~p: ~p",
+				      [Escript,Reason2])
     end;
 escripts_to_apps([], Apps, Status) ->
     {Apps, Status}.
@@ -1932,7 +1998,7 @@ ensure_app_info(#app{name = Name,
         fun(Dir, StatusAcc) ->
                 Base = get_base(Name, Dir),
                 Ebin = filename:join([Dir, "ebin"]),
-                {_, DefaultVsn} = reltool_utils:split_app_name(Base),
+                DefaultVsn = get_vsn_from_dir(Name,Base),
                 AppFile = filename:join([Ebin, atom_to_list(Name) ++ ".app"]),
                 read_app_info(AppFile, AppFile, Name, DefaultVsn, StatusAcc)
         end,
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl
index e3a7b02143..6cb7ba0163 100644
--- a/lib/reltool/src/reltool_target.erl
+++ b/lib/reltool/src/reltool_target.erl
@@ -333,7 +333,9 @@ merge_apps(#rel{name = RelName,
 		       A#app.name =/= ?MISSING_APP_NAME,
 		       not lists:keymember(A#app.name, #app.name, MergedApps2)],
     MergedApps3 = do_merge_apps(RelName, Embedded, Apps, EmbAppType, MergedApps2),
-    sort_apps(lists:reverse(MergedApps3)).
+    RevMerged = lists:reverse(MergedApps3),
+    MergedSortedUsedAndIncs = sort_used_and_incl_apps(RevMerged,RevMerged),
+    sort_apps(MergedSortedUsedAndIncs).
 
 do_merge_apps(RelName, [#rel_app{name = Name} = RA | RelApps], Apps, RelAppType, Acc) ->
     case is_already_merged(Name, RelApps, Acc) of
@@ -342,9 +344,11 @@ do_merge_apps(RelName, [#rel_app{name = Name} = RA | RelApps], Apps, RelAppType,
 	false ->
 	    {value, App} = lists:keysearch(Name, #app.name, Apps),
 	    MergedApp = merge_app(RelName, RA, RelAppType, App),
-	    MoreNames = (MergedApp#app.info)#app_info.applications,
+	    ReqNames = (MergedApp#app.info)#app_info.applications,
+	    IncNames = (MergedApp#app.info)#app_info.incl_apps,
 	    Acc2 = [MergedApp | Acc],
-	    do_merge_apps(RelName, MoreNames ++ RelApps, Apps, RelAppType, Acc2)
+	    do_merge_apps(RelName, ReqNames ++ IncNames ++ RelApps,
+			  Apps, RelAppType, Acc2)
     end;
 do_merge_apps(RelName, [Name | RelApps], Apps, RelAppType, Acc) ->
   case is_already_merged(Name, RelApps, Acc) of
@@ -507,6 +511,56 @@ load_app_mods(#app{mods = Mods} = App, Mand, PathFlag, Variables) ->
       SplitMods).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% sort_used_and_incl_apps(Apps, OrderedApps) -> Apps
+%%   Apps = [#app{}]
+%%   OrderedApps = [#app{}]
+%%
+%% OTP-4121, OTP-9984
+%% (Tickets are written for systools, but needs to be implemented here
+%% as well.)
+%% Make sure that used and included applications are given in the same
+%% order as in the release resource file (.rel). Otherwise load and
+%% start instructions in the boot script, and consequently release
+%% upgrade instructions in relup, may end up in the wrong order.
+
+sort_used_and_incl_apps([#app{info=Info} = App|Apps], OrderedApps) ->
+    Incls2 =
+	case Info#app_info.incl_apps of
+	    Incls when length(Incls)>1 ->
+		sort_appl_list(Incls, OrderedApps);
+	    Incls ->
+		Incls
+	end,
+    Uses2 =
+	case Info#app_info.applications of
+	    Uses when length(Uses)>1 ->
+		sort_appl_list(Uses, OrderedApps);
+	    Uses ->
+		Uses
+	end,
+    App2 = App#app{info=Info#app_info{incl_apps=Incls2, applications=Uses2}},
+    [App2|sort_used_and_incl_apps(Apps, OrderedApps)];
+sort_used_and_incl_apps([], _OrderedApps) ->
+    [].
+
+sort_appl_list(List, Order) ->
+    IndexedList = find_pos(List, Order),
+    SortedIndexedList = lists:keysort(1, IndexedList),
+    lists:map(fun({_Index,Name}) -> Name end, SortedIndexedList).
+
+find_pos([Name|Incs], OrderedApps) ->
+    [find_pos(1, Name, OrderedApps)|find_pos(Incs, OrderedApps)];
+find_pos([], _OrderedApps) ->
+    [].
+
+find_pos(N, Name, [#app{name=Name}|_OrderedApps]) ->
+    {N, Name};
+find_pos(N, Name, [_OtherAppl|OrderedApps]) ->
+    find_pos(N+1, Name, OrderedApps).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Function: sort_apps(Apps) -> {ok, Apps'} | throw({error, Error})
 %% Types: Apps = {{Name, Vsn}, #application}]
 %% Purpose: Sort applications according to dependencies among
@@ -687,6 +741,8 @@ strip_name_ebin(Dir, Name, Vsn) ->
     case lists:reverse(Dir) of
         ["ebin", Name     | D] -> {ok, lists:reverse(D)};
         ["ebin", FullName | D] -> {ok, lists:reverse(D)};
+        [Name     | D] -> {ok, lists:reverse(D)};
+        [FullName | D] -> {ok, lists:reverse(D)};
         _                      -> false
     end.
 
@@ -733,8 +789,20 @@ do_spec_rel_files(#rel{name = RelName} = Rel,  Sys) ->
     BootFile = RelName ++ ".boot",
     MergedApps = merge_apps(Rel, Sys),
     GenRel = do_gen_rel(Rel, Sys, MergedApps),
+    Variables =
+	case Sys#sys.excl_lib of
+	    otp_root ->
+		%% All applications that are fetched from somewhere
+		%% other than $OTP_ROOT/lib will get $RELTOOL_EXT_LIB
+		%% as path prefix in the .script file.
+		[{"RELTOOL_EXT_LIB",LibDir} ||  LibDir <- Sys#sys.lib_dirs] ++
+		    [{"RELTOOL_EXT_LIB",filename:dirname(AppLibDir)} ||
+			#app{active_dir=AppLibDir,use_selected_vsn=dir}
+			    <- MergedApps];
+	    _ ->
+		[]
+	end,
     PathFlag = true,
-    Variables = [],
     {ok, Script} = do_gen_script(Rel, Sys, MergedApps, PathFlag, Variables),
     {ok, BootBin} = gen_boot(Script),
     Date = date(),
@@ -771,29 +839,34 @@ gen_spec(Sys) ->
     end.
 
 do_gen_spec(#sys{root_dir = RootDir,
+		 excl_lib = ExclLib,
                  incl_sys_filters = InclRegexps,
                  excl_sys_filters = ExclRegexps,
                  relocatable = Relocatable,
                  apps = Apps} = Sys) ->
-    {create_dir, _, SysFiles} = spec_dir(RootDir),
-    {ExclRegexps2, SysFiles2} =
-	strip_sys_files(Relocatable, SysFiles, Apps, ExclRegexps),
     RelFiles = spec_rel_files(Sys),
-    {InclRegexps2, BinFiles} =
-	spec_bin_files(Sys, SysFiles, SysFiles2, RelFiles, InclRegexps),
+    {SysFiles, InclRegexps2, ExclRegexps2, Mandatory} =
+	case ExclLib of
+	    otp_root ->
+		{[],InclRegexps,ExclRegexps,["lib"]};
+	    _ ->
+		{create_dir, _, SF} = spec_dir(RootDir),
+		{ER2, SF2} = strip_sys_files(Relocatable, SF, Apps, ExclRegexps),
+		{IR2, BinFiles} =
+		    spec_bin_files(Sys, SF, SF2, RelFiles, InclRegexps),
+		SF3 = [{create_dir, "bin", BinFiles}] ++ SF2,
+		{SF3,IR2,ER2,["bin","erts","lib"]}
+	end,
     LibFiles = spec_lib_files(Sys),
     {BootVsn, StartFile} = spec_start_file(Sys),
-    SysFiles3 =
-        [
-         {create_dir, "releases",
+    SysFiles2 =
+        [{create_dir, "releases",
 	  [StartFile,
-	   {create_dir,BootVsn, RelFiles}]},
-	 {create_dir, "bin", BinFiles}
-        ] ++ SysFiles2,
-    SysFiles4 = filter_spec(SysFiles3, InclRegexps2, ExclRegexps2),
-    SysFiles5 = SysFiles4 ++ [{create_dir, "lib", LibFiles}],
-    check_sys(["bin", "erts", "lib"], SysFiles5),
-    SysFiles5.
+	   {create_dir,BootVsn, RelFiles}]}] ++ SysFiles,
+    SysFiles3 = filter_spec(SysFiles2, InclRegexps2, ExclRegexps2),
+    SysFiles4 = SysFiles3 ++ [{create_dir, "lib", LibFiles}],
+    check_sys(Mandatory, SysFiles4),
+    SysFiles4.
 
 strip_sys_files(Relocatable, SysFiles, Apps, ExclRegexps) ->
     ExclRegexps2 =
@@ -967,22 +1040,35 @@ safe_lookup_spec(Prefix, Specs) ->
 %% Specify applications
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-spec_lib_files(#sys{apps = Apps} = Sys) ->
+spec_lib_files(#sys{root_dir = RootDir,
+		    apps = Apps,
+		    excl_lib = ExclLib} = Sys) ->
     Filter = fun(#app{is_escript = IsEscript, is_included = IsIncl,
-                      is_pre_included = IsPre, name = Name}) ->
+                      is_pre_included = IsPre, name = Name,
+		      active_dir = ActiveDir}) ->
                      if
                          Name =:= ?MISSING_APP_NAME ->
                              false;
                          IsEscript =/= false ->
                              false;
                          IsIncl; IsPre ->
-                             true;
+			     case ExclLib of
+				 otp_root ->
+				     not lists:prefix(RootDir,ActiveDir);
+				 _ ->
+				     true
+			     end;
                          true ->
                              false
                      end
              end,
     SelectedApps = lists:filter(Filter, Apps),
-    check_apps([kernel, stdlib], SelectedApps),
+    case ExclLib of
+	otp_root ->
+	    ok;
+	_ ->
+	    check_apps([kernel, stdlib], SelectedApps)
+    end,
     lists:flatten([spec_app(App, Sys) || App <- SelectedApps]).
 
 check_apps([Mandatory | Names], Apps) ->
@@ -1388,12 +1474,10 @@ do_install(RelName, TargetDir) ->
             BinDir = filename:join([TargetDir2, "bin"]),
 	    case os:type() of
 		{win32, _} ->
-		    NativeRootDir = filename:nativename(TargetDir2),
-		    %% NativeBinDir =
-		    %% filename:nativename(filename:join([BinDir, "win32"])),
-		    NativeBinDir = filename:nativename(BinDir),
+		    NativeRootDir = nativename(TargetDir2),
+		    NativeErtsBinDir = nativename(ErtsBinDir),
 		    IniData = ["[erlang]\r\n",
-			       "Bindir=", NativeBinDir, "\r\n",
+			       "Bindir=", NativeErtsBinDir, "\r\n",
 			       "Progname=erl\r\n",
 			       "Rootdir=", NativeRootDir, "\r\n"],
 		    IniFile = filename:join([BinDir, "erl.ini"]),
@@ -1413,6 +1497,15 @@ do_install(RelName, TargetDir) ->
             reltool_utils:throw_error("~s: Illegal data file syntax", [DataFile])
     end.
 
+nativename(Dir) ->
+    escape_backslash(filename:nativename(Dir)).
+escape_backslash([$\\|T]) ->
+    [$\\,$\\|escape_backslash(T)];
+escape_backslash([H|T]) ->
+    [H|escape_backslash(T)];
+escape_backslash([]) ->
+    [].
+
 subst_src_scripts(Scripts, SrcDir, DestDir, Vars, Opts) ->
     Fun = fun(Script) ->
 		  subst_src_script(Script, SrcDir, DestDir, Vars, Opts)
diff --git a/lib/reltool/test/Makefile b/lib/reltool/test/Makefile
index d8a7adb837..52cdef44da 100644
--- a/lib/reltool/test/Makefile
+++ b/lib/reltool/test/Makefile
@@ -49,7 +49,7 @@ RELSYSDIR = $(RELEASE_PATH)/reltool_test
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-#ERL_COMPILE_FLAGS +=
+ERL_COMPILE_FLAGS += -pa $(ERL_TOP)/lib/reltool/ebin/
 
 EBIN = .
 
@@ -73,12 +73,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) reltool.spec reltool.cover $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
-	$(INSTALL_SCRIPT) rtt $(INSTALL_PROGS) $(RELSYSDIR)
-	$(INSTALL_DATA) $(INSTALL_PROGS) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) reltool.spec reltool.cover $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_SCRIPT) rtt $(INSTALL_PROGS) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(INSTALL_PROGS) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
 
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index 8a98dc36cf..8d71865508 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -67,6 +67,7 @@ all() ->
      create_standalone_app_clash,
      create_multiple_standalone,
      create_old_target,
+     create_slim,
      eval_target_spec,
      otp_9135,
      otp_9229_dupl_mod_exclude_app,
@@ -89,8 +90,10 @@ all() ->
      gen_rel_files,
      save_config,
      dependencies,
+     mod_incl_cond_derived,
      use_selected_vsn,
-     use_selected_vsn_relative_path].
+     use_selected_vsn_relative_path,
+     non_standard_vsn_id].
 
 groups() -> 
     [].
@@ -105,6 +108,15 @@ end_per_group(_GroupName, Config) ->
 %% The test cases
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% A dummy break test case which is NOT in all(), but can be run
+%% directly from the command line with ct_run. It just does a
+%% test_server:break()...
+break(_Config) ->
+    test_server:break(""),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Start a server process and check that it does not crash
 
 start_server(_Config) ->
@@ -297,7 +309,6 @@ create_release(_Config) ->
 %% started before the including application.
 %% Circular dependencies shall also be detected and cause error.
 
-create_release_sort(_Config) -> {skip, "Two bugs related to sorting"};
 create_release_sort(Config) ->
     DataDir = ?config(data_dir,Config),
     %% Configure the server
@@ -306,11 +317,12 @@ create_release_sort(Config) ->
     RelName3 = "Include-both",
     RelName4 = "Include-only-app",
     RelName5 = "Include-only-rel",
-    RelName6 = "Include-missing-app",
+    RelName6 = "Auto-add-missing-apps",
     RelName7 = "Circular",
-    RelName8 = "Include-both-missing-app",
-    RelName9 = "Include-overwrite",
+    RelName8 = "Include-rel-alter-order",
+    RelName9 = "Include-none-overwrite",
     RelName10= "Uses-order-as-rel",
+    RelName11= "Auto-add-dont-overwrite-load",
     RelVsn = "1.0",
     %% Application z (.app file):
     %%     includes [tools, mnesia]
@@ -325,11 +337,12 @@ create_release_sort(Config) ->
           {rel, RelName3, RelVsn, [stdlib, kernel, {z,[tools]}, tools, mnesia]},
           {rel, RelName4, RelVsn, [stdlib, kernel, z, mnesia, tools]},
           {rel, RelName5, RelVsn, [stdlib, kernel, {sasl,[tools]}]},
-          {rel, RelName6, RelVsn, [stdlib, kernel, z]},
+          {rel, RelName6, RelVsn, [z]},
 	  {rel, RelName7, RelVsn, [stdlib, kernel, mnesia, y, sasl, x]},
-          {rel, RelName8, RelVsn, [stdlib, kernel, {z,[tools]}]},
+          {rel, RelName8, RelVsn, [stdlib, kernel, {z,[mnesia,tools]}]},
           {rel, RelName9, RelVsn, [stdlib, kernel, {z,[]}]},
           {rel, RelName10, RelVsn, [stdlib, kernel, {z,[]}, inets, sasl]},
+          {rel, RelName11, RelVsn, [stdlib, kernel, z, {inets, load}]},
 	  {incl_cond,exclude},
 	  {mod_cond,app},
 	  {app,kernel,[{incl_cond,include}]},
@@ -371,7 +384,6 @@ create_release_sort(Config) ->
 		 {mnesia, _}]}},
 	  reltool:get_rel([{config, Sys}], RelName3)),
 
-    %%! BUG: same as OTP-4121, but for reltool???? Or revert tools and mnesia
     ?msym({ok, {release, {RelName4, RelVsn},
 		{erts, _},
 		[{kernel, _},
@@ -388,13 +400,29 @@ create_release_sort(Config) ->
 	"in the app file: [tools]"},
        reltool:get_rel([{config, Sys}], RelName5)),
 
-    ?m({error, "Undefined applications: [tools,mnesia]"},
+    ?msym({ok, {release, {RelName6, RelVsn},
+		{erts, _},
+		[{kernel, _},
+		 {stdlib, _},
+		 {sasl, _},
+		 {inets, _},
+		 {tools, _},
+		 {mnesia, _},
+		 {z, _}]}},
        reltool:get_rel([{config, Sys}], RelName6)),
 
     ?m({error,"Circular dependencies: [x,y]"},
        reltool:get_rel([{config, Sys}], RelName7)),
 
-    ?m({error,"Undefined applications: [tools]"},
+    ?msym({ok, {release, {RelName8, RelVsn},
+		{erts, _},
+		[{kernel, _},
+		 {stdlib, _},
+		 {sasl, _},
+		 {inets, _},
+		 {mnesia, _},
+		 {tools, _},
+		 {z, _, [mnesia,tools]}]}},
        reltool:get_rel([{config, Sys}], RelName8)),
 
     ?msym({ok,{release,{RelName9,RelVsn},
@@ -406,7 +434,6 @@ create_release_sort(Config) ->
 		{z,_,[]}]}},
 	  reltool:get_rel([{config, Sys}], RelName9)),
 
-    %%! BUG: same as OTP-9984, but for reltool???? Or revert inets and sasl?
     ?msym({ok,{release,{RelName10,RelVsn},
 	       {erts,_},
 	       [{kernel,_},
@@ -416,6 +443,17 @@ create_release_sort(Config) ->
 		{z,_,[]}]}},
 	  reltool:get_rel([{config, Sys}], RelName10)),
 
+    ?msym({ok,{release,{RelName11,RelVsn},
+	       {erts,_},
+	       [{kernel,_},
+		{stdlib,_},
+		{sasl, _},
+		{inets, _, load},
+		{tools, _},
+		{mnesia, _},
+		{z,_}]}},
+	  reltool:get_rel([{config, Sys}], RelName11)),
+
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -476,12 +514,16 @@ create_script_sort(Config) ->
     RelName3 = "Include-both",
     RelName4 = "Include-only-app",
     RelName5 = "Include-only-rel",
-    RelName6 = "Include-missing-app",
+    RelName6 = "Auto-add-missing-apps",
     RelName7 = "Circular",
-    RelName8 = "Include-both-missing-app",
-    RelName9 = "Include-overwrite",
+    RelName8 = "Include-rel-alter-order",
+    RelName9 = "Include-none-overwrite",
+    RelName10= "Uses-order-as-rel",
     RelVsn = "1.0",
     LibDir = filename:join(DataDir,"sort_apps"),
+    %% Application z (.app file):
+    %%     includes [tools, mnesia]
+    %%     uses [kernel, stdlib, sasl, inets]
     Sys =
         {sys,
          [
@@ -492,10 +534,11 @@ create_script_sort(Config) ->
           {rel, RelName3, RelVsn, [stdlib, kernel, {z,[tools]}, tools, mnesia]},
           {rel, RelName4, RelVsn, [stdlib, kernel, z, mnesia, tools]},
           {rel, RelName5, RelVsn, [stdlib, kernel, {sasl,[tools]}]},
-          {rel, RelName6, RelVsn, [stdlib, kernel, z]},
+          {rel, RelName6, RelVsn, [z]},
 	  {rel, RelName7, RelVsn, [stdlib, kernel, mnesia, y, sasl, x]},
-          {rel, RelName8, RelVsn, [stdlib, kernel, {z,[tools]}]},
+          {rel, RelName8, RelVsn, [stdlib, kernel, {z,[mnesia,tools]}]},
           {rel, RelName9, RelVsn, [stdlib, kernel, {z,[]}]},
+          {rel, RelName10, RelVsn, [stdlib, kernel, {z,[]}, inets, sasl]},
 	  {incl_cond,exclude},
 	  {mod_cond,app},
 	  {app,kernel,[{incl_cond,include}]},
@@ -552,8 +595,8 @@ create_script_sort(Config) ->
 	     [{kernel,KernelVsn},
 	      {stdlib,StdlibVsn},
 	      {z,"1.0"},
-	      {tools,ToolsVsn},
 	      {mnesia,MnesiaVsn},
+	      {tools,ToolsVsn},
 	      {sasl,SaslVsn},
 	      {inets,InetsVsn}]},
     FullName4 = filename:join(?WORK_DIR,RelName4),
@@ -568,6 +611,10 @@ create_script_sort(Config) ->
     Rel6 = {release, {RelName6,RelVsn}, {erts,ErtsVsn},
 	     [{kernel,KernelVsn},
 	      {stdlib,StdlibVsn},
+	      {sasl,SaslVsn},
+	      {inets,InetsVsn},
+	      {tools,ToolsVsn},
+	      {mnesia,MnesiaVsn},
 	      {z,"1.0"}]},
     FullName6 = filename:join(?WORK_DIR,RelName6),
     ?m(ok, file:write_file(FullName6 ++ ".rel", io_lib:format("~p.\n", [Rel6]))),
@@ -583,7 +630,11 @@ create_script_sort(Config) ->
     Rel8 = {release, {RelName8,RelVsn}, {erts,ErtsVsn},
 	     [{kernel,KernelVsn},
 	      {stdlib,StdlibVsn},
-	      {z,"1.0",[tools]}]},
+	      {z,"1.0",[mnesia,tools]},
+	      {sasl,SaslVsn},
+	      {inets,InetsVsn},
+	      {mnesia,MnesiaVsn},
+	      {tools,ToolsVsn}]},
     FullName8 = filename:join(?WORK_DIR,RelName8),
     ?m(ok, file:write_file(FullName8 ++ ".rel", io_lib:format("~p.\n", [Rel8]))),
     Rel9 = {release, {RelName9,RelVsn}, {erts,ErtsVsn},
@@ -594,6 +645,14 @@ create_script_sort(Config) ->
 	      {inets,InetsVsn}]},
     FullName9 = filename:join(?WORK_DIR,RelName9),
     ?m(ok, file:write_file(FullName9 ++ ".rel", io_lib:format("~p.\n", [Rel9]))),
+    Rel10 = {release, {RelName10,RelVsn}, {erts,ErtsVsn},
+	     [{kernel,KernelVsn},
+	      {stdlib,StdlibVsn},
+	      {z,"1.0",[]},
+	      {inets,InetsVsn},
+	      {sasl,SaslVsn}]},
+    FullName10 = filename:join(?WORK_DIR,RelName10),
+    ?m(ok, file:write_file(FullName10 ++ ".rel", io_lib:format("~p.\n", [Rel10]))),
 
     %% Generate script files with systools and reltool and compare
     ZPath = filename:join([LibDir,"*",ebin]),
@@ -625,26 +684,31 @@ create_script_sort(Config) ->
 	"in the app file: [tools]"},
        reltool:get_script(Pid, RelName5)),
 
-    ?msym({error,_,{undefined_applications,_}},
-	  systools_make_script(FullName6,ZPath)),
-    ?m({error, "Undefined applications: [tools,mnesia]"},
-       reltool:get_script(Pid, RelName6)),
+    ?msym({ok,_,_}, systools_make_script(FullName6,ZPath)),
+    {ok, [SystoolsScript6]} = ?msym({ok,[_]}, file:consult(FullName6++".script")),
+    {ok, Script6} = ?msym({ok, _}, reltool:get_script(Pid, RelName6)),
+    ?m(equal, diff_script(SystoolsScript6, Script6)),
 
     ?msym({error,_,{circular_dependencies,_}},
 	  systools_make_script(FullName7,ZPath)),
     ?m({error,"Circular dependencies: [x,y]"},
        reltool:get_script(Pid, RelName7)),
 
-    ?msym({error,_,{undefined_applications,_}},
-	  systools_make_script(FullName8,ZPath)),
-    ?m({error, "Undefined applications: [tools]"},
-       reltool:get_script(Pid, RelName8)),
+    ?msym({ok,_,_}, systools_make_script(FullName8,ZPath)),
+    {ok, [SystoolsScript8]} = ?msym({ok,[_]}, file:consult(FullName8++".script")),
+    {ok, Script8} = ?msym({ok, _}, reltool:get_script(Pid, RelName8)),
+    ?m(equal, diff_script(SystoolsScript8, Script8)),
 
     ?msym({ok,_,_}, systools_make_script(FullName9,ZPath)),
     {ok, [SystoolsScript9]} = ?msym({ok,[_]}, file:consult(FullName9++".script")),
     {ok, Script9} = ?msym({ok, _}, reltool:get_script(Pid, RelName9)),
     ?m(equal, diff_script(SystoolsScript9, Script9)),
 
+    ?msym({ok,_,_}, systools_make_script(FullName10,ZPath)),
+    {ok, [SystoolsScript10]} = ?msym({ok,[_]}, file:consult(FullName10++".script")),
+    {ok, Script10} = ?msym({ok, _}, reltool:get_script(Pid, RelName10)),
+    ?m(equal, diff_script(SystoolsScript10, Script10)),
+
     %% Stop server
     ?m(ok, reltool:stop(Pid)),
     ok.
@@ -950,8 +1014,6 @@ create_multiple_standalone(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Generate old type of target system
-
-create_old_target(_Config) -> {skip, "Old style of target"};
 create_old_target(_Config) ->
     
     %% Configure the server
@@ -974,8 +1036,7 @@ create_old_target(_Config) ->
     ?m(ok, reltool_utils:recursive_delete(TargetDir)),
     ?m(ok, file:make_dir(TargetDir)),
     ok = ?m(ok, reltool:create_target([{config, Config}], TargetDir)),
-    
-    %% io:format("Will fail on Windows (should patch erl.ini)\n", []),
+
     ok = ?m(ok, reltool:install(RelName2, TargetDir)),
 
     Erl = filename:join([TargetDir, "bin", "erl"]),
@@ -985,6 +1046,61 @@ create_old_target(_Config) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Generate target system
+
+create_slim(Config) ->
+    %% Configure the server
+    RelName = "slim",
+    RelVsn = "1.0",
+
+    DataDir =  ?config(data_dir,Config),
+    LibDir = filename:join(DataDir,"slim"),
+
+    Sys =
+        {sys,
+         [
+          {root_dir, code:root_dir()},
+          {lib_dirs, []},
+          {boot_rel, RelName},
+          {rel, RelName, RelVsn, [sasl, stdlib, kernel, a]},
+          {app, sasl, [{incl_cond, include}]},
+          {app, a, [{incl_cond, include},
+		    {lib_dir,filename:join(LibDir,"a-1.0")}]},
+	  {excl_lib,otp_root}
+         ]},
+
+    %% Generate target file
+    TargetDir = filename:absname(filename:join([?WORK_DIR, "target_slim"])),
+    ?m(ok, reltool_utils:recursive_delete(TargetDir)),
+    ?m(ok, file:make_dir(TargetDir)),
+    ?log("SPEC: ~p\n", [reltool:get_target_spec([{config, Sys}])]),
+    ok = ?m(ok, reltool:create_target([{config, Sys}], TargetDir)),
+
+    TargetLibDir = filename:join(TargetDir,"lib"),
+    TargetRelDir = filename:join(TargetDir,"releases"),
+    TargetRelVsnDir = filename:join(TargetRelDir,RelVsn),
+
+    {ok,["a-1.0.ez"]} = file:list_dir(TargetLibDir),
+
+    RootDir = code:root_dir(),
+    Erl = filename:join([RootDir, "bin", "erl"]),
+    EscapedQuote =
+	case os:type() of
+	    {win32,_} -> "\\\"";
+	    _         -> "\""
+	end,
+    Args = ["-boot_var", "RELTOOL_EXT_LIB", TargetLibDir,
+	    "-boot", filename:join(TargetRelVsnDir,RelName),
+	    "-sasl", "releases_dir", EscapedQuote++TargetRelDir++EscapedQuote],
+    {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl, Args)),
+    ?msym(RootDir, rpc:call(Node, code, root_dir, [])),
+    ?msym([{RelName,RelVsn,_,permanent}],
+	  rpc:call(Node,release_handler,which_releases,[])),
+    ?msym(ok, stop_node(Node)),
+
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Generate target system with eval_target_spec/3
 
 eval_target_spec(_Config) ->
@@ -1891,7 +2007,7 @@ save_config(Config) ->
 %%
 %% x-1.0: x1.erl   x2.erl   x3.erl
 %%                   \        /         (x2 calls y1, x3 calls y2)
-%% y-1.0:          y1.erl   y2.erl
+%% y-1.0: y0.erl    y1.erl   y2.erl
 %%                    \                 (y1 calls z1)
 %% z-1.0            z1.erl
 %%
@@ -2021,6 +2137,47 @@ dependencies(Config) ->
     ok.
 
 
+%% Test that incl_cond on mod level overwrites mod_cond on app level
+%% Uses same test applications as dependencies/1 above
+mod_incl_cond_derived(Config) ->
+    %% In app y: mod_cond=none means no module shall be included
+    %% but mod_cond is overwritten by incl_cond on mod level
+    Sys = {sys,[{lib_dirs,[filename:join(datadir(Config),"dependencies")]},
+		{incl_cond, exclude},
+		{app,kernel,[{incl_cond,include}]},
+		{app,sasl,[{incl_cond,include}]},
+		{app,stdlib,[{incl_cond,include}]},
+		{app,x,[{incl_cond,include}]},
+		{app,y,[{incl_cond,include},
+			{mod_cond,none},
+			{mod,y0,[{incl_cond,derived}]},
+			{mod,y2,[{incl_cond,derived}]}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+
+    ?msym({ok,[#app{name=kernel},
+	       #app{name=sasl},
+	       #app{name=stdlib},
+	       #app{name=x,uses_apps=[y]},
+	       #app{name=y,uses_apps=[]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+    {ok, Der} = ?msym({ok,_},reltool_server:get_apps(Pid,derived)),
+    ?msym([], rm_missing_app(Der)),
+    ?msym({ok,[]}, reltool_server:get_apps(Pid,source)),
+
+    %% 1. check that y0 is not included since it has
+    %% incl_cond=derived, but is not used by any other module.
+    ?msym({ok,#mod{is_included=undefined}}, reltool_server:get_mod(Pid,y0)),
+
+    %% 2. check that y1 is excluded since it has undefined incl_cond
+    %% on mod level, so mod_cond on app level shall be used.
+    ?msym({ok,#mod{is_included=false}}, reltool_server:get_mod(Pid,y1)),
+
+    %% 3. check that y2 is included since it has incl_cond=derived and
+    %% is used by x3.
+    ?msym({ok,#mod{is_included=true}}, reltool_server:get_mod(Pid,y2)),
+
+    ok.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 use_selected_vsn(Config) ->
     LibDir1 = filename:join(datadir(Config),"use_selected_vsn"),
@@ -2145,6 +2302,39 @@ use_selected_vsn_relative_path(Config) ->
     ok = file:set_cwd(Cwd),
     ok.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Test that reltool recognizes an application with its real name even
+%% though it uses non standard format for its version number (in the
+%% directory name)
+non_standard_vsn_id(Config) ->
+    LibDir = filename:join(datadir(Config),"non_standard_vsn_id"),
+    B1Dir = filename:join(LibDir,"b-first"),
+    B2Dir = filename:join(LibDir,"b-second"),
+
+    %%-----------------------------------------------------------------
+    %% Default vsn of app b
+    Sys1 = {sys,[{lib_dirs,[LibDir]},
+		 {incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,b,[{incl_cond,include}]}]},
+    {ok, Pid1} = ?msym({ok, _}, reltool:start_server([{config, Sys1}])),
+    ?msym({ok,#app{vsn="first",active_dir=B1Dir,sorted_dirs=[B1Dir,B2Dir]}},
+	  reltool_server:get_app(Pid1,b)),
+
+    %%-----------------------------------------------------------------
+    %% Pre-selected vsn of app b
+    Sys2 = {sys,[{lib_dirs,[LibDir]},
+		 {incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,b,[{incl_cond,include},{vsn,"second"}]}]},
+    {ok, Pid2} = ?msym({ok, _}, reltool:start_server([{config, Sys2}])),
+    ?msym({ok,#app{vsn="second",active_dir=B2Dir,sorted_dirs=[B1Dir,B2Dir]}},
+	  reltool_server:get_app(Pid2,b)),
+   ok.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2226,10 +2416,14 @@ mod_path(Node,Mod) ->
 %% Node handling
 
 start_node(Name, ErlPath) ->
+    start_node(Name, ErlPath, []).
+start_node(Name, ErlPath, Args0) ->
     FullName = full_node_name(Name),
-    CmdLine = mk_node_cmdline(Name, ErlPath),
-    io:format("Starting node ~p: ~s~n", [FullName, CmdLine]),
-    case open_port({spawn, CmdLine}, []) of
+    Args = mk_node_args(Name, Args0),
+    io:format("Starting node ~p: ~s~n",
+	      [FullName, lists:flatten([[X," "] || X <- [ErlPath|Args]])]),
+    %io:format("open_port({spawn_executable, ~p}, [{args,~p}])~n",[ErlPath,Args]),
+    case open_port({spawn_executable, ErlPath}, [{args,Args}]) of
         Port when is_port(Port) ->
             unlink(Port),
             erlang:port_close(Port),
@@ -2246,29 +2440,21 @@ stop_node(Node) ->
     spawn(Node, fun () -> halt() end),
     receive {nodedown, Node} -> ok end.
 
-mk_node_cmdline(Name) ->
-    Prog = case catch init:get_argument(progname) of
-               {ok,[[P]]} -> P;
-               _ -> exit(no_progname_argument_found)
-           end,
-    mk_node_cmdline(Name, Prog).
-
-mk_node_cmdline(Name, Prog) ->
-    Static = "-detached -noinput",
+mk_node_args(Name, Args) ->
     Pa = filename:dirname(code:which(?MODULE)),
     NameSw = case net_kernel:longnames() of
-                 false -> "-sname ";
-                 true -> "-name ";
+                 false -> "-sname";
+                 true -> "-name";
                  _ -> exit(not_distributed_node)
              end,
     {ok, Pwd} = file:get_cwd(),
     NameStr = atom_to_list(Name),
-    Prog ++ " "
-        ++ Static ++ " "
-        ++ NameSw ++ " " ++ NameStr ++ " "
-        ++ "-pa " ++ Pa ++ " "
-        ++ "-env ERL_CRASH_DUMP " ++ Pwd ++ "/erl_crash_dump." ++ NameStr ++ " "
-        ++ "-setcookie " ++ atom_to_list(erlang:get_cookie()).
+    ["-detached", "-noinput",
+     NameSw, NameStr,
+     "-pa", Pa,
+     "-env", "ERL_CRASH_DUMP", Pwd ++ "/erl_crash_dump." ++ NameStr,
+     "-setcookie", atom_to_list(erlang:get_cookie())
+     | Args].
 
 full_node_name(PreName) ->
     HostSuffix = lists:dropwhile(fun ($@) -> false; (_) -> true end,
diff --git a/lib/reltool/test/reltool_server_SUITE_data/Makefile.src b/lib/reltool/test/reltool_server_SUITE_data/Makefile.src
index 21410ceaa9..02846f42b6 100644
--- a/lib/reltool/test/reltool_server_SUITE_data/Makefile.src
+++ b/lib/reltool/test/reltool_server_SUITE_data/Makefile.src
@@ -22,7 +22,11 @@ SEL_VSN= \
      use_selected_vsn/b-3.0/ebin/b.@EMULATOR@ \
      use_selected_vsn/lib2/b-2.0/ebin/b.@EMULATOR@
 
-all: $(OTP9229) $(DEPENDENCIES) $(ESCRIPT) $(SEL_VSN)
+SLIM= \
+     slim/a-1.0/ebin/a_sup.@EMULATOR@ \
+     slim/a-1.0/ebin/a.@EMULATOR@
+
+all: $(OTP9229) $(DEPENDENCIES) $(ESCRIPT) $(SEL_VSN) $(SLIM)
 
 otp_9229/x-1.0/ebin/x.@EMULATOR@: otp_9229/x-1.0/src/x.erl
 	erlc $(EFLAGS) -ootp_9229/x-1.0/ebin otp_9229/x-1.0/src/x.erl
@@ -55,3 +59,8 @@ use_selected_vsn/b-3.0/ebin/b.@EMULATOR@: use_selected_vsn/b-3.0/src/b.erl
 	erlc $(EFLAGS) -ouse_selected_vsn/b-3.0/ebin use_selected_vsn/b-3.0/src/b.erl
 use_selected_vsn/lib2/b-2.0/ebin/b.@EMULATOR@: use_selected_vsn/lib2/b-2.0/src/b.erl
 	erlc $(EFLAGS) -ouse_selected_vsn/lib2/b-2.0/ebin use_selected_vsn/lib2/b-2.0/src/b.erl
+
+slim/a-1.0/ebin/a_sup.@EMULATOR@: slim/a-1.0/src/a_sup.erl
+	erlc $(EFLAGS) -oslim/a-1.0/ebin slim/a-1.0/src/a_sup.erl
+slim/a-1.0/ebin/a.@EMULATOR@: slim/a-1.0/src/a.erl
+	erlc $(EFLAGS) -oslim/a-1.0/ebin slim/a-1.0/src/a.erl
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app
index d9dac371d7..39fdabeea4 100644
--- a/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app
@@ -2,6 +2,6 @@
 {application, y,
  [{description, "Library application in reltool dependency test"},
   {vsn, "1.0"},
-  {modules, [y1,y2]},
+  {modules, [y0,y1,y2]},
   {registered, []},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y0.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y0.erl
new file mode 100644
index 0000000000..dc188ba7b6
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y0.erl
@@ -0,0 +1,5 @@
+-module(y0).
+-compile(export_all).
+
+f() ->
+    ok.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/ebin/b.app b/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/ebin/b.app
new file mode 100644
index 0000000000..55550a8190
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/ebin/b.app
@@ -0,0 +1,6 @@
+%% -*- erlang -*-
+{application, b,
+ [{description, "Reltool test app for using selected version of app"},
+  {vsn, "first"},
+  {modules, [b]},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/src/b.erl b/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/src/b.erl
new file mode 100644
index 0000000000..a6b4ff1c05
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/src/b.erl
@@ -0,0 +1,4 @@
+-module(b).
+-compile(export_all).
+
+foo() -> ok.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-second/ebin/b.app b/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-second/ebin/b.app
new file mode 100644
index 0000000000..91e1365df7
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-second/ebin/b.app
@@ -0,0 +1,6 @@
+%% -*- erlang -*-
+{application, b,
+ [{description, "Reltool test app for using selected version of app"},
+  {vsn, "second"},
+  {modules, [b]},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-second/src/b.erl b/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-second/src/b.erl
new file mode 100644
index 0000000000..a6b4ff1c05
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-second/src/b.erl
@@ -0,0 +1,4 @@
+-module(b).
+-compile(export_all).
+
+foo() -> ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/ebin/a.app b/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/ebin/a.app
index 200cfcfe47..3160e00da7 100644
--- a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/ebin/a.app
+++ b/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/ebin/a.app
@@ -1,8 +1,7 @@
 {application, a,
 	     [{description, "A  CXC 138 11"},
-              {vsn, "2.0"},
-	      {modules, [{a, 1}, {a_sup,1}]},
+              {vsn, "1.0"},
+	      {modules, [a, a_sup]},
 	      {registered, [a_sup]},
 	      {applications, [kernel, stdlib]},
-	      {env, [{key1, val1}]},
 	      {mod, {a_sup, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a.erl b/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/src/a.erl
index cfe38b55ce..bb500bed69 100644
--- a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a.erl
+++ b/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/src/a.erl
@@ -20,6 +20,8 @@
 
 -behaviour(gen_server).
 
+-vsn(1).
+
 %% External exports
 -export([start_link/0, a/0]).
 %% Internal exports
diff --git a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a_sup.erl b/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/src/a_sup.erl
index a141c1767b..a141c1767b 100644
--- a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a_sup.erl
+++ b/lib/reltool/test/reltool_server_SUITE_data/slim/a-1.0/src/a_sup.erl
diff --git a/lib/reltool/vsn.mk b/lib/reltool/vsn.mk
index 3811d897c7..6872539b8c 100644
--- a/lib/reltool/vsn.mk
+++ b/lib/reltool/vsn.mk
@@ -1 +1 @@
-RELTOOL_VSN = 0.6
+RELTOOL_VSN = 0.6.1
diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
index cbbcfa2d56..586f649924 100644
--- a/lib/runtime_tools/c_src/Makefile.in
+++ b/lib/runtime_tools/c_src/Makefile.in
@@ -46,9 +46,6 @@ LDFLAGS += $(DED_LDFLAGS)
 DTRACE_LIBNAME = dyntrace
 
 SYSINCLUDE = $(DED_SYS_INCLUDE)
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-	SYSINCLUDE += -I$(ERL_TOP)/erts/etc/vxworks
-endif
 
 TRACE_DRV_INCLUDES = $(SYSINCLUDE)
 
@@ -101,12 +98,8 @@ ifeq ($(findstring win32,$(TARGET)), win32)
 SOLIBS = $(LIBDIR)/trace_ip_drv.dll $(LIBDIR)/trace_file_drv.dll
 LN=cp
 else
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-SOLIBS = $(LIBDIR)/trace_ip_drv.eld $(LIBDIR)/trace_file_drv.eld
-else
 SOLIBS = $(LIBDIR)/trace_ip_drv.so $(LIBDIR)/trace_file_drv.so
 endif
-endif
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
@@ -165,15 +158,6 @@ $(LIBDIR)/trace_ip_drv.dll: $(TRACE_IP_DRV_OBJS)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 $(LIBDIR)/trace_file_drv.dll: $(TRACE_FILE_DRV_OBJS)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-#
-# VxWorks is simply to different from Unix in this sense.
-# Here are the inference rules for VxWorks
-#
-$(LIBDIR)/trace_ip_drv.eld: $(TRACE_IP_DRV_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $^ 
-
-$(LIBDIR)/trace_file_drv.eld: $(TRACE_FILE_DRV_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $^ 
 
 clean:
 	rm -f $(SOLIBS) $(TRACE_IP_DRV_OBJS) $(TRACE_FILE_DRV_OBJS)
@@ -193,10 +177,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
-	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) $(RELSYSDIR)/priv/obj
-	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) $(RELSYSDIR)/priv/lib
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj"
+	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
 
 release_docs_spec:
 
diff --git a/lib/runtime_tools/c_src/dtrace_user.d b/lib/runtime_tools/c_src/dtrace_user.d
index 3a80d0f7a3..9e180a3cb2 100644
--- a/lib/runtime_tools/c_src/dtrace_user.d
+++ b/lib/runtime_tools/c_src/dtrace_user.d
@@ -19,31 +19,11 @@
  */
 
 provider erlang {
-    /**
-     * Send a single string to a probe.
-     *
-     * @param NUL-terminated string
+    /*
+     * The set of probes for use by Erlang code ... moved from here to
+     * erts/emulator/beam/erlang_dtrace.d until a more portable solution is
+     * found; see erlang_dtrace.d for details.
      */
-    probe user_trace__s1(char* message);
-
-    /**
-     * Multi-purpose probe: up to 4 NUL-terminated strings and 4
-     * 64-bit integer arguments.
-     *
-     * @param proc, the PID (string form) of the sending process
-     * @param user_tag, the user tag of the sender
-     * @param i1, integer
-     * @param i2, integer
-     * @param i3, integer
-     * @param i4, integer
-     * @param s1, string/iolist. D's arg6 is NULL if not given by Erlang
-     * @param s2, string/iolist. D's arg7 is NULL if not given by Erlang
-     * @param s3, string/iolist. D's arg8 is NULL if not given by Erlang
-     * @param s4, string/iolist. D's arg9 is NULL if not given by Erlang
-     */
-    probe user_trace__i4s4(char *proc, char *user_tag,
-                           int i1, int i2, int i3, int i4,
-                           char *s1, char *s2, char *s3, char *s4);
 };
 
 #pragma D attributes Evolving/Evolving/Common provider erlang provider
diff --git a/lib/runtime_tools/c_src/dyntrace.c b/lib/runtime_tools/c_src/dyntrace.c
index 96dbebbdfa..eef03afd1c 100644
--- a/lib/runtime_tools/c_src/dyntrace.c
+++ b/lib/runtime_tools/c_src/dyntrace.c
@@ -36,6 +36,10 @@
 
 void dtrace_nifenv_str(ErlNifEnv *env, char *process_buf);
 void get_string_maybe(ErlNifEnv *env, const ERL_NIF_TERM term, char **ptr, char *buf, int bufsiz);
+#ifdef HAVE_USE_DTRACE
+ERL_NIF_TERM erl_nif_user_trace_s1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM erl_nif_user_trace_i4s4(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+#endif
 
 #ifdef VALGRIND
     #  include <valgrind/memcheck.h>
@@ -56,11 +60,13 @@ static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info);
 static ERL_NIF_TERM available(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM user_trace_s1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM user_trace_i4s4(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM user_trace_n(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 
 static ErlNifFunc nif_funcs[] = {
     {"available", 0, available},
     {"user_trace_s1", 1, user_trace_s1},
-    {"user_trace_i4s4", 9, user_trace_i4s4}
+    {"user_trace_i4s4", 9, user_trace_i4s4},
+    {"user_trace_n", 10, user_trace_n}
 };
 
 ERL_NIF_INIT(dyntrace, nif_funcs, load, NULL, NULL, NULL)
@@ -96,76 +102,25 @@ static ERL_NIF_TERM available(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
 static ERL_NIF_TERM user_trace_s1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
 #ifdef	HAVE_USE_DTRACE
-    ErlNifBinary message_bin;
-    DTRACE_CHARBUF(messagebuf, MESSAGE_BUFSIZ + 1);
-
-    if (DTRACE_ENABLED(user_trace_s1)) {
-	if (!enif_inspect_iolist_as_binary(env, argv[0], &message_bin) ||
-	    message_bin.size > MESSAGE_BUFSIZ) {
-	    return atom_badarg;
-	}
-	memcpy(messagebuf, (char *) message_bin.data, message_bin.size);
-        messagebuf[message_bin.size] = '\0';
-	DTRACE1(user_trace_s1, messagebuf);
-	return atom_true;
-    } else {
-	return atom_false;
-    }
+    return erl_nif_user_trace_s1(env, argc, argv);
 #else
     return atom_error;
 #endif
 }
 
-void
-get_string_maybe(ErlNifEnv *env,
-                 const ERL_NIF_TERM term, char **ptr, char *buf, int bufsiz)
+static ERL_NIF_TERM user_trace_i4s4(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
-    ErlNifBinary str_bin;
-
-    if (!enif_inspect_iolist_as_binary(env, term, &str_bin) ||
-        str_bin.size > bufsiz) {
-        *ptr = NULL;
-    } else {
-        memcpy(buf, (char *) str_bin.data, str_bin.size);
-        buf[str_bin.size] = '\0';
-        *ptr = buf;
-    }
+#ifdef	HAVE_USE_DTRACE
+    return erl_nif_user_trace_i4s4(env, argc, argv);
+#else
+    return atom_error;
+#endif
 }
 
-static ERL_NIF_TERM user_trace_i4s4(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+static ERL_NIF_TERM user_trace_n(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
 #ifdef	HAVE_USE_DTRACE
-    DTRACE_CHARBUF(procbuf, 32 + 1);
-    DTRACE_CHARBUF(user_tagbuf, MESSAGE_BUFSIZ + 1);
-    char *utbuf = NULL;
-    ErlNifSInt64 i1, i2, i3, i4;
-    DTRACE_CHARBUF(messagebuf1, MESSAGE_BUFSIZ + 1);
-    DTRACE_CHARBUF(messagebuf2, MESSAGE_BUFSIZ + 1);
-    DTRACE_CHARBUF(messagebuf3, MESSAGE_BUFSIZ + 1);
-    DTRACE_CHARBUF(messagebuf4, MESSAGE_BUFSIZ + 1);
-    char *mbuf1 = NULL, *mbuf2 = NULL, *mbuf3 = NULL, *mbuf4 = NULL;
-
-    if (DTRACE_ENABLED(user_trace_i4s4)) {
-	dtrace_nifenv_str(env, procbuf);
-        get_string_maybe(env, argv[0], &utbuf, user_tagbuf, MESSAGE_BUFSIZ);
-        if (! enif_get_int64(env, argv[1], &i1))
-            i1 = 0;
-        if (! enif_get_int64(env, argv[2], &i2))
-            i2 = 0;
-        if (! enif_get_int64(env, argv[3], &i3))
-            i3 = 0;
-        if (! enif_get_int64(env, argv[4], &i4))
-            i4 = 0;
-        get_string_maybe(env, argv[5], &mbuf1, messagebuf1, MESSAGE_BUFSIZ);
-        get_string_maybe(env, argv[6], &mbuf2, messagebuf2, MESSAGE_BUFSIZ);
-        get_string_maybe(env, argv[7], &mbuf3, messagebuf3, MESSAGE_BUFSIZ);
-        get_string_maybe(env, argv[8], &mbuf4, messagebuf4, MESSAGE_BUFSIZ);
-	DTRACE10(user_trace_i4s4, procbuf, utbuf,
-		 i1, i2, i3, i4, mbuf1, mbuf2, mbuf3, mbuf4);
-	return atom_true;
-    } else {
-	return atom_false;
-    }
+    return erl_nif_user_trace_n(env, argc, argv);
 #else
     return atom_error;
 #endif
diff --git a/lib/runtime_tools/c_src/trace_ip_drv.c b/lib/runtime_tools/c_src/trace_ip_drv.c
index 7f7ab8dd9d..a7d132ca6e 100644
--- a/lib/runtime_tools/c_src/trace_ip_drv.c
+++ b/lib/runtime_tools/c_src/trace_ip_drv.c
@@ -34,21 +34,12 @@
 #include <stdlib.h>
 #include <string.h>
 #ifndef __WIN32__
-#    ifdef VXWORKS
-#        include <sockLib.h>
-#        include <sys/times.h>
-#        include <iosLib.h>
-#        include <taskLib.h>
-#        include <selectLib.h>
-#        include <ioLib.h>
-#        include "reclaim.h"
-#    endif 
-#        include <unistd.h>
-#        include <errno.h>
-#        include <sys/types.h>
-#        include <sys/socket.h>
-#        include <netinet/in.h>
-#        include <fcntl.h>
+# include <unistd.h>
+# include <errno.h>
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <fcntl.h>
 #endif
 
 #ifdef DEBUG
@@ -590,8 +581,8 @@ static void *my_alloc(size_t size)
     void *ret;
     if ((ret = driver_alloc(size)) == NULL) {
 	/* May or may not work... */
-	fprintf(stderr, "Could not allocate %d bytes of memory in %s.",
-		(int) size, __FILE__);
+	fprintf(stderr, "Could not allocate %lu bytes of memory in %s.",
+		(unsigned long) size, __FILE__);
 	exit(1);
     }
     return ret;
@@ -605,8 +596,8 @@ static ErlDrvBinary *my_alloc_binary(int size)
     ErlDrvBinary *ret;
     if ((ret = driver_alloc_binary(size)) == NULL) {
 	/* May or may not work... */
-	fprintf(stderr, "Could not allocate a binary of %d bytes in %s.",
-		(int) size, __FILE__);
+	fprintf(stderr, "Could not allocate a binary of %lu bytes in %s.",
+		(unsigned long) size, __FILE__);
 	exit(1);
     }
     return ret;
@@ -910,7 +901,7 @@ static void stop_select(ErlDrvEvent event, void* _)
     WSACloseEvent((HANDLE)event);
 }
 
-#else /* UNIX/VXWORKS */
+#else /* UNIX */
 
 static int my_driver_select(TraceIpData *desc, SOCKET fd, int flags, enum MySelectOp op)
 {
diff --git a/lib/runtime_tools/doc/src/Makefile b/lib/runtime_tools/doc/src/Makefile
index c67f7bd1f6..51d93df418 100644
--- a/lib/runtime_tools/doc/src/Makefile
+++ b/lib/runtime_tools/doc/src/Makefile
@@ -43,9 +43,11 @@ XML_APPLICATION_FILES = ref_man.xml
 XML_REF3_FILES = dbg.xml dyntrace.xml erts_alloc_config.xml
 XML_REF6_FILES = runtime_tools_app.xml
 
-XML_PART_FILES = part_notes.xml part_notes_history.xml
+XML_PART_FILES = part_notes.xml part_notes_history.xml part.xml
 XML_CHAPTER_FILES = notes.xml notes_history.xml
 
+GENERATED_XML_FILES = DTRACE.xml SYSTEMTAP.xml
+
 BOOK_FILES = book.xml
 
 XML_FILES = \
@@ -78,6 +80,11 @@ DVIPS_FLAGS +=
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
+$(XML_FILES): $(GENERATED_XML_FILES)
+
+%.xml: $(ERL_TOP)/HOWTO/%.md $(ERL_TOP)/make/emd2exml
+	$(ERL_TOP)/make/emd2exml $< $@
+
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
@@ -108,16 +115,16 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6_FILES) $(RELEASE_PATH)/man/man6
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6_FILES) "$(RELEASE_PATH)/man/man6"
 
 release_spec:
 
diff --git a/lib/runtime_tools/doc/src/book.xml b/lib/runtime_tools/doc/src/book.xml
index 3f0dd7d55e..ad7d709644 100644
--- a/lib/runtime_tools/doc/src/book.xml
+++ b/lib/runtime_tools/doc/src/book.xml
@@ -34,6 +34,9 @@
   <preamble>
     <contents level="2"></contents>
   </preamble>
+  <parts lift="no">
+    <xi:include href="part.xml"/>
+  </parts>
   <applications>
     <xi:include href="ref_man.xml"/>
   </applications>
diff --git a/lib/runtime_tools/doc/src/dyntrace.xml b/lib/runtime_tools/doc/src/dyntrace.xml
index 5fc5530f25..f0149d0665 100644
--- a/lib/runtime_tools/doc/src/dyntrace.xml
+++ b/lib/runtime_tools/doc/src/dyntrace.xml
@@ -42,7 +42,7 @@
     </list>
       <p>Both building with dynamic trace probes and using them is experimental and unsupported by Erlang/OTP. It is included as an option for the developer to trace and debug performance issues in their systems.</p>
       <p>The original implementation is mostly done by Scott Lystiger Fritchie as an Open Source Contribution and it should be viewed as such even though the source for dynamic tracing as well as this module is included in the main distribution. However, the ability to use dynamic tracing of the virtual machine is a very valuable contribution which OTP has every intention to maintain as a tool for the developer.</p>
-      <p>How to write <c>d</c> programs or <c>systemtap</c> scripts can be learned from books and from a lot of pages on the Internet. This manual page does not include any documentation about using the dynamic trace tools of respective platform. The <c>examples</c> directory of the <c>runtime_tools</c> application however contains comprehensive examples of both <c>d</c> and <c>systemtap</c> programs that will help you get started. Another source of information is the <c>README.dtrace(.md)</c> and <c>README.systemtap(.md)</c> files in the Erlang source top directory.</p> 
+      <p>How to write <c>d</c> programs or <c>systemtap</c> scripts can be learned from books and from a lot of pages on the Internet. This manual page does not include any documentation about using the dynamic trace tools of respective platform. The <c>examples</c> directory of the <c>runtime_tools</c> application however contains comprehensive examples of both <c>d</c> and <c>systemtap</c> programs that will help you get started. Another source of information is the <seealso marker="DTRACE">dtrace</seealso> and <seealso marker="SYSTEMTAP">systemtap</seealso> chapters in the Runtime Tools Users' Guide.</p>
   </description>
   <funcs>
     <func>
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index 2d4a206e1c..90641719c5 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,52 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
+<section><title>Runtime_Tools 1.8.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Change the module-level docs to give complete
+	    step-by-step instructions for using the `dyntrace:p()`
+	    trace function. (Thanks to Scott Lystig Fritchie)</p>
+          <p>
+	    Own Id: OTP-10141</p>
+        </item>
+        <item>
+          <p>
+	    Add 1024 separate USDT probes to dyntrace.erl and
+	    dyntrace.c (Thanks to Scott Lystig Fritchie)</p>
+          <p>
+	    Own Id: OTP-10143</p>
+        </item>
+        <item>
+          <p>
+	    Relocate bodies of DTrace probes to the statically-linked
+	    VM.</p>
+          <p>
+	    Due to various operating systems (in both the DTrace and
+	    SystemTap worlds) not fully supporting DTrace probes (or
+	    SystemTap-compatibility mode probes) in shared libraries,
+	    we relocate those probes to the statically-linked virtual
+	    machine. This could be seen as pollution of the pristine
+	    VM by a (yet) experimental feature. However:</p>
+          <p>
+	    1. This code can be eliminated completely by the C
+	    preprocessor. 2. Leaving the probes in the dyntrace NIF
+	    shared library simply does not work correctly on too many
+	    platforms. *Many* thanks to Macneil Shonle at Basho for
+	    assisting when my RSI-injured fingers gave out. (note:
+	    Solaris 10 and FreeBSD 9.0-RELEASE can take a long time
+	    to compile)</p>
+          <p>
+	    Own Id: OTP-10189</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Runtime_Tools 1.8.8</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/inviso/doc/src/part.xml b/lib/runtime_tools/doc/src/part.xml
index 08ced28f47..948d4a8020 100644
--- a/lib/inviso/doc/src/part.xml
+++ b/lib/runtime_tools/doc/src/part.xml
@@ -4,7 +4,7 @@
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2012</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -21,15 +21,22 @@
     
     </legalnotice>
 
-    <title>Inviso User's Guide</title>
-    <prepared></prepared>
+    <title>Runtime Tools User's Guide</title>
+    <prepared>Lukas Larsson</prepared>
     <docno></docno>
-    <date></date>
+    <date>2012-07-18</date>
     <rev></rev>
+    <file>part.xml</file>
   </header>
+  
   <description>
-    <p><em>Inviso</em>, an Erlang trace tool.</p>
+      <p><em>Runtime Tools</em></p>
   </description>
-  <xi:include href="inviso_chapter.xml"/>
+
+  <xi:include href="DTRACE.xml"/>
+  <xi:include href="SYSTEMTAP.xml"/>
 </part>
+          
+
+
 
diff --git a/lib/runtime_tools/examples/user-probe-n.d b/lib/runtime_tools/examples/user-probe-n.d
new file mode 100644
index 0000000000..06a3e5c9b9
--- /dev/null
+++ b/lib/runtime_tools/examples/user-probe-n.d
@@ -0,0 +1,44 @@
+/* example usage: dtrace -q -s /path/to/user-probe.d */
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Scott Lystig Fritchie 2011-2012. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+erlang*:::user_trace-n0
+{
+    printf("probe n0: %s %s %d %d %d %d '%s' '%s' '%s' '%s'\n",
+           copyinstr(arg0),
+           arg1 == NULL ? "" : copyinstr(arg1),
+           arg2, arg3, arg4, arg5,
+           arg6 == NULL ? "" : copyinstr(arg6),
+           arg7 == NULL ? "" : copyinstr(arg7),
+           arg8 == NULL ? "" : copyinstr(arg8),
+           arg9 == NULL ? "" : copyinstr(arg9));
+}
+
+erlang*:::user_trace-n1
+{
+    printf("probe n1: %s %s %d %d %d %d '%s' '%s' '%s' '%s'\n",
+           copyinstr(arg0),
+           arg1 == NULL ? "" : copyinstr(arg1),
+           arg2, arg3, arg4, arg5,
+           arg6 == NULL ? "" : copyinstr(arg6),
+           arg7 == NULL ? "" : copyinstr(arg7),
+           arg8 == NULL ? "" : copyinstr(arg8),
+           arg9 == NULL ? "" : copyinstr(arg9));
+}
+
diff --git a/lib/runtime_tools/examples/user-probe-n.systemtap b/lib/runtime_tools/examples/user-probe-n.systemtap
new file mode 100644
index 0000000000..6aa415bb67
--- /dev/null
+++ b/lib/runtime_tools/examples/user-probe-n.systemtap
@@ -0,0 +1,53 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Scott Lystig Fritchie and Andreas Schultz, 2011-2012. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+/*
+ * Note: This file assumes that you're using the non-SMP-enabled Erlang
+ *       virtual machine, "beam".  The SMP-enabled VM is called "beam.smp".
+ *       Note that other variations of the virtual machine also have
+ *       different names, e.g. the debug build of the SMP-enabled VM
+ *       is "beam.debug.smp".
+ *
+ *       To use a different virtual machine, replace each instance of
+ *       "beam" with "beam.smp" or the VM name appropriate to your
+ *       environment.
+ */
+
+probe process("beam").mark("user_trace-n0")
+{
+    printf("probe n0: %s %s %d %d %d %d '%s' '%s' '%s' '%s'\n",
+           user_string($arg1),
+           $arg2 == NULL ? "" : user_string($arg2),
+           $arg3, $arg4, $arg5, $arg6,
+           $arg7 == NULL ? "" : user_string($arg7),
+           $arg8 == NULL ? "" : user_string($arg8),
+           $arg9 == NULL ? "" : user_string($arg9),
+           $arg9 == NULL ? "" : user_string($arg9));
+}
+
+probe process("beam").mark("user_trace-n1")
+{
+    printf("probe n1: %s %s %d %d %d %d '%s' '%s' '%s' '%s'\n",
+           user_string($arg1),
+           $arg2 == NULL ? "" : user_string($arg2),
+           $arg3, $arg4, $arg5, $arg6,
+           $arg7 == NULL ? "" : user_string($arg7),
+           $arg8 == NULL ? "" : user_string($arg8),
+           $arg9 == NULL ? "" : user_string($arg9),
+           $arg9 == NULL ? "" : user_string($arg9));
+}
diff --git a/lib/runtime_tools/examples/user-probe.systemtap b/lib/runtime_tools/examples/user-probe.systemtap
index b41d7483ad..0482235324 100644
--- a/lib/runtime_tools/examples/user-probe.systemtap
+++ b/lib/runtime_tools/examples/user-probe.systemtap
@@ -28,12 +28,12 @@
  *       environment.
  */
 
-probe process("dyntrace.so").mark("user_trace-s1")
+probe process("beam").mark("user_trace-s1")
 {
     printf("%s\n", user_string($arg1));
 }
 
-probe process("dyntrace.so").mark("user_trace-i4s4")
+probe process("beam").mark("user_trace-i4s4")
 {
     printf("%s %s %d %d %d %d '%s' '%s' '%s' '%s'\n",
            user_string($arg1),
diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
index cb302b79c2..d6750f3a88 100644
--- a/lib/runtime_tools/src/Makefile
+++ b/lib/runtime_tools/src/Makefile
@@ -36,12 +36,6 @@ RELSYSDIR = $(RELEASE_PATH)/lib/runtime_tools-$(VSN)
 
 MODULES= \
 	erts_alloc_config \
-	inviso_rt \
-	inviso_rt_meta \
-	inviso_rt_lib \
-	inviso_as_lib \
-	inviso_autostart \
-	inviso_autostart_server \
 	runtime_tools \
 	runtime_tools_sup \
 	dbg \
@@ -99,14 +93,14 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/runtime_tools/src/dbg.erl b/lib/runtime_tools/src/dbg.erl
index 385047ee73..d35c8e781e 100644
--- a/lib/runtime_tools/src/dbg.erl
+++ b/lib/runtime_tools/src/dbg.erl
@@ -431,10 +431,8 @@ trace_port1(file, Filename, Options) ->
     fun() ->
 	    Name = filename:absname(Filename), 
 	    %% Absname is needed since the driver uses 
-	    %% the supplied name without further investigations, 
-	    %% and if the name is relative the resulting path 
-	    %% might be too long which can cause a bus error
-	    %% on vxworks instead of a nice error code return.
+	    %% the supplied name without further investigations.
+
 	    %% Also, the absname must be found inside the fun,
 	    %% in case the actual node where the port shall be
 	    %% started is on another node (or even another host)
diff --git a/lib/runtime_tools/src/dyntrace.erl b/lib/runtime_tools/src/dyntrace.erl
index 388c7679b9..f7dbef6929 100644
--- a/lib/runtime_tools/src/dyntrace.erl
+++ b/lib/runtime_tools/src/dyntrace.erl
@@ -6,23 +6,22 @@
 %%% work on any operating system platform where user-space DTrace/Systemtap 
 %%% (and in the future LttNG UST) probes are supported.
 %%%
-%%% Use the `dyntrace:init()' function to load the NIF shared library and
-%%% to initialize library's private state.
-%%%
 %%% It is recommended that you use the `dyntrace:p()' function to add
 %%% Dynamic trace probes to your Erlang code.  This function can accept up to
 %%% four integer arguments and four string arguments; the integer
-%%% argument(s) must come before any string argument.  For example:
+%%% argument(s) must come before any string argument.
+%%%
+%%% If using DTrace, enable the dynamic trace probe using the 'dtrace'
+%%% command, for example:
+%%%
+%%%    dtrace -s /your/path/to/lib/runtime_tools-1.8.7/examples/user-probe.d
+%%%
+%%% Then, back at the Erlang shell, try this example:
 %%% ```
 %%% 1> dyntrace:put_tag("GGOOOAAALL!!!!!").
 %%% true
-%%% 2> dyntrace:init().
-%%% ok
-%%%
-%%% % % % If using dtrace, enable the Dynamic trace probe using the 'dtrace' 
-%%% % % % command.
 %%%
-%%% 3> dyntrace:p(7, 8, 9, "one", "four").
+%%% 2> dyntrace:p(7, 8, 9, "one", "four").
 %%% true
 %%% '''
 %%%
@@ -38,15 +37,16 @@
 
 -export([available/0,
          user_trace_s1/1, % TODO: unify with pid & tag args like user_trace_i4s4
-         p/0, p/1, p/2, p/3, p/4, p/5, p/6, p/7, p/8]).
+         p/0, p/1, p/2, p/3, p/4, p/5, p/6, p/7, p/8,
+         pn/1, pn/2, pn/3, pn/4, pn/5, pn/6, pn/7, pn/8, pn/9]).
 -export([put_tag/1, get_tag/0, get_tag_data/0, spread_tag/1, restore_tag/1]).
 
--export([scaff/0]). % Development only
 -export([user_trace_i4s4/9]). % Know what you're doing!
 -on_load(on_load/0).
 
 -type probe_arg() :: integer() | iolist().
 -type int_p_arg() :: integer() | iolist() | undef.
+-type n_probe_label() :: 0..1023.
 
 %% The *_maybe() types use atom() instead of a stricter 'undef'
 %% because user_trace_i4s4/9 is exposed to the outside world, and
@@ -105,7 +105,7 @@ available() ->
 user_trace_s1(_Message) ->
     erlang:nif_error(nif_not_loaded).
 
--spec user_trace_i4s4(iolist(),
+-spec user_trace_i4s4(binary() | undefined,
                       integer_maybe(), integer_maybe(),
                           integer_maybe(), integer_maybe(),
                       iolist_maybe(), iolist_maybe(),
@@ -115,6 +115,16 @@ user_trace_s1(_Message) ->
 user_trace_i4s4(_, _, _, _, _, _, _, _, _) ->
     erlang:nif_error(nif_not_loaded).
 
+-spec user_trace_n(n_probe_label(), binary() | undefined,
+                   integer_maybe(), integer_maybe(),
+                   integer_maybe(), integer_maybe(),
+                   iolist_maybe(), iolist_maybe(),
+                   iolist_maybe(), iolist_maybe()) ->
+      true | false | error | badarg.
+
+user_trace_n(_, _, _, _, _, _, _, _, _, _) ->
+    erlang:nif_error(nif_not_loaded).
+
 %%%
 %%% Erlang support functions
 %%%
@@ -218,6 +228,106 @@ user_trace_int(I1, I2, I3, I4, S1, S2, S3, S4) ->
             false
     end.
 
+-spec pn(n_probe_label()) -> true | false | error | badarg.
+
+pn(ProbeLabel) ->
+    user_trace_n_int(ProbeLabel, undef, undef, undef, undef, undef, undef, undef, undef).
+
+-spec pn(n_probe_label(), probe_arg()) -> true | false | error | badarg.
+
+pn(ProbeLabel, I1) when is_integer(I1) ->
+    user_trace_n_int(ProbeLabel, I1, undef, undef, undef, undef, undef, undef, undef);
+pn(ProbeLabel, S1) ->
+    user_trace_n_int(ProbeLabel, undef, undef, undef, undef, S1, undef, undef, undef).
+
+-spec pn(n_probe_label(), probe_arg(), probe_arg()) -> true | false | error | badarg.
+
+pn(ProbeLabel, I1, I2) when is_integer(I1), is_integer(I2) ->
+    user_trace_n_int(ProbeLabel, I1, I2, undef, undef, undef, undef, undef, undef);
+pn(ProbeLabel, I1, S1) when is_integer(I1) ->
+    user_trace_n_int(ProbeLabel, I1, undef, undef, undef, S1, undef, undef, undef);
+pn(ProbeLabel, S1, S2) ->
+    user_trace_n_int(ProbeLabel, undef, undef, undef, undef, S1, S2, undef, undef).
+
+-spec pn(n_probe_label(), probe_arg(), probe_arg(), probe_arg()) -> true | false | error | badarg.
+
+pn(ProbeLabel, I1, I2, I3) when is_integer(I1), is_integer(I2), is_integer(I3) ->
+    user_trace_n_int(ProbeLabel, I1, I2, I3, undef, undef, undef, undef, undef);
+pn(ProbeLabel, I1, I2, S1) when is_integer(I1), is_integer(I2) ->
+    user_trace_n_int(ProbeLabel, I1, I2, undef, undef, S1, undef, undef, undef);
+pn(ProbeLabel, I1, S1, S2) when is_integer(I1) ->
+    user_trace_n_int(ProbeLabel, I1, undef, undef, undef, S1, S2, undef, undef);
+pn(ProbeLabel, S1, S2, S3) ->
+    user_trace_n_int(ProbeLabel, undef, undef, undef, undef, S1, S2, S3, undef).
+
+-spec pn(n_probe_label(), probe_arg(), probe_arg(), probe_arg(), probe_arg()) ->
+      true | false | error | badarg.
+
+pn(ProbeLabel, I1, I2, I3, I4) when is_integer(I1), is_integer(I2), is_integer(I3), is_integer(I4) ->
+    user_trace_n_int(ProbeLabel, I1, I2, I3, I4, undef, undef, undef, undef);
+pn(ProbeLabel, I1, I2, I3, S1) when is_integer(I1), is_integer(I2), is_integer(I3) ->
+    user_trace_n_int(ProbeLabel, I1, I2, I3, undef, S1, undef, undef, undef);
+pn(ProbeLabel, I1, I2, S1, S2) when is_integer(I1), is_integer(I2) ->
+    user_trace_n_int(ProbeLabel, I1, I2, undef, undef, S1, S2, undef, undef);
+pn(ProbeLabel, I1, S1, S2, S3) when is_integer(I1) ->
+    user_trace_n_int(ProbeLabel, I1, undef, undef, undef, S1, S2, S3, undef);
+pn(ProbeLabel, S1, S2, S3, S4) ->
+    user_trace_n_int(ProbeLabel, undef, undef, undef, undef, S1, S2, S3, S4).
+
+-spec pn(n_probe_label(), probe_arg(), probe_arg(), probe_arg(), probe_arg(),
+        probe_arg()) ->
+      true | false | error | badarg.
+
+pn(ProbeLabel, I1, I2, I3, I4, S1) when is_integer(I1), is_integer(I2), is_integer(I3), is_integer(I4) ->
+    user_trace_n_int(ProbeLabel, I1, I2, I3, I4, S1, undef, undef, undef);
+pn(ProbeLabel, I1, I2, I3, S1, S2) when is_integer(I1), is_integer(I2), is_integer(I3) ->
+    user_trace_n_int(ProbeLabel, I1, I2, I3, undef, S1, S2, undef, undef);
+pn(ProbeLabel, I1, I2, S1, S2, S3) when is_integer(I1), is_integer(I2) ->
+    user_trace_n_int(ProbeLabel, I1, I2, undef, undef, S1, S2, S3, undef);
+pn(ProbeLabel, I1, S1, S2, S3, S4) when is_integer(I1) ->
+    user_trace_n_int(ProbeLabel, I1, undef, undef, undef, S1, S2, S3, S4).
+
+-spec pn(n_probe_label(), probe_arg(), probe_arg(), probe_arg(), probe_arg(),
+        probe_arg(), probe_arg()) ->
+      true | false | error | badarg.
+
+pn(ProbeLabel, I1, I2, I3, I4, S1, S2) when is_integer(I1), is_integer(I2), is_integer(I3), is_integer(I4) ->
+    user_trace_n_int(ProbeLabel, I1, I2, I3, I4, S1, S2, undef, undef);
+pn(ProbeLabel, I1, I2, I3, S1, S2, S3) when is_integer(I1), is_integer(I2), is_integer(I3) ->
+    user_trace_n_int(ProbeLabel, I1, I2, I3, undef, S1, S2, S3, undef);
+pn(ProbeLabel, I1, I2, S1, S2, S3, S4) when is_integer(I1), is_integer(I2) ->
+    user_trace_n_int(ProbeLabel, I1, I2, undef, undef, S1, S2, S3, S4).
+
+-spec pn(n_probe_label(), probe_arg(), probe_arg(), probe_arg(), probe_arg(),
+        probe_arg(), probe_arg(), probe_arg()) ->
+      true | false | error | badarg.
+
+pn(ProbeLabel, I1, I2, I3, I4, S1, S2, S3) when is_integer(I1), is_integer(I2), is_integer(I3), is_integer(I4) ->
+    user_trace_n_int(ProbeLabel, I1, I2, I3, I4, S1, S2, S3, undef);
+pn(ProbeLabel, I1, I2, I3, S1, S2, S3, S4) when is_integer(I1), is_integer(I2), is_integer(I3) ->
+    user_trace_n_int(ProbeLabel, I1, I2, I3, undef, S1, S2, S3, S4).
+
+-spec pn(n_probe_label(), probe_arg(), probe_arg(), probe_arg(), probe_arg(),
+        probe_arg(), probe_arg(), probe_arg(), probe_arg()) ->
+      true | false | error | badarg.
+
+pn(ProbeLabel, I1, I2, I3, I4, S1, S2, S3, S4) when is_integer(I1), is_integer(I2), is_integer(I3), is_integer(I4) ->
+    user_trace_n_int(ProbeLabel, I1, I2, I3, I4, S1, S2, S3, S4).
+
+-spec user_trace_n_int(n_probe_label(),
+                       int_p_arg(), int_p_arg(), int_p_arg(), int_p_arg(),
+                       int_p_arg(), int_p_arg(), int_p_arg(), int_p_arg()) ->
+      true | false | error | badarg.
+
+user_trace_n_int(ProbeLabel, I1, I2, I3, I4, S1, S2, S3, S4) ->
+    UTag = get_tag(),
+    try
+        user_trace_n(ProbeLabel, UTag, I1, I2, I3, I4, S1, S2, S3, S4)
+    catch
+        error:nif_not_loaded ->
+            false
+    end.
+
 -spec put_tag(undefined | iodata()) -> binary() | undefined.
 put_tag(Data) ->
     erlang:dt_put_tag(unicode:characters_to_binary(Data)).
@@ -240,40 +350,3 @@ spread_tag(B) ->
 -spec restore_tag(true | {non_neg_integer(), binary() | []}) -> true.
 restore_tag(T) ->
     erlang:dt_restore_tag(T).
-    
-
-%% Scaffolding to write tedious code: quick brute force and not 100% correct.
-
-scaff_int_args(N) ->
-    L = lists:sublist(["I1", "I2", "I3", "I4"], N),
-    [string:join(L, ", ")].
-
-scaff_int_guards(N) ->
-    L = lists:sublist(["is_integer(I1)", "is_integer(I2)", "is_integer(I3)",
-                       "is_integer(I4)"], N),
-    lists:flatten(string:join(L, ", ")).
-
-scaff_char_args(N) ->
-    L = lists:sublist(["S1", "S2", "S3", "S4"], N),
-    [string:join(L, ", ")].
-
-scaff_fill(N) ->
-    [string:join(lists:duplicate(N, "undef"), ", ")].
-
-scaff() ->
-    L = [begin
-             IntArgs = scaff_int_args(N_int),
-             IntGuards = scaff_int_guards(N_int),
-             IntFill = scaff_fill(4 - N_int),
-             CharArgs = scaff_char_args(N_char),
-             CharFill = scaff_fill(4 - N_char),
-             InArgs = string:join(IntArgs ++ CharArgs, ", "),
-             OutArgs = string:join(IntArgs ++ IntFill ++ CharArgs ++ CharFill,
-                                   ", "),
-             {N_int + N_char,
-              lists:flatten([io_lib:format("p(~s) when ~s ->\n",
-                                           [InArgs, IntGuards]),
-                             io_lib:format("    user_trace_int(~s);\n", [OutArgs])
-                            ])}
-         end || N_int <- [0,1,2,3,4], N_char <- [0,1,2,3,4]],
-    [io:format("%%~p\n~s", [N, Str]) || {N, Str} <- lists:sort(L)].
diff --git a/lib/runtime_tools/src/inviso_as_lib.erl b/lib/runtime_tools/src/inviso_as_lib.erl
deleted file mode 100644
index 75f3d9d004..0000000000
--- a/lib/runtime_tools/src/inviso_as_lib.erl
+++ /dev/null
@@ -1,155 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%% File    : inviso_as_lib.erl
-%%% Author  : Lennart �hman <[email protected]>
-%%% Description : 
-%% The purpose of the inviso autostart library is to provide useful functions
-%% for anyone wanting to customize the autostart mechanism in the inviso
-%% tracer. It is intended to work well with the example 'inviso_autostart_server'.
-%%%
-%%% Created : 15 Dec 2005 by Lennart �hman
-%% -----------------------------------------------------------------------------
-
--module(inviso_as_lib).
-
--export([setup_autostart/7,setup_autostart/8,setup_autostart/9,
-	 inhibit_autostart/1,
-	 set_repeat/2,set_repeat_2/2]).
-%% -----------------------------------------------------------------------------
-
-%% setup_autostart(Node,Repeat,Options,TracerData,CmdFiles,Bindings) = ok|{error,Reason}.
-%%    Repeat=integer(), where 0 means no (more) autostarts.
-%%    Options=List of options as taken by the runtime component at start-up.
-%%    TracerData= Tracerdata as given to inviso_rt:init_tracing.
-%%    CmdFiles=[FileName,...] list of string(), files that will be executed
-%%      by the subprocess started during autostart.
-%%    Bindings=[{VarName,Value},...] Variable bindings for CmdFiles.
-%%      VarName=atom(),
-%%
-%% This function creates the inviso_autostart.config file on Erlang node Node.
-%% This is useful when you wish to prepare for an autostarted trace.
-setup_autostart(Node,Repeat,Options,TracerData,CmdFiles,Bindings,Translations) ->
-    setup_autostart(Node,Repeat,Options,TracerData,CmdFiles,
-		    Bindings,Translations,inviso_std_ref,off).
-setup_autostart(Node,Repeat,Options,TracerData,CmdFiles,Bindings,Translations,RTtag) ->
-    setup_autostart(Node,Repeat,Options,TracerData,CmdFiles,
-		    Bindings,Translations,RTtag,off).
-setup_autostart(Node,Repeat,Options,TracerData,CmdFiles,Bindings,Translations,RTtag,Dbg) ->
-    case rpc:call(Node,inviso_autostart,which_config_file,[]) of
-	FileName when is_list(FileName) ->      % Write to this file then.
-	    {String,Args}=format_config_file(Repeat,TracerData,Options,CmdFiles,
-					     Bindings,Translations,RTtag,Dbg),
-	    Bytes=list_to_binary(io_lib:format(String,Args)),
-	    case rpc:call(Node,file,write_file,[FileName,Bytes]) of
-		ok ->
-		    ok;
-		{error,Reason} ->
-		    {error,{write_file,Reason}};
-		{badrpc,Reason} ->
-		    {error,{badrpc,{write_file,Reason}}}
-	    end;
-	{error,Reason} ->
-	    {error,{which_config_file,Reason}};
-	{badrpc,Reason} ->
-	    {error,{badrpc,{which_config_file,Reason}}}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% inhibit_autostart(Node) = ok|{error,Reason}
-%%
-%% Inhibits autostart by simply making the repeat parameter zero in the
-%% configuration file at node Node. All other parameters are left untouched.
-inhibit_autostart(Node) ->
-    set_repeat(Node,0).
-%% -----------------------------------------------------------------------------
-
-%% set_repeat(Node,N)=ok | {error,Reason}
-%%   N=integer(), the number of time autostart shall be allowed.
-set_repeat(Node,N) ->
-    case examine_config_file(Node) of
-	{ok,FileName,Terms} ->
-	    NewTerms=[{repeat,N}|lists:keydelete(repeat,1,Terms)],
-	    case rpc:call(Node,?MODULE,set_repeat_2,[FileName,NewTerms]) of
-		{badrpc,Reason} ->
-		    {error,{badrpc,{open,Reason}}};
-		Result ->
-		    Result
-	    end;
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-
-%% Must be a sepparate function to do rpc on. The entire function must be done
-%% in one rpc call. Otherwise the FD will die since it is linked to the opening
-%% process.
-set_repeat_2(FileName,NewTerms) ->
-    case file:open(FileName,[write]) of
-	{ok,FD} ->
-	    String=lists:flatten(lists:map(fun(_)->"~w.~n" end,NewTerms)),
-	    case catch io:format(FD,String,NewTerms) of
-		ok ->
-		    file:close(FD),
-		    ok;
-		{'EXIT',Reason} ->
-		    file:close(FD),
-		    {error,{format,Reason}}
-	    end;
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-%% -----------------------------------------------------------------------------
-
-examine_config_file(Node) ->
-    case rpc:call(Node,inviso_autostart,which_config_file,[]) of
-	FileName when is_list(FileName) ->     % Read this file, and then modify it.
-	    case rpc:call(Node,file,consult,[FileName]) of
-		{ok,Terms} ->
-		    {ok,FileName,Terms};
-		{error,Reason} ->
-		    {error,{consult,Reason}};
-		{badrpc,Reason} ->
-		    {error,{badrpc,{consult,Reason}}}
-	    end;
-	{error,Reason} ->
-	    {error,{which_config_file,Reason}};
-	{badrpc,Reason} ->
-	    {error,{badrpc,{which_config_file,Reason}}}
-    end.
-%% -----------------------------------------------------------------------------
-
-format_config_file(Repeat,TracerData,Options,CmdFiles,Bindings,Translations,RTtag,Dbg) ->
-    String="~w.~n~w.~n~w.~n~w.~n",
-    Args=[{repeat,Repeat},
-	  {mfa,{inviso_autostart_server,init,[[{tracerdata,TracerData},
-					       {cmdfiles,CmdFiles},
-					       {bindings,Bindings},
-					       {translations,Translations},
-					       {debug,Dbg}]]}},
-	  {options,Options},
-	  {tag,RTtag}],
-    {String,Args}.
-%% -----------------------------------------------------------------------------
-
-
-
-
-
-
-
diff --git a/lib/runtime_tools/src/inviso_autostart.erl b/lib/runtime_tools/src/inviso_autostart.erl
deleted file mode 100644
index 787292e244..0000000000
--- a/lib/runtime_tools/src/inviso_autostart.erl
+++ /dev/null
@@ -1,201 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% Author: Lennart �hman, [email protected]
--module(inviso_autostart).
-
--export([autostart/1,which_config_file/0]).
-
-%% This module implements the default autostart module for the inviso runtime
-%% component.
-%% It will:
-%% (1) Open the autostart configuration file (either the default or the one
-%%     pointed out by the runtime_tools application parameter inviso_autostart_config).
-%% (2) Check that the incarnation counter has not reached 0. If so, we do not
-%%     allow (yet) one autostart.
-%% (3) Rewrite the configuration file if there was an incarnation counter.
-%%     (With the counter decreased).
-%% (4) Inspect the content of the configuration file and pass paramters in the
-%%     return value (which is interpreted by the runtime component).
-%%
-%% CONTENT OF A CONFIGURATION FILE:
-%% A plain text file containing erlang tuple terms, each ended with a period(.).
-%% The following parameters are recognized:
-%% {repeat,N} N=interger(),
-%%   The number of remaining allowed autostart incarnations of inviso.
-%% {options,Options} Options=list()
-%%   The options which controls the runtime component, such as overload and
-%%   dependency.
-%% {mfa,{Mod,Func,Args}} Args=list()
-%%   Controls how a spy process initiating tracing, patterns and flags shall
-%%   be started.
-%% {tag,Tag}
-%%   The tag identifying the runtime component to control components.
-%% =============================================================================
-
-%% This function is run in the runtime component's context during autostart
-%% to determine whether to continue and if, then how.
-autostart(_AutoModArgs) ->
-    ConfigFile=
-	case application:get_env(inviso_autostart_conf) of
-	    {ok,FileName} when is_list(FileName) -> % Use this filename then.
-		FileName;
-	    {ok,{load,FileNames,{M,F}}} ->  % First load the module, then...
-		case try_load_module(FileNames) of
-		    ok ->
-			autostart_apply(M,F);
-
-		    false ->                % No such module available
-			"inviso_autostart.config"
-		end;
-	    {ok,{M,F}} ->                   % Use M:F(node())
-		autostart_apply(M,F);
-	    {ok,no_autostart} ->
-		false;
-	    _ ->                            % Use a default name, in CWD!
-		"inviso_autostart.config"
-	end,
-    if
-	is_list(ConfigFile) ->
-	    case file:consult(ConfigFile) of
-		{ok,Terms} ->               % There is a configuration.
-		    case handle_repeat(ConfigFile,Terms) of
-			ok ->               % Handled or not, we shall continue.
-			    {get_mfa(Terms),get_options(Terms),get_tag(Terms)};
-			stop ->             % We are out of allowed starts.
-			    true            % Then no autostart.
-		    end;
-		{error,_} ->                % There is no config file
-		    true                    % Then no autostart!
-	    end;
-	true ->                             % Skip it then.
-	    true
-    end.
-
-autostart_apply(M,F) ->
-    case catch M:F(node()) of
-	FileName when is_list(FileName) ->
-	    FileName;
-	no_autostart ->                     % No autostart after all.
-	    false;
-	_ ->
-	    "inviso_autostart.config"
-    end.
-
-%% This function is necessary since it is not always the case that all code-paths
-%% are set at the time of an autostart.
-try_load_module([AbsFileName|Rest]) when is_list(AbsFileName) ->
-    case catch code:load_abs(AbsFileName) of % May not be a proper filename.
-	{module,_Mod} ->
-	    try_load_module(Rest);
-	_ ->
-	    false
-    end;
-try_load_module([]) ->                      % Load all beam files successfully.
-    ok;
-try_load_module(AbsFileName) when is_list(AbsFileName) ->
-    try_load_module([AbsFileName]).
-%% -----------------------------------------------------------------------------
-
-%% Function returning the filename probably used as autostart config file.
-%% Note that this function must be executed at the node in question.
-which_config_file() ->
-    case application:get_env(runtime_tools,inviso_autostart_conf) of
-	{ok,FileName} when is_list(FileName) -> % Use this filename then.
-	    FileName;
-	{ok,{M,F}} ->                       % Use M:F(node())
-	    case catch M:F(node()) of
-		FileName when is_list(FileName) ->
-		    FileName;
-		_ ->
-		    {ok,CWD}=file:get_cwd(),
-		    filename:join(CWD,"inviso_autostart.config")
-	    end;
-	_ ->                                % Use a default name, in CWD!
-	    {ok,CWD}=file:get_cwd(),
-	    filename:join(CWD,"inviso_autostart.config")
-    end.
-%% -----------------------------------------------------------------------------
-
-
-%% Help function which finds out if there is a limit on the number of times
-%% we shall autostart. If there is a repeat parameter and it is greater than
-%% zero, the file must be rewritten with the parameter decreased with one.
-%% Returns 'ok' or 'stop'.
-handle_repeat(FileName,Terms) ->
-    case lists:keysearch(repeat,1,Terms) of
-	{value,{_,N}} when N>0 ->           % Controlls how many time more.
-	    handle_repeat_rewritefile(FileName,Terms,N-1),
-	    ok;                             % Indicate that we shall continue.
-	{value,_} ->                        % No we have reached the limit.
-	    stop;
-	false ->                            % There is no repeat parameter.
-	    ok                              % No restrictions then!
-    end.
-
-%% Help function which writes the configuration file again, but with the
-%% repeat parameter set to NewN.
-%% Returns nothing significant.
-handle_repeat_rewritefile(FileName,Term,NewN) ->
-    case file:open(FileName,[write]) of
-	{ok,FD} ->
-	    NewTerm=lists:keyreplace(repeat,1,Term,{repeat,NewN}),
-	    handle_repeat_rewritefile_2(FD,NewTerm),
-	    file:close(FD);
-	{error,_Reason} ->                  % Not much we can do then?!
-	    error
-    end.
-
-handle_repeat_rewritefile_2(FD,[Tuple|Rest]) ->
-    io:format(FD,"~w.~n",[Tuple]),
-    handle_repeat_rewritefile_2(FD,Rest);
-handle_repeat_rewritefile_2(_,[]) ->
-    true.
-%% -----------------------------------------------------------------------------
-
-%% Three help functions finding the parameters possible to give to the runtime
-%% component. Note that some of them have default values, should the parameter
-%% not exist.
-get_mfa(Terms) ->
-    case lists:keysearch(mfa,1,Terms) of
-	{value,{_,MFA}} ->
-	    MFA;
-	false ->
-	    false
-    end.
-
-get_options(Terms) ->
-    case lists:keysearch(options,1,Terms) of
-	{value,{_,Options}} ->
-	    Options;
-	false ->
-	    []
-    end.
-
-get_tag(Terms) ->
-    case lists:keysearch(tag,1,Terms) of
-	{value,{_,Tag}} ->
-	    Tag;
-	false ->
-	    default_tag
-    end.
-%% -----------------------------------------------------------------------------
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
diff --git a/lib/runtime_tools/src/inviso_autostart_server.erl b/lib/runtime_tools/src/inviso_autostart_server.erl
deleted file mode 100644
index 1e352822f4..0000000000
--- a/lib/runtime_tools/src/inviso_autostart_server.erl
+++ /dev/null
@@ -1,311 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% Author: Lennart �hman, [email protected]
-%%
--module(inviso_autostart_server).
--export([init/1]).
-
-%% -----------------------------------------------------------------------------
-%% Internal exports
-%% -----------------------------------------------------------------------------
--export([cmd_file_interpreter_init/4]).
-%% -----------------------------------------------------------------------------
-
-
-%% This module provides a (well working) example of how to program an
-%% autostart server responsible for initializing trace, setting patterns
-%% and flags.
-%%
-%% The general idea is that this code spawns interpreter processes in order to
-%% execute commands concurrently. Each of the interpreter processes opens one or
-%% several files (in sequence) containing erlang function calls which are evaluated
-%% in the interpreter process context.
-%% The argument provided to init shall be a list of options controlling
-%% how to initialize tracing, which file(s) to open and variable bindings.
-%%
-%% This autostart_server interpreters understands standard inviso trace case files.
-%%
-%% The runtime component provides an API very similar to the API provided
-%% by the control component. It is therefore easy to translate inviso calls to
-%% inviso_rt calls.
-%%
-%% This process may be killed by the inviso_rt process if stop_tracing is called.
-%% The reason is that there is no time limit to the interpreter processes. Hence
-%% they should be killed if tracing is not possible anylonger.
-%% =============================================================================
-
-
-%% -----------------------------------------------------------------------------
-
-%% The independent autostart process spawned by the runtime component to carry
-%% out initializations is spawened on this function (if using the example
-%% autostart which comes with inviso).
-%% ArgsFromConfig is as can be heard from the name comming from a paramater in
-%% the autostart configuration file. Here it is supposed to be:
-%%   ArgsFromConfig=[ServerParam,...]
-%%     ServerParam={tracerdata,TracerData}|{cmdfiles,Files}|{bindings,Bindings}|
-%%       {translations,Translations}|{debug,DbgLevel}
-%%       TracerData=tracerdata given to inviso_rt:init_tracing/1 function.
-%%       Files=[FileNameSpecs,...] where each FileNameSpecs will be executed in
-%%         a separate process. Making each FileNameSpec parallel.
-%%         FileNameSpecs=[FileNameSpec,...]
-%%           FileNameSpec=FileName | {FileName,Bindings}
-%%       Bindings=[{Var,Value},...] variable environment understood by
-%%         erl_eval:exprs/2.
-%%       Translations=[Translation,...]
-%%       A translation file is a text-file with following tuples
-%%         Translation={{Mod,Func,Arity,{Mod2,Func2,ParamMF}}}|
-%%                     {{Func,Arity,{Mod2,Func2,ParamMF}}}
-%%           ParamMF={M,F} | any()
-%%           Translates Mod:Func/Arity to Mod2:Func2 with the arguments to
-%%             Mod:Func translated using M:F/1. Note that ParamMF is not
-%%             necessarily an MF. If no translation shall be done, ParamMF
-%%             shall be anything else but an MF.
-%%           Also note that Mod is optional in a Translation. That means that
-%%           function calls without a module in the trace case file will
-%%           be translated according to that translation.
-init(ArgsFromConfig) ->
-    case get_tracerdata_opts(ArgsFromConfig) of
-	{ok,TracerData} ->                  % Otherwise we can not start a trace!
-	    case inviso_rt:init_tracing(TracerData) of
-		{ok,_Response} ->                   % Ok, tracing has been initiated.
-		    case get_cmdfiles_opts(ArgsFromConfig) of
-			{ok,CmdFiles} ->    % List of cmd-files.
-			    Bindings=get_initialbindings_opts(ArgsFromConfig),
-			    Translations=get_translations_opts(ArgsFromConfig),
-			    Dbg=get_dbg_opts(ArgsFromConfig),
-			    Procs=start_cmd_file_interpreters(CmdFiles,
-							      Bindings,
-							      Translations,
-							      Dbg),
-			    loop(Procs,Dbg); % Wait for procs to be done.
-			false ->            % Then we can terminate normally.
-			    true
-		    end;
-		{error,Reason} ->           % This is fault, lets terminate abnormally.
-		    exit({inviso,{error,Reason}})
-	    end;
-	false ->                            % Then there is not much use then.
-	    true                            % Just terminate normally.
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function which starts a process for each item found in the FileNames
-%% list. The idea is that each item will be processed concurrently. The items
-%% them selves may be a sequence of filenames.
-%% Returns a list of spawned interpret processes.
-start_cmd_file_interpreters([FileNames|Rest],Bindings,Translations,Dbg) ->
-    P=spawn_link(?MODULE,cmd_file_interpreter_init,[FileNames,Bindings,Translations,Dbg]),
-    MRef=erlang:monitor(process,P),         % Can't trap exits in this process.
-    [{P,MRef}|start_cmd_file_interpreters(Rest,Bindings,Translations,Dbg)];
-start_cmd_file_interpreters([],_,_,_) ->
-    [].
-%% -----------------------------------------------------------------------------
-
-
-%% The loop where this process simply waits for all of the interpreters to be
-%% done. Note that that may take som time. An interpreter may take as long time
-%% necessary to do its task.
-loop(Procs,Dbg) ->
-    receive
-	{'DOWN',MRef,process,Pid,_Reason} ->
-	    case lists:keysearch(MRef,1,Procs) of
-		{value,{Pid,_}} ->          % It was an interpreter that terminated.
-		    case lists:keydelete(MRef,1,Procs) of
-			[] ->               % No more interpreters.
-			    true;           % Then terminate.
-			NewProcs ->
-			    loop(NewProcs,Dbg)
-		    end;
-		false ->
-		    loop(Procs,Dbg)
-	    end;
-	_ ->
-	    loop(Procs,Dbg)
-    end.
-
-
-%% -----------------------------------------------------------------------------
-%% The interpret process.
-%%
-%% An interpreter process executes trace case files. Several interpreter processes
-%% may be running in parallel. It is not within the scoop of this implementation
-%% of an autostart server to solve conflicts. (You may implement your own autostart
-%% server!).
-%% An interpret process may run for as long as necessary. Hence the function called
-%% within the trace case file can contain wait functions, waiting for a certain
-%% system state to occure before continuing.
-%% Note that this process also mixes global and local bindings. GlobalBindings
-%% is a binding() structure, where LocalBindings is a list of {Var,Value}.
-%% Further it is possible to let FileName be a {inviso,Func,Args} tuple instead.
-%% -----------------------------------------------------------------------------
-
-%% Init function for an interpreter process instance.
-cmd_file_interpreter_init(FileNames,GlobalBindings,Translations,Dbg) ->
-    interpret_cmd_files(FileNames,GlobalBindings,Translations,Dbg).
-
-interpret_cmd_files([{FileName,LocalBindings}|Rest],GlobalBindings,Translations,Dbg) ->
-    Bindings=join_local_and_global_vars(LocalBindings,GlobalBindings),
-    interpret_cmd_files_1(FileName,Bindings,Translations,Dbg),
-    interpret_cmd_files(Rest,GlobalBindings,Translations,Dbg);
-interpret_cmd_files([],_,_,_) ->            % Done, return nothing significant!
-    true;
-interpret_cmd_files(FileName,GlobalBindings,Translations,Dbg) ->
-    interpret_cmd_files_1(FileName,GlobalBindings,Translations,Dbg).
-%    interpret_cmd_files(Rest,GlobalBindings,Translations,Dbg).
-
-%% This is "inline" inviso calls.
-interpret_cmd_files_1({inviso,F,Args},Bindings,Translations,Dbg) ->
-    {ok,Tokens1,_}=erl_scan:string("inviso:"++atom_to_list(F)++"("),
-    Tokens2=tokenize_args(Args),
-    {ok,Tokens3,_}=erl_scan:string(")."),
-    case erl_parse:parse_exprs(Tokens1++Tokens2++Tokens3) of
-	{ok,Exprs} ->
-	    interpret_cmd_files_3(Bindings,Exprs,Translations,Dbg);
-	{error,_Reason} ->
-	    error
-    end;
-interpret_cmd_files_1({Mod,Func,Args},_Bindings,_Translations,_Dbg) ->
-    catch apply(Mod,Func,Args);
-%% This is the case when it actually is a trace case file.
-interpret_cmd_files_1(FileName,Bindings,Translations,Dbg) ->
-    case file:open(FileName,[read]) of
-	{ok,FD} ->
-	    interpret_cmd_files_2(FD,Bindings,io:parse_erl_exprs(FD,""),Translations,Dbg),
-	    file:close(FD);
-	{error,Reason} ->                   % Something wrong with the file.
-	    inviso_rt_lib:debug(Dbg,interpret_cmd_files,[FileName,{error,Reason}])
-    end.
-
-%% Help function which handles Exprs returned from io:parse_erl_exprs and
-%% tries to eval them. It is the side-effects we are interested in, like
-%% setting flags and patterns. Note that we will get a failure should there
-%% be a variable conflict.
-%% Also note that there is logic to translate control component API calls to
-%% corresponding runtime component calls.
-%% Returns nothing significant.
-interpret_cmd_files_2(FD,Bindings,{ok,Exprs,_},Translations,Dbg) ->
-    {next,NewBindings}=interpret_cmd_files_3(Bindings,Exprs,Translations,Dbg),
-    interpret_cmd_files_2(FD,NewBindings,io:parse_erl_exprs(FD,""),Translations,Dbg);
-interpret_cmd_files_2(FD,Bindings,{error,ErrorInfo,Line},Translations,Dbg) ->
-    inviso_rt_lib:debug(Dbg,parse_erl_exprs,[ErrorInfo,Line]),
-    interpret_cmd_files_2(FD,Bindings,io:parse_erl_exprs(FD,""),Translations,Dbg);
-interpret_cmd_files_2(_,_,{eof,_},_,_) ->    % End of file.
-    true.
-
-interpret_cmd_files_3(Bindings,Exprs,Translations,Dbg) ->
-    case catch inviso_rt_lib:transform(Exprs,Translations) of
-	NewExprs when is_list(NewExprs) ->     % We may have translated the API.
-	    case catch erl_eval:exprs(NewExprs,Bindings) of
-		{'EXIT',Reason} ->
-		    inviso_rt_lib:debug(Dbg,exprs,[Exprs,Bindings,{'EXIT',Reason}]),
-		    {next,Bindings};
-		{value,_Val,NewBindings} -> % Only interested in the side effects!
-		    {next,NewBindings}
-	    end;
-	{'EXIT',Reason} ->
-	    inviso_rt_lib:debug(Dbg,translate2runtime_funcs,[Exprs,Reason]),
-	    {next,Bindings}
-    end.
-
-%% Help function adding variables to a bindings structure. If the variable already
-%% is assigned in the structure, it will be overridden. Returns a new
-%% bindings structure.
-join_local_and_global_vars([{Var,Val}|Rest],Bindings) when is_atom(Var) ->
-    join_local_and_global_vars(Rest,erl_eval:add_binding(Var,Val,Bindings));
-join_local_and_global_vars([_|Rest],Bindings) ->
-    join_local_and_global_vars(Rest,Bindings);
-join_local_and_global_vars([],Bindings) ->
-    Bindings.
-
-%% Help function returning a string of tokens, including "," separation
-%% between the arguments.
-tokenize_args(Args=[Arg|Rest]) when length(Args)>1 ->
-    AbsTerm=erl_parse:abstract(Arg),
-    Tokens=erl_parse:tokens(AbsTerm),
-    {ok,Token,_}=erl_scan:string(","),
-    Tokens++Token++tokenize_args(Rest);
-tokenize_args([Arg]) ->
-    AbsTerm=erl_parse:abstract(Arg),
-    erl_parse:tokens(AbsTerm);
-tokenize_args([]) ->
-    "".
-%% -----------------------------------------------------------------------------
-
-
-%% -----------------------------------------------------------------------------
-%% Help functions working on the options given as argument to init during spawn.
-%% -----------------------------------------------------------------------------
-
-get_tracerdata_opts(ArgsFromConfig) ->
-    case lists:keysearch(tracerdata,1,ArgsFromConfig) of
-	{value,{_,{mfa,{M,F,CompleteTDGargs}}}} -> % Dynamic tracerdata.
-	    case catch apply(M,F,CompleteTDGargs) of
-		{'EXIT',_Reason} ->
-		    false;
-		TracerData ->
-		    {ok,TracerData}
-	    end;
-	{value,{_,TracerData}} ->           % Interpret this as static tracerdata.
-	    {ok,TracerData};
-	false ->
-	    false
-    end.
-%% -----------------------------------------------------------------------------
-
-get_cmdfiles_opts(ArgsFromConfig) ->
-    case lists:keysearch(cmdfiles,1,ArgsFromConfig) of
-	{value,{_,CmdFiles}} ->
-	    {ok,CmdFiles};
-	false ->
-	    false
-    end.
-%% -----------------------------------------------------------------------------
-
-get_initialbindings_opts(ArgsFromConfig) ->
-    case lists:keysearch(bindings,1,ArgsFromConfig) of
-	{value,{_,Bindings}} ->
-	    Bindings;
-	false ->                            % Then we use empty bindings.
-	    erl_eval:new_bindings()
-    end.
-%% -----------------------------------------------------------------------------
-
-get_translations_opts(ArgsFromConfig) ->
-    case lists:keysearch(translations,1,ArgsFromConfig) of
-	{value,{_,Translations}} ->
-	    Translations;
-	false ->                            % This becomes nearly point less.
-	    []
-    end.
-%% -----------------------------------------------------------------------------
-
-get_dbg_opts(ArgsFromConfig) ->
-    case lists:keysearch(debug,1,ArgsFromConfig) of
-	{value,{_,DbgLevel}} ->
-	    DbgLevel;
-	false ->
-	    off
-    end.
-%% -----------------------------------------------------------------------------
-
-%% EOF
-
-
-
diff --git a/lib/runtime_tools/src/inviso_rt.erl b/lib/runtime_tools/src/inviso_rt.erl
deleted file mode 100644
index b162f5b045..0000000000
--- a/lib/runtime_tools/src/inviso_rt.erl
+++ /dev/null
@@ -1,2885 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% Description:
-%% The runtime component of the trace tool Inviso.
-%%
-%% Authors:
-%% Ann-Marie L�f, [email protected]
-%% Lennart �hman, [email protected]
-%% -----------------------------------------------------------------------------
-
--module(inviso_rt).
-
-
-%% -----------------------------------------------------------------------------
-%% interface for supervisor
-%% -----------------------------------------------------------------------------
--export([start_link_man/3,start_link_auto/1]).
-
-%% API for controll component.
--export([start/4,stop/1, 
-	 init_tracing/2,stop_tracing_parallel/1,
-	 try_to_adopt/3,confirm_connection/2,get_node_info/1,
-	 suspend/2,call_suspend/2,cancel_suspension/1,change_options/2,
-	 clear/2,clear_all_tp/1,
-	 flush/1,
-	 trace_patterns_parallel/3,
-	 trace_flags_parallel/3,trace_flags_parallel/2,trace_flags_parallel/1,
-	 meta_tracer_call_parallel/2,
-	 get_status/1,get_tracerdata/1,list_logs/1,list_logs/2,fetch_log/2,fetch_log/3,
-	 delete_log/1,delete_log/2,
-	 state/1]).
-%% -----------------------------------------------------------------------------
-
-%% API mostly for autostart scripts, instead of corresponding control component
-%% apis not available doing local function calls.
--export([init_tracing/1,tp/4,tp/5,tp/1,tpg/4,tpg/5,tpg/1,
-	 tpl/4,tpl/5,tpl/1,
-	 ctp/1,ctp/3,ctpg/1,ctpg/3,ctpl/1,ctpl/3,
-	 init_tpm/4,init_tpm/7,
-	 tpm/4,tpm/5,tpm/8,tpm_tracer/4,tpm_tracer/5,tpm_tracer/8,
-	 tpm_ms/5,tpm_ms_tracer/5,
-	 ctpm_ms/4,
-	 local_register/0,global_register/0,
-	 ctpm/3,remove_local_register/0,remove_global_register/0,
-	 tf/2,tf/1,ctf/2,ctf/1]).
-%% -----------------------------------------------------------------------------
-
-%% Internal exports.
--export([init/4,auto_init/2,fetch_init/4]).
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% Constants.
-%% -----------------------------------------------------------------------------
-
--define(DEFAULT_OVERLOAD_FUNC,default_overload_func).
--define(NO_LOADCHECK,no_loadcheck).
-
--define(RT_SUP,runtime_tools_sup).          % Refers to the registered name.
--define(CTRL,inviso_c).                     % Refers to the registered name.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% Record definition.
-%% -----------------------------------------------------------------------------
-
-%% #rt
-%% All record fields must be bound to listed values when leaving init or 
-%% auto_init.
-%% dependency: Timeout accepting being without control component.
-%% overload : Controlls which module to call, if any, when time for a check.
-%% timer_ref: Used when timing delayed shutdown due to lost control component.
--record(rt,{state = new,            % new | idle | tracing
-	    status = running,       % running | {suspended, Reason}
-	    next_loadcheck = now(), % now | "No Loadcheck"
-	    parent,                 % pid()
-	    tracerdata,             % undefined|{fun(),term()}|{file,Param}|{ip,Param}
-	    tracer_port,            % port() | undefined
-	    handler,                % {fun(), term()} | undefined
-	    auto_starter,           % pid() | undefined; proc starting interpreters.
-	    meta_tracer,            % undefined | pid()
-	    fetchers=[],            % [pid(),...] processes transfering logfiles.
-%	     spies = [],
-	    dependency={infinity,node()}, % {TOut,Node} | TOut; TOut=int()|infinity
-	    overload=no_loadcheck,  % ?NO_LOADCHECK|{LoadMF,Interval,InitMFA,RemoveMFA}
-	    overload_data=void,     % Datastructure given to LoadMF and RemoveMFA.
-	    timer_ref,              % undefined | reference()
-	    ctrl,                   % undefined | pid()
-	    ctrl_ref,               % undefined | reference()
-	    vsn,                    % list()
-	    tag                     % term()
-	   }).
-%% -----------------------------------------------------------------------------
-
-
-%% ==============================================================================
-%% Start API
-%% ==============================================================================
-
-%% Note that the runtime component may be started in many different ways.
-%% It can be autostarted by the runtime_tools_sup during initial start-up of the
-%% system. It is actually most likely that it will be started that way. However
-%% if there are no autostart trace-cases to run, the inviso_rt runtime component
-%% will terminate. It will then however remain as a child of the runtime_tools_sup
-%% supervisor. This means that if the runtime component is started again, manually,
-%% by the control component, some actions must be taken.
-%% For instance is it very likely that the child already exists. But since it
-%% must be started with different arguments when started manually, the child-spec
-%% must be changed.
-%%
-%% The runtime component is not a proper gen_server, to allow full control of
-%% what happens. It however mimcs gen_server behaviour to be managed by the
-%% runtime_tools_sup supervisor.
-
-
-%% start_link_auto(AutoModArgs)={ok,Pid}
-%%
-%% This function is entered into the child-spec when planning on doing autostart
-%% of the runtime component. The autostart is controlled by the so called
-%% inviso_autostart_mod. It is an application environment parameter of the
-%% runtime_tools application. If it exists, it shall point out a module name.
-%% If it does not exist, the default 'inviso_autostart' module will be tried.
-%% Note that these start_link functions do not implement proper otp-behaviour.
-%% For instance they return {ok,Pid} immediately making the init-phase of the
-%% runtime component process empty.
-%%
-%% The inviso_autostart_mod shall export one function:
-%%   autostart(AutoModArgs) -> {MFA,Options,Tag}, where
-%%     AutoModArgs=term(), comes from the application start parameters in the
-%%       runtime_tools application resource file.
-%%     MFA={Mod,Func,Args} | term().
-%%       If it is MFA it will cause a trace initiator process to start spawning
-%%       on spawn_link(Mod,Func,Args). The trace initiator may for instance
-%%       initiate the wanted tracing.
-start_link_auto(AutoModArgs) ->
-    {ok,spawn_link(?MODULE,auto_init,[AutoModArgs,self()])}.
-%% ------------------------------------------------------------------------------
-
-%% This function is entered into the child-specification of the runtime_tools_sup
-%% if the runtime component shall be started manually via the control component.
-start_link_man(Ctrl,Options,Tag) ->
-    {ok,spawn_link(?MODULE,init,[Ctrl,Options,Tag,self()])}.
-%% ------------------------------------------------------------------------------
-
-%% start(Node,Options,Tag,Condition)=tbd
-%%   Node=The node where the runtime component shall be started.
-%%   Options=[Opt]; List of options to the runtime component.
-%%     Opt={dependency,Val}|{dependency,{Val,Node}}
-%%       Val=int()|infinity
-%%       If the runtime component may run on its own or not. Val=0 means a runtime
-%%       component which will terminate immediately without its control component.
-%%       Note that if the runtime component is started manually, the Node part
-%%       is never used. The runtime is supposed to be dependent of the Ctrl mentioned
-%%       in the start_link_man parameters.
-%%     Opt={overload,OverLoad} | overload
-%%           The latter means no loadcheck. Necessary if changing the options.
-%%       Overload=Iterval (int() in milliseconds) |
-%%         {LoadMF,Interval}|{LoadMF,Interval,InitMFA,RemoveMFA}
-%%           LoadMF={Mod,Func}|function()
-%%           InitMFA,RemoveMFA={Mod,Func,ArgList} where
-%%             apply(InitM,InitF,InitArgs) -> {ok,DataStruct}|'void'.
-%%             apply(RemoveM,RemoveF,[DataStruct|Args]) -> don't care
-%%             LoadMF is called each time loadcheck is performed.
-%%               Mod:Func(DataStruct)->ok|{suspend,Reason}
-%%           If just Interval is used, it means using a default overload check.
-%%     Tag=term(), used to identify an incarnation of a runtime component so that
-%%       a control component reconnecting will know if it was its own incarnation
-%%       still alive, or some elses.
-%%     Condition='if_ref'|term(). Controls if we want to adopt the runtime component.
-%%       If 'if_ref' is stated it means that we only want to adopt a runtime component
-%%       with the suggested Tag.
-%%
-%% This is the API used by the control component when tries to start a runtime
-%% component. Note that it will try to adopt an already running, if possible.
-%% Adoptions are only possible if the runtime component at hand is running
-%% without control component.
-start(Node, Options, Tag, Condition) when Node == node() ->
-    ChildSpec = {?MODULE, {?MODULE, start_link_man, [self(), Options, Tag]}, 
-		 temporary, 5000, worker, [?MODULE]},
-    case catch supervisor:start_child(?RT_SUP, ChildSpec) of
-	{ok, Pid} when is_pid(Pid) ->
-	    {node_info, _Node, Pid, VSN, State, Status, _Tag} = 
-		get_node_info(Pid),
-	    {node_info, Node, Pid, VSN, State, Status, new};
-	{error, already_present} ->
-	    supervisor:delete_child(?RT_SUP, ?MODULE),
-	    start(Node, Options, Tag, Condition);
-	{error, {already_started, Pid}} ->
-	    try_to_adopt(Pid, Tag, Condition);
-	{error,Reason} ->
-	    {error,Reason};
-	{'EXIT',Reason} ->
-	    {error,Reason}
-    end;
-start(Node, Options, Tag, Condition) ->
-    case rt_version(Node) of
-	{error,Error} ->
-	    {error,Error};
-	_VSN ->
-	    ChildSpec = {?MODULE, {?MODULE, start_link_man, 
-				    [self(), Options, Tag]}, 
-			 temporary, 5000, worker, [?MODULE]},
-	    case catch rpc:call(Node, supervisor, start_child, 
-				[?RT_SUP, ChildSpec]) of
-		{ok, Pid} when is_pid(Pid) ->
-		    {node_info, _Node, Pid, 
-		     VSN, State, Status, _Tag} = get_node_info(Pid),
-		    {node_info, Node, Pid, VSN, State, Status, new};
-		{error, already_present} ->
-		    rpc:call(Node, supervisor, delete_child, 
-			     [?RT_SUP, ?MODULE]),
-		    start(Node, Options, Tag, Condition);
-		{error, {already_started, Pid}} ->
-		    try_to_adopt(Pid, Tag, Condition);
-		{error,Reason} ->           % Could not start child.
-		    {error,Reason};
-		{badrpc,nodedown} ->
-		    {error,nodedown};
-		{badrpc,Reason} ->
-		    {error,{badrpc,Reason}};
-		{'EXIT',Reason} ->
-		    {error,Reason}
-	    end
-    end.
-
-rt_version(Node) ->
-    case catch rpc:call(Node,application,loaded_applications,[]) of
-	List when is_list(List) ->
-	    case lists:keysearch(runtime_tools,1,List) of
-		{value,{_,_,VSN}} ->
-		    VSN;
-		false ->
-		    {error,not_loaded}
-	    end;
-	{badrpc,nodedown} ->
-	    {error,nodedown};
-	{'EXIT',Reason} -> 
-	    {error,Reason}
-    end.
-%% ------------------------------------------------------------------------------
-
-%% stop(Node)=ok|{error,Reason}
-%% Stops the runtim component on node Node. Note that this is mearly calling the
-%% supervisor API to shutdown the inviso_rt child belonging to the runtime_tools_sup.
-stop(Node) when Node==node() ->
-    supervisor:terminate_child(?RT_SUP,?MODULE),
-    supervisor:delete_child(?RT_SUP,?MODULE),
-    ok;
-stop(Node) ->
-    case catch rpc:call(Node,supervisor,terminate_child,[?RT_SUP,?MODULE]) of
-	ok ->
-	    stop_delete_child(Node);
-	{error,_} ->                        % No child running.
-	    stop_delete_child(Node);        % Make sure we remove it also.
-	{badrpc,Reason} ->
-	    {error,{badrpc,Reason}};
-	{'EXIT',Reason} ->
-	    {error,Reason}
-    end.
-
-stop_delete_child(Node) ->
-    case catch rpc:call(Node,supervisor,delete_child,[?RT_SUP,?MODULE]) of
-	ok ->
-	    ok;
-	{error,_} ->                        % No child running.
-	    ok;
-	{badrpc,Reason} ->
-	    {error,{badrpc,Reason}};
-	{'EXIT',Reason} ->
-	    {error,Reason}
-    end.
-%% ------------------------------------------------------------------------------
-
-
-%% ==============================================================================
-%% API for the control component.
-%% ==============================================================================
-
-%% init_tracing(TracerData) ->
-%%   TracerData = LogTD | [{trace,LogTD},{ti,TiTD}]
-%%   LogTD = {HandlerFun, Data} | collector |
-%%           {relayer, pid()} | {ip, IPPortParameters} |
-%%           {file, FilePortParameters}
-%%   TiTD = {file,FileName} | {file,FileName,{InitPublLD,RemovePublLD,CleanPublLD}}
-%%          | {relay,Node} | {relay,Node,{InitPublLD,RemovePublLD,CleanPublLD}}
-%%   HandlerFun=fun(TraceMsg,Data)->NewData
-%%   IPPortParameters = Portno | {Portno, Qsiz}
-%%   Qsiz = 
-%%   FilePortParameters = {Filename, wrap, Tail, {time, WrapTime}, WrapCnt} |
-%%                        {FileName, wrap, Tail, WrapSize, WrapCnt} |
-%%                        {FileName, wrap, Tail, WrapSize} |
-%%                        {FileName, wrap, Tail} | FileName
-%% Defines a tracer:
-%% {HandlerFun, Data} - will be used as handler inside the runtime component for
-%%   every incomming trace message.
-%% relayer - the runtime component will relay all comming trace messages to
-%%   the runtime component Pid.
-%% collector - the runtime component is used as tracer or collector of relayed 
-%%             trace messages using the default handler writing them to io.
-%% ip | file - will start a tracer port using PortParameters
-init_tracing(Pid,TracerData) ->
-    call(Pid,{init_tracing,TracerData}).
-%% ------------------------------------------------------------------------------
-
-%% stop_tracing(RTpids)=[{Node,NodeResult},...]
-%%   RTpids=[RTinfo,...]
-%%     RTinfo={RTpid,Node} | {{error,Reason},Node}
-%%   NodeResult={ok,State} | {error,Reason}
-%% Sends a request to stop tracing to all nodes in RTpids, in parallel. Stop
-%% tracing means that all trace flags are removed and the nodes go to idle
-%% state.
-stop_tracing_parallel(RTpids) ->
-    call_parallel(lists:map(fun({Pid,Node})->{Pid,Node,stop_tracing};
-			       (Error)->Error
-			    end,
-			    RTpids)).
-%% ------------------------------------------------------------------------------
-
-%% try_to_adopt(Pid,NewTag,Condition)=
-%%   {node_info,node(),self(),VSN,State,Status,{tag,PreviousTag}}|{error,Reason}
-%%   NewTag=term(), the identification tag we want the runtime component to use
-%%     from now on if adoption was successful.
-%%   Condition='if_ref', only adopt if current tag is NewTag.
-%%   PreviousTag= the tag the runtime component had before it accepted the
-%%     adoption.
-%% This function shall only be used by a control component wishing to adopt this
-%% runtime component.
-try_to_adopt(Pid, Tag, Condition) ->
-    call(Pid,{try_to_adopt,Tag,Condition}).
-%% ------------------------------------------------------------------------------
-
-%% confirm_connection(Pid,Tag)= {node_info,node(),self(),VSN,State,Status,Tag}|
-%%   {error,refused}.
-%% Must only be used by a control component having been contacted by the runtime
-%% component Pid. It confirms to the runtime component that the control component
-%% has accepted the connect request.
-confirm_connection(Pid,Tag) ->
-    call(Pid,{confirm_connection,Tag}).
-%% ------------------------------------------------------------------------------
-
-%% get_node_info(Pid)={node_info,Node,Pid,VSN,State,Status,Tag}.
-get_node_info(Pid) ->
-    call(Pid,get_node_info).
-%% ------------------------------------------------------------------------------
-
-%% suspend(NodeOrPid,Reason)=ok
-%% call_suspend(NodeOrPid,Reason)=ok
-%% Makes the runtime component and all of its helpers suspend. suspend/2 is
-%% assynchronous.
-suspend(NodeOrPid,Reason) ->
-    cast(NodeOrPid,{suspend,Reason}).
-
-call_suspend(NodeOrPid,Reason) ->
-    call(NodeOrPid,{suspend,Reason}).
-%% ------------------------------------------------------------------------------
-
-%% cancel_suspension(Pid)=ok
-%% Function moving the runtime component to status running. Regardless of its
-%% current status.
-cancel_suspension(Pid) ->
-    call(Pid,cancel_suspension).
-%% ------------------------------------------------------------------------------
-
-%% change_options(Pid,Options)=ok
-%%   Options=list(); see the start_link_XXX functions.
-%% Changes options according to Options list.
-%% Changing the control component we shall be depending on has no effect. The
-%% dependency value in self can however be changed, and takes effect immediately.
-change_options(Pid,Options) ->
-    call(Pid,{change_options,Options}).
-%% ------------------------------------------------------------------------------
-
-%% clear_all_tp(Pid)=ok
-%% Function removing all, both local and global trace-patterns from the node.
-clear_all_tp(Pid) ->
-    call(Pid,clear_all_tp).
-%% ------------------------------------------------------------------------------
-
-%% clear(Pid,Options)={ok,{new,Status}}
-%%   Options=[Opt,...]
-%%     Opt=keep_trace_patterns | keep_log_files
-%% Resets the runtime component to state 'new' by stopping all ongoing tracing,
-%% closing and removing all associated logfiles. The Options can be used to
-%% prevent the runtime component from being totally erased.
-clear(Pid,Options) ->
-    call(Pid,{clear,Options}).
-%% ------------------------------------------------------------------------------
-
-%% flush(Pid)=ok | {error,Reason}
-%% Sends the flush command to the trace-port, if we are using a trace-port and
-%% are tracing.
-flush(Pid) ->
-    call(Pid,flush).
-%% ------------------------------------------------------------------------------
-
-%% trace_patterns_parallel(RTpids,Args,Flags)=[{Node,Answer},...]
-%%   RTpids=[{RTpid,Node},...] or [{Error,Node},...]
-%%   Args=[Arg,...]
-%%     Arg={Mod,Func,Arity,MS}|{Mod,Func,Arity,MS,Opts}
-%%       Mod=atom()|reg_exp()|{Dir,reg_exp()}
-%%         Dir=reg_exp()
-%%   Answer=[Answer,...]
-%%     Answer=int()|{error,Reason}
-%% API function for the control component sending trace-patterns to a list of
-%% runtime components. Returns a [{Node,Answer},...] list in the same order.
-trace_patterns_parallel(RTpids,Args,Flags) ->     % Same args and flags for all.
-    call_parallel(lists:map(fun({Pid,Node})when is_pid(Pid)->{Pid,Node,{tp,Args,Flags}};
-			       (Error)-> Error
-			    end,
-			    RTpids)).
-%% ------------------------------------------------------------------------------
-
-%% trace_flags_parallel(RTpids,Args,How)=
-%% trace_flags_parallel(RTpidsArgs,How)=
-%% trace_flags_parallel(RTpidsArgsHow)=[{Node,Reply},...]
-%%   RTpids=[RTpidEntry,...]
-%%     RTpidEntry={RTpid,Node}|{Error,Node}
-%%     Error=term(), any term you wish to have as reply in Answer assoc. to Node.
-%%   Args=[{Process,Flags},...]
-%%     Process=pid()|registeredname()|'all'|'new'|'existing'
-%%     Flags=List of the allowed process trace flags.
-%%   RTpidsArgs=[RTpidArgEntry,...]
-%%     RTpidArgEntry={RTpid,Node,Args}|{Error,Node}
-%%   RTpidsArgsHow=[RTpidArgsHowEntry,...]
-%%     RTpidArgsHowEntry={RTpid,Node,Args,How}|{Error,Node}
-%%   How=true|false
-%%   Reply={ok,Answers}
-%%     Answers=[Answer,...], one for each Args and in the same order.
-%%       Answer=int()|{error,Reason}
-%% API function used by the control component to send flags to a list of runtime
-%% components. Returns a list of [{Node,Answer},... ] in the same order.
-trace_flags_parallel(RTpids,Args,How) ->     % Same args for every node!
-    call_parallel(lists:map(fun({Pid,Node})when is_pid(Pid)->{Pid,Node,{tf,Args,How}};
-			       (Error)-> Error
-			    end,
-			    RTpids)).
-
-trace_flags_parallel(RTpidArgs,How) ->       % Different args but same how.
-    call_parallel(lists:map(fun({Pid,Node,Args})when is_pid(Pid)->
-				    {Pid,Node,{tf,Args,How}};
-			       (Error)->
-				    Error
-			    end,
-			    RTpidArgs)).
-
-trace_flags_parallel(RTpidArgsHow) ->        % Both different args and hows.
-    call_parallel(lists:map(fun({Pid,Node,Args,How})when is_pid(Pid)->
-				    {Pid,Node,{tf,Args,How}};
-			       (Error)->
-				    Error
-			    end,
-			    RTpidArgsHow)).
-%% ------------------------------------------------------------------------------
-
-%% meta_pattern(RTpids,Args)=[{Node,Answer},...]
-%%   RTpids=[{RTpid,Node},...] or [{Error,Node},...]
-%%   Args={FunctionName,ArgList}
-%%     FunctionName=atom()
-%%     ArgList=list(), list of the arguments to FunctionName.
-%%   Answer=[Answer,...]
-%%     Answer=int()|{error,Reason}
-%% Makes a call to the meta-tracer through its runtime component. Returns a list
-%% a answers in the same order as RTpids. Note that if "someone" has discovered
-%% that there is an error with a particular node, the error answer can be placed
-%% in the RTpids list from the start.
-meta_tracer_call_parallel(RTpids,Args) ->    % Same args for all nodes.
-    call_parallel(lists:map(fun({Pid,Node})when is_pid(Pid)->
-				    {Pid,Node,{meta_tracer_call,Args}};
-			       (Error)->
-				    Error
-			    end,
-			    RTpids)).
-%% ------------------------------------------------------------------------------
-
-%% get_status(Pid)={ok,{State,Status}}
-%%   State=new|tracing|idle
-%%   Status=running|{suspended,Reason}
-get_status(Pid) ->
-    call(Pid,get_status).
-%% ------------------------------------------------------------------------------
-
-%% get_tracerdata(Pid)={ok,TracerData} | {ok,no_tracerdata} | {error,Reason}
-%%   TracerData=see init_tracing
-%% Fetches the current tracerdata from the runtime component.
-get_tracerdata(Pid) ->
-    call(Pid,get_tracerdata).
-%% ------------------------------------------------------------------------------
-
-%% list_log(Pid)={ok,no_log}|{ok,LogCollection}|{error,Reason}
-%% list_log(Pid,TracerData)=
-%%   LogCollection=[LogTypes,...]
-%%     LogTypes={trace_log,Dir,Files}|{ti_log,Dir,Files}
-%%     Dir=string()
-%%     Files=[FileNameWithoutDir,...]
-%% Lists all files associated with the current tracerdata. Or finds out which
-%% files there are stored in this node given a tracerdata.
-list_logs(Pid) ->
-    call(Pid,list_logs).
-list_logs(Pid,TD) ->
-    call(Pid,{list_logs,TD}).
-%% ------------------------------------------------------------------------------
-
-%% fetch_log(Pid,CollectPid)={ok,FetcherPid}|{complete,no_log}|{error,Reason}
-%% fetch_log(Pid,CollectPid,Spec)=
-%%   CollectPid=pid(), the process which will be given the transfered logs.
-%%   Spec=TracerData|LogCollection
-%% Transferes a number of files using ditributed Erlang to CollectPid. This
-%% function is supposed to be used internally by a control component. It returns
-%% when the transfer is initiated and does not mean it is done or successful.
-fetch_log(Pid,CollectPid) ->
-    call(Pid,{fetch_log,CollectPid}).
-fetch_log(Pid,CollectPid,Spec) ->
-    call(Pid,{fetch_log,CollectPid,Spec}).
-%% ------------------------------------------------------------------------------
-
-%% delete_log(Pid,TracerDataOrLogList)={ok,Results}|{error,Reason}
-%%   TracerDataOrLogList=[FileNameWithPath,...]|LogCollection|TracerData
-%%   Results=[LogType,...]
-%%   LogType={trace_log,FileSpecs}|{ti_log,FilesSpecs}
-%%     FilesSpecs=[FileSpec,...]
-%%       FileSpec={ok,FileName}|{error,{Posix,FileName}}
-%%       Filename=string(), the filename without dir-path.
-delete_log(Pid) ->
-    call(Pid,delete_logs).
-delete_log(Pid,TracerDataOrLogList) ->
-    call(Pid,{delete_logs,TracerDataOrLogList}).
-%% ------------------------------------------------------------------------------
-
-%% state(NodeOrPid)=LoopData
-%% Returns the loopdata of the runtime component. Only meant for debugging.
-state(NodeOrPid) ->
-    call(NodeOrPid,state).
-%% ------------------------------------------------------------------------------
-
-
-%% ==============================================================================
-%% API for local calls made from the same node. E.g autostart.
-%% ==============================================================================
-
-%% init_tracing(TracerData)=
-%% See init_tracing/2.
-init_tracing(TracerData) ->
-    call_regname(?MODULE,{init_tracing,TracerData}).
-%% ------------------------------------------------------------------------------
-
-
-%% Meaning that these function does most often not have to be called by a
-%% control component because there are more efficient ones above.
-
-%% tp(Module,Function,Arity,MatchSpec) ->
-%% tp(Module,Function,Arity,MatchSpec,Opts) ->
-%% tp(PatternList) -> 
-%%   Module = '_'|atom()|ModRegExp|{DirRegExp,ModRegExp}
-%%   Function == atom() | '_'
-%%   Arity = integer() | '_'
-%%   MatchSpec = true | false | [] | matchspec() see ERTS User's guide for a
-%%   description of match specifications.
-%%   Opts=list(); 'only_loaded'
-%%   PatternList = [Pattern],
-%%   Pattern = {Module,Function,Arity,MatchSpec,Opts},
-%% Set trace pattern (global).
-tp(Module,Function,Arity,MatchSpec) ->
-    tp(Module,Function,Arity,MatchSpec,[]).
-tp(Module,Function,Arity,MatchSpec,Opts) ->
-    call_regname(?MODULE,{tp,[{Module,Function,Arity,MatchSpec,Opts}],[global]}).
-tp(PatternList) -> 
-    call_regname(?MODULE,{tp,PatternList,[global]}).
-%% ------------------------------------------------------------------------------
-
-tpg(Mod,Func,Arity,MatchSpec) ->
-    tp(Mod,Func,Arity,MatchSpec).
-tpg(Mod,Func,Arity,MatchSpec,Opts) ->
-    tp(Mod,Func,Arity,MatchSpec,Opts).
-tpg(PatternList) ->
-    tp(PatternList).
-%% ------------------------------------------------------------------------------
-
-%% tpl(Module,Function,Arity,MatchSpec) ->
-%% tpl(Module,Function,Arity,MatchSpec,Opts) ->
-%% tpl(PatternList) ->
-%%   Module = Function == atom() | '_' | RegExpMod | {RegExpDir,RegExpMod}
-%%   Arity = integer() | '_'
-%%   MatchSpec = true | false | [] | matchspec() see ERTS User's guide for a
-%%   Opts=list(); 'only_loaded'
-%%   description of match specifications.
-%%   PatternList = [Pattern],
-%%   Pattern = {Module, Function, Arity, MatchSpec},
-%% Set trace pattern (local).
-tpl(Module,Function,Arity,MatchSpec) ->
-    call_regname(?MODULE,{tp,[{Module,Function,Arity,MatchSpec,[]}],[local]}).
-tpl(Module,Function,Arity,MatchSpec,Opts) ->
-    call_regname(?MODULE,{tp,[{Module,Function,Arity,MatchSpec,Opts}],[local]}).
-tpl(PatternList) ->
-    call_regname(?MODULE,{tp,PatternList,[local]}).
-%% ------------------------------------------------------------------------------
-
-%% ctp(Module,Function,Arity) ->
-%% ctp(PatternList)=
-%%   Module = atom()|'_'|RegExpMod|{RegExpDir,RegExpMod}
-%%   Function == atom() | '_'
-%%   Arity = integer() | '_'
-%%   PatternList=[{Mod,Func,Arity},...]
-%% Clear trace pattern (global).
-%% Note that it is possible to clear patterns using regexps. But we can for
-%% natural reasons only clear patterns for loaded modules. Further more there
-%% seems to be a fault in the emulator (<=R10B) crashing if we remove patterns
-%% for deleted modules. Therefore we use the only_loaded option.
-ctp(Module,Function,Arity) ->
-    call_regname(?MODULE,{tp,[{Module,Function,Arity,false,[only_loaded]}],[global]}). 
-ctp(PatternList) ->
-    call_regname(?MODULE,
-		 {tp,
-		  lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList),
-		  [global]}).
-%% ------------------------------------------------------------------------------
-
-ctpg(Mod,Func,Arity) ->
-    ctp(Mod,Func,Arity).
-ctpg(PatternList) ->
-    ctp(PatternList).
-%% ------------------------------------------------------------------------------
-
-%% ctpl(Module,Function,Arity) ->
-%%   Module = atom()|'_'|RegExpMod|{RegExpDir,RegExpMod}
-%%   Function == atom() | '_'
-%%   Arity = integer() | '_'
-%%   PatternList=[{Mod,Func,Arity},...]
-%% Clear trace pattern (local).
-ctpl(Module,Function,Arity) ->
-    call_regname(?MODULE,{tp,[{Module,Function,Arity,false,[only_loaded]}],[local]}). 
-ctpl(PatternList) ->
-    call_regname(?MODULE,
-		 {tp,
-		  lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList),
-		  [local]}).
-%% ------------------------------------------------------------------------------
-
-init_tpm(Mod,Func,Arity,CallFunc) ->
-    call_regname(?MODULE,{meta_tracer_call,{init_tpm,[Mod,Func,Arity,CallFunc]}}).
-
-init_tpm(Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->
-    call_regname(?MODULE,
-		 {meta_tracer_call,
-		  {init_tpm,
-		   [Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc]}}).
-%% ------------------------------------------------------------------------------
-
-tpm(Mod,Func,Arity,MS) ->
-    call_regname(?MODULE,{meta_tracer_call,{tpm,[Mod,Func,Arity,MS]}}).
-tpm(Mod,Func,Arity,MS,CallFunc) ->
-    call_regname(?MODULE,{meta_tracer_call,{tpm,[Mod,Func,Arity,MS,CallFunc]}}).
-tpm(Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->
-    call_regname(?MODULE,
-		 {meta_tracer_call,
-		  {tpm,
-		   [Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc]}}).
-%% ------------------------------------------------------------------------------
-
-tpm_tracer(Mod,Func,Arity,MS) ->
-    call_regname(?MODULE,{meta_tracer_call,{tpm_tracer,[Mod,Func,Arity,MS]}}).
-tpm_tracer(Mod,Func,Arity,MS,CallFunc) ->
-    call_regname(?MODULE,{meta_tracer_call,{tpm_tracer,[Mod,Func,Arity,MS,CallFunc]}}).
-tpm_tracer(Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->
-    call_regname(?MODULE,
-		 {meta_tracer_call,
-		  {tpm_tracer,
-		   [Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc]}}).
-%% ------------------------------------------------------------------------------
-
-tpm_ms(Mod,Func,Arity,MSname,MS) ->
-    call_regname(?MODULE,{meta_tracer_call,{tpm_ms,[Mod,Func,Arity,MSname,MS]}}).
-%% ------------------------------------------------------------------------------
-
-tpm_ms_tracer(Mod,Func,Arity,MSname,MS) ->
-    call_regname(?MODULE,{meta_tracer_call,{tpm_ms_tracer,[Mod,Func,Arity,MSname,MS]}}).
-%% ------------------------------------------------------------------------------
-
-ctpm_ms(Mod,Func,Arity,MSname) ->
-    call_regname(?MODULE,{meta_tracer_call,{ctpm_ms,[Mod,Func,Arity,MSname]}}).
-%% ------------------------------------------------------------------------------
-
-local_register() ->
-    call_regname(?MODULE,{meta_tracer_call,{local_register,[]}}).
-%% ------------------------------------------------------------------------------
-
-global_register() ->
-    call_regname(?MODULE,{meta_tracer_call,{global_register,[]}}).
-%% ------------------------------------------------------------------------------
-
-ctpm(Mod,Func,Arity) ->
-    call_regname(?MODULE,{meta_tracer_call,{ctpm,[Mod,Func,Arity]}}).
-%% ------------------------------------------------------------------------------
-
-remove_local_register() ->
-    call_regname(?MODULE,{meta_tracer_call,{remove_local_register,[]}}).
-%% ------------------------------------------------------------------------------
-
-remove_global_register() ->
-    call_regname(?MODULE,{meta_tracer_call,{remove_global_register,[]}}).
-%% ------------------------------------------------------------------------------
-
-%% tf(PidSpec, FlagList) ->
-%% tf(TraceConfList) ->
-%%   TraceConfList = [{PidSpec, FlagList}],
-%%   FlagList = [Flags],
-%%   PidSpec = all | new | existing | pid() | registeredname()
-%%   Flags = all | send | 'receive' | procs | call | silent | return_to |
-%%   running | garbage_collection | timestamp | cpu_timestamp | arity | 
-%%   set_on_spawn | set_on_first_spawn | set_on_link | set_on_first_link
-%% Set trace flags.
-tf(PidSpec, FlagList) ->
-    call_regname(?MODULE,{tf,[{PidSpec,FlagList}],true}).
-
-tf(TraceConfList) -> 
-    call_regname(?MODULE,{tf,TraceConfList,true}).
-%% ------------------------------------------------------------------------------
-
-%% ctf(PidSpec, FlagList) ->
-%% ctf(TraceConfList) ->
-%%   TraceConfList = [{PidSpec, FlagList}],
-%%   FlagList = [Flags],
-%%   PidSpec = all | new | existing | pid() | registeredname()
-%%   Flags = all | send | 'receive' | procs | call | silent | return_to |
-%%   running | garbage_collection | timestamp | cpu_timestamp | arity | 
-%%   set_on_spawn | set_on_first_spawn | set_on_link | set_on_first_link
-%% Clear trace flags.
-ctf(PidSpec, FlagList) ->
-    call_regname(?MODULE,{tf,[{PidSpec,FlagList}],false}).
-
-ctf(TraceConfList) -> 
-    call_regname(?MODULE,{tf_as,TraceConfList,false}).
-%% ------------------------------------------------------------------------------
-
-
-%% ------------------------------------------------------------------------------
-%% Client side functions.
-%% ------------------------------------------------------------------------------
-
-%% Call function managing the client to server communication. This function may
-%% be run by a client on a different node.
-%% Note that we must use two different functions for calling a named process and
-%% calling the runtime component at a specified node.
-call(Pid,Request) when is_pid(Pid) ->
-    call_2(Pid,Request);
-call(Node,Request) when Node==node() ->     % To our node!
-    call_2(?MODULE,Request);
-call(Node,Request) when is_atom(Node) ->
-    call_2({?MODULE,Node},Request);
-call(To,_Request) ->
-    {error,{badarg,To}}.
-
-call_regname(Name,Request) when is_atom(Name) -> % To a registered name.
-    call_2(Name,Request).
-
-call_2(To,Request) ->
-    MRef=erlang:monitor(process,To),        % Use a monitor to avoid waiting for ever.
-    Ref=make_ref(),
-    case catch To ! {Request,self(),Ref} of % Can be a remote pid.
-	{'EXIT',_} ->                       % If we use registered name.
-	    erlang:demonitor(MRef),         % Maybe not necessary!?
-	    receive
-		{'DOWN',MRef,_Type,_Obj,_Info} ->
-		    true
-	    after
-		0 ->
-		    true
-	    end,
-	    {error,not_started};
-	_ ->                                % At least no obvious error.
-	    receive
-		{Msg,Ref} ->
-		    erlang:demonitor(MRef),
-		    Msg;
-		{'DOWN',MRef,_Type,_Obj,Info} -> % The runtime component disapeared.
-		    {error,{no_response,Info}}
-	    end
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Multicall function taking a list of [{Pid,Node,Request},...] and sends
-%% a request to every Pid. This function then also allows you to send multiple
-%% requests to the same Pid since it will sit and wait for all replies.
-%% Note that RTspec may also be an [{{error,Reason},Node},...]. That tuple will
-%% then be used as reply in the reply list.
-%% Returns [{Node,Reply},...] for every element in RTspec, in the same order.
-call_parallel(RTspec) ->
-    Ref=make_ref(),
-    {Nr,Pending}=call_parallel_2(RTspec,Ref,0,[]),
-    Replies=call_parallel_3(Ref,Pending,Nr,[],[]),
-    call_parallel_build_reply(RTspec,1,Replies).
-
-call_parallel_2([{Pid,Node,Request}|Rest],Ref,Nr,Pending) when is_pid(Pid) ->
-    Pid ! {Request,self(),{Ref,Nr+1}},
-    MRef=erlang:monitor(process,Pid),        % So we won't wait for ever for it.
-    call_parallel_2(Rest,Ref,Nr+1,[{Nr+1,Node,MRef}|Pending]);
-call_parallel_2([{{error,_Reason},_Node}|Rest],Ref,Nr,Pending) ->
-    call_parallel_2(Rest,Ref,Nr,Pending); % Just skip it. This is no process.
-call_parallel_2([_Faulty|Rest],Ref,Nr,Pending) -> % Should not happend.
-    call_parallel_2(Rest,Ref,Nr,Pending); % But we choose to skip it instead of crash.
-call_parallel_2([],_,Nr,Pending) ->
-    {Nr,Pending}.
-
-%% Help function collecting reply-messages sent from the runtime components. We
-%% count down until we got a reply for every pending request. Or if we get a DOWN
-%% message indicating that the runtime component is no longer present. Note that
-%% we can by accident read away DOWN messages not belonging to this procedure.
-%% They are collected to be reissued after we are done.
-call_parallel_3(_Ref,_Pending,0,Replies,DownMsgs) ->  % All expected received.
-    lists:foreach(fun({MRef,Pid,Info}) -> self() ! {'DOWN',MRef,process,Pid,Info} end,
-		  DownMsgs),                 % Reissue the down messages!
-    Replies;
-call_parallel_3(Ref,Pending,NrOfPending,Replies,DownMsgs) ->
-    receive
-	{Reply,{Ref,Nr}} ->
-	    case lists:keysearch(Nr,1,Pending) of
-		{value,{_Nr,Node,MRef}} ->
-		    erlang:demonitor(MRef),
-		    call_parallel_3(Ref,Pending,NrOfPending-1,
-				    [{Nr,Node,Reply}|Replies],DownMsgs);
-		false ->                     % Really strange!
-		    call_parallel_3(Ref,Pending,NrOfPending,Replies,DownMsgs)
-	    end;
-	{'DOWN',MRef,process,Pid,Info} ->    % Probably process we monitor terminated.
-	    case lists:keysearch(MRef,3,Pending) of
-		{value,{Nr,Node,_}} ->       % Yes it was one of our processes.
-		    call_parallel_3(Ref,Pending,NrOfPending-1,
-				    [{Nr,Node,{error,no_reponse}}|Replies],DownMsgs);
-		false ->                     % We picked up a DOWN msg by misstake.
-		    call_parallel_3(Ref,Pending,NrOfPending,Replies,
-				    [{MRef,Pid,Info}|DownMsgs])
-	    end
-    end.
-
-%% Help function which build up the [{Node,Reply},...] list in the same order as RTspec.
-call_parallel_build_reply([],_,_) ->
-    [];
-call_parallel_build_reply([{Pid,Node,_Request}|Rest],Nr,Replies) when is_pid(Pid) ->
-    {value,{_Nr,_Node,Reply}}=lists:keysearch(Nr,1,Replies),
-    [{Node,Reply}|call_parallel_build_reply(Rest,Nr+1,Replies)];
-call_parallel_build_reply([{{error,Reason},Node}|Rest],Nr,Replies) ->
-    [{Node,{error,Reason}}|call_parallel_build_reply(Rest,Nr,Replies)];
-call_parallel_build_reply([_Faulty|Rest],Nr,Replies) ->
-    call_parallel_build_reply(Rest,Nr,Replies).
-%% ------------------------------------------------------------------------------
-
-cast(Pid,Request) when is_pid(Pid) ->
-    cast2(Pid,Request);
-cast(Node,Request) when Node==node() ->
-    catch cast2(?MODULE,Request),
-    ok;
-cast(Node,Request) when is_atom(Node) ->
-    catch cast2({?MODULE,Node},Request),
-    ok;
-cast(BadAddress,_Request) ->
-    {error,{badarg,BadAddress}}.
-
-cast2(To,Request) ->
-    To ! {Request,void,void}.                % Mimics the call protocol.
-%% ------------------------------------------------------------------------------
-
-
-%% ==============================================================================
-%% Implementation of the runtime component (server side).
-%% ==============================================================================
-
-%% Since the runtime component is not implemented using gen_sever we are "free"
-%% to use what ever functionnames we like.
-
-%% Initial function on which the runtime component is spawned on if started by
-%% a controlcomponent.
-init(Ctrl, Options, Tag, Parent) when is_list(Options) ->
-    %% started from controller
-    process_flag(trap_exit,true),
-    register(?MODULE,self()),                % Will crash if rt is already running
-    do_clear_trace_patterns(),               % Remove potential old patterns left.
-    LD1=read_option_list(Options,
-			 #rt{state=new,
-			     parent=Parent,
-			     ctrl=Ctrl,
-			     vsn=get_application_vsn(),
-			     tag=Tag}),
-    OverloadData=initialize_overload(LD1),
-    CtrlRef=erlang:monitor(process,Ctrl),    % Monitor our control component.
-    loop1(LD1#rt{ctrl_ref=CtrlRef,overload_data=OverloadData}).
-%% ----------------------------------------------------------------------------
-
-%% Initial function on which the runtime component is spawned on if started
-%% by the runtime_tools supervisor. It is here it is determined if we shall
-%% autostart.
-auto_init(AutoModArgs,Parent) -> 
-    %% autostart
-    process_flag(trap_exit, true),
-    register(?MODULE, self()),               % Will crash if a rt is already running
-    AutoMod=get_autostart_module(),          % Determine which module to use!
-    case catch AutoMod:autostart(AutoModArgs) of 
-	{MFA,Options,Tag} ->
-	    do_clear_trace_patterns(),       % Remove previously left patterns.
-	    LD1=read_option_list(Options,#rt{state=new,
-					     parent=Parent,
-					     vsn=get_application_vsn(),
-					     tag=Tag}),
-	    case auto_init_connect_control(LD1) of
-		{ok,LD2} ->                  % Either connected or running_alone.
-		    OverloadData=initialize_overload(LD2),
-		    case auto_init_check_mfa(MFA) of
-			{ok,{M,F,A}} ->      % We shall start somekind of tracing!
-			    P=spawn_link(M,F,A), % It lives its own life, only link!
-			    loop1(LD2#rt{auto_starter=P,overload_data=OverloadData});
-			false ->
-			    loop1(LD2#rt{overload_data=OverloadData})
-		    end;
-		stop ->                      % Not allowed to run alone!
-		    true                     % Simply terminate.
-	    end;
-	 _ ->                                % Non existent or faulty autostart mod!
-	    true                             % Terminate normally.
-    end.
-
-auto_init_connect_control(LD1) ->
-    case auto_init_connect_find_pid(LD1#rt.dependency) of
-	Pid when is_pid(Pid) ->                 % There is a control component.
-	    CtrlRef=erlang:monitor(process,Pid),
-	    Pid ! {connect,node(),self(),LD1#rt.vsn,LD1#rt.tag},
-	    {ok,LD1#rt{ctrl_ref=CtrlRef,ctrl=Pid}};
-	_ ->                                 % There is no control component.
-	    do_down_message(LD1)             % Will return 'stop' or a LoopData.
-    end.
-
-%% Help function which finds the pid of the control component.
-auto_init_connect_find_pid({_TimeOut,Node}) when Node==node() ->
-    whereis(?CTRL);
-auto_init_connect_find_pid({_TimeOut,Node}) when is_atom(Node) ->
-    rpc:call(Node,erlang,whereis,[?CTRL]);
-auto_init_connect_find_pid(_) ->             % Node is not a proper node.
-    undefined.                               % Act as could not find control comp.
-
-%% Help function checking that the parameter is reasonable to be used as
-%% spawn_link argument.
-auto_init_check_mfa({M,F,A}) when is_atom(M),is_atom(F),is_list(A) ->
-    {ok,{M,F,A}};
-auto_init_check_mfa(_) ->
-    false.
-
-%% Help function to init_auto which finds out which module to call for
-%% guidance on how to proceed. Returns an atom.
-get_autostart_module() ->
-    case application:get_env(inviso_autostart_mod) of
-	{ok,Mod} when is_atom(Mod) ->
-	    Mod;
-	_ ->
-	    inviso_autostart                 % The default autostart module.
-    end.
-%% ----------------------------------------------------------------------------
-
-
-%% This is the preloop function which performs loadcheck if necessary. Note
-%% that it calculates the timeout used in the after in the real loop. There is
-%% further no use doing overload checks if we are not tracing or already
-%% suspended. There is yet one more situation, we do not want to perform
-%% overload checks if the interval is set to infinity. This can be the case if
-%% we are using an external source pushing overload information instead.
-loop1(LD=#rt{overload=Overload}) ->
-    if
-	Overload/=?NO_LOADCHECK,element(2,Overload)/=infinity ->
-	    Now=now(),
-	    if
-		LD#rt.status==running,
-		LD#rt.state==tracing,
-		Now>LD#rt.next_loadcheck ->  % Do loadcheck only then!
-		    {NewLD,TimeOut}=do_check_overload(LD,{timeout,LD#rt.overload_data}),
-		    loop(NewLD,TimeOut);
-		LD#rt.status==running,LD#rt.state==tracing ->
-		    Timeout=calc_diff_to_now(Now,LD#rt.next_loadcheck),
-		    loop(LD,Timeout);
-		true ->                      % Do not spend CPU on this! :-)
-		    loop(LD,infinity)
-	    end;
-	true ->                              % Either no check or infinity.
-	    loop(LD,infinity)
-    end.
-
-loop(LoopData,Timeout) ->
-    receive
-	Msg when element(1,Msg)==trace_ts;
-		 element(1,Msg)==trace;
-		 element(1,Msg)==drop;
-		 element(1,Msg)==seq_trace ->
-	    case LoopData#rt.handler of
-		{HandlerFun,Data} ->
-		    NewData=HandlerFun(Msg,Data),
-		    loop1(LoopData#rt{handler={HandlerFun,NewData}});
-		_ ->
-		    loop1(LoopData)
-	    end;
-	{{tp,Args,Flags},From,Ref} ->
-	    if
-		LoopData#rt.status==running -> % Not when suspended.
-		    Reply=do_set_trace_patterns(Args,Flags),
-		    if
-			LoopData#rt.state==new -> % No longer new when tp set.
-			    reply_and_loop({ok,Reply},From,Ref,LoopData#rt{state=idle});
-			true ->
-			    reply_and_loop({ok,Reply},From,Ref,LoopData)
-		    end;
-		true ->                      % We are suspended!
-		    reply_and_loop({error,suspended},From,Ref,LoopData)
-	    end;
-	{{tf,Args,How},From,MRef} ->
-	    Reply=
-		case How of
-		    true ->
-			if
-			    LoopData#rt.status==running -> 
-				case {LoopData#rt.tracer_port,LoopData#rt.handler} of
-				    {Port,_} when is_port(Port) ->
-					do_set_trace_flags(Port,Args,How);
-				    {_,{Handler,_D}} when is_function(Handler) ->
-					do_set_trace_flags(self(),Args,How);
-				    _ -> 
-					{error,no_tracer}
-				end;
-			    true ->          % Can't turn *on* flags if suspended.
-				{error, suspended}
-			end;
-		    false ->                 % No tracer needed when turning off.
-			do_set_trace_flags(void,Args,How)
-		end,
-	    reply_and_loop(Reply,From,MRef,LoopData);
-	{{meta_tracer_call,Args},From,MRef} ->
-	    if
-		LoopData#rt.status==running ->
-		    case LoopData#rt.meta_tracer of
-			MPid when is_pid(MPid) ->
-			    Reply=do_meta_pattern(MPid,Args),
-			    reply_and_loop(Reply,From,MRef,LoopData);
-			_ ->
-			    reply_and_loop({error,no_metatracer},From,MRef,LoopData)
-		    end;
-		true ->
-		    reply_and_loop({error,suspended},From,MRef,LoopData)
-	    end;
-	{clear_all_tp,From,MRef} ->
-	    do_clear_trace_patterns(),	    
-	    reply_and_loop(ok,From,MRef,LoopData);
-	{{init_tracing,TracerData},From,MRef} ->
-	    {NewLoopData,Reply}= 
-		if
-		    LoopData#rt.status==running ->
-			if
-			    LoopData#rt.state==tracing ->
-				{LoopData,{error,already_initiated}};
-			    true ->          % Otherwise, try to init-tracing!
-				case translate_td(TracerData) of
-				    {ok,LogTD,MetaTD} ->
-					do_init_tracing(LoopData,TracerData,LogTD,MetaTD);
-				    Error ->
-					{LoopData,Error}
-				end
-			end;
-		    true ->                  % Can't init tracing if not running.
-			{LoopData,{error,suspended}}
-		end,
-	    reply_and_loop(Reply,From,MRef,NewLoopData);
-	{stop_tracing,From,MRef} ->
-	    case LoopData#rt.state of
-		tracing ->                   % Only case we need to do anything.
-		    reply_and_loop({ok,idle},From,MRef,do_stop_tracing(LoopData));
-		idle ->                      % Already idle!
-		    reply_and_loop({ok,idle},From,MRef,LoopData);
-		new ->                       % Have actually never traced!
-		    reply_and_loop({ok,new},From,MRef,LoopData)
-	    end;
-	{{suspend,Reason},From,MRef} ->
-	    if
-		LoopData#rt.status==running ->
-		    NewLD=do_suspend(LoopData,Reason),
-		    reply_and_loop(ok,From,MRef,NewLD);
-		true ->                      % No need suspend if not running!
-		    reply_and_loop(ok,From,MRef,LoopData)
-	    end;
-	{cancel_suspension,From,MRef} ->
-	    NewLoopData=LoopData#rt{status=running,next_loadcheck=now()},
-	    send_event(state_change,NewLoopData),
-	    reply_and_loop(ok,From,MRef,NewLoopData);
-	{{clear,Options},From,MRef} ->
-	    NewLoopData=do_clear(LoopData,Options),
-	    reply_and_loop({ok,{new,NewLoopData#rt.status}},From,MRef,NewLoopData);
-	{flush,From,MRef} ->
-	    case LoopData#rt.state of
-		tracing ->                  % Can only flush if we are tracing.
-		    if
-			is_port(LoopData#rt.tracer_port) ->
-			    trace_port_control(LoopData#rt.tracer_port,flush),
-			    reply_and_loop(ok,From,MRef,LoopData);
-			true ->             % Not necessary but lets pretend.
-			    reply_and_loop(ok,From,MRef,LoopData)
-		    end;
-		State ->
-		    reply_and_loop({error,{not_tracing,State}},From,MRef,LoopData)
-	    end;
-	{list_logs,From,MRef} ->
-	    TracerData=LoopData#rt.tracerdata, % Current tracerdata.
-	    if
-		TracerData/=undefined ->    % There is tracerdata!
-		    reply_and_loop(do_list_logs(TracerData),From,MRef,LoopData);
-		true ->                     % Have no current tracerdata!
-		    reply_and_loop({error,no_tracerdata},From,MRef,LoopData)
-	    end;
-	{{list_logs,TracerData},From,MRef} ->
-	    reply_and_loop(do_list_logs(TracerData),From,MRef,LoopData);
-	{{fetch_log,CollectPid},From,MRef} -> % Fetch according to current tracerdata.
-	    TracerData=LoopData#rt.tracerdata, % Current tracerdata.
-	    if
-		TracerData/=undefined ->    % There is tracerdata!
-		    {Reply,NewLD}=do_fetch_log(LoopData,CollectPid,TracerData),
-		    reply_and_loop(Reply,From,MRef,NewLD);
-		true ->                     % No tracerdata!
-		    reply_and_loop({error,no_tracerdata},From,MRef,LoopData)
-	    end;
-	{{fetch_log,CollectPid,Spec},From,MRef} -> % Either list of files or tracerdata.
-	    {Reply,NewLD}=do_fetch_log(LoopData,CollectPid,Spec),
-	    reply_and_loop(Reply,From,MRef,NewLD);
-	{delete_logs,From,MRef} ->
-	    if
-		LoopData#rt.state==tracing -> % Can't remove then!
-		    reply_and_loop({error,tracing},From,MRef,LoopData);
-		true ->
-		    TracerData=LoopData#rt.tracerdata,
-		    reply_and_loop(do_delete_logs(TracerData),From,MRef,LoopData)
-	    end;
-	{{delete_logs,TracerDataOrLogList},From,MRef} ->
-	    if
-		LoopData#rt.state==tracing -> % Can't remove then!
-		    reply_and_loop({error,tracing},From,MRef,LoopData);
-		true ->
-		    reply_and_loop(do_delete_logs(TracerDataOrLogList),From,MRef,LoopData)
-	    end;
-	{get_node_info,From,MRef} ->
-	    Reply=collect_node_info(LoopData),
-	    reply_and_loop(Reply,From,MRef,LoopData);
-	{{try_to_adopt,Tag,Condition},From,MRef} ->
-	    if
-		LoopData#rt.ctrl_ref==undefined -> % We have no control component.
-		    {Reply,NewLoopData}=do_try_to_adopt(Tag,Condition,LoopData,From),
-		    reply_and_loop(Reply,From,MRef,NewLoopData);
-		true ->                      % We already have a control component.
-		    reply_and_loop({error,refused},From,MRef,LoopData)
-	    end;
-	{{confirm_connection,_Tag},From,MRef} ->
-	    if
-		LoopData#rt.ctrl==From ->    % It must be from this process!
-		    Reply=collect_node_info(LoopData),
-		    reply_and_loop(Reply,From,MRef,LoopData);
-		true ->                      % Strange, some one is joking?
-		    reply_and_loop({error,refused},From,MRef,LoopData)
-	    end;
-	{{change_options,Options},From,MRef} ->
-	    case do_change_options(Options,LoopData) of
-		stop ->                      % Can't run alone with these options!
-		    terminate_overload(LoopData),
-		    From ! {ok,MRef};        % Don't care if From not a proper pid!
-		NewLoopData when is_record(NewLoopData,rt) ->
-		    reply_and_loop(ok,From,MRef,NewLoopData)
-	    end;
-	{get_status,From,MRef} ->
-	    Reply={ok,{LoopData#rt.state,LoopData#rt.status}},
-	    reply_and_loop(Reply,From,MRef,LoopData);
-	{get_tracerdata,From,MRef} ->
-	    case LoopData#rt.tracerdata of
-		undefined ->
-		    reply_and_loop({ok,no_tracerdata},From,MRef,LoopData);
-		TracerData ->
-		    reply_and_loop({ok,TracerData},From,MRef,LoopData)
-	    end;
-	{state,From,MRef} ->                 % For debugging purposes.
-	    reply_and_loop(LoopData,From,MRef,LoopData);
-
-	{'DOWN',CtrlRef,process,_,_} when CtrlRef==LoopData#rt.ctrl_ref ->
-	    case do_down_message(LoopData) of
-		stop ->                      % inviso_c gone and we must stop!
-		    terminate_overload(LoopData),
-		    exit(running_alone);
-		{ok,NewLoopData} ->
-		    loop1(NewLoopData)
-	    end;
-	{'EXIT',Pid,Reason} ->
-	    case act_on_exit(Pid,Reason,LoopData) of
-		exit ->
-		    terminate_overload(LoopData),
-		    exit(Reason);
-		NewLoopData when is_record(NewLoopData,rt) ->
-		    loop1(NewLoopData);
-		{NewLoopData,NewTimeOut} when is_record(NewLoopData,rt) ->
-		    loop(NewLoopData,NewTimeOut)
-	    end;
-	Other ->                            % Check if it concerns overload.
-	    if
-		LoopData#rt.overload/=?NO_LOADCHECK,
-		LoopData#rt.status==running,
-		LoopData#rt.state==tracing ->
-		    {NewLD,NewTimeOut}=
-			do_check_overload(LoopData,
-					  {msg,{Other,LoopData#rt.overload_data}}),
-		    loop(NewLD,NewTimeOut);
-		true ->
-		    NewTimeOut=calc_diff_to_now(now(),LoopData#rt.next_loadcheck),
-		    loop(LoopData,NewTimeOut)
-	    end
-    after
-	Timeout ->
-	    loop1(LoopData)
-    end.
-
-reply_and_loop(Reply,To,MRef,LoopData) when is_pid(To) -> 
-    To ! {Reply,MRef},
-    loop1(LoopData);
-reply_and_loop(_,_,_,LoopData) ->            % Used together with incoming casts.
-    loop1(LoopData).
-%% -----------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% File transfer process implementation.
-%% =============================================================================
-
-%% Files that are to to be transfered from the runtime component to the control
-%% component are done so by reading them as binaries and sending them with
-%% normal message passing (over distributed Erlang).
-%% Reading the files are done in a process separate to the runtime component,
-%% to both make the code more simple. But also to free up the runtime component.
-%%
-%% This help process must be capable of recognizing the fact that the runtime
-%% component has been suspended, and then of course also discontinue any file
-%% transfere.
-fetch_init(Parent,Files,CollectPid,ChunkSize) ->
-    process_flag(trap_exit,true),            % We must clean-up.
-    process_flag(priority,low),              % Lets be careful.
-    case fetch_open_file(Files,CollectPid) of
-	{ok,FileName,FD,RestFiles} ->
-	    MRef=erlang:monitor(process,CollectPid),
-	    fetch_loop(Parent,RestFiles,CollectPid,ChunkSize,FileName,FD,MRef);
-	done ->
-	    fetch_end(CollectPid);
-	error ->
-	    fetch_incomplete(CollectPid)
-    end.
-
-fetch_loop(Parent,Files,CollectPid,ChunkSize,FName,FD,MRef) ->
-    receive
-	{suspend,Parent} ->                  % The runtime component is suspended.
-	    file:close(FD),                  % We must clean-up.
-	    fetch_incomplete(CollectPid);
-	{'DOWN',MRef,process,_,_} ->         % The CollectPid terminated!
-	    file:close(FD);                  % Close file and terminate.
-	{'EXIT',Parent,_Reason} ->           % The runtime component terminated.
-	    file:close(FD),
-	    fetch_incomplete(CollectPid);
-	_ ->
-	    fetch_loop(Parent,Files,CollectPid,ChunkSize,FName,FD,MRef)
-    after
-	0 ->                                 % If non of the above, get to work!
-	    case file:read(FD,ChunkSize) of
-		{ok,Bin} ->
-		    fetch_send_chunk(CollectPid,Bin),
-		    case fetch_wait_for_chunk_ack(CollectPid,MRef) of
-			ok ->                % Collector ready to receive next chunk.
-			    fetch_loop(Parent,Files,CollectPid,ChunkSize,FName,FD,MRef);
-			cancel ->            % Send no more files!
-			    file:close(FD),  % Close file, send incomplete, terminate!
-			    fetch_incomplete(CollectPid);
-			'DOWN' ->            % Collector has terminate, stop!
-			    file:close(FD)   % Close file and terminate.
-		    end;
-		eof ->                       % Ok, go on with the next file.
-		    file:close(FD),
-		    fetch_send_eof(CollectPid),
-		    case fetch_open_file(Files,CollectPid) of
-			{ok,NewFName,NewFD,RestFiles} ->
-			    fetch_loop(Parent,RestFiles,CollectPid,
-				       ChunkSize,NewFName,NewFD,MRef);
-			done ->
-			    fetch_end(CollectPid);
-			error ->
-			    fetch_incomplete(CollectPid)
-		    end;
-		{error,Reason} ->            % Do not continue.
-		    file:close(FD),
-		    fetch_send_readerror(CollectPid,FName,Reason),
-		    fetch_incomplete(CollectPid)
-	    end
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function which opens the next file to be transferred. It also communicates
-%% the opening of the file to the collector process.
-%% We know here that it will be a list of three-tuples. But there is no guarantee
-%% that Dir or FileName are proper strings.
-%% Returns {ok,FileName,FileDescriptor,RemainingFiles} or 'done'.
-fetch_open_file([{FType,Dir,FileName}|RestFiles],CollectPid) ->
-    case catch file:open(filename:join(Dir,FileName),[read,raw,binary]) of
-	{ok,FD} ->
-	    CollectPid ! {node(),open,{FType,FileName}},
-	    {ok,FileName,FD,RestFiles};
-	{error,_Reason} ->
-	    CollectPid ! {node(),open_failure,{FType,FileName}},
-	    error;
-	{'EXIT',_Reason} ->                   % Faulty Dir or FileName.
-	    CollectPid ! {node(),open_failure,{FType,FileName}},
-	    error
-    end;    
-fetch_open_file([],_CollectPid) ->
-    done.
-%% -----------------------------------------------------------------------------
-
-%% A group of help functions sending information to the collector process.
-%% Returns nothing significant.
-fetch_send_chunk(CollectPid,Bin) ->
-    CollectPid ! {node(),payload,Bin,self()}.
-%% -----------------------------------------------------------------------------
-
-fetch_send_eof(CollectPid) ->
-    CollectPid ! {node(),end_of_file}.
-%% -----------------------------------------------------------------------------
-
-fetch_end(CollectPid) ->
-    CollectPid ! {node(),end_of_transmission}.
-%% -----------------------------------------------------------------------------
-
-fetch_send_readerror(CollectPid,FName,Reason) ->
-    CollectPid ! {node(),{error,{file_read,{Reason,FName}}}}.
-%% -----------------------------------------------------------------------------
-
-fetch_incomplete(CollectPid) ->
-    CollectPid ! {node(),incomplete}.
-%% -----------------------------------------------------------------------------
-
-%% Help function waiting for the collector to respond that it is ready to receive
-%% the next chunk. This is in order to exercise flow control protecting the
-%% collector to get swamped if the node where the collector runs is busy.
-fetch_wait_for_chunk_ack(CollectPid,MRef) ->
-    receive
-	{CollectPid,chunk_ack} ->
-	    ok;
-	{CollectPid,cancel_transmission} ->  % Some problem at collector side.
-	    cancel;
-	{'DOWN',MRef,process,_,_} ->         % The collector terminated.
-	    'DOWN'
-    end.
-%% -----------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% First level do-functions, called from the main server loop on incomming
-%% requests.
-%% =============================================================================
-
-%% Function performing the overload check. Returns {NewLoopData,TimeOut}.
-%% Note that this function may also cause a suspend to be carried out if the
-%% loadcheck turns out negative.
-do_check_overload(LD,Data) ->
-    case do_check_overload_2(LD#rt.overload,Data) of
-	ignore ->                            % Load check not performed.
-	    {LD,calc_diff_to_now(now(),LD#rt.next_loadcheck)};
-	{ok,Interval} ->                     % No problem, continue.
-	    NextLoadCheck=add_to_now(now(),Interval),
-	    {LD#rt{next_loadcheck=NextLoadCheck},Interval};
-	{suspend,Reason} ->                  % Emergency! suspend, suspend!
-	    NewLD=do_suspend(LD,Reason),
-	    {NewLD,infinity};                % No need to do load-checks now!
-	{new,NewData,Interval} ->            % The overload was restarted or something.
-	    NextLoadCheck=add_to_now(now(),Interval),
-	    {LD#rt{overload_data=NewData,next_loadcheck=NextLoadCheck},Interval};
-	error ->                             % Inhibit overload check then.
-	    {LD#rt{overload=?NO_LOADCHECK},infinity}
-    end.
-
-%% Help function performing an overload check. Returns {ok,Interval},
-%% {suspend,Reason}, 'error' ir 'ignore'.
-do_check_overload_2({{Mod,Func},Interval,_,_},Data) ->
-    do_check_overload_3(Interval,catch Mod:Func(Data));
-do_check_overload_2({Fun,Interval,_,_},Data) when is_function(Fun) ->
-    do_check_overload_3(Interval,catch Fun(Data));
-do_check_overload_2(_,_) ->                  % Bad loadcheck configuration.
-    error.                                   % Stop using load checks then.
-
-do_check_overload_3(Interval,ok) ->
-    {ok,Interval};
-do_check_overload_3(Interval,{new,NewData}) ->
-    {new,NewData,Interval};
-do_check_overload_3(_Interval,{suspend,Reason}) ->
-    {suspend,Reason};
-do_check_overload_3(_Interval,ignore) ->     % Loadcheck not triggered.
-    ignore;
-do_check_overload_3(_Interval,_) ->          % Failure or other return value.
-    error.                                   % Stop doing loadchecks from now on.
-%% ------------------------------------------------------------------------------
-
-%% Function setting the trace-pattern according to Args and Flags. Note that
-%% Args can contain regexps which must be expanded here.
-%% Returns a list: [Result], where Result can be: int()|{error,Reason}.
-%% Sometimes an error tuple will represent an entire pattern, sometimes the
-%% pattern will expand to a number of error-tuples.
-do_set_trace_patterns(Args,Flags) ->
-    Replies=do_set_trace_patterns_2(Args,Flags,[]),
-    lists:reverse(Replies).
-
-do_set_trace_patterns_2([{M,F,Arity,MS}|Rest],Flags,Replies) -> % Option-less.
-    do_set_trace_patterns_2([{M,F,Arity,MS,[]}|Rest],Flags,Replies);
-do_set_trace_patterns_2(Mlist = [{M,F,Arity,MS,Opts}|Rest],Flags,Replies) when is_atom(M) ->
-    case length(Mlist) rem 10 of
-	0 ->
-	    timer:sleep(100);
-	_ ->
-	    ok
-    end,
-    %% sleep 100 ms for every 10:th element in the list to let other 
-    %% processes run since this is a potentially
-    %% heavy operation that might result in an unresponsive Erlang VM for
-    %% several seconds otherwise
-    case load_module_on_option(M,Opts) of
-	true ->                             % Already present, loaded or no option!
-	    case catch erlang:trace_pattern({M,F,Arity},MS,Flags) of
-		No when is_integer(No) ->
-		    do_set_trace_patterns_2(Rest,Flags,[No|Replies]);
-		{'EXIT',Reason} ->
-		    do_set_trace_patterns_2(Rest,
-					    Flags,
-					    [{error,{bad_trace_args,[{M,F,Arity,MS},Reason]}}|
-					     Replies])
-	    end;
-	false ->                            % Module not present, or not found!
-	    do_set_trace_patterns_2(Rest,Flags,[0|Replies])
-    end;
-do_set_trace_patterns_2([{M,F,Arity,MS,Opts}|Rest],Flags,Replies) when is_list(M) ->
-    do_set_trace_patterns_2([{{void,M},F,Arity,MS,Opts}|Rest],Flags,Replies);
-do_set_trace_patterns_2([{{Dir,M},F,Arity,MS,Opts}|Rest],Flags,Replies)
-  when is_list(Dir),is_list(M) ->
-    case check_pattern_parameters('_',F,Arity,MS) of % We don't want to repeat bad params.
-	true ->
-	    case inviso_rt_lib:expand_regexp(Dir,M,Opts) of % Get a list of real modulnames.
-		Mods when is_list(Mods) ->
-		    MoreReplies=
-			do_set_trace_patterns_2(lists:map(fun(Mod)->
-								  {Mod,F,Arity,MS,Opts}
-							  end,
-							  Mods),
-						Flags,
-						Replies),
-		    do_set_trace_patterns_2(Rest,Flags,MoreReplies);
-		{error,Reason} ->
-		    do_set_trace_patterns_2(Rest,Flags,[{error,Reason}|Replies])
-	    end;
-	false ->                            % Bad pattern parameters.
-	    do_set_trace_patterns_2(Rest,
-				    Flags,
-				    [{error,{bad_trace_args,{M,F,Arity,MS}}}|Replies])
-    end;
-do_set_trace_patterns_2([Arg|Rest],Flags,Replies) ->
-    do_set_trace_patterns_2(Rest,Flags,[{error,{bad_trace_args,Arg}}|Replies]);
-do_set_trace_patterns_2([],_Flags,Replies) ->
-    Replies.
-%% -----------------------------------------------------------------------------
-
-%% Help function which sets the trace flags for all processes specifed in Args.
-%% Args shall be a list of {ProcessSpecification,ProcessTraceFlags}.
-%% Returns {ok,Answers} where Answers is a list of integer and error descriptions.
-%% Note that a process specification may be a particular pid or a {global,Name}.
-%% In the case the process does not exist we will fake a zero instead of an
-%% error.
-do_set_trace_flags(Tracer,Args,How) ->
-    Fun=fun({Proc,Flags}) ->
-		case check_traceflag_pidspec(Proc) of
-		    {ok,Proc2} ->            % Reg-names converted.
-			case check_flags(Flags) of
-			    Flags2 when is_list(Flags2) -> % No error!
-				case (catch
-					 case How of
-					     true ->
-						 erlang:trace(Proc2,
-							      true,
-							      [{tracer,Tracer}|Flags2]);
-					     false -> % No tracer of turning off.
-						 erlang:trace(Proc2,
-							      false,
-							      Flags2)
-					 end) of
-				    N when is_integer(N) ->
-					N;
-				    {'EXIT',Reason} ->
-					if
-					    is_pid(Proc2) ->
-						0;    % Proc2 not alive or not at this node!
-					    true ->   % Otherwise, just error!
-						{error,
-						 {bad_trace_args,
-						  [Reason,Proc2,How,Flags2,Tracer]}}
-					end
-				end;
-			    FlagError ->
-				FlagError
-			end;
-		    false ->                 % Skip it.
-			0;                   % Indicate that zero processes matched.
-		    {error,Reason} ->        % Bad process specification.
-			{error,{bad_process,[Reason,Proc]}}
-		end;
-	   (Faulty) ->
-		{error,{bad_process,Faulty}}
-	end,
-    {ok,lists:map(Fun,Args)}.
-%% ------------------------------------------------------------------------------
-
-%% Function calling API:s in the trace information server. Note that we have
-%% given the responsibility to form a correct functionsname and argument list
-%% to the caller.
-%% Returns whatever the called function returns.
-do_meta_pattern(MPid,{FuncName,ArgList}) ->
-    case catch apply(inviso_rt_meta,FuncName,[MPid|ArgList]) of
-	{'EXIT',_Reason} ->
-	    {error,{badarg,{FuncName,ArgList}}};
-	Result ->
-	    Result
-    end;
-do_meta_pattern(_MPid,BadArgs) ->
-    {error,{bad_args,BadArgs}}.
-%% ------------------------------------------------------------------------------
-
-%% Function removing *all* patterns. Beaware that the one for local patterns
-%% causes a walkthrough of all loaded modules.
-do_clear_trace_patterns() ->
-    erlang:trace_pattern({'_','_','_'},false,[local]), %% inc. meta, call_count
-    erlang:trace_pattern({'_','_','_'},false,[global]).
-%% ------------------------------------------------------------------------------
-
-%% Function that takes TracerData and initializes the tracing. That can be
-%% opening appropriate logfiles, starting meta-tracer. There must be one
-%% clause here for every "type" of logging we want to be able to do.
-%% Returns the Reply to be forwarded to the caller.
-do_init_tracing(LoopData,TD,{HandlerFun,Data},TiTD) when is_function(HandlerFun) ->
-    {NewLoopData,Reply}=
-	case do_init_metatracing(TiTD,self()) of
-	    {ok,MetaPid} ->
-		{LoopData#rt{handler={HandlerFun,Data},
-			     tracerdata=TD,
-			     meta_tracer=MetaPid,
-			     state=tracing},
-		 {ok,[{trace_log,ok},{ti_log,ok}]}};
-	    false ->                         % No meta tracing requested.
-		{LoopData#rt{handler={HandlerFun,Data},
-			     tracerdata=TD,
-			     state=tracing},
-		 {ok,[{trace_log,ok}]}};
-	    {error,Reason} ->                % Problems starting meta tracing.
-		{LoopData#rt{handler={HandlerFun,Data},
-			     tracerdata=TD,
-			     state=tracing},
-		 {ok,[{trace_log,ok},{ti_log,{error,Reason}}]}}
-	end,
-    send_event(state_change,NewLoopData),    % Send to subscribing processes.
-    {NewLoopData,Reply};
-do_init_tracing(LoopData,TD,{Type,Parameters},TiTD) when Type==ip;Type==file ->
-    case check_traceport_parameters(Type,Parameters) of
-	ok ->
-	    case catch trace_port(Type,Parameters) of
-		Fun when is_function(Fun) ->
-		    case catch Fun() of
-			Port when is_port(Port) -> % Ok, our trace-port is open.
-			    {NewLoopData,Reply}=
-				case do_init_metatracing(TiTD,Port) of
-				    {ok,MetaPid} ->
-					{LoopData#rt{tracer_port=Port,
-						     tracerdata=TD,
-						     meta_tracer=MetaPid,
-						     state=tracing},
-					 {ok,[{trace_log,ok},{ti_log,ok}]}};
-				    false -> % No meta tracing requested.
-					{LoopData#rt{tracer_port=Port,
-						     tracerdata=TD,
-						     state=tracing},
-					 {ok,[{trace_log,ok}]}};
-				    {error,Reason} -> % Problems starting meta tracing.
-					{LoopData#rt{tracer_port=Port,
-						     tracerdata=TD,
-						     state=tracing},
-					 {ok,[{trace_log,ok},{ti_log,{error,Reason}}]}}
-				end,
-			    send_event(state_change,NewLoopData),
-			    {NewLoopData,Reply};
-			{'EXIT',Reason} ->
-			    {LoopData,{error,{bad_port_fun,[Parameters,Reason]}}}
-		    end;
-		{'EXIT',Reason} ->
-		    {LoopData,{error,{bad_port_args,[Parameters,Reason]}}}
-	    end;
-	{error,Reason} ->                    % Bad traceport parameters.
-	    {LoopData,{error,Reason}}
-    end.
-
-%% Help function that starts the meta-tracing. Note that the runtime component
-%% will becom linked to it.
-%% Currently the meta tracer handles two types, 'file' and 'relay'.
-%% Note that Tracer tells the meta tracer where regular trace messages shall be
-%% sent. This is because the meta tracer is capable of appending a {tracer,Tracer}
-%% action term to meta match specs.
-do_init_metatracing(LogSpec={_Type,_Arg},Tracer) ->
-    case inviso_rt_meta:start(LogSpec,Tracer) of
-	{ok,MetaPid} ->
-	    {ok,MetaPid};
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-do_init_metatracing({Type,Arg,{InitPublLDmfa,RemovePublLDmf,CleanPublLDmf}},Tracer)->
-    case inviso_rt_meta:start({Type,Arg},Tracer,InitPublLDmfa,RemovePublLDmf,CleanPublLDmf) of
-	{ok,MetaPid} ->
-	    {ok,MetaPid};
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-do_init_metatracing(void,_) ->              % Means no meta tracer.
-    false.
-%% -----------------------------------------------------------------------------
-
-%% Function that stops all tracing and closes all open files. This function
-%% can't fail :-) It tries as hard as it can.
-%% This function also kills the autostarter process if one exists. Otherwise it
-%% will not be possible from a control component to end an ongoing autostarted
-%% tracing.
-%% Returns a new loopdata structure since stopping tracing involves updating it.
-do_stop_tracing(LoopData) ->
-    do_stop_tracing_kill_autostarter(LoopData#rt.auto_starter),
-    do_clear_trace_flags(),                 % Do not generate any more traces.
-    NewLoopData1=do_stop_tracing_tracelog(LoopData),
-    NewLoopData2=do_stop_tracing_metatracing(NewLoopData1),
-    NewLoopData3=NewLoopData2#rt{state=idle,auto_starter=undefined},
-    send_event(state_change,NewLoopData3),
-    NewLoopData3.
-
-do_stop_tracing_tracelog(LoopData=#rt{tracer_port=Port}) when is_port(Port) ->
-    trace_port_control(Port,flush),         % Write buffered trace messages.
-    catch port_close(Port),
-    LoopData#rt{tracer_port=undefined};
-do_stop_tracing_tracelog(LoopData) ->
-    LoopData#rt{handler=undefined}.
-
-do_stop_tracing_metatracing(LoopData=#rt{meta_tracer=MPid}) when is_pid(MPid) ->
-    inviso_rt_meta:stop(MPid),
-    LoopData#rt{meta_tracer=undefined};
-do_stop_tracing_metatracing(LoopData) ->    % No meta tracer running!
-    LoopData.
-
-%% Help function killing the autostarter, if one is active.
-do_stop_tracing_kill_autostarter(P) when is_pid(P) ->
-    exit(P,stop_tracing);
-do_stop_tracing_kill_autostarter(_) ->      % No autostarter, do nothing.
-    true.
-%% -----------------------------------------------------------------------------
-
-%% Help function implementing suspending the runtime component.
-%% Returns a new loopdata structure.
-do_suspend(LD,Reason) ->
-    do_clear_trace_flags(),                 % If no process flags, no output!
-    do_suspend_metatracer(LD#rt.meta_tracer),
-    do_suspend_fetchers(LD#rt.fetchers),
-    do_stop_tracing_kill_autostarter(LD#rt.auto_starter),
-    NewLD=LD#rt{fetchers=[],status={suspended,Reason},auto_starter=undefined},
-    send_event(state_change,NewLD),         % Notify subscribers.
-    NewLD.
-
-do_suspend_metatracer(MetaTracer) when is_pid(MetaTracer) ->
-    inviso_rt_meta:suspend(MetaTracer);     % This makes it suspended.
-do_suspend_metatracer(_) ->
-    true.
-
-do_suspend_fetchers([FetcherPid|Rest]) ->
-    FetcherPid ! {suspend,self()},          % This makes it terminate.
-    do_suspend_fetchers(Rest);
-do_suspend_fetchers([]) ->
-    true.
-%% ------------------------------------------------------------------------------
-
-%% Function that stops all tracing, removes all trace-patterns and removes all
-%% logfiles. The idea is to return the runtime component to the 'new' state.
-do_clear(LoopData,Opts) when is_list(Opts) ->
-    NewLoopData=do_stop_tracing(LoopData),  % First stop tracing, if tracing.
-    case lists:member(keep_trace_patterns,Opts) of
-	false ->
-	    do_clear_trace_patterns();
-	_ ->
-	    true
-    end,
-    case lists:member(keep_log_files,Opts) of
-	false ->
-	    if
-		NewLoopData#rt.tracerdata/=undefined ->
-		    do_delete_logs(NewLoopData#rt.tracerdata);
-		true ->                     % If no tracerdata, nothing to remove!
-		    true                    % Do nothing then.
-	    end;
-	_ ->
-	    true
-    end,
-    NewLoopData#rt{state=new,tracerdata=undefined};
-do_clear(LoopData,_Opts) ->                 % Faulty Opts.
-    do_clear(LoopData,[]).                  % Then just ignore the options.
-%% -----------------------------------------------------------------------------
-
-%% Function which takes a tracerdata, either our own or a "suggested"
-%% and tries to find the corresponding files. Note that the return value only
-%% contains "types" of logs that the tracerdata is pointing out. Hence
-%% is there no ti-log, no one will be mentioned in the return value.
-do_list_logs(TracerData) ->                   % Handles both list and tuple.
-    case translate_td(TracerData) of
-	{ok,LogTD,TiTD} ->
-	    {TraceDir,TraceLogs}=list_logs_tracelog(LogTD),
-	    {TiDir,TiLogs}=list_logs_tilog(TiTD),
-	    case {TraceLogs,TiLogs} of
-		{no_log,no_log} ->            % Tracerdata not generating logs!
-		    {ok,no_log};
-		{_,no_log} ->                 % No ti logs.
-		    {ok,[{trace_log,TraceDir,TraceLogs}]};
-		{no_log,_} ->                 % Only ti-logs, unusual!
-		    {ok,[{ti_log,TiDir,TiLogs}]};
-		_ ->                          % Both trace and ti logs.
-		    {ok,[{trace_log,TraceDir,TraceLogs},{ti_log,TiDir,TiLogs}]}
-	    end;
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function implementing fetching logfiles using distributed Erlang.
-%% This function works for both situations, a list of specific files are
-%% requested, or a tracerdata is specified.
-%% Returns {Reply,NewLoopData}.
-do_fetch_log(LD,CollectPid,What) ->
-    if
-	LD#rt.state/=tracing ->
-	    case is_list_of_files_or_tracerdata(What) of
-		files ->
-		    FetcherPid=do_fetch_log_listoffiles(CollectPid,What),
-		    {{ok,FetcherPid},add_fetcher_ld(FetcherPid,LD)};
-		tracerdata ->
-		    case do_fetch_log_tracerdata(CollectPid,What) of
-			{Reply,FetcherPid} when is_pid(FetcherPid) ->
-			    {Reply,add_fetcher_ld(FetcherPid,LD)};
-			{Reply,_} ->        % No fetch process was started.
-			    {Reply,LD}
-		    end;
-		false ->                    % It is an empty list!
-		    {{complete,no_log},LD};
-		error ->                    % Incorrect parameter.
-		    {{error,badarg},LD}
-	    end;
-	true ->                             % No transfere during tracing.
-	    {{error,tracing},LD}
-    end.
-
-%% Function taking tracerdata to find out what files to send over to the RemotePid.
-%% Note that we will not go back to the loop function from here but rather call
-%% the fetch_loop instead, prepresenting the fetch-log state. Unless we encounter
-%% a problem.
-do_fetch_log_tracerdata(CollectPid,TracerData) ->
-    case do_list_logs(TracerData) of
-	{ok,no_log} ->
-	    {{complete,no_log},void};
-	{ok,Logs} ->                          % Ok, some trace_log and ti_log.
-	    FetcherPid=do_fetch_log_listoffiles(CollectPid,Logs),
-	    {{ok,FetcherPid},FetcherPid};
-	{error,Reason} ->                     % Problem with tracerdata!
-	    {{error,Reason},void}
-    end.
-
-do_fetch_log_listoffiles(CollectPid,FileSpec) ->
-    ExpandedFileSpec=do_fetch_log_expand_filespec(FileSpec),
-%% !!! try out different ChunkSizes
-%	            ChunkSize = 60,
-%	            ChunkSize = 7*1024,
-    ChunkSize=1024,
-    _Fetcher=spawn_link(?MODULE,
-			fetch_init,
-			[self(),ExpandedFileSpec,CollectPid,ChunkSize]).
-
-%% Help function which expands the list of logs to have tags in front of every
-%% file, as required by the fetch_loop.
-do_fetch_log_expand_filespec(Logs) ->
-    TraceLogs=
-	case lists:keysearch(trace_log,1,Logs) of
-	    {value,{_,Dir1,Logs1}} ->         % There is a list of trace-logs.
-		lists:map(fun(File)->{trace_log,Dir1,File} end,Logs1);
-	    false ->                          % No trace-logs!
-		[]
-	end,
-    TiLogs=
-	case lists:keysearch(ti_log,1,Logs) of
-	    {value,{_,Dir2,Logs2}} ->
-		lists:map(fun(File)->{ti_log,Dir2,File} end,Logs2);
-	    false ->
-		[]
-	end,
-    TiLogs++TraceLogs.
-
-%% ------------------------------------------------------------------------------
-
-%% Function that removes all logfiles associated with a certain tracerdata.
-do_delete_logs(TracerDataOrLogList) ->
-    case is_list_of_files_or_tracerdata(TracerDataOrLogList) of
-	tracerdata ->
-	    case translate_td(TracerDataOrLogList) of
-		{ok,LogTD,TiTD} ->
-		    case {list_logs_tracelog(LogTD),list_logs_tilog(TiTD)} of
-			{{_,no_log},{_,no_log}} ->  % No logs nowhere!
-			    {ok,no_log};
-			{{LogDir,LogFiles},{_,no_log}} -> % No ti.
-			    {ok,[{trace_log,delete_files(LogDir,LogFiles)}]};
-			{{_,no_log},{TiDir,TiFiles}} ->
-			    {ok,[{ti_log,delete_files(TiDir,TiFiles)}]};
-			{{LogDir,LogFiles},{TiDir,TiFiles}} ->
-			    {ok,[{trace_log,delete_files(LogDir,LogFiles)},
-				 {ti_log,delete_files(TiDir,TiFiles)}]}
-		    end;
-		{error,Reason} ->
-		    {error,Reason}
-	    end;
-	files ->                              % It is [{trace_log,Dir,Files},..
-	    if
-		is_list(hd(TracerDataOrLogList)) -> % Just a list of files.
-		    {ok,delete_files(".",TracerDataOrLogList)};
-		is_tuple(hd(TracerDataOrLogList)) -> % A "modern" logspec.
-		    case {lists:keysearch(trace_log,1,TracerDataOrLogList),
-			  lists:keysearch(ti_log,1,TracerDataOrLogList)} of
-			{false,false} ->      % Hmm, no logs specified!
-			    {ok,[]};          % Easy response!
-			{{value,{_,LogDir,LogFiles}},false} ->
-			    {ok,[{trace_log,delete_files(LogDir,LogFiles)}]};
-			{false,{value,{_,TiDir,TiFiles}}} ->
-			    {ok,[{ti_log,delete_files(TiDir,TiFiles)}]};
-			{{value,{_,LogDir,LogFiles}},{value,{_,TiDir,TiFiles}}} ->
-			    {ok,[{trace_log,delete_files(LogDir,LogFiles)},
-				 {ti_log,delete_files(TiDir,TiFiles)}]}
-		    end
-	    end;
-	false ->                              % Can't tell which!
-	    {ok,[]};
-	error ->
-	    {error,{badarg,TracerDataOrLogList}}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Function handling the request when a control component wishing to take
-%% control over this already existing control component. It does not matter
-%% what state it is in. It can very well already be tracing.
-%% Returns {Reply,NewLoopData}.
-%% Where the Reply tells the control component wether it took control of it
-%% or not. {node_info,node(),self(),Vsn,State,Status,{tag,Tag}} means that we
-%% can be adopted (and more precisely considers ourselves being adopted now).
-do_try_to_adopt(Tag,if_ref,LoopData=#rt{tag=Tag},_Ctrl) ->
-    {{error,{wrong_reference,LoopData#rt.tag}},LoopData};
-do_try_to_adopt(NewTag,_Condition,LoopData,CtrlPid) ->
-    case LoopData#rt.timer_ref of           % Do we have a running-alone timer?
-	undefined ->                        % No we don't.
-	    true;
-	TimerRef ->
-	    timer:cancel(TimerRef)
-    end,
-    CtrlRef=erlang:monitor(process,CtrlPid), % Lets monitor our new "master"!
-    {DepVal,_}=LoopData#rt.dependency,
-    {node_info,Node,Pid,VSN,State,Status,Tag}=collect_node_info(LoopData),
-    NewLoopData=
-	LoopData#rt{dependency={DepVal,node(CtrlPid)},
-		    ctrl=CtrlPid,
-		    ctrl_ref=CtrlRef,       % Monitoring our new master.
-		    tag=NewTag,             % Use this tag from now on.
-		    timer_ref=undefined},
-    {{node_info,Node,Pid,VSN,State,Status,{tag,Tag}},NewLoopData}.
-%% -----------------------------------------------------------------------------
-
-%% Function changing parameters accoring to a new options list. Note that we
-%% can not change control component if the one we have is still working.
-%% We can however of course change how this runtime component will react to
-%% a running alone scenario.
-%% Returns 'stop' or NewLoopData.
-do_change_options(Options,LoopData) ->
-    NewLoopData=read_option_list(Options,LoopData),
-    if
-	NewLoopData/=LoopData ->            % Some options changed.
-	    case do_change_options_ctrl(LoopData,NewLoopData) of
-		stop ->
-		    stop;
-		{ok,NewLoopData2} ->
-		    NewLoopData3=do_change_options_overload(LoopData,NewLoopData2),
-		    NewLoopData3#rt{next_loadcheck=now()} % Force a load check next.
-	    end;
-	true ->
-	    LoopData
-    end.
-
-%% Help function which sets up the new dependencies. Note that we only do that
-%% if do not have a working control component.
-%% Returns {ok,NewLoopData} or 'stop'.
-do_change_options_ctrl(OldLD,NewLD) ->
-    if
-	OldLD#rt.timer_ref/=undefined ->    % No control and waiting to terminate.
-	    timer:cancel(OldLD#rt.timer_ref),
-	    do_down_message(NewLD#rt{timer_ref=undefined});
-	OldLD#rt.ctrl==undefiend ->         % No control component.
-	    do_down_message(NewLD);
-	true ->                             % We have a working control component!
-	    {ok,NewLD}
-    end.
-
-do_change_options_overload(OldLD,NewLD) ->
-    if
-	OldLD#rt.overload/=NewLD#rt.overload ->
-	    terminate_overload(OldLD),
-	    NewOverloadData=initialize_overload(NewLD),
-	    NewLD#rt{overload_data=NewOverloadData};
-	true ->                             % No changes done.
-	    NewLD
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function handling an incoming DOWN message from our control component.
-%% If the runtime component is not allowed to run without a control component, it
-%% simply terminates which closes the trace-port and process trace flags are
-%% therefore automatically removed.
-%% Returns 'stop' or a {ok,NewLoopData} structure.
-do_down_message(LoopData) ->
-    case LoopData#rt.dependency of
-	{0,_} ->                            % Not allowed to run without controller.
-	    stop;
-	{infinity,_} ->                     % Don't care. Just remove the controller.
-	    {ok,LoopData#rt{ctrl=undefined,ctrl_ref=undefined}};
-	{TimeOut,_} ->                      % Allowed to run TimeOut ms alone.
-	    {ok,TimerRef}=timer:exit_after(TimeOut,self(),running_alone),
-	    {ok,LoopData#rt{timer_ref=TimerRef,ctrl=undefined,ctrl_ref=undefined}}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Function handling incomming exit signals. We can expect exit signals from the
-%% following: Our parent supervisor (runtime_tools_sup), a meta-tracer process,
-%% a logfile fetcher process, or the auto_starter.
-%% A trace-port may also generate an exit signal.
-%% In addition it is possible that an overload mechanism generates exit-signals.
-%% We can also get the running_alone exit signal from our self. This is the
-%% situation if our control component has terminated and this runtime component
-%% is not allowed to exist on its own for ever.
-%% Also note that after we have stopped tracing, for any reason, it is not
-%% impossible that we receive the EXIT signals from still working parts that
-%% we are now shuting down. This is no problem, the code will mearly update
-%% the loopdata structure once again.
-%% Returns 'exit' indicating that the runtime component shall terminate now,
-%% {NewLoopData,NewTimeOut} if the exit-signal resulted in an overload check, or
-%% a new loopdata structure shall we ignore the exit, or it simply resulted in
-%% a state-change.
-act_on_exit(Parent,_Reason,#rt{parent=Parent}) ->
-    exit;
-act_on_exit(_Pid,running_alone,_LoopData) ->
-    exit;
-act_on_exit(MetaTracer,_Reason,LoopData=#rt{meta_tracer=MetaTracer}) ->
-    LoopData#rt{meta_tracer=undefined};     % It does not exit anylonger.
-act_on_exit(Port,Reason,LoopData=#rt{tracer_port=Port}) -> 
-    send_event({port_down,node(),Reason},LoopData),
-    _NewLoopData=do_stop_tracing(LoopData);
-act_on_exit(AutoStarter,_Reason,LoopData=#rt{auto_starter=AutoStarter}) ->
-    LoopData#rt{auto_starter=undefined};    % The autostarter has terminated.
-act_on_exit(Pid,Reason,LoopData) ->
-    case remove_fetcher_ld(Pid,LoopData) of
-	{true,NewLoopData} ->               % Yes it really was a fetcher.
-	    NewLoopData;
-	false ->                            % No it was not a fetcher.
-	    act_on_exit_overload(Pid,Reason,LoopData)
-    end.
-
-%% Help function checking if this exit has anything to do with an overload
-%% mechanism. Note that here we run the overload mechanism regardless of
-%% if we are tracing or not. This because an exit signal from the overload
-%% must most likely always be handled.
-act_on_exit_overload(Pid,Reason,LoopData) ->
-    if
-	LoopData#rt.overload/=?NO_LOADCHECK ->
-	    {_NewLD,_NewTimeOut}=
-		do_check_overload(LoopData,
-				  {'EXIT',{Pid,Reason,LoopData#rt.overload_data}});
-	true ->                             % Overload not in use.
-	    LoopData
-    end.
-%% -----------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-%% ==============================================================================
-%% Various help functions.
-%% ==============================================================================
-
-%% Help function which calculates a new now-tuple by adding Interval milliseconds
-%% to the first argument. Note that Interval may be 'infinity' too.
-%% Returns a new now-tuple or "bigvalue" which is greater than any now-tuple.
-add_to_now({MegSec,Sec,MicroSec},Interval) when is_integer(Interval) ->
-    NewSec=Sec+(Interval div 1000),
-    if
-	NewSec>=1000000 ->
-	    {MegSec+1,NewSec-1000000,MicroSec};
-	true ->
-	    {MegSec,NewSec,MicroSec}
-    end;
-add_to_now(_,infinity) ->
-    "bigvalue".
-%% ------------------------------------------------------------------------------
-
-%% Help function calculating the difference in milliseconds between its first
-%% and second argument. This is useful when calculating an after timeout value
-%% from current now() and next_loadcheck value.
-calc_diff_to_now(T1={_,_,_},T2={_,_,_}) ->
-    TimeOut1=timer:now_diff(T2,T1),          % The difference in microseconds.
-    if
-	TimeOut1<0 ->
-	    0;
-	true ->                              % Make milliseconds out of it.
-	    TimeOut1 div 1000
-    end;
-calc_diff_to_now(_T1,_) ->                   % Next loadcheck is not activated.
-    infinity.                                % The the after timeout is infinity.
-%% ------------------------------------------------------------------------------
-
-
-%% Help function returning information about this runtime component.
-collect_node_info(#rt{vsn=VSN,state=State,status=Status,tag=Tag}) -> 
-    {node_info,node(),self(),VSN,State,Status,Tag}.
-%% ------------------------------------------------------------------------------
-
-%% Help function sending information to the control component that state/status
-%% change has occurred. Returns nothing significant.
-send_event(state_change,LoopData=#rt{ctrl=CtrlPid}) when is_pid(CtrlPid) ->
-    Event={trace_event,{state_change,node(),{LoopData#rt.state,LoopData#rt.status}}},
-    CtrlPid ! Event;
-send_event(Event,#rt{ctrl=CtrlPid}) when is_pid(CtrlPid) ->
-    CtrlPid ! {event,Event};
-send_event(_,_) ->                          % We have no control to send to!
-    true.                                   % Maybe tracing alone after autostart.
-%% ------------------------------------------------------------------------------
-
-%% Help function initializing the overload protection mechanism. This may be
-%% necessary if it is a port program or similar. Returns {ok,Data} or 'void'.
-%% The datastructure vill be given to LoadMF as argument whenever loadchecks
-%% are done.
-initialize_overload(#rt{overload={_MF,_Interval,{M,F,Args},_RemoveMFA}}) ->
-    case catch apply(M,F,Args) of
-	{ok,Data} ->
-	    Data;
-	_ ->                                % 'EXIT' or other faulty returnvalue.
-	    void
-    end;
-initialize_overload(_) ->
-    void.
-%% ------------------------------------------------------------------------------
-
-%% Help function which terminates an overload protection mechanism.
-%% Returns nothing significant.
-terminate_overload(#rt{overload={_MF,_Interval,_InitMFA,{M,F,Args}},
-		       overload_data=Data}) ->
-    catch apply(M,F,[Data|Args]),           % Interested in the side-effect.
-    true;
-terminate_overload(_) ->
-    true.
-%% ------------------------------------------------------------------------------
-
-
-%% Help function which checks that a process specified for trace flags is correct.
-%% Either the built-in "aliases" for groups of processes, a pid, a locally registered
-%% name. This function also works for globally registered names. It must then
-%% first be established that the process is local for this node before setting any
-%% process flags.
-%% Returns {ok,PidSpec}, 'false' or {error,Reason}.
-check_traceflag_pidspec(all) -> {ok,all};
-check_traceflag_pidspec(new) -> {ok,new};
-check_traceflag_pidspec(existing) -> {ok,existing};
-check_traceflag_pidspec(Name) when is_atom(Name) ->
-    check_traceflag_pidspec({local,Name});
-check_traceflag_pidspec({local,A}) when is_atom(A) ->
-    case whereis(A) of
-	undefined ->                         % Then it is considered faulty.
-	    {error,{nonexistent_name,A}};
-	Pid when is_pid(Pid) ->
-	    {ok,Pid}
-    end;
-check_traceflag_pidspec({global,Name}) when is_atom(Name) ->
-    case global:whereis_name(Name) of
-	undefined ->                         % Then the name does not exist at all.
-	    {error,{nonexistent_name,{global,Name}}};
-	Pid when is_pid(Pid) ->                 % Ok, but must check that it is here.
-	    if
-		node()==node(Pid) ->
-		    {ok,Pid};
-		true ->                      % Pid is not at this node.
-		    false                    % Not an error but cant be used.
-	    end
-    end;
-check_traceflag_pidspec(Pid) when is_pid(Pid) ->
-    {ok,Pid};
-check_traceflag_pidspec(Proc) ->
-    {error,{faulty,Proc}}.
-%% ------------------------------------------------------------------------------
-
-%% Help function removing all trace flags from all processes. Useful in connection
-%% with suspend. Returns nothing significant.
-do_clear_trace_flags() ->
-    erlang:trace(all, false, [all]).
-%% ------------------------------------------------------------------------------
-
-%% Help function which checks that only valid process trace flags are mentioned.
-%% In order to create better fault reports.
-%% Returns a list of the approved flags, or {error,Reason}.
-check_flags(Flags) ->
-    check_flags_2(Flags,Flags).
-
-check_flags_2([send|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2(['receive'|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2([call|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2([return_to|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2([procs|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2([garbage_collection|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2([running|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2([set_on_spawn|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2([set_on_first_spawn|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2([set_on_link|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2([timestamp|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2([arity|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2([silent|Rest],Flags) -> check_flags_2(Rest,Flags);
-check_flags_2([],Flags) -> Flags;
-check_flags_2([Faulty|_],_Flags) -> {error,{bad_flag,Faulty}}.
-%% ------------------------------------------------------------------------------    
-
-%% Help function which checks parameters to erlang:trace_pattern. The purpose of
-%% the function is to avoid to get multiple error return values in the return
-%% list for a pattern used together with a regexp expanded module name.
-check_pattern_parameters(Mod,Func,Arity,MS) ->
-    MSresult = check_MS(MS),
-    MFAresult = check_MFA(Mod,Func,Arity),
-    MFAresult and MSresult.
-
-check_MS(MS) when is_list(MS) -> true;
-check_MS(true) -> true;
-check_MS(false) -> true.
-    
-check_MFA('_','_','_') -> true;
-check_MFA(Mod,'_','_') when is_atom(Mod) -> true;
-check_MFA(Mod,'_',A) when is_atom(Mod), is_integer(A) -> false;
-check_MFA(Mod,F,'_') when is_atom(Mod), is_atom(F) -> true;
-check_MFA(Mod,F,A) when is_atom(Mod), is_atom(F), is_integer(A) -> true.
-
-%% -----------------------------------------------------------------------------
-
-%% Help function finding out if Mod is loaded, and if not, if it can successfully
-%% be loaded. The Opts list can prevent modules from being loaded.
-%% Returns 'true' or 'false'.
-load_module_on_option(Mod,Opts) when is_list(Opts) ->
-    case lists:member(no_loadcheck,Opts) of
-	true ->                             % Then just skip this, return true.
-	    true;
-	false ->
-	    case erlang:module_loaded(Mod) of
-		true ->
-		    true;                   % It is loaded, do no more.
-		false ->
-		    case lists:member(only_loaded,Opts) of
-			true ->             % Then, make no attempts to load.
-			    false;
-			false ->            % Try to load!
-			    case code:ensure_loaded(Mod) of
-				{module,_Mod} -> % Successfully loaded!
-				    true;
-				{error,_Reason} ->
-				    false
-			    end
-		    end
-	    end
-    end;
-load_module_on_option(Mod,_Opts) ->        % Most likely Opts not a list!
-    load_module_on_option(Mod,[]).         % Call without options.
-%% -----------------------------------------------------------------------------
-
-%% Help function taking a tuplelist of options turning them into a loopdata
-%% structure. Returns the loopdata structure with the new values changed.
-read_option_list([],LD) ->                  % Done, return loopdata.
-    LD;
-read_option_list([{dependency,{Value,Node}}|Rest],LD) ->
-    read_option_list(Rest,LD#rt{dependency={Value,Node}});
-read_option_list([{dependency,Value}|Rest],LD) when is_integer(Value);Value==infinity ->
-    read_option_list(Rest,LD#rt{dependency={Value,node()}});
-read_option_list([overload|Rest],LD) ->     % So that we can remove loadcheck.
-    read_option_list(Rest,LD#rt{overload=?NO_LOADCHECK});
-read_option_list([{overload,{MF,Interval}}|Rest],LD)
-  when is_integer(Interval);Interval==infinity ->
-    read_option_list(Rest,LD#rt{overload={MF,Interval,void,void}});
-read_option_list([{overload,{MF,Interval,InitMFA,RemoveMFA}}|Rest],LD)
-  when is_integer(Interval);Interval==infinity ->
-    read_option_list(Rest,LD#rt{overload={MF,Interval,InitMFA,RemoveMFA}});
-read_option_list([{overload,Interval}|Rest],LD)
-  when is_integer(Interval);Interval==infinity ->
-    read_option_list(Rest,LD#rt{overload={fun ?DEFAULT_OVERLOAD_FUNC/1,
-					  Interval,
-					  void,
-					  void}});
-read_option_list([_|Rest],LD) ->            % Unknown option.
-    read_option_list(Rest,LD).
-%% -----------------------------------------------------------------------------
-
-%% Help function which returns the version number for the runtime_tools
-%% application. Since it is called from within the runtime_tools application
-%% we can be "sure" that it really exists.
-get_application_vsn() ->
-    {value,{_,_,VSN}}=lists:keysearch(runtime_tools,1,application:loaded_applications()),
-    VSN.
-%% -----------------------------------------------------------------------------
-
-%% Help function that examines an argument to determine if it is a list of files
-%% or tracerdata. This since they are both complex structures, looking alike.
-%% Returns 'tracerdata', 'files', 'false' or 'error'. Error is returned if it
-%% can not be decided which it is.
-is_list_of_files_or_tracerdata(What) ->
-    case inviso_rt_lib:is_tracerdata(What) of
-	true ->
-	    tracerdata;
-	false ->
-	    if
-		What==[] ->
-		    false;
-		is_list(What),is_list(hd(What)) ->
-		    files;
-		is_list(What) ->
-		    case lists:keysearch(trace_log,1,What) of
-			{value,_} ->
-			    files;
-			false ->
-			    case lists:keysearch(ti_log,1,What) of
-				{value,_} ->
-				    files;
-				false ->
-				    error    % Neither tracerdata nor list of files.
-			    end
-		    end;
-		true ->
-		    error
-	    end
-    end.
-%% ------------------------------------------------------------------------------
-
-%% Help function which removes all files in the ListOfFiles, assuming they
-%% are located in Dir.
-%% Returns a list of [{ok,FileName},...{error,Reason},...]
-delete_files(Dir,ListOfFiles) ->
-    delete_files_2(Dir,ListOfFiles, []).
-
-delete_files_2(Dir,[File|Tail],Reply) when is_list(Dir),is_list(File) ->
-    case catch file:delete(filename:join(Dir,File)) of
-	ok ->
-	    delete_files_2(Dir,Tail,[{ok,File}|Reply]);
-	{error,Posix} ->
-	    delete_files_2(Dir,Tail,[{error,{Posix,File}}|Reply]);
-	{'EXIT',_Reason} ->                  % Probably not proper string.
-	    delete_files_2(Dir,Tail,[{error,{badarg,[Dir,File]}}|Reply])
-    end;
-delete_files_2(Dir,[Faulty|Tail],Reply) ->
-    delete_files_2(Dir,Tail,[{error,{badarg,[Dir,Faulty]}}|Reply]);
-delete_files_2(_,[],Reply) ->
-    Reply.
-%% -----------------------------------------------------------------------------
-
-%% Help function which lists all trace logs belonging to this tracerdata.
-%% Note that this function operates on internal LogTD structures.
-list_logs_tracelog({file,FileName}) when is_list(FileName) ->
-    case file:read_file_info(FileName) of
-	{ok,_} ->                            % The file exists.
-	    {filename:dirname(FileName),[filename:basename(FileName)]};
-	_ ->                                 % The file does not exist
-	    {filename:dirname(FileName),[]}
-    end;
-list_logs_tracelog({file,Wrap}) when is_tuple(Wrap),element(2,Wrap)==wrap ->
-    case {element(1,Wrap),element(3,Wrap)} of
-	{FileName,Tail} when is_list(FileName),is_list(Tail) ->
-	    case catch {filename:dirname(FileName),list_wrapset(FileName,Tail)} of
-		{'EXIT',_Reason} ->          % Garbage in either lists.
-		    {"",no_log};             % Interpret as no log for tracerdata.
-		Tuple ->
-		    Tuple
-	    end;
-	_ ->
-	    {"",no_log}
-    end;
-list_logs_tracelog(void) ->                  % Trace log not used.
-    {"",no_log};
-list_logs_tracelog(_) ->                     % Some fun or similar.
-    {"",no_log}.                             % Then there are no files to report.
-%% -----------------------------------------------------------------------------
-
-%% Help function which lists all ti-files belonging to this tracerdata.
-%% Note that this function operates on the internal TiTD structure.
-list_logs_tilog(TiTD)
-  when tuple_size(TiTD)>=2,element(1,TiTD)==file,is_list(element(2,TiTD)) ->
-    FileName=element(2,TiTD),
-    case file:read_file_info(FileName) of
-	{ok,_} ->                            % Yes the file exists.
-	    {filename:dirname(FileName),[filename:basename(FileName)]};
-	_ ->
-	    {filename:dirname(FileName),[]}
-    end;
-list_logs_tilog(void) ->                     % Internal representation for
-    {"",no_log};                             % ti-file not in use.
-list_logs_tilog(_) ->
-    {"",no_log}.
-%% -----------------------------------------------------------------------------
-
-%% Help function which lists all files belonging to the wrap-set specified by
-%% Prefix and Suffix. Note that there can be a directory in Prefix as well.
-%% Will fail if either of Prefix or Suffix are not proper strings.
-%% Returns a list of files, without dirname.
-list_wrapset(Prefix,Suffix) ->
-    Name=filename:basename(Prefix),
-    Dirname=filename:dirname(Prefix),
-    case file:list_dir(Dirname) of
-	{ok,Files} ->
-	    RegExp="^"++list_wrapset_escapes(Name)++"[0-9]+"++
-		list_wrapset_escapes(Suffix)++"$",
-	    list_wrapset_2(Files,RegExp);
-	{error,_Reason} ->                   % Translate this to no files!
-	    []
-    end.
-
-list_wrapset_2([File|Rest],RegExp) ->
-    Length=length(File),
-    case re:run(File,RegExp) of
-	{match,[{0,Length}]} ->                  % This is a member of the set.
-	    [File|list_wrapset_2(Rest,RegExp)];
-	_ ->
-	    list_wrapset_2(Rest,RegExp)
-    end;
-list_wrapset_2([],_) ->
-    [].
-
-%% Help function which inserts escape characters infront of characters which
-%% will otherwise be missinterpreted by the regexp function as meta rather than
-%% just the character itself.
-list_wrapset_escapes([$.|Rest]) ->
-    [$\\,$.|list_wrapset_escapes(Rest)];
-list_wrapset_escapes([Char|Rest]) ->
-    [Char|list_wrapset_escapes(Rest)];
-list_wrapset_escapes([]) ->
-    [].
-%% -----------------------------------------------------------------------------
-
-
-
-
-
-
-%% ==============================================================================
-%% Handler functions for implementing simple trace-message handlers.
-%% ==============================================================================
-%%
-%% A handler must be a function taking two arguments. The first is the trace-
-%% message. The second is datastructure used by the handler. The handler shall
-%% returns (possibly) new datastructure.
-
-%% ------------------------------------------------------------------------------
-%% Function implementing a relayer. This function is used to creat a fun handler
-%% if the relay option is used in tracer-data.
-%% ------------------------------------------------------------------------------
-relay_handler(Msg,Tracer) ->
-    Tracer ! Msg,
-    Tracer.
-
-%% ------------------------------------------------------------------------------
-%% Function implementing a default terminal io handler.
-%% ------------------------------------------------------------------------------
-
-dhandler(end_of_trace, Out) ->
-    Out;
-dhandler(Trace, Out) when element(1, Trace) == trace, 
-			  tuple_size(Trace) >= 3 ->
-    dhandler1(Trace, tuple_size(Trace), Out);
-dhandler(Trace, Out) when element(1, Trace) == trace_ts, 
-			  tuple_size(Trace) >= 4 ->
-    dhandler1(Trace, tuple_size(Trace)-1, Out);
-dhandler(Trace, Out) when element(1, Trace) == drop, 
-			  tuple_size(Trace) == 2 ->
-    io:format(Out, "*** Dropped ~p messages.~n", [element(2,Trace)]),
-    Out;
-dhandler(Trace, Out) when element(1, Trace) == seq_trace, 
-			  tuple_size(Trace) >= 3 ->
-    SeqTraceInfo = case Trace of
-		       {seq_trace, Lbl, STI, TS} ->
-			   io:format(Out, "SeqTrace ~p [~p]: ",
-				     [TS, Lbl]),
-			   STI;
-		       {seq_trace, Lbl, STI} ->
-			   io:format(Out, "SeqTrace [~p]: ",
-				     [Lbl]),
-			   STI 
-		   end,
-    case SeqTraceInfo of
-	{send, Ser, Fr, To, Mes} ->
-	    io:format(Out, "(~p) ~p ! ~p [Serial: ~p]~n",
-		      [Fr, To, Mes, Ser]);
-	{'receive', Ser, Fr, To, Mes} ->
-	    io:format(Out, "(~p) << ~p [Serial: ~p, From: ~p]~n",
-		      [To, Mes, Ser, Fr]);
-	{print, Ser, Fr, _, Info} ->
-	    io:format(Out, "-> ~p [Serial: ~p, From: ~p]~n",
-		      [Info, Ser, Fr]);
-	Else ->
-	    io:format(Out, "~p~n", [Else])
-    end,
-    Out;
-dhandler(_Trace, Out) ->
-    Out.
-
-dhandler1(Trace, Size, Out) ->
-%%%!    Self = self(),
-    From = element(2, Trace),
-    case element(3, Trace) of
-	'receive' ->
-	    case element(4, Trace) of
-		{dbg,ok} -> ok;
-		Message -> io:format(Out, "(~p) << ~p~n", [From,Message])
-	    end;
-	'send' ->
-	    Message = element(4, Trace),
-	    case element(5, Trace) of
-%%%! This causes messages to disappear when used by ttb (observer). Tests
-%%%! so far show that there is no difference in results with dbg even if I
-%%%! comment it out, so  I hope this is only some old code which isn't
-%%%! needed anymore... /siri
-%%%!		Self -> ok;
-		To -> io:format(Out, "(~p) ~p ! ~p~n", [From,To,Message])
-	    end;
-	call ->
-	    case element(4, Trace) of
-		MFA when Size == 5 ->
-		    Message = element(5, Trace),
-		    io:format(Out, "(~p) call ~s (~p)~n", 
-			      [From,ffunc(MFA),Message]);
-		MFA ->
-		    io:format(Out, "(~p) call ~s~n", [From,ffunc(MFA)])
-	    end;
-	return -> %% To be deleted...
-	    case element(4, Trace) of
-		MFA when Size == 5 ->
-		    Ret = element(5, Trace),
-		    io:format(Out, "(~p) old_ret ~s -> ~p~n", 
-			      [From,ffunc(MFA),Ret]);
-		MFA ->
-		    io:format(Out, "(~p) old_ret ~s~n", [From,ffunc(MFA)])
-	    end;
-	return_from ->
-	    MFA = element(4, Trace),
-	    Ret = element(5, Trace),
-	    io:format(Out, "(~p) returned from ~s -> ~p~n", 
-		      [From,ffunc(MFA),Ret]);
-	return_to ->
-	    MFA = element(4, Trace),
-	    io:format(Out, "(~p) returning to ~s~n", [From,ffunc(MFA)]);
-	spawn when Size == 5 ->
-	    Pid = element(4, Trace),
-	    MFA = element(5, Trace),
-	    io:format(Out, "(~p) spawn ~p as ~s~n", [From,Pid,ffunc(MFA)]);
-	Op ->
-	    io:format(Out, "(~p) ~p ~s~n", [From,Op,ftup(Trace,4,Size)])
-    end,
-    Out.
-
-
-%%% These f* functions returns non-flat strings
-
-%% {M,F,[A1, A2, ..., AN]} -> "M:F(A1, A2, ..., AN)"
-%% {M,F,A}                 -> "M:F/A"
-ffunc({M,F,Argl}) when is_list(Argl) ->
-    io_lib:format("~p:~p(~s)", [M, F, fargs(Argl)]);
-ffunc({M,F,Arity}) ->
-    io_lib:format("~p:~p/~p", [M,F,Arity]);
-ffunc(X) -> io_lib:format("~p", [X]).
-
-%% Integer           -> "Integer"
-%% [A1, A2, ..., AN] -> "A1, A2, ..., AN"
-fargs(Arity) when is_integer(Arity) -> integer_to_list(Arity);
-fargs([]) -> [];
-fargs([A]) -> io_lib:format("~p", [A]);  %% last arg
-fargs([A|Args]) -> [io_lib:format("~p,", [A]) | fargs(Args)];
-fargs(A) -> io_lib:format("~p", [A]). % last or only arg
-
-%% {A_1, A_2, ..., A_N} -> "A_Index A_Index+1 ... A_Size"
-ftup(Trace, Index, Index) -> 
-    io_lib:format("~p", [element(Index, Trace)]);
-ftup(Trace, Index, Size) -> 
-    [io_lib:format("~p ", [element(Index, Trace)]) 
-     | ftup(Trace, Index+1, Size)].
-%% ------------------------------------------------------------------------------
-
-%% ==============================================================================
-%% Functions handling the trace-port. Copied from dbg.erl
-%% ==============================================================================
-
-trace_port_control(Port, flush) ->
-    case trace_port_control(Port, $f, "") of
-	{ok, [0]} -> ok;
-	{ok, _}   -> {error, not_supported_by_trace_driver};
-	Other     -> Other
-    end.
-
-trace_port_control(Port, Command, Arg) when is_port(Port)->
-    case catch port_control(Port, Command, Arg) of
-	{'EXIT', _} -> {error, {no_trace_driver, node()}};
-	Result      -> Result
-    end.
-
-
-trace_port(file, {Filename, wrap, Tail}) ->
-    trace_port(file, {Filename, wrap, Tail, 128*1024});
-trace_port(file, {Filename, wrap, Tail, WrapSize}) ->
-    trace_port(file, {Filename, wrap, Tail, WrapSize, 8});
-trace_port(file, {Filename, wrap, Tail, WrapSize, WrapCnt})
-  when is_list(Tail), 
-       is_integer(WrapSize), WrapSize >= 0, WrapSize < (1 bsl 32),
-       is_integer(WrapCnt), WrapCnt >= 1, WrapCnt < (1 bsl 32) ->
-   trace_port1(file, Filename, {wrap, Tail, WrapSize, WrapCnt, 0});
-trace_port(file, {Filename, wrap, Tail, {time, WrapTime}, WrapCnt})
-  when is_list(Tail), 
-       is_integer(WrapTime), WrapTime >= 1, WrapTime < (1 bsl 32),
-       is_integer(WrapCnt), WrapCnt >= 1, WrapCnt < (1 bsl 32) ->
-    trace_port1(file, Filename, {wrap, Tail, 0, WrapCnt, WrapTime});
-trace_port(file, Filename) when is_list(Filename) ->
-    trace_port1(file, Filename, nowrap);
-
-trace_port(ip, Portno) when is_integer(Portno) -> 
-    trace_port(ip,{Portno,50});
-
-trace_port(ip, {Portno, Qsiz}) when is_integer(Portno), is_integer(Qsiz) -> 
-    fun() ->
-	    Driver = "trace_ip_drv",
-	    Dir1 = filename:join(code:priv_dir(runtime_tools), "lib"),
-	    case catch erl_ddll:load_driver(Dir1, Driver) of
-		ok ->
-		    ok;
-		_ ->
-		    Dir2 = filename:join(
-			     Dir1, 
-			     erlang:system_info(system_architecture)),
-		    catch erl_ddll:load_driver(Dir2, Driver)
-	    end,
-	    L = lists:flatten(
-		  io_lib:format("~s ~p ~p 2",
-				[Driver, Portno, Qsiz])),
-	    open_port({spawn, L}, [eof])
-    end.
-
-trace_port1(file, Filename, Options) ->
-    Driver = "trace_file_drv",
-    fun() ->
-	    Name = filename:absname(Filename), 
-	    %% Absname is needed since the driver uses 
-	    %% the supplied name without further investigations, 
-	    %% and if the name is relative the resulting path 
-	    %% might be too long which can cause a bus error
-	    %% on vxworks instead of a nice error code return.
-	    %% Also, the absname must be found inside the fun,
-	    %% in case the actual node where the port shall be
-	    %% started is on another node (or even another host)
-	    {Wrap, Tail} =
-		case Options of
-		    {wrap, T, WrapSize, WrapCnt, WrapTime} ->
-			{lists:flatten(
-			   io_lib:format("w ~p ~p ~p ~p ", 
-					 [WrapSize, WrapCnt, WrapTime, 
-					  length(Name)])),
-			 T};
-		    nowrap ->
-			{"", ""}
-		end,
-	    Command = Driver ++ " " ++ Wrap ++ "n " ++ Name ++ Tail,
-	    Dir1 = filename:join(code:priv_dir(runtime_tools), "lib"),
-	    case catch erl_ddll:load_driver(Dir1, Driver) of
-		ok ->
-		    ok;
-		_ ->
-		    Dir2 = filename:join(
-			     Dir1, 
-			     erlang:system_info(system_architecture)),
-		    catch erl_ddll:load_driver(Dir2, Driver)
-	    end,
-	    if 	element(1, Options) == wrap ->
-		    %% Delete all files from any previous wrap log
-		    Files = wrap_postsort(wrap_presort(Name, Tail)),
-		    lists:foreach(
-		      fun(N) -> file:delete(N) end,
-		      Files);
-		true -> ok
-	    end,
-	    open_port({spawn, Command}, [eof])
-    end.
-
-%% Find all possible wrap log files.
-%% Returns: a list of sort converted filenames.
-%%
-%% The sort conversion is done by extracting the wrap sequence counter
-%% from the filename, and calling wrap_encode/2.
-wrap_presort(Filename, Tail) ->
-    Name = filename:basename(Filename),
-    Dirname = filename:dirname(Filename),
-    case file:list_dir(Dirname) of
-	{ok, Files} ->
-	    lists:zf(
-	      fun(N) ->
-		      case match_front(N, Name) of
-			  false ->
-			      false;
-			  X ->
-			      case match_rear(X, Tail) of
-				  false ->
-				      false;
-				  C -> % Counter
-				      case match_0_9(C) of
-					  true ->
-					      {true, 
-%						 filename:join(Dirname, N)}
-					       wrap_encode(
-						 filename:join(Dirname, N),
-						 C)};
-					  false ->
-					      false
-				      end
-			      end
-		      end
-	      end,
-	      Files);
-	_ ->
-	    []
-    end.
-
-%% Extract the filenames from a list of sort converted ones.
-wrap_postsort(Files) ->    
-    lists:map(fun wrap_name/1, Files).
-
-wrap_encode(N, C) ->
-    {list_to_integer(C), N}.
-
-wrap_name({_C, N}) ->
-    N.
-
-%% Returns what is left of ListA when removing all matching
-%% elements from ListB, or false if some element did not match,
-%% or if ListA runs out of elements before ListB.
-match_front(ListA, []) when is_list(ListA) ->
-    ListA;
-match_front([], ListB) when is_list(ListB) ->
-    false;
-match_front([Hd|TlA], [Hd|TlB]) ->
-    match_front(TlA,TlB);
-match_front([_HdA|_], [_HdB|_]) ->
-    false.
-
-%% Reversed version of match_front/2
-match_rear(ListA, ListB) when is_list(ListA), is_list(ListB) ->
-    case match_front(lists:reverse(ListA), lists:reverse(ListB)) of
-	false ->
-	    false;
-	List ->
-	    lists:reverse(List)
-    end.
-
-%% Returns true if the non-empty list arguments contains all
-%% characters $0 .. $9.
-match_0_9([]) ->
-    false;
-match_0_9([H]) when is_integer(H), $0 =< H, H =< $9 ->
-    true;
-match_0_9([H|T]) when is_integer(H), $0 =< H, H =< $9 ->
-    match_0_9(T);
-match_0_9(L) when is_list(L) ->
-    false.
-%% -----------------------------------------------------------------------------
-
-
-%% -----------------------------------------------------------------------------
-%% Functions working on the tracerdata structure.
-%% -----------------------------------------------------------------------------
-
-%% Tracerdata is the structure which specifies to where tracing is logged at this
-%% runtime component. It may now (and in the future specify) several things.
-%% Currently it can consist of:
-%% LogTD: specifying how trace-log data shall be handled.
-%% TiTD : trace information, specifying how trace information shall be handled.
-%%
-%% Tracerdata may also contain quick or standard forms of LogTD and/or TiTD.
-%% For instance if a standard handler-fun shall be used. The handler fun is not
-%% part of the tracerdata but rather specified by a constant.
-
-
-%% Help function that translates an input-tracerdata to useful internal formats.
-%% This since the tracerdata may consist of specifications which shall be
-%% translated into funs or similar.
-%% Returns {ok,LogTD,TiTD} or {error,Reason}.
-%% Note that TiTD may be 'void' since TiTD is not mandatory.
-translate_td(TracerData) when is_list(TracerData) -> % Both log and ti.
-    case translate_td_logtd(get_trace_log_tracerdata(TracerData)) of
-	{ok,LogTD} ->
-	    case translate_td_titd(get_ti_log_tracerdata(TracerData)) of
-		{ok,TiTD} ->
-		    {ok,LogTD,TiTD};
-		{error,Reason} ->
-		    {error,Reason}
-	    end;
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-translate_td(TracerData) ->                  % The it is just LogTD!?
-    case translate_td_logtd(TracerData) of
-	{ok,LogTD} ->
-	    {ok,LogTD,void};
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function translating trace-log tracerdata.
-translate_td_logtd(collector) ->             % This rt will act as receiver.
-    {ok,{fun dhandler/2,user}};              % Simple terminal io.
-translate_td_logtd({relayer,Tracer}) when is_pid(Tracer) ->
-    {ok,{fun relay_handler/2,Tracer}};       % Relay trace-msg to Tracer-pid.
-translate_td_logtd({HandlerFun,Data}) when is_function(HandlerFun) ->
-    {ok,{HandlerFun,Data}};                  % Own invented fun.
-translate_td_logtd({Type,Parameters}) when Type==ip;Type==file ->
-    {ok,{Type,Parameters}};                  % Built in trace-port
-translate_td_logtd(false) ->                 % Unusual but no trace log.
-    {ok,void};
-translate_td_logtd(Arg) ->
-    {error,{bad_log_td,Arg}}.
-%% -----------------------------------------------------------------------------
-
-%% Help function translating ti-log tracerdata.
-translate_td_titd(TiTD={file,FileName}) when is_list(FileName) ->
-    {ok,TiTD};
-translate_td_titd({file,FileName,
-		   {InitPublLDmfa={M1,F1,L1},
-		    RemovePublLDmf={M2,F2},
-		    CleanPublLDmf={M3,F3}}})
-  when is_list(FileName),is_atom(M1),is_atom(F1),is_atom(M2),is_atom(F2),is_list(L1),is_atom(M3),is_atom(F3) ->
-    {ok,{file,FileName,{InitPublLDmfa,RemovePublLDmf,CleanPublLDmf}}};
-translate_td_titd({file,FileName,
-		   {InitPublLDmfa={M1,F1,L1},
-		    void,
-		    CleanPublLDmf={M3,F3}}})
-  when is_list(FileName),is_atom(M1),is_atom(F1),is_list(L1),is_atom(M3),is_atom(F3) ->
-    {ok,{file,FileName,{InitPublLDmfa,void,CleanPublLDmf}}};
-translate_td_titd(false) ->                  % Means no ti-tracerdata.
-    {ok,void};
-translate_td_titd(TiTD) ->
-    {error,{bad_ti_td,TiTD}}.
-%% -----------------------------------------------------------------------------
-
-%% This function retrieves the trace-log part of a TracerData list structure.
-%% Returns TraceLogTD or 'false'.
-get_trace_log_tracerdata(TracerData) ->
-    case lists:keysearch(trace,1,TracerData) of
-	{value,{_,LogTD}} ->
-	    LogTD;
-	false ->
-	    false
-    end.
-%% -----------------------------------------------------------------------------
-
-%% This function retrieves the ti-log part of a TracerData list structure.
-%% Returns TiLogTD or 'false'.
-get_ti_log_tracerdata(TracerData) ->
-    case lists:keysearch(ti,1,TracerData) of
-	{value,{_,TiTD}} ->
-	    TiTD;
-	false ->
-	    false
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function which checks that parameters to the built in trace-port are
-%% sane.
-check_traceport_parameters(Type,Args) ->
-    case {Type,Args} of
-	{file,{FileName,wrap,Tail}} when is_list(FileName),is_list(Tail) ->
-	    ok;
-	{file,{FileName,wrap,Tail,WrapSize}}
-	when is_list(FileName),
-	is_list(Tail),
-	is_integer(WrapSize),WrapSize>=0,WrapSize< (1 bsl 32) ->
-	    ok;
-	{file,{FileName,wrap,Tail,WrapSize,WrapCnt}}
-	when is_list(FileName),is_list(Tail), 
-	is_integer(WrapSize), WrapSize >= 0, WrapSize < (1 bsl 32),
-	is_integer(WrapCnt), WrapCnt >= 1, WrapCnt < (1 bsl 32) ->
-	    ok;
-	{file,{FileName,wrap,Tail,{time,WrapTime},WrapCnt}}
-	when is_list(FileName),is_list(Tail), 
-	is_integer(WrapTime), WrapTime >= 1, WrapTime < (1 bsl 32),
-	is_integer(WrapCnt), WrapCnt >= 1, WrapCnt < (1 bsl 32) ->
-	    ok;
-	{file,FileName} when is_list(FileName) ->
-	    ok;
-	{ip,Portno} when is_integer(Portno),Portno=<16#FFFF -> 
-	    ok;
-	{ip,{Portno,Qsiz}} when is_integer(Portno),Portno=<16#FFFF,is_integer(Qsiz) ->
-	    ok;
-	_ ->
-	    {error,{trace_port_args,[Type,Args]}}
-    end.
-%% -----------------------------------------------------------------------------
-
-
-%% -----------------------------------------------------------------------------
-%% Default overload functionality.
-%% -----------------------------------------------------------------------------
-
-%% A default overload protection function. An overload function must take
-%% one argument and return 'ok' or {suspend,SuspendReason}.
-default_overload_func(_) ->
-    case process_info(self(),message_queue_len) of
-	{message_queue_len,N} when N > 1000 -> 
-	    {suspend,rt_max_queue_len};
-	_ ->
-	    ok
-    end.
-%% -----------------------------------------------------------------------------
-
-%% =============================================================================
-%% Functions working on the internal loopdata structure.
-%% =============================================================================
-
-%% Help function simply adding Fetcher as a fetcher process to the loopdata.
-%% Returns a new loopdata structure.
-add_fetcher_ld(Fetcher,LD) ->
-    LD#rt{fetchers=[Fetcher|LD#rt.fetchers]}.
-%% -----------------------------------------------------------------------------
-
-%% Help function investigating if the first argument is a known fetcher process
-%% or not. If it is, it also removed it from the fetchers list in the loopdata
-%% structure.
-%% Returns {true,NewLoopData} or 'false'.
-remove_fetcher_ld(Fetcher,LD) ->
-    NewFetchers=lists:delete(Fetcher,LD#rt.fetchers),
-    if
-	NewFetchers/=LD#rt.fetchers ->
-	    {true,LD#rt{fetchers=NewFetchers}};
-	true ->                             % No it was not a fetcher process.
-	    false
-    end.
-%% -----------------------------------------------------------------------------
-
-%%% end of file
-
diff --git a/lib/runtime_tools/src/inviso_rt_lib.erl b/lib/runtime_tools/src/inviso_rt_lib.erl
deleted file mode 100644
index 5dfe14068a..0000000000
--- a/lib/runtime_tools/src/inviso_rt_lib.erl
+++ /dev/null
@@ -1,474 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% ------------------------------------------------------------------------------
-%% File    : inviso_rt_lib.erl
-%% Author  : Lennart �hman <[email protected]>
-%% Description : 
-%%
-%% Created : 27 Sep 2005 by Lennart �hman <[email protected]>
-%% ------------------------------------------------------------------------------
--module(inviso_rt_lib).
-
--export([expand_regexp/2,expand_regexp/3,expand_regexp/4]).
--export([is_tracerdata/1]).
--export([transform/2]).
-
--export([rpc/4,rpc/5,match_modules/2,match_modules/3]).
--export([debug/3]).
-
-%% ------------------------------------------------------------------------------
-
-%% ==============================================================================
-%% Exported API functions.
-%% ==============================================================================
-
-%% ------------------------------------------------------------------------------
-%% expand_regexp(Nodes,RegExpDir,RegExpMod,Opts) = [{Node,Answer},...] | {error,Reason}
-%% expand_regexp(Nodes,RegExpMod,Opts) = [{Node,Answer},...] | {error,Reason}
-%% expand_regexp(RegExpDir,RegExpMod,Opts) = ListOfModules | {error,Reason}
-%% expand_regexp(RegExpMod,Opts) = ListOfModules | {error,Reason}
-%%   Nodes=List of all nodes (atoms) where to expand.
-%%   RegExpDir=Reg.exp (string) specifying directories.
-%%   RegExpMod=Reg.exp (string) specifying module names.
-%%   Node=node name (atom).
-%%   Opts=[Opt,...]
-%%   Opt=only_loaded
-%%   Answer=List of modules (atoms) | 'badrpc'
-%%
-%% Expands, concurrently, the regular expression on Nodes and returns a list
-%% of what modules it expanded to on the different nodes. Note that it may
-%% differ between Erlang nodes depending on whether the modules are the same
-%% or not. Also note that all modules becomes loaded as a result.
-%% RegExpDir can further limit the modules. It introduces the requirement that
-%% a module must be loaded from a directory with a path satisfying the RegExpDir.
-%% All regular expression are according to the standard lib regexp module.
-expand_regexp(RegExpMod,Opts) when is_list(RegExpMod),is_list(Opts) ->
-    match_modules(RegExpMod,Opts);
-expand_regexp(RegExpMod,Opts) ->
-    {error,{badarg,[RegExpMod,Opts]}}.
-expand_regexp(NodesOrRegExpDir,RegExpMod,Opts)
-  when is_list(NodesOrRegExpDir),is_list(RegExpMod),is_list(Opts) ->
-    case is_list_of_atoms(NodesOrRegExpDir) of
-	true ->                              % Interpret as list of nodes.
-	    lists:foreach(fun(N)->spawn(?MODULE,rpc,[self(),N,RegExpMod,Opts]) end,
-			  NodesOrRegExpDir),
-	    expand_regexp_answers(NodesOrRegExpDir,[]);
-	false ->                             % Interpret as a string.
-	    match_modules(NodesOrRegExpDir,RegExpMod,Opts)
-    end;
-expand_regexp(NodesOrRegExpDir,RegExpMod,Opts) ->
-    {error,{badarg,[NodesOrRegExpDir,RegExpMod,Opts]}}.
-expand_regexp(Nodes,RegExpDir,RegExpMod,Opts)
-  when is_list(Nodes),is_list(RegExpDir),is_list(RegExpMod),is_list(Opts) ->
-    lists:foreach(fun(N)->
-			  spawn(?MODULE,rpc,[self(),N,RegExpDir,RegExpMod,Opts])
-		  end,
-		  Nodes),
-    expand_regexp_answers(Nodes,[]);
-expand_regexp(Nodes,RegExpDir,RegExpMod,Opts) ->
-    {error,{badarg,[Nodes,RegExpDir,RegExpMod,Opts]}}.
-
-expand_regexp_answers([],Answers) -> Answers;  % List of [{Node,Answer},...].
-expand_regexp_answers(Nodes,Answers) ->
-    receive
-	{?MODULE,Node,Answer} ->
-	    expand_regexp_answers(lists:delete(Node,Nodes),[{Node,Answer}|Answers])
-    end.
-%% ------------------------------------------------------------------------------
-
-%% is_tracerdata(TracerData)=true|false
-%% Answers the question if TracerData is proper tracerdata. Note that true can be
-%% returned if it resembles tracerdata very closely.
-is_tracerdata({Fun,_Data}) when is_function(Fun) -> true;
-is_tracerdata({relayer,To}) when is_pid(To);is_atom(To) -> true;
-is_tracerdata(collector) -> true;
-is_tracerdata({file,Param}) when is_tuple(Param);is_list(Param) -> true;
-is_tracerdata({ip,_Param}) -> true;
-is_tracerdata([{trace,LogTD}|Rest]) ->
-    case is_tracerdata(LogTD) of
-	true ->
-	    is_tracerdata(Rest);
-	false ->
-	    false
-    end;
-is_tracerdata([{ti,TiData}|Rest]) ->
-    case is_tidata(TiData) of
-	true ->
-	    is_tracerdata(Rest);
-	false ->
-	    false
-    end;
-is_tracerdata([]) ->
-    true;
-is_tracerdata(_) ->
-    false.
-
-is_tidata({file,FileName}) when is_list(FileName) -> true; 
-is_tidata({file,FileName,{M,F,Args}}) when is_list(FileName),is_atom(M),is_atom(F),is_list(Args) ->
-    true;
-is_tidata(_) -> false.
-%% ------------------------------------------------------------------------------		
-
-
-%% ==============================================================================
-%% Help functions.
-%% ==============================================================================
-
-%% Help function intended to be run in its own process. Will report with
-%% a message when done.
-%% This function will be spawned on.
-rpc(Parent,Node,RegExpMod,Opts) ->			   
-    case rpc:call(Node,?MODULE,match_modules,[RegExpMod,Opts]) of
-	{badrpc,_Reason} ->                  % The node is probably not healthy.
-	    Parent ! {?MODULE,Node,badrpc};
-	Modules ->
-	    Parent ! {?MODULE,Node,Modules}
-    end.
-
-rpc(Parent,Node,RegExpDir,RegExpMod,Opts) ->			   
-    case rpc:call(Node,?MODULE,match_modules,[RegExpDir,RegExpMod,Opts]) of
-	{badrpc,_Reason} ->                  % The node is probably not healthy.
-	    Parent ! {?MODULE,Node,badrpc};
-	Modules ->
-	    Parent ! {?MODULE,Node,Modules}
-    end.
-%% ------------------------------------------------------------------------------
-
-
-%% ==============================================================================
-%% Exported function which actually shall be in code.erl.
-%% ==============================================================================
-
-%% match_modules(RegExpMod,Actions) = [Module,...] | {error,Reason}
-%% match_modules(RegExpDir,RegExpMod,Actions)=[Module,...] | {error,Reason}
-%%   RegExpMod=Erlang regular expression describing module names (string).
-%%   RegExpDir=Erlang regular expression describing directory paths(string) |
-%%             void
-%%   Actions=List of;'only_loaded'.
-%%
-%% Function which matches a regular expresion against module names. The function
-%% can also match the directory from where the module is loaded or will be loaded
-%% against a regular expresion for directory paths.
-%% The function uses the same strategy as code-loading if the same module is
-%% discovered in several places.
-%% (1) An already loaded module shadows all other occurancies.
-%% (2) .beams found in by a path shadows .beams found by paths later in the
-%%   code paths.
-%%
-%% Description of actions:
-%% only_loaded: Only consider modules which are loaded.
-match_modules(RegExpMod,Actions) ->
-    match_modules(void,RegExpMod,Actions).
-match_modules(RegExpDir,RegExpMod,Actions) ->
-    AllLoaded=code:all_loaded(),
-    Mods1=handle_expand_regexp_2(AllLoaded,RegExpDir,RegExpMod,[]),
-    case lists:member(only_loaded,Actions) of % Shall we do not loaded too?
-	false ->                             % Ok, search all paths too then.
-	    Paths=code:get_path(),
-	    handle_expand_regexp_3(Paths,RegExpDir,RegExpMod,AllLoaded,Mods1);
-	true ->                              % Only loaded modules then.
-	    Mods1
-    end.
-
-
-%% Help function which traverses all loaded modules and determines
-%% which shall be returned. First we check that the module satisfies the
-%% module-regexp. Then we, if a dir reg-exp is given, checks that the
-%% module is loaded from an approved path. Note that if it can not be
-%% determined from where it was loaded (like preloaded or cover-compiled
-%% etc), but dir reg-exps are used. That module will be excluded.
-%% Returns a list of modules.
-handle_expand_regexp_2([{Mod,Path}|Rest],RegExpDir,RegExpMod,Result) ->
-    ModStr=atom_to_list(Mod),
-    ModLen=length(ModStr),
-    case re:run(ModStr,RegExpMod) of
-	{match,[{0,ModLen}]} ->                  % Ok, The regexp matches the module.
-	    if
-		is_list(RegExpDir),is_atom(Path) -> % Preloaded or covercompiled...
-		    handle_expand_regexp_2(Rest,RegExpDir,RegExpMod,Result);
-		is_list(RegExpDir),is_list(Path) -> % Dir reg-exp is used!
-		    PathOnly=filename:dirname(Path), % Must remove beam-file name.
-		    case re:run(PathOnly,RegExpDir,[{capture,none}]) of
-			match ->             % Did find a match, that is enough!
-			    handle_expand_regexp_2(Rest,RegExpDir,RegExpMod,[Mod|Result]);
-			_ ->                 % Either error or nomatch.
-			    handle_expand_regexp_2(Rest,RegExpDir,RegExpMod,Result)
-		    end;
-		true ->                      % Otherwise already done!
-		    handle_expand_regexp_2(Rest,RegExpDir,RegExpMod,[Mod|Result])
-	    end;
-	_ ->                                 % Then Mod is not part of the set.
-	    handle_expand_regexp_2(Rest,RegExpDir,RegExpMod,Result)
-    end;
-handle_expand_regexp_2([],_,_,Result) -> Result.
-
-%% Help function which traverses all paths and looks for modules satisfying
-%% the module reg.exp.
-%% Returns a list of unique module names.
-handle_expand_regexp_3([Path|Rest],RegExpDir,RegExpMod,AllLoaded,Result) ->
-    if
-	is_list(RegExpDir) ->                   % We must consider the directory name.
-	    AbsPath=
-		case filename:pathtype(Path) of
-		    absolute ->              % Is already abs.
-			Path;
-		    relative ->              % Then it must be made absolute.
-			filename:absname(Path);
-		    volumerelative ->        % Only on Windows!?
-			filename:absname(Path)
-		end,
-	    case re:run(AbsPath,RegExpDir,[{capture,none}]) of
-		match ->                     % Ok, the directory is allowed.
-		    NewResult=handle_expand_regexp_3_1(Path,RegExpMod,AllLoaded,Result),
-		    handle_expand_regexp_3(Rest,RegExpDir,RegExpMod,AllLoaded,NewResult);
-		_ ->                         % This directory does not qualify.
-		    handle_expand_regexp_3(Rest,RegExpDir,RegExpMod,AllLoaded,Result)
-	    end;
-	true ->                              % RegExpDir is not used!
-	    NewResult=handle_expand_regexp_3_1(Path,RegExpMod,AllLoaded,Result),
-	    handle_expand_regexp_3(Rest,RegExpDir,RegExpMod,AllLoaded,NewResult)
-    end;
-handle_expand_regexp_3([],_,_,_,Result) -> Result.
-
-handle_expand_regexp_3_1(Path,RegExpMod,AllLoaded,Result) ->
-    case file:list_dir(Path) of
-	{ok,FileNames} ->
-	    handle_expand_regexp_3_2(FileNames,RegExpMod,AllLoaded,Result);
-	{error,_Reason} ->                   % Bad path!? Skip it.
-	    Result
-    end.
-
-handle_expand_regexp_3_2([File|Rest],RegExpMod,AllLoaded,Result) ->
-    case filename:extension(File) of
-	".beam" ->                           % It is a beam-file. Consider it!
-	    ModStr=filename:basename(File,".beam"),
-	    Mod=list_to_atom(ModStr),
-	    case {lists:keysearch(Mod,1,AllLoaded),lists:member(Mod,Result)} of
-		{false,false} ->             % This module is not tried before.
-		    ModLen=length(ModStr),
-		    case re:run(ModStr,RegExpMod) of
-			{match,[{0,ModLen}]} ->  % This module satisfies the regexp.
-			    handle_expand_regexp_3_2(Rest,RegExpMod,AllLoaded,[Mod|Result]);
-			_ ->                 % Error or not perfect match.
-			    handle_expand_regexp_3_2(Rest,RegExpMod,AllLoaded,Result)
-		    end;
-		{_,_} ->                     % This module is already tested.
-		    handle_expand_regexp_3_2(Rest,RegExpMod,AllLoaded,Result)
-	    end;
-	_ ->                                 % Not a beam-file, skip it.
-	    handle_expand_regexp_3_2(Rest,RegExpMod,AllLoaded,Result)
-    end;
-handle_expand_regexp_3_2([],_,_,Result) -> Result.
-%% ------------------------------------------------------------------------------
-
-%% Help function which finds out if its argument is a list of zero or more
-%% atoms.
-%% Returns 'true' or 'false'.
-is_list_of_atoms([A|Rest]) when is_atom(A) ->
-    is_list_of_atoms(Rest);
-is_list_of_atoms([_|_]) ->
-    false;
-is_list_of_atoms([]) ->
-    true.
-%% ------------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% Functions transforming function calls in trace-case file.
-%% =============================================================================
-
-%% transform(Exprs,Translations)=NewExprs
-%%   Exprs=list(); List of abstract format erlang terms, as returned by
-%%     io:parse_erl_exprs/2.
-%%   Translations=list(); List of translations from function calls to other
-%%     function calls. [{Mod,Func,Arity,{NewMod,NewFunc,ParamTransformMF}},...]
-%%     Mod can actually be omitted, ParamTransformMF shall be {M,F} where F is
-%%     a function taking one argument (the parameter list), and returning the
-%%     new parameter list. It can also be anything else should no transformation
-%%     of the parameters be the case.
-%%
-%% Function that transforms function calls in a trace-case file. The transform/2
-%% can only transform shallow function calls. I.e where both module and function
-%% name are specified as atoms. Any binding-environment is not examined.
-transform([Expr|Rest],Translations) ->
-    [transform_2(Expr,Translations)|transform(Rest,Translations)];
-transform([],_) ->
-    [].
-
-%% Help function handling a single expr.
-transform_2({call,L1,{remote,L2,ModExpr,FuncExpr},Params},Translations) ->
-    case transform_2(ModExpr,Translations) of
-	{atom,L3,M} ->
-	    case transform_2(FuncExpr,Translations) of
-		{atom,L4,F} ->               % Now we have a M:F/Arity!
-		    case do_call_translation(M,F,Params,Translations) of
-			{ok,NewM,NewF,NewP} ->
-			    NewParams=transform(NewP,Translations),
-			    {call,L1,{remote,L2,{atom,L3,NewM},{atom,L4,NewF}},NewParams};
-			false ->             % No translation or faulty.
-			    NewParams=transform(Params,Translations),
-			    {call,L1,{remote,L2,ModExpr,FuncExpr},NewParams}
-		    end;
-		NewFuncExpr ->               % Not translated to a shallow term.
-		    NewParams=transform(Params,Translations),
-		    {call,L1,{remote,L2,ModExpr,NewFuncExpr},NewParams}
-	    end;
-	NewModExpr ->                        % Not translated to a shallow term.
-	    NewFuncExpr=transform_2(FuncExpr,Translations),
-	    NewParams=transform(Params,Translations),
-	    {call,L1,{remote,L2,NewModExpr,NewFuncExpr},NewParams}
-    end;
-transform_2({call,L1,FuncExpr,Params},Translations) ->
-    case transform_2(FuncExpr,Translations) of
-	{atom,L3,F} ->                       % Now we have a M:F/Arity!
-	    case do_call_translation(F,Params,Translations) of
-		{ok,NewM,NewF,NewP} ->       % It is turned into a global call.
-		    NewParams=transform(NewP,Translations),
-		    {call,L1,{remote,L1,{atom,L3,NewM},{atom,L3,NewF}},NewParams};
-		false ->                     % No translation or faulty.
-		    NewParams=transform(Params,Translations),
-		    {call,L1,FuncExpr,NewParams}
-	    end;
-	NewFuncExpr ->                       % Not translated to a shallow term.
-	    NewParams=transform(Params,Translations),
-	    {call,L1,NewFuncExpr,NewParams}
-    end;
-transform_2({match,L,P,E},Translations) ->
-    NewPattern=transform_2(P,Translations),
-    NewExpr=transform_2(E,Translations),
-    {match,L,NewPattern,NewExpr};
-transform_2({op,L,Op,Arg1,Arg2},Translations) ->
-    NewArg1=transform_2(Arg1,Translations),
-    NewArg2=transform_2(Arg2,Translations),
-    {op,L,Op,NewArg1,NewArg2};
-transform_2({op,L,Op,Arg},Translations) ->
-    NewArg=transform_2(Arg,Translations),
-    {op,L,Op,NewArg};
-transform_2({block,L,Body},Translations) ->
-    NewBody=transform(Body,Translations),
-    {block,L,NewBody};
-transform_2({'if',L,Clauses},Translations) ->
-    NewClauses=transform_clauses(Clauses,Translations),
-    {'if',L,NewClauses};
-transform_2({'case',L,Func,Clauses},Translations) ->
-    NewFunc=transform_2(Func,Translations),
-    NewClauses=transform_clauses(Clauses,Translations),
-    {'case',L,NewFunc,NewClauses};
-transform_2({'fun',L,{clauses,Clauses}},Translations) ->
-    NewClauses=transform_clauses(Clauses,Translations),
-    {'fun',L,NewClauses};
-transform_2({lc,L,Items,GeneratorsFilters},Translations) ->
-    NewItem=transform_2(Items,Translations),
-    NewGensAndFilters=transform_gensandfilters(GeneratorsFilters,Translations),
-    {lc,L,NewItem,NewGensAndFilters};
-transform_2({'catch',L,Expr},Translations) ->
-    NewExpr=transform_2(Expr,Translations),
-    {'catch',L,NewExpr};
-transform_2({tuple,L,Elements},Translations) ->
-    NewElements=transform(Elements,Translations),
-    {tuple,L,NewElements};
-transform_2({cons,L,Element,Tail},Translations) ->
-    NewElement=transform_2(Element,Translations),
-    NewTail=transform_2(Tail,Translations),
-    {cons,L,NewElement,NewTail};
-transform_2({nil,L},_) ->
-    {nil,L};
-transform_2({bin,L,Elements},Translations) ->
-    NewElements=transform_binary(Elements,Translations),
-    {bin,L,NewElements};
-transform_2(Expr,_) ->                       % Can be a var for instance.
-    Expr.
-
-transform_binary([{bin_element,L,Val,Size,TSL}|Rest],Translations) ->
-    NewVal=transform_2(Val,Translations),
-    NewSize=transform_2(Size,Translations),
-    [{bin_element,L,NewVal,NewSize,TSL}|transform_binary(Rest,Translations)];
-transform_binary([],_) ->
-    [].
-
-transform_clauses([{clause,L,Pattern,Guards,Body}|Rest],Translations) ->
-    NewPattern=transform(Pattern,Translations),
-    NewBody=transform(Body,Translations),
-    [{clause,L,NewPattern,Guards,NewBody}|transform_clauses(Rest,Translations)];
-transform_clauses([],_Translations) ->
-    [].
-
-transform_gensandfilters([{generator,L,Pattern,Exprs}|Rest],Translations) ->
-    NewExprs=transform(Exprs,Translations),
-    [{generator,L,Pattern,NewExprs}|transform_gensandfilters(Rest,Translations)];
-transform_gensandfilters([Expr|Rest],Translations) ->
-    [transform_2(Expr,Translations)|transform_gensandfilters(Rest,Translations)];
-transform_gensandfilters([],_) ->
-    [].
-%% ------------------------------------------------------------------------------
-
-%% This is the heart of the translation functionality. Here we actually try to
-%% replace calls to certain functions with other calls. This can include removing
-%% arguments.
-do_call_translation(M,F,Params,Translations) ->
-    case lists:keysearch({M,F,length(Params)},1,Translations) of
-	{value,{_,{NewM,NewF,ArgFun}}} ->    % Lets transform the function.
-	    do_call_translation_2(Params,NewM,NewF,ArgFun);
-	_ ->
-	    false                            % No translations at all.
-    end.
-do_call_translation(F,Params,Translations) ->
-    case lists:keysearch({F,length(Params)},1,Translations) of
-	{value,{_,{NewM,NewF,ArgFun}}} ->    % Lets transform the function.
-	    do_call_translation_2(Params,NewM,NewF,ArgFun);
-	_ ->
-	    false                            % No translations at all.
-    end.
-
-do_call_translation_2(Params,NewM,NewF,ArgFun) ->
-    case ArgFun of
-	{M,F} when is_atom(M),is_atom(F) ->
-	    case catch M:F(Params) of
-		{'EXIT',_Reason} ->
-		    false;                   % If it does not work, skipp it.
-		MungedParams when is_list(MungedParams) ->
-		    {ok,NewM,NewF,MungedParams};
-		_ ->
-		    false
-	    end;
-	_ ->                                 % No munging of parameters.
-	    {ok,NewM,NewF,Params}
-    end.
-%% ------------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% Functions for the runtime component internal debugging system.
-%% =============================================================================
-
-%% The debug system is meant to provide tracing of ttb at different levels.
-%%
-%% debug(What,Level,Description) -> nothing significant.
-%%   What : controls what kind of event. This can both be certain parts of ttb
-%%          as well as certain levels (info to catastrophy).
-%%   Level: Determines if What shall be printed or not.
-%%   Description: this is what happend.
-debug(off,_What,_Description) ->
-    true;                                    % Debug is off, no action.
-debug(On,What,Description) ->
-    debug_2(On,What,Description).
-
-debug_2(_,What,Description) ->
-    io:format("INVISO DEBUG:~w, ~p~n",[What,Description]).
-%% -----------------------------------------------------------------------------
diff --git a/lib/runtime_tools/src/inviso_rt_meta.erl b/lib/runtime_tools/src/inviso_rt_meta.erl
deleted file mode 100644
index 6865dc2242..0000000000
--- a/lib/runtime_tools/src/inviso_rt_meta.erl
+++ /dev/null
@@ -1,1207 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% Author: Lennart �hman, [email protected]
-%%
-%% This module implements the meta tracer process belonging to the
-%% runtime component. Its main purpose is to write the ti-file (traceinformation).
-%% The ti-file contains translations between process id:s and what ever "you"
-%% want to read in the merged and formatted logfile.
-%% This process interacts with the runtime component process.
-%%
-%% Currently it handles the following types of ti-files:
-%%   Plain raw, binary log.
-%%   Relay to other inviso_rt_meta process on another node.
-%%
-%% The TI file will be on binary format and each entry is:
-%%   <<LengthIndicator:32, {Pid,Alias,Op,NowStamp} >>
-%%       Pid=pid(), or if OP==unalias pid()|any_other_than_pid()
-%%       Op=alias|unalias
-%% -----------------------------------------------------------------------------
--module(inviso_rt_meta).
-
-%% -----------------------------------------------------------------------------
-%% API exports.
-%% -----------------------------------------------------------------------------
-
--export([start/2,start/5]).
--export([stop/1,suspend/1]).
--export([init_tpm/5,init_tpm/8]).
--export([tpm/5,tpm/6,tpm/9,tpm_tracer/5,tpm_tracer/6,tpm_tracer/9]).
--export([tpm_ms/6,tpm_ms_tracer/6,ctpm_ms/5,ctpm/4]).
--export([local_register/1,global_register/1]).
--export([remove_local_register/1,remove_global_register/1]).
-
--export([write_ti/1]).
-
--export([get_tracer/0,tpm_ms/5,tpm_ms_tracer/5,list_tpm_ms/3,ctpm_ms/4]).
-
--export([metacast_call/5,metacast_return_from/6]).
--export([get_state/1]).
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% Internal exports.
-%% -----------------------------------------------------------------------------
-
--export([init/6]).
--export([init_std_publld/2,clean_std_publld/1]).
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% Constants.
-%% -----------------------------------------------------------------------------
-
--define(NAMED_MS_TAB,inviso_rt_meta_named_ms).
-
-%% -----------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% Exported API (Meant to be used by a runtime component).
-%% =============================================================================
-
-%% start(TiData,Tracer)={ok,Pid} | {error,Reason}
-%% start(TiData,Tracer,InitPublLDmfa,RemovePublLDmfa,CleanPublLDmf)=
-%%     {ok,Pid} | {error,Reason}
-%%   TiData={file,FileName}|{relay,Node}
-%%   Tracer=pid()|port()
-%%   FileName=string()
-%%   InitPublLDmfa={Mod,Func,ArgList}
-%%   RemovePublLDmf={Mod,Func} | void
-%%     RemovePublLDmf(PublLD)->nothing significant.
-%%     These functions are called to create and destroy the public loopdata
-%%     structure available to the meta-trace CallFunc and ReturnFunc.
-%%   CleanPublLDmf={Mod,Func}
-%%     This function will periodically be called to clean the public LD from
-%%     pending meta-trace messages waiting for a corresponding return_from
-%%     message.
-%%
-%% Starts a meta-tracer process, opening the ti-file specified in TiData. PublLD
-%% is used to communicate data, typically between a call and return_from.
-%% If no special initialization function is specified a standard one is used.
-%% Note that the meta tracer function must know "who" is the regular tracer
-%% (process or port). This because it must be possible to append {tracer,Tracer}
-%% in meta match specs.
-start(TiData,Tracer) ->
-    Pid=spawn_link(?MODULE,
-		   init,
-		   [self(),
-		    TiData,
-		    Tracer,
-		    {?MODULE,init_std_publld,[2,[]]},
-		    void,
-		    {?MODULE,clean_std_publld}]),
-    wait_for_reply(Pid).
-start(TiData,Tracer,InitPublLDmfa,RemovePublLDmf,CleanPublLDmf) ->
-    Pid=spawn_link(?MODULE,
-		   init,
-		   [self(),TiData,Tracer,InitPublLDmfa,RemovePublLDmf,CleanPublLDmf]),
-    wait_for_reply(Pid).
-
-wait_for_reply(Pid) ->
-    receive
-	{Pid,ok} ->
-	    {ok,Pid};
-	{Pid,{error,Reason}} ->
-	    {error,Reason}
-    after
-	10000 ->                             % After very long time.
-	    exit(Pid,kill),                  % It must be hanging.
-	    {error,time_out}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% stop(Pid)=ok
-%%   Pid=Adders to the meta tracer, pid().
-%% Shutsdown the metatracer.
-stop(Pid) ->
-    Pid ! {stop,self()},
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% suspend(Pid)=ok
-%%   Pid=Adders to the meta tracer, pid().
-%% Suspends the meta tracer by removing all meta trace patterns.
-suspend(Pid) ->
-    Pid ! {suspend,self()},
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% init_tpm(Pid,Mod,Func,Arity,CallFunc)=
-%% init_tpm(Pid,Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc)=ok|{error,Reason}.
-%%   Pid=Address to meta tracer process, pid().
-%%   Mod,Func=Pointing out the function which shall be meta traced, atom().
-%%   Arity=As above, integer().
-%%   InitFunc,RemoveFunc={Module,Function}|fun(), functions being called when
-%%     to initialize the public loopdata structure, and to reset it.
-%%       InitFunc(Mod,Func,Arity,PublLD)->{ok,NewPublLD,Output}
-%%         Supposed to initialize whatever needs to be done before
-%%         handling any incoming meta-trace message for the Mod:Func/Arity.
-%%       RemoveFunc(Mod,Func,Arity,PublLD)->{ok,NewPublLD}
-%%         Called when meta tracing of Mod:Func/Arity is stopped. It is supposed
-%%         to clear datastructures away from the PublLD.
-%% Initializes the public loopdata for this function. Note that we can not use wildcards
-%% here (even if it is perfectly legal in Erlang). It also sets the CallFunc and
-%% ReturnFunc for the meta traced function. The function is hence ready to be
-%% meta traced with either tpm/5 or tpm_ms/5.
-%% This function is synchronous, waiting for a reply from the meta server.
-init_tpm(Pid,Mod,Func,Arity,CallFunc) ->
-    init_tpm(Pid,Mod,Func,Arity,void,CallFunc,void,void).
-init_tpm(Pid,Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->
-    send_wait(Pid,
-	      {init_tpm,{Mod,Func,Arity},InitFunc,CallFunc,ReturnFunc,RemoveFunc}).
-%% -----------------------------------------------------------------------------
-
-%% tpm(Pid,Mod,Func,Arity,MatchSpec)={ok,N}|{error,Reason}
-%% tpm(Pid,Mod,Func,Arity,MatchSpec,CallFunc)={ok,N}|{error,Reason}
-%% tpm(Pid,Mod,Func,Arity,MatchSpec,InitFunc,CallFunc,ReturnFunc,RemoveFunc)=
-%%   Pid=Address to meta tracer process, pid().
-%%   Mod,Func=Pointing out the function which shall be meta traced, atom().
-%%   Arity=As above, integer().
-%%   MatchSpec=List of match specification, possibly empty. Remember {return_trace}
-%%     if expecting return_from messages.
-%%   InitFunc,CallFunc,ReturnFunc,RemoveFunc={Module,Function}|fun(),
-%%     functions being called when these functions are called by the meta trace
-%%     server at certain events.
-%%       CallFunc(CallingPid,ActualArgList,PublLD)->{ok,NewPrivLD,Output}
-%%       ReturnFunc(CallingPid,ReturnValue,PublLD)->{ok,NewPrivLD,Output}
-%%         When a call respectively return_from trace message arrives for the meta
-%%         traced function, the corresponding function is called.
-%%         The ReturnFunc must handle the fact that a return_from message arrives
-%%         for a call which was never noticed. This because the message queue of the
-%%         meta tracer may have been emptied.
-%%   Reason=badarg | 
-%%   Output=Characters to be written to the ti-file, bin() | 'void'
-%% The tpm/5 function simply starts meta tracing for the function. It must
-%% previously have been initialized.
-%% tpm/6 & /9 initializes the function and starts meta tracing.
-tpm(Pid,Mod,Func,Arity,MatchSpec)
-  when is_atom(Mod),is_atom(Func),is_integer(Arity),is_list(MatchSpec),Mod/='_',Func/='_'->
-    send_wait(Pid,{tpm,{Mod,Func,Arity,MatchSpec}});
-tpm(_,_,_,_,_) ->
-    {error,badarg}.
-
-tpm(Pid,Mod,Func,Arity,MatchSpec,CallFunc) ->
-    tpm(Pid,Mod,Func,Arity,MatchSpec,void,CallFunc,void,void).
-
-tpm(Pid,Mod,Func,Arity,MatchSpec,InitFunc,CallFunc,ReturnFunc,RemoveFunc)
-  when is_atom(Mod),is_atom(Func),is_integer(Arity),is_list(MatchSpec),Mod/='_',Func/='_' ->
-    send_wait(Pid,{tpm,{Mod,Func,Arity,MatchSpec},InitFunc,CallFunc,ReturnFunc,RemoveFunc});
-tpm(_,_,_,_,_,_,_,_,_) ->
-    {error,badarg}.
-%% -----------------------------------------------------------------------------
-
-%% Same as tpm/X but the meta tracer will automatically append {tracer,Tracer}
-%% to the enable list in a {trace,Disable,Enable} match spec action term.
-tpm_tracer(Pid,Mod,Func,Arity,MatchSpec)
-  when is_atom(Mod),is_atom(Func),is_integer(Arity),is_list(MatchSpec),Mod/='_',Func/='_'->
-    send_wait(Pid,{tpm_tracer,{Mod,Func,Arity,MatchSpec}});
-tpm_tracer(_,_,_,_,_) ->
-    {error,badarg}.
-
-tpm_tracer(Pid,Mod,Func,Arity,MatchSpec,CallFunc) ->
-    tpm_tracer(Pid,Mod,Func,Arity,MatchSpec,void,CallFunc,void,void).
-
-tpm_tracer(Pid,Mod,Func,Arity,MatchSpec,InitFunc,CallFunc,ReturnFunc,RemoveFunc)
-  when is_atom(Mod),is_atom(Func),is_integer(Arity),is_list(MatchSpec),Mod/='_',Func/='_' ->
-    send_wait(Pid,{tpm_tracer,
-		   {Mod,Func,Arity,MatchSpec},
-		   InitFunc,CallFunc,ReturnFunc,RemoveFunc});
-tpm_tracer(_,_,_,_,_,_,_,_,_) ->
-    {error,badarg}.
-%% -----------------------------------------------------------------------------
-
-%% tpm_ms(Pid,Mod,Func,Arity,MSname,MS)={ok,N}|{error,Reason}
-%%   Pid=Address to meta tracer process, pid().
-%%   Mod,Func=Pointing out the function to which we shall add a match-spec., atom().
-%%   Arity=As above, integer().
-%%   MSname=A name to be used if this MS shall be removed later. term().
-%%   MatchSpec=List of match specification, Remember {return_trace}
-%%     if expecting return_from messages.
-%% This function adds a list of match-specs to the already existing ones. It
-%% uses an internal database to keep track of existing match-specs. If the
-%% match-spec does not result in any meta traced functions (for whatever reason),
-%% the MS is not saved in the database. The previously known match-specs are
-%% not removed.
-tpm_ms(Pid,Mod,Func,Arity,MSname,MS) ->
-    send_wait(Pid,{tpm_ms,{Mod,Func,Arity},MSname,MS}).
-%% -----------------------------------------------------------------------------
-
-%% Same as tpm_ms/6 but the meta tracer will automatically append {tracer,Tracer}
-%% to the enable list in a {trace,Disable,Enable} match spec action term.
-tpm_ms_tracer(Pid,Mod,Func,Arity,MSname,MS) ->
-    send_wait(Pid,{tpm_ms_tracer,{Mod,Func,Arity},MSname,MS}).
-%% -----------------------------------------------------------------------------
-
-%% ctpm_ms(Pid,Mod,Func,Arity)=ok
-%%
-%% Removes a names match-spec from the meta traced function. Note that is never
-%% a fault to remove an MS. Not even from a function which is non existant.
-ctpm_ms(Pid,Mod,Func,Arity,MSname) ->
-    send_wait(Pid,{ctpm_ms,{Mod,Func,Arity},MSname}).
-%% -----------------------------------------------------------------------------
-
-%% Quick versions for erlang:register/2 which also uses a default CallFunc
-%% and a default ReturnFunc.
-local_register(Pid) ->
-    Res1=tpm(Pid,
-	     erlang,register,2,[{'_',[],[{exception_trace}]}],
-	     fun metafunc_init/4,fun local_register_call/3,
-	     fun local_register_return/3,void),
-    Res2=tpm(Pid,
-	     erlang,unregister,1,[],
-	     void,fun local_unregister_call/3,void,void),
-    {Res1,Res2}.
-%% -----------------------------------------------------------------------------
-
-%% Quick version for global:register_name/2, /3.
-global_register(Pid) ->
-    Res1=tpm(Pid,global,handle_call,3,[{[{register,'_','_','_'},'_','_'],[],[]}],
-	void,fun global_register_call/3,void,void),
-    Res2=tpm(Pid,global,delete_global_name,2,[],
-	     void,fun global_unregister_call/3,void,void),
-    {Res1,Res2}.
-%% -----------------------------------------------------------------------------
-
-%% ctpm(Pid,Mod,Func,Arity)=ok|{error,bad_mfa}
-%%
-%% Removes the meta trace pattern for the function, means stops generating output
-%% for this function. The public LD may be cleared by the previously entered
-%% RemoveFunc.
-ctpm(Pid,Mod,Func,Arity) ->
-    send_wait(Pid,{ctpm,{Mod,Func,Arity}}).
-%% -----------------------------------------------------------------------------
-
-%% remove_local_register(Pid)={Res1,Res2}
-%%   Res1,Res2=ok|{error,Reason}
-remove_local_register(Pid) ->
-    Res1=ctpm(Pid,erlang,register,2),
-    Res2=ctpm(Pid,erlang,unregister,1),
-    {Res1,Res2}.
-%% -----------------------------------------------------------------------------
-
-%% remove_global_register(Pid)={Res1,Res2}
-%%   Res1,Res2=ok|{error,Reason}
-remove_global_register(Pid) ->
-    Res1=ctpm(Pid,global,handle_call,3),
-    Res2=ctpm(Pid,global,delete_global_name,2),
-    {Res1,Res2}.
-%% -----------------------------------------------------------------------------
-
-%% Exported help functions which may be used in programming CallFunc and/or
-%% ReturnFunc. Useful if the call is done on one node but must trigger the
-%% start of something at other nodes.
-metacast_call(Nodes,OrigPid,M,F,Args) ->
-    multicast(Nodes,{trace_ts,OrigPid,call,{M,F,Args},void}),
-    ok.
-
-metacast_return_from(Nodes,OrigPid,M,F,Arity,Value) ->
-    multicast(Nodes,{trace_ts,OrigPid,return_from,{M,F,Arity},Value,void}),
-    ok.
-
-multicast([Node|Rest],Msg) ->
-    {?MODULE,Node} ! Msg,
-    multicast(Rest,Msg);
-multicast([],_) ->
-    true.
-%% -----------------------------------------------------------------------------
-
-%% get_states(Pid)={ok,LD,PubLD}.
-get_state(Pid) ->
-    send_wait(Pid,get_state).
-%% -----------------------------------------------------------------------------
-
-
-send_wait(To,Msg) ->
-    Ref=make_ref(),
-    MRef=erlang:monitor(process,To),
-    To ! {Msg,Ref,self()},
-    receive
-	{inviso_rt_meta_reply,Ref,Reply} ->
-	    erlang:demonitor(MRef),
-	    Reply;
-	{'DOWN',MRef,_,_To,_Reason} ->
-	    {error,no_metatracer}
-    end.
-
-reply(To,Ref,Reply) ->
-    To ! {inviso_rt_meta_reply,Ref,Reply}.
-%% -----------------------------------------------------------------------------
-
-%% =============================================================================
-%% Special API.
-%% =============================================================================
-
-%% write_ti(OutPut)=
-%%   OutPut=binary()
-%% Makes an extra entry into the trace information file (ti-file). This is useful
-%% if a pid-alias association is learned in another way than through a meta traced
-%% function call. Note that this API can only be used locally at the node in
-%% question.
-write_ti(OutPut) ->
-    catch ?MODULE ! {write_ti,OutPut}.
-%% -----------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% API intended to be used on CallFuncs and RemoveFuncs.
-%% =============================================================================
-
-%% The reason there must be a special API for CallFuncs and RemoveFuncs are is
-%% that those functions are executed inside *this* process context. Hence they
-%% can not make function calls requiering this process to receive messages.
-
-%% Returns the tracer used for regular tracing. The reason this is implemented
-%% in this way is that this function is intended to be used in meta trace call-
-%% back functions. And there we can not have message passing API:s to the meta
-%% trace(!).
-get_tracer() ->
-    get(tracer).
-%% -----------------------------------------------------------------------------
-
-%% Function equivalent to inviso_rt:tpm_ms/6. This function can *only* be used
-%% inside a CallFunc or a RemoveFunc.
-tpm_ms(Mod,Func,Arity,MSname,MS) ->
-    case check_mfarity_exists(Mod,Func,Arity) of
-	yes ->                               % Ok, and args must be ok then also.
-	    {ok,h_tpm_ms(Mod,Func,Arity,MSname,MS)};
-	no ->
-	    {error,not_initiated}
-    end.
-%% -----------------------------------------------------------------------------
-
-tpm_ms_tracer(Mod,Func,Arity,MSname,MS) ->
-    case check_mfarity_exists(Mod,Func,Arity) of
-	yes ->                               % Ok, and args must be ok then also.
-	    NewMS=add_tracer(MS,get_tracer()),
-	    {ok,h_tpm_ms(Mod,Func,Arity,MSname,NewMS)};
-	no ->
-	    {error,not_initiated}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Function that returns all MSname in use for Mod:Func/Arity
-list_tpm_ms(Mod,Func,Arity) ->
-    {ok,h_list_tpm_ms(Mod,Func,Arity)}.
-%% -----------------------------------------------------------------------------
-
-%% Function equivalent to inviso_rt:ctpm_ms/5. This function can *only* be used
-%% inside a CallFunc or a RemoveFunc.
-ctpm_ms(Mod,Func,Arity,MSname) ->
-    h_ctpm_ms(Mod,Func,Arity,MSname),
-    ok.
-%% -----------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% The server implemenation.
-%% =============================================================================
-
-init(Parent,TiData,Tracer,InitPublLDmfa,RemovePublLDmf,CleanPublLDmf) ->
-    process_flag(priority,high),            % Since we may receive from many procs.
-    register(?MODULE,self()),               % So we can act as relay receiver.
-    case open_traceinfo_file(TiData) of
-	{ok,TI} ->                          % The ti.-file.
-	    TId=ets:new(?NAMED_MS_TAB,[named_table,set,protected]),
-	    PublLD=do_init_publ_ld(InitPublLDmfa),
-	    Parent ! {self(),ok},
-	    put(tracer,Tracer),             % Uggly quick fix!
-	    loop(Parent,
-		 Tracer,
-		 TI,
-		 mk_new_ld(InitPublLDmfa,RemovePublLDmf,CleanPublLDmf,TId),
-		 PublLD,
-		 now());
-	{error,Reason} ->
-	    Parent ! {self(),{error,Reason}}
-    end.
-%% -----------------------------------------------------------------------------
-
-loop(Parent,Tracer,TI,LD,PrevPublLD,PrevCleanTime) ->
-    {PublLD,CleanTime}=throw_old_failed(get_cleanpublldmf_ld(LD),PrevPublLD,PrevCleanTime),
-    receive
-	{{init_tpm,{Mod,Func,Arity},InitFunc,CallFunc,ReturnFunc,RemoveFunc},Ref,Parent} ->
-	    case check_mfarity_exists(Mod,Func,Arity) of
-		no ->                       % Good then we can add it!
-		    case check_tpm_args(Mod,Func,Arity) of
-			true ->             % Args are ok.
-			    {NewLD,NewPublLD}=
-				h_init_tpm(Mod,Func,Arity,
-					   InitFunc,CallFunc,ReturnFunc,RemoveFunc,
-					   TI,LD,PublLD),
-			    reply(Parent,Ref,ok),
-			    loop(Parent,Tracer,TI,NewLD,NewPublLD,CleanTime);
-			false ->            % Faulty arguments,
-			    reply(Parent,Ref,{error,bad_mfa}),
-			    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-		    end;
-		yes ->                      % If it already exists, cant init again.
-		    reply(Parent,Ref,{error,already_initiated}),
-		    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-	    end;
-	{{tpm,{Mod,Func,Arity,MS},InitFunc,CallFunc,ReturnFunc,RemoveFunc},Ref,Parent} ->
-	    case check_mfarity_exists(Mod,Func,Arity) of
-		no ->                       % Good then we can add it!
-		    case check_tpm_args(Mod,Func,Arity) of
-			true ->             % Args are ok.
-			    {NewLD,NewPublLD,N}=
-				h_tpm(Mod,Func,Arity,MS,
-				      InitFunc,CallFunc,ReturnFunc,RemoveFunc,
-				      TI,LD,PublLD),
-			    reply(Parent,Ref,{ok,N}),
-			    loop(Parent,Tracer,TI,NewLD,NewPublLD,CleanTime);
-			false ->
-			    reply(Parent,Ref,{error,bad_mfa}),
-			    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-		    end;
-		yes ->
-		    reply(Parent,Ref,{error,already_initiated}),
-		    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-	    end;
-	{{tpm,{Mod,Func,Arity,MS}},Ref,Parent} ->
-	    case check_mfarity_exists(Mod,Func,Arity) of
-		yes ->                      % Ok, and args must be ok then also.
-		    {NewLD,N}=h_tpm(Mod,Func,Arity,MS,LD),
-		    reply(Parent,Ref,{ok,N}),
-		    loop(Parent,Tracer,TI,NewLD,PublLD,CleanTime);
-		no ->                       % Must be initiated before.
-		    reply(Parent,Ref,{error,not_initiated}),
-		    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-	    end;
-	{{tpm_tracer,{Mod,Func,Arity,MS},InitFunc,CallFunc,ReturnFunc,RemoveFunc},Ref,Parent} ->
-	    case check_mfarity_exists(Mod,Func,Arity) of
-		no ->                       % Good then we can add it!
-		    case check_tpm_args(Mod,Func,Arity) of
-			true ->             % Args are ok.
-			    NewMS=add_tracer(MS,Tracer),
-			    {NewLD,NewPublLD,N}=
-				h_tpm(Mod,Func,Arity,NewMS,
-				      InitFunc,CallFunc,ReturnFunc,RemoveFunc,
-				      TI,LD,PublLD),
-			    reply(Parent,Ref,{ok,N}),
-			    loop(Parent,Tracer,TI,NewLD,NewPublLD,CleanTime);
-			false ->
-			    reply(Parent,Ref,{error,bad_mfa}),
-			    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-		    end;
-		yes ->
-		    reply(Parent,Ref,{error,already_initiated}),
-		    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-	    end;
-	{{tpm_tracer,{Mod,Func,Arity,MS}},Ref,Parent} ->
-	    case check_mfarity_exists(Mod,Func,Arity) of
-		yes ->                      % Ok, and args must be ok then also.
-		    NewMS=add_tracer(MS,Tracer),
-		    {NewLD,N}=h_tpm(Mod,Func,Arity,NewMS,LD),
-		    reply(Parent,Ref,{ok,N}),
-		    loop(Parent,Tracer,TI,NewLD,PublLD,CleanTime);
-		no ->                       % Must be initiated before.
-		    reply(Parent,Ref,{error,not_initiated}),
-		    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-	    end;
-	{{tpm_ms,{Mod,Func,Arity},MSname,MS},Ref,Parent} ->
-	    case check_mfarity_exists(Mod,Func,Arity) of
-		yes ->                      % Ok, and args must be ok then also.
-		    reply(Parent,Ref,{ok,h_tpm_ms(Mod,Func,Arity,MSname,MS)}),
-		    loop(Parent,Tracer,TI,LD,PublLD,CleanTime);
-		no ->
-		    reply(Parent,Ref,{error,not_initiated}),
-		    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-	    end;
-	{{tpm_ms_tracer,{Mod,Func,Arity},MSname,MS},Ref,Parent} ->
-	    case check_mfarity_exists(Mod,Func,Arity) of
-		yes ->                      % Ok, and args must be ok then also.
-		    NewMS=add_tracer(MS,Tracer),
-		    reply(Parent,Ref,{ok,h_tpm_ms(Mod,Func,Arity,MSname,NewMS)}),
-		    loop(Parent,Tracer,TI,LD,PublLD,CleanTime);
-		no ->
-		    reply(Parent,Ref,{error,not_initiated}),
-		    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-	    end;
-	{{ctpm_ms,{Mod,Func,Arity},MSname},Ref,Parent} ->
-	    reply(Parent,Ref,ok),
-	    h_ctpm_ms(Mod,Func,Arity,MSname),
-	    loop(Parent,Tracer,TI,LD,PublLD,CleanTime);
-	{{ctpm,{Mod,Func,Arity}},Ref,Parent} ->
-	    case get_remove_func_ld(Mod,Func,Arity,LD) of
-		false ->                    % Incorrect Mod:Func/Arity!
-		    reply(Parent,Ref,{error,bad_mfa}),
-		    loop(Parent,Tracer,TI,LD,PublLD,CleanTime); % Do nothing!
-		MF ->                       % {M,F}, Func or 'void'.
-		    catch erlang:trace_pattern({Mod,Func,Arity},false,[meta]),
-		    NewPublLD=do_removefunc(MF,Mod,Func,Arity,PublLD),
-		    NewLD=ctpm_ld(Mod,Func,Arity,LD),
-		    reply(Parent,Ref,ok),
-		    loop(Parent,Tracer,TI,NewLD,NewPublLD,CleanTime)
-	    end;
-	{suspend,Parent} ->                 % Removes all meta trace patterns.
-	    stop_all_meta_tracing(get_all_meta_funcs_ld(LD),PublLD,LD),
-	    do_remove_publ_ld(get_removepublldmf_ld(LD),PublLD),
-	    NewPublLD=do_init_publ_ld(get_initpublldmfa_ld(LD)),
-	    loop(Parent,Tracer,TI,reset_ld(LD),NewPublLD,CleanTime);
-	{stop,Parent} ->                    % Make a controlled shutdown.
-	    stop_all_meta_tracing(get_all_meta_funcs_ld(LD),PublLD,LD),
-	    do_remove_publ_ld(get_removepublldmf_ld(LD),PublLD),
-	    close_traceinfo_file(TI);       % And then simply terminate.
-	{trace_ts,Pid,call,{M,F,Args},TS} ->
-	    case handle_meta(get_call_func_ld(M,F,length(Args),LD),Pid,{call,Args,TS},PublLD) of
-		{ok,NewPublLD,Output} when is_binary(Output);is_list(Output) ->
-		    write_output(TI,Output),
-		    loop(Parent,Tracer,TI,LD,NewPublLD,CleanTime);
-		{ok,NewPublLD,_} ->         % No output to the ti-file this time.
-		    loop(Parent,Tracer,TI,LD,NewPublLD,CleanTime);
-		_ ->                        % Not handled correct, not much to do.
-		    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-	    end;
-	{trace_ts,Pid,TypeTag,{M,F,Arity},Value,TS}
-	  when TypeTag==return_from;TypeTag==exception_from ->
-	    case handle_meta(get_return_func_ld(M,F,Arity,LD),Pid,{TypeTag,Value,TS},PublLD) of
-		{ok,NewPublLD,Output} when is_binary(Output);is_list(Output) ->
-		    write_output(TI,Output),
-		    loop(Parent,Tracer,TI,LD,NewPublLD,CleanTime);
-		{ok,NewPublLD,_} ->         % No output to the ti-file this time.
-		    loop(Parent,Tracer,TI,LD,NewPublLD,CleanTime);
-		_ ->                        % Not handled correct, not much to do.
-		    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-	    end;
-	{relayed_meta,Bin} ->
-	    write_output(TI,Bin),
-	    loop(Parent,Tracer,TI,LD,PublLD,CleanTime);
-	{write_ti,OutPut} ->
-	    write_output(TI,OutPut),
-	    loop(Parent,Tracer,TI,LD,PublLD,CleanTime);
-	{get_state,Ref,From} ->             % Debug function.
-	    reply(From,Ref,{ok,LD,PublLD}),
-	    loop(Parent,Tracer,TI,LD,PublLD,CleanTime);
-	_Other ->
-	    loop(Parent,Tracer,TI,LD,PublLD,CleanTime)
-    end.
-
-
-%% =============================================================================
-%% First level help functions.
-%% =============================================================================
-
-%% Function which opens the trace-information file(s). It must understand
-%% the tidata specification which is part of the tracerdata given to the
-%% runtime component during init_tracing.
-%% It must return an internal notation of the time of file open and a
-%% useful descriptor the write_output function can use.
-%% Returns {ok,TiDescriptor} or {error,Reason}.
-open_traceinfo_file({file,FileName}) ->     % A plain raw binary file.
-    case file:open(FileName,[write,raw,binary]) of
-	{ok,FD} ->
-	    {ok,{file,FD}};
-	{error,Reason} ->
-	    {error,{open,[FileName,Reason]}}
-    end;
-open_traceinfo_file({relay,ToNode}) ->      % Use distributed Erlang.
-    {ok,{relay,ToNode}};
-open_traceinfo_file(IncorrectTI) ->
-    {error,{badarg,IncorrectTI}}.
-%% -----------------------------------------------------------------------------
-
-close_traceinfo_file({file,FD}) ->
-    file:close(FD);
-close_traceinfo_file(_) ->
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% Help function handling initializing meta tracing of a function.
-%% Returns {NewLD,NewPublLD}.
-h_init_tpm(Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc,TI,LD,PublLD) ->
-    case do_initfunc(InitFunc,Mod,Func,Arity,PublLD) of
-	{NewPublLD,Output} ->
-	    write_output(TI,Output),
-	    NewLD=init_tpm_ld(Mod,Func,Arity,CallFunc,ReturnFunc,RemoveFunc,LD),
-	    {NewLD,NewPublLD};
-	false ->                            % The initfunc did not do anything.
-	    NewLD=init_tpm_ld(Mod,Func,Arity,CallFunc,ReturnFunc,RemoveFunc,LD),
-	    {NewLD,PublLD}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function handling initializing meta tracing of a function and also
-%% set the meta trace pattern as specified.
-%% Returns {NewLD,NewPublLD,N}.
-h_tpm(Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc,TI,LD,PublLD) ->
-    {NewLD,NewPublLD}=
-	h_init_tpm(Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc,TI,LD,PublLD),
-    case set_meta_tracing(Mod,Func,Arity,MS) of
-	true ->                              % Ok, set one pattern.
-	    {NewLD,NewPublLD,1};
-	false ->
-	    {NewLD,NewPublLD,0}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function handling setting meta trace patter for a function which has
-%% already been intialized. Note that we must remove all potentially stored
-%% match-specs, if this function has been given match-specs before with
-%% tpm_ms.
-%% Returns a {NewLD,N}.
-h_tpm(Mod,Func,Arity,MS,LD) ->
-    case set_meta_tracing(Mod,Func,Arity,MS) of
-	true ->
-	    {remove_ms_ld(Mod,Func,Arity,LD),1};
-	false ->
-	    {LD,0}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function that adds a match-spec to Mod:Func/Arity. It is not defined
-%% in which order the match-specs will be given to the BIF.
-%% Note that if an MS with the same name as an exiting is inserted, the previous
-%% match-spec will be removed.
-%% Very important to realise is that the empty meta match spec [] imposes no
-%% restrictions what so ever on the generating of meta trace call messages.
-%% Uncontrolled sending of such messages may quickly drain power from the system.
-%% Since an empty match-spec will "disappear" when added to other match specs,
-%% the empty match is transformed to what it actually is: [{'_',[],[]}].
-%% Returns 0 or 1 indicating failure or success.
-h_tpm_ms(Mod,Func,Arity,MSname,MS) ->
-    MSsNames=get_ms_ld(Mod,Func,Arity),     % Fetch all previous match-specs.
-    TransformedMS=h_tpm_ms_convert_null_ms(MS),
-    MSsNames1=lists:keydelete(MSname,1,MSsNames), % If it already existed, it is gone!
-    NewMSs=lists:flatten([TransformedMS,lists:map(fun({_Name,MSx})->MSx end,MSsNames1)]),
-    case set_meta_tracing(Mod,Func,Arity,NewMSs) of
-	true ->                             % We only save the MS if it was good.
-	    put_ms_ld(Mod,Func,Arity,MSname,TransformedMS,MSsNames1),
-	    1;
-	false ->
-	    0
-    end.
-
-%% Help function converting the null match spec into, still a null match spec,
-%% on a proper match spec format. This because it will otherwise be difficult
-%% to see the difference between no active tpm_ms and all a set of null ms.
-h_tpm_ms_convert_null_ms([]) ->
-    [{'_',[],[]}];
-h_tpm_ms_convert_null_ms(MS) ->
-    MS.
-%% -----------------------------------------------------------------------------
-
-%% Help function returning a list of all names used for match-functions for
-%% the Mod:Func/Arity in question.
-h_list_tpm_ms(Mod,Func,Arity) ->
-    MSsNames=get_ms_ld(Mod,Func,Arity),     % A list of {MSname,MS}.
-    lists:map(fun({MSname,_})->MSname end,MSsNames).
-%% -----------------------------------------------------------------------------
-
-%% Function that removes a named match-spec. Returns nothing significant.
-%% Note that if we end up with no match-specs, we must remove the meta trace
-%% patten all together. That is bringing the function back to just initiated.
-h_ctpm_ms(Mod,Func,Arity,MSname) ->
-    case get_ms_ld(Mod,Func,Arity) of
-	[] ->                               % The name does certainly not exist!
-	    true;                           % We don't have to do anything.
-	MSsNames ->
-	    case lists:keysearch(MSname,1,MSsNames) of
-		{value,{_,_MS}} ->          % Ok, we must do something!
-		    NewMSsNames=lists:keydelete(MSname,1,MSsNames),
-		    case lists:flatten(lists:map(fun({_Name,MS})->MS end,NewMSsNames)) of
-			[] ->               % This means stop meta tracing.
-			    set_meta_tracing(Mod,Func,Arity,false);
-			NewMSs ->
-			    set_meta_tracing(Mod,Func,Arity,NewMSs)
-		    end,
-		    set_ms_ld(Mod,Func,Arity,NewMSsNames);
-		false ->                    % But this name does not exist.
-		    true                    % So we do not have to do anything.
-	    end
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Function that checks the arguments to the meta trace pattern. The reason we
-%% must do this is that we can only allow meta tracing on specific functions and
-%% not using wildpatterns. Otherwise the meta trace server will not understand
-%% which callfunc for instance to call when a meta-trace message is generated
-%% for a function.
-%% Returns 'true' or 'false'.
-check_tpm_args(Mod,Func,Arity)
-  when is_atom(Mod),is_atom(Func),is_integer(Arity),Mod/='_',Func/='_' ->
-    true;
-check_tpm_args(_,_,_) ->
-    false.
-%% -----------------------------------------------------------------------------
-
-%% Help function which calls the actual BIF setting meta-trace-patterns.
-%% Returns 'true' or 'false'.
-set_meta_tracing(Mod,Func,Arity,MS) when is_atom(Mod) ->
-    case erlang:module_loaded(Mod) of
-	true ->
-	    set_meta_tracing_2(Mod,Func,Arity,MS);
-	false ->                            % The module is not loaded.
-	    case code:ensure_loaded(Mod) of
-		{module,_Mod} ->
-		    set_meta_tracing_2(Mod,Func,Arity,MS);
-		{error,_Reason} ->          % Could not load the module.
-		    false                   % No use try to trace.
-	    end
-    end;
-set_meta_tracing(_,_,_,_) ->
-    false.
-
-set_meta_tracing_2(Mod,Func,Arity,MS) ->
-    case catch erlang:trace_pattern({Mod,Func,Arity},MS,[meta]) of
-	0 ->                                % Hmm, nothing happend :-)
-	    false;
-	N when is_integer(N) ->                % The normal case, some functions were hit.
-	    true;
-	{'EXIT',_Reason} ->
-	    false
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function which removes all meta trace pattern for the functions mentioned
-%% in the list being first argument. It also executes the remove funcs for each
-%% and every no longer meta traced function. This done since some of the remove
-%% functions may do side-effects (like deleteing ETS tables).
-%% Returns nothing significant.
-stop_all_meta_tracing([{M,F,Arity}|Rest],PublLD,LD) ->
-    catch erlang:trace_pattern({M,F,Arity},false,[meta]),
-    NewPublLD=do_removefunc(get_remove_func_ld(M,F,Arity,LD),M,F,Arity,PublLD),
-    stop_all_meta_tracing(Rest,NewPublLD,LD);
-stop_all_meta_tracing([],_,_) ->
-    true.
-%% -----------------------------------------------------------------------------
-
-%% This function calls the function registered to be handler for a certain
-%% meta-traced function. Such a function or fun must take three arguments
-%% and return {ok,NewPrivLD,OutPutBinary} or 'false'. OutPutBinary may be
-%% something else, and is then ignored.
-handle_meta({M,F},Pid,Arg1,PrivLD) ->
-    (catch M:F(Pid,Arg1,PrivLD));
-handle_meta(Fun,Pid,Arg1,PrivLD) when is_function(Fun) ->
-    (catch Fun(Pid,Arg1,PrivLD));
-handle_meta(_,_,_,_) ->                     % Don't know how to do this.
-    false.
-%% -----------------------------------------------------------------------------
-
-%% Help function writing output from a callback function to the ti-file.
-%% Output can be a binary or a list of binaries.
-write_output(TI,[OutPut|Rest]) ->
-    write_output(TI,OutPut),
-    write_output(TI,Rest);
-write_output({file,FD},Bin) when is_binary(Bin) -> % Plain direct-binary file
-    Size=byte_size(Bin),
-    file:write(FD,list_to_binary([<<0,Size:32>>,Bin]));
-write_output({relay,ToNode},Bin) when is_atom(ToNode),is_binary(Bin) ->
-    {inviso_rt_meta,ToNode} ! {relayed_meta,Bin};
-write_output(_,_) ->                        % Don't understand, just skip.
-    true.
-%% -----------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% Various help functions.
-%% =============================================================================
-
-%% Help function initializing the public loopdata structure. Note that if the
-%% supplied InitPublLDmfa is faulty we let the structure become the error.
-%% The error will most likely turn up in an error report somewhere, eventually.
-do_init_publ_ld({M,F,Args}) when is_atom(M),is_atom(F),is_list(Args) ->
-    case catch apply(M,F,Args) of
-	{'EXIT',_Reason} ->
-	    {error,init_publ_ld_func};      % Let the struct be this error!
-	InitialPublLD ->
-	    InitialPublLD
-    end;
-do_init_publ_ld(_) ->
-    {error,init_publ_ld_func}.
-%% -----------------------------------------------------------------------------
-
-%% Help function which removes the public loopdata structure. The function does
-%% not necessarily have to exist. Returns nothing significant.
-do_remove_publ_ld({M,F},PublLD) when is_atom(M),is_atom(F) ->
-    catch M:F(PublLD);
-do_remove_publ_ld(_,_) ->
-    true.
-%% -----------------------------------------------------------------------------	
-
-%% Hlp function initializing a particular meta traced function into the public
-%% loopdata. Note that the function is not mandatory.
-%% Returns {NewPublLD,Output} or 'false'.
-do_initfunc({M,F},Mod,Func,Arity,PublLD) when is_atom(M),is_atom(F) ->
-    case catch M:F(Mod,Func,Arity,PublLD) of
-	{ok,NewPublLD,Output} ->
-	    {NewPublLD,Output};
-	_ ->                                % Everything else is an error.
-	    false                           % Act as no initialization function.
-    end;
-do_initfunc(Fun,Mod,Func,Arity,PublLD) when is_function(Fun) ->
-    case catch Fun(Mod,Func,Arity,PublLD) of
-	{ok,NewPublLD,Output} ->
-	    {NewPublLD,Output};
-	_ ->                                % Everything else is an error.
-	    false                           % Act as no initialization function.
-    end;
-do_initfunc(_,_,_,_,_) ->                   % Perhaps too generous, should be 'void' only.
-    false.
-%% -----------------------------------------------------------------------------
-
-%% Help function removing a particular meta traced function from the public
-%% loopdata. Note that we do not make much noice should the call back function
-%% be faulty.
-do_removefunc({M,F},Mod,Func,Arity,PublLD) when is_atom(M),is_atom(F) ->
-    case catch M:F(Mod,Func,Arity,PublLD) of
-	{ok,NewPublLD} ->
-	    NewPublLD;
-	_ ->                                % Everything else is an error.
-	    PublLD                          % Act as no initialization function.
-    end;
-do_removefunc(Fun,Mod,Func,Arity,PublLD) when is_function(Fun) ->
-    case catch Fun(Mod,Func,Arity,PublLD) of
-	{ok,NewPublLD} ->
-	    NewPublLD;
-	_ ->                                % Everything else is an error.
-	    PublLD                          % Act as no initialization function.
-    end;
-do_removefunc(_,_,_,_,PublLD) ->
-    PublLD.
-%% -----------------------------------------------------------------------------
-
-%% Function that, if the time has come, goes through the priv-ld structure and
-%% cleans away entryn left behind. The usual cause is that the function call
-%% caused an exception and there were therefore no matching return_from.
-%% Returns {NewPrivLD,now()}.
-throw_old_failed({M,F},PrivLD,PrevClean) ->
-    case difference_in_now(PrevClean,now(),60) of % We clean once every minute.
-	true ->
-	    case catch apply(M,F,[PrivLD]) of
-		{'EXIT',_Reason} ->         % Something went wrong, ignore it.
-		    {PrivLD,now()};         % Just keep the old priv-ld.
-		NewPrivLD ->                % The function must return a priv-ld.
-		    {NewPrivLD,now()}
-	    end;
-	false ->                            % Not time yet!
-	    {PrivLD,PrevClean}
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function comparing two now timestamps. Returns true or false depending
-%% on if S2 is more than DiffS seconds after S1. Only works for differences
-%% less than 1 million seconds.
-difference_in_now({MegaS1,S1,_},{MegaS2,S2,_},DiffS) ->
-    if
-	MegaS1+1<MegaS2 ->                  % More than 1 Mega sec. difference.
-	    true;
-	MegaS1==MegaS2,S1+DiffS<S2 ->
-	    true;
-	MegaS1+1==MegaS2,S1+DiffS<S2+1000000 ->
-	    true;
-	true ->
-	    false
-    end.
-%% -----------------------------------------------------------------------------
-
-%% This help function adds a {tracer,Tracer} to the enable-list in a 'trace'
-%% match spec action. The reason for this is that the author of the a meta
-%% match spec meant to turn tracing on for the process executing the match spec
-%% can not know the tracer. This since the match spec is most likely authored
-%% at the control component's node, and not here.
-%% Note the double tuple necessary to make it just precise a tuple!
-%% Returns a new match spec.
-add_tracer([MS1|Rest],Tracer) ->
-    [add_tracer_2(MS1,Tracer)|add_tracer(Rest,Tracer)];
-add_tracer([],_) ->
-    [];
-add_tracer(NotList,_Tracer) ->              % Can be 'false', but also an error.
-    NotList.
-
-add_tracer_2({Head,Cond,Body},Tracer) ->
-    {Head,Cond,add_tracer_3(Body,Tracer)};
-add_tracer_2(Faulty,_Tracer) ->
-    Faulty.
-
-add_tracer_3([{trace,Disable,Enable}|Rest],Tracer) when is_list(Enable) ->
-    [{trace,Disable,Enable++[{{tracer,Tracer}}]}|Rest];
-add_tracer_3([ActionTerm|Rest],Tracer) ->
-    [ActionTerm|add_tracer_3(Rest,Tracer)];
-add_tracer_3([],_Tracer) ->
-    [];
-add_tracer_3(FaultyBody,_Tracer) ->
-    FaultyBody.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% Help functions handling internal loopdata.
-%% -----------------------------------------------------------------------------
-
--record(ld,{init_publ_ld_mfa,               % {M,F,Args}
-	    remove_publ_ld_mf,              % {M,F} | void
-	    clean_publ_ld_mf,               % {Mod,Func}
-	    ms_mfarities=notable,           % ETS holding names match functions.
-	    call_mfarities=[],              % [{{M,F,Arity},2-TupleOrFun},...]
-	    return_mfarities=[],            % [{{M,F,Arity},2-TupleOrFun},...]
-	    remove_mfarities=[]
-	   }).
-
-mk_new_ld(InitPublLDmfa,RemovePublLDmf,CleanPublLDmf,TId) ->
-    #ld{
-	   init_publ_ld_mfa=InitPublLDmfa,
-	   remove_publ_ld_mf=RemovePublLDmf,
-	   clean_publ_ld_mf=CleanPublLDmf,
-	   ms_mfarities=TId
-       }.
-%% -----------------------------------------------------------------------------
-
-%% Function which restores the internal loop data to somekind of initial state.
-%% This is useful when tracing has been suspended.
-reset_ld(#ld{init_publ_ld_mfa=InitPublLDmfa,
-	     remove_publ_ld_mf=RemovePublLDmf,
-	     clean_publ_ld_mf=CleanPublLDmf,
-	     ms_mfarities=TId}) ->
-    ets:match_delete(TId,{'_','_'}),        % Empty the table.
-    #ld{init_publ_ld_mfa=InitPublLDmfa,
-	remove_publ_ld_mf=RemovePublLDmf,
-	clean_publ_ld_mf=CleanPublLDmf,
-        ms_mfarities=TId}.
-%% -----------------------------------------------------------------------------
-
-get_initpublldmfa_ld(#ld{init_publ_ld_mfa=InitPublLDmfa}) ->
-    InitPublLDmfa.
-%% -----------------------------------------------------------------------------
-
-get_removepublldmf_ld(#ld{remove_publ_ld_mf=RemovePublLDmf}) ->
-    RemovePublLDmf.
-%% -----------------------------------------------------------------------------
-
-get_cleanpublldmf_ld(#ld{clean_publ_ld_mf=CleanPublLDmf}) ->
-    CleanPublLDmf.
-%% -----------------------------------------------------------------------------
-
-%% Help function adding data associated with a meta traced function to the
-%% internal loopdata. Called when meta tracing is activated for M:F/Arity.
-init_tpm_ld(M,F,Arity,CallFunc,ReturnFunc,RemoveFunc,LD) ->
-    ets:insert(LD#ld.ms_mfarities,{{M,F,Arity},[]}),
-    CallFuncs=LD#ld.call_mfarities,
-    ReturnFuncs=LD#ld.return_mfarities,
-    RemoveFuncs=LD#ld.remove_mfarities,
-    LD#ld{call_mfarities=[{{M,F,Arity},CallFunc}|CallFuncs],
-	  return_mfarities=[{{M,F,Arity},ReturnFunc}|ReturnFuncs],
-	  remove_mfarities=[{{M,F,Arity},RemoveFunc}|RemoveFuncs]}.
-%% -----------------------------------------------------------------------------
-
-%% Help function which answers the question if we have already initiated the
-%% function. It is done by looking in the ETS-table with named match-functions.
-%% If there is an entry in the set-type table for M:F/Arity, the function is
-%% initiated.
-%% Returns 'yes' or 'no'.
-check_mfarity_exists(M,F,Arity) ->
-    case ets:lookup(?NAMED_MS_TAB,{M,F,Arity}) of
-	[] ->
-	    no;
-	[_] ->
-	    yes
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function adding an entry with [{MSname,MSlist}|MSsNames] for M:F/Arity.
-%% Note that any already existing entry is removed.
-%% Returns nothing significant.
-put_ms_ld(M,F,Arity,MSname,MS,MSsNames) ->
-    ets:insert(?NAMED_MS_TAB,{{M,F,Arity},[{MSname,MS}|MSsNames]}).
-%% -----------------------------------------------------------------------------
-
-%% Help function taking a list of {MSname,MSs} and storing them in the
-%% internal loop data structure. The storage is actually implemented as an ETS
-%% table. Any previous list of {MSname,MSs} associated with this {M,F,Arity} will
-%% be lost. Returns nothing significant.
-set_ms_ld(M,F,Arity,MSsNames) ->
-    ets:insert(?NAMED_MS_TAB,{{M,F,Arity},MSsNames}).
-%% -----------------------------------------------------------------------------
-
-%% Help function fetching a list of {MSname,MatchSpecs} for a M:F/Arity. The
-%% match-functions are stored in an ETS table searchable on {M,F,Arity}.
-get_ms_ld(M,F,Arity) ->
-    case ets:lookup(?NAMED_MS_TAB,{M,F,Arity}) of
-	[{_MFArity,MSsNames}] ->
-	    MSsNames;
-	[] ->
-	    []
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Help function removing all saved match-specs for a certain M:F/Arity.
-%% Returns a new loopdata structure.
-remove_ms_ld(M,F,Arity,LD) ->
-    ets:delete(LD#ld.ms_mfarities,{M,F,Arity}),
-    LD.
-%% -----------------------------------------------------------------------------
-
-%% Help function which removes all information about a meta traced function from
-%% the internal loopdata. Returns a new loopdata structure.
-ctpm_ld(M,F,Arity,LD) ->
-    ets:delete(LD#ld.ms_mfarities,{M,F,Arity}),
-    NewCallFuncs=lists:keydelete({M,F,Arity},1,LD#ld.call_mfarities),
-    NewReturnFuncs=lists:keydelete({M,F,Arity},1,LD#ld.return_mfarities),
-    NewRemoveFuncs=lists:keydelete({M,F,Arity},1,LD#ld.remove_mfarities),
-    LD#ld{call_mfarities=NewCallFuncs,
-	  return_mfarities=NewReturnFuncs,
-	  remove_mfarities=NewRemoveFuncs}.
-%% -----------------------------------------------------------------------------
-
-get_call_func_ld(M,F,Arity,#ld{call_mfarities=CallFuncs}) ->
-    case lists:keysearch({M,F,Arity},1,CallFuncs) of
-	{value,{_,MF}} ->
-	    MF;
-	false ->
-	    false
-    end.
-%% -----------------------------------------------------------------------------
-
-get_return_func_ld(M,F,Arity,#ld{return_mfarities=CallFuncs}) ->
-    case lists:keysearch({M,F,Arity},1,CallFuncs) of
-	{value,{_,MF}} ->
-	    MF;
-	false ->
-	    false
-    end.
-%% -----------------------------------------------------------------------------
-
-get_remove_func_ld(M,F,Arity,#ld{remove_mfarities=RemoveFuncs}) ->
-    case lists:keysearch({M,F,Arity},1,RemoveFuncs) of
-	{value,{_,MF}} ->
-	    MF;
-	false ->
-	    false
-    end.
-%% -----------------------------------------------------------------------------
-
-%% Function returning a list of all {Mod,Func,Arity} which are currently meta
-%% traced. It does do by listifying the call_mfarities field in the internal
-%% loopdata.
-get_all_meta_funcs_ld(#ld{call_mfarities=CallFuncs}) ->
-    lists:map(fun({MFArity,_})->MFArity end,CallFuncs).
-%% -----------------------------------------------------------------------------
-
-
-%% =============================================================================
-%% Functions for the standard PublLD structure.
-%%
-%% It is tuple {Part1,GlobalData} where Part1 is of length at least 2.
-%% Where each field is a list of tuples. The last item in each tuple shall be
-%% a now tuple, making it possible to clean it away should it be too old to be
-%% relevant (there was no return_from message due to a failure).
-%% Other fields can be used for other functions.
-%% The GlobalData is not cleaned but instead meant to store data must be passed
-%% to each CallFunc when a meta trace message arrives.
-%% =============================================================================
-		      
-%% Function returning our standard priv-loopdata structure.
-init_std_publld(Size,GlobalData) ->
-    {list_to_tuple(lists:duplicate(Size,[])),GlobalData}.
-%% -----------------------------------------------------------------------------
-
-%% Function capable of cleaning out a standard publ-ld. The last element of each
-%% tuple must be the now item.
-%% Returns a new publ-ld structure.
-clean_std_publld({Part1,GlobalData}) ->
-    {clean_std_publld_2(Part1,now(),tuple_size(Part1),[]),GlobalData}.
-
-clean_std_publld_2(_,_,0,Accum) ->
-    list_to_tuple(Accum);
-clean_std_publld_2(PublLD,Now,Index,Accum) ->
-    NewTupleList=clean_std_publld_3(element(Index,PublLD),Now),
-    clean_std_publld_2(PublLD,Now,Index-1,[NewTupleList|Accum]).
-
-clean_std_publld_3([Tuple|Rest],Now) ->
-    PrevNow=element(tuple_size(Tuple),Tuple), % Last item shall be the now item.
-    case difference_in_now(PrevNow,Now,30) of
-	true ->                             % Remove it then!
-	    clean_std_publld_3(Rest,Now);
-	false ->                            % Keep it!
-	    [Tuple|clean_std_publld_3(Rest,Now)]
-    end;
-clean_std_publld_3([],_) ->
-    [].
-%% -----------------------------------------------------------------------------
-
-%% =============================================================================
-%% Functions used as handling functions (as funs) for registered process names.
-%% (Given that we use the standard priv-ld, otherwise you must do your own!).
-%% =============================================================================
-
-%% Call-back for initializing the meta traced functions there are quick functions
-%% for. Returns a new public loop data structure.
-metafunc_init(erlang,register,2,{Part1,GlobalData}) ->
-    {setelement(1,Part1,[]),GlobalData}.
-%% -----------------------------------------------------------------------------
-
-%% Call-function for erlang:register/2.
-%% This function adds the call to register/2 to a standard priv-ld structure.
-%% Note that we *must* search for previous entries from the same process. If such
-%% still in structure it means a failed register/2 call. It must first be removed
-%% so it can not be mixed up with this one. Since meta-trace message will arrive
-%% in order, there was no return_from message for that call if we are here now.
-local_register_call(CallingPid,{call,[Alias,Pid],TS},{Part1,GlobalData}) ->
-    TupleList=element(1,Part1),             % The register/2 entry in a std. priv-ld.
-    NewTupleList=lists:keydelete(CallingPid,1,TupleList), % If present, remove previous call.
-    {ok,
-     {setelement(1,Part1,[{CallingPid,{Alias,Pid},TS}|NewTupleList]),GlobalData},
-     void}.
-
-%% Return-function for the erlang:register/2 BIF.
-%% This function formulates the output and removes the corresponding call entry
-%% from the standard priv-ld structure.
-local_register_return(CallingPid,{return_from,_Val,_TS},PublLD={Part1,GlobalData}) ->
-    TupleList=element(1,Part1),             % The register/2 entry in a std. priv-ld.
-    case lists:keysearch(CallingPid,1,TupleList) of
-	{value,{_,{Alias,Pid},NowTS}} ->
-	    NewTupleList=lists:keydelete(CallingPid,1,TupleList),
-	    {ok,
-	     {setelement(1,Part1,NewTupleList),GlobalData},
-	     term_to_binary({Pid,Alias,alias,NowTS})};
-	false ->                            % Strange, then don't know what to do.
-	    {ok,PublLD,void}                % Do nothing seems safe.
-    end;
-local_register_return(CallingPid,{exception_from,_Val,_TS},{Part1,GlobalData}) ->
-    TupleList=element(1,Part1),             % The register/2 entry in a std. priv-ld.
-    NewTupleList=lists:keydelete(CallingPid,1,TupleList),
-    {ok,{setelement(1,Part1,NewTupleList),GlobalData},void}; % No association then.
-local_register_return(_,_,PublLD) ->        % Don't understand this.
-    {ok,PublLD,void}.
-
-%% When unregister/1 us called we simply want a unalias entry in the ti-file.
-%% We can unfortunately not connect it with a certain pid.
-local_unregister_call(_CallingPid,{_TypeTag,[Alias],TS},PublLD) ->
-    {ok,PublLD,term_to_binary({undefined,Alias,unalias,TS})}.
-%% -----------------------------------------------------------------------------
-
-%% Call-function for global:register_name/2,/3.
-%% This function is actually the call function for the handle_call/3 in the
-%% global server. Note that we must check that we only do this on the node
-%% where Pid actually resides.
-global_register_call(_CallingPid,{call,[{register,Alias,P,_},_,_],TS},PublLD)
-  when node(P)==node()->
-    {ok,PublLD,term_to_binary({P,{global,Alias},alias,TS})};
-global_register_call(_CallingPid,_,PublLD) ->
-    {ok,PublLD,void}.
-
-%% Call-function for global:unregister_name. It acutally checks on the use of
-%% global:delete_global_name/2 which is called when ever a global name is removed.
-global_unregister_call(_CallingPid,{call,[Alias,P],TS},PublLD) when node(P)==node()->
-    {ok,PublLD,term_to_binary({P,{global,Alias},unalias,TS})};
-global_unregister_call(_CallingPid,_,PublLD) ->
-    {ok,PublLD,void}.
-%% -----------------------------------------------------------------------------
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
diff --git a/lib/runtime_tools/src/runtime_tools.app.src b/lib/runtime_tools/src/runtime_tools.app.src
index 1152f7259d..60be9ed7c9 100644
--- a/lib/runtime_tools/src/runtime_tools.app.src
+++ b/lib/runtime_tools/src/runtime_tools.app.src
@@ -17,16 +17,13 @@
 %% %CopyrightEnd%
 %%
 {application, runtime_tools,
-   [{description,  "RUNTIME_TOOLS version 1"},
+   [{description,  "RUNTIME_TOOLS"},
     {vsn,          "%VSN%"},
     {modules,      [dbg,observer_backend,percept_profile,
-		    inviso_rt,inviso_rt_lib,inviso_rt_meta,
-		    inviso_as_lib,inviso_autostart,inviso_autostart_server,
 		    runtime_tools,runtime_tools_sup,erts_alloc_config,
 		    ttb_autostart,dyntrace]},
-    {registered,   [runtime_tools_sup,inviso_rt,inviso_rt_meta]},
+    {registered,   [runtime_tools_sup]},
     {applications, [kernel, stdlib]},
-%    {env,          [{inviso_autostart_mod,your_own_autostart_module}]},
     {env,          []},
     {mod,          {runtime_tools, []}}]}.
 
diff --git a/lib/runtime_tools/src/runtime_tools_sup.erl b/lib/runtime_tools/src/runtime_tools_sup.erl
index 913719c449..c8dab250dd 100644
--- a/lib/runtime_tools/src/runtime_tools_sup.erl
+++ b/lib/runtime_tools/src/runtime_tools_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -31,15 +31,11 @@
 %% =============================================================================
 
 %% The runtime tools top most supervisor starts:
-%% -The inviso runtime component. This is the only way to get the runtime component
-%%  started automatically (if for instance autostart is wanted).
-%%  Note that it is not impossible that the runtime component terminates it self
-%%  should it discover that no autostart is configured.
+%% -The ttb_autostart component. This is used for tracing at startup
+%%  using observer/ttb.
 init(AutoModArgs) ->
     Flags = {one_for_one, 0, 3600},
-    Children = [{inviso_rt, {inviso_rt, start_link_auto, [AutoModArgs]}, 
-		 temporary, 3000, worker, [inviso_rt]},
-                {ttb_autostart, {ttb_autostart, start_link, []},
+    Children = [{ttb_autostart, {ttb_autostart, start_link, []},
                  temporary, 3000, worker, [ttb_autostart]}],
     {ok, {Flags, Children}}.
 %% -----------------------------------------------------------------------------
diff --git a/lib/runtime_tools/test/Makefile b/lib/runtime_tools/test/Makefile
index 3e50ba02ca..bcabdf13ed 100644
--- a/lib/runtime_tools/test/Makefile
+++ b/lib/runtime_tools/test/Makefile
@@ -5,8 +5,6 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 MODULES =  \
 	dyntrace_SUITE \
 	runtime_tools_SUITE \
-	inviso_testmodule1_foo \
-	inviso_SUITE \
 	dbg_SUITE \
 	erts_alloc_config_SUITE
 
@@ -57,10 +55,10 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) runtime_tools.spec runtime_tools.cover $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) $(EMAKEFILE) runtime_tools.cover $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) runtime_tools.spec runtime_tools.cover $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(EMAKEFILE) runtime_tools.cover "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl
index bd908c1f3a..dfae52ed1d 100644
--- a/lib/runtime_tools/test/dbg_SUITE.erl
+++ b/lib/runtime_tools/test/dbg_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -394,41 +394,36 @@ file_port2(suite) ->
 file_port2(doc) ->
     ["Test tracing to file port with 'follow_file'"];
 file_port2(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {skipped, "VxWorks NFS cache ruins it all."};
-	_ ->
-	    ?line stop(),
-	    ?line {A,B,C} = erlang:now(),
-	    ?line FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++
-		"-" ++ integer_to_list(B) ++ "-" ++ integer_to_list(C),
-	    ?line FName = filename:join([?config(data_dir, Config), FTMP]),
-	    %% Ok, lets try with flush and follow_file, not a chance on VxWorks
-	    %% with NFS caching...
-	    ?line Port2 = dbg:trace_port(file, FName),
-	    ?line {ok, _} = dbg:tracer(port, Port2),
-	    try
-		?line {ok, [{matched, _node, 1}]} = dbg:p(self(),call),
-		?line {ok, _} = dbg:tp(dbg, ltp,[{'_',[],[{message, {self}}]}]),
-		?line {ok, _} = dbg:tp(dbg, ln, [{'_',[],[{message, hej}]}]),
-		?line ok = dbg:ltp(),
-		?line ok = dbg:flush_trace_port(),
-		?line dbg:trace_client(follow_file, FName,
-				       {fun myhandler/2, self()}),
-		?line S = self(),
-		?line [{trace,S,call,{dbg,ltp,[]},S}] = flush(),
-		?line ok = dbg:ln(),
-		?line ok = dbg:flush_trace_port(),
-		?line receive after 1000 -> ok end, %% Polls every second...
-		?line [{trace,S,call,{dbg,ln,[]},hej}] = flush(),
-		?line stop(),
-		?line [] = flush()
-	    after
-		?line stop(),
-		?line file:delete(FName)
-	    end,
-	    ok
-    end.
+    stop(),
+    {A,B,C} = erlang:now(),
+    FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++
+	"-" ++ integer_to_list(B) ++ "-" ++ integer_to_list(C),
+    FName = filename:join([?config(data_dir, Config), FTMP]),
+    %% Ok, lets try with flush and follow_file, not a chance on VxWorks
+    %% with NFS caching...
+    Port2 = dbg:trace_port(file, FName),
+    {ok, _} = dbg:tracer(port, Port2),
+    try
+	{ok, [{matched, _node, 1}]} = dbg:p(self(),call),
+	{ok, _} = dbg:tp(dbg, ltp,[{'_',[],[{message, {self}}]}]),
+	{ok, _} = dbg:tp(dbg, ln, [{'_',[],[{message, hej}]}]),
+	ok = dbg:ltp(),
+	ok = dbg:flush_trace_port(),
+	dbg:trace_client(follow_file, FName,
+	  	       {fun myhandler/2, self()}),
+	S = self(),
+	[{trace,S,call,{dbg,ltp,[]},S}] = flush(),
+	ok = dbg:ln(),
+	ok = dbg:flush_trace_port(),
+	receive after 1000 -> ok end, %% Polls every second...
+	[{trace,S,call,{dbg,ln,[]},hej}] = flush(),
+	stop(),
+	[] = flush()
+    after
+	stop(),
+	file:delete(FName)
+    end,
+    ok.
 
 file_port_schedfix(suite) ->
     [];
@@ -519,7 +514,7 @@ file_port_schedfix1(Config) when is_list(Config) ->
     %% Cleanup
     %%
     ?line ToBeDeleted = filelib:wildcard(FName++"*"++".wraplog"),
-    ?line lists:map({file, delete}, ToBeDeleted),
+    ?line lists:map(fun file:delete/1, ToBeDeleted),
 %    io:format("ToBeDeleted=~p", [ToBeDeleted]),
     %%
     %% Present the result
diff --git a/lib/runtime_tools/test/inviso_SUITE.erl b/lib/runtime_tools/test/inviso_SUITE.erl
deleted file mode 100644
index c64c40b945..0000000000
--- a/lib/runtime_tools/test/inviso_SUITE.erl
+++ /dev/null
@@ -1,2838 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-%% Description:
-%% Test suite for inviso (basic parts, i.e not inviso tools). Note that
-%% inviso basic parts have modules in both the runtime_tools and
-%% inviso applications.
-%%
-%% Authors:
-%% Ann-Marie L�f, [email protected]
-%% Lennart �hman, [email protected]
-%% -----------------------------------------------------------------------------
-
--module(inviso_SUITE).
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("kernel/include/file.hrl").
-
--define(l,?line).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [basic_dist_trace_1, basic_dist_trace_2,
-     basic_dist_trace_3, basic_dist_trace_ti_1,
-     basic_dist_trace_ti_2, basic_dist_trace_ti_3,
-     suspend_dist_trace_ti_1, suspend_dist_trace_ti_2,
-     meta_cleanfunc_dist_1, basic_handlerfun_dist_1,
-     delete_log_dist_1, autostart_dist_1, autostart_dist_2,
-     autostart_dist_3, running_alone_dist_1,
-     running_alone_dist_2, running_alone_dist_3,
-     running_alone_dist_4, running_alone_dist_5,
-     overload_dist_1, overload_dist_2, overload_dist_3,
-     overload_dist_4, overload_dist_5, subscribe_dist_1,
-     lfm_trace_dist_1, lfm_trace_ti_dist_2,
-     handle_logfile_sort_wrapset, fetch_log_dist_trace_1,
-     fetch_log_dist_trace_2, fetch_log_dist_trace_3,
-     fetch_log_dist_error_1, fetch_log_dist_error_2,
-     expand_regexp_dist_1, only_loaded_dist_1].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-
-init_per_suite(Config) ->
-    case test_server:is_native(lists) of
-	true ->
-	    {skip,"Native libs -- tracing doesn't work"};
-	false ->
-	    %% We never know who messed up this node before this suite! :-)
-	    erlang:trace_pattern({'_','_','_'},[],[local]),
-	    erlang:trace_pattern({'_','_','_'},[],[global]),
-	    erlang:trace(all,false,[all]),
-
-	    ok=application:start(runtime_tools),
-	    Config
-    end.
-
-end_per_suite(_Config) ->
-    ?l ok=application:stop(runtime_tools).
-
-
-%% For each distributed testcase, we need two other distributed nodes to run the
-%% runtime components on. Since they are freshly started every time there is no
-%% need to clean them up first.
-init_per_testcase(_Case,Config) ->
-    ?l TH=test_server:timetrap(100000),
-    ?l {ok,Node1}=test_server:start_node(inviso1,peer,[]),
-    ?l {ok,Node2}=test_server:start_node(inviso2,peer,[]),
-    ?l SuiteDir=filename:dirname(code:which(?MODULE)),
-
-    %% Otherwise peer nodes will not find this module!
-    ?l true=rpc:call(Node1,code,add_patha,[SuiteDir]),
-    ?l true=rpc:call(Node2,code,add_patha,[SuiteDir]),
-
-    ?l start_side_effect_logger(node()),
-    ?l start_side_effect_logger(Node1),
-    ?l start_side_effect_logger(Node2),
-
-
-    %% SPECIAL FOR MY PRIVATE TEST ENVIROMENT
-%    ?l rpc:call(Node1,code,add_patha,["/clearcase/otp/tools/runtime_tools/ebin"]),
-%    ?l rpc:call(Node1,code,add_patha,["/clearcase/otp/tools/inviso/ebin"]),
-%    ?l rpc:call(Node2,code,add_patha,["/clearcase/otp/tools/runtime_tools/ebin"]),
-%    ?l rpc:call(Node2,code,add_patha,["/clearcase/otp/tools/inviso/ebin"]),
-
-%    %% SPECIAL FOR MY PRIVATE TEST ENVIROMENT, windows.
-%    ?l rpc:call(Node1,code,add_patha,["Z:/DATA/PROJECTS/inviso_project/runtime_tools/ebin"]),
-%    ?l rpc:call(Node1,code,add_patha,["Z:/DATA/PROJECTS/inviso_project/inviso/ebin"]),
-%    ?l rpc:call(Node2,code,add_patha,["Z:/DATA/PROJECTS/inviso_project/runtime_tools/ebin"]),
-%    ?l rpc:call(Node2,code,add_patha,["Z:/DATA/PROJECTS/inviso_project/inviso/ebin"]),
-
-    ?l ok=rpc:call(Node1,application,start,[runtime_tools]),
-    ?l ok=rpc:call(Node2,application,start,[runtime_tools]),
-    ?l timer:sleep(100),                     % Problem with autostarted runtime.
-    %% The following is a test that the inviso_rt processes which are autostarted
-    %% are now gone.
-
-    ?l ok=poll(rpc,call,[Node1,erlang,whereis,[inviso_rt]],undefined,20),
-    ?l ok=poll(rpc,call,[Node2,erlang,whereis,[inviso_rt]],undefined,20),
-
-%    ?l ok=poll(rpc,call,[Node1,supervisor,which_children,[runtime_tools_sup]],[],20),
-%    ?l ok=poll(rpc,call,[Node2,supervisor,which_children,[runtime_tools_sup]],[],20),
-    NewConfig1=insert_remotenode_config(inviso1,Node1,Config),
-    NewConfig2=insert_remotenode_config(inviso2,Node2,NewConfig1),
-    insert_timetraphandle_config(TH,NewConfig2).
-%% -----------------------------------------------------------------------------
-
-end_per_testcase(Case,Config) ->
-    ?l test_server:stop_node(get_remotenode_config(inviso1,Config)),
-    ?l test_server:stop_node(get_remotenode_config(inviso2,Config)),
-
-    case whereis(inviso_c) of
-	undefined ->                         % Should not exist.
-	    true;
-	Pid when is_pid(Pid) ->                 % But if it exists...
-	    exit(Pid,kill),                  % Remove it!
-	    io:format("Had to kill the control component in end_per_testcase,~p.~n",[Case])
-    end,
-    case whereis(inviso_rt) of
-	undefined ->                         % Should not exist.
-	    true;
-	Pid2 when is_pid(Pid2) ->               % But if it exists...
-	    exit(Pid2,kill),                 % Remove it!
-	    io:format("Had to kill local runtime component in end_per_testcase,~p.~n",[Case])
-    end,
-    ?l process_killer([inviso_test_proc,
-		       inviso_tab_proc,
-		       inviso_collector_proc,
-		       global_inviso_test_proc]),
-    ?l test_server:timetrap_cancel(get_timetraphandle_config(Config)),
-
-    NewConfig1=remove_remotenode_config(inviso1,Config),
-    NewConfig2=remove_remotenode_config(inviso2,NewConfig1),
-    remove_timetraphandle_config(NewConfig2).
-%% -----------------------------------------------------------------------------
-
-%% ==============================================================================
-%% Testcases.
-%% ==============================================================================
-
-%% TEST CASE: Basic, distributed, trace only.
-basic_dist_trace_1(suite) -> [];
-basic_dist_trace_1(doc) ->
-    ["Basic case, start of distributed tracing, using only trac."];
-basic_dist_trace_1(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataList=lists:map(fun(N)->{N,{file,filename:join([PrivDir,
-							     "tf1_"++
-							     atom_to_list(N)
-							    ])}} end,
-			     Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
-    activate_local_tracing(Nodes),
-    deactivate_local_tracing(Nodes),
-    stop_tracing(Nodes),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-
-%% TEST CASE: Basic, distributed, activate global tracing for functions in modules
-%% pointed out using a regexp. No tracing will be done.
-basic_dist_trace_2(suite) -> [];
-basic_dist_trace_2(doc) ->
-    [""];
-basic_dist_trace_2(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataList=lists:map(fun(N)->{N,{file,filename:join([PrivDir,
-							     "tf1a_"++
-							     atom_to_list(N)
-							    ])}} end,
-			     Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
-    Funcs1=activate_global_tracing_regexp(Nodes),
-    deactivate_global_tracing_regexp(Nodes,Funcs1),
-    stop_tracing(Nodes),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Basic, distributed, activate global tracing for functions in modules
-%% pointed out using a dir-regexp. No tracing will be done.
-basic_dist_trace_3(suite) -> [];
-basic_dist_trace_3(doc) ->
-    [""];
-basic_dist_trace_3(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataList=lists:map(fun(N)->{N,{file,filename:join([PrivDir,
-							     "tf1b_"++
-							     atom_to_list(N)
-							    ])}} end,
-			     Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
-    Funcs1=activate_global_tracing_regexp_dir(Nodes),
-    deactivate_global_tracing_regexp_dir(Nodes,Funcs1),
-    stop_tracing(Nodes),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Basic, distributed, trace and ti.
-basic_dist_trace_ti_1(suite) -> [];
-basic_dist_trace_ti_1(doc) ->
-    [""];
-basic_dist_trace_ti_1(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataFun=
-	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf2_"++atom_to_list(N)])}},
-		    {ti,{file,filename:join([PrivDir,"tf2_"++atom_to_list(N)++".ti"])}}]}
-	end,
-    TracerDataList=lists:map(TracerDataFun,Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
-    activate_local_tracing(Nodes),
-    activate_meta_tracing(Nodes),
-    ?l true=(is_pid(whereis(inviso_rt))),
-    ?l true=(is_pid(whereis(inviso_rt_meta))),
-    deactivate_meta_tracing(Nodes),
-    deactivate_local_tracing(Nodes),
-    stop_tracing(Nodes),
-    ?l true=(is_pid(whereis(inviso_rt))),  % Shall still be running.
-    ?l ok=poll(erlang,whereis,[inviso_rt_meta],undefined,3),
-    stop(Nodes),
-    timer:sleep(200),                      % Give it time to terminate.
-    ?l ok=poll(erlang,whereis,[inviso_rt],undefined,3),% Shall be gone now.
-    ?l undefined=whereis(inviso_rt_meta),  % Still gone.
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% Test CASE: Testing that the tpm_tracer functionality works. That is appending
-%% {tracer,Tracer} to a meta match spec.
-basic_dist_trace_ti_2(suite) -> [];
-basic_dist_trace_ti_2(doc) ->
-    [""];
-basic_dist_trace_ti_2(Config) when is_list(Config) ->
-    case erlang:system_info(version) of
-	"5.4"++_ ->                        % Perhaps not perfect, but work now :-)
-	    {skip,"Old emulator"};
-	_ ->
-	    basic_dist_trace_ti_2_do(Config)
-    end.
-
-basic_dist_trace_ti_2_do(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataFun=
-	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf3_"++atom_to_list(N)])}},
-		    {ti,{file,filename:join([PrivDir,"tf3_"++atom_to_list(N)++".ti"])}}]}
-	end,
-    TracerDataList=lists:map(TracerDataFun,Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
-    activate_deactivate_meta_tracing_tracer(Nodes),
-    stop_tracing(Nodes),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Basic, distributed, trace and ti, where we try to use ctp_all to
-%% check that all global and local patterns are removed but that meta patterns
-%% remain.
-%% This test also checks that if the meta tracer is terminated an error value
-%% is generated when trying to do meta tracing at that node.
-basic_dist_trace_ti_3(suite) -> [];
-basic_dist_trace_ti_3(doc) ->
-    [""];
-basic_dist_trace_ti_3(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataFun=
-	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf4_"++atom_to_list(N)])}},
-		    {ti,{file,filename:join([PrivDir,"tf4_"++atom_to_list(N)++".ti"])}}]}
-	end,
-    TracerDataList=lists:map(TracerDataFun,Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
-    activate_local_tracing(Nodes),
-    activate_global_tracing(Nodes),
-    activate_meta_tracing(Nodes),
-    ?l true=(is_pid(whereis(inviso_rt))),
-    ?l true=(is_pid(whereis(inviso_rt_meta))),
-    ?l {ok,NodeResults1}=inviso:ctp_all(Nodes), % Removes local and global patterns.
-    ?l true=check_noderesults(Nodes,ok,NodeResults1),
-    ?l true=check_on_nodes(Nodes,erlang,trace_info,[{code,which,1},traced],{traced,false}),
-    ?l true=check_on_nodes(Nodes,erlang,trace_info,[{code,get_path,0},traced],{traced,false}),
-    %% But meta patters shall remain.
-    ?l true=check_on_nodes(Nodes,
-			   erlang,
-			   trace_info,
-			   [{lists,module_info,0},meta_match_spec],
-			   fun({meta_match_spec,L})when length(L)>0 ->true end),
-    ?l true=check_on_nodes(Nodes,
-			   erlang,
-			   trace_info,
-			   [{lists,module_info,0},meta],
-			   fun({meta,P})when is_pid(P) ->
-				   P=rpc:call(node(P),erlang,whereis,[inviso_rt_meta]),
-				   true
-			   end),
-    %% Now kill the meta tracer somewhere and try to activate meta tracing.
-    ?l [ANode|_]=Nodes,
-    ?l AMetaPid=rpc:call(ANode,erlang,whereis,[inviso_rt_meta]),
-    ?l rpc:call(ANode,erlang,exit,[AMetaPid,kill]),
-    ?l {ok,NodeResults2}=inviso:tpm(Nodes,math,pi,0,[],void),
-    ?l {value,{ANode,{error,_}}}=lists:keysearch(ANode,1,NodeResults2),
-
-    ?l stop_tracing(Nodes),
-    ?l stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% -----------------------------------------------------------------------------
-%% Test cases for SUSPEND
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: In this test case a trace with ti is started. Trace flags are set,
-%% trace patterns are set and meta trace patterns. We then check that the trace
-%% flags and the meta patterns are removed when tracing suspended.
-%% The suspension is cancelled and we check that it is possible to reactivate
-%% tracing by setting the process flags and meta patterns again.
-suspend_dist_trace_ti_1(suite) -> [];
-suspend_dist_trace_ti_1(doc) ->
-    [""];
-suspend_dist_trace_ti_1(Config) when is_list(Config) ->
-    ?l RemoteNodes=get_remotenodes_config(Config),
-    ?l Nodes=[node()|RemoteNodes],
-    ?l PrivDir=filename:join(?config(priv_dir,Config),""),
-    ?l TracerDataFun=
-	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf_suspend1_"++atom_to_list(N)])}},
-		    {ti,{file,filename:join([PrivDir,"tf_suspend1_"++atom_to_list(N)++".ti"])}}]}
-	end,
-    ?l TracerDataList=lists:map(TracerDataFun,Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
-    activate_local_tracing(Nodes),
-    activate_meta_tracing(Nodes),
-    ?l true=(is_pid(whereis(inviso_rt))),
-    ?l true=(is_pid(whereis(inviso_rt_meta))),
-    %% Set some trace flags on some newly started test procs.
-    activate_traceflags(Nodes),
-
-    %% Now suspend the tracing on all nodes. That shall result in the removal
-    %% of trace flags and meta trace patterns, but not local trace patterns.
-    ?l {ok,NodeResults1}=inviso:suspend(Nodes,test),
-    ?l true=check_noderesults(Nodes,ok,NodeResults1),
-    %% Trace flags gone?
-    ?l TestProcs=lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_test_proc]) end,Nodes),
-    ?l lists:foreach(fun(P)->
-			     {flags,[]}=
-				 rpc:call(node(P),erlang,trace_info,[P,flags])
-		     end,
-		     TestProcs),
-    %% Meta patterns shall be gone too, but local functions still there.
-    ?l lists:foreach(fun(N)->
-			     {meta,false}=
-				 rpc:call(N,
-					  erlang,
-					  trace_info,
-					  [{math,module_info,1},meta]),
-			     {traced,local}=
-				 rpc:call(N,
-					  erlang,
-					  trace_info,
-					  [{code,which,1},traced])
-		     end,
-		     Nodes),
-
-    %% Try to activate trace flags, trace patterns and meta tracing while
-    %% suspended. Should not succeed of course!
-    ?l ThisNode=node(),
-    ?l {ok,[{ThisNode,{error,suspended}}]}=
-	inviso:tf([ThisNode],inviso_test_proc,[call]),
-    ?l {ok,[{ThisNode,{error,suspended}}]}=
-	inviso:tpl([ThisNode],math,module_info,1,[]),
-    ?l {ok,[{ThisNode,{error,suspended}}]}=
-	inviso:init_tpm([ThisNode],
-			math,
-			module_info,
-			1,
-			{?MODULE,tpm_init_func2}, % Does not exist on purpose.
-			{?MODULE,tpm_call_func2}, % Does not exist on purpose.
-			{?MODULE,tpm_return_func2}, % Does not exist on purpose.
-			{?MODULE,tpm_remove_func2}), % Does not exist on purpose.
-
-    %% Now we want to cancel suspension and see that we can reactivate tracing.
-    ?l {ok,NodeResults2}=inviso:cancel_suspension(Nodes),
-    ?l true=check_noderesults(Nodes,ok,NodeResults2),
-
-    ?l {ok,NodeResults3}=
-	inviso:init_tpm(math,
-			module_info,
-			1,
-			{?MODULE,tpm_init_func2}, % Does not exist on purpose.
-			{?MODULE,tpm_call_func2}, % Does not exist on purpose.
-			{?MODULE,tpm_return_func2}, % Does not exist on purpose.
-			{?MODULE,tpm_remove_func2}), % Does not exist on purpose.
-    ?l true=check_noderesults(Nodes,ok,NodeResults3),
-    ?l {ok,NodeResults5}=
-	inviso:tpm_ms(math,module_info,1,ms1,[{'_',[],[{return_trace}]}]),
-    ?l true=check_noderesults(Nodes,{ok,1},NodeResults5),
-    ?l true=check_on_nodes(Nodes,
-			   erlang,
-			   trace_info,
-			   [{math,module_info,1},meta_match_spec],
-			   {meta_match_spec,[{'_',[],[{return_trace}]}]}),
-    ?l {ok,NodeResults6}=inviso:tf(Nodes,inviso_test_proc,[call]),
-    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults6),
-
-    %deactivate_meta_tracing(Nodes),
-    %deactivate_local_tracing(Nodes),
-    stop_tracing(Nodes),
-    ?l true=(is_pid(whereis(inviso_rt))),  % Shall still be running.
-    ?l ok=poll(erlang,whereis,[inviso_rt_meta],undefined,3),
-    stop(Nodes),
-    ?l timer:sleep(200),                   % Give it time to terminate.
-    ?l ok=poll(erlang,whereis,[inviso_rt],undefined,3),% Shall be gone now.
-    ?l undefined=whereis(inviso_rt_meta),  % Still gone.
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: In this test case a trace with ti is started. Trace flags are set,
-%% trace patterns are set and meta trace patterns. We then suspend tracing at
-%% all nodes, then stop tracing which shall be allowed. We then try to initiate
-%% tracing again which shall not be possible.
-suspend_dist_trace_ti_2(suite) -> [];
-suspend_dist_trace_ti_2(doc) ->
-    [""];
-suspend_dist_trace_ti_2(Config) when is_list(Config) ->
-    ?l RemoteNodes=get_remotenodes_config(Config),
-    ?l Nodes=[node()|RemoteNodes],
-    ?l PrivDir=filename:join(?config(priv_dir,Config),""),
-    ?l TracerDataFun=
-	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf_suspend2_"++atom_to_list(N)])}},
-		    {ti,{file,filename:join([PrivDir,"tf_suspend2_"++atom_to_list(N)++".ti"])}}]}
-	end,
-    ?l TracerDataList=lists:map(TracerDataFun,Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
-    activate_local_tracing(Nodes),
-    activate_meta_tracing(Nodes),
-    ?l true=(is_pid(whereis(inviso_rt))),
-    ?l true=(is_pid(whereis(inviso_rt_meta))),
-    %% Set some trace flags on some newly started test procs.
-    activate_traceflags(Nodes),
-
-    %% Now suspend the tracing on all nodes. That shall result in the removal
-    %% of trace flags and meta trace patterns, but not local trace patterns.
-    ?l {ok,NodeResults1}=inviso:suspend(Nodes,test),
-    ?l true=check_noderesults(Nodes,ok,NodeResults1),
-
-    %% Now stop tracing.
-    ?l {ok,NodeResults3}=inviso:stop_tracing(Nodes),
-    ?l true=check_noderesults(Nodes,{ok,idle},NodeResults3),
-    %% Now try to initiate tracing again.
-    ThisNode=node(),
-    ?l {ok,[{ThisNode,{error,suspended}}]}=
-	inviso:init_tracing([ThisNode],
-			    [{trace,{file,filename:join([PrivDir,"tf_suspend3_"++
-							 atom_to_list(ThisNode)])}},
-			     {ti,{file,{filename:join([PrivDir,"tf_suspend3_"++
-						       atom_to_list(ThisNode)])}}}]),
-
-    %% Cancel the suspension and initiate tracing again.
-    ?l {ok,NodeResults2}=inviso:cancel_suspension(Nodes),
-    ?l true=check_noderesults(Nodes,ok,NodeResults2),
-    ?l TracerDataFun2=
-	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf_suspend4_"++atom_to_list(N)])}},
-		    {ti,{file,filename:join([PrivDir,"tf_suspend4_"++atom_to_list(N)++".ti"])}}]}
-	end,
-    ?l TracerDataList2=lists:map(TracerDataFun2,Nodes),
-    ?l {ok,NodeResults4}=inviso:init_tracing(TracerDataList2),
-    ?l true=check_noderesults(Nodes,{ok,[{trace_log,ok},{ti_log,ok}]},NodeResults4),
-    stop_tracing(Nodes),
-    ?l true=(is_pid(whereis(inviso_rt))),  % Shall still be running.
-    stop(Nodes),
-    ?l timer:sleep(200),                   % Give it time to terminate.
-    ?l ok=poll(erlang,whereis,[inviso_rt],undefined,3),% Shall be gone now.
-    ok.
-%% -----------------------------------------------------------------------------
-
-
-
-%% TEST CASE: This test case tests that the clean function removes (prosumed)
-%% expired data from the internal public-loopdata structure in the inviso_rt_meta
-%% process.
-meta_cleanfunc_dist_1(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataFun=
-	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"mcf1_"++atom_to_list(N)])}},
-		    {ti,{file,filename:join([PrivDir,"mcf1_"++atom_to_list(N)++".ti"])}}]}
-	end,
-    TracerDataList=lists:map(TracerDataFun,Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
-    %% Now initialize meta tracing, but the call_func is a bit "fixed".
-    ?l {ok,NodeResults1}=
-	inviso:tpm(Nodes,math,module_info,1,[],
-		   {?MODULE,meta_cleanfunc_initfunc_1},
-		   {?MODULE,meta_cleanfunc_callfunc_1},
-		   void,void),
-    ?l true=check_noderesults(Nodes,{ok,1},NodeResults1),
-    %% Nothing in the "our" part of the public loop data.
-    ?l true=check_on_nodes(Nodes,
-			   inviso_rt_meta,get_state,[inviso_rt_meta],
-			   fun({ok,_LD,{{_,[]},_}})->true end),
-    ?l lists:foreach(fun(N)->rpc:call(N,math,module_info,[exports]) end,Nodes),
-    %% Check that it has been added to the public loopdata structure.
-    ?l true=check_on_nodes(Nodes,
-			   ?MODULE,poll,[inviso_rt_meta,
-					 get_state,
-					 [inviso_rt_meta],
-					 fun({ok,_LD,{{_,[{meta_cleanfunc_test1,_Now}]},_}})->
-						 true;
-					    (_)->false
-					 end,
-					 20],
-			   ok),
-    %% While we wait for 60 seconds to pass, we test a few other things.
-    ?l {ok,NodeResults2}=
-	inviso:tpm(Nodes,?MODULE,slowfunction2,0,[{'_',[],[{return_trace}]}],
-		   {?MODULE,meta_cleanfunc_initfunc_2},
-		   {?MODULE,meta_cleanfunc_callfunc_2},
-		   {?MODULE,meta_cleanfunc_returnfunc_2},
-		   void),
-    ?l true=check_noderesults(Nodes,{ok,1},NodeResults2),
-    ?l lists:foreach(fun(N)->rpc:call(N,?MODULE,slowfunction,[]) end,Nodes),
-    %% Believe it or not but slowfunction is still running, in its own process,
-    %% we are therefore free now to examine the meta tracer.
-    ?l true=check_on_nodes(Nodes,
-			   ?MODULE,poll,[inviso_rt_meta,
-					 get_state,
-					 [inviso_rt_meta],
-					 fun({ok,_LD,{{[],Tuples},_}})->
-						 {value,_}=
-						     lists:keysearch(meta_cleanfunc_test2,
-								     1,
-								     Tuples),
-						 {value,_}=
-						     lists:keysearch(meta_cleanfunc_test1,
-								     1,
-								     Tuples),
-						 true;
-					    (_)->
-						 false
-					 end,
-					 20],
-			   ok),
-    %% Now we wait for slowfunction to return and that the meta_cleanfunc_test2
-    %% to be removed from public loopdata strucuture.
-    ?l timer:sleep(10000),
-    %% The only thing remaining should be the meta_cleanfunc_test1 which will not
-    %% go away for less than that the clean functionality removes it.
-    ?l true=check_on_nodes(Nodes,
-			   ?MODULE,poll,[inviso_rt_meta,
-					 get_state,
-					 [inviso_rt_meta],
-					 fun({ok,_LD,{{_,[{meta_cleanfunc_test1,_Now}]},_}})->
-						 true;
-					    (_)->
-						 false
-					 end,
-					 20],
-			   ok),
-    %% Wait for the clean function to clean meta_cleanfunc_test1 away.
-    ?l timer:sleep(51000),                       % Shall be gone after 5 seconds.
-    ?l true=check_on_nodes(Nodes,
-			   ?MODULE,poll,[inviso_rt_meta,
-					 get_state,
-					 [inviso_rt_meta],
-					 fun({ok,_LD,{{_,[]},_}})->true;
-					    (_)->false
-					 end,
-			                 20],
-			   ok),
-    stop_tracing(Nodes),
-    stop(Nodes),
-    ok.
-
-%% This function acts as tpm initialization function when we are going to test
-%% that the clean function works. Note that we here assume standard public loop
-%% datastructure.
-meta_cleanfunc_initfunc_1(_M,_F,_Arity,{E1,_E2}) ->
-    {ok,{E1,[]},void}.
-%% Function that is supposed to be called when the meta traced function is
-%% called.
-meta_cleanfunc_callfunc_1(_Pid,_Args,{{E1,E2},Global}) ->
-    {ok,{{E1,[{meta_cleanfunc_test1,now()}|E2]},Global},void}.
-
-meta_cleanfunc_initfunc_2(_M,_F,_Arity,PublLD) ->
-    {ok,PublLD,void}.
-meta_cleanfunc_callfunc_2(_Pid,_Args,{{E1,E2},Global}) ->
-    {ok,{{E1,[{meta_cleanfunc_test2,now()}|E2]},Global},void}.
-meta_cleanfunc_returnfunc_2(_Pid,_,{{E1,E2},Global}) ->
-    {value,_}=lists:keysearch(meta_cleanfunc_test2,1,E2),
-    {ok,{{E1,lists:keydelete(meta_cleanfunc_test2,1,E2)},Global},void}.
-
-slowfunction() ->
-    spawn(?MODULE,slowfunction1,[]).
-slowfunction1() ->
-    slowfunction2().                         % Meta trace on this function call.
-slowfunction2() ->
-    timer:sleep(2000),
-    true.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Testing that a runtime component can be started instructing it
-%% to use a handler fun. Checks that the handler fun is called if a trace
-%% message comes in.
-basic_handlerfun_dist_1(suite) -> [];
-basic_handlerfun_dist_1(doc) ->
-    [""];
-basic_handlerfun_dist_1(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    ?l lists:foreach(fun(N)->rpc:call(N,ets,insert,[inviso_sideeffect_tab,{bhf1,0}]) end,
-		     Nodes),
-    TracerDataFun=
-	fun(N)->{N,{fun basic_handlerfun_dist_1_fun/2,inviso_sideeffect_tab}} end,
-    TracerDataList=lists:map(TracerDataFun,Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
-    activate_local_tracing(Nodes),
-    activate_traceflags(Nodes),
-    ?l lists:foreach(fun(N)->[{bhf1,0}]=
-				 rpc:call(N,ets,lookup,[inviso_sideeffect_tab,bhf1])
-		     end,
-		     Nodes),
-    ?l inviso_test_proc ! {apply,code,which,[lists]},
-    ok=poll(ets,lookup,[inviso_sideeffect_tab,bhf1],[{bhf1,1}],20),
-    deactivate_traceflags(Nodes),
-    deactivate_local_tracing(Nodes),
-    stop_tracing(Nodes),
-    timer:sleep(100),
-    ?l [{bhf1,1}]=ets:lookup(inviso_sideeffect_tab,bhf1),
-    stop(Nodes),
-    ok.
-
-%% Function used as handler fun for testcase above.
-basic_handlerfun_dist_1_fun(_Msg,TId) ->
-    ets:update_counter(TId,bhf1,1),
-    TId.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Here we test that delete_log removes the files at the involved
-%% runtime nodes. In this case we test that we remove logs according to last
-%% used tracer data.
-delete_log_dist_1(suite) -> [];
-delete_log_dist_1(doc) -> [""];
-delete_log_dist_1(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataFun=
-	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"dl1_"++atom_to_list(N)])}},
-		    {ti,{file,filename:join([PrivDir,"dl1_"++atom_to_list(N)++".ti"])}}]}
-	end,
-    TracerDataList=lists:map(TracerDataFun,Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
-    ?l Files=lists:map(fun({N,TD})->
-			       ?l {value,{_,{_,TraceFile}}}=lists:keysearch(trace,1,TD),
-			       ?l {value,{_,{_,TiFile}}}=lists:keysearch(ti,1,TD),
-			       ?l {N,{TraceFile,TiFile}}
-		       end,
-		       TracerDataList),
-    io:format("The Files is:~w~n",[Files]),
-    ?l {ok,NodeResults1}=inviso:delete_log(Nodes), % Should not work!
-    ?l true=check_noderesults(Nodes,{error,tracing},NodeResults1),
-    stop_tracing(Nodes),
-    %% Files still here.
-    ?l lists:foreach(fun({N,{F1,F2}})->
-			     ?l {ok,_}=rpc:call(N,file,read_file_info,[F1]),
-			     ?l {ok,_}=rpc:call(N,file,read_file_info,[F2])
-		     end,
-		     Files),
-    ?l {ok,NodeResults2}=inviso:delete_log(Nodes),
-    ?l true=check_noderesults(Nodes,
-			      fun({_N,{ok,LogInfos}})->
-				      ?l {value,{_,[{ok,_FName1}]}}=
-					  lists:keysearch(trace_log,1,LogInfos),
-				      ?l {value,{_,[{ok,_FName2}]}}=
-					  lists:keysearch(ti_log,1,LogInfos),
-				      true
-			      end,
-			      NodeResults2),
-    %% The files shall be gone now.
-    ?l lists:foreach(fun({N,{F1,F2}})->
-			     ?l {error,enoent}=rpc:call(N,file,read_file_info,[F1]),
-			     ?l {error,enoent}=rpc:call(N,file,read_file_info,[F2])
-		     end,
-		     Files),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-
-%% TEST CASE: Test of the autostart behaviour of the runtime component.
-%% Here we test that a runtime component is started according to the autostart.conf
-%% file. Note that the repeat parameter is set to 2.
-autostart_dist_1(suite) -> [];
-autostart_dist_1(doc) ->
-    [""];
-autostart_dist_1(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    AutoConfFile=filename:join(PrivDir,"autostart1.conf"),
-    [RNode|_]=RemoteNodes,
-    ?l ok=rpc:call(RNode,application,stop,[runtime_tools]),
-    ?l ok=rpc:call(RNode,application,set_env,[runtime_tools,
-					      inviso_autostart_conf,
-					      AutoConfFile]),
-    ?l {ok,FD}=file:open(AutoConfFile,[write]),
-    ?l ok=io:format(FD,"~w.~n~w.~n",[{repeat,2},{tag,c_ref}]),
-    ?l file:close(FD),
-    ?l ok=rpc:call(RNode,application,start,[runtime_tools]),
-    timer:sleep(1000),
-    ?l P1=rpc:call(RNode,erlang,whereis,[inviso_rt]),
-    ?l true=is_pid(P1),
-    ?l rpc:call(RNode,erlang,exit,[P1,kill]),
-    ?l ok=rpc:call(RNode,application,stop,[runtime_tools]),
-    ?l ok=rpc:call(RNode,application,start,[runtime_tools]),
-    timer:sleep(1000),
-    ?l P2=rpc:call(RNode,erlang,whereis,[inviso_rt]),
-    ?l true=is_pid(P2),
-    ?l rpc:call(RNode,erlang,exit,[P2,kill]),
-    ?l ok=rpc:call(RNode,application,stop,[runtime_tools]),
-    ?l ok=rpc:call(RNode,application,start,[runtime_tools]),
-    timer:sleep(1000),
-    ?l undefined=rpc:call(RNode,erlang,whereis,[inviso_rt]),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Test of autostart. Here we focus on that an autostarted
-%% runtime component actually follows the trace case command file and
-%% initiates tracing.
-autostart_dist_2(suite) -> [];
-autostart_dist_2(doc) ->
-    [""];
-autostart_dist_2(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    AutoConfFile=filename:join(PrivDir,"autostart2.conf"),
-    [RNode|_]=RemoteNodes,
-    ?l ok=rpc:call(RNode,application,stop,[runtime_tools]),
-    ?l ok=rpc:call(RNode,application,set_env,[runtime_tools,
-					      inviso_autostart_conf,
-					      AutoConfFile]),
-    ?l CmdFileName=filename:join(PrivDir,"autostart_cmd_as1"),
-    ?l {ok,FD}=file:open(CmdFileName,[write]),
-    ?l ok=io:format(FD,
-		    "inviso:tpl(Nodes,M,F,Arity,[]).~n"
-		    "inviso:tf(Nodes,inviso_test_proc,[call]).~n",
-		    []),
-    ?l file:close(FD),
-    ?l TraceFileName=filename:join([PrivDir,"as1_"++atom_to_list(RNode)]),
-    ?l TiFileName=filename:join([PrivDir,"as1_"++atom_to_list(RNode)++".ti"]),
-    ?l inviso_as_lib:setup_autostart(RNode,
-				     2,
-				     [],
-				     [{trace,{file,TraceFileName}},
-				      {ti,{file,TiFileName}}],
-				     [[CmdFileName]],
-				     [{'M',code},{'F',which},{'Arity',1}],
-				     [{{inviso,tpl,5},{inviso_rt,tpl,{erlang,tl}}},
-				      {{inviso,tf,3},{inviso_rt,tf,{erlang,tl}}}]),
-    ?l TestP=spawn(RNode,?MODULE,test_proc_init,[]),
-    ?l ok=rpc:call(RNode,application,start,[runtime_tools]),
-    ?l timer:sleep(1000),
-    ?l {ok,_}=file:read_file_info(TraceFileName),
-    ?l {ok,_}=file:read_file_info(TiFileName),
-    ?l true=is_pid(P=rpc:call(RNode,erlang,whereis,[inviso_rt])),
-    ?l ok=poll(rpc,call,[RNode,erlang,trace_info,[{code,which,1},traced]],{traced,local},10),
-    ?l {flags,[call]}=rpc:call(RNode,erlang,trace_info,[TestP,flags]),
-    ?l rpc:call(RNode,erlang,exit,[P,kill]),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Here we test that an autostarted runtime component with a dependency
-%% to a specific control component tries to connect to that control component
-%% during its start-up.
-autostart_dist_3(suite) -> [];
-autostart_dist_3(doc) ->
-    [""];
-autostart_dist_3(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    AutoConfFile=filename:join(PrivDir,"autostart3.conf"),
-    [RNode|_]=RemoteNodes,
-    ?l ok=rpc:call(RNode,application,stop,[runtime_tools]),
-    ?l ok=rpc:call(RNode,application,set_env,[runtime_tools,
-					      inviso_autostart_conf,
-					      AutoConfFile]),
-    ?l {ok,FD}=file:open(AutoConfFile,[write]),
-    ?l ok=io:format(FD,"~w.~n~w.~n~w.~n",
-		    [{options,[{dependency,{infinity,node()}}]},{repeat,2},{tag,c_ref}]),
-    ?l file:close(FD),
-    %% Now start inviso at this node here for the runtime to connect.
-    ?l {ok,_Pid}=inviso:start(),
-    ?l ok=poll(erlang,whereis,[inviso_c],fun(P) when is_pid(P)->true;(_)->false end,10),
-    %% Make the runtime component start.
-    ?l ok=rpc:call(RNode,application,start,[runtime_tools]),
-    ?l ok=poll(rpc,call,[RNode,erlang,whereis,[inviso_rt]],
-	       fun(P) when is_pid(P)->true;(_)->false end,10),
-    %% Check that the runtime component started.
-    ?l ok=poll(inviso,get_status,[[RNode]],{ok,[{RNode,{ok,{new,running}}}]},20),
-%    ?l {ok,[{RNode,{ok,{new,running}}}]}=inviso:get_status([RNode]),
-    stop([RNode]),
-    ok.
-%% -----------------------------------------------------------------------------
-
-
-
-%% TEST CASE: Test of the dependency mechanism in the runtime component.
-%% Default behaviour is dependency=infinity, i.e the runtime components remains.
-%% We also test here that we can reconnect to the runtime.
-running_alone_dist_1(suite) -> [];
-running_alone_dist_1(doc) ->
-    [""];
-running_alone_dist_1(Config) when is_list(Config) ->
-    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref,[]),
-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
-    ?l shutdown=inviso:stop(),                  % Stop the control component!
-    ?l undefined=whereis(inviso_c),
-    timer:sleep(3000),                          % How long shall we wait? :-)
-    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt])) end,
-		     Nodes),
-    ?l {ok,_Pid2}=inviso:start(),
-    ?l {ok,NodeResults2}=inviso:add_nodes(Nodes,b_ref,[]),
-    ?l true=check_noderesults(Nodes,{ok,{adopted,new,running,a_ref}},NodeResults2),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Test of the dependency mechanism in the runtime component.
-%% Test that the runtime components terminates after the specified 5000 ms.
-running_alone_dist_2(suite) -> [];
-running_alone_dist_2(doc) ->
-    [""];
-running_alone_dist_2(Config) when is_list(Config) ->
-    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref,[{dependency,5000}]),
-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
-    ?l shutdown=inviso:stop(),                  % Stop the control component!
-    ?l undefined=whereis(inviso_c),
-    timer:sleep(2000),
-    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt])) end,
-		     Nodes),
-    timer:sleep(4000),                          % Now they shall be dead!
-    ?l lists:foreach(fun(N)->undefined=rpc:call(N,erlang,whereis,[inviso_rt]) end,
-		     Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Test of the dependency mechanism in the runtime component.
-%% Test that the runtime components terminates after the specified 5000 ms.
-running_alone_dist_3(suite) -> [];
-running_alone_dist_3(doc) ->
-    [""];
-running_alone_dist_3(Config) when is_list(Config) ->
-    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref,[{dependency,1000}]),
-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
-    ?l {ok,NodeResults2}=inviso:change_options(Nodes,[{dependency,5000}]),
-    ?l true=check_noderesults(Nodes,ok,NodeResults2),
-    ?l shutdown=inviso:stop(),                  % Stop the control component!
-    ?l undefined=whereis(inviso_c),
-    timer:sleep(3000),
-    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt])) end,
-		     Nodes),
-    timer:sleep(3000),                          % Now they shall be dead!
-    ?l lists:foreach(fun(N)->undefined=rpc:call(N,erlang,whereis,[inviso_rt]) end,
-		     Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Test of the dependency mechanism in the runtime component.
-%% Test that the runtime components terminates after the specified 5000 ms,
-%% like we did in running_alone_dist_2. But now we also start tracing and checks
-%% that all inviso processes actually disappears when the time-out is reached.
-running_alone_dist_4(suite) -> [];
-running_alone_dist_4(doc) ->
-    [""];
-running_alone_dist_4(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    %% Start some tracing!
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataFun=
-	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf_ra4"++atom_to_list(N)])}},
-		    {ti,{file,filename:join([PrivDir,"tf_ra4_"++atom_to_list(N)++".ti"])}}]}
-	end,
-    TracerDataList=lists:map(TracerDataFun,Nodes),
-    start_and_init_tracing2(Nodes,
-			    [{dependency,5000}],
-			    TracerDataList,
-			    {ok,[{trace_log,ok},{ti_log,ok}]}),
-
-    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt])) end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt_meta])) end,
-		     Nodes),
-    %% Stop control component and wait for the runtimes to terminate after
-    %% running alone timer has expired.
-    ?l shutdown=inviso:stop(),                  % Stop the control component!
-    ?l undefined=whereis(inviso_c),
-    timer:sleep(2000),
-    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt])) end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt_meta])) end,
-		     Nodes),
-    timer:sleep(4000),                          % Now they shall be dead!
-    ?l lists:foreach(fun(N)->undefined=rpc:call(N,erlang,whereis,[inviso_rt]) end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->undefined=rpc:call(N,erlang,whereis,[inviso_rt_meta]) end,
-		     Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Test of the dependency mechanism in the runtime component.
-%% Test that the runtime components terminates imeediately when the control
-%% component is stopped. Check that all processes are gone.
-running_alone_dist_5(suite) -> [];
-running_alone_dist_5(doc) ->
-    [""];
-running_alone_dist_5(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    %% Start some tracing!
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataFun=
-	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf_ra5"++atom_to_list(N)])}},
-		    {ti,{file,filename:join([PrivDir,"tf_ra5_"++atom_to_list(N)++".ti"])}}]}
-	end,
-    TracerDataList=lists:map(TracerDataFun,Nodes),
-    start_and_init_tracing2(Nodes,
-			    [{dependency,0}],
-			    TracerDataList,
-			    {ok,[{trace_log,ok},{ti_log,ok}]}),
-
-    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt])) end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt_meta])) end,
-		     Nodes),
-    %% Stop control component and check that all runtime component processes have
-    %% terminate more or less immediately afterwards, since dependency==0.
-    ?l shutdown=inviso:stop(),                  % Stop the control component!
-    timer:sleep(100),
-    ?l undefined=whereis(inviso_c),
-    timer:sleep(500),
-    ?l lists:foreach(fun(N)->undefined=rpc:call(N,erlang,whereis,[inviso_rt]) end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->undefined=rpc:call(N,erlang,whereis,[inviso_rt_meta]) end,
-		     Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Test of the overload protection mechanism. The mechanism checks
-%% for overload using the callback approximately at the interval specified.
-%% Check that it does not start protection until start of tracing.
-overload_dist_1(suite) -> [];
-overload_dist_1(doc) ->
-    [""];
-overload_dist_1(Config) when is_list(Config) ->
-    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    ?l lists:foreach(fun(N)->true=rpc:call(N,ets,insert,[inviso_sideeffect_tab,{ovl1,0}]) end,
-		     Nodes),                    % Initiate the counter.
-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,
-					  a_ref,
-					  [{overload,{{?MODULE,overload1},500}}]),
-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
-    timer:sleep(1000),                          % Give the loadcheck time to perform.
-    ?l [{_,0}]=ets:lookup(inviso_sideeffect_tab,ovl1), % Nothing should have happened.
-
-    %% Overload check shall not start until we start tracing.
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataList=lists:map(fun(N)->{N,[{trace,
-					  {file,filename:join([PrivDir,
-							       "tf_ovl1."++atom_to_list(N)
-							      ])}}]}
-			     end,
-			     Nodes),
-    ?l {ok,NodeResults2}=inviso:init_tracing(TracerDataList),
-    ?l true=check_noderesults(Nodes,{ok,[{trace_log,ok}]},NodeResults2),
-    timer:sleep(1500),                          % Give the loadcheck time to perform.
-    ?l [{_,N}]=ets:lookup(inviso_sideeffect_tab,ovl1),
-    ?l true=(N>=2),                             % After 1,5 seconds, at least 2 checks.
-
-    %% Now change options and remove overload checking!
-    ?l {ok,NodeResults3}=inviso:change_options(Nodes,[overload]),
-    ?l true=check_noderesults(Nodes,ok,NodeResults3),
-    ?l [{_,N2}]=ets:lookup(inviso_sideeffect_tab,ovl1),
-    timer:sleep(1000),
-    ?l [{_,N2}]=ets:lookup(inviso_sideeffect_tab,ovl1), % No more loadchecks!
-
-    stop_tracing(Nodes),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Test of the overload protection mechanism. In this case we focus
-%% in that the init and remove functions are carried out at change_options and
-%% when starting and stoping the runtime component.
-overload_dist_2(suite) -> [];
-overload_dist_2(doc) ->
-    [""];
-overload_dist_2(Config) when is_list(Config) ->
-    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,
-					  a_ref,
-					  [{overload,{{?MODULE,overload2},
-						      500,
-						      {?MODULE,overload2i,[]},
-						      {?MODULE,overload2r,[]}}}]),
-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
-    ?l [{_,0}]=ets:lookup(inviso_sideeffect_tab,ovl2),
-
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataList=lists:map(fun(N)->{N,[{trace,
-					  {file,filename:join([PrivDir,
-							       "tf_ovl2."++atom_to_list(N)
-							      ])}}]}
-			     end,
-			     Nodes),
-    ?l {ok,NodeResults2}=inviso:init_tracing(TracerDataList),
-    ?l true=check_noderesults(Nodes,{ok,[{trace_log,ok}]},NodeResults2),
-    timer:sleep(1500),                          % Give the loadcheck time to perform.
-    ?l [{_,N}]=ets:lookup(inviso_sideeffect_tab,ovl2),
-    io:format("� is:~p~n",[N]),
-    ?l true=(N>=2),                             % After 1,5 seconds, at least 2 checks.
-    ?l {ok,NodeResults3}=inviso:change_options(Nodes,[{overload,{{?MODULE,overload3},
-								 500,
-								 {?MODULE,overload3i,[]},
-								 {?MODULE,overload3r,[]}}}]),
-    ?l true=check_noderesults(Nodes,ok,NodeResults3),
-    ?l []=ets:lookup(inviso_sideeffect_tab,ovl2),
-    timer:sleep(1500),
-    ?l [{_,N2}]=ets:lookup(inviso_sideeffect_tab,ovl3),
-    ?l true=(N2>=2),                            % After 1,5 seconds, at least 2 checks.
-    stop_tracing(Nodes),
-    ?l []=ets:lookup(inviso_sideeffect_tab,ovl3r), % Remove function shall not be called.
-    ?l [{_,N3}]=ets:lookup(inviso_sideeffect_tab,ovl3),
-    timer:sleep(1000),                          % Check that overloadchecking has stopped.
-    ?l [{_,N3}]=ets:lookup(inviso_sideeffect_tab,ovl3),
-    stop(Nodes),
-    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,ovl3r],[{ovl3r,done}],20),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Test of the overload protections mechanism. Here we focus on testing
-%% that if overload is reached tracing is really suspended.
-overload_dist_3(suite) -> [];
-overload_dist_3(doc) ->
-    [""];
-overload_dist_3(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataList=
-	lists:map(fun(N)->{N,[{trace,{file,filename:join([PrivDir,
-							  "tf_ovl3."++atom_to_list(N)])}},
-			      {ti,{file,filename:join([PrivDir,
-						       "tf_ovl3_ti."++atom_to_list(N)])}}]}
-		  end,
-		  Nodes),
-    ?l lists:foreach(fun(N)->
-			     true=rpc:call(N,ets,insert,[inviso_sideeffect_tab,{ovl4,0}])
-		     end,
-		     Nodes),
-    start_and_init_tracing2(Nodes,
-			    [{overload,{{?MODULE,overload4},500}}],
-			    TracerDataList,
-			    {ok,[{trace_log,ok},{ti_log,ok}]}),
-    activate_local_tracing(Nodes),
-    activate_meta_tracing(Nodes),
-    activate_traceflags(Nodes),
-    timer:sleep(600),
-    ?l [{_,N1}]=ets:lookup(inviso_sideeffect_tab,ovl4),
-    ?l true=(N1>=1),                            % Overload check has been done!
-    ?l Node=node(),
-    ?l {ok,[{Node,{ok,{tracing,running}}}]}=inviso:get_status([node()]),
-    ?l true=ets:insert(inviso_sideeffect_tab,{ovl4_suspend,true}),
-    timer:sleep(600),
-    ?l {ok,[{Node,{ok,{tracing,{suspended,test}}}}]}=inviso:get_status([node()]),
-    ?l [{_,N2}]=ets:lookup(inviso_sideeffect_tab,ovl4),
-    ?l {flags,[]}=erlang:trace_info(whereis(inviso_test_proc),flags),
-    ?l {meta,false}=erlang:trace_info({lists,module_info,0},meta),
-    ?l {traced,local}=erlang:trace_info({code,which,1},traced),
-    ?l true=(is_pid(whereis(inviso_rt_meta))),
-    ?l true=ets:delete(inviso_sideeffect_tab,ovl4_suspend),
-    timer:sleep(600),
-    ?l [{_,N2}]=ets:lookup(inviso_sideeffect_tab,ovl4), % No checking while suspended!
-    ?l {ok,[{Node,ok}]}=inviso:cancel_suspension([node()]),
-    ?l {ok,NodeResults1}=inviso:get_status(Nodes),
-    ?l true=check_noderesults(Nodes,{ok,{tracing,running}},NodeResults1),
-    timer:sleep(600),
-    ?l [{_,N3}]=ets:lookup(inviso_sideeffect_tab,ovl4),
-    ?l true=(N3>N2),
-    ?l deactivate_local_tracing(Nodes),
-    ?l stop_tracing(Nodes),
-    ?l stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE. Test that the overload mechanism is triggered by to the runtime
-%% component incomming messages, and nothing else.
-overload_dist_4(suite) -> [];
-overload_dist_4(doc) ->
-    [""];
-overload_dist_4(Config) when is_list(Config) ->
-    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,
-					  a_ref,
-					  [{overload,{{?MODULE,overload5},
-						      infinity,
-						      {?MODULE,overload5i,[]},
-						      {?MODULE,overload5r,[]}}}]),
-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
-    ?l [{_,0}]=ets:lookup(inviso_sideeffect_tab,ovl5),
-
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataList=lists:map(fun(N)->{N,[{trace,
-					  {file,filename:join([PrivDir,
-							       "tf_ovl4."++atom_to_list(N)
-							      ])}}]}
-			     end,
-			     Nodes),
-    ?l {ok,NodeResults2}=inviso:init_tracing(TracerDataList),
-    ?l true=check_noderesults(Nodes,{ok,[{trace_log,ok}]},NodeResults2),
-    timer:sleep(2000),                          % Give the loadcheck time to perform.
-    ?l [{_,N}]=ets:lookup(inviso_sideeffect_tab,ovl5),
-    ?l true=(N==0),                             % And nothing shall have happend!
-    %% Now we send a message to the inviso_rt, then the load check function
-    %% shall be called.
-    ?l whereis(inviso_rt) ! test_of_loadcheck,
-    timer:sleep(200),                           % Make sure the inviso_rt gets scheduled.
-    ?l [{_,1}]=ets:lookup(inviso_sideeffect_tab,ovl5),
-    stop_tracing(Nodes),
-    ?l []=ets:lookup(inviso_sideeffect_tab,ovl5r), % Remove function shall not be called.
-    ?l [{_,N3}]=ets:lookup(inviso_sideeffect_tab,ovl5),
-    ?l whereis(inviso_rt) ! test_of_loadcheck,
-    timer:sleep(1000),                          % Check that overloadchecking has stopped.
-    ?l [{_,N3}]=ets:lookup(inviso_sideeffect_tab,ovl5),
-    stop(Nodes),
-    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,ovl5r],[{ovl5r,done}],20),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE. Test that the overload mechanism correctly calculates remaining time
-%% to next load check if a message comes into the runtime component "interupting"
-%% the waiting for loadcheck timeout. (Loadcheck timeout is implemented as an after
-%% in the receive).
-overload_dist_5(suite) -> [];
-overload_dist_5(doc) ->
-    [""];
-overload_dist_5(Config) when is_list(Config) ->
-    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    ?l lists:foreach(fun(N)->true=rpc:call(N,ets,insert,[inviso_sideeffect_tab,{ovl6,0}]) end,
-		     Nodes),                    % Initiate the counter.
-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,
-					  a_ref,
-					  [{overload,{{?MODULE,overload6},1000}}]),
-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
-    %% Overload check shall not start until we start tracing.
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataList=lists:map(fun(N)->{N,[{trace,
-					  {file,filename:join([PrivDir,
-							       "tf_ovl5."++atom_to_list(N)
-							      ])}}]}
-			     end,
-			     Nodes),
-    ?l {ok,NodeResults2}=inviso:init_tracing(TracerDataList),
-    ?l true=check_noderesults(Nodes,{ok,[{trace_log,ok}]},NodeResults2),
-    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,ovl6],[{ovl6,2}],25),
-    %% Now we know that exactly 2 checks have been made. Try to Distract the runtime :-)
-    ?l inviso_rt:state(whereis(inviso_rt)),     % Make it have to receive a message.
-    timer:sleep(500),
-    ?l [{_,2}]=ets:lookup(inviso_sideeffect_tab,ovl6), % Should still be 2.
-    timer:sleep(600),
-    ?l [{_,3}]=ets:lookup(inviso_sideeffect_tab,ovl6), % We expect yet one check.
-    timer:sleep(1100),
-    ?l [{_,4}]=ets:lookup(inviso_sideeffect_tab,ovl6),
-
-    stop_tracing(Nodes),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-
-%% TEST CASE: Test of the subscription mechanism.
-subscribe_dist_1(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    Pid=spawn(?MODULE,inviso_msg_collector,[]),
-    CtrlPid=whereis(inviso_c),
-
-    ?l {ok,_Pid}=inviso:start(),             % Start a control component.
-    ?l ok=inviso:subscribe(Pid),
-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref,[]),
-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
-    ?l {ok,NodeResults2}=inviso:get_status(Nodes),
-    ?l true=check_noderesults(Nodes,{ok,{new,running}},NodeResults2),
-    check_msg_collector(Nodes,
-			fun({inviso_event,CP,_,{connected,N,{_Tag,{idle,running}}}})
-			   when CP==CtrlPid ->
-				{true,N};
-			   (_) ->
-				false
-			end,
-			13),
-    TracerDataList=lists:map(fun(N)->{N,{file,
-					 filename:join([PrivDir,
-							"tf_sub1"++atom_to_list(N)])}}
-			     end,
-			     Nodes),
-    ?l {ok,NodeResults3}=inviso:init_tracing(TracerDataList),
-    ?l true=check_noderesults(Nodes,{ok,[{trace_log,ok}]},NodeResults3),
-    check_msg_collector(Nodes,
-			fun({inviso_event,CP,_,{state_change,N,{tracing,running}}})
-			   when CP==CtrlPid ->
-				{true,N};
-			   (_) ->
-				false
-			end,
-			13),
-    ?l {ok,NodeResults4}=inviso:suspend(Nodes,test),
-    ?l true=check_noderesults(Nodes,ok,NodeResults4),
-    check_msg_collector(Nodes,
-			fun({inviso_event,CP,_,{state_change,N,{tracing,{suspended,test}}}})
-			   when CP==CtrlPid ->
-				{true,N};
-			   (_) ->
-				false
-			end,
-			13),
-    ?l [RNode|_]=RemoteNodes,
-    ?l RInvisoPid=rpc:call(RNode,erlang,whereis,[inviso_rt]),
-    ?l rpc:call(RNode,erlang,exit,[RInvisoPid,kill]),
-    check_msg_collector([RNode],
-			fun({inviso_event,CP,_,{disconnected,N,_Info}})
-			   when CP==CtrlPid ->
-				{true,N};
-			   (_) ->
-				false
-			end,
-			11),
-
-    ?l {ok,_NodeResults5}=inviso:stop_tracing(Nodes),
-    ?l {ok,_NodeResults6}=inviso:stop_nodes(Nodes),
-    ?l shutdown=inviso:stop(),
-    ok.
-%% -----------------------------------------------------------------------------
-
-
-%% TEST CASE: fetch_log test of single straight trace_log file in distributed
-%% environment.
-fetch_log_dist_trace_1(suite) -> [];
-fetch_log_dist_trace_1(doc) ->
-    ["fetch_log test of single straight trace_log file in distributed"
-     "environment."];
-fetch_log_dist_trace_1(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataList=lists:map(fun(N)->{N,[{trace,{file,filename:join([PrivDir,
-								     "testfile1."++
-								     atom_to_list(N)
-								    ])}}]} end,
-			     Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
-
-    %% Put some output in the logs.
-    ?l inviso:tp(Nodes,math,module_info,0,[]),
-    ?l inviso:tf(Nodes,all,[call]),
-    ?l lists:foreach(fun(N)->rpc:call(N,math,module_info,[]) end,Nodes),
-
-    stop_tracing(Nodes),
-    {H,M,S}=time(),
-    FetchToDir=filename:join([PrivDir,
-			      "fetch_log_test1_"++integer_to_list(H)++"_"++
-			      integer_to_list(M)++"_"++integer_to_list(S)]),
-    ?l ok=file:make_dir(FetchToDir),
-    ?l {ok,NodeResults}=inviso:fetch_log(RemoteNodes,FetchToDir,"p1"),
-    io:format("~p~n",[NodeResults]),
-    ?l true=check_noderesults(RemoteNodes,
-			      fun({N,{complete,[{trace_log,[{ok,File}]},{ti_log,[]}]}}) ->
-				      ?l File="p1testfile1."++atom_to_list(N),
-				      true;
-				 (_)->
-				      false
-			      end,
-			      NodeResults),
-    ?l ON=filename:join(PrivDir,"testfile1."),
-    ?l FN=filename:join(FetchToDir,"p1testfile1."),
-    ?l lists:foreach(fun(N)->
-			     {ok,#file_info{size=Size}}=
-				 file:read_file_info(ON++atom_to_list(N)),
-			     {ok,#file_info{size=Size}}=
-				 file:read_file_info(FN++atom_to_list(N))
-		     end,
-		     RemoteNodes),
-    %% Now we wish to see that we get an incomplete if we try to fetch to a
-    %% directory that does not exist.
-    ?l FetchToErrorDir=filename:join([PrivDir,nonexistingingdir]),
-    ?l {ok,NodeResults2}=inviso:fetch_log(RemoteNodes,FetchToErrorDir,"p1"),
-    ?l io:format("NodeResults2:~w~n",[NodeResults2]),
-    ?l true=check_noderesults(RemoteNodes,
-			      fun({_,{incomplete,_}}) ->
-				      true;
-				 (_)->
-				      false
-			      end,
-			      NodeResults2),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-fetch_log_dist_trace_2(suite) -> [];
-fetch_log_dist_trace_2(doc) ->
-    [""];
-fetch_log_dist_trace_2(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-
-    {H,M,S}=time(),
-    ?l Name="wrap"++integer_to_list(H)++"_"++integer_to_list(M)++"_"++integer_to_list(S),
-    ?l BaseName=filename:join(PrivDir,Name),
-    Fun=fun(N)->{N,[{trace,{file,{BaseName++atom_to_list(N),wrap,".log",512,2}}},
-		    {ti,{file,BaseName++"_ti_"++atom_to_list(N)++".ti"}}]}
-	end,
-    ?l TracerDataList=lists:map(Fun,Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
-    fill_and_reach_two_wrapfiles(PrivDir,"^"++Name,Nodes),
-
-    stop_tracing(Nodes),
-    FetchToDir=filename:join([PrivDir,
-			      "fetch_log_test2_"++integer_to_list(H)++"_"++
-			      integer_to_list(M)++"_"++integer_to_list(S)]),
-    ?l ok=file:make_dir(FetchToDir),
-    ?l {ok,NodeResults}=inviso:fetch_log(RemoteNodes,FetchToDir,"p1"),
-    io:format("~p~n",[NodeResults]),
-    CheckFun=fun({N,{complete,[{trace_log,FileResults1},{ti_log,[{ok,TiFile}]}]}}) ->
-		     Fun2=fun({ok,File}) ->
-				  match=
-				      re:run(File,
-					     "^"++"p1"++Name++atom_to_list(N),
-					     [{capture,none}]),
-				  true;
-			     (_) ->
-				  false
-			  end,
-		     ?l true=lists:all(Fun2,FileResults1),
-		     ?l TiFile="p1"++Name++"_ti_"++atom_to_list(N)++".ti",
-		     true;
-		(_)->
-		     false
-	     end,
-    ?l true=check_noderesults(RemoteNodes,CheckFun,NodeResults),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-fetch_log_dist_trace_3(suite) -> [];
-fetch_log_dist_trace_3(doc) ->
-    [""];
-fetch_log_dist_trace_3(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-
-    {H,M,S}=time(),
-    ?l Name="wrap2_"++integer_to_list(H)++"_"++integer_to_list(M)++"_"++integer_to_list(S),
-    ?l BaseName=filename:join(PrivDir,Name),
-    Fun=fun(N)->{N,[{trace,{file,{BaseName++atom_to_list(N),wrap,".log",512,2}}},
-		    {ti,{file,BaseName++"_ti_"++atom_to_list(N)++".ti"}}]}
-	end,
-    ?l TracerDataList=lists:map(Fun,Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
-    fill_and_reach_two_wrapfiles(PrivDir,"^"++Name,Nodes),
-
-    stop_tracing(Nodes),
-    FetchToDir=filename:join([PrivDir,
-			      "fetch_log_test3_"++integer_to_list(H)++"_"++
-			      integer_to_list(M)++"_"++integer_to_list(S)]),
-    ?l ok=file:make_dir(FetchToDir),
-    ?l {ok,NodeResults1}=inviso:list_logs(Nodes),
-    CheckFun=fun({N,{ok,[{trace_log,PrivDir2,[F1,F2]},{ti_log,PrivDir2,[F3]}]}})->
-		     PrivDir2=PrivDir,
-		     RegExp="^"++Name++atom_to_list(N)++"[0-9]+"++"\.log",
-		     match=re:run(F1,RegExp,[{capture,none}]),
-		     match=re:run(F2,RegExp,[{capture,none}]),
-		     F3=Name++"_ti_"++atom_to_list(N)++".ti",
-		     true;
-		(_) ->
-		     false
-	     end,
-    ?l true=check_noderesults(Nodes,CheckFun,NodeResults1),
-    ?l NodeFileSpecList=lists:map(fun({N,{ok,L}})->{N,L} end,
-				  lists:keydelete(node(),1,NodeResults1)),
-    ?l {ok,NodeResults2}=inviso:fetch_log(NodeFileSpecList,FetchToDir,"p1"),
-io:format("~p~n",[NodeResults2]),
-    CheckFun2=fun({N,{complete,[{trace_log,FileResults1},{ti_log,[{ok,TiFile}]}]}}) ->
-		     Fun2=fun({ok,File}) ->
-				  match=
-				      re:run(File,
-					     "^"++"p1"++Name++atom_to_list(N),
-					    [{capture,none}]),
-				  true;
-			     (_) ->
-				  false
-			  end,
-		     ?l true=lists:all(Fun2,FileResults1),
-		     ?l TiFile="p1"++Name++"_ti_"++atom_to_list(N)++".ti",
-		     true;
-		(_)->
-		     false
-	     end,
-    ?l true=check_noderesults(RemoteNodes,CheckFun2,NodeResults2),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-fetch_log_dist_error_1(suite) -> [];
-fetch_log_dist_error_1(doc) ->
-    [""];
-fetch_log_dist_error_1(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    ?l {ok,_Pid}=inviso:start(),             % Start a control component.
-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref),
-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
-    ?l {ok,NodeResults2}=inviso:fetch_log(RemoteNodes,"foo","bar"),
-io:format("~p~n",[NodeResults2]),
-    ?l true=check_noderesults(RemoteNodes,
-			      fun({_N,{error,no_tracerdata}})->true;
-				 (_)->false
-			      end,
-			      NodeResults2),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-fetch_log_dist_error_2(suite) -> [];
-fetch_log_dist_error_2(doc) ->
-    [""];
-fetch_log_dist_error_2(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    ?l {ok,_Pid}=inviso:start(),             % Start a control component.
-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref),
-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
-    ?l NodeLogList=lists:map(fun(N)->{N,[{trace_log,
-					  PrivDir,
-					  ["f1,fil","f2.fil"]},
-					 {ti_log,
-					  PrivDir,
-					  ["f.ti"]}]}
-			     end,
-			     RemoteNodes),
-    ?l {ok,NodeResults2}=inviso:fetch_log(NodeLogList,"foo","bar"),
-    io:format("~p~n",[NodeResults2]),
-    ?l true=check_noderesults(RemoteNodes,
-			      fun({_N,{incomplete,_}}) ->
-				      true;
-				 (_) ->
-				      false
-			      end,
-			      NodeResults2),
-    ?l NodeTracerData=lists:map(fun(N)->{N,
-					 [{trace,{file,filename:join(PrivDir,"foo")}},
-					  {ti,{file,filename:join(PrivDir,"bar.ti")}}]}
-				end,
-				RemoteNodes),
-    {ok,NodeResults3}=inviso:fetch_log(NodeTracerData,"foo","bar"),
-    io:format("~p~n",[NodeResults3]),
-%% This should work this way. Now it says complete [], which is not entirely
-%% incorrect. But to follow the sematics of when fetching named files should
-%% say incomplete.
-%% Must do some rework to make that work. No real danger leaving it this way
-%% for now.
-%    ?l true=check_noderesults(RemoteNodes,
-%			      fun({_N,{incomplete,_}}) ->
-%				      true;
-%				 (_) ->
-%				      false
-%			      end,
-%			      NodeResults3),
-    stop(Nodes),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: This case tests that the log file merger merges files in the
-%% correct order, based on the timestamps.
-lfm_trace_dist_1(suite) -> [];
-lfm_trace_dist_1(doc) ->
-    [""];
-lfm_trace_dist_1(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    [RNode1,RNode2|_]=RemoteNodes,
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataList=
-	lists:map(fun(N)->{N,{file,filename:join([PrivDir,"lfm1_"++atom_to_list(N)])}} end,
-		  Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
-    activate_local_tracing(Nodes),
-    activate_traceflags(Nodes),
-
-    {inviso_test_proc,RNode2} ! {apply,code,which,[lists]},
-    timer:sleep(300),
-    {inviso_test_proc,RNode1} ! {apply,code,which,[lists]},
-    timer:sleep(300),
-    {inviso_test_proc,RNode1} ! {apply,code,which,[lists]},
-    timer:sleep(300),
-    inviso_test_proc ! {apply,code,which,[lists]},
-    timer:sleep(300),
-    {inviso_test_proc,RNode2} ! {apply,code,which,[lists]},
-    timer:sleep(300),
-    inviso_test_proc ! {apply,code,which,[lists]},
-
-    deactivate_traceflags(Nodes),
-    deactivate_local_tracing(Nodes),
-    stop_tracing(Nodes),
-    stop(Nodes),
-
-    DestFile=filename:join(PrivDir,"lfm1_out.txt"),
-    ?l {ok,6}=
-	inviso_lfm:merge([{node(),
-			   [{trace_log,
-			     [filename:join(PrivDir,"lfm1_"++atom_to_list(node()))]}]},
-			  {RNode1,
-			   [{trace_log,
-			     [filename:join(PrivDir,"lfm1_"++atom_to_list(RNode1))]}]},
-			  {RNode2,
-			   [{trace_log,
-			     [filename:join(PrivDir,"lfm1_"++atom_to_list(RNode2))]}]}],
-			 DestFile),
-    ?l {ok,FD}=file:open(DestFile,[read]),
-    ?l S1=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(RNode2),S1),
-    ?l S2=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(RNode1),S2),
-    ?l S3=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(RNode1),S3),
-    ?l S4=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(node()),S4),
-    ?l S5=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(RNode2),S5),
-    ?l S6=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(node()),S6),
-    ?l file:close(FD),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: Testing to the full extent that pid-mappings work with both
-%% local and global registration. Also checks that pidmappings can be removed
-%% and that consequently the mappings in the resulting merged file stops.
-lfm_trace_ti_dist_2(suite) -> [];
-lfm_trace_ti_dist_2(doc) ->
-    [""];
-lfm_trace_ti_dist_2(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    [RNode1,RNode2|_]=RemoteNodes,
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataList=
-	lists:map(fun(N)->{N,[{trace,{file,filename:join(PrivDir,"lfm2_"++atom_to_list(N))}},
-			      {ti,{file,filename:join(PrivDir,"lfm2_ti_"++atom_to_list(N))}}]}
-		  end,
-		  Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
-    activate_local_tracing(Nodes),
-    activate_meta_tracing(Nodes),
-    activate_traceflags(Nodes),
-
-    {inviso_test_proc,RNode2} ! {apply,code,which,[lists]},
-    timer:sleep(300),
-    {inviso_test_proc,RNode1} ! {apply,code,which,[lists]},
-    timer:sleep(300),
-    {inviso_test_proc,RNode1} ! {apply,code,which,[lists]},
-    timer:sleep(300),
-    inviso_test_proc ! {apply,code,which,[lists]},
-    timer:sleep(300),
-
-    P2=spawn(RNode2,?MODULE,test_proc_loop,[]),
-    P1=spawn(RNode1,?MODULE,test_proc_loop,[]),
-    P0=spawn_link(?MODULE,test_proc_loop,[]),
-    ThisNode=node(),
-    ?l {ok,[{ThisNode,{ok,[1]}}]}=inviso:tf([node()],P0,[call,timestamp]),
-    ?l {ok,[{RNode1,{ok,[1]}}]}=inviso:tf([RNode1],P1,[call,timestamp]),
-    ?l {ok,[{RNode2,{ok,[1]}}]}=inviso:tf([RNode2],P2,[call,timestamp]),
-    P2 ! {apply,code,which,[lists]},
-    timer:sleep(300),
-    P1 ! {apply,code,which,[lists]},
-    timer:sleep(300),
-    P0 ! {apply,code,which,[lists]},
-    timer:sleep(300),
-
-    P3=spawn(RNode2,?MODULE,test_proc_loop,[]),
-    ?l yes=global:register_name(inviso_test_proc_globalname,P3),
-    ?l {ok,[{RNode2,{ok,[1]}}]}=inviso:tf([RNode2],P3,[call,timestamp]),
-    timer:sleep(300),
-    P3 ! {apply,code,which,[lists]},
-    timer:sleep(300),
-
-    P4=rpc:call(RNode1,erlang,whereis,[inviso_test_proc]),
-    ?l true=rpc:call(RNode1,erlang,unregister,[inviso_test_proc]),
-    timer:sleep(300),
-    P4 ! {apply,code,which,[lists]},
-    timer:sleep(300),
-
-    ?l true=rpc:call(RNode1,erlang,register,[inviso_test_proc,P4]),
-
-    ?l global:unregister_name(inviso_test_proc_globalname),
-    timer:sleep(300),
-    ?l P3 ! {apply,code,which,[lists]},
-    timer:sleep(300),
-
-    deactivate_traceflags(Nodes),
-    deactivate_local_tracing(Nodes),
-    stop_tracing(Nodes),
-    stop(Nodes),
-
-    DestFile=filename:join(PrivDir,"lfm2_out.txt"),
-    ?l {ok,10}=
-	inviso_lfm:merge([
-			  {node(),
-			   [{trace_log,
-			     [filename:join(PrivDir,"lfm2_"++atom_to_list(node()))]},
-			    {ti_log,
-			     [filename:join(PrivDir,"lfm2_ti_"++atom_to_list(node()))]}]},
-			  {RNode1,
-			   [{trace_log,
-			     [filename:join(PrivDir,"lfm2_"++atom_to_list(RNode1))]},
-			    {ti_log,
-			     [filename:join(PrivDir,"lfm2_ti_"++atom_to_list(RNode1))]}]},
-			  {RNode2,
-			   [{trace_log,
-			     [filename:join(PrivDir,"lfm2_"++atom_to_list(RNode2))]},
-			    {ti_log,
-			     [filename:join(PrivDir,"lfm2_ti_"++atom_to_list(RNode2))]}]}
-			 ],
-			 DestFile),
-    ?l {ok,FD}=file:open(DestFile,[read]),
-    ?l S1=io:get_line(FD,""),
-io:format("S1 is:~p~n",[S1]),
-    ?l true=lists:prefix(atom_to_list(RNode2)++" [inviso_test_proc",S1),
-    ?l S2=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(RNode1)++" [inviso_test_proc",S2),
-    ?l S3=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(RNode1)++" [inviso_test_proc",S3),
-    ?l S4=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(node())++" [inviso_test_proc",S4),
-    ?l S5=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(RNode2)++" []",S5),
-    ?l S6=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(RNode1)++" []",S6),
-    ?l S7=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(node())++" []",S7),
-    ?l S8=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(RNode2)++" [{global,inviso_test_proc_globalname}]",S8),
-    ?l S9=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(RNode1)++" []",S9),
-    ?l S10=io:get_line(FD,""),
-    ?l true=lists:prefix(atom_to_list(RNode2)++" []",S10),
-    ?l file:close(FD),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: This tests that the wrapset sorter works.
-handle_logfile_sort_wrapset(suite) -> [];
-handle_logfile_sort_wrapset(doc) ->
-    [""];
-handle_logfile_sort_wrapset(Config) when is_list(Config) ->
-    File0="prefix10.fil",
-    File1="prefix11.fil",
-    File2="prefix12.fil",
-    File3="prefix13.fil",
-    ?l [File0,File1,File2,File3]=
-	inviso_lfm_tpfreader:handle_logfile_sort_wrapset([File2,File1,File0,File3]),
-    File5="prefix15.fil",
-    ?l [File5,File0,File1,File2,File3]=
-	inviso_lfm_tpfreader:handle_logfile_sort_wrapset([File2,File5,File1,File0,File3]),
-    ok.
-%% -----------------------------------------------------------------------------
-
-%% TEST CASE: This case tests that the regexp mechanism in the inviso_rt_lib can
-%% find modules using regexps and that its only_loaded mechanism works.
-%% This test case can not be run when using cover because cover will make the
-%% modules no longer loaded from the path containing "runtime_tools".
-expand_regexp_dist_1(suite) -> [];
-expand_regexp_dist_1(doc) ->
-    [""];
-expand_regexp_dist_1(Config) when is_list(Config) ->
-    case ?t:is_cover() of
-	true ->
-	    {skip,"Cover is running"};
-	false ->
-	    expand_regexp_dist_1_nocover(Config)
-    end.
-
-expand_regexp_dist_1_nocover(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    [RNode1|_]=RemoteNodes,
-    ?l NodeResults1=inviso_rt_lib:expand_regexp(Nodes,"^inviso_rt.*",[]),
-    ?l L1=length(Nodes),
-    ?l L1=length(NodeResults1),
-    ?l true=lists:all(fun({_,Mods})->
-			      ?l 3=length(Mods),
-			      ?l true=lists:member(inviso_rt,Mods),
-			      ?l true=lists:member(inviso_rt_lib,Mods),
-			      ?l true=lists:member(inviso_rt_meta,Mods),
-			      true;
-			 (_) ->
-			      false
-		      end,
-		      NodeResults1),
-    %% Check the dir-option. In the following inviso_tool_lib shall not be found.
-    ?l NodeResults2=inviso_rt_lib:expand_regexp(Nodes,"runtime_tools","invi.*lib.*",[]),
-?l io:format("NodeResults2:~w~n",[NodeResults2]),
-    ?l L1=length(NodeResults2),          % Same number of nodes replying.
-    ?l true=lists:all(fun({_,Mods})->
-			      2=length(Mods),
-			      true=lists:member(inviso_as_lib,Mods),
-			      true=lists:member(inviso_rt_lib,Mods),
-			      true;
-			 (_) ->
-			      false
-		      end,
-		      NodeResults2),
-    ?l [{RNode1,[]}]=
-	inviso_rt_lib:expand_regexp([RNode1],"^inviso_testmodule1.*",[only_loaded]),
-    ?l [{RNode1,[inviso_testmodule1_foo]}]=
-	inviso_rt_lib:expand_regexp([RNode1],"^inviso_testmodule1.*",[]),
-    ok.
-%% -----------------------------------------------------------------------------
-
-
-only_loaded_dist_1(suite) -> [];
-only_loaded_dist_1(doc) ->
-    [""];
-only_loaded_dist_1(Config) when is_list(Config) ->
-    RemoteNodes=get_remotenodes_config(Config),
-    Nodes=[node()|RemoteNodes],
-    [RNode1|_]=RemoteNodes,
-    PrivDir=filename:join(?config(priv_dir,Config),""),
-    TracerDataList=
-	lists:map(fun(N)->{N,[{trace,{file,filename:join(PrivDir,"ol_1_"++atom_to_list(N))}}]}
-		  end,
-		  Nodes),
-    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
-    ?l false=rpc:call(RNode1,erlang,module_loaded,[inviso_testmodule1_foo]),
-    ?l {ok,[{RNode1,{ok,[0]}}]}=
-	inviso:tpl([RNode1],inviso_testmodule1_foo,'_','_',[],[only_loaded]),
-    ?l false=rpc:call(RNode1,erlang,module_loaded,[inviso_testmodule1_foo]),
-    ?l {ok,[{RNode1,{ok,[3]}}]}=
-	inviso:tpl([RNode1],inviso_testmodule1_foo,'_','_',[],[]),
-    stop_tracing(Nodes),
-    stop(Nodes),
-    ok.
-
-
-%% ==============================================================================
-%% Common functions setting up inviso.
-%% ==============================================================================
-
-%% Starts controlcomponent and adds runtime components on the nodes specified.
-%% Also initiates tracing on the nodes.
-start_and_init_tracing1(Nodes,Options,TracerData,Reply) when is_list(Nodes) ->
-    ?l {ok,_Pid}=inviso:start(),             % Start a control component.
-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref,Options),
-    io:format("~p~n",[NodeResults1]),
-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
-    ?l {ok,NodeResults2}=inviso:get_status(Nodes),
-    ?l true=check_noderesults(Nodes,{ok,{new,running}},NodeResults2),
-    ?l {ok,NodeResults3}=inviso:init_tracing(Nodes,TracerData),
-    ?l true=check_noderesults(Nodes,Reply,NodeResults3),
-    ok.
-start_and_init_tracing2(Nodes,Options,TracerDataList,Reply) ->
-    ?l {ok,_Pid}=inviso:start(),             % Start a control component.
-    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref,Options),
-    io:format("~p~n",[NodeResults1]),
-    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
-    ?l {ok,NodeResults2}=inviso:get_status(Nodes),
-    ?l true=check_noderesults(Nodes,{ok,{new,running}},NodeResults2),
-    ?l {ok,NodeResults4}=inviso:get_tracerdata(Nodes),
-    ?l true=check_noderesults(Nodes,{ok,no_tracerdata},NodeResults4),
-    ?l {ok,NodeResults3}=inviso:init_tracing(TracerDataList),
-    io:format("Tracerdatalist:~p~n",[TracerDataList]),
-    ?l true=check_noderesults(Nodes,Reply,NodeResults3),
-
-    ?l Fun1=fun({N,{ok,TD}}) when is_list(TD)->
-		    ?l {value,{trace,Trace}}=lists:keysearch(trace,1,TD),
-		    ?l {value,{N,TD2}}=lists:keysearch(N,1,TracerDataList),
-		    ?l true=lists:member({trace,Trace},TD2),
-		    %% Check that the trace file really exists.
-		    ?l case Trace of % Trace={file,FilePortParameters}
-			   {file,FileName1} when is_list(FileName1) ->
-			       ?l {ok,_}=rpc:call(N,file,read_file_info,[FileName1]);
-			   _ ->              % This should be extended with more cases.
-			       true
-		       end,
-		    ?l case lists:keysearch(ti,1,TD2) of
-			   {value,{_,Ti}} -> % Ok, we have ti too.
-			       ?l {value,{_,Ti}}=lists:keysearch(ti,1,TD),
-			       ?l FileName2=element(2,Ti),
-			       ?l {ok,_}=rpc:call(N,file,read_file_info,[FileName2]),
-			       true;
-			   false ->          % No ti, we are done now.
-			       true
-		       end;
-	       ({N,{ok,{file,FileName}}}) ->
-		    ?l {value,{N,{file,FileName}}}=lists:keysearch(N,1,TracerDataList),
-		    ?l {ok,_}=rpc:call(N,file,read_file_info,[FileName]),
-		    true;
-	       ({N,{ok,LogTD}}) ->           % The case using a fun.
-		    ?l {value,{N,LogTD}}=lists:keysearch(N,1,TracerDataList),
-		    true
-	    end,
-    ?l {ok,NodeResults5}=inviso:get_tracerdata(Nodes),
-    ?l true=check_noderesults(Nodes,Fun1,NodeResults5),
-    ok.
-%% ------------------------------------------------------------------------------
-
-%% Stops tracing on Nodes.
-stop_tracing(Nodes) when is_list(Nodes) ->
-    ?l {ok,NodeResults1}=inviso:stop_tracing(Nodes),
-    ?l true=check_noderesults(Nodes,{ok,idle},NodeResults1),
-    ?l {ok,NodeResults2}=inviso:get_status(Nodes),
-    ?l true=check_noderesults(Nodes,{ok,{idle,running}},NodeResults2),
-    %% The implementation says that the meta tracer shall be stopped when
-    %% tracing is stopped. Check that.
-    ?l lists:foreach(fun(N)->
-			     ok=poll(erlang,whereis,[inviso_rt_meta],undefined,20)
-		     end,
-		     Nodes).
-%% ------------------------------------------------------------------------------
-
-%% Stops the runtime components on Nodes and stops the control component at this
-%% Erlang node.
-stop(Nodes) when is_list(Nodes) ->
-    ?l true=check_on_nodes(Nodes,erlang,whereis,[inviso_rt],fun(P) when is_pid(P)->true end),
-    ?l {ok,NodeResults}=inviso:stop_nodes(Nodes),
-    ?l true=check_noderesults(Nodes,ok,NodeResults),
-    ?l true=check_on_nodes(Nodes,erlang,whereis,[inviso_rt],fun(undefined)->true end),
-    ?l true=is_pid(whereis(inviso_c)),
-    ?l shutdown=inviso:stop(),
-    ?l ok=poll(erlang,whereis,[inviso_c],undefined,20).
-%% ------------------------------------------------------------------------------
-
-%% Help function activating local tracing.
-activate_local_tracing(Nodes) when is_list(Nodes) ->
-    ?l true=check_on_nodes(Nodes,
-			   erlang,
-			   trace_info,
-			   [{code,which,1},traced],
-			   {traced,false}),
-    ?l {ok,NodeResults}=inviso:tpl(Nodes,code,which,1,[]),
-    ?l true=check_noderesults(Nodes,fun({_,{ok,[1]}})->true end,NodeResults),
-    ?l true=check_on_nodes(Nodes,
-			   erlang,
-			   trace_info,
-			   [{code,which,1},traced],
-			   {traced,local}).
-%% ------------------------------------------------------------------------------
-
-%% Help function activating global tracing.
-activate_global_tracing(Nodes) when is_list(Nodes) ->
-    ?l true=check_on_nodes(Nodes,
-			   erlang,
-			   trace_info,
-			   [{code,get_path,0},traced],
-			   {traced,false}),
-    ?l {ok,NodeResults}=inviso:tp(Nodes,code,get_path,0,[]),
-    ?l true=check_noderesults(Nodes,fun({_,{ok,[1]}})->true end,NodeResults),
-    ?l true=check_on_nodes(Nodes,
-			   erlang,
-			   trace_info,
-			   [{code,get_path,0},traced],
-			   {traced,global}).
-%% ------------------------------------------------------------------------------
-
-
-%% Help function activating local tracing and using a regexp to point out modules.
-%% Returns the structure of modules and functions that were activated. Must be used
-%% when deactivating.
-activate_global_tracing_regexp(Nodes) when is_list(Nodes) ->
-    %% First find out which modules will be effected.
-    ?l Mods1=inviso_rt_lib:expand_regexp("application.*",[]),
-    ?l true=(length(Mods1)>1),                % Should find more than one module!
-    ?l Funcs1=lists:foldl(fun(M,Acc)->[{M,M:module_info(exports)}|Acc] end,[],Mods1),
-    %% Check that these functions are not traced.
-    io:format("Modules:~w~n",[Mods1]),
-    ?l {ok,NodeResults}=inviso:tp(Nodes,"application.*",'_','_',[],[]),
-    io:format("Here 2~w~n",[NodeResults]),
-    ?l N=lists:foldl(fun({_,L1},A1)->lists:foldl(fun(_,A2)->A2+1 end,A1,L1) end,0,Funcs1),
-    ?l true=check_noderesults(Nodes,fun({_,{ok,L}})-> N==lists:sum(L) end,NodeResults),
-    io:format("Here 3~n",[]),
-    %% Check again!
-    ?l lists:foreach(fun({M,Funcs})->
-			     lists:foreach(fun({F,Arity})->
-						   true=check_on_nodes(Nodes,
-								       erlang,
-								       trace_info,
-								       [{M,F,Arity},traced],
-								       {traced,global})
-					   end,
-					   Funcs)
-		     end,
-		     Funcs1),
-    Funcs1.
-%% ------------------------------------------------------------------------------
-
-%% Help function as above but uses the dir feature as well.
-activate_global_tracing_regexp_dir(Nodes) when is_list(Nodes) ->
-    %% First find out which modules will be effected.
-    ?l Mods1=inviso_rt_lib:expand_regexp(".*kernel.*","application.*",[]),
-    ?l true=(length(Mods1)>1),                % Should find more than one module!
-    ?l Funcs1=lists:foldl(fun(M,Acc)->[{M,M:module_info(exports)}|Acc] end,[],Mods1),
-    %% Check that these functions are not traced.
-    io:format("Modules:~w~n",[Mods1]),
-    ?l {ok,NodeResults}=inviso:tp(Nodes,{".*kernel.*","application.*"},'_','_',[],[]),
-    io:format("Here 2~w~n",[NodeResults]),
-    ?l N=lists:foldl(fun({_,L1},A1)->lists:foldl(fun(_,A2)->A2+1 end,A1,L1) end,0,Funcs1),
-    ?l true=check_noderesults(Nodes,fun({_,{ok,L}})-> N==lists:sum(L) end,NodeResults),
-    io:format("Here 3~n",[]),
-    %% Check again!
-    ?l lists:foreach(fun({M,Funcs})->
-			     lists:foreach(fun({F,Arity})->
-						   true=check_on_nodes(Nodes,
-								       erlang,
-								       trace_info,
-								       [{M,F,Arity},traced],
-								       {traced,global})
-					   end,
-					   Funcs)
-		     end,
-		     Funcs1),
-    Funcs1.
-%% ------------------------------------------------------------------------------
-
-deactivate_local_tracing(Nodes) when is_list(Nodes) ->
-    ?l true=check_on_nodes(Nodes,
-			   erlang,
-			   trace_info,
-			   [{code,which,1},traced],
-			   {traced,local}),
-    ?l {ok,NodeResults}=inviso:ctpl(Nodes,code,'_','_'),
-    ?l true=check_noderesults(Nodes,fun({_,{ok,[N]}})when is_integer(N)->true end,NodeResults),
-    ?l true=check_on_nodes(Nodes,
-			   erlang,
-			   trace_info,
-			   [{code,which,1},traced],
-			   {traced,false}).
-%% ------------------------------------------------------------------------------
-
-deactivate_global_tracing(Nodes) when is_list(Nodes) ->
-    ?l true=check_on_nodes(Nodes,
-			   erlang,
-			   trace_info,
-			   [{code,get_path,0},traced],
-			   {traced,global}),
-    ?l {ok,NodeResults}=inviso:ctp(Nodes,code,'_','_'),
-    ?l true=check_noderesults(Nodes,fun({_,{ok,[N]}})when is_integer(N)->true end,NodeResults),
-    ?l true=check_on_nodes(Nodes,
-			   erlang,
-			   trace_info,
-			   [{code,get_path,0},traced],
-			   {traced,false}).
-%% ------------------------------------------------------------------------------
-
-
-%% Function deactivating the functions activated by activate_global_tracing_regexp/1.
-deactivate_global_tracing_regexp(Nodes,Funcs1) ->
-    ?l lists:foreach(fun({M,Funcs})->
-			     lists:foreach(fun({F,Arity})->
-						   true=check_on_nodes(Nodes,
-								       erlang,
-								       trace_info,
-								       [{M,F,Arity},traced],
-								       {traced,global})
-					   end,
-					   Funcs)
-		     end,
-		     Funcs1),
-    ?l {ok,NodeResults}=inviso:ctp(Nodes,"application.*",'_','_'),
-    ?l N=lists:foldl(fun({_,L1},A1)->lists:foldl(fun(_,A2)->A2+1 end,A1,L1) end,0,Funcs1),
-    io:format("Noderesult from deactivate;~w~n",[NodeResults]),
-    ?l true=check_noderesults(Nodes,fun({_,{ok,L}})-> N==lists:sum(L) end,NodeResults),
-    ?l lists:foreach(fun({M,Funcs})->
-			     lists:foreach(fun({F,Arity})->
-						   true=check_on_nodes(Nodes,
-								       erlang,
-								       trace_info,
-								       [{M,F,Arity},traced],
-								       {traced,false})
-					   end,
-					   Funcs)
-		     end,
-		     Funcs1).
-%% ------------------------------------------------------------------------------
-
-%% Function deactivating the functions activated by activate_global_tracing_regexp_dir/1.
-deactivate_global_tracing_regexp_dir(Nodes,Funcs1) ->
-    ?l lists:foreach(fun({M,Funcs})->
-			     lists:foreach(fun({F,Arity})->
-						   true=check_on_nodes(Nodes,
-								       erlang,
-								       trace_info,
-								       [{M,F,Arity},traced],
-								       {traced,global})
-					   end,
-					   Funcs)
-		     end,
-		     Funcs1),
-    ?l {ok,NodeResults}=inviso:ctp(Nodes,{".*kernel.*","application.*"},'_','_'),
-    ?l N=lists:foldl(fun({_,L1},A1)->lists:foldl(fun(_,A2)->A2+1 end,A1,L1) end,0,Funcs1),
-    io:format("Noderesult from deactivate;~w~n",[NodeResults]),
-    ?l true=check_noderesults(Nodes,fun({_,{ok,L}})-> N==lists:sum(L) end,NodeResults),
-    ?l lists:foreach(fun({M,Funcs})->
-			     lists:foreach(fun({F,Arity})->
-						   true=check_on_nodes(Nodes,
-								       erlang,
-								       trace_info,
-								       [{M,F,Arity},traced],
-								       {traced,false})
-					   end,
-					   Funcs)
-		     end,
-		     Funcs1).
-%% ------------------------------------------------------------------------------
-
-%% Help function which starts the inviso_test_proc on all nodes and then sets
-%% the call flag on that process.
-activate_traceflags(Nodes) ->
-    ?l lists:foreach(fun(N)->spawn(N,?MODULE,test_proc_init,[]) end,Nodes),
-    ?l lists:foreach(fun(N)->
-			     P=rpc:call(N,erlang,whereis,[inviso_test_proc]),
-			     {flags,[]}=rpc:call(N,erlang,trace_info,[P,flags])
-		     end,
-		     Nodes),
-    ?l {ok,NodeResults}=inviso:tf(Nodes,inviso_test_proc,[call,timestamp]),
-    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults),
-    ?l lists:foreach(fun(N)->
-			     P=rpc:call(N,erlang,whereis,[inviso_test_proc]),
-			     {flags,Flags}=rpc:call(N,erlang,trace_info,[P,flags]),
-			     true=lists:member(call,Flags),
-			     true=lists:member(timestamp,Flags)
-		     end,
-		     Nodes),
-    %% Now try a globally registered process.
-    ?l [ANode|_]=Nodes,
-    ?l GPid=spawn(ANode,?MODULE,global_test_proc_init,[]),
-    ?l ok=poll(global,whereis_name,[global_inviso_test_proc],
-	       fun(P) when is_pid(P)->true;(_)->false end,
-	       10),
-    ?l {ok,NodeResults2}=
-	inviso:tf(Nodes,{global,global_inviso_test_proc},[call,timestamp]),
-    ?l true=check_noderesults(Nodes,
-			      fun({N,{ok,[1]}}) when N==ANode->true;
-				 ({_,{ok,[0]}})->true;
-				 (_)->false
-			      end,
-			      NodeResults2),
-    ?l {flags,Flags2}=rpc:call(ANode,erlang,trace_info,[GPid,flags]),
-    ?l 2=length(Flags2),
-    ?l true=lists:member(call,Flags2),
-    ?l true=lists:member(timestamp,Flags2),
-    true.
-%% ------------------------------------------------------------------------------
-
-deactivate_traceflags(Nodes) ->
-    ?l lists:foreach(fun(N)->
-			     P=rpc:call(N,erlang,whereis,[inviso_test_proc]),
-			     {flags,Flags}=rpc:call(N,erlang,trace_info,[P,flags]),
-			     true=lists:member(call,Flags),
-			     true=lists:member(timestamp,Flags)
-		     end,
-		     Nodes),
-    ?l {ok,NodeResults}=inviso:ctf(Nodes,inviso_test_proc,[call,timestamp]),
-    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults),
-    ?l lists:foreach(fun(N)->
-			     P=rpc:call(N,erlang,whereis,[inviso_test_proc]),
-			     {flags,[]}=rpc:call(N,erlang,trace_info,[P,flags])
-		     end,
-		     Nodes),
-    ?l GPid=global:whereis_name(global_inviso_test_proc),
-    ?l ANode=node(GPid),
-    ?l {flags,Flags2}=rpc:call(ANode,erlang,trace_info,[GPid,flags]),
-    ?l 2=length(Flags2),
-    ?l {ok,NodeResults2}=inviso:ctf(Nodes,{global,global_inviso_test_proc},[call,timestamp]),
-    ?l true=check_noderesults(Nodes,
-			      fun({N,{ok,[1]}}) when N==ANode->true;
-				 ({_,{ok,[0]}})->true;
-				 (_)->false
-			      end,
-			      NodeResults2).
-%% ------------------------------------------------------------------------------
-
-
-activate_meta_tracing(Nodes) ->
-    ?l {ok,NodeResults1}=inviso:tpm_localnames(),
-    ?l true=check_noderesults(Nodes,{{ok,1},{ok,1}},NodeResults1),
-    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
-			     {meta,P}=rpc:call(N,erlang,trace_info,[{erlang,register,2},meta])
-		     end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
-			     {meta,P}=rpc:call(N,erlang,trace_info,[{erlang,unregister,1},meta])
-		     end,
-		     Nodes),
-    ?l {ok,NodeResults2}=inviso:tpm_globalnames(),
-    ?l true=check_noderesults(Nodes,{{ok,1},{ok,1}},NodeResults2),
-    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
-			     {meta,P}=rpc:call(N,
-					       erlang,
-					       trace_info,
-					       [{global,handle_call,3},meta])
-		     end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
-			     {meta,P}=rpc:call(N,
-					       erlang,
-					       trace_info,
-					       [{global,delete_global_name,2},meta])
-		     end,
-		     Nodes),
-
-    ?l lists:foreach(fun(N)->true=rpc:call(N,
-					   ets,
-					   insert,
-					   [inviso_sideeffect_tab,{tpm_init_func1,0}]),
-			     true=rpc:call(N,
-					   ets,
-					   insert,
-					   [inviso_sideeffect_tab,{tpm_call_func1,0}]),
-			     true=rpc:call(N,
-					   ets,
-					   insert,
-					   [inviso_sideeffect_tab,{tpm_return_func1,0}])
-		     end,
-		     Nodes),
-    ?l {ok,NodeResults3}=
-	inviso:init_tpm(lists,
-			module_info,
-			0,
-			{?MODULE,tpm_init_func1},
-			{?MODULE,tpm_call_func1},
-			{?MODULE,tpm_return_func1},
-			{?MODULE,tpm_remove_func1}),
-    ?l true=check_noderesults(Nodes,ok,NodeResults3),
-    ?l [{_,1}]=ets:lookup(inviso_sideeffect_tab,tpm_init_func1),
-    ?l {ok,NodeResults3a}=
-	inviso:init_tpm(lists,
-			module_info,
-			0,
-			{?MODULE,tpm_init_func1},
-			{?MODULE,tpm_call_func1},
-			{?MODULE,tpm_return_func1},
-			{?MODULE,tpm_remove_func1}),
-    ?l true=check_noderesults(Nodes,{error,already_initiated},NodeResults3a),
-%    %% Try more forbidden things. Wildcards not allowed in meta tracing!
-%    ?l {ok,NodeResults3b}=inviso:tpm(Nodes,lists,'_',0,[{'_',[],[{return_trace}]}]),
-%    io:format("The noderesults3b is:~w~n",[NodeResults3b]),
-%    ?l true=check_noderesults(Nodes,{error,bad_mfa},NodeResults3b),
-    ?l {ok,NodeResults3c}=inviso:tpm(Nodes,lists,module_info,0,[{'_',[],[{return_trace}]}]),
-    ?l true=check_noderesults(Nodes,{ok,1},NodeResults3c),
-    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
-			     {meta,P}=rpc:call(N,erlang,trace_info,[{lists,module_info,0},meta])
-		     end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->rpc:call(N,lists,module_info,[]) end,Nodes),
-    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_call_func1],[{tpm_call_func1,1}],20),
-    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_return_func1],[{tpm_return_func1,1}],20),
-    ?l lists:foreach(fun(N)->rpc:call(N,lists,module_info,[]) end,Nodes),
-    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_call_func1],[{tpm_call_func1,2}],20),
-    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_return_func1],[{tpm_return_func1,2}],20),
-
-    ?l {ok,NodeResults4}=
-	inviso:init_tpm(math,
-			module_info,
-			1,
-			{?MODULE,tpm_init_func2}, % Does not exist on purpose.
-			{?MODULE,tpm_call_func2}, % Does not exist on purpose.
-			{?MODULE,tpm_return_func2}, % Does not exist on purpose.
-			{?MODULE,tpm_remove_func2}), % Does not exist on purpose.
-    ?l true=check_noderesults(Nodes,ok,NodeResults4),
-    ?l {ok,NodeResults5}=
-	inviso:tpm_ms(math,module_info,1,ms1,[{'_',[],[{return_trace}]}]),
-    ?l true=check_noderesults(Nodes,{ok,1},NodeResults5),
-    ?l lists:foreach(fun(N)->{meta_match_spec,[{'_',[],[{return_trace}]}]}=
-				 rpc:call(N,erlang,trace_info,[{math,module_info,1},
-							       meta_match_spec])
-		     end,
-		     Nodes),
-
-    ?l {ok,NodeResults6}=inviso:tpm_ms(math,module_info,1,ms2,[{[exports],[],[]}]),
-    ?l true=check_noderesults(Nodes,{ok,1},NodeResults6),
-    ?l lists:foreach(fun(N)->{meta_match_spec,[{[exports],[],[]},{'_',[],[{return_trace}]}]}=
-				 rpc:call(N,erlang,trace_info,[{math,module_info,1},
-							       meta_match_spec])
-		     end,
-		     Nodes),
-    ?l {ok,NodeResults7}=inviso:tpm_ms(math,module_info,1,ms3,[{[attributes],[],[]}]),
-    ?l true=check_noderesults(Nodes,{ok,1},NodeResults7),
-    ?l lists:foreach(fun(N)->{meta_match_spec,[{[attributes],[],[]},
-					       {[exports],[],[]},
-					       {'_',[],[{return_trace}]}]}=
-				 rpc:call(N,erlang,trace_info,[{math,module_info,1},
-							       meta_match_spec])
-		     end,
-		     Nodes),
-    ?l {ok,NodeResults8}=inviso:ctpm_ms(math,module_info,1,ms2),
-    ?l true=check_noderesults(Nodes,ok,NodeResults8),
-    ?l lists:foreach(fun(N)->{meta_match_spec,[{[attributes],[],[]},
-					       {'_',[],[{return_trace}]}]}=
-				 rpc:call(N,erlang,trace_info,[{math,module_info,1},
-							       meta_match_spec])
-		     end,
-		     Nodes),
-    ?l io:format("whereis:~w~n",[lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_rt_meta]) end,Nodes)]),
-    ?l {ok,NodeResults8}=inviso:ctpm_ms(math,module_info,1,ms3),
-    ?l io:format("whereis:~w~n",[lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_rt_meta]) end,Nodes)]),
-    ?l {ok,NodeResults8}=inviso:ctpm_ms(math,module_info,1,ms1),
-    ?l lists:foreach(fun(N)->{meta_match_spec,false}=
-			      rpc:call(N,erlang,trace_info,[{math,module_info,1},
-							    meta_match_spec])
-		     end,
-		     Nodes),
-
-    %% Now try to do this with exception tracing instead.
-    %% Reset the side effect tables.
-    ?l lists:foreach(fun(N)->true=rpc:call(N,
-					   ets,
-					   insert,
-					   [inviso_sideeffect_tab,{tpm_init_func1,0}]),
-			     true=rpc:call(N,
-					   ets,
-					   insert,
-					   [inviso_sideeffect_tab,{tpm_call_func1,0}]),
-			     true=rpc:call(N,
-					   ets,
-					   insert,
-					   [inviso_sideeffect_tab,{tpm_return_func1,0}])
-		     end,
-		     Nodes),
-    ?l {ok,NodeResults9}=
-	inviso:init_tpm(?MODULE,
-			failing_function,
-			1,
-			{?MODULE,tpm_init_func1},
-			{?MODULE,tpm_call_func1},
-			{?MODULE,tpm_return_func1},
-			{?MODULE,tpm_remove_func1}),
-    ?l true=check_noderesults(Nodes,ok,NodeResults9),
-    ?l [{_,1}]=ets:lookup(inviso_sideeffect_tab,tpm_init_func1),
-    ?l {ok,NodeResults10}=inviso:tpm(Nodes,?MODULE,failing_function,1,[{'_',[],[{exception_trace}]}]),
-    ?l true=check_noderesults(Nodes,{ok,1},NodeResults10),
-    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
-			     {meta,P}=rpc:call(N,erlang,trace_info,[{?MODULE,failing_function,1},meta])
-		     end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->rpc:call(N,?MODULE,failing_function,[nofailure]) end,Nodes),
-    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_call_func1],[{tpm_call_func1,1}],20),
-    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_return_func1],[{tpm_return_func1,1}],20),
-    ?l lists:foreach(fun(N)->rpc:call(N,?MODULE,failing_function,[failure]) end,Nodes),
-    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_call_func1],[{tpm_call_func1,2}],20),
-    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_return_func1],[{tpm_return_func1,3}],20),
-
-    ok.
-%% ------------------------------------------------------------------------------
-
-%% This function is for testing that appending the tracer to a trace action term
-%% works.
-activate_deactivate_meta_tracing_tracer(Nodes) ->
-    ?l {ok,NodeResults}=
-	inviso:tpm_tracer(Nodes,lists,module_info,0,[{'_',[],[{trace,[all],[call]}]}],void),
-    ?l true=check_noderesults(Nodes,{ok,1},NodeResults),
-    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
-			     {meta,P}=rpc:call(N,erlang,trace_info,[{lists,module_info,0},meta]),
-			     {meta_match_spec,[{'_',[],[{trace,[all],Enable}]}]}=
-				 rpc:call(N,erlang,trace_info,[{lists,module_info,0},
-							       meta_match_spec]),
-			     true=list_search(Enable,fun({{tracer,P}}) when is_port(P)->true;
-							(_) -> false
-						     end)
-		     end,
-		     Nodes),
-    ?l {ok,NodeResults2}=
-	inviso:ctpm(Nodes,lists,module_info,0),
-    ?l true=check_noderesults(Nodes,ok,NodeResults2),
-    ?l lists:foreach(fun(N)->{meta,false}=
-				 rpc:call(N,erlang,trace_info,[{lists,module_info,0},meta])
-		     end,
-		     Nodes),
-    ok.
-%% ------------------------------------------------------------------------------
-
-deactivate_meta_tracing(Nodes) ->
-    ?l lists:foreach(fun(N)->{meta,P}=
-				 rpc:call(N,erlang,trace_info,[{erlang,register,2},meta]),
-			     true=is_pid(P)
-		     end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->{meta,P}=
-				 rpc:call(N,erlang,trace_info,[{erlang,unregister,1},meta]),
-			     true=is_pid(P)
-		     end,
-		     Nodes),
-    ?l {ok,NodeResults1}=inviso:ctpm_localnames(),
-    ?l lists:foreach(fun(N)->{meta,false}=
-				 rpc:call(N,erlang,trace_info,[{erlang,register,2},meta]) end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->{meta,false}=
-				 rpc:call(N,erlang,trace_info,[{erlang,unregister,1},meta])
-		     end,
-		     Nodes),
-    ?l true=check_noderesults(Nodes,{ok,ok},NodeResults1),
-
-    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
-			     {meta,P}=rpc:call(N,
-					       erlang,
-					       trace_info,
-					       [{global,handle_call,3},meta])
-		     end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
-			     {meta,P}=rpc:call(N,
-					       erlang,
-					       trace_info,
-					       [{global,delete_global_name,2},meta])
-		     end,
-		     Nodes),
-    ?l {ok,NodeResults1b}=inviso:ctpm_globalnames(),
-    ?l true=check_noderesults(Nodes,{ok,ok},NodeResults1b),
-    ?l lists:foreach(fun(N)->
-			     {meta,false}=rpc:call(N,
-						   erlang,
-						   trace_info,
-						   [{global,handle_call,3},meta])
-		     end,
-		     Nodes),
-    ?l lists:foreach(fun(N)->
-			     {meta,false}=rpc:call(N,
-						   erlang,
-						   trace_info,
-						   [{global,delete_global_name,2},meta])
-		     end,
-		     Nodes),
-
-    ?l lists:foreach(fun(N)->{meta,P}=
-				 rpc:call(N,erlang,trace_info,[{lists,module_info,0},meta]),
-			     true=is_pid(P)
-		     end,
-		     Nodes),
-    ?l {ok,NodeResults2}=inviso:ctpm(lists,module_info,0),
-    ?l true=check_noderesults(Nodes,ok,NodeResults2),
-    ?l lists:foreach(fun(N)->{meta,false}=
-				 rpc:call(N,erlang,trace_info,[{lists,module_info,0},meta]) end,
-		     Nodes),
-    ?l [{_,0}]=ets:lookup(inviso_sideeffect_tab,tpm_init_func1),
-    ?l {ok,NodeResults3}=inviso:ctpm(math,module_info,1),
-    ?l true=check_noderesults(Nodes,ok,NodeResults3),
-    ok.
-%% ------------------------------------------------------------------------------
-
-%% Functions acting as callbacks for testing the meta tracing mechanisms.
-tpm_init_func1(_M,_F,_Arity,PublLD) ->
-    ets:update_counter(inviso_sideeffect_tab,tpm_init_func1,1),
-    {ok,PublLD,void}.
-tpm_call_func1(_Pid,{call,_Args,_TS},PublLD) ->
-    ets:update_counter(inviso_sideeffect_tab,tpm_call_func1,1),
-    {ok,PublLD,void}.
-tpm_return_func1(_Pid,{return_from,_ReturnVal,_TS},PublLD) ->
-    ets:update_counter(inviso_sideeffect_tab,tpm_return_func1,1),
-    {ok,PublLD,void};
-tpm_return_func1(_Pid,{exception_from,_ReturnVal,_TS},PublLD) ->
-    ets:update_counter(inviso_sideeffect_tab,tpm_return_func1,1),
-    ets:update_counter(inviso_sideeffect_tab,tpm_return_func1,1),
-    {ok,PublLD,void}.
-tpm_remove_func1(_M,_F,_Arity,PublLD) ->
-    ets:update_counter(inviso_sideeffect_tab,tpm_init_func1,-1),
-    {ok,PublLD}.
-%% ------------------------------------------------------------------------------
-
-
-%% Help function which traces on a function and makes function calls until there
-%% are two files in the wrap-set.
-fill_and_reach_two_wrapfiles(PrivDir,RegExp,Nodes) ->
-    ?l lists:foreach(fun(N)->spawn(N,?MODULE,test_proc_init,[]) end,Nodes),
-    ?l {ok,NodeResults1}=inviso:tpl(Nodes,?MODULE,test_function,0,[]),
-    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults1),
-    ?l {ok,NodeResults2}=inviso:tf(Nodes,inviso_test_proc,[call]),
-    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults2),
-    fill_and_reach_two_wrapfiles_2(PrivDir,RegExp,Nodes),
-    ?l {ok,NodeResults3}=inviso:ctf(Nodes,inviso_test_proc,[call]),
-    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults3),
-    ?l {ok,NodeResults4}=inviso:ctpl(Nodes,?MODULE,test_function,0),
-    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults4),
-    ok.
-
-fill_and_reach_two_wrapfiles_2(PrivDir,RegExp,[Node|Rest]) ->
-    ?l ok=rpc:call(Node,?MODULE,fill_and_reach_two_wrapfiles_3,[PrivDir,RegExp]),
-    fill_and_reach_two_wrapfiles_2(PrivDir,RegExp,Rest);
-fill_and_reach_two_wrapfiles_2(_,_,[]) ->
-    ok.
-
-fill_and_reach_two_wrapfiles_3(Dir,RegExp) ->
-    ok=send_to_test_proc({apply,?MODULE,test_function,[]},
-			 fun reach_two_wraps_stopfun/1,
-			 {Dir,RegExp++atom_to_list(node())},
-			 100).
-
-%% Help function intended to be used as fun in a send_to_test_proc/4 call.
-%% The function lists the content of Dir and looks for occurancies of String.
-%% If two files containing the string String are found, 'done' is returned.
-%% Otherwise 'continue'.
-reach_two_wraps_stopfun({Dir,RegExp}) ->
-    case file:list_dir(Dir) of
-	{ok,FileNames} ->
-	    case how_many_files_regexp(FileNames,RegExp,0) of
-		{ok,2} ->
-		    done;
-		_ ->
-		    continue
-	    end;
-	{error,_Reason} ->
-	    error
-    end.
-%% ------------------------------------------------------------------------------
-
-%% ------------------------------------------------------------------------------
-%% Help function for the overload tests. These functions are used as callbacks.
-%% ------------------------------------------------------------------------------
-
-overload1(_) ->
-    ets:update_counter(inviso_sideeffect_tab,ovl1,1),
-    ok.
-%% This function is used when timeout occurs inside the runtime component.
-%% That is it is time to check for overload.
-overload2({timeout,overload2i_data}) ->
-    ets:update_counter(inviso_sideeffect_tab,ovl2,1),
-    ok.
-overload2i() ->
-    ets:insert(inviso_sideeffect_tab,{ovl2,0}),
-    {ok,overload2i_data}.
-overload2r(overload2i_data) ->
-    ets:delete(inviso_sideeffect_tab,ovl2).
-
-%% This function is used when timeout occurs inside the runtime component.
-%% That is it is time to check for overload.
-overload3({timeout,overload3i_data}) ->
-    ets:update_counter(inviso_sideeffect_tab,ovl3,1),
-    ok;
-overload3(_) ->                                 % Must handle garbage too.
-    ignore.
-overload3i() ->
-    ets:insert(inviso_sideeffect_tab,{ovl3,0}),
-    {ok,overload3i_data}.
-overload3r(overload3i_data) ->
-    ets:insert(inviso_sideeffect_tab,{ovl3r,done}),
-    ets:delete(inviso_sideeffect_tab,ovl3).
-
-overload4(_) ->
-    case ets:lookup(inviso_sideeffect_tab,ovl4_suspend) of
-	[] ->                                   % We are supposed to be running.
-	    ets:update_counter(inviso_sideeffect_tab,ovl4,1),
-	    ok;
-	[_] ->
-	    {suspend,test}
-    end.
-
-%% This function is used when overload check is done by icomming message.
-overload5({msg,{test_of_loadcheck,overload5i_data}}) ->
-    ets:update_counter(inviso_sideeffect_tab,ovl5,1),
-    ok;
-overload5(_) ->
-    ignore.
-overload5i() ->
-    ets:insert(inviso_sideeffect_tab,{ovl5,0}),
-    {ok,overload5i_data}.
-overload5r(overload5i_data) ->
-    ets:delete(inviso_sideeffect_tab,ovl5),
-    ets:insert(inviso_sideeffect_tab,{ovl5r,done});
-overload5r(X) ->
-    erlang:display({'***',overload5r,X}).
-
-overload6(_) ->
-    ets:update_counter(inviso_sideeffect_tab,ovl6,1),
-    ok.
-%% ------------------------------------------------------------------------------
-
-%% ------------------------------------------------------------------------------
-%% Help function for the subscription tests. These function implements a collector
-%% process which will subscribe to inviso_events from the control component.
-%% ------------------------------------------------------------------------------
-
-%% Function which can be used to check if an inviso_event has arrived. The function
-%% takes a fun which tests the messages.
-check_msg_collector([],_,_) ->
-    true;
-check_msg_collector(_,_,0) ->
-    false;
-check_msg_collector(Nodes,Fun,T) ->
-    Ref=make_ref(),
-    inviso_collector_proc ! {fetch_message,self(),Ref,Fun},
-    receive
-	{inviso,Ref,{true,Node}} ->
-	    check_msg_collector(lists:delete(Node,Nodes),Fun,T-1);
-	{inviso,Ref,false} ->
-	    timer:sleep(100),
-	    check_msg_collector(Nodes,Fun,T-1)
-    end.
-
-%% Spawn on this function to get a subscriber.
-inviso_msg_collector() ->
-    register(inviso_collector_proc,self()),
-    inviso_msg_collector_loop([]).
-
-inviso_msg_collector_loop(Msgs) ->
-    receive
-	{fetch_message,From,Ref,Fun} ->
-	    {NewMsgs,Reply}=inviso_msg_collector_selector(Msgs,Fun,[]),
-	    From ! {inviso,Ref,Reply},
-	    inviso_msg_collector_loop(NewMsgs);
-	Msg ->
-	    inviso_msg_collector_loop([Msg|Msgs])
-    end.
-
-inviso_msg_collector_selector([M|Rest],Fun,Accum) ->
-    case Fun(M) of
-	{true,X} ->
-	    {Rest++Accum,{true,X}};
-	_ ->
-	    inviso_msg_collector_selector(Rest,Fun,[M|Accum])
-    end;
-inviso_msg_collector_selector([],_,Accum) ->
-    {Accum,false}.
-%% ------------------------------------------------------------------------------
-
-
-%% ==============================================================================
-%% Help functions
-%% ==============================================================================
-
-list_search([E|Rest],Fun) ->
-    case Fun(E) of
-	true ->
-	    true;
-	false ->
-	    list_search(Rest,Fun)
-    end;
-list_search([],_Fun) ->
-    false.
-%% ------------------------------------------------------------------------------
-
-%% Help function checking that there is a Result for each node in Nodes.
-%% Returns 'true' if successful.
-check_noderesults(Nodes,Fun,[{Node,Result}|Rest]) when is_function(Fun) ->
-    case Fun({Node,Result}) of
-	true ->
-	    case lists:member(Node,Nodes) of
-		true ->
-		    check_noderesults(lists:delete(Node,Nodes),Fun,Rest);
-		false ->                     % Not good.
-		    unknown_node_in_returnvalue
-	    end;
-	_ ->
-	    illegal_result
-    end;
-check_noderesults(Nodes,Result,[{Node,Result}|Rest]) ->
-    case lists:member(Node,Nodes) of
-	true ->
-	    check_noderesults(lists:delete(Node,Nodes),Result,Rest);
-	false ->                             % Not good.
-	    unknown_node_in_returnvalue
-    end;
-check_noderesults([],_,[]) ->
-    true;
-check_noderesults(X,Y,Z) ->
-    io:format("Bad arguments to check noderesults:~w~n~w~n~w~n",[X,Y,Z]),
-    false.
-%% ------------------------------------------------------------------------------
-
-%% Help function doing rpc on all nodes in Nodes calling M:F. Returns 'true' if
-%% successful.
-check_on_nodes([Node|Rest],M,F,Args,Result) when Node==node() ->
-    if
-	is_function(Result) ->
-	    ?l true=Result(apply(M,F,Args));
-	true ->
-	    ?l Result=apply(M,F,Args)
-    end,
-    check_on_nodes(Rest,M,F,Args,Result);
-check_on_nodes([Node|Rest],M,F,Args,Result) ->
-    if
-	is_function(Result) ->
-	    ?l true=Result(rpc:call(Node,M,F,Args));
-	true ->
-	    ?l Result=rpc:call(Node,M,F,Args)
-    end,
-    check_on_nodes(Rest,M,F,Args,Result);
-check_on_nodes([],_,_,_,_) ->
-    true.
-%% ------------------------------------------------------------------------------
-
-%% Help function which given a list of files searches through it and returns
-%% how many satisfies the RegExp.
-%% Returns {ok,N}.
-how_many_files_regexp([],_,N) ->
-    {ok,N};
-how_many_files_regexp([FName|Rest],RegExp,N) ->
-    case re:run(FName,RegExp,[{capture,none}]) of
-	match ->
-	    how_many_files_regexp(Rest,RegExp,N+1);
-	nomatch ->
-	    how_many_files_regexp(Rest,RegExp,N);
-	{error,Reason} ->
-	    test_server:fail(Reason)
-    end.
-%% ------------------------------------------------------------------------------
-
-%% Help function killing a bunch of registered processes.
-process_killer([RegName|Rest]) ->
-    case whereis(RegName) of
-	undefined ->
-	    case global:whereis_name(RegName) of
-		undefined ->
-		    process_killer(Rest);
-		P when is_pid(P) ->
-		    if
-			node()==node(P) ->
-			    exit(P,kill);
-			true ->
-			    true
-		    end,
-		    process_killer(Rest)
-	    end;
-	P when is_pid(P) ->
-	    exit(P,kill),
-	    process_killer(Rest)
-    end;
-process_killer([]) ->
-    true.
-%% ------------------------------------------------------------------------------
-
-%% Help function which waits for a function call to become Result. This is useful
-%% if what we are waiting for can happend independantly of indications we have
-%% access to.
-poll(_,_,_,_,0) ->
-    error;
-poll(M,F,Args,Result,Times) ->
-    try apply(M,F,Args) of
-	What when is_function(Result) ->
-	    case Result(What) of
-		true ->
-		    ok;
-		_ ->
-		    timer:sleep(100),
-		    poll(M,F,Args,Result,Times-1)
-	    end;
-	Result ->
-	    ok;
-	_ ->
-	    timer:sleep(100),
-	    poll(M,F,Args,Result,Times-1)
-    catch
-	error:Reason ->
-	    io:format("Apply in suite-function poll/5 failed, ~w~n",[Reason]),
-	    timer:sleep(100),
-	    poll(M,F,Args,Result,Times-1)
-    end.
-%% ------------------------------------------------------------------------------
-
-insert_remotenode_config(Name,Node,Config) ->
-    [{remotenode,{Name,Node}}|Config].
-%% ------------------------------------------------------------------------------
-
-insert_timetraphandle_config(Handle,Config) ->
-    [{timetraphandle,Handle}|Config].
-%% ------------------------------------------------------------------------------
-
-get_remotenode_config(Name, [{remotenode, {Name, Node}}| _Cs]) ->
-    Node;
-get_remotenode_config(Name, [_ | Cs]) ->
-    get_remotenode_config(Name, Cs);
-get_remotenode_config(Name, []) ->
-    exit({no_remotenode, Name}).
-
-%% ------------------------------------------------------------------------------
-
-get_timetraphandle_config(Config) ->
-    {value,{_,Handle}}=lists:keysearch(timetraphandle,1,Config),
-    Handle.
-%% ------------------------------------------------------------------------------
-
-get_remotenodes_config([{remotenode,{_Name,Node}}|Config]) ->
-    [Node|get_remotenodes_config(Config)];
-get_remotenodes_config([_|Config]) ->
-    get_remotenodes_config(Config);
-get_remotenodes_config([]) ->
-    [].
-%% ------------------------------------------------------------------------------
-
-remove_remotenode_config(Name, [{remotenode, {Name, _}} | Cs]) ->
-    Cs;
-remove_remotenode_config(Name, [C | Cs]) ->
-    [C | remove_remotenode_config(Name, Cs)];
-remove_remotenode_config(_Name, []) ->
-    [].
-
-%% ------------------------------------------------------------------------------
-
-remove_timetraphandle_config(Config) ->
-    lists:keydelete(timetraphandle,1,Config).
-%% ------------------------------------------------------------------------------
-
-%% This function can be meta traced in order to check that exception_trace works.
-%% Must be exported.
-failing_function(nofailure) ->
-    true;
-failing_function(failure) ->
-    exit(failure).
-%% ------------------------------------------------------------------------------
-
-%% ==============================================================================
-%% Code for a test process which can be started.
-%% ==============================================================================
-
-test_proc_init() ->
-    register(inviso_test_proc,self()),
-    test_proc_loop().
-
-test_proc_loop() ->
-    receive
-	{apply,M,F,Args} ->
-	    apply(M,F,Args),
-	    test_proc_loop();
-	X ->
-	    io:format("Got ~w~n",[X]),
-	    test_proc_loop()
-    end.
-
-global_test_proc_init() ->
-    global:register_name(global_inviso_test_proc,self()),
-    test_proc_loop().
-%% ------------------------------------------------------------------------------
-
-send_to_test_proc(_,_,_,0) ->
-    error;
-send_to_test_proc(Msg,Fun,FunArg,N) ->
-    inviso_test_proc ! Msg,
-    case Fun(FunArg) of
-	done ->
-	    ok;
-	error ->
-	    test_server:fail(send_to_test_proc);
-	_ ->
-	    send_to_test_proc(Msg,Fun,FunArg,N-1)
-    end.
-%% ------------------------------------------------------------------------------
-
-
-%% This function is here to be traced on by the inviso_test_proc. Must be exported.
-test_function() ->
-    1+1.
-%% ------------------------------------------------------------------------------
-
-
-%% ==============================================================================
-%% Code for a test side effect table process.
-%% ==============================================================================
-
-%% The side effect logger is a process owning a public ETS table. The idea is that
-%% various callback functions can write in the table when called. In that way
-%% correct calling of the call-backs can be verified.
-start_side_effect_logger(Node) ->
-    ?l true=is_pid(spawn(Node,?MODULE,side_effect_logger_proc,[])),
-    ?l ok=poll(rpc,call,[Node,ets,lookup,[inviso_sideeffect_tab,foo]],[],20).
-
-%% This one must be exported.
-side_effect_logger_proc() ->
-    register(inviso_tab_proc,self()),        % So we can kill it later.
-    ets:new(inviso_sideeffect_tab,[public,named_table]),
-    side_effect_logger_proc_2().
-
-side_effect_logger_proc_2() ->
-    receive
-	_X ->                                % This process is not expecting anything!
-	    side_effect_logger_proc_2()
-    end.
-%% ------------------------------------------------------------------------------
diff --git a/lib/runtime_tools/test/inviso_testmodule1_foo.erl b/lib/runtime_tools/test/inviso_testmodule1_foo.erl
deleted file mode 100644
index a7a22cad39..0000000000
--- a/lib/runtime_tools/test/inviso_testmodule1_foo.erl
+++ /dev/null
@@ -1,9 +0,0 @@
--module(inviso_testmodule1_foo).
-
--compile(export_all).
-
-%% The purpose of this module is simply to have a module that is
-%% guaranteed not loaded.
-
-foo() ->
-    true.
diff --git a/lib/runtime_tools/test/runtime_tools_SUITE.erl b/lib/runtime_tools/test/runtime_tools_SUITE.erl
index b26f3dd881..62497ab527 100644
--- a/lib/runtime_tools/test/runtime_tools_SUITE.erl
+++ b/lib/runtime_tools/test/runtime_tools_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -25,7 +25,7 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases
--export([app_file/1]).
+-export([app_file/1, start_stop_app/1]).
 
 %% Default timetrap timeout (set in init_per_testcase)
 -define(default_timeout, ?t:minutes(1)).
@@ -42,7 +42,8 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [app_file].
+    [app_file,
+     start_stop_app].
 
 groups() -> 
     [].
@@ -60,10 +61,14 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-app_file(suite) ->
-    [];
-app_file(doc) ->
-    ["Testing .app file"];
-app_file(Config) when is_list(Config) ->
+app_file(_Config) ->
     ?line ok = ?t:app_test(runtime_tools),
     ok.
+
+start_stop_app(_Config) ->
+    ok = application:start(runtime_tools),
+    Sup = whereis(runtime_tools_sup),
+    true = is_pid(Sup),
+    Ref = erlang:monitor(process,Sup),
+    ok = application:stop(runtime_tools),
+    receive {'DOWN', Ref, process, Sup, shutdown} -> ok end.
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index c9b5cc1a41..534c7508d8 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.8.8
+RUNTIME_TOOLS_VSN = 1.8.9
diff --git a/lib/sasl/doc/src/Makefile b/lib/sasl/doc/src/Makefile
index eb880ccb78..b0ec671adc 100644
--- a/lib/sasl/doc/src/Makefile
+++ b/lib/sasl/doc/src/Makefile
@@ -116,18 +116,18 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man4
-	$(INSTALL_DATA) $(MAN4_FILES) $(RELEASE_PATH)/man/man4
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6_FILES) $(RELEASE_PATH)/man/man6
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man4"
+	$(INSTALL_DATA) $(MAN4_FILES) "$(RELEASE_PATH)/man/man4"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6_FILES) "$(RELEASE_PATH)/man/man6"
 
 release_spec:
 
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index e4a2c98db7..1333e375b1 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/examples/src/Makefile b/lib/sasl/examples/src/Makefile
index 9cf0d4c25d..c0d73aab1d 100644
--- a/lib/sasl/examples/src/Makefile
+++ b/lib/sasl/examples/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2010-2011. All Rights Reserved.
+# Copyright Ericsson AB 2010-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -63,10 +63,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/src
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/ebin
-	(cd ..; tar cf - src ebin  | (cd $(RELSYSDIR)/examples; tar xf -))
-	chmod -R ug+w $(RELSYSDIR)/examples
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/ebin"
+	(cd ..; tar cf - src ebin  | (cd "$(RELSYSDIR)/examples"; tar xf -))
+	chmod -R ug+w "$(RELSYSDIR)/examples"
 
 release_docs_spec:
 
diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
index 9a5d1e42d9..de0c45e6ae 100644
--- a/lib/sasl/src/Makefile
+++ b/lib/sasl/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -91,10 +91,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index 5efd932c92..1ff3eb96eb 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -494,10 +494,10 @@ find_script(App, Dir, OldVsn, UpOrDown) ->
 			  up -> UpFromScripts;
 			  down -> DownToScripts
 		      end,
-	    case lists:keysearch(OldVsn, 1, Scripts) of
-		{value, {_OldVsn, Script}} ->
-		    {NewVsn, Script};
-		false ->
+	    case systools_relup:appup_search_for_version(OldVsn,Scripts) of
+		{ok,Script} ->
+		    {NewVsn,Script};
+		error ->
 		    throw({version_not_in_appup, OldVsn})
 	    end;
 	{error, enoent} ->
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 806f597675..29c4a0d168 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -673,7 +673,7 @@ check_item({_,{registered,Regs}},I) ->
 	_ -> throw({bad_param, I})
     end;
 check_item({_,{modules,Mods}},I) ->
-    case mod_list_p(Mods) of
+    case a_list_p(Mods) of
 	true -> Mods;
 	_ -> throw({bad_param, I})
     end;
@@ -900,11 +900,10 @@ find_pos(N, Name, [_OtherAppl|OrderedAppls]) ->
 
 check_modules(Appls, Path, TestP, Machine) ->
     %% first check that all the module names are unique
-    %% Make a list M1 = [{Mod,Vsn,App,AppVsn,Dir}]
-    %%   where Vsn = '$$ignore$$' | Specified
-    M1 = [{Mod,Vsn,App,Appv,A#application.dir} ||
-	     {{App,Appv},A} <- Appls,
-	     {Mod,Vsn} <- get_mod_vsn(A#application.modules)],
+    %% Make a list M1 = [{Mod,App,Dir}]
+    M1 = [{Mod,App,A#application.dir} ||
+	     {{App,_Appv},A} <- Appls,
+	     Mod <- A#application.modules],
     case duplicates(M1) of
 	[] ->
 	    case check_mods(M1, Appls, Path, TestP, Machine) of
@@ -918,16 +917,8 @@ check_modules(Appls, Path, TestP, Machine) ->
 	    throw({error, {duplicate_modules, Dups}})
     end.
 
-get_mod_vsn([{Mod,Vsn}|Mods]) ->
-    [{Mod,Vsn}|get_mod_vsn(Mods)];
-get_mod_vsn([Mod|Mods]) ->
-    [{Mod,'$$ignore$$'}|get_mod_vsn(Mods)];
-get_mod_vsn([]) ->
-    [].
-
 %%______________________________________________________________________
-%% Check that all modules exists and that the specified version
-%% corresponds to the version in the module's source code.
+%% Check that all modules exists.
 %% Use the module extension of the running machine as extension for
 %% the checked modules.
 
@@ -952,7 +943,7 @@ check_src(Modules, Appls, Path, true, Machine) ->
     Ext = objfile_extension(Machine),
     IncPath = create_include_path(Appls, Path),
     append(map(fun(ModT) ->
-		       {Mod,_Vsn,App,_,Dir} = ModT,
+		       {Mod,App,Dir} = ModT,
 		       case check_mod(Mod,App,Dir,Ext,IncPath) of
 			   ok ->
 			       [];
@@ -1421,10 +1412,7 @@ create_mandatory_path(Appls, PathFlag, Variables) ->
 %% Load all modules, except those in Mandatory_modules.
 
 load_appl_mods([{{Name,Vsn},A}|Appls], Mand, PathFlag, Variables) ->
-    Mods = map(fun({Mod,_}) -> Mod;
-		  (Mod)     -> Mod
-	       end,
-	       A#application.modules),
+    Mods = A#application.modules,
     load_commands(filter(fun(Mod) -> not member(Mod, Mand) end, Mods),
 		  cr_path(Name, Vsn, A, PathFlag, Variables)) ++
 	load_appl_mods(Appls, Mand, PathFlag, Variables);
@@ -1785,9 +1773,7 @@ add_appl(Name, Vsn, App, Tar, Variables, Flags, Var) ->
 	    add_to_tar(Tar,
 		       filename:join(AppDir, Name ++ ".app"),
 		       filename:join(BinDir, Name ++ ".app")),
-	    add_modules(map(fun({Mod,_}) -> to_list(Mod);
-			       (Mod)     -> to_list(Mod)
-			    end,
+	    add_modules(map(fun(Mod) -> to_list(Mod) end,
 			    App#application.modules),
 			Tar,
 			AppDir,
@@ -2027,14 +2013,6 @@ t_list_p([{A,_}|T]) when is_atom(A) -> t_list_p(T);
 t_list_p([])                        -> true;
 t_list_p(_)                         -> false.
 
-% check if a term is a list of atoms or two-tuples with the first
-% element as an atom.
-
-mod_list_p([{A,_}|T]) when is_atom(A) -> mod_list_p(T);
-mod_list_p([A|T]) when is_atom(A)     -> mod_list_p(T);
-mod_list_p([])                        -> true;
-mod_list_p(_)                         -> false.
-
 % check if a term is a list of atoms.
 
 a_list_p([A|T]) when is_atom(A) -> a_list_p(T);
diff --git a/lib/sasl/src/systools_rc.erl b/lib/sasl/src/systools_rc.erl
index c16f6aa845..cf5cca7cb3 100644
--- a/lib/sasl/src/systools_rc.erl
+++ b/lib/sasl/src/systools_rc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -326,8 +326,7 @@ translate_application_instrs(Script, Appls, PreAppls) ->
 	  fun({add_application, Appl, Type}) ->
 		  case lists:keysearch(Appl, #application.name, Appls) of
 		      {value, Application} ->
-			  Mods =
-			      remove_vsn(Application#application.modules),
+			  Mods = Application#application.modules,
 			  ApplyL = case Type of
 			      none -> [];
 			      load -> [{apply, {application, load, [Appl]}}];
@@ -349,9 +348,11 @@ translate_application_instrs(Script, Appls, PreAppls) ->
 		  end,
 		  case lists:keysearch(Appl, #application.name, PreAppls) of
 		      {value, RemApplication} ->
-			  Mods = remove_vsn(RemApplication#application.modules),
+			  Mods = RemApplication#application.modules,
+
 			  [{apply, {application, stop, [Appl]}}] ++
-			      [{remove, {M, brutal_purge, brutal_purge}} || M <- Mods] ++
+			      [{remove, {M, brutal_purge, brutal_purge}}
+			       || M <- Mods] ++
 			      [{purge, Mods},
 			       {apply, {application, unload, [Appl]}}];
 		      false ->
@@ -360,16 +361,14 @@ translate_application_instrs(Script, Appls, PreAppls) ->
 	     ({restart_application, Appl}) ->
 		  case lists:keysearch(Appl, #application.name, PreAppls) of
 		      {value, PreApplication} ->
-			  PreMods =
-			      remove_vsn(PreApplication#application.modules),
-
+			  PreMods = PreApplication#application.modules,
 			  case lists:keysearch(Appl, #application.name, Appls) of
 			      {value, PostApplication} ->
-				  PostMods =
-				      remove_vsn(PostApplication#application.modules),
-				  
+				  PostMods = PostApplication#application.modules,
+
 				  [{apply, {application, stop, [Appl]}}] ++
-				      [{remove, {M, brutal_purge, brutal_purge}} || M <- PreMods] ++
+				      [{remove, {M, brutal_purge, brutal_purge}}
+				       || M <- PreMods] ++
 				      [{purge, PreMods}] ++
 				      [{add_module, M, []} || M <- PostMods] ++
 				      [{apply, {application, start,
@@ -385,11 +384,6 @@ translate_application_instrs(Script, Appls, PreAppls) ->
 	  end, Script),
     lists:flatten(L).
 
-remove_vsn(Mods) ->
-    lists:map(fun({Mod, _Vsn}) -> Mod;
-		 (Mod) -> Mod
-	      end, Mods).
-
 %%-----------------------------------------------------------------
 %% Translates add_module into load_module (high-level transformation)
 %%-----------------------------------------------------------------
@@ -654,15 +648,9 @@ translate_dep_to_low(Mode, Instructions, Appls) ->
     end.
 
 get_lib(Mod, [#application{name = Name, vsn = Vsn, modules = Modules} | T]) ->
-    %% Module = {Mod, Vsn} | Mod
-    case lists:keysearch(Mod, 1, Modules) of
-	{value, _} ->
-	    {Name, Vsn};
-	false ->
-	    case lists:member(Mod, Modules) of
-		true -> {Name, Vsn};
-		false ->   get_lib(Mod, T)
-	    end
+    case lists:member(Mod, Modules) of
+	true -> {Name, Vsn};
+	false ->   get_lib(Mod, T)
     end;
 get_lib(Mod, []) ->
     throw({error, {no_such_module, Mod}}).
diff --git a/lib/sasl/src/systools_relup.erl b/lib/sasl/src/systools_relup.erl
index 7fb623bb85..7048184426 100644
--- a/lib/sasl/src/systools_relup.erl
+++ b/lib/sasl/src/systools_relup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -114,7 +114,8 @@
 
 -define(R15_SASL_VSN,"2.2").
 
-%% For test purposes only - used by kernel, stdlib and sasl tests
+%% Used by release_handler:find_script/4.
+%% Also used by kernel, stdlib and sasl tests
 -export([appup_search_for_version/2]).
 
 %%-----------------------------------------------------------------
diff --git a/lib/sasl/test/Makefile b/lib/sasl/test/Makefile
index 91a8c42484..837abf74d4 100644
--- a/lib/sasl/test/Makefile
+++ b/lib/sasl/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2011. All Rights Reserved.
+# Copyright Ericsson AB 2011-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -85,10 +85,10 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) sasl.spec sasl.cover $(EMAKEFILE) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cfh - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) sasl.spec sasl.cover $(EMAKEFILE) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cfh - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/sasl/test/installer.erl b/lib/sasl/test/installer.erl
index 6942ec21ea..709269a73c 100644
--- a/lib/sasl/test/installer.erl
+++ b/lib/sasl/test/installer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -876,7 +876,9 @@ trace_disallowed_calls(Node) ->
     MasterProc = self(),
     rpc:call(Node,dbg,tracer,[process,{fun(T,_) -> MasterProc ! T end,[]}]),
     rpc:call(Node,dbg,p,[all,call]),
-    rpc:call(Node,dbg,tp,[file,[{'_',[],[{message,{caller}}]}]]).
+    rpc:call(Node,dbg,tp,[file,[{'_',[],[{message,{caller}}]}]]),
+    %% File:native_name_encoding/0 is a BIF and OK to use
+    rpc:call(Node,dbg,ctp,[file,native_name_encoding,0]).
 
 check_disallowed_calls(TestNode,Line) ->
     receive
diff --git a/lib/sasl/test/rb_SUITE.erl b/lib/sasl/test/rb_SUITE.erl
index 35a4eb7e7b..b0e43be3a2 100644
--- a/lib/sasl/test/rb_SUITE.erl
+++ b/lib/sasl/test/rb_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -66,23 +66,31 @@ init_per_group(running_error_logger,Config) ->
     restart_sasl(),
     Config.
 
-end_per_group(running_error_logger,Config) ->
+end_per_group(running_error_logger,_Config) ->
     %% Remove log_mf_h???
     ok.
 
 
 init_per_testcase(_Case,Config) ->
     case whereis(?SUP) of
-	undefined -> ok;
-	Pid -> kill(Pid)
+	undefined ->
+	    ok;
+	Sup ->
+	    Server = whereis(?MODULE),
+	    exit(Sup,kill),
+	    wait_for_down([Server,Sup])
     end,
     empty_error_logs(Config),
     Config.
 
-kill(Pid) ->
+wait_for_down([]) ->
+    ok;
+wait_for_down([undefined|Rest]) ->
+    wait_for_down(Rest);
+wait_for_down([Pid|Rest]) ->
     Ref = erlang:monitor(process,Pid),
-    exit(Pid,kill),
-    receive {'DOWN', Ref, process, Pid, _Info} -> ok end.
+    receive {'DOWN', Ref, process, Pid, _Info} -> ok end,
+    wait_for_down(Rest).
 
 end_per_testcase(Case,Config) ->
     try apply(?MODULE,Case,[cleanup,Config])
@@ -96,8 +104,9 @@ end_per_testcase(Case,Config) ->
 
 help(_Config) ->
     Help = capture(fun() -> rb:h() end),
-    "Report Browser Tool - usage" = hd(Help),
-    "rb:stop            - stop the rb_server" = lists:last(Help),
+    %% Check that first and last line is there
+    true = lists:member("Report Browser Tool - usage", Help),
+    true = lists:member("rb:stop            - stop the rb_server", Help),
     ok.
 
 %% Test that all three sasl env vars must be set for a successful start of rb
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index a8e3cc3d88..94cffc988d 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -63,7 +63,8 @@ cases() ->
      instructions, eval_appup, eval_appup_with_restart,
      supervisor_which_children_timeout,
      release_handler_which_releases, install_release_syntax_check,
-     upgrade_supervisor, upgrade_supervisor_fail, otp_9864].
+     upgrade_supervisor, upgrade_supervisor_fail, otp_9864,
+     otp_10463_upgrade_script_regexp].
 
 groups() ->
     [{release,[],
@@ -1206,12 +1207,25 @@ otp_9395_rm_many_mods(cleanup,_Conf) ->
     stop_node(node_name(otp_9395_rm_many_mods)).
 
 otp_9864(Conf) ->
+    case os:type() of
+	{win32,_} ->
+	    {skip,"Testing handling of symlinks - skipped on windows"};
+	_ ->
+	    do_otp_9864(Conf)
+    end.
+do_otp_9864(Conf) ->
     %% Set some paths
     PrivDir = priv_dir(Conf),
     Dir = filename:join(PrivDir,"otp_9864"),
     RelDir = filename:join(?config(data_dir, Conf), "app1_app2"),
-    LibDir1 = filename:join(RelDir, "lib1"),
-    LibDir2 = filename:join(RelDir, "lib2"),
+
+    %% Copy libs to priv_dir because remove_release will remove some
+    %% of these again, and we don't want to remove anything from
+    %% data_dir
+    copy_tree(Conf,filename:join(RelDir, "lib1"),Dir),
+    copy_tree(Conf,filename:join(RelDir, "lib2"),Dir),
+    LibDir1 = filename:join(Dir, "lib1"),
+    LibDir2 = filename:join(Dir, "lib2"),
 
     %% Create the releases
     Rel1 = create_and_install_fake_first_release(Dir,
@@ -1229,10 +1243,6 @@ otp_9864(Conf) ->
     {ok, Node} = t_start_node(otp_9864, Rel1, filename:join(Rel1Dir,"sys.config")),
     
     %% Unpack rel2 (make sure it does not work if an AppDir is bad)
-    LibDir3 = filename:join(RelDir, "lib3"),
-    {error, {no_such_directory, _}} =
-	rpc:call(Node, release_handler, set_unpacked,
-		 [Rel2++".rel", [{app1,"2.0",LibDir2}, {app2,"1.0",LibDir3}]]),
     {ok, RelVsn2} =
 	rpc:call(Node, release_handler, set_unpacked,
 		 [Rel2++".rel", [{app1,"2.0",LibDir2}, {app2,"1.0",LibDir2}]]),
@@ -1243,22 +1253,27 @@ otp_9864(Conf) ->
     ok = rpc:call(Node, release_handler, install_file,
 			[RelVsn2, filename:join(Rel2Dir, "sys.config")]),
 
-    %% Install RelVsn2 without {update_paths, true} option
+    %% Install RelVsn2
     {ok, RelVsn1, []} =
 	rpc:call(Node, release_handler, install_release, [RelVsn2]),
 
-    %% Install RelVsn1 again
+    %% Create a symlink inside release 2
+    Releases2Dir = filename:join([Dir,"releases","2"]),
+    Link = filename:join(Releases2Dir,"foo_symlink_dir"),
+    file:make_symlink(Releases2Dir,Link),
+
+    %% Back down to RelVsn1
     {ok, RelVsn1, []} =
 	rpc:call(Node, release_handler, install_release, [RelVsn1]),
 
-    TempRel2Dir = filename:join(Dir,"releases/2"),
-    file:make_symlink(TempRel2Dir, filename:join(TempRel2Dir, "foo_symlink_dir")),
-
     %% This will fail if symlinks are not handled
     ok = rpc:call(Node, release_handler, remove_release, [RelVsn2]),
 
     ok.
 
+otp_9864(cleanup,_Conf) ->
+    stop_node(node_name(otp_9864)).
+
 
 upgrade_supervisor(Conf) when is_list(Conf) ->
     %% Set some paths
@@ -1646,6 +1661,15 @@ upgrade_gg(cleanup,Config) ->
     ok = stop_nodes(NodeNames).
 
 
+%%%-----------------------------------------------------------------
+%%% OTP-10463, Bug - release_handler could not handle regexp in appup
+%%% files.
+otp_10463_upgrade_script_regexp(_Config) ->
+    %% Assuming that kernel always has a regexp in it's appup
+    KernelVsn = vsn(kernel,current),
+    {ok,KernelVsn,_} =
+	release_handler:upgrade_script(kernel,code:lib_dir(kernel)),
+    ok.
 
 
 %%%=================================================================
diff --git a/lib/sasl/test/release_handler_SUITE_data/Makefile.src b/lib/sasl/test/release_handler_SUITE_data/Makefile.src
index 55d20aa8b6..b794aa0e6f 100644
--- a/lib/sasl/test/release_handler_SUITE_data/Makefile.src
+++ b/lib/sasl/test/release_handler_SUITE_data/Makefile.src
@@ -1,9 +1,5 @@
 EFLAGS=+debug_info
 
-P2B= \
-     P2B/a-2.0/ebin/a.@EMULATOR@ \
-     P2B/a-2.0/ebin/a_sup.@EMULATOR@
-
 LIB= \
      lib/a-9.1/ebin/a.@EMULATOR@ \
      lib/a-9.1/ebin/a_sup.@EMULATOR@ \
@@ -80,13 +76,7 @@ SUP= \
 	 release_handler_timeouts/dummy-0.1/ebin/dummy_sup.@EMULATOR@ \
 	 release_handler_timeouts/dummy-0.1/ebin/dummy_sup_2.@EMULATOR@
 
-all: $(P2B) $(LIB) $(APP) $(OTP2740) $(C) $(SUP)
-
-P2B/a-2.0/ebin/a.@EMULATOR@: P2B/a-2.0/src/a.erl
-	erlc $(EFLAGS) -oP2B/a-2.0/ebin P2B/a-2.0/src/a.erl
-P2B/a-2.0/ebin/a_sup.@EMULATOR@: P2B/a-2.0/src/a_sup.erl
-	erlc $(EFLAGS) -oP2B/a-2.0/ebin P2B/a-2.0/src/a_sup.erl
-
+all: $(LIB) $(APP) $(OTP2740) $(C) $(SUP)
 
 lib/a-1.0/ebin/a.@EMULATOR@: lib/a-1.0/src/a.erl
 	erlc $(EFLAGS) -olib/a-1.0/ebin lib/a-1.0/src/a.erl
diff --git a/lib/sasl/test/release_handler_SUITE_data/c/c.app b/lib/sasl/test/release_handler_SUITE_data/c/c.app
index 908a94cf2d..2f56196918 100644
--- a/lib/sasl/test/release_handler_SUITE_data/c/c.app
+++ b/lib/sasl/test/release_handler_SUITE_data/c/c.app
@@ -1,7 +1,7 @@
 {application, c,
 	     [{description, "C  CXC 138 11"},
               {vsn, "1.0"},
-	      {modules, [b, {aa, 1}, {c_sup,1}]},
+	      {modules, [b, aa, c_sup]},
 	      {registered, [cc,bb,c_sup]},
 	      {applications, [kernel, stdlib]},
 	      {env, [{key1, val1}]},
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app
index e938137f67..7ae189a36a 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app
@@ -1,7 +1,7 @@
 {application, a,
 	     [{description, "A  CXC 138 11"},
               {vsn, "1.0"},
-	      {modules, [{a, 1}, {a_sup,1}]},
+	      {modules, [a, a_sup]},
 	      {registered, [a_sup]},
 	      {applications, [kernel, stdlib]},
 	      {env, [{key1, val1}]},
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app
index 1c3053b2fa..f8ab31fab9 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app
@@ -1,7 +1,7 @@
 {application, a,
 	     [{description, "A  CXC 138 11"},
               {vsn, "1.1"},
-	      {modules, [{a, 2}, {a_sup,1}]},
+	      {modules, [a, a_sup]},
 	      {registered, [a_sup]},
 	      {applications, [kernel, stdlib]},
 	      {env, [{key1, val1}]},
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.app b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.app
index b38722f06d..2393af0493 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.app
@@ -1,7 +1,7 @@
 {application, a,
 	     [{description, "A  CXC 138 11"},
               {vsn, "1.2"},
-	      {modules, [{a, 2}, {a_sup,1}]},
+	      {modules, [a, a_sup]},
 	      {registered, [a_sup]},
 	      {applications, [kernel, stdlib]},
 	      {env, [{key1, val1}]},
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/ebin/b.app b/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/ebin/b.app
index 00347b2754..e2eada00a4 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/ebin/b.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/ebin/b.app
@@ -2,6 +2,6 @@
 {application, b,
  [{description, "B  CXC 138 12"},
   {vsn, "1.0"},
-  {modules, [{b_server, 1},{b_lib, 1}]},
+  {modules, [b_server,b_lib]},
   {registered, [b_server]},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.app b/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.app
index 73c8e42b32..e4f8369ae5 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.app
@@ -2,6 +2,6 @@
 {application, b,
  [{description, "B  CXC 138 12"},
   {vsn, "2.0"},
-  {modules, [{b_server, 1}]},
+  {modules, [b_server]},
   {registered, [b_server]},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app
index aa39adfffa..5c56c4cd74 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app
@@ -2,16 +2,6 @@
 {application, many_mods,
  [{description, "Application with many modules  CXC 138 11"},
   {vsn, "1.0"},
-  {modules, [{m, 1},
-	     {m1,1},
-	     {m2,1},
-	     {m3,1},
-	     {m4,1},
-	     {m5,1},
-	     {m6,1},
-	     {m7,1},
-	     {m8,1},
-	     {m9,1},
-	     {m10,1}]},
+  {modules, [m,m1,m2,m3,m4,m5,m6,m7,m8,m9,m10]},
   {registered, []},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app
index 36c50caf2f..87fdfe8442 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app
@@ -2,16 +2,6 @@
 {application, many_mods,
  [{description, "Application with many modules  CXC 138 11"},
   {vsn, "1.1"},
-  {modules, [{m, 1},
-	     {m1,1},
-	     {m2,1},
-	     {m3,1},
-	     {m4,1},
-	     {m5,1},
-	     {m6,1},
-	     {m7,1},
-	     {m8,1},
-	     {m9,1},
-	     {m10,1}]},
+  {modules, [m,m1,m2,m3,m4,m5,m6,m7,m8,m9,m10]},
   {registered, []},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app
index 98f6527750..aba906d667 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app
@@ -2,6 +2,6 @@
 {application, many_mods,
  [{description, "Application with many modules  CXC 138 11"},
   {vsn, "2.0"},
-  {modules, [{m, 1}]},
+  {modules, [m]},
   {registered, []},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app
index d375768b99..0878b80cb5 100644
--- a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
    [{description, "ERICSSON NR FOR DB"},
     {vsn, "2.0"},
-    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {modules, [db1, db2]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app
index d3bd85cda6..33d44805bd 100644
--- a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "3.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app
index 3cb0b0c2cf..d7fae9e092 100644
--- a/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
  [{description, "ERICSSON NR FOR FE"},
   {vsn, "2.1"},
-  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {modules, [fe1, fe2, fe3]},
   {registered, []},
   {applications, []},
   {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app
index 0696e2494c..682d40eb12 100644
--- a/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
  [{description, "ERICSSON NR FOR FE"},
   {vsn, "3.1"},
-  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {modules, [fe1, fe2, fe3]},
   {registered, []},
   {applications, []},
   {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app
index 191919f8d3..a1025c306a 100644
--- a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
    [{description, "ERICSSON NR FOR DB"},
     {vsn, "2.1"},
-    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {modules, [db1, db2]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app
index d3bd85cda6..33d44805bd 100644
--- a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "3.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app
index 3e0ac3c3c9..28d0f80d34 100644
--- a/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
    [{description, "ERICSSON NR FOR DB"},
     {vsn, "2.1"},
-    {modules, [{db1, "1.0"}, {db2, "1.0"}, {db3, "2.0"}]},
+    {modules, [db1, db2, db3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app
index 191919f8d3..a1025c306a 100644
--- a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
    [{description, "ERICSSON NR FOR DB"},
     {vsn, "2.1"},
-    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {modules, [db1, db2]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app
index d3bd85cda6..33d44805bd 100644
--- a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "3.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app
index 47ea248720..717d30cf45 100644
--- a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "2.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app
index 0696e2494c..682d40eb12 100644
--- a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
  [{description, "ERICSSON NR FOR FE"},
   {vsn, "3.1"},
-  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {modules, [fe1, fe2, fe3]},
   {registered, []},
   {applications, []},
   {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app
index 3a5c0ddd9b..77b97979cb 100644
--- a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
  [{description, "ERICSSON NR FOR FE"},
   {vsn, "500.18.7"},
-  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {modules, [fe1, fe2, fe3]},
   {registered, []},
   {applications, []},
   {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app
index 22530ee335..3968ce3c32 100644
--- a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
    [{description, "ERICSSON NR FOR DB"},
     {vsn, "1.0"},
-    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {modules, [db1, db2]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app
index 7243a0a96a..0f0c926fbd 100644
--- a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
    [{description, "ERICSSON NR FOR DB"},
     {vsn, "1.1"},
-    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {modules, [db1, db2]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app
index 202d7f1234..6901d225e2 100644
--- a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
  [{description, "ERICSSON NR FOR DB"},
   {vsn, "2.1"},
-  {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+  {modules, [db1, db2]},
   {registered, []},
   {applications, []},
   {mod, {db1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app
index c7ba1dfe91..d963a7e7fa 100644
--- a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "2.1.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app
index 47ea248720..717d30cf45 100644
--- a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "2.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app
index 0696e2494c..682d40eb12 100644
--- a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
  [{description, "ERICSSON NR FOR FE"},
   {vsn, "3.1"},
-  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {modules, [fe1, fe2, fe3]},
   {registered, []},
   {applications, []},
   {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app
index c7ba1dfe91..d963a7e7fa 100644
--- a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "2.1.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app
index 47ea248720..717d30cf45 100644
--- a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "2.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app
index 0696e2494c..682d40eb12 100644
--- a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
  [{description, "ERICSSON NR FOR FE"},
   {vsn, "3.1"},
-  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {modules, [fe1, fe2, fe3]},
   {registered, []},
   {applications, []},
   {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_rc_SUITE.erl b/lib/sasl/test/systools_rc_SUITE.erl
index bd4aa9e7a7..0cb6e63cf3 100644
--- a/lib/sasl/test/systools_rc_SUITE.erl
+++ b/lib/sasl/test/systools_rc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -46,7 +46,7 @@ syntax_check(Config) when is_list(Config) ->
 	[#application{name = test,
 		      description = "TEST",
 		      vsn = "0.1",
-		      modules = [{foo,1},{bar,1},{baz,1},{old_mod,1}],
+		      modules = [foo,bar,baz,old_mod],
 		      regs = [],
 		      mod = {sasl, []}},
 	 #application{name = snmp,
@@ -59,7 +59,7 @@ syntax_check(Config) when is_list(Config) ->
 	[#application{name = test,
 		      description = "TEST",
 		      vsn = "1.0",
-		      modules = [{foo,1},{bar,1},{baz,1},{new_mod,1}],
+		      modules = [foo,bar,baz,new_mod],
 		      regs = [],
 		      mod = {sasl, []}}],
     S1 = [
@@ -128,8 +128,8 @@ translate(Config) when is_list(Config) ->
 	[#application{name = test,
 		      description = "TEST",
 		      vsn = "1.0",
-		      modules = [{foo,1},{bar,1},{baz,1},
-				 {x,1},{y,1},{z,1}],
+		      modules = [foo,bar,baz,
+				 x,y,z],
 		      regs = [],
 		      mod = {sasl, []}}],
     %% Simple translation (1)
@@ -439,7 +439,7 @@ translate_app(Config) when is_list(Config) ->
 	[#application{name = test,
 		      description = "TEST",
 		      vsn = "1.0",
-		      modules = [{foo,1},{bar,1},{baz,1}],
+		      modules = [foo,bar,baz],
 		      regs = [],
 		      mod = {sasl, []}},
 	 #application{name = pelle,
@@ -452,7 +452,7 @@ translate_app(Config) when is_list(Config) ->
 	[#application{name = test,
 		      description = "TEST",
 		      vsn = "1.0",
-		      modules = [{foo,1},{bar,1},{baz,1}],
+		      modules = [foo,bar,baz],
 		      regs = [],
 		      mod = {sasl, []}}],
     %% Simple translation (1)
@@ -492,13 +492,13 @@ translate_emulator_restarts(_Config) ->
 	[#application{name = test,
 		      description = "TEST",
 		      vsn = "1.0",
-		      modules = [{foo,1},{bar,1},{baz,1}],
+		      modules = [foo,bar,baz],
 		      regs = [],
 		      mod = {sasl, []}},
 	 #application{name = test,
 		      description = "TEST2",
 		      vsn = "1.0",
-		      modules = [{x,1},{y,1},{z,1}],
+		      modules = [x,y,z],
 		      regs = [],
 		      mod = {sasl, []}}],
     %% restart_new_emulator
diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile
index 8645886590..8820565124 100644
--- a/lib/snmp/doc/src/Makefile
+++ b/lib/snmp/doc/src/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -170,20 +170,20 @@ $(MAN1DIR)/snmpc.1: snmpc_cmd.xml
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DATA) $(MAN1DIR)/* $(RELEASE_PATH)/man/man1
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6DIR)/* $(RELEASE_PATH)/man/man6
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man7
-	$(INSTALL_DATA) $(MAN7DIR)/* $(RELEASE_PATH)/man/man7
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DATA) $(MAN1DIR)/* "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6DIR)/* "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man7"
+	$(INSTALL_DATA) $(MAN7DIR)/* "$(RELEASE_PATH)/man/man7"
 
 release_spec:
 
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 2d045faa0f..442837d57d 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,6 +34,98 @@
 
 
   <section>
+    <title>SNMP Development Toolkit 4.22.1</title>
+    <p>Version 4.22.1 supports code replacement in runtime from/to
+    version 4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 
+    4.21. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[agent] Sematic fixes to SNMP-USER-BASED-SM-MIB.
+	  The semantics allow the <c>usmUserAuthKeyChange</c> and 
+	  <c>usmUserPrivKeyChange</c> objects to be written to in the 
+	  same set requests that also creates and clones the user. 
+	  This was not possible beforehand, causing test tools checking 
+	  semantic SNMPv3 behaviour to fail on a lot of test cases. </p>
+	  <p>Furthermore, once the user has been cloned by writing to an 
+	  instance of <c>usmUserCloneFrom</c>, further set-operations to 
+	  the same object will not return an error, but be no-ops. 
+	  Especially, it must be avoided to copy security parameters 
+	  again (possibly even from a different user). </p>
+	  <p>Stefan Zegenhagen</p>
+	  <p>Own Id: OTP-10166</p>
+        </item>
+
+        <item>
+          <p>[agent] Errors in <c>vacmAccessTable</c> RowStatus handling.
+	  There are problems with the handling of vacmAccessTableStatus 
+	  that cause some SNMP test suites to report errors.
+	  Most notably, erroneous set operations frequently cause "genErr" 
+	  errors to be returned. These "genErr" errors are usually caused 
+	  by badmatch exceptions coming from 
+	  <c>{ok, Row} = snmpa_vacm:get_row(RowIndex)</c> 
+	  if the row does not exist. </p>
+	  <p>The semantics of the RowStatus handling in that table has 
+	  been adjusted to be compliant with the RowStatus
+	  textual description of SNPMv2-TC MIB. </p>
+	  <p>Stefan Zegenhagen</p>
+	  <p>Own Id: OTP-10164</p>
+        </item>
+      </list>
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[agent] Fix walk over vacmAccessTable.
+	  Fix the get_next implementation of vacmAccessTable to 
+	  return all table entries. </p>
+	  <p>The get_next implementation of vacmAccessTable did not return 
+	  all available table data. Instead, it only returned the first 
+	  column for each row, and all columns for the last row available. </p>
+	  <p>Stefan Zegenhagen</p>
+          <p>Own Id: OTP-10165</p>
+        </item>
+
+        <item>
+          <p>[manager] 
+	  <seealso marker="snmpm#log_to_io">snmpm:log_to_io/6</seealso> 
+	  did not use the LogName argument. </p>
+          <p>Own Id: OTP-10066</p>
+        </item>
+
+        <item>
+          <p>Incorrect TimeTicks decode. Also bad handling of 
+	  invalid encode (value outside of value range) for both
+	  <c>TimeTicks</c> and <c>Unsigned32</c>. </p>
+          <p>Own Id: OTP-10132</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+
+  </section> <!-- 4.22.1 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.22</title>
     <p>Version 4.22 supports code replacement in runtime from/to
     version 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 4.21. </p>
diff --git a/lib/snmp/doc/src/snmp_config.xml b/lib/snmp/doc/src/snmp_config.xml
index 340f2f1fa7..eec53162a1 100644
--- a/lib/snmp/doc/src/snmp_config.xml
+++ b/lib/snmp/doc/src/snmp_config.xml
@@ -963,7 +963,8 @@ Manager snmp config:
 7b. User name? hobbes
 7c. Security name? [hobbes] 
 7d. Authentication protocol (no/sha/md5)? [no] sha
-7e  Authentication [sha] key (length 0 or 20)? [""] [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]
+7e  Authentication [sha] key (length 0 or 20)? [""] [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16, \
+    17,18,19,20]
 7d. Priv protocol (no/des/aes)? [no] des
 7f  Priv [des] key (length 0 or 16)? [""] 10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25
 7. Configure an usm user handled by this manager (y/n)? [y] n
diff --git a/lib/snmp/doc/src/snmpa_network_interface_filter.xml b/lib/snmp/doc/src/snmpa_network_interface_filter.xml
index 10419517dd..bff0a24879 100644
--- a/lib/snmp/doc/src/snmpa_network_interface_filter.xml
+++ b/lib/snmp/doc/src/snmpa_network_interface_filter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2007</year><year>2010</year>
+      <year>2007</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -84,7 +84,9 @@
     <title>DATA TYPES</title>
     <code type="none">
 port() = integer() > 0
-pdu_type() = 'get-request' | 'get-next-request' | 'get-response' | 'set-request' | trap | 'get-bulk-request' | 'inform-request' | report
+pdu_type() = 'get-request' | 'get-next-request' | 'get-response' | 
+             'set-request' | trap | 'get-bulk-request' | 'inform-request' | 
+             report
     </code>
     <marker id="accept_recv"></marker>
   </section>
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index 9bbb6cdbdb..e6e188d5d5 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -173,16 +173,16 @@ sec_level() = noAuthNoPriv | authNoPriv | authPriv
       </type>
       <desc>
         <p>Register the manager entity (=user) responsible for specific 
-          agent(s). </p>
+	agent(s). </p>
 
         <p><c>Module</c> is the callback module (snmpm_user behaviour) which 
-          will be called whenever something happens (detected 
-          agent, incoming reply or incoming trap/notification).
-          Note that this could have already been done as a 
-          consequence of the node config. (see users.conf).</p>
+	will be called whenever something happens (detected 
+	agent, incoming reply or incoming trap/notification).
+	Note that this could have already been done as a 
+	consequence of the node config. (see users.conf).</p>
 
-        <p>The argument <c>DefaultAgentConfig</c> is used as default values when 
-          this user register agents.</p>
+        <p>The argument <c>DefaultAgentConfig</c> is used as default 
+	values when this user register agents.</p>
 
         <p>The type of <c>Val</c> depends on <c>Item</c>: </p>
 <code type="none"><![CDATA[
@@ -367,7 +367,7 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
         <p>Update agent config. The function <c>update_agent_info/3</c> 
 	should be used when several values needs to be updated atomically. </p>
 	<p>See function 
-	<seealso marker="#register_agent">register_agent</seealso>) 
+	<seealso marker="#register_agent">register_agent</seealso>
 	for more info about what kind of items are allowed. </p>
 
         <marker id="which_agents"></marker>
diff --git a/lib/snmp/doc/src/snmpm_network_interface_filter.xml b/lib/snmp/doc/src/snmpm_network_interface_filter.xml
index 5f80cec94e..4dc133dd71 100644
--- a/lib/snmp/doc/src/snmpm_network_interface_filter.xml
+++ b/lib/snmp/doc/src/snmpm_network_interface_filter.xml
@@ -82,7 +82,9 @@
     <title>DATA TYPES</title>
     <code type="none">
 port() = integer() > 0
-pdu_type() = 'get-request' | 'get-next-request' | 'get-response' | 'set-request' | trap | 'get-bulk-request' | 'inform-request' | report | trappdu
+pdu_type() = 'get-request' | 'get-next-request' | 'get-response' | 
+             'set-request' | trap | 'get-bulk-request' | 'inform-request' | 
+             report | trappdu
     </code>
     <marker id="accept_recv"></marker>
   </section>
diff --git a/lib/snmp/examples/ex1/Makefile b/lib/snmp/examples/ex1/Makefile
index 1a55ba0470..8d10476b30 100644
--- a/lib/snmp/examples/ex1/Makefile
+++ b/lib/snmp/examples/ex1/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -46,7 +46,7 @@ ERL_COMPILE_FLAGS += -I../include \
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR         = $(RELEASE_PATH)/lib/snmp-$(VSN)
-EXAMPLE_RELSYSDIR = $(RELSYSDIR)/examples
+EXAMPLE_RELSYSDIR = "$(RELSYSDIR)/examples"
 EX1_RELSYSDIR     = $(EXAMPLE_RELSYSDIR)/ex1
 
 # ----------------------------------------------------
diff --git a/lib/snmp/examples/ex2/Makefile b/lib/snmp/examples/ex2/Makefile
index 7fbd7f530b..a85ff8e4e2 100644
--- a/lib/snmp/examples/ex2/Makefile
+++ b/lib/snmp/examples/ex2/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2006-2009. All Rights Reserved.
+# Copyright Ericsson AB 2006-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -47,7 +47,7 @@ ERL_COMPILE_FLAGS += -I../include \
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR         = $(RELEASE_PATH)/lib/snmp-$(VSN)
-EXAMPLE_RELSYSDIR = $(RELSYSDIR)/examples
+EXAMPLE_RELSYSDIR = "$(RELSYSDIR)/examples"
 EX2_RELSYSDIR     = $(EXAMPLE_RELSYSDIR)/ex2
 
 # ----------------------------------------------------
diff --git a/lib/snmp/mibs/Makefile.in b/lib/snmp/mibs/Makefile.in
index 993a67c6f2..5c1f855fad 100644
--- a/lib/snmp/mibs/Makefile.in
+++ b/lib/snmp/mibs/Makefile.in
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2011. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -211,7 +211,7 @@ info:
 	@echo ""
 	@echo "SNMP_VSN    = $(SNMP_VSN)"
 	@echo "VSN         = $(VSN)"
-	@echo "RELSYSDIR   = $(RELSYSDIR)"
+	@echo "RELSYSDIR   = "$(RELSYSDIR)""
 
 v1/%.mib.v1: %.mib $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1
 	$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
@@ -223,17 +223,17 @@ v1/%.mib.v1: %.mib $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/mibs
-	$(INSTALL_DIR) $(RELSYSDIR)/mibs/v1
-	$(INSTALL_DATA) $(MIB_FILES) $(RELSYSDIR)/mibs
-	$(INSTALL_DATA) $(STD_v2_MIB_FILES) $(RELSYSDIR)/mibs
-	$(INSTALL_DATA) $(FUNCS_FILES) $(RELSYSDIR)/mibs
-	$(INSTALL_DATA) $(STD_v1_MIB_FILES) $(RELSYSDIR)/mibs/v1
-	$(INSTALL_DATA) $(V1_MIB_FILES) $(RELSYSDIR)/mibs/v1
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/mibs
-	$(INSTALL_DATA) $(BIN_TARGETS) $(RELSYSDIR)/priv/mibs
+	$(INSTALL_DIR) "$(RELSYSDIR)/mibs"
+	$(INSTALL_DIR) "$(RELSYSDIR)/mibs/v1"
+	$(INSTALL_DATA) $(MIB_FILES) "$(RELSYSDIR)/mibs"
+	$(INSTALL_DATA) $(STD_v2_MIB_FILES) "$(RELSYSDIR)/mibs"
+	$(INSTALL_DATA) $(FUNCS_FILES) "$(RELSYSDIR)/mibs"
+	$(INSTALL_DATA) $(STD_v1_MIB_FILES) "$(RELSYSDIR)/mibs/v1"
+	$(INSTALL_DATA) $(V1_MIB_FILES) "$(RELSYSDIR)/mibs/v1"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/mibs"
+	$(INSTALL_DATA) $(BIN_TARGETS) "$(RELSYSDIR)/priv/mibs"
 
 release_docs_spec:
 
diff --git a/lib/snmp/priv/conf/agent/Makefile b/lib/snmp/priv/conf/agent/Makefile
index ee3a915c2b..3082889dc8 100644
--- a/lib/snmp/priv/conf/agent/Makefile
+++ b/lib/snmp/priv/conf/agent/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -55,9 +55,9 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/conf
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/conf/agent
-	$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/priv/conf/agent
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/conf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/conf/agent"
+	$(INSTALL_DATA) $(CONF_FILES) "$(RELSYSDIR)/priv/conf/agent"
 
 release_docs_spec:
 
diff --git a/lib/snmp/priv/conf/manager/Makefile b/lib/snmp/priv/conf/manager/Makefile
index 16355f0ff3..a04c227754 100644
--- a/lib/snmp/priv/conf/manager/Makefile
+++ b/lib/snmp/priv/conf/manager/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2004-2009. All Rights Reserved.
+# Copyright Ericsson AB 2004-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -55,9 +55,9 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/conf
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/conf/manager
-	$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/priv/conf/manager
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/conf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv/conf/manager"
+	$(INSTALL_DATA) $(CONF_FILES) "$(RELSYSDIR)/priv/conf/manager"
 
 release_docs_spec:
 
diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile
index a67fe4d17c..beed696648 100644
--- a/lib/snmp/src/agent/Makefile
+++ b/lib/snmp/src/agent/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -128,14 +128,14 @@ info:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/src/agent
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/agent
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/agent"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
-		$(RELSYSDIR)/ebin
-# 	$(INSTALL_DIR) $(RELSYSDIR)/include
-# 	$(INSTALL_DATA) $(EXT_HRL_FILES) $(RELSYSDIR)/include
+		"$(RELSYSDIR)/ebin"
+# 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+# 	$(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
 
diff --git a/lib/snmp/src/agent/snmp_user_based_sm_mib.erl b/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
index 2e801622e7..3c4ba1af66 100644
--- a/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
+++ b/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
@@ -54,6 +54,7 @@
 %% Columns not accessible via SNMP
 -define(usmUserAuthKey, 14).
 -define(usmUserPrivKey, 15).
+-define(is_cloning, 16).
 
 
 %%%-----------------------------------------------------------------
@@ -564,7 +565,9 @@ usmUserTable(set, RowIndex, Cols0) ->
 	{ok, Cols} ->
 	    ?vtrace("usmUserTable(set) -> verified"
 		    "~n   Cols: ~p", [Cols]),
-	    NCols = pre_set(RowIndex, Cols),
+        % check whether we're cloning. if so, get cloned params and add a few
+        % defaults that might be needed.
+	    NCols = pre_set(RowIndex, validate_clone_from(RowIndex, Cols)),
 	    ?vtrace("usmUserTable(set) -> pre-set: "
 		    "~n   NCols: ~p", [NCols]),
 	    %% NOTE: The NCols parameter is sent to snmp_generic, but not to
@@ -730,30 +733,40 @@ validate_is_set_ok(Error, _RowIndex, _Cols) ->
     Error.
 
 do_validate_is_set_ok(RowIndex, Cols) ->
-    validate_clone_from(RowIndex, Cols),
-    validate_auth_protocol(RowIndex, Cols),
-    validate_auth_key_change(RowIndex, Cols),
-    validate_own_auth_key_change(RowIndex, Cols),
-    validate_priv_protocol(RowIndex, Cols),
-    validate_priv_key_change(RowIndex, Cols),
-    validate_own_priv_key_change(RowIndex, Cols),
+    NCols = validate_clone_from(RowIndex, Cols),
+    validate_auth_protocol(RowIndex, NCols),
+    validate_auth_key_change(RowIndex, NCols),
+    validate_own_auth_key_change(RowIndex, NCols),
+    validate_priv_protocol(RowIndex, NCols),
+    validate_priv_key_change(RowIndex, NCols),
+    validate_own_priv_key_change(RowIndex, NCols),
     ok.
     
 pre_set(RowIndex, Cols) ->
+    %% Remove the ?is_cloning member again; it must no longer be
+    %% present.
+    Cols0 = key1delete(?is_cloning, Cols),
     %% Possibly initialize the usmUserSecurityName and privacy keys
     case snmp_generic:table_row_exists(db(usmUserTable), RowIndex) of
-	true -> Cols;
+	true -> Cols0;
 	false ->
 	    SecName = get_user_name(RowIndex),
-	    [{?usmUserSecurityName, SecName} | Cols] ++
-		[{?usmUserAuthKey, ""},
-		 {?usmUserPrivKey, ""}]
+	    Cols1 = [{?usmUserSecurityName, SecName} | Cols0],
+        case proplists:get_value(?is_cloning, Cols) of
+            true ->
+                % the row is just being cloned. the cloned user's
+                % passwords are already present in Cols and must
+                % not be overwritten.
+                Cols1;
+            _ ->
+                Cols1 ++ [{?usmUserAuthKey, ""},
+                    {?usmUserPrivKey, ""}]
+        end
     end.
 
 validate_set({noError, 0}, RowIndex, Cols) ->
     %% Now, all is_set_ok validation steps have been executed.  So
     %% everything is ready for the set.
-    set_clone_from(RowIndex, Cols),
     set_auth_key_change(RowIndex, Cols),
     set_own_auth_key_change(RowIndex, Cols),
     set_priv_key_change(RowIndex, Cols),
@@ -769,7 +782,7 @@ validate_set(Error, _RowIndex, _Cols) ->
 %% no further checks.
 %%-----------------------------------------------------------------
 validate_clone_from(RowIndex, Cols) ->
-    case lists:keysearch(?usmUserCloneFrom, 1, Cols) of
+    case key1search(?usmUserCloneFrom, Cols) of
 	{value, {_Col, RowPointer}} ->
 	    RowIndex2 = extract_row(RowPointer),
 	    OldCloneFrom = snmp_generic:table_get_element(db(usmUserTable),
@@ -778,35 +791,63 @@ validate_clone_from(RowIndex, Cols) ->
 	    case OldCloneFrom of
 		{value, Val} when Val /= noinit ->
 		    %% This means that the cloning is already done...
-		    ok;
+		    no_cloning(Cols);
 		_ ->
-		    %% Otherwise, we must check the CloneFrom value
-		    case snmp_generic:table_get_element(db(usmUserTable),
-							RowIndex2,
-							?usmUserStatus) of
-			{value, ?'RowStatus_active'} -> ok;
-			_ -> inconsistentName(?usmUserCloneFrom)
-		    end
+		    %% Otherwise, we must check the CloneFrom value. It
+            %% must relate to a usmUserEntry that exists and is active.
+            case snmp_generic:table_get_row(db(usmUserTable), RowIndex2) of
+                CloneFromRow when is_tuple(CloneFromRow) ->
+                    case element(?usmUserStatus, CloneFromRow) of
+                        ?'RowStatus_active' ->
+                            get_cloned_cols(CloneFromRow, Cols);
+                        _ ->
+                            inconsistentName(?usmUserCloneFrom)
+                    end;
+                undefined ->
+                    inconsistentName(?usmUserCloneFrom)
+            end
 	    end;
 	false ->
-	    ok
+        % no ?usmUserCloneFrom specified, don't modify columns
+        no_cloning(Cols)
     end.
 
+get_cloned_cols(CloneFromRow, Cols) ->
+    % initialize cloned columns with data from CloneFromRow
+    % and overwrite that again with data found in Cols
+    AuthP = element(?usmUserAuthProtocol, CloneFromRow),
+    PrivP = element(?usmUserPrivProtocol, CloneFromRow),
+    AuthK = element(?usmUserAuthKey, CloneFromRow),
+    PrivK = element(?usmUserPrivKey, CloneFromRow),
+    ClonedCols = [{?usmUserAuthProtocol, AuthP},
+        {?usmUserPrivProtocol, PrivP},
+        {?usmUserAuthKey, AuthK},
+        {?usmUserPrivKey, PrivK},
+        {?is_cloning, true}
+    ],
+    Func = fun({Col, _} = Item, NCols) ->
+            key1store(Col, NCols, Item)
+    end,
+    Cols1 = lists:foldl(Func, ClonedCols, Cols),
+    key1sort(Cols1).
+
+no_cloning(Cols0) ->
+    Cols1 = key1delete(?usmUserCloneFrom, Cols0),
+    key1delete(?is_cloning, Cols1).
+
 
 validate_auth_protocol(RowIndex, Cols) ->
-    case lists:keysearch(?usmUserAuthProtocol, 1, Cols) of
+    case key1search(?usmUserAuthProtocol, Cols) of
 	{value, {_Col, AuthProtocol}} ->
-	    %% Check if the row has been cloned; we can't check the
+	    %% Check if the row is being cloned; we can't check the
 	    %% old value of authProtocol, because if the row was
 	    %% createAndWaited, the default value would have been
 	    %% written (usmNoAuthProtocol).
-	    OldCloneFrom = snmp_generic:table_get_element(db(usmUserTable),
-							  RowIndex,
-							  ?usmUserCloneFrom),
-	    case OldCloneFrom of
-		{value, Val} when Val /= noinit ->
-		    %% This means that the cloning is already done; set is ok
-		    %% if new protocol is usmNoAuthProtocol
+	    IsCloning = proplists:get_value(?is_cloning, Cols, false),
+	    if
+		not IsCloning ->
+		    %% This means that the row is not being cloned right
+            %% now; set is ok if new protocol is usmNoAuthProtocol
 		    case AuthProtocol of
 			?usmNoAuthProtocol ->
 			    %% Check that the Priv protocl is noPriv
@@ -821,7 +862,7 @@ validate_auth_protocol(RowIndex, Cols) ->
 			_ ->
 			    wrongValue(?usmUserAuthProtocol)
 		    end;
-		_ ->
+		true ->
 		    %% Otherwise, check that the new protocol is known,
 		    %% and that the system we're running supports the
 		    %% hash function.
@@ -867,7 +908,7 @@ validate_own_priv_key_change(RowIndex, Cols) ->
 
 %% Check that the requesting user is the same as the modified user
 validate_requester(RowIndex, Cols, KeyChangeCol) ->
-    case lists:keysearch(KeyChangeCol, 1, Cols) of
+    case key1search(KeyChangeCol, Cols) of
 	{value, _} ->
 	    case get(sec_model) of % Check the securityModel in the request
 		?SEC_USM -> ok;
@@ -890,17 +931,14 @@ validate_requester(RowIndex, Cols, KeyChangeCol) ->
     end.
 
 validate_key_change(RowIndex, Cols, KeyChangeCol, Type) ->
-    case lists:keysearch(KeyChangeCol, 1, Cols) of
+    case key1search(KeyChangeCol, Cols) of
 	{value, {_Col, KeyC}} ->
 	    %% Check if the row has been cloned; or if it is cloned in
 	    %% this set-operation.
 	    OldCloneFrom = snmp_generic:table_get_element(db(usmUserTable),
 							  RowIndex,
 							  ?usmUserCloneFrom),
-	    IsClonePresent = case lists:keysearch(?usmUserCloneFrom, 1, Cols) of
-				 {value, _} -> true;
-				 false -> false
-			     end,
+	    IsClonePresent = proplists:get_value(?is_cloning, Cols, false),
 	    %% Set is ok if 1) the user already is created, 2) this is
 	    %% a new user, which has been cloned, or is about to be
 	    %% cloned.
@@ -912,7 +950,7 @@ validate_key_change(RowIndex, Cols, KeyChangeCol, Type) ->
 		    %% The user is cloned in this operation
 		    ok;
 		_ ->
-		    %% The user doen't exist, or hasn't been cloned,
+		    %% The user doesn't exist, or hasn't been cloned,
 		    %% and is not cloned in this operation.
 		    inconsistentName(KeyChangeCol)
 	    end,
@@ -939,17 +977,15 @@ validate_key_change(RowIndex, Cols, KeyChangeCol, Type) ->
     end.
 
 validate_priv_protocol(RowIndex, Cols) ->
-    case lists:keysearch(?usmUserPrivProtocol, 1, Cols) of
+    case key1search(?usmUserPrivProtocol, Cols) of
 	{value, {_Col, PrivProtocol}} ->
 	    %% Check if the row has been cloned; we can't check the
 	    %% old value of privhProtocol, because if the row was
 	    %% createAndWaited, the default value would have been
 	    %% written (usmNoPrivProtocol).
-	    OldCloneFrom = snmp_generic:table_get_element(db(usmUserTable),
-							  RowIndex,
-							  ?usmUserCloneFrom),
-	    case OldCloneFrom of
-		{value, Val} when Val /= noinit ->
+        IsCloning = proplists:get_value(?is_cloning, Cols, false),
+	    if
+        not IsCloning ->
 		    %% This means that the cloning is already done; set is ok
 		    %% if new protocol is usmNoPrivProtocol
 		    case PrivProtocol of
@@ -962,7 +998,7 @@ validate_priv_protocol(RowIndex, Cols) ->
 			_ ->
 			    wrongValue(?usmUserPrivProtocol)
 		    end;
-		_ ->
+		true ->
 		    %% Otherwise, check that the new protocol is known,
 		    %% and that the system we're running supports the
 		    %% crypto function.
@@ -1005,31 +1041,6 @@ validate_priv_protocol(RowIndex, Cols) ->
     end.
 
 
-set_clone_from(RowIndex, Cols) ->
-    %% If CloneFrom is modified, do the cloning.
-    case lists:keysearch(?usmUserCloneFrom, 1, Cols) of
-	{value, {_Col, RowPointer}} ->
-	    RowIndex2 = extract_row(RowPointer), % won't fail
-	    CloneRow = snmp_generic:table_get_row(db(usmUserTable), RowIndex2,
-						  foi(usmUserTable)),
-	    AuthP = element(?usmUserAuthProtocol, CloneRow),
-	    PrivP = element(?usmUserPrivProtocol, CloneRow),
-	    AuthK = element(?usmUserAuthKey, CloneRow),
-	    PrivK = element(?usmUserPrivKey, CloneRow),
-	    SCols = [{?usmUserAuthProtocol, AuthP},
-		     {?usmUserPrivProtocol, PrivP},
-		     {?usmUserAuthKey, AuthK},
-		     {?usmUserPrivKey, PrivK}],
-	    case snmp_generic:table_set_elements(db(usmUserTable),
-						 RowIndex,
-						 SCols) of
-		true -> ok;
-		false -> {commitFailed, ?usmUserCloneFrom}
-	    end;
-	false ->
-	    ok
-    end.
-
 set_auth_key_change(RowIndex, Cols) ->
     set_key_change(RowIndex, Cols, ?usmUserAuthKeyChange, auth).
 
@@ -1043,7 +1054,7 @@ set_own_priv_key_change(RowIndex, Cols) ->
     set_key_change(RowIndex, Cols, ?usmUserOwnPrivKeyChange, priv).
 
 set_key_change(RowIndex, Cols, KeyChangeCol, Type) ->
-    case lists:keysearch(KeyChangeCol, 1, Cols) of
+    case key1search(KeyChangeCol, Cols) of
 	{value, {_Col, KeyChange}} ->
 	    KeyCol = case Type of
 			 auth -> ?usmUserAuthKey;
@@ -1071,11 +1082,11 @@ extract_row([H | T], [H | T2])          -> extract_row(T, T2);
 extract_row([], [?usmUserSecurityName | T]) -> T;
 extract_row(_, _) -> wrongValue(?usmUserCloneFrom).
 
-%% Pre: the user exixt
+%% Pre: the user exists or is being cloned in this operation
 get_auth_proto(RowIndex, Cols) ->
-    %% The protocol can be chanegd by the request too, otherwise,
+    %% The protocol can be changed by the request too, otherwise,
     %% check the stored protocol.
-    case lists:keysearch(?usmUserAuthProtocol, 1, Cols) of
+    case key1search(?usmUserAuthProtocol, Cols) of
 	{value, {_, Protocol}} ->
 	    Protocol;
 	false ->
@@ -1090,11 +1101,11 @@ get_auth_proto(RowIndex, Cols) ->
 	    end
     end.
 
-%% Pre: the user exixt
+%% Pre: the user exists or is being cloned in this operation
 get_priv_proto(RowIndex, Cols) ->
-    %% The protocol can be chanegd by the request too, otherwise,
+    %% The protocol can be changed by the request too, otherwise,
     %% check the stored protocol.
-    case lists:keysearch(?usmUserPrivProtocol, 1, Cols) of
+    case key1search(?usmUserPrivProtocol, Cols) of
 	{value, {_, Protocol}} ->
 	    Protocol;
 	false ->
@@ -1232,6 +1243,27 @@ set_sname(_) -> %% Keep it, if already set.
 error(Reason) ->
     throw({error, Reason}).
 
+
+%%-----------------------------------------------------------------
+%%     lists key-function(s) wrappers 
+
+-compile({inline,key1delete/2}).
+key1delete(Key, List) ->
+    lists:keydelete(Key, 1, List).
+
+-compile({inline,key1search/2}).
+key1search(Key, List) ->
+    lists:keysearch(Key, 1, List).
+
+-compile({inline,key1store/3}).
+key1store(Key, List, Elem) ->
+    lists:keystore(Key, 1, List, Elem).
+
+-compile({inline,key1sort/1}).
+key1sort(List) ->
+    lists:keysort(1, List).
+
+
 %%-----------------------------------------------------------------
 
 info_msg(F, A) ->
diff --git a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
index 479a44795f..436f15eb9c 100644
--- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
+++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
@@ -565,45 +565,85 @@ vacmAccessTable(is_set_ok, RowIndex, Cols0) ->
     case (catch verify_vacmAccessTable_cols(Cols0, [])) of
 	{ok, Cols} ->
 	    IsValidKey = is_valid_key(RowIndex),
-	    case lists:keysearch(?vacmAccessStatus, 1, Cols) of
-		%% Ok, if contextMatch is init
-		{value, {Col, ?'RowStatus_active'}} -> 
-	            {ok, Row} = snmpa_vacm:get_row(RowIndex),
-	            case element(?vacmAContextMatch, Row) of
-			noinit -> {inconsistentValue, Col};
-			_ -> {noError, 0}
+	    StatusCol  = lists:keyfind(?vacmAccessStatus, 1, Cols),
+	    MaybeRow   = snmpa_vacm:get_row(RowIndex),
+	    case {StatusCol, MaybeRow} of
+		{{Col, ?'RowStatus_active'}, false} ->
+		    %% row does not yet exist => inconsistentValue
+		    %% (see SNMPv2-TC.mib, RowStatus textual convention)
+		    {inconsistentValue, Col};
+		{{Col, ?'RowStatus_active'}, {ok, Row}} ->
+		    %% Ok, if contextMatch is init
+		    case element(?vacmAContextMatch, Row) of
+			noinit ->
+			    %% check whether ContextMatch is being set in
+			    %% the same operation
+			    case proplists:get_value(?vacmAccessContextMatch, 
+						     Cols) of
+				undefined ->
+				    %% no, we can't make this row active yet
+				    {inconsistentValue, Col};
+				_ ->
+				    %% ok, activate the row
+				    {noError, 0}
+			    end;
+			_ ->
+			    {noError, 0}
 		    end;
-		{value, {Col, ?'RowStatus_notInService'}} -> % Ok, if not notReady
-		    {ok, Row} = snmpa_vacm:get_row(RowIndex),
+		{{Col, ?'RowStatus_notInService'}, false} ->
+		    %% row does not yet exist => inconsistentValue
+		    %% (see SNMPv2-TC.mib, RowStatus textual convention)
+		    {inconsistentValue, Col};
+		{{Col, ?'RowStatus_notInService'}, {ok, Row}} ->
+		    %% Ok, if not notReady
 		    case element(?vacmAStatus, Row) of
-			?'RowStatus_notReady' -> {inconsistentValue, Col};
-			_ -> {noError, 0}
+			?'RowStatus_notReady' ->
+			    {inconsistentValue, Col};
+			_ ->
+			    {noError, 0}
 		    end;
-		{value, {Col, ?'RowStatus_notReady'}} -> % never ok!
+		{{Col, ?'RowStatus_notReady'}, _} ->
+		    %% never ok!
 		    {inconsistentValue, Col};
-		{value, {Col, ?'RowStatus_createAndGo'}} -> % ok, if it doesn't exist
+		{{Col, ?'RowStatus_createAndGo'}, false} ->
+		    %% ok, if it doesn't exist
 		    Res = lists:keysearch(?vacmAccessContextMatch, 1, Cols),
-		    case snmpa_vacm:get_row(RowIndex) of
-			false when (IsValidKey =:= true) andalso 
-				   is_tuple(Res) -> {noError, 0};
-			false -> {noCreation, Col}; % Bad RowIndex
-			_ -> {inconsistentValue, Col}
+		    if
+			IsValidKey =/= true ->
+			    %% bad RowIndex => noCreation
+			    {noCreation, Col};
+			is_tuple(Res) ->
+			    %% required field is present => noError
+			    {noError, 0};
+			true ->
+			    %% required field is missing => inconsistentValue
+			    {inconsistentValue, Col}
 		    end;
-		{value, {Col, ?'RowStatus_createAndWait'}} -> % ok, if it doesn't exist
-		    case snmpa_vacm:get_row(RowIndex) of
-			false when (IsValidKey =:= true) -> {noError, 0};
-			false -> {noCreation, Col}; % Bad RowIndex
-			_ -> {inconsistentValue, Col}
+		{{Col, ?'RowStatus_createAndGo'}, _} ->
+		    %% row already exists => inconsistentValue
+		    {inconsistentValue, Col};
+		{{Col, ?'RowStatus_createAndWait'}, false} ->
+		    %% ok, if it doesn't exist
+		    if
+			IsValidKey =:= true ->
+			    %% RowIndex is valid => noError
+			    {noError, 0};
+			true ->
+			    {noCreation, Col}
 		    end;
-		{value, {_Col, ?'RowStatus_destroy'}} -> % always ok!
+		{{Col, ?'RowStatus_createAndWait'}, _} ->
+		    %% Row already exists => inconsistentValue
+		    {inconsistentValue, Col};
+		{value, {_Col, ?'RowStatus_destroy'}} ->
+		    %% always ok!
 		    {noError, 0};
-		_ -> % otherwise, it's a change; it must exist
-		    case snmpa_vacm:get_row(RowIndex) of
-			{ok, _} ->
-			    {noError, 0};
-			false ->
-			    {inconsistentName, element(1, hd(Cols))}
-		    end
+		{_, false} ->
+		    %% otherwise, it's a row change; 
+		    %% row does not exist => inconsistentName
+		    {inconsistentName, element(1, hd(Cols))};
+		_ ->
+		    %% row change and row exists => noError
+		    {noError, 0}
 	    end;
 	Error ->
 	    Error
@@ -734,10 +774,15 @@ do_vacmAccessTable_set(RowIndex, Cols) ->
 	    
 	    
 %% Cols are sorted, and all columns are > 3.
+do_get_next(_RowIndex, []) ->
+    % Cols can be empty because we're called for each
+    % output of split_cols(); and one of that may well
+    % be empty.
+    [];
 do_get_next(RowIndex, Cols) ->
     case snmpa_vacm:get_next_row(RowIndex) of
 	{NextIndex, Row} ->
-	    F1 = fun(Col) when Col < ?vacmAccessStatus -> 
+	    F1 = fun(Col) when Col =< ?vacmAccessStatus ->
 			 {[Col | NextIndex], element(Col-3, Row)};
 		    (_) -> 
 			 endOfTable
@@ -745,9 +790,9 @@ do_get_next(RowIndex, Cols) ->
 	    lists:map(F1, Cols);
 	false ->
 	    case snmpa_vacm:get_next_row([]) of
-		{_NextIndex, Row} ->
+		{NextIndex2, Row} ->
 		    F2 = fun(Col) when Col < ?vacmAccessStatus -> 
-				 {[Col+1 | RowIndex], element(Col-2, Row)};
+				 {[Col+1 | NextIndex2], element(Col-2, Row)};
 			    (_) ->
 				 endOfTable
 			 end,
diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile
index d89eb4e723..f7c311b663 100644
--- a/lib/snmp/src/app/Makefile
+++ b/lib/snmp/src/app/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
+# Copyright Ericsson AB 2003-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -127,14 +127,14 @@ $(APPUP_TARGET): $(APPUP_SRC) ../../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/src/app
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/app
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/app"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/app"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
-		$(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXT_HRL_FILES) $(RELSYSDIR)/include
+		"$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
 
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 8360d88c94..593ddd82bd 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,8 +22,18 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.22", 
+   [
+    {load_module, snmpm,                   soft_purge, soft_purge, []}, 
+    {load_module, snmp_pdus,               soft_purge, soft_purge, []}, 
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
+    {load_module, snmp_user_based_sm_mib,  soft_purge, soft_purge, []}
+   ]
+  }, 
   {"4.21.7", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -50,6 +60,8 @@
   }, 
   {"4.21.6",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -76,6 +88,8 @@
   },
   {"4.21.5",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -107,6 +121,8 @@
   },
   {"4.21.4", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -141,6 +157,8 @@
   }, 
   {"4.21.3", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -175,6 +193,8 @@
   }, 
   {"4.21.2", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -211,6 +231,8 @@
   }, 
   {"4.21.1", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -248,6 +270,8 @@
   }, 
   {"4.21", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -288,8 +312,19 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.22", 
+   [
+    {load_module, snmpm,                   soft_purge, soft_purge, []}, 
+    {load_module, snmp_pdus,               soft_purge, soft_purge, []}, 
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
+    {load_module, snmp_user_based_sm_mib,  soft_purge, soft_purge, []}
+   ]
+  }, 
   {"4.21.7", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -316,6 +351,8 @@
   }, 
   {"4.21.6",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -342,6 +379,8 @@
   },
   {"4.21.5",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -373,6 +412,8 @@
   },
   {"4.21.4", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -407,6 +448,8 @@
   }, 
   {"4.21.3", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -441,6 +484,8 @@
   }, 
   {"4.21.2", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -477,6 +522,8 @@
   }, 
   {"4.21.1", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -514,6 +561,8 @@
   }, 
   {"4.21", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile
index 627af6f185..f63fc18997 100644
--- a/lib/snmp/src/compile/Makefile
+++ b/lib/snmp/src/compile/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -120,13 +120,13 @@ $(GENERATED_PARSER): $(PARSER_SRC)
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/src/compiler
-	$(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/compiler
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(EBIN_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/bin
-	$(INSTALL_SCRIPT) $(ESCRIPT_BIN) $(RELSYSDIR)/bin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/compiler"
+	$(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
+	$(INSTALL_SCRIPT) $(ESCRIPT_BIN) "$(RELSYSDIR)/bin"
 
 release_docs_spec:
 
diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile
index c1d5703300..c76dbacf90 100644
--- a/lib/snmp/src/manager/Makefile
+++ b/lib/snmp/src/manager/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2004-2009. All Rights Reserved.
+# Copyright Ericsson AB 2004-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -111,13 +111,13 @@ info:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/src/manager
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/manager
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-# 	$(INSTALL_DIR) $(RELSYSDIR)/include
-# 	$(INSTALL_DATA) $(EXT_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/manager"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+# 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+# 	$(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
 
diff --git a/lib/snmp/src/manager/snmpm.erl b/lib/snmp/src/manager/snmpm.erl
index 89eaee9f80..f590892c66 100644
--- a/lib/snmp/src/manager/snmpm.erl
+++ b/lib/snmp/src/manager/snmpm.erl
@@ -1411,7 +1411,7 @@ log_to_io(LogDir, Mibs, LogName, LogFile) ->
 log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Start).
 log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> 
-    snmp:log_to_io(LogDir, Mibs, LogFile, Start, Stop).
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop).
     
 
 change_log_size(NewSize) ->
diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile
index 48d76bdbed..698c341268 100644
--- a/lib/snmp/src/misc/Makefile
+++ b/lib/snmp/src/misc/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
+# Copyright Ericsson AB 2003-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -109,13 +109,13 @@ info:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/src/misc
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/misc
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-# 	$(INSTALL_DIR) $(RELSYSDIR)/include
-# 	$(INSTALL_DATA) $(EXT_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/misc"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+# 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+# 	$(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
 
diff --git a/lib/snmp/src/misc/snmp_pdus.erl b/lib/snmp/src/misc/snmp_pdus.erl
index 0788d86b2d..15156f7467 100644
--- a/lib/snmp/src/misc/snmp_pdus.erl
+++ b/lib/snmp/src/misc/snmp_pdus.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -254,68 +254,95 @@ strip(0, _Tail) ->
 %%----------------------------------------------------------------------
 %% Returns:{Type, Value}
 %%----------------------------------------------------------------------
+
+%% OBJECT IDENTIFIER
 dec_value([6 | Bytes]) ->
     {Value, Rest} = dec_oid_notag(Bytes),
     {{'OBJECT IDENTIFIER', Value}, Rest};
 dec_value([5,0 | T]) ->
     {{'NULL', 'NULL'}, T};
+
+%% INTEGER
 dec_value([2 | Bytes]) ->
     {Value, Rest} = dec_integer_notag(Bytes),
     {{'INTEGER', Value}, Rest};
+
+%% OCTET STRING
 dec_value([4 | Bytes]) ->
     {Value, Rest} = dec_oct_str_notag(Bytes),
     {{'OCTET STRING', Value}, Rest};
+
+%% IpAddress
 dec_value([64 | Bytes]) -> 
     {Value, Rest} = dec_oct_str_notag(Bytes),
     {{'IpAddress', Value}, Rest};
+
+%% Counter32
 dec_value([65 | Bytes]) ->
     %% Counter32 is an unsigned 32 but is actually encoded as 
     %% a signed integer 32 (INTEGER).
     {Value, Rest} = dec_integer_notag(Bytes),
     Value2 = 
-	if
+    	if
+    	    (Value >= 0) andalso (Value =< 16#ffffffff) ->
+    		%% We accept value above 16#7fffffff
+    		%% in order to be backward bug-compatible
+    		Value;
+    	    (Value < 0) ->
+    		16#ffffffff + Value + 1;
+    	    true ->
+    		exit({error, {bad_counter32, Value}})	
+    	end,
+    {{'Counter32', Value2}, Rest};
+
+%% Unsigned32
+dec_value([66 | Bytes]) ->
+    {Value, Rest} = dec_integer_notag(Bytes),
+    Value2 = 
+	if 
 	    (Value >= 0) andalso (Value =< 16#ffffffff) ->
-		%% We accept value above 16#7fffffff
-		%% in order to be backward bug-compatible
 		Value;
 	    (Value < 0) ->
 		16#ffffffff + Value + 1;
 	    true ->
-		exit({error, {bad_counter32, Value}})	
+		exit({error, {bad_unsigned32, Value}})
 	end,
-    {{'Counter32', Value2}, Rest};
-dec_value([66 | Bytes]) ->
-    {Value, Rest} = dec_integer_notag(Bytes),
-    if 
-	(Value >= 0) andalso (Value =< 4294967295) ->
-	    {{'Unsigned32', Value}, Rest};
-	true ->
-	    exit({error, {bad_unsigned32, Value}})
-    end;
+    {{'Unsigned32', Value2}, Rest};
+
+%% TimeTicks
 dec_value([67 | Bytes]) ->
     {Value, Rest} = dec_integer_notag(Bytes),
-    if 
-	(Value >= 0) andalso (Value =< 4294967295) ->
-	    {{'TimeTicks', Value}, Rest};
+    Value2 = 
+	if
+	    (Value >= 0) andalso (Value =< 16#ffffffff) ->
+		Value;
+	    (Value < 0) ->
+		16#ffffffff + Value + 1;
 	true ->
 	    exit({error, {bad_timeticks, Value}})
-    end;
+	end,
+    {{'TimeTicks', Value2}, Rest};
+
+%% Opaque
 dec_value([68 | Bytes]) ->
     {Value, Rest} = dec_oct_str_notag(Bytes),
     {{'Opaque', Value}, Rest};
+
+%% Counter64
 dec_value([70 | Bytes]) ->
     %% Counter64 is an unsigned 64 but is actually encoded as 
     %% a signed integer 64.
     {Value, Rest} = dec_integer_notag(Bytes),
     Value2 = 
-	if
-	    (Value >= 0) andalso (Value < 16#8000000000000000) ->
-		Value;
-	    (Value < 0) ->
-		18446744073709551615 + Value + 1;
-	    true ->
-		exit({error, {bad_counter64, Value}})	end,
+    	if
+    	    (Value >= 0) andalso (Value < 16#8000000000000000) ->
+    		Value;
+    	    (Value < 0) ->
+    		16#ffffffffffffffff + Value + 1;
+    	    true ->
+    		exit({error, {bad_counter64, Value}})	end,
     {{'Counter64', Value2}, Rest};
+
 dec_value([128,0|T]) ->
     {{'NULL', noSuchObject}, T};
 dec_value([129,0|T]) ->
@@ -629,7 +656,7 @@ enc_VarBind_attributes(#varbind{oid = Oid, variabletype = Type,value = Val}) ->
     ValueBytes = enc_value(Type, Val),
     lists:append(OidBytes, ValueBytes).
 
-enc_value('INTEGER',Val) ->
+enc_value('INTEGER', Val) ->
     enc_integer_tag(Val);
 enc_value('OCTET STRING', Val) ->
     enc_oct_str_tag(Val);
@@ -637,7 +664,7 @@ enc_value('BITS', Val) ->
     enc_oct_str_tag(bits_to_str(Val));
 enc_value('OBJECT IDENTIFIER', Val) ->
     enc_oid_tag(Val);
-enc_value('IpAddress',Val) ->
+enc_value('IpAddress', Val) ->
     Bytes2 = enc_oct_str_notag(Val),
     Len2 = elength(length(Bytes2)),
     lists:append([64 | Len2],Bytes2);
@@ -668,6 +695,24 @@ enc_value('Counter32', Val) ->
     Bytes2 = enc_integer_notag(Val2),
     Len2 = elength(length(Bytes2)),
     lists:append([65 | Len2],Bytes2);
+enc_value('Unsigned32', Val) ->
+    if
+	(Val >= 0) andalso (Val =< 4294967295) ->
+	    Bytes2 = enc_integer_notag(Val),
+	    Len2 = elength(length(Bytes2)),
+	    lists:append([66 | Len2], Bytes2);
+	true ->
+	    exit({error, {bad_counter32, Val}}) 
+    end;
+enc_value('TimeTicks', Val) ->
+    if
+	(Val >= 0) andalso (Val =< 4294967295) ->
+	    Bytes2 = enc_integer_notag(Val),
+	    Len2 = elength(length(Bytes2)),
+	    lists:append([67 | Len2], Bytes2);
+	true ->
+	    exit({error, {bad_timeticks, Val}}) 
+    end;
 enc_value('Counter64', Val) ->
     Val2 = 
 	if
@@ -682,18 +727,7 @@ enc_value('Counter64', Val) ->
 	end,
     Bytes2 = enc_integer_notag(Val2),
     Len2 = elength(length(Bytes2)),
-    lists:append([70 | Len2],Bytes2);
-enc_value(Type, Val) ->
-    Bytes2 = enc_integer_notag(Val),
-    Len2 = elength(length(Bytes2)),
-    lists:append([enc_val_tag(Type,Val) | Len2],Bytes2).
-
-enc_val_tag('Counter32',Val) when (Val >= 0) andalso (Val =< 4294967295) ->
-    65;
-enc_val_tag('Unsigned32', Val) when (Val >= 0) andalso (Val =< 4294967295) ->
-    66;
-enc_val_tag('TimeTicks', Val) when (Val >= 0) andalso (Val =< 4294967295) ->
-    67.
+    lists:append([70 | Len2],Bytes2).
 
 
 %%----------------------------------------------------------------------
diff --git a/lib/snmp/test/Makefile b/lib/snmp/test/Makefile
index 40a294f783..546d46a002 100644
--- a/lib/snmp/test/Makefile
+++ b/lib/snmp/test/Makefile
@@ -79,7 +79,7 @@ COVER_SPEC_FILE = snmp.cover
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/snmp_test 
+RELSYSDIR = $(RELEASE_PATH)/snmp_test
 
 
 # ----------------------------------------------------
@@ -235,10 +235,10 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec:
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(RELTEST_FILES) $(COVER_SPEC_FILE) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	tar cf - snmp_test_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(RELTEST_FILES) $(COVER_SPEC_FILE) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	tar cf - snmp_test_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
 
@@ -254,7 +254,7 @@ info:
 	@echo ""
 	@echo "ERL_COMPILE_FLAGS = $(ERL_COMPILE_FLAGS)"
 	@echo ""
-	@echo "RELSYSDIR         = $(RELSYSDIR)"
+	@echo "RELSYSDIR         = "$(RELSYSDIR)""
 	@echo ""
 	@echo "SOURCE            = $(SOURCE)"
 	@echo ""
diff --git a/lib/snmp/test/exp/snmp_agent_bl_test.erl b/lib/snmp/test/exp/snmp_agent_bl_test.erl
index a5a6e8260b..263319aa5d 100644
--- a/lib/snmp/test/exp/snmp_agent_bl_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_bl_test.erl
@@ -95,24 +95,13 @@ end_per_testcase(_Case, Config) when list(Config) ->
     Config.
 
 cases() ->
-    case ?OSTYPE() of
-	vxworks ->
-	    %% No crypto app, so skip v3 testcases
- 	    [
-	     app_info, 
-	     test_v1, test_v2, test_v1_v2, 
-	     test_multi_threaded, 
- 	     mib_storage, 
-	     tickets];
-	_Else ->
-  	    [
-	     app_info, 
- 	     test_v1, test_v2, test_v1_v2, test_v3, 
-   	     test_multi_threaded, 
-	     mib_storage, 
-	     tickets
-	    ]
-    end.
+    [
+	app_info, 
+	test_v1, test_v2, test_v1_v2, test_v3, 
+	test_multi_threaded, 
+	mib_storage, 
+	tickets
+    ].
 
 
 %%%-----------------------------------------------------------------
@@ -1187,21 +1176,16 @@ init_v3(Config) when list(Config) ->
     %% and we will be stuck with a bunch of mnesia tables for
     %% the rest of this suite...
     ?DBG("start_agent -> start crypto app",[]),
-    case os:type() of
-	vxworks ->
-	    no_crypto;
-	_ ->
-	    case ?CRYPTO_START() of
-		ok ->
-		    case ?CRYPTO_SUPPORT() of
-			{no, Reason} ->
-			    ?SKIP({unsupported_encryption, Reason});
-			yes ->
-			    ok
-		    end;
-		{error, Reason} ->
-		    ?SKIP({failed_starting_crypto, Reason})
-	    end
+    case ?CRYPTO_START() of
+	ok ->
+	    case ?CRYPTO_SUPPORT() of
+		{no, Reason} ->
+		    ?SKIP({unsupported_encryption, Reason});
+		yes ->
+		    ok
+	    end;
+	{error, Reason} ->
+	    ?SKIP({failed_starting_crypto, Reason})
     end,
     SaNode = ?config(snmp_sa, Config),
     create_tables(SaNode),
@@ -5071,12 +5055,7 @@ run(F, A, Opts) ->
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
     Community = snmp_misc:get_option(community, Opts, "all-rights"),
     ?DBG("run -> start crypto app",[]),
-    Crypto = case os:type() of
-		 vxworks ->
-		     no_crypto;
-		 _ ->
-		     ?CRYPTO_START()
-	     end,
+    Crypto = ?CRYPTO_START(),
     ?DBG("run -> Crypto: ~p",[Crypto]),
     catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
     StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
diff --git a/lib/snmp/test/exp/snmp_agent_ms_test.erl b/lib/snmp/test/exp/snmp_agent_ms_test.erl
index d5eaea55fa..340b95f512 100644
--- a/lib/snmp/test/exp/snmp_agent_ms_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_ms_test.erl
@@ -231,17 +231,13 @@ end_per_testcase(_Case, Config) when list(Config) ->
     Config.
 
 cases() -> 
-case ?OSTYPE() of
-  vxworks ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_multi_threaded},
-       {group, mib_storage}, {group, tickets}];
-  _Else ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_v3},
-       {group, test_multi_threaded}, {group, mib_storage},
-       {group, tickets}]
-end.
+    [
+	app_info,
+	{group, test_v1}, {group, test_v2},
+	{group, test_v1_v2}, {group, test_v3},
+	{group, test_multi_threaded}, {group, mib_storage},
+	{group, tickets}
+    ].
 
 
 %%%-----------------------------------------------------------------
@@ -1221,21 +1217,16 @@ init_v3(Config) when list(Config) ->
     %% and we will be stuck with a bunch of mnesia tables for
     %% the rest of this suite...
     ?DBG("start_agent -> start crypto app",[]),
-    case os:type() of
-	vxworks ->
-	    no_crypto;
-	_ ->
-	    case ?CRYPTO_START() of
-		ok ->
-		    case ?CRYPTO_SUPPORT() of
-			{no, Reason} ->
-			    ?SKIP({unsupported_encryption, Reason});
-			yes ->
-			    ok
-		    end;
-		{error, Reason} ->
-		    ?SKIP({failed_starting_crypto, Reason})
-	    end
+    case ?CRYPTO_START() of
+	ok ->
+	    case ?CRYPTO_SUPPORT() of
+		{no, Reason} ->
+		    ?SKIP({unsupported_encryption, Reason});
+		yes ->
+		    ok
+	    end;
+	{error, Reason} ->
+	    ?SKIP({failed_starting_crypto, Reason})
     end,
     SaNode = ?config(snmp_sa, Config),
     create_tables(SaNode),
@@ -5066,12 +5057,7 @@ run(F, A, Opts) ->
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
     Community = snmp_misc:get_option(community, Opts, "all-rights"),
     ?DBG("run -> start crypto app",[]),
-    Crypto = case os:type() of
-		 vxworks ->
-		     no_crypto;
-		 _ ->
-		     ?CRYPTO_START()
-	     end,
+    Crypto = ?CRYPTO_START(),
     ?DBG("run -> Crypto: ~p",[Crypto]),
     catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
     StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
diff --git a/lib/snmp/test/exp/snmp_agent_mt_test.erl b/lib/snmp/test/exp/snmp_agent_mt_test.erl
index d62bc6c2e7..33d104305a 100644
--- a/lib/snmp/test/exp/snmp_agent_mt_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_mt_test.erl
@@ -231,17 +231,13 @@ end_per_testcase(_Case, Config) when list(Config) ->
     Config.
 
 cases() -> 
-case ?OSTYPE() of
-  vxworks ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_multi_threaded},
-       {group, mib_storage}, {group, tickets}];
-  _Else ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_v3},
-       {group, test_multi_threaded}, {group, mib_storage},
-       {group, tickets}]
-end.
+    [
+	app_info,
+	{group, test_v1}, {group, test_v2},
+	{group, test_v1_v2}, {group, test_v3},
+	{group, test_multi_threaded}, {group, mib_storage},
+	{group, tickets}
+    ].
 
 
 %%%-----------------------------------------------------------------
@@ -1221,21 +1217,16 @@ init_v3(Config) when list(Config) ->
     %% and we will be stuck with a bunch of mnesia tables for
     %% the rest of this suite...
     ?DBG("start_agent -> start crypto app",[]),
-    case os:type() of
-	vxworks ->
-	    no_crypto;
-	_ ->
-	    case ?CRYPTO_START() of
-		ok ->
-		    case ?CRYPTO_SUPPORT() of
-			{no, Reason} ->
-			    ?SKIP({unsupported_encryption, Reason});
-			yes ->
-			    ok
-		    end;
-		{error, Reason} ->
-		    ?SKIP({failed_starting_crypto, Reason})
-	    end
+    case ?CRYPTO_START() of
+	ok ->
+	    case ?CRYPTO_SUPPORT() of
+		{no, Reason} ->
+		    ?SKIP({unsupported_encryption, Reason});
+		yes ->
+		    ok
+	    end;
+	{error, Reason} ->
+	    ?SKIP({failed_starting_crypto, Reason})
     end,
     SaNode = ?config(snmp_sa, Config),
     create_tables(SaNode),
@@ -5066,12 +5057,7 @@ run(F, A, Opts) ->
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
     Community = snmp_misc:get_option(community, Opts, "all-rights"),
     ?DBG("run -> start crypto app",[]),
-    Crypto = case os:type() of
-		 vxworks ->
-		     no_crypto;
-		 _ ->
-		     ?CRYPTO_START()
-	     end,
+    Crypto = ?CRYPTO_START(),
     ?DBG("run -> Crypto: ~p",[Crypto]),
     catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
     StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
diff --git a/lib/snmp/test/exp/snmp_agent_v2_test.erl b/lib/snmp/test/exp/snmp_agent_v2_test.erl
index a86449ca72..dc3d2efbb3 100644
--- a/lib/snmp/test/exp/snmp_agent_v2_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_v2_test.erl
@@ -231,17 +231,13 @@ end_per_testcase(_Case, Config) when list(Config) ->
     Config.
 
 cases() -> 
-case ?OSTYPE() of
-  vxworks ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_multi_threaded},
-       {group, mib_storage}, {group, tickets}];
-  _Else ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_v3},
-       {group, test_multi_threaded}, {group, mib_storage},
-       {group, tickets}]
-end.
+    [
+	app_info,
+	{group, test_v1}, {group, test_v2},
+	{group, test_v1_v2}, {group, test_v3},
+	{group, test_multi_threaded}, {group, mib_storage},
+	{group, tickets}
+    ].
 
 
 %%%-----------------------------------------------------------------
@@ -1221,21 +1217,16 @@ init_v3(Config) when list(Config) ->
     %% and we will be stuck with a bunch of mnesia tables for
     %% the rest of this suite...
     ?DBG("start_agent -> start crypto app",[]),
-    case os:type() of
-	vxworks ->
-	    no_crypto;
-	_ ->
-	    case ?CRYPTO_START() of
-		ok ->
-		    case ?CRYPTO_SUPPORT() of
-			{no, Reason} ->
-			    ?SKIP({unsupported_encryption, Reason});
-			yes ->
-			    ok
-		    end;
-		{error, Reason} ->
-		    ?SKIP({failed_starting_crypto, Reason})
-	    end
+    case ?CRYPTO_START() of
+	ok ->
+	    case ?CRYPTO_SUPPORT() of
+		{no, Reason} ->
+		    ?SKIP({unsupported_encryption, Reason});
+		yes ->
+		    ok
+	    end;
+	{error, Reason} ->
+	    ?SKIP({failed_starting_crypto, Reason})
     end,
     SaNode = ?config(snmp_sa, Config),
     create_tables(SaNode),
@@ -5066,12 +5057,7 @@ run(F, A, Opts) ->
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
     Community = snmp_misc:get_option(community, Opts, "all-rights"),
     ?DBG("run -> start crypto app",[]),
-    Crypto = case os:type() of
-		 vxworks ->
-		     no_crypto;
-		 _ ->
-		     ?CRYPTO_START()
-	     end,
+    Crypto = ?CRYPTO_START(),
     ?DBG("run -> Crypto: ~p",[Crypto]),
     catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
     StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
diff --git a/lib/snmp/test/exp/snmp_agent_v3_test.erl b/lib/snmp/test/exp/snmp_agent_v3_test.erl
index c72d845bf2..b0bc6384e8 100644
--- a/lib/snmp/test/exp/snmp_agent_v3_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_v3_test.erl
@@ -231,17 +231,12 @@ end_per_testcase(_Case, Config) when list(Config) ->
     Config.
 
 cases() -> 
-case ?OSTYPE() of
-  vxworks ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_multi_threaded},
-       {group, mib_storage}, {group, tickets}];
-  _Else ->
-      [app_info, {group, test_v1}, {group, test_v2},
-       {group, test_v1_v2}, {group, test_v3},
-       {group, test_multi_threaded}, {group, mib_storage},
-       {group, tickets}]
-end.
+    [
+	app_info, {group, test_v1}, {group, test_v2},
+	{group, test_v1_v2}, {group, test_v3},
+	{group, test_multi_threaded}, {group, mib_storage},
+	{group, tickets}
+    ].
 
 
 %%%-----------------------------------------------------------------
@@ -1221,21 +1216,16 @@ init_v3(Config) when list(Config) ->
     %% and we will be stuck with a bunch of mnesia tables for
     %% the rest of this suite...
     ?DBG("start_agent -> start crypto app",[]),
-    case os:type() of
-	vxworks ->
-	    no_crypto;
-	_ ->
-	    case ?CRYPTO_START() of
-		ok ->
-		    case ?CRYPTO_SUPPORT() of
-			{no, Reason} ->
-			    ?SKIP({unsupported_encryption, Reason});
-			yes ->
-			    ok
-		    end;
-		{error, Reason} ->
-		    ?SKIP({failed_starting_crypto, Reason})
-	    end
+    case ?CRYPTO_START() of
+	ok ->
+	    case ?CRYPTO_SUPPORT() of
+		{no, Reason} ->
+		    ?SKIP({unsupported_encryption, Reason});
+		yes ->
+		    ok
+	    end;
+	{error, Reason} ->
+	    ?SKIP({failed_starting_crypto, Reason})
     end,
     SaNode = ?config(snmp_sa, Config),
     create_tables(SaNode),
@@ -5066,12 +5056,7 @@ run(F, A, Opts) ->
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
     Community = snmp_misc:get_option(community, Opts, "all-rights"),
     ?DBG("run -> start crypto app",[]),
-    Crypto = case os:type() of
-		 vxworks ->
-		     no_crypto;
-		 _ ->
-		     ?CRYPTO_START()
-	     end,
+    Crypto = ?CRYPTO_START(),
     ?DBG("run -> Crypto: ~p",[Crypto]),
     catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
     StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
diff --git a/lib/snmp/test/modules.mk b/lib/snmp/test/modules.mk
index a444cab6d6..3d658bf8e8 100644
--- a/lib/snmp/test/modules.mk
+++ b/lib/snmp/test/modules.mk
@@ -79,5 +79,5 @@ MIB_FILES = \
 	Test2.mib \
 	Test3.mib
 
-SPECS = snmp.spec snmp.spec.vxworks 
+SPECS = snmp.spec
 
diff --git a/lib/snmp/test/snmp.spec.vxworks b/lib/snmp/test/snmp.spec.vxworks
deleted file mode 100644
index 654aa96d8c..0000000000
--- a/lib/snmp/test/snmp.spec.vxworks
+++ /dev/null
@@ -1,4 +0,0 @@
-{topcase, {dir, "../snmp_test"}}.
-{skip, {snmp_SUITE, test_v3, "Requires crypto"}}.
-
-
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index 8ee5dd534d..bfe14bc080 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -346,47 +346,72 @@ end_per_group(_GroupName, Config) ->
 
 
 
-init_per_testcase(otp8395 = Case, Config) when is_list(Config) ->
+%% ---- Init Per TestCase ---- 
+
+init_per_testcase(Case, Config) when is_list(Config) ->
     ?DBG("init_per_testcase -> entry with"
+	 "~n   Config: ~p", [Config]),
+
+    p("Agent Info: "
+      "~n   ~p", [snmpa:info()]),
+
+    init_per_testcase1(Case, Config).
+
+init_per_testcase1(otp8395 = Case, Config) when is_list(Config) ->
+    ?DBG("init_per_testcase1 -> entry with"
 	 "~n   Case:   ~p"
 	 "~n   Config: ~p", [Case, Config]),
     otp8395({init, init_per_testcase2(Case, Config)});
-init_per_testcase(otp9884 = Case, Config) when is_list(Config) ->
-    ?DBG("init_per_testcase -> entry with"
+init_per_testcase1(otp9884 = Case, Config) when is_list(Config) ->
+    ?DBG("init_per_testcase1 -> entry with"
 	 "~n   Case:   ~p"
 	 "~n   Config: ~p", [Case, Config]),
     otp9884({init, init_per_testcase2(Case, Config)});
-init_per_testcase(otp_7157_test = _Case, Config) when is_list(Config) ->
-    ?DBG("init_per_testcase -> entry with"
+init_per_testcase1(otp_7157_test = _Case, Config) when is_list(Config) ->
+    ?DBG("init_per_testcase1 -> entry with"
 	 "~n   Case:   ~p"
 	 "~n   Config: ~p", [_Case, Config]),
     Dog = ?WD_START(?MINS(1)),
     [{watchdog, Dog} | Config ];
-init_per_testcase(v2_inform_i = _Case, Config) when is_list(Config) ->
-    ?DBG("init_per_testcase -> entry with"
+init_per_testcase1(v2_inform_i = _Case, Config) when is_list(Config) ->
+    ?DBG("init_per_testcase1 -> entry with"
 	 "~n   Case:   ~p"
 	 "~n   Config: ~p", [_Case, Config]),
     Dog = ?WD_START(?MINS(10)),
     [{watchdog, Dog} | Config ];
-init_per_testcase(v3_inform_i = _Case, Config) when is_list(Config) ->
-    ?DBG("init_per_testcase -> entry with"
+init_per_testcase1(v3_inform_i = _Case, Config) when is_list(Config) ->
+    ?DBG("init_per_testcase1 -> entry with"
 	 "~n   Case:   ~p"
 	 "~n   Config: ~p", [_Case, Config]),
     Dog = ?WD_START(?MINS(10)),
     [{watchdog, Dog} | Config ];
-init_per_testcase(_Case, Config) when is_list(Config) ->
+init_per_testcase1(_Case, Config) when is_list(Config) ->
     ?DBG("init_per_testcase -> entry with"
 	 "~n   Case:   ~p"
 	 "~n   Config: ~p", [_Case, Config]),
     Dog = ?WD_START(?MINS(6)),
     [{watchdog, Dog}| Config ].
 
-end_per_testcase(otp8395, Config) when is_list(Config) ->
+
+%% ---- End Per TestCase ---- 
+
+end_per_testcase(Case, Config) when is_list(Config) ->
+    ?DBG("end_per_testcase -> entry with"
+	 "~n   Config: ~p", [Config]),
+
+    p("Agent Info: "
+      "~n   ~p", [snmpa:info()]),
+
+    display_log(Config),
+    
+    end_per_testcase1(Case, Config).
+
+end_per_testcase1(otp8395, Config) when is_list(Config) ->
     otp8395({fin, Config});
-end_per_testcase(otp9884, Config) when is_list(Config) ->
+end_per_testcase1(otp9884, Config) when is_list(Config) ->
     otp9884({fin, Config});
-end_per_testcase(_Case, Config) when is_list(Config) ->
-    ?DBG("end_per_testcase -> entry with"
+end_per_testcase1(_Case, Config) when is_list(Config) ->
+    ?DBG("end_per_testcase1 -> entry with"
 	 "~n   Case:   ~p"
 	 "~n   Config: ~p", [_Case, Config]),
     Dog = ?config(watchdog, Config),
@@ -433,29 +458,16 @@ end_per_testcase2(_Case, Config) ->
 
 
 cases() -> 
-    case ?OSTYPE() of
-	vxworks ->
-	    [
-	     {group, misc}, 
-	     {group, test_v1}, 
-	     {group, test_v2},
-	     {group, test_v1_v2}, 
-	     {group, test_multi_threaded},
-	     {group, mib_storage}, 
-	     {group, tickets1}
-	    ];
-	_Else ->
-	    [
-	     {group, misc}, 
-	     {group, test_v1}, 
-	     {group, test_v2},
-	     {group, test_v1_v2}, 
-	     {group, test_v3},
-	     {group, test_multi_threaded}, 
-	     {group, mib_storage},
-	     {group, tickets1}
-	    ]
-    end.
+    [
+	{group, misc}, 
+	{group, test_v1}, 
+	{group, test_v2},
+	{group, test_v1_v2}, 
+	{group, test_v3},
+	{group, test_multi_threaded}, 
+	{group, mib_storage},
+	{group, tickets1}
+    ].
 
 
 %%%-----------------------------------------------------------------
@@ -1280,21 +1292,16 @@ init_v3(Config) when is_list(Config) ->
     %% and we will be stuck with a bunch of mnesia tables for
     %% the rest of this suite...
     ?DBG("start_agent -> start crypto app",[]),
-    case os:type() of
-	vxworks ->
-	    no_crypto;
-	_ ->
-	    case ?CRYPTO_START() of
-		ok ->
-		    case ?CRYPTO_SUPPORT() of
-			{no, Reason} ->
-			    ?SKIP({unsupported_encryption, Reason});
-			yes ->
-			    ok
-		    end;
-		{error, Reason} ->
-		    ?SKIP({failed_starting_crypto, Reason})
-	    end
+    case ?CRYPTO_START() of
+	ok ->
+	    case ?CRYPTO_SUPPORT() of
+		{no, Reason} ->
+		    ?SKIP({unsupported_encryption, Reason});
+		yes ->
+		    ok
+	    end;
+	{error, Reason} ->
+	    ?SKIP({failed_starting_crypto, Reason})
     end,
     SaNode = ?config(snmp_sa, Config),
     create_tables(SaNode),
@@ -1406,9 +1413,6 @@ simple(Config) when is_list(Config) ->
     
     try_test(simple_standard_test),
 
-    p("Display log"),
-    display_log(Config),
-    
     p("done"),
     ok.
 
diff --git a/lib/snmp/test/snmp_agent_test_lib.erl b/lib/snmp/test/snmp_agent_test_lib.erl
index 238832b7c1..757aebfa9b 100644
--- a/lib/snmp/test/snmp_agent_test_lib.erl
+++ b/lib/snmp/test/snmp_agent_test_lib.erl
@@ -338,12 +338,7 @@ run(Mod, Func, Args, Opts) ->
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
     Community = snmp_misc:get_option(community, Opts, "all-rights"),
     ?DBG("run -> start crypto app",[]),
-    Crypto = case os:type() of
-		 vxworks ->
-		     no_crypto;
-		 _ ->
-		     ?CRYPTO_START()
-	     end,
+    Crypto = ?CRYPTO_START(),
     ?DBG("run -> Crypto: ~p", [Crypto]),
     catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
     StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
@@ -729,7 +724,6 @@ expect2(Id, F) ->
 get_timeout() ->
     get_timeout(os:type()).
 
-get_timeout(vxworks) -> 7000;
 get_timeout(_)       -> 3500.
 
 receive_pdu(To) ->
@@ -1540,7 +1534,6 @@ rpc(Node, F, A) ->
 %% timeout() ->
 %%     timeout(os:type()).
 %% 
-%% timeout(vxworks) -> 7000;
 %% timeout(_)       -> 3500.
     
 
diff --git a/lib/snmp/test/snmp_pdus_test.erl b/lib/snmp/test/snmp_pdus_test.erl
index 07b6d6b657..7d649b1dad 100644
--- a/lib/snmp/test/snmp_pdus_test.erl
+++ b/lib/snmp/test/snmp_pdus_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -39,6 +39,7 @@
 	 otp7575/1,
 	 otp8563/1, 
 	 otp9022/1, 
+	 otp10132/1, 
 
          init_per_testcase/2, end_per_testcase/2
 	]).
@@ -74,16 +75,16 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %% Test case definitions
 %%======================================================================
 all() -> 
-[{group, tickets}].
+    [{group, tickets}].
 
 groups() -> 
-    [{tickets, [], [otp7575, otp8563, otp9022]}].
+    [{tickets, [], [otp7575, otp8563, otp9022, otp10132]}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 
@@ -94,7 +95,7 @@ end_per_group(_GroupName, Config) ->
 %%======================================================================
 
 otp7575(suite) -> [];
-otp7575(doc) -> ["OTP-7575"];
+otp7575(doc) -> ["OTP-7575 - Message version"];
 otp7575(Config) when is_list(Config) ->
     io:format("attempt to decode message with valid version~n", []),
     MsgWithOkVersion = <<48,39,2,1,0,4,6,112,117,98,108,105,99,160,26,2,2,1,49,2,1,0,2,1,0,48,14,48,12,6,8,43,6,1,2,1,1,5,0,5,0>>,
@@ -127,48 +128,55 @@ otp7575(Config) when is_list(Config) ->
 
 
 otp8563(suite) -> [];
-otp8563(doc) -> ["OTP-8563"];
+otp8563(doc) -> ["OTP-8563 - Counter64"];
 otp8563(Config) when is_list(Config) ->
     Val1 = 16#7fffffffffffffff,
-    io:format("try encode and decode ~w~n", [Val1]),
+    io:format("try encode and decode value 1: ~w (0x~.16b)~n", [Val1, Val1]),
     Enc1 = snmp_pdus:enc_value('Counter64', Val1), 
+    io:format("  => ~w~n", [Enc1]),
     {{'Counter64', Val1}, []} = snmp_pdus:dec_value(Enc1), 
 
     Val2 = Val1 + 1,
-    io:format("try encode and decode ~w~n", [Val2]),
+    io:format("try encode and decode value 2: ~w (0x~.16b)~n", [Val2, Val2]),
     Enc2 = snmp_pdus:enc_value('Counter64', Val2), 
+    io:format("  => ~w~n", [Enc2]),
     {{'Counter64', Val2}, []} = snmp_pdus:dec_value(Enc2), 
 
     Val3 = Val2 + 1,
-    io:format("try encode and decode ~w~n", [Val3]),
+    io:format("try encode and decode valule 3: ~w (0x~.16b)~n", [Val3, Val3]),
     Enc3 = snmp_pdus:enc_value('Counter64', Val3), 
+    io:format("  => ~w~n", [Enc3]),
     {{'Counter64', Val3}, []} = snmp_pdus:dec_value(Enc3), 
 
     Val4 = 16#fffffffffffffffe,
-    io:format("try encode and decode ~w~n", [Val4]),
+    io:format("try encode and decode value 4: ~w (0x~.16b)~n", [Val4, Val4]),
     Enc4 = snmp_pdus:enc_value('Counter64', Val4), 
+    io:format("  => ~w~n", [Enc4]),
     {{'Counter64', Val4}, []} = snmp_pdus:dec_value(Enc4), 
 
     Val5 = Val4 + 1,
-    io:format("try encode and decode ~w~n", [Val5]),
+    io:format("try encode and decode value 5: ~w (0x~.16b)~n", [Val5, Val5]),
     Enc5 = snmp_pdus:enc_value('Counter64', Val5), 
+    io:format("  => ~w~n", [Enc5]),
     {{'Counter64', Val5}, []} = snmp_pdus:dec_value(Enc5), 
 
     Val6 = 16#ffffffffffffffff + 1, 
-    io:format("try and fail to encode ~w~n", [Val6]),
+    io:format("try and fail to encode value 6: ~w (0x~.16b)~n", [Val6, Val6]),
     case (catch snmp_pdus:enc_value('Counter64', Val6)) of
 	{'EXIT', {error, {bad_counter64, Val6}}} ->
 	    ok;
 	Unexpected6 ->
+	    io:format("  => ~w~n", [Unexpected6]),
 	    exit({unexpected_encode_result, Unexpected6, Val6})
     end,
 
     Val7 = -1, 
-    io:format("try and fail to encode ~w~n", [Val7]),
+    io:format("try and fail to encode value 7: ~w~n", [Val7]),
     case (catch snmp_pdus:enc_value('Counter64', Val7)) of
 	{'EXIT', {error, {bad_counter64, Val7}}} ->
 	    ok;
 	Unexpected7 ->
+	    io:format("  => ~w~n", [Unexpected7]),
 	    exit({unexpected_encode_result, Unexpected7, Val7})
     end,
 
@@ -176,51 +184,151 @@ otp8563(Config) when is_list(Config) ->
 
 
 otp9022(suite) -> [];
-otp9022(doc) -> ["OTP-9022"];
+otp9022(doc) -> ["OTP-9022 - Counter32"];
 otp9022(Config) when is_list(Config) ->
-    Val1 = 16#7fffffff,
-    io:format("try encode and decode ~w~n", [Val1]),
+    Val0 = 2908389204, 
+    io:format("try encode and decode value 0: ~w (0x~.16b)~n", [Val0, Val0]),
+    Enc0 = snmp_pdus:enc_value('Counter32', Val0), 
+    io:format("  => ~w~n", [Enc0]),
+    {{'Counter32', Val0}, []} = snmp_pdus:dec_value(Enc0), 
+
+    Val1 = 0, 
+    io:format("try encode and decode value 1: ~w (0x~.16b)~n", [Val1, Val1]),
     Enc1 = snmp_pdus:enc_value('Counter32', Val1), 
+    io:format("  => ~w~n", [Enc1]),
     {{'Counter32', Val1}, []} = snmp_pdus:dec_value(Enc1), 
 
     Val2 = Val1 + 1,
-    io:format("try encode and decode ~w~n", [Val2]),
+    io:format("try encode and decode value 2: ~w (0x~.16b)~n", [Val2, Val2]),
     Enc2 = snmp_pdus:enc_value('Counter32', Val2), 
+    io:format("  => ~w~n", [Enc2]),
     {{'Counter32', Val2}, []} = snmp_pdus:dec_value(Enc2), 
 
-    Val3 = Val2 + 1,
-    io:format("try encode and decode ~w~n", [Val3]),
+    Val3 = 16#7ffffffe,
+    io:format("try encode and decode value 3: ~w (0x~.16b)~n", [Val3, Val3]),
     Enc3 = snmp_pdus:enc_value('Counter32', Val3), 
+    io:format("  => ~w~n", [Enc3]),
     {{'Counter32', Val3}, []} = snmp_pdus:dec_value(Enc3), 
 
-    Val4 = 16#fffffffe,
-    io:format("try encode and decode ~w~n", [Val4]),
+    Val4 = Val3 + 1,
+    io:format("try encode and decode value 4: ~w (0x~.16b)~n", [Val4, Val4]),
     Enc4 = snmp_pdus:enc_value('Counter32', Val4), 
+    io:format("  => ~w~n", [Enc4]),
     {{'Counter32', Val4}, []} = snmp_pdus:dec_value(Enc4), 
 
     Val5 = Val4 + 1,
-    io:format("try encode and decode ~w~n", [Val5]),
+    io:format("try encode and decode value 5: ~w (0x~.16b)~n", [Val5, Val5]),
     Enc5 = snmp_pdus:enc_value('Counter32', Val5), 
+    io:format("  => ~w~n", [Enc5]),
     {{'Counter32', Val5}, []} = snmp_pdus:dec_value(Enc5), 
 
-    Val6 = 16#ffffffff + 1, 
-    io:format("try and fail to encode ~w~n", [Val6]),
-    case (catch snmp_pdus:enc_value('Counter32', Val6)) of
-	{'EXIT', {error, {bad_counter32, Val6}}} ->
+    Val6 = 16#fffffffe,
+    io:format("try encode and decode value 6: ~w (0x~.16b)~n", [Val6, Val6]),
+    Enc6 = snmp_pdus:enc_value('Counter32', Val6), 
+    io:format("  => ~w~n", [Enc6]),
+    {{'Counter32', Val6}, []} = snmp_pdus:dec_value(Enc6), 
+
+    Val7 = Val6 + 1,
+    io:format("try encode and decode value 7: ~w (0x~.16b)~n", [Val7, Val7]),
+    Enc7 = snmp_pdus:enc_value('Counter32', Val7), 
+    io:format("  => ~w~n", [Enc7]),
+    {{'Counter32', Val7}, []} = snmp_pdus:dec_value(Enc7), 
+
+    Val8 = 16#ffffffff + 1, 
+    io:format("try and fail to encode value 8: ~w (0x~.16b)~n", [Val8, Val8]),
+    case (catch snmp_pdus:enc_value('Counter32', Val8)) of
+	{'EXIT', {error, {bad_counter32, Val8}}} ->
 	    ok;
-	Unexpected6 ->
-	    exit({unexpected_encode_result, Unexpected6, Val6})
+	Unexpected8 ->
+	    io:format("  => ~w~n", [Unexpected8]),
+	    exit({unexpected_encode_result, Unexpected8, Val8})
     end,
 
-    Val7 = -1, 
-    io:format("try and fail to encode ~w~n", [Val7]),
-    case (catch snmp_pdus:enc_value('Counter32', Val7)) of
-	{'EXIT', {error, {bad_counter32, Val7}}} ->
+    Val9 = -1, 
+    io:format("try and fail to encode value 9: ~w~n", [Val9]),
+    case (catch snmp_pdus:enc_value('Counter32', Val9)) of
+	{'EXIT', {error, {bad_counter32, Val9}}} ->
 	    ok;
-	Unexpected7 ->
-	    exit({unexpected_encode_result, Unexpected7, Val7})
+	Unexpected9 ->
+	    io:format("  => ~w~n", [Unexpected9]),
+	    exit({unexpected_encode_result, Unexpected9, Val9})
+    end,
+
+    ok.
+
+
+otp10132(suite) -> [];
+otp10132(doc) -> ["OTP-10132 - TimeTicks"];
+otp10132(Config) when is_list(Config) ->
+    Val0 = 2159001034, 
+    io:format("try encode and decode value 0: ~w (0x~.16b)~n", [Val0, Val0]),
+    Enc0 = snmp_pdus:enc_value('TimeTicks', Val0), 
+    io:format("  => ~w~n", [Enc0]),
+    {{'TimeTicks', Val0}, []} = snmp_pdus:dec_value(Enc0), 
+
+    Val1 = 0, 
+    io:format("try encode and decode value 1: ~w (0x~.16b)~n", [Val1, Val1]),
+    Enc1 = snmp_pdus:enc_value('TimeTicks', Val1), 
+    io:format("  => ~w~n", [Enc1]),
+    {{'TimeTicks', Val1}, []} = snmp_pdus:dec_value(Enc1), 
+
+    Val2 = Val1 + 1, 
+    io:format("try encode and decode value 2: ~w (0x~.16b)~n", [Val2, Val2]),
+    Enc2 = snmp_pdus:enc_value('TimeTicks', Val2), 
+    io:format("  => ~w~n", [Enc2]),
+    {{'TimeTicks', Val2}, []} = snmp_pdus:dec_value(Enc2), 
+
+    Val3 = 16#7ffffffe,
+    io:format("try encode and decode value 3: ~w (0x~.16b)~n", [Val3, Val3]),
+    Enc3 = snmp_pdus:enc_value('TimeTicks', Val3), 
+    io:format("  => ~w~n", [Enc3]),
+    {{'TimeTicks', Val3}, []} = snmp_pdus:dec_value(Enc3), 
+
+    Val4 = Val3 + 1,
+    io:format("try encode and decode value 4: ~w (0x~.16b)~n", [Val4, Val4]),
+    Enc4 = snmp_pdus:enc_value('TimeTicks', Val4), 
+    io:format("  => ~w~n", [Enc4]),
+    {{'TimeTicks', Val4}, []} = snmp_pdus:dec_value(Enc4), 
+
+    Val5 = Val4 + 1,
+    io:format("try encode and decode value 5: ~w (0x~.16b)~n", [Val5, Val5]),
+    Enc5 = snmp_pdus:enc_value('TimeTicks', Val5), 
+    io:format("  => ~w~n", [Enc5]),
+    {{'TimeTicks', Val5}, []} = snmp_pdus:dec_value(Enc5), 
+
+    Val6 = 16#fffffffe,
+    io:format("try encode and decode value 6: ~w (0x~.16b)~n", [Val6, Val6]),
+    Enc6 = snmp_pdus:enc_value('TimeTicks', Val6), 
+    io:format("  => ~w~n", [Enc6]),
+    {{'TimeTicks', Val6}, []} = snmp_pdus:dec_value(Enc6), 
+
+    Val7 = Val6 + 1,
+    io:format("try encode and decode value 7: ~w (0x~.16b)~n", [Val7, Val7]),
+    Enc7 = snmp_pdus:enc_value('TimeTicks', Val7), 
+    io:format("  => ~w~n", [Enc7]),
+    {{'TimeTicks', Val7}, []} = snmp_pdus:dec_value(Enc7), 
+
+    Val8 = Val7 + 1, 
+    io:format("try and fail to encode value 8: ~w (0x~.16b)~n", [Val8, Val8]),
+    case (catch snmp_pdus:enc_value('TimeTicks', Val8)) of
+	{'EXIT', {error, {bad_timeticks, Val8}}} ->
+	    ok;
+	Unexpected8 ->
+	    io:format("  => ~w~n", [Unexpected8]),
+	    exit({unexpected_encode_result, Unexpected8, Val8})
     end,
 
+    Val9 = -1, 
+    io:format("try and fail to encode value 9: ~w~n", [Val9]),
+    case (catch snmp_pdus:enc_value('TimeTicks', Val9)) of
+	{'EXIT', {error, {bad_timeticks, Val9}}} ->
+	    ok;
+	Unexpected9 ->
+	    io:format("  => ~w~n", [Unexpected9]),
+	    exit({unexpected_encode_result, Unexpected9, Val9})
+    end,
+
+    io:format("done~n", []),
     ok.
 
 
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index 26115a0c74..e327456bc4 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -516,8 +516,6 @@ warning_msg(F, A) ->
 timeout(T) ->
     trunc(timeout(T, os:type())).
 
-timeout(T, vxworks) ->
-    5 * T * timetrap_scale_factor();
 timeout(T, _) ->
     T * timetrap_scale_factor().
             
diff --git a/lib/snmp/test/snmp_test_mgr.erl b/lib/snmp/test/snmp_test_mgr.erl
index 499cf7abcf..40fcbce8f1 100644
--- a/lib/snmp/test/snmp_test_mgr.erl
+++ b/lib/snmp/test/snmp_test_mgr.erl
@@ -161,7 +161,6 @@ get_timeout() ->
 	    get_timeout(os:type())
     end.
 
-get_timeout(vxworks) -> 7000;
 get_timeout(_)       -> 3500.
 
 %%----------------------------------------------------------------------
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 36b9764bc8..b90dbe4eef 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 4.22
+SNMP_VSN    = 4.22.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/Makefile b/lib/ssh/doc/src/Makefile
index 125dcf8775..da99c4ea0f 100644
--- a/lib/ssh/doc/src/Makefile
+++ b/lib/ssh/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2011. All Rights Reserved.
+# Copyright Ericsson AB 2004-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -109,13 +109,13 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index a85cada732..d4acb2ef1a 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -29,6 +29,120 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 2.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    SSH quiet mode</p>
+          <p>
+	    A new option to ssh:connect/3,4, quiet_mode. If true, the
+	    client will not print out anything on authorization.</p>
+          <p>
+	    Own Id: OTP-10429 Aux Id: kunagi-273 [184] </p>
+        </item>
+        <item>
+          <p>
+	    Restrict which key algorithms to use</p>
+          <p>
+	    A new option to ssh:connect/3,4 is introduced,
+	    public_key_algs, where you can restrict which key
+	    algorithms to use and in which order to try them.</p>
+          <p>
+	    Own Id: OTP-10498 Aux Id: kunagi-289 [200] </p>
+        </item>
+        <item>
+          <p>
+	    Confidentiality of client password</p>
+          <p>
+	    Unsets clients password after authentication.</p>
+          <p>
+	    Own Id: OTP-10511 Aux Id: kunagi-292 [203] </p>
+        </item>
+        <item>
+          <p>
+	    Fixed user interaction for SSH</p>
+          <p>
+	    It's now available to accept hosts and input password</p>
+          <p>
+	    Own Id: OTP-10513 Aux Id: kunagi-293 [204] </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 2.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Ssh now only sends one channel close message under all
+	    circumstances, before it would sometimes incorrectly send
+	    two.</p>
+          <p>
+	    Own Id: OTP-10060</p>
+        </item>
+        <item>
+          <p>
+	    The options check mistreated the ip_v6_disable-option,
+	    and did not handle some, at the moment, undocumented
+	    options correctly.</p>
+          <p>
+	    Own Id: OTP-10061</p>
+        </item>
+        <item>
+          <p>
+	    The channel id in a channel failure message, sent to the
+	    peer, is now in all cases the remote channel id</p>
+          <p>
+	    Own Id: OTP-10062</p>
+        </item>
+        <item>
+          <p>
+	    Improved handling of multiple closes to avoid occasional
+	    crashes when a channel is closed more than once.</p>
+          <p>
+	    Own Id: OTP-10112</p>
+        </item>
+        <item>
+          <p>
+	    Fix lib/src/test/ssh_basic_SUITE.erl to fix IPv6 option
+	    typos</p>
+          <p>
+	    Fixed incorrect option "ipv6_disable" to "ipv6_disabled"
+	    as documented in the ssh manual.</p>
+          <p>
+	    Own Id: OTP-10219</p>
+        </item>
+        <item>
+          <p>
+	    SSH: Make "auth_methods" server option re-usable</p>
+          <p>
+	    The 'auth_methods' option is used by the server side of
+	    the SSH code to tell a connecting SSH client about the
+	    authentication methods that are supported by the server.
+	    The code still extracts and handles the 'auth_methods'
+	    option from Opts in appropriate places, but the Opts
+	    checking code in ssh.erl didn't allow that option to be
+	    specified.</p>
+          <p>
+	    Own Id: OTP-10224</p>
+        </item>
+        <item>
+          <p>
+	    Use the correct channel id when adjusting the channel
+	    window</p>
+          <p>
+	    Own Id: OTP-10232</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index e30c6f1ccc..04b7a2ae56 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -142,6 +142,11 @@
 	    some reason, the other algorithm is tried. The  default is
 	    to try <c><![CDATA[ssh_rsa]]></c> first.</p>
 	  </item>
+	  <tag><c><![CDATA[{pref_public_key_algs, list()}]]></c></tag>
+	  <item>
+            <p>List of public key algorithms to try to use, ssh_rsa and ssh_dsa available. 
+	    Will override <c><![CDATA[{public_key_alg, ssh_rsa | ssh_dsa}]]></c></p>
+	  </item>
 	  <tag><c><![CDATA[{connect_timeout, timeout()}]]></c></tag>
 	  <item>
 	    <p>Sets a timeout on the transport layer connection. Defaults to infinity.</p>
@@ -178,13 +183,20 @@
 	    <c><![CDATA[add_host_key/3]]></c>. This is considered
 	    somewhat experimental and will be better documented later on.</p>
 	  </item>
+	  <tag><c><![CDATA[{quiet_mode, atom() = boolean()}]]></c></tag>
+	  <item>
+	    <p>If true, the client will not print out anything on authorization.</p>
+	  </item>
 	  <tag><c><![CDATA[{fd, file_descriptor()}]]></c></tag>
 	  <item>
 	    <p>Allow an existing file-descriptor to be used
 	  (simply passed on to the transport protocol).</p></item>
 	  <tag><c><![CDATA[{ip_v6_disabled, boolean()}]]></c></tag>
 	  <item>
-	    <p>Determines if SSH shall use IPv6 or not.</p></item>
+	  <p>Determines if SSH shall use IPv6 or not.</p></item>
+	  <tag><c><![CDATA[{idle_time, timeout()}]]></c></tag>
+	  <item>
+	  <p>Sets a timeout on connection when no channels are active, default is infinity</p></item>
 	</taglist>
       </desc>   
     </func>
@@ -259,11 +271,17 @@
             that identifies the host for ssh. The default is
             <c><![CDATA[/etc/ssh]]></c>, note that SSH normally
             requires the host files there to be readable only by
-            root.</p>
+	    root.</p>
+	  </item>
+	  <tag><c><![CDATA[{auth_methods, string()}]]></c></tag>
+	  <item>
+	    <p>Comma separated string that determines which authentication methodes that the server
+	    should support and in what order they will be tried. Defaults to
+	    <c><![CDATA["publickey,keyboard-interactive,password"]]></c></p>
           </item>
-          <tag><c><![CDATA[{user_passwords, [{string() = User, string() = Password}]}]]></c></tag>
-          <item>
-	    <p>Provide passwords for password authentication.They will
+	  <tag><c><![CDATA[{user_passwords, [{string() = User, string() = Password}]}]]></c></tag>
+	  <item>
+            <p>Provide passwords for password authentication.They will
 	    be used when someone tries to connect to the server and
 	    public key user authentication fails. The option provides
 	    a list of valid user names and the corresponding password.
@@ -290,6 +308,18 @@
 	  <item>
 	    <p>Determines if SSH shall use IPv6 or not (only used when 
                HostAddress is set to any).</p></item>
+	  <tag><c><![CDATA[{failfun, fun()}]]></c></tag>
+	  <item>
+	    <p>Provide a fun() to implement your own logging when a user fails to authenticate.</p>
+	  </item>
+	  <tag><c><![CDATA[{connectfun, fun()}]]></c></tag>
+	  <item>
+	    <p>Provide a fun() to implement your own logging when a user authenticates to the server.</p>
+	  </item>
+	  <tag><c><![CDATA[{disconnectfun, fun()}]]></c></tag>
+	  <item>
+	    <p>Provide a fun() to implement your own logging when a user disconnects from the server.</p>
+	  </item>
         </taglist>
       </desc>
     </func>
diff --git a/lib/ssh/doc/src/ssh_connection.xml b/lib/ssh/doc/src/ssh_connection.xml
index 9942306b93..a9ae13d556 100644
--- a/lib/ssh/doc/src/ssh_connection.xml
+++ b/lib/ssh/doc/src/ssh_connection.xml
@@ -196,7 +196,7 @@
        <name>send(ConnectionRef, ChannelId, Data, Timeout) -></name>
        <name>send(ConnectionRef, ChannelId, Type, Data) -></name>
        <name>send(ConnectionRef, ChannelId, Type, Data, TimeOut) ->
-       ok | {error, timeout}</name>
+       ok | {error, timeout} | {error, closed}</name>
        <fsummary>Sends channel data </fsummary>
        <type>
 	<v> ConnectionRef = ssh_connection_ref() </v>
@@ -212,7 +212,7 @@
      </func>
      
      <func>
-       <name>send_eof(ConnectionRef, ChannelId) -> ok </name>
+       <name>send_eof(ConnectionRef, ChannelId) -> ok | {error, closed}</name>
        <fsummary>Sends eof on the channel <c>ChannelId</c>.  </fsummary>
        <type>
 	<v> ConnectionRef = ssh_connection_ref() </v>
diff --git a/lib/ssh/examples/Makefile b/lib/ssh/examples/Makefile
index 5f17542fb8..de019f75b5 100644
--- a/lib/ssh/examples/Makefile
+++ b/lib/ssh/examples/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2005-2010. All Rights Reserved.
+# Copyright Ericsson AB 2005-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -69,8 +69,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/examples
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/examples"
 
 release_docs_spec:
 
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index 1734ae4df4..b8eecd3fa2 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -38,15 +38,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/ssh-$(VSN)
 
 # Behaviour (api) modules are first so they are compiled when
 # the compiler reaches a callback module using them.
-MODULES= \
+BEHAVIOUR_MODULES= \
 	ssh_sftpd_file_api \
-	ssh_key_api \
+        ssh_channel \
+	ssh_key_api
+
+MODULES= \
 	ssh \
 	ssh_sup \
 	sshc_sup \
 	sshd_sup \
 	ssh_connection_sup \
-        ssh_channel \
 	ssh_connection \
 	ssh_connection_handler \
 	ssh_connection_manager \
@@ -73,11 +75,14 @@ MODULES= \
 
 PUBLIC_HRL_FILES= ssh.hrl ssh_userauth.hrl ssh_xfer.hrl
 
-ERL_FILES= $(MODULES:%=%.erl)
+ERL_FILES= \
+	$(MODULES:%=%.erl) \
+	$(BEHAVIOUR_MODULES:%=%.erl)
 
-ALL_MODULES= $(MODULES)
 
-TARGET_FILES= $(ALL_MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 APP_FILE= ssh.app
 APPUP_FILE= ssh.appup
@@ -93,29 +98,29 @@ INTERNAL_HRL_FILES = ssh_auth.hrl ssh_connect.hrl ssh_transport.hrl
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += -pa$(EBIN)\
-	-pz $(ERL_TOP)/lib/public_key/ebin
+EXTRA_ERLC_FLAGS = +warn_unused_vars
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
+	-pz $(EBIN) \
+	-pz $(ERL_TOP)/lib/public_key/ebin \
+	$(EXTRA_ERLC_FLAGS)
+
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
 
-debug: ERLC_FLAGS += -Ddebug
+debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
 clean:
-	rm -f $(TARGET_FILES)
+	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 	rm -f errs core *~
 
-$(TARGET_FILES): ssh.hrl
-
-# $(EBIN)/ssh_sftpd_file.$(EMULATOR): ERLC_FLAGS += -pa$(EBIN)
-# $(EBIN)/ssh_sftpd_file.$(EMULATOR): $(EBIN)/ssh_sftpd_file_api.$(EMULATOR)
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
+$(APP_TARGET):	$(APP_SRC) ../vsn.mk
 	sed -e 's;%VSN%;$(VSN);' $< > $@
 
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+$(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
 	sed -e 's;%VSN%;$(VSN);' $< > $@
 
 
@@ -127,12 +132,13 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(PUBLIC_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
+	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(PUBLIC_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
 
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 0542054596..6ba32e018f 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -18,12 +18,30 @@
 %%
 
 {"%VSN%",	
- [			
- {<<"2\\.*">>, [{restart_application, ssh}]},
- {<<"1\\.*">>, [{restart_application, ssh}]}	
+ [
+ {<<"2.1.1">>, [{restart_application, ssh}]},
+ {<<"2.1">>, [{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []},
+	      {load_module, ssh_connection, soft_purge, soft_purge, []},
+	      {load_module, ssh_connection_manager, soft_purge, soft_purge, []},
+	      {load_module, ssh_auth, soft_purge, soft_purge, []},
+	      {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+	      {load_module, ssh_channel, soft_purge, soft_purge, []},
+	      {load_module, ssh_file, soft_purge, soft_purge, []}]},
+	      {load_module, ssh, soft_purge, soft_purge, []}]},
+  {<<"2.0\\.*">>, [{restart_application, ssh}]},
+  {<<"1\\.*">>, [{restart_application, ssh}]}
  ],
  [
- {<<"2\\.*">>, [{restart_application, ssh}]},
- {<<"1\\.*">>, [{restart_application, ssh}]}			   
+  {<<"2.1.1">>, [{restart_application, ssh}]},
+  {<<"2.1">>,[{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []},
+	      {load_module, ssh_connection, soft_purge, soft_purge, []},
+	      {load_module, ssh_connection_manager, soft_purge, soft_purge, []},
+	      {load_module, ssh_auth, soft_purge, soft_purge, []},
+	      {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+	      {load_module, ssh_channel, soft_purge, soft_purge, []},
+	      {load_module, ssh_file, soft_purge, soft_purge, []}]},
+	      {load_module, ssh, soft_purge, soft_purge, []}]},
+  {<<"2.0\\.*">>, [{restart_application, ssh}]},
+  {<<"1\\.*">>, [{restart_application, ssh}]}
  ]
-}.
+}.
\ No newline at end of file
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 39c7fe329e..719c97e940 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -79,7 +79,7 @@ connect(Host, Port, Options, Timeout) ->
 	    DisableIpv6 =  proplists:get_value(ip_v6_disabled, SshOptions, false),
 	    Inet = inetopt(DisableIpv6),
 	    do_connect(Host, Port, [Inet | SocketOptions], 
-		       [{host, Host} | SshOptions], Timeout, DisableIpv6)
+		       [{user_pid, self()}, {host, Host} | fix_idle_time(SshOptions)], Timeout, DisableIpv6)
     end.
 
 do_connect(Host, Port, SocketOptions, SshOptions, Timeout, DisableIpv6) ->
@@ -91,59 +91,39 @@ do_connect(Host, Port, SocketOptions, SshOptions, Timeout, DisableIpv6) ->
  	{ok, ConnectionSup} ->
 	    {ok, Manager} = 
 		ssh_connection_sup:connection_manager(ConnectionSup),
-	    MRef = erlang:monitor(process, Manager),
-	    receive 
-		{Manager, is_connected} ->
-		    do_demonitor(MRef, Manager),
-		    {ok, Manager};
-		%% When the connection fails 
-		%% ssh_connection_sup:connection_manager
-		%% might return undefined as the connection manager
-		%% could allready have terminated, so we will not
-		%% match the Manager in this case
-		{_, not_connected, {error, econnrefused}} when DisableIpv6 == false ->
-		    do_demonitor(MRef, Manager),
-		    do_connect(Host, Port, proplists:delete(inet6, SocketOptions), 
-			    SshOptions, Timeout, true);
-		{_, not_connected, {error, Reason}} ->
-		    do_demonitor(MRef, Manager),
-		    {error, Reason};
-		{_, not_connected, Other} ->
-		    do_demonitor(MRef, Manager),
-		    {error, Other};
-		{'DOWN', MRef, _, Manager, Reason} when is_pid(Manager) ->
-		    error_logger:warning_report([{ssh, connect},
-						 {diagnose,
-						  "Connection was closed before properly set up."},
-						 {host, Host},
-						 {port, Port},
-						 {reason, Reason}]),
-		    receive %% Clear EXIT message from queue
-			{'EXIT', Manager, _What} -> 
-			    {error, channel_closed}
-		    after 0 ->
-			    {error, channel_closed}
-		    end
-	    after Timeout  ->
-		    do_demonitor(MRef, Manager),
-		    ssh_connection_manager:stop(Manager),
-		    {error, timeout}
-	    end
+	    msg_loop(Manager, DisableIpv6, Host, Port, SocketOptions, SshOptions, Timeout)
     catch 
 	exit:{noproc, _} ->
  	    {error, ssh_not_started}
     end.
-
-do_demonitor(MRef, Manager) ->
-    erlang:demonitor(MRef),
+msg_loop(Manager, DisableIpv6, Host, Port, SocketOptions, SshOptions, Timeout) ->
     receive 
-	{'DOWN', MRef, _, Manager, _} -> 
-	    ok
-    after 0 -> 
-	    ok
+	{Manager, is_connected} ->
+	    {ok, Manager};
+	%% When the connection fails 
+	%% ssh_connection_sup:connection_manager
+	%% might return undefined as the connection manager
+	%% could allready have terminated, so we will not
+	%% match the Manager in this case
+	{_, not_connected, {error, econnrefused}} when DisableIpv6 == false ->
+	    do_connect(Host, Port, proplists:delete(inet6, SocketOptions), 
+		       SshOptions, Timeout, true);
+	{_, not_connected, {error, Reason}} ->
+	    {error, Reason};
+	{_, not_connected, Other} ->
+	    {error, Other};
+	{From, user_password} ->
+	    Pass = io:get_password(),
+	    From ! Pass,
+	    msg_loop(Manager, DisableIpv6, Host, Port, SocketOptions, SshOptions, Timeout);
+	{From, question} ->
+	    Answer = io:get_line(""),
+	    From ! Answer,
+	    msg_loop(Manager, DisableIpv6, Host, Port, SocketOptions, SshOptions, Timeout)
+    after Timeout  ->
+	    ssh_connection_manager:stop(Manager),
+	    {error, timeout}
     end.
-
-
 %%--------------------------------------------------------------------
 %% Function: close(ConnectionRef) -> ok
 %%
@@ -266,6 +246,13 @@ shell(Host, Port, Options) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
+fix_idle_time(SshOptions) ->
+    case proplists:get_value(idle_time, SshOptions) of
+	undefined ->
+	    [{idle_time, infinity}|SshOptions];
+	_ ->
+	    SshOptions
+    end.
 start_daemon(Host, Port, Options, Inet) ->
     case handle_options(Options) of
 	{error, _Reason} = Error ->
@@ -346,8 +333,9 @@ handle_option([{role, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{compression, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
-handle_option([{allow_user_interaction, _} = Opt | Rest], SocketOptions, SshOptions) ->
-    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+%%Backwards compatibility
+handle_option([{allow_user_interaction, Value}  | Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option({user_interaction, Value}) | SshOptions]);
 handle_option([{infofun, _} = Opt | Rest],SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{connectfun, _} = Opt | Rest], SocketOptions, SshOptions) ->
@@ -366,6 +354,16 @@ handle_option([{ssh_cli, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{shell, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+handle_option([{exec, _} = Opt | Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+handle_option([{auth_methods, _} = Opt | Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+handle_option([{pref_public_key_algs, _} = Opt | Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+handle_option([{quiet_mode, _} = Opt|Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+handle_option([{idle_time, _} = Opt | Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions).
 
@@ -381,6 +379,13 @@ handle_ssh_option({user_interaction, Value} = Opt) when Value == true; Value ==
     Opt;
 handle_ssh_option({public_key_alg, Value} = Opt) when Value == ssh_rsa; Value == ssh_dsa ->
     Opt;
+handle_ssh_option({pref_public_key_algs, Value} = Opt) when is_list(Value), length(Value) >= 1 ->
+    case check_pref_algs(Value) of
+	true ->
+	    Opt;
+	_ ->
+	    throw({error, {eoptions, Opt}})
+    end;
 handle_ssh_option({connect_timeout, Value} = Opt) when is_integer(Value); Value == infinity ->
     Opt;
 handle_ssh_option({user, Value} = Opt) when is_list(Value) ->
@@ -401,8 +406,11 @@ handle_ssh_option({key_cb, Value} = Opt)  when is_atom(Value) ->
     Opt;
 handle_ssh_option({compression, Value} = Opt) when is_atom(Value) ->
     Opt;
-handle_ssh_option({allow_user_interaction, Value} = Opt) when Value == true;
-							      Value == false ->
+handle_ssh_option({exec, {Module, Function, _}} = Opt) when is_atom(Module), 
+							    is_atom(Function) ->
+
+    Opt;
+handle_ssh_option({auth_methods, Value} = Opt)  when is_list(Value) ->
     Opt;
 handle_ssh_option({infofun, Value} = Opt)  when is_function(Value) ->
     Opt;
@@ -412,11 +420,11 @@ handle_ssh_option({disconnectfun , Value} = Opt) when is_function(Value) ->
     Opt;
 handle_ssh_option({failfun, Value} = Opt) when is_function(Value) ->
     Opt;
-handle_ssh_option({ip_v6_disabled, Value} = Opt) when is_function(Value) ->
+handle_ssh_option({ip_v6_disabled, Value} = Opt) when is_boolean(Value) ->
     Opt;
 handle_ssh_option({transport, {Protocol, Cb, ClosTag}} = Opt) when is_atom(Protocol),
-							     is_atom(Cb),
-							     is_atom(ClosTag) ->
+								   is_atom(Cb),
+								   is_atom(ClosTag) ->
     Opt;
 handle_ssh_option({subsystems, Value} = Opt) when is_list(Value) ->
     Opt;
@@ -427,6 +435,11 @@ handle_ssh_option({shell, {Module, Function, _}} = Opt)  when is_atom(Module),
     Opt;
 handle_ssh_option({shell, Value} = Opt) when is_function(Value) ->
     Opt;
+handle_ssh_option({quiet_mode, Value} = Opt) when Value == true; 
+						  Value == false -> 
+    Opt;
+handle_ssh_option({idle_time, Value} = Opt) when is_integer(Value), Value > 0 ->
+    Opt;
 handle_ssh_option(Opt) ->
     throw({error, {eoptions, Opt}}).
 
@@ -444,12 +457,23 @@ handle_inet_option({reuseaddr, _} = Opt) ->
 %% Option verified by inet
 handle_inet_option(Opt) ->
     Opt.
-
+%% Check preferred algs
+check_pref_algs([]) ->
+    true;
+check_pref_algs([H|T]) ->
+    case H of
+	ssh_dsa ->
+	    check_pref_algs(T);
+	ssh_rsa ->
+	    check_pref_algs(T);
+	_ ->
+	    false
+    end.
 %% Has IPv6 been disabled?
 inetopt(true) ->
     inet;
 inetopt(false) ->
-    case gen_tcp:listen(0, [inet6, {ip, loopback}]) of
+    case gen_tcp:listen(0, [inet6]) of
 	{ok, Dummyport} ->
 	    gen_tcp:close(Dummyport),
 	    inet6;
@@ -495,4 +519,3 @@ verify_data(Data, Signature, Algorithm) when is_binary(Data), is_binary(Signatur
 	Error ->
 	    Error
     end.
-
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl
index 1a4517c689..c436793dc4 100644
--- a/lib/ssh/src/ssh_auth.erl
+++ b/lib/ssh/src/ssh_auth.erl
@@ -71,7 +71,7 @@ password_msg([#ssh{opts = Opts, io_cb = IoCb,
     ssh_bits:install_messages(userauth_passwd_messages()),
     Password = case proplists:get_value(password, Opts) of
 		   undefined -> 
-		       user_interaction(Opts, IoCb);
+		       user_interaction(IoCb, Ssh);
 		   PW -> 
 		       PW
 	       end,
@@ -89,13 +89,10 @@ password_msg([#ssh{opts = Opts, io_cb = IoCb,
 	      Ssh)
     end.
 
-user_interaction(Opts, IoCb) ->
-    case proplists:get_value(allow_user_interaction, Opts, true) of
-	true ->
-	    IoCb:read_password("ssh password: ");
-	false ->
-	    not_ok
-    end.
+user_interaction(ssh_no_io, _) ->
+    not_ok;
+user_interaction(IoCb, Ssh) ->
+    IoCb:read_password("ssh password: ", Ssh).
 
 
 %% See RFC 4256 for info on keyboard-interactive
@@ -121,16 +118,37 @@ init_userauth_request_msg(#ssh{opts = Opts} = Ssh) ->
 					    service = "ssh-connection",
 					    method = "none",
 					    data = <<>>},
-	    FirstAlg = algorithm(proplists:get_value(public_key_alg, Opts,
-					  ?PREFERRED_PK_ALG)),
-	    SecondAlg = other_alg(FirstAlg),
-	    AllowUserInt =  proplists:get_value(allow_user_interaction, Opts,
-						true),
-	    Prefs = method_preference(FirstAlg, SecondAlg, AllowUserInt),
-	    ssh_transport:ssh_packet(Msg, Ssh#ssh{user = User,
-					    userauth_preference = Prefs,
-					    userauth_methods = none,
-					    service = "ssh-connection"});
+	    case proplists:get_value(pref_public_key_algs, Opts, false) of
+		false ->
+		    FirstAlg = algorithm(proplists:get_value(public_key_alg, Opts,
+							     ?PREFERRED_PK_ALG)),
+		    SecondAlg = other_alg(FirstAlg),
+		    AllowUserInt =  proplists:get_value(user_interaction, Opts, true),
+		    Prefs = method_preference(FirstAlg, SecondAlg, AllowUserInt),
+		    ssh_transport:ssh_packet(Msg, Ssh#ssh{user = User,
+							  userauth_preference = Prefs,
+							  userauth_methods = none,
+							  service = "ssh-connection"});
+		Algs ->
+		    FirstAlg = algorithm(lists:nth(1, Algs)),
+		    case length(Algs) =:= 2 of
+			true ->
+			    SecondAlg = other_alg(FirstAlg),
+			    AllowUserInt =  proplists:get_value(user_interaction, Opts, true),
+			    Prefs = method_preference(FirstAlg, SecondAlg, AllowUserInt),
+			    ssh_transport:ssh_packet(Msg, Ssh#ssh{user = User,
+								  userauth_preference = Prefs,
+								  userauth_methods = none,
+								  service = "ssh-connection"});
+			_ ->
+			    AllowUserInt = proplists:get_value(user_interaction, Opts, true),
+			    Prefs = method_preference(FirstAlg, AllowUserInt),
+			    ssh_transport:ssh_packet(Msg, Ssh#ssh{user = User,
+								  userauth_preference = Prefs,
+								  userauth_methods = none,
+								  service = "ssh-connection"})
+		    end
+	    end;
 	{error, no_user} ->
 	    ErrStr = "Could not determine the users name",
 	    throw(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_ILLEGAL_USER_NAME,
@@ -291,6 +309,15 @@ method_preference(Alg1, Alg2, false) ->
      {"publickey", ?MODULE, publickey_msg,[Alg2]},
      {"password", ?MODULE, password_msg, []}
     ].
+method_preference(Alg1, true) ->
+    [{"publickey", ?MODULE, publickey_msg, [Alg1]},
+     {"password", ?MODULE, password_msg, []},
+     {"keyboard-interactive", ?MODULE, keyboard_interactive_msg, []}
+    ];
+method_preference(Alg1, false) ->
+    [{"publickey", ?MODULE, publickey_msg, [Alg1]},
+     {"password", ?MODULE, password_msg, []}
+    ].
 
 user_name(Opts) ->
     Env = case os:type() of
@@ -374,11 +401,11 @@ keyboard_interact_get_responses(IoCb, Opts, Name, Instr, PromptInfos) ->
 	    %% Special case/fallback for just one prompt
 	    %% (assumed to be the password prompt)
 	    case proplists:get_value(password, Opts) of
-		undefined -> keyboard_interact(IoCb, Name, Instr, PromptInfos);
+		undefined -> keyboard_interact(IoCb, Name, Instr, PromptInfos, Opts);
 		PW        -> [PW]
 	    end;
 	undefined ->
-	    keyboard_interact(IoCb, Name, Instr, PromptInfos);
+	    keyboard_interact(IoCb, Name, Instr, PromptInfos, Opts);
 	KbdInteractFun ->
 	    Prompts = lists:map(fun({Prompt, _Echo}) -> Prompt end,
 				PromptInfos),
@@ -392,15 +419,15 @@ keyboard_interact_get_responses(IoCb, Opts, Name, Instr, PromptInfos) ->
 	    end
     end.
 
-keyboard_interact(IoCb, Name, Instr, Prompts) ->
+keyboard_interact(IoCb, Name, Instr, Prompts, Opts) ->
     if Name /= "" -> IoCb:format("~s", [Name]);
        true       -> ok
     end,
     if Instr /= "" -> IoCb:format("~s", [Instr]);
        true        -> ok
     end,
-    lists:map(fun({Prompt, true})  -> IoCb:read_line(Prompt);
-		 ({Prompt, false}) -> IoCb:read_password(Prompt)
+    lists:map(fun({Prompt, true})  -> IoCb:read_line(Prompt, Opts);
+		 ({Prompt, false}) -> IoCb:read_password(Prompt, Opts)
 	      end,
 	      Prompts).
 
diff --git a/lib/ssh/src/ssh_auth.hrl b/lib/ssh/src/ssh_auth.hrl
index 7d7bad4436..e74ee10041 100644
--- a/lib/ssh/src/ssh_auth.hrl
+++ b/lib/ssh/src/ssh_auth.hrl
@@ -21,7 +21,7 @@
 
 %%% Description: Ssh User Authentication Protocol
 
--define(SUPPORTED_AUTH_METHODS, "publickey,keyboard_interactive,password").
+-define(SUPPORTED_AUTH_METHODS, "publickey,keyboard-interactive,password").
 
 -define(PREFERRED_PK_ALG, ssh_rsa).
 
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl
index 7b600ed8b2..1938858420 100644
--- a/lib/ssh/src/ssh_channel.erl
+++ b/lib/ssh/src/ssh_channel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -215,7 +215,7 @@ handle_info({ssh_cm, ConnectionManager, {closed, ChannelId}},
 		   close_sent = false} = State) ->
     %% To be on the safe side, i.e. the manager has already been terminated.
     (catch ssh_connection:close(ConnectionManager, ChannelId)),
-    {stop, normal, State};
+    {stop, normal, State#state{close_sent = true}};
 
 handle_info({ssh_cm, _, _} = Msg, #state{cm = ConnectionManager,
 			channel_cb = Module, 
diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl
index 781e01b9d1..c8c610f8ef 100644
--- a/lib/ssh/src/ssh_cli.erl
+++ b/lib/ssh/src/ssh_cli.erl
@@ -81,7 +81,8 @@ handle_ssh_msg({ssh_cm, ConnectionManager,
 				  height = not_zero(Height, 24),
 				  pixel_width = PixWidth,
 				  pixel_height = PixHeight,
-				  modes = Modes}},
+                  modes = Modes},
+             buf = empty_buf()},
     set_echo(State),
     ssh_connection:reply_request(ConnectionManager, WantReply, 
 				 success, ChannelId),
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 46f0c7e688..9424cdd423 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -177,7 +177,7 @@ close(ConnectionManager, ChannelId) ->
 %% Description: Send status replies to requests that want such replies.
 %%--------------------------------------------------------------------
 reply_request(ConnectionManager, true, Status, ChannelId) ->
-    ConnectionManager ! {ssh_cm, self(), {Status, ChannelId}},
+    ssh_connection_manager:reply_request(ConnectionManager, Status, ChannelId),
     ok;
 reply_request(_,false, _, _) ->
     ok.
@@ -318,21 +318,22 @@ channel_data(ChannelId, DataType, Data,
 	     From) ->
     
     case ssh_channel:cache_lookup(Cache, ChannelId) of
-	#channel{remote_id = Id} = Channel0 ->
-	    {SendList, Channel} = update_send_window(Channel0, DataType, 
+	#channel{remote_id = Id, sent_close = false} = Channel0 ->
+	    {SendList, Channel} = update_send_window(Channel0#channel{flow_control = From}, DataType,
 						     Data, Connection),
 	    Replies = 
 		lists:map(fun({SendDataType, SendData}) -> 
-				      {connection_reply, ConnectionPid, 
-				       channel_data_msg(Id, 
-							SendDataType, 
-							SendData)}
+				  {connection_reply, ConnectionPid,
+				   channel_data_msg(Id,
+						    SendDataType,
+						    SendData)}
 			  end, SendList),
 	    FlowCtrlMsgs = flow_control(Replies, 
-					Channel#channel{flow_control = From}, 
+					Channel,
 					Cache),
 	    {{replies, Replies ++ FlowCtrlMsgs}, Connection};
-	undefined ->
+	_ ->
+	    gen_server:reply(From, {error, closed}),
 	    {noreply, Connection}
     end.
 
@@ -386,20 +387,30 @@ handle_msg(#ssh_msg_channel_close{recipient_channel = ChannelId},
 	   ConnectionPid, _) ->
 
 	case ssh_channel:cache_lookup(Cache, ChannelId) of
-	    #channel{sent_close = Closed, remote_id = RemoteId} = Channel ->
+		#channel{sent_close = Closed, remote_id = RemoteId, flow_control = FlowControl} = Channel ->
 		ssh_channel:cache_delete(Cache, ChannelId),
 		{CloseMsg, Connection} = 
 		    reply_msg(Channel, Connection0, {closed, ChannelId}),
+
+			ConnReplyMsgs =
 		case Closed of
-		    true ->
-			{{replies, [CloseMsg]}, Connection};
+					true -> [];
 		    false ->
 			RemoteCloseMsg = channel_close_msg(RemoteId),
-			{{replies, 
-			  [{connection_reply, 
-				      ConnectionPid, RemoteCloseMsg},
-			   CloseMsg]}, Connection}
-		end;
+						[{connection_reply, ConnectionPid, RemoteCloseMsg}]
+				end,
+
+			%% if there was a send() in progress, make it fail
+			SendReplyMsgs =
+				case FlowControl of
+					undefined -> [];
+					From ->
+						[{flow_control, From, {error, closed}}]
+				end,
+
+			Replies = ConnReplyMsgs ++ [CloseMsg] ++ SendReplyMsgs,
+			{{replies, Replies}, Connection};
+
 	    undefined ->
 		{{replies, []}, Connection0}
 	end;
@@ -436,32 +447,32 @@ handle_msg(#ssh_msg_channel_window_adjust{recipient_channel = ChannelId,
 	   #connection{channel_cache = Cache} = Connection, 
 	   ConnectionPid, _) ->
     
-    #channel{send_window_size = Size} = 
+    #channel{send_window_size = Size, remote_id = RemoteId} = 
 	Channel0 = ssh_channel:cache_lookup(Cache, ChannelId), 
-
+    
     {SendList, Channel} =  %% TODO: Datatype 0 ?
 	update_send_window(Channel0#channel{send_window_size = Size + Add},
-			   0, <<>>, Connection),
+			   0, undefined, Connection),
     
     Replies = lists:map(fun({Type, Data}) -> 
 				{connection_reply, ConnectionPid,
-				 channel_data_msg(ChannelId, Type, Data)}
+				 channel_data_msg(RemoteId, Type, Data)}
 			end, SendList),
     FlowCtrlMsgs = flow_control(Channel, Cache),
     {{replies, Replies ++ FlowCtrlMsgs}, Connection};
 
 handle_msg(#ssh_msg_channel_open{channel_type = "session" = Type,
-				 sender_channel = ChannelId,
+				 sender_channel = RemoteId,
 				 initial_window_size = WindowSz,
 				 maximum_packet_size = PacketSz}, Connection0, 
 	   ConnectionPid, server) ->
    
-    try setup_session(Connection0, ConnectionPid, ChannelId,
+    try setup_session(Connection0, ConnectionPid, RemoteId,
 		     Type, WindowSz, PacketSz) of
 	Result ->
 	    Result
     catch _:_ ->
-	    FailMsg = channel_open_failure_msg(ChannelId, 
+	    FailMsg = channel_open_failure_msg(RemoteId, 
 					       ?SSH_OPEN_CONNECT_FAILED,
 					       "Connection refused", "en"),
 	    {{replies, [{connection_reply, ConnectionPid, FailMsg}]}, 
@@ -532,9 +543,9 @@ handle_msg(#ssh_msg_channel_open{channel_type = "forwarded-tcpip",
     {{replies, [{connection_reply, ConnectionPid, FailMsg}]}, Connection};
 
 
-handle_msg(#ssh_msg_channel_open{sender_channel = ChannelId}, Connection, 
+handle_msg(#ssh_msg_channel_open{sender_channel = RemoteId}, Connection, 
 	   ConnectionPid, _) ->
-    FailMsg = channel_open_failure_msg(ChannelId, 
+    FailMsg = channel_open_failure_msg(RemoteId, 
 				       ?SSH_OPEN_ADMINISTRATIVELY_PROHIBITED,
 				       "Not allowed", "en"),
     {{replies, [{connection_reply, ConnectionPid, FailMsg}]}, Connection};
@@ -720,12 +731,17 @@ handle_msg(#ssh_msg_channel_request{request_type = "env"},
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = _Other,
-				    want_reply = WantReply}, Connection,
+				    want_reply = WantReply},  #connection{channel_cache = Cache} = Connection,
 	   ConnectionPid, _) ->
     if WantReply == true ->
-	    FailMsg = channel_failure_msg(ChannelId),
-	    {{replies, [{connection_reply, ConnectionPid, FailMsg}]}, 
-	     Connection};
+		case ssh_channel:cache_lookup(Cache, ChannelId) of
+		    #channel{remote_id = RemoteId}  -> 
+			FailMsg = channel_failure_msg(RemoteId),
+			{{replies, [{connection_reply, ConnectionPid, FailMsg}]}, 
+			 Connection};
+		    undefined -> %% Chanel has been closed
+			{noreply, Connection}
+		end;
        true ->
 	    {noreply, Connection}
     end;
@@ -1068,14 +1084,15 @@ request_reply_or_data(#channel{local_id = ChannelId, user = ChannelPid},
 	false ->
 	    {{channel_data, ChannelPid, Reply}, Connection}
     end.
+update_send_window(Channel, _, undefined,
+		   #connection{channel_cache = Cache}) ->
+    do_update_send_window(Channel,  Channel#channel.send_buf, Cache);
+
+update_send_window(Channel, DataType, Data,
+		   #connection{channel_cache = Cache}) ->
+    do_update_send_window(Channel, Channel#channel.send_buf ++ [{DataType, Data}], Cache).
 
-update_send_window(Channel0, DataType, Data,  
-			#connection{channel_cache = Cache}) ->
-    Buf0 = if Data == <<>> ->
-		   Channel0#channel.send_buf;
-	      true ->
-		   Channel0#channel.send_buf ++ [{DataType, Data}]
-	   end,
+do_update_send_window(Channel0, Buf0, Cache) ->
     {Buf1, NewSz, Buf2} = get_window(Buf0, 
 				     Channel0#channel.send_packet_size,
 				     Channel0#channel.send_window_size),
@@ -1120,13 +1137,13 @@ flow_control(Channel, Cache) ->
 flow_control([], Channel, Cache) ->
     ssh_channel:cache_update(Cache, Channel),
     [];
-flow_control([_|_], #channel{flow_control = From} = Channel, Cache) ->
-    case From of
-	undefined ->
-	    [];
-	_ ->
-	    [{flow_control, Cache,  Channel, From, ok}]
-    end.
+
+flow_control([_|_], #channel{flow_control = From,
+							 send_buf = []} = Channel, Cache) when From =/= undefined ->
+	[{flow_control, Cache, Channel, From, ok}];
+flow_control(_,_,_) ->
+	[].
+
 
 encode_pty_opts(Opts) ->
     Bin = list_to_binary(encode_pty_opts2(Opts)),
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 5b3d1b8a1b..d8950a7b67 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -718,8 +718,18 @@ init_ssh(server = Role, Vsn, Version, Options, Socket) ->
 	 available_host_keys = supported_host_keys(Role, KeyCb, Options)
 	 }.
 
-supported_host_keys(client, _, _) ->
-    ["ssh-rsa", "ssh-dss"];
+supported_host_keys(client, _, Options) ->
+    try
+	case extract_algs(proplists:get_value(pref_public_key_algs, Options, false), []) of
+	    false ->
+		["ssh-rsa", "ssh-dss"];
+	    Algs ->
+		Algs
+	end
+    catch
+	exit:Reason ->
+	    {stop, {shutdown, Reason}}
+    end;
 supported_host_keys(server, KeyCb, Options) ->
     lists:foldl(fun(Type, Acc) ->
 			case available_host_key(KeyCb, Type, Options) of
@@ -731,7 +741,19 @@ supported_host_keys(server, KeyCb, Options) ->
 		end, [],
 		%% Prefered alg last so no need to reverse
 		["ssh-dss", "ssh-rsa"]).
-
+extract_algs(false, _) ->
+    false;
+extract_algs([],[]) ->
+    false;
+extract_algs([], NewList) ->
+    lists:reverse(NewList);
+extract_algs([H|T], NewList) ->
+    case H of
+	ssh_dsa ->
+	    extract_algs(T, ["ssh-dss"|NewList]);
+	ssh_rsa -> 
+	    extract_algs(T, ["ssh-rsa"|NewList])
+    end.
 available_host_key(KeyCb, "ssh-dss"= Alg, Opts) ->
     case KeyCb:host_key('ssh-dss', Opts) of
 	{ok, _} ->
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index e993f597a5..0c1eee5186 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -40,7 +40,7 @@
 	 close/2, stop/1, send/5,
 	 send_eof/2]).
 
--export([open_channel/6, request/6, request/7, global_request/4, event/2,
+-export([open_channel/6, reply_request/3, request/6, request/7, global_request/4, event/2,
 	 cast/2]).
 
 %% Internal application API and spawn
@@ -62,6 +62,7 @@
 	  latest_channel_id = 0, 
 	  opts,
 	  channel_args,
+	  idle_timer_ref, % timerref
 	  connected 
 	 }).
 
@@ -95,6 +96,9 @@ request(ConnectionManager, ChannelId, Type, true, Data, Timeout) ->
 request(ConnectionManager, ChannelId, Type, false, Data, _) ->
     cast(ConnectionManager, {request, ChannelId, Type, Data}).
 
+reply_request(ConnectionManager, Status, ChannelId) ->
+    cast(ConnectionManager, {reply_request, Status, ChannelId}).
+
 global_request(ConnectionManager, Type, true = Reply, Data) ->
     case call(ConnectionManager, 
 	      {global_request, self(), Type, Reply, Data}) of
@@ -163,7 +167,7 @@ send(ConnectionManager, ChannelId, Type, Data, Timeout) ->
     call(ConnectionManager, {data, ChannelId, Type, Data}, Timeout).
 
 send_eof(ConnectionManager, ChannelId) ->
-    cast(ConnectionManager, {eof, ChannelId}).
+    call(ConnectionManager, {eof, ChannelId}).
 
 %%====================================================================
 %% gen_server callbacks
@@ -200,6 +204,8 @@ init([client, Opts]) ->
     ChannelPid = proplists:get_value(channel_pid, Opts),
     self() ! 
 	{start_connection, client, [Parent, Address, Port, SocketOpts, Options]},
+    TimerRef = get_idle_time(Options),
+	
     {ok, #state{role = client, 
 		client = ChannelPid,
 		connection_state = #connection{channel_cache = Cache,
@@ -208,6 +214,7 @@ init([client, Opts]) ->
 					       connection_supervisor = Parent,
 					       requests = []},
 		opts = Opts,
+		idle_timer_ref = TimerRef,
 		connected = false}}.
 
 %%--------------------------------------------------------------------
@@ -227,6 +234,13 @@ handle_call({request, ChannelPid, ChannelId, Type, Data}, From, State0) ->
     %% channel is sent later when reply arrives from the connection
     %% handler. 
     lists:foreach(fun send_msg/1, Replies),
+    SshOpts = proplists:get_value(ssh_opts, State0#state.opts),
+    case proplists:get_value(idle_time, SshOpts) of
+	infinity ->
+	    ok;
+	_IdleTime ->
+	    erlang:send_after(5000, self(), {check_cache, [], []})
+    end,
     {noreply, State};
 
 handle_call({request, ChannelId, Type, Data}, From, State0) ->
@@ -267,7 +281,7 @@ handle_call({ssh_msg, Pid, Msg}, From,
 	    disconnect_fun(Reason, SSHOpts),
 	    {stop, {shutdown, normal}, State#state{connection_state = Connection}}
 	catch
-	    _:Reason ->
+	    _:Error ->
 		{disconnect, Reason, {{replies, Replies}, Connection}} =
 		    ssh_connection:handle_msg(
 		      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
@@ -277,7 +291,7 @@ handle_call({ssh_msg, Pid, Msg}, From,
 		lists:foreach(fun send_msg/1, Replies),
 		SSHOpts = proplists:get_value(ssh_opts, Opts),
 		disconnect_fun(Reason, SSHOpts),
-		{stop, {shutdown, Reason}, State#state{connection_state = Connection}}
+		{stop, {shutdown, Error}, State#state{connection_state = Connection}}
 	end;
 
 handle_call({global_request, Pid, _, _, _} = Request, From, 
@@ -295,6 +309,18 @@ handle_call({data, ChannelId, Type, Data}, From,
     channel_data(ChannelId, Type, Data, Connection0, ConnectionPid, From,
 		 State);
 
+handle_call({eof, ChannelId}, _From,
+			#state{connection = Pid, connection_state =
+					   #connection{channel_cache = Cache}} = State) ->
+	case ssh_channel:cache_lookup(Cache, ChannelId) of
+		#channel{remote_id = Id, sent_close = false} ->
+			send_msg({connection_reply, Pid,
+					  ssh_connection:channel_eof_msg(Id)}),
+			{reply, ok, State};
+		_ ->
+			{reply, {error,closed}, State}
+	end;
+
 handle_call({connection_info, Options}, From, 
 	    #state{connection = Connection} = State) ->
     ssh_connection_handler:connection_info(Connection, From, Options),
@@ -343,7 +369,7 @@ handle_call({open, ChannelPid, Type, InitialWindowSize, MaxPacketSize, Data},
 		       recv_packet_size = MaxPacketSize},
     ssh_channel:cache_update(Cache, Channel),
     State = add_request(true, ChannelId, From, State1),
-    {noreply, State};
+    {noreply, remove_timer_ref(State)};
 
 handle_call({send_window, ChannelId}, _From, 
 	    #state{connection_state = 
@@ -384,9 +410,17 @@ handle_call({close, ChannelId}, _,
 	    #state{connection = Pid, connection_state = 
 		   #connection{channel_cache = Cache}} = State) ->
     case ssh_channel:cache_lookup(Cache, ChannelId) of			 
-	#channel{remote_id = Id} ->
+	#channel{remote_id = Id} = Channel ->
 	    send_msg({connection_reply, Pid, 
 		      ssh_connection:channel_close_msg(Id)}),
+	    ssh_channel:cache_update(Cache, Channel#channel{sent_close = true}),
+	    SshOpts = proplists:get_value(ssh_opts, State#state.opts),
+	    case proplists:get_value(idle_time, SshOpts) of
+		infinity ->
+		    ok;
+		_IdleTime ->
+		    erlang:send_after(5000, self(), {check_cache, [], []})
+	    end,
 	    {reply, ok, State};
 	undefined -> 
 	    {reply, ok, State}
@@ -430,6 +464,16 @@ handle_cast({request, ChannelId, Type, Data}, State0) ->
     lists:foreach(fun send_msg/1, Replies),
     {noreply, State};
 
+handle_cast({reply_request, Status, ChannelId}, #state{connection_state =
+        #connection{channel_cache = Cache}} = State0) ->
+    State = case ssh_channel:cache_lookup(Cache, ChannelId) of
+        #channel{remote_id = RemoteId} ->
+            cm_message({Status, RemoteId}, State0);
+        undefined ->
+            State0
+    end,
+    {noreply, State};
+
 handle_cast({global_request, _, _, _, _} = Request, State0) ->
     State = handle_global_request(Request, State0),
     {noreply, State};
@@ -452,18 +496,6 @@ handle_cast({adjust_window, ChannelId, Bytes},
     end,
     {noreply, State};
 
-handle_cast({eof, ChannelId}, 
-	    #state{connection = Pid, connection_state = 
-		   #connection{channel_cache = Cache}} = State) ->
-    case ssh_channel:cache_lookup(Cache, ChannelId) of			 
-	#channel{remote_id = Id} ->
-	    send_msg({connection_reply, Pid, 
-		      ssh_connection:channel_eof_msg(Id)}),
-	    {noreply, State};
-	undefined -> 
-	    {noreply, State}
-    end;
-
 handle_cast({success, ChannelId},  #state{connection = Pid} = State) ->
     Msg = ssh_connection:channel_success_msg(ChannelId),
     send_msg({connection_reply, Pid, Msg}),
@@ -509,7 +541,10 @@ handle_info({start_connection, client,
 	    Pid ! {self(), not_connected, Reason},
 	    {stop, {shutdown, normal}, State}
     end;
-
+handle_info({check_cache, _ , _}, 
+	    #state{connection_state = 
+		       #connection{channel_cache = Cache}} = State) ->
+    {noreply, check_cache(State, Cache)};
 handle_info({ssh_cm, _Sender, Msg}, State0) ->
     %% Backwards compatibility!  
     State = cm_message(Msg, State0),
@@ -522,7 +557,7 @@ handle_info({same_user, _}, State) ->
 handle_info(ssh_connected, #state{role = client, client = Pid} 
 	    = State) ->
     Pid ! {self(), is_connected},
-    {noreply, State#state{connected = true}};
+    {noreply, State#state{connected = true, opts = handle_password(State#state.opts)}};
 
 handle_info(ssh_connected, #state{role = server} = State) ->
     {noreply, State#state{connected = true}};
@@ -535,6 +570,47 @@ handle_info({'DOWN', _Ref, process, ChannelPid, _Reason}, State) ->
 handle_info({'EXIT', _Sup, Reason}, State) ->
     {stop, Reason, State}.
 
+handle_password(Opts) ->
+    handle_rsa_password(handle_dsa_password(handle_normal_password(Opts))).
+handle_normal_password(Opts) ->
+    case proplists:get_value(ssh_opts, Opts, false) of
+	false ->
+	    Opts;
+	SshOpts ->
+	    case proplists:get_value(password, SshOpts, false) of
+		false ->
+		    Opts;
+		_Password ->
+		    NewOpts = [{password, undefined}|lists:keydelete(password, 1, SshOpts)],
+		    [{ssh_opts, NewOpts}|lists:keydelete(ssh_opts, 1, Opts)]
+	    end
+    end.
+handle_dsa_password(Opts) ->
+    case proplists:get_value(ssh_opts, Opts, false) of
+	false ->
+	    Opts;
+	SshOpts ->
+	    case proplists:get_value(dsa_pass_phrase, SshOpts, false) of
+		false ->
+		    Opts;
+		_Password ->
+		    NewOpts = [{dsa_pass_phrase, undefined}|lists:keydelete(dsa_pass_phrase, 1, SshOpts)],
+		    [{ssh_opts, NewOpts}|lists:keydelete(ssh_opts, 1, Opts)]
+	    end
+    end.
+handle_rsa_password(Opts) ->
+    case proplists:get_value(ssh_opts, Opts, false) of
+	false ->
+	    Opts;
+	SshOpts ->
+	    case proplists:get_value(rsa_pass_phrase, SshOpts, false) of
+		false ->
+		    Opts;
+		_Password ->
+		    NewOpts = [{rsa_pass_phrase, undefined}|lists:keydelete(rsa_pass_phrase, 1, SshOpts)],
+		    [{ssh_opts, NewOpts}|lists:keydelete(ssh_opts, 1, Opts)]
+	    end
+    end.
 %%--------------------------------------------------------------------
 %% Function: terminate(Reason, State) -> void()
 %% Description: This function is called by a gen_server when it is about to
@@ -566,6 +642,45 @@ code_change(_OldVsn, State, _Extra) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
+get_idle_time(SshOptions) ->
+    case proplists:get_value(idle_time, SshOptions) of
+	infinity ->
+	    infinity;
+       _IdleTime -> %% We dont want to set the timeout on first connect
+	    undefined
+    end.
+check_cache(State, Cache) ->
+    %% Check the number of entries in Cache
+    case proplists:get_value(size, ets:info(Cache)) of
+	0 ->
+	    Opts = proplists:get_value(ssh_opts, State#state.opts),
+	    case proplists:get_value(idle_time, Opts) of
+		infinity ->
+		    State;
+		undefined ->
+		    State;
+		Time ->
+		    case State#state.idle_timer_ref of
+			undefined ->
+			    TimerRef = erlang:send_after(Time, self(), {'EXIT', [], "Timeout"}),
+			    State#state{idle_timer_ref=TimerRef};
+			_ ->
+			    State
+		    end
+	    end;
+	_ ->
+	    State
+    end.
+remove_timer_ref(State) ->
+    case State#state.idle_timer_ref of
+	infinity -> %% If the timer is not activated
+	    State;
+	undefined -> %% If we already has cancelled the timer
+	    State;
+	TimerRef -> %% Timer is active
+	    erlang:cancel_timer(TimerRef),
+	    State#state{idle_timer_ref = undefined}
+    end.
 channel_data(Id, Type, Data, Connection0, ConnectionPid, From, State) ->
     case ssh_connection:channel_data(Id, Type, Data, Connection0,
 				     ConnectionPid, From) of
@@ -585,7 +700,7 @@ call(Pid, Msg, Timeout) ->
     catch
 	exit:{timeout, _} ->
 	    {error, timeout};
-	exit:{normal} ->
+	exit:{normal, _} ->
 	    {error, channel_closed};
 	exit:{{shutdown, _}, _} ->
 	    {error, channel_closed};
@@ -613,6 +728,8 @@ do_send_msg({connection_reply, Pid, Data}) ->
     ssh_connection_handler:send(Pid, Msg);
 do_send_msg({flow_control, Cache, Channel, From, Msg}) ->
     ssh_channel:cache_update(Cache, Channel#channel{flow_control = undefined}),
+    gen_server:reply(From, Msg);
+do_send_msg({flow_control, From, Msg}) ->
     gen_server:reply(From, Msg).
 
 handle_request(ChannelPid, ChannelId, Type, Data, WantReply, From, 
@@ -661,7 +778,7 @@ handle_channel_down(ChannelPid, #state{connection_state =
 		  (_,Acc) ->
 		       Acc
 	       end, [], Cache),
-    {{replies, []}, State}.
+    {{replies, []}, check_cache(State, Cache)}.
 
 update_sys(Cache, Channel, Type, ChannelPid) ->
     ssh_channel:cache_update(Cache, 
diff --git a/lib/ssh/src/ssh_connection_sup.erl b/lib/ssh/src/ssh_connection_sup.erl
index e3544af1c6..b620056310 100644
--- a/lib/ssh/src/ssh_connection_sup.erl
+++ b/lib/ssh/src/ssh_connection_sup.erl
@@ -48,8 +48,12 @@ start_manager_child(Sup, Args) ->
     supervisor:start_child(Sup, Spec).
 
 connection_manager(SupPid) -> 
-    Children = supervisor:which_children(SupPid),
-    {ok, ssh_connection_manager(Children)}.
+    try supervisor:which_children(SupPid) of
+	Children ->
+	    {ok, ssh_connection_manager(Children)}
+    catch exit:{noproc,_} ->
+	    {ok, undefined}
+    end.
 
 %%%=========================================================================
 %%%  Supervisor callback
@@ -107,6 +111,8 @@ handler_spec([Role, Socket, Opts]) ->
     Type = worker,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
+ssh_connection_manager([]) ->
+    undefined;
 ssh_connection_manager([{_, Child, _, [ssh_connection_manager]} | _]) ->
     Child;
 ssh_connection_manager([_ | Rest]) ->
diff --git a/lib/ssh/src/ssh_file.erl b/lib/ssh/src/ssh_file.erl
index d05fa8e09a..a6b82a7a13 100644
--- a/lib/ssh/src/ssh_file.erl
+++ b/lib/ssh/src/ssh_file.erl
@@ -232,7 +232,7 @@ lookup_host_key_fd(Fd, Host, KeyType) ->
 	eof ->
 	    {error, not_found};
 	Line ->
-	    case public_key:ssh_decode(Line, known_hosts) of
+	    case ssh_decode_line(Line, known_hosts) of
 		[{Key, Attributes}] ->
 		    handle_host(Fd, Host, proplists:get_value(hostnames, Attributes), Key, KeyType);
 		[] ->
@@ -240,6 +240,13 @@ lookup_host_key_fd(Fd, Host, KeyType) ->
 	    end
     end.
 
+ssh_decode_line(Line, Type) ->
+    try 
+	public_key:ssh_decode(Line, Type) 
+    catch _:_ ->
+	    []
+    end.
+
 handle_host(Fd, Host, HostList, Key, KeyType) ->
     Host1 = host_name(Host),
     case lists:member(Host1, HostList) and key_match(Key, KeyType) of
@@ -285,7 +292,7 @@ lookup_user_key_fd(Fd, Key) ->
 	eof ->
 	    {error, not_found};
 	Line ->
-	    case public_key:ssh_decode(Line, auth_keys) of
+	    case ssh_decode_line(Line, auth_keys) of
 		[{AuthKey, _}] ->
 		    case is_auth_key(Key, AuthKey) of
 			true ->
diff --git a/lib/ssh/src/ssh_io.erl b/lib/ssh/src/ssh_io.erl
index 1dbd097423..01fc713569 100644
--- a/lib/ssh/src/ssh_io.erl
+++ b/lib/ssh/src/ssh_io.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -23,37 +23,52 @@
 
 -module(ssh_io).
 
--export([yes_no/1, read_password/1, read_line/1, format/2]).
+-export([yes_no/2, read_password/2, read_line/2, format/2]).
 -import(lists, [reverse/1]).
+-include("ssh.hrl").
 
+read_line(Prompt, Ssh) ->
+    format("~s", [listify(Prompt)]),
+    proplists:get_value(user_pid, Ssh) ! {self(), question},
+    receive
+	Answer ->
+	    Answer
+    end.
 
-read_line(Prompt) when is_list(Prompt) ->
-    io:get_line(list_to_atom(Prompt));
-read_line(Prompt) when is_atom(Prompt) ->
-    io:get_line(Prompt).
-
-read_ln(Prompt) ->
-    trim(read_line(Prompt)).
-
-yes_no(Prompt) ->
+yes_no(Prompt, Ssh) ->
     io:format("~s [y/n]?", [Prompt]),
-    case read_ln('') of
-	"y" -> yes;
-	"n" -> no;
-	"Y" -> yes;
-	"N" -> no;
-	_ ->
-	    io:format("please answer y or n\n"),
-	    yes_no(Prompt)
+    proplists:get_value(user_pid, Ssh#ssh.opts) ! {self(), question},
+    receive
+	Answer ->
+	    case trim(Answer) of
+		"y" -> yes;
+		"n" -> no;
+		"Y" -> yes;
+		"N" -> no;
+		y -> yes;
+		n -> no;
+		_ ->
+		    io:format("please answer y or n\n"),
+		    yes_no(Prompt, Ssh)
+	    end
     end.
 
 
-read_password(Prompt) ->
+read_password(Prompt, Ssh) ->
     format("~s", [listify(Prompt)]),
-    case io:get_password() of
-	"" ->
-	    read_password(Prompt);
-	Pass -> Pass
+    case is_list(Ssh) of
+	false ->
+	    proplists:get_value(user_pid, Ssh#ssh.opts) ! {self(), user_password};
+	_ ->
+	    proplists:get_value(user_pid, Ssh) ! {self(), user_password}
+    end,
+    receive
+	Answer ->
+	    case Answer of
+		"" ->
+		    read_password(Prompt, Ssh);
+		Pass -> Pass
+	    end
     end.
 
 listify(A) when is_atom(A) ->
diff --git a/lib/ssh/src/ssh_sftpd_file_api.erl b/lib/ssh/src/ssh_sftpd_file_api.erl
index 38371f809d..83d90907f5 100644
--- a/lib/ssh/src/ssh_sftpd_file_api.erl
+++ b/lib/ssh/src/ssh_sftpd_file_api.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -22,40 +22,40 @@
 -module(ssh_sftpd_file_api).
 
 %% To be further specified later
--callback close(IoDevice::term(), State::term()) -> 
-    ok | {error, Reason::term()}.
--callback delete(Path::term(), State::term()) ->
-     ok | {error, Reason::term()}.
--callback del_dir(Path::term(), State::term()) ->
-    ok | {error, Reason::term()}.
+-callback close(file:io_device(), State::term()) ->
+    {ok, State::term()} | {{error, Reason::term()}, State::term()}.
+-callback delete(file:name(), State::term()) ->
+    {ok, State::term()} | {{error, Reason::term()}, State::term()}.
+-callback del_dir(file:name(), State::term()) ->
+    {ok, State::term()} | {{error, Reason::term()}, State::term()}.
 -callback get_cwd(State::term()) ->
-    {ok, Dir::term()} | {error, Reason::term()}.
--callback is_dir(AbsPath::term(), State::term()) ->
-    boolean().
--callback list_dir(AbsPath::term(), State::term()) ->
-    {ok, Filenames::term()} | {error, Reason::term()}.
+    {{ok, Dir::term()}, State::term()} | {{error, Reason::term()}, State::term()}.
+-callback is_dir(file:name(), State::term()) ->
+    {boolean(), State::term()}.
+-callback list_dir(file:name(), State::term()) ->
+    {{ok, Filenames::term()}, State::term()} | {{error, Reason::term()}, State::term()}.
 -callback make_dir(Dir::term(), State::term()) ->
-    ok | {error, Reason::term()}.
+    {{ok, State::term()},State::term()} | {{error, Reason::term()}, State::term()}.
 -callback make_symlink(Path2::term(), Path::term(), State::term()) ->
-    ok | {error, Reason::term()}.
+    {ok, State::term()} | {{error, Reason::term()}, State::term()}.
 -callback open(Path::term(), Flags::term(), State::term()) ->
-    {ok, IoDevice::term()} | {error, Reason::term()}.
--callback position(IoDevice::term(), Offs::term(), State::term()) ->
-    {ok, NewPosition::term()} | {error, Reason::term()}.
--callback read(IoDevice::term(), Len::term(), State::term()) ->
-    {ok, Data::term()} | eof | {error, Reason::term()}.
--callback read_link(Path::term(), State::term()) ->
-    {ok, FileName::term()} | {error, Reason::term()}.
--callback read_link_info(Path::term(), State::term()) ->
-    {ok, FileInfo::term()} | {error, Reason::term()}.
--callback read_file_info(Path::term(), State::term()) ->
-    {ok, FileInfo::term()} | {error, Reason::term()}.
--callback rename(Path::term(), Path2::term(), State::term()) ->
-    ok | {error, Reason::term()}.
--callback write(IoDevice::term(), Data::term(), State::term()) ->
-    ok | {error, Reason::term()}.
--callback write_file_info(Path::term(),Info::term(), State::term()) ->
-    ok | {error, Reason::term()}.
+    {{ok, IoDevice::term()}, State::term()} | {{error, Reason::term()}, State::term()}.
+-callback position(file:io_device(), Offs::term(), State::term()) ->
+    {{ok, NewPosition::term()}, State::term()} | {{error, Reason::term()}, State::term()}.
+-callback read(file:io_device(), Len::term(), State::term()) ->
+    {{ok, Data::term()},State::term()} | {eof, State::term()} | {{error, Reason::term()}, State::term()}.
+-callback read_link(file:name(), State::term()) ->
+    {{ok, FileName::term()}, State::term()} | {{error, Reason::term()}, State::term()}.
+-callback read_link_info(file:name(), State::term()) ->
+    {{ok, FileInfo::term()}, State::term()} | {{error, Reason::term()}, State::term()}.
+-callback read_file_info(file:name(), State::term()) ->
+    {{ok, FileInfo::term()}, State::term()} | {{error, Reason::term()},State::term()}.
+-callback rename(file:name(), file:name(), State::term()) ->
+    {ok, State::term()} | {{error, Reason::term()}, State::term()}.
+-callback write(file:io_device(), Data::term(), State::term()) ->
+    {ok, State::term()} | {{error, Reason::term()}, State::term()}.
+-callback write_file_info(file:name(),Info::term(), State::term()) ->
+    {ok, State::term()} | {{error, Reason::term()}, State::term()}.
 
 
 
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 1f912c9bdf..7f6e7d9946 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -133,7 +133,7 @@ kex_dh_gex_messages() ->
     ].
 
 yes_no(Ssh, Prompt)  ->
-    (Ssh#ssh.io_cb):yes_no(Prompt).
+    (Ssh#ssh.io_cb):yes_no(Prompt, Ssh).
 
 connect(ConnectionSup, Address, Port, SocketOpts, Opts) ->    
     Timeout = proplists:get_value(connect_timeout, Opts, infinity),
diff --git a/lib/ssh/test/Makefile b/lib/ssh/test/Makefile
index 145d5d2ad6..f5db31baee 100644
--- a/lib/ssh/test/Makefile
+++ b/lib/ssh/test/Makefile
@@ -36,7 +36,9 @@ MODULES= \
 	ssh_to_openssh_SUITE \
 	ssh_sftp_SUITE \
 	ssh_sftpd_SUITE \
-        ssh_sftpd_erlclient_SUITE
+	ssh_sftpd_erlclient_SUITE \
+	ssh_connection_SUITE \
+	ssh_echo_server
 
 HRL_FILES_NEEDED_IN_TEST= \
 	$(ERL_TOP)/lib/ssh/src/ssh.hrl \
@@ -110,11 +112,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) ssh.spec ssh.cover $(RELSYSDIR)
-	$(INSTALL_DATA) $(HRL_FILES_NEEDED_IN_TEST) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) ssh.spec ssh.cover "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(HRL_FILES_NEEDED_IN_TEST) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/ssh/test/ssh.spec.vxworks b/lib/ssh/test/ssh.spec.vxworks
deleted file mode 100644
index 81f665283c..0000000000
--- a/lib/ssh/test/ssh.spec.vxworks
+++ /dev/null
@@ -1,3 +0,0 @@
-{topcase, {dir, "../ssh_test"}}.
-{require_nodenames, 1}.
-%{skip, {M, F, "Not yet implemented"}}.
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index d66214d415..5fec7f0cd7 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -22,7 +22,6 @@
 -module(ssh_basic_SUITE).
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -30,78 +29,12 @@
 -define(NEWLINE, <<"\r\n">>).
 
 %%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initialization before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    case catch crypto:start() of
-	ok ->
-	    Config;
-	_Else ->
-	    {skip, "Crypto could not be started!"}
-    end.
 
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config) -> _
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after the whole suite
-%%--------------------------------------------------------------------
-end_per_suite(_Config) ->
-    ssh:stop(),
-    crypto:stop(),
-    ok.
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
-%%--------------------------------------------------------------------
-%% Function: init_per_testcase(TestCase, Config) -> Config
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Initialization before each test case
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%% Description: Initialization before each test case
-%%--------------------------------------------------------------------
-init_per_testcase(_TestCase, Config) ->
-    ssh:start(),
-    Config.
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
-%%--------------------------------------------------------------------
-
-end_per_testcase(TestCase, Config) when TestCase == server_password_option;
-					TestCase == server_userpassword_option ->
-    UserDir = filename:join(?config(priv_dir, Config), nopubkey),
-    ssh_test_lib:del_dirs(UserDir),
-    end_per_testcase(Config);
-end_per_testcase(_TestCase, Config) ->
-    end_per_testcase(Config).
-end_per_testcase(_Config) ->    
-    ssh:stop(),
-    ok.
-
-%%--------------------------------------------------------------------
-%% Function: all(Clause) -> TestCases
-%% Clause - atom() - suite | doc
-%% TestCases - [Case]
-%% Case - atom()
-%%   Name of a test case.
-%% Description: Returns a list of all test cases in this test suite
-%%--------------------------------------------------------------------
 all() -> 
     [app_test,
      {group, dsa_key},
@@ -109,18 +42,31 @@ all() ->
      {group, dsa_pass_key},
      {group, rsa_pass_key},
      {group, internal_error},
+     {group, idle_time},
      daemon_already_started,
-     server_password_option, server_userpassword_option,
+     server_password_option,
+     server_userpassword_option,
      close].
 
 groups() -> 
-    [{dsa_key, [], [exec, exec_compressed, shell, known_hosts]},
-     {rsa_key, [], [exec, exec_compressed, shell, known_hosts]},     
+    [{dsa_key, [], [send, exec, exec_compressed, shell, known_hosts, idle_time]},
+     {rsa_key, [], [send, exec, exec_compressed, shell, known_hosts, idle_time]},
      {dsa_pass_key, [], [pass_phrase]},
      {rsa_pass_key, [], [pass_phrase]},
      {internal_error, [], [internal_error]}
     ].
-
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    case catch crypto:start() of
+	ok ->
+	    Config;
+	_Else ->
+	    {skip, "Crypto could not be started!"}
+    end.
+end_per_suite(_Config) ->
+    ssh:stop(),
+    crypto:stop().
+%%--------------------------------------------------------------------
 init_per_group(dsa_key, Config) ->
     DataDir = ?config(data_dir, Config),
     PrivDir = ?config(priv_dir, Config),
@@ -173,23 +119,53 @@ end_per_group(internal_error, Config) ->
 
 end_per_group(_, Config) ->
     Config.
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    ssh:start(),
+    Config.
+
+end_per_testcase(TestCase, Config) when TestCase == server_password_option;
+					TestCase == server_userpassword_option ->
+    UserDir = filename:join(?config(priv_dir, Config), nopubkey),
+    ssh_test_lib:del_dirs(UserDir),
+    end_per_testcase(Config);
+end_per_testcase(_TestCase, Config) ->
+    end_per_testcase(Config).
+end_per_testcase(_Config) ->    
+    ssh:stop(),
+    ok.
 
-%% Test cases starts here.
 %%--------------------------------------------------------------------
-app_test(suite) ->
-    [];
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
 app_test(doc) ->
     ["Application consistency test."];
 app_test(Config) when is_list(Config) ->
     ?t:app_test(ssh),
     ok.
+%%--------------------------------------------------------------------
+misc_ssh_options(doc) ->
+    ["Test that we can set some misc options not tested elsewhere, "
+     "some options not yet present are not decided if we should support or "
+     "if they need thier own test case."];
+misc_ssh_options(Config) when is_list(Config) ->  
+    SystemDir = filename:join(?config(priv_dir, Config), system),
+    UserDir = ?config(priv_dir, Config),
+    
+    CMiscOpt0 = [{connecect_timeout, 1000}, {ip_v6_disabled, false}, {user_dir, UserDir}],
+    CMiscOpt1 = [{connecect_timeout, infinity}, {ip_v6_disabled, true}, {user_dir, UserDir}],
+    SMiscOpt0 =  [{ip_v6_disabled, false}, {user_dir, UserDir}, {system_dir, SystemDir}],
+    SMiscOpt1 =  [{ip_v6_disabled, true}, {user_dir, UserDir}, {system_dir, SystemDir}],
+    
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
 
+    basic_test([{client_opts, CMiscOpt0 ++ ClientOpts}, {server_opts, SMiscOpt0 ++ ServerOpts}]),
+    basic_test([{client_opts, CMiscOpt1 ++ ClientOpts}, {server_opts, SMiscOpt1 ++ ServerOpts}]).
+
+%%--------------------------------------------------------------------
 exec(doc) ->
     ["Test api function ssh_connection:exec"];
-
-exec(suite) ->
-    [];
-
 exec(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     SystemDir = filename:join(?config(priv_dir, Config), system),
@@ -210,7 +186,7 @@ exec(Config) when is_list(Config) ->
 	expected ->
 	    ok;
 	Other0 ->
-	    test_server:fail(Other0)
+	    ct:fail(Other0)
     end,
     ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId0),
 
@@ -224,7 +200,7 @@ exec(Config) when is_list(Config) ->
 	expected ->
 	    ok;
 	Other1 ->
-	    test_server:fail(Other1)
+	    ct:fail(Other1)
     end,
     ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId1),
     ssh:stop_daemon(Pid).
@@ -232,10 +208,6 @@ exec(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 exec_compressed(doc) ->
     ["Test that compression option works"];
-
-exec_compressed(suite) ->
-    [];
-
 exec_compressed(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     SystemDir = filename:join(?config(priv_dir, Config), system),
@@ -257,19 +229,35 @@ exec_compressed(Config) when is_list(Config) ->
 	expected ->
 	    ok;
 	Other ->
-	    test_server:fail(Other)
+	    ct:fail(Other)
     end,
     ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId),
     ssh:stop_daemon(Pid).
 
 %%--------------------------------------------------------------------
+idle_time(doc) ->
+    ["Idle timeout test"];
+idle_time(Config) ->
+    SystemDir = filename:join(?config(priv_dir, Config), system),
+    UserDir = ?config(priv_dir, Config),
 
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+					     {user_dir, UserDir},
+					     {failfun, fun ssh_test_lib:failfun/2}]),
+    ConnectionRef =
+	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user_dir, UserDir},
+					  {user_interaction, false}]),
+    {ok, Id} = ssh_connection:session_channel(ConnectionRef, 1000),
+    ssh_connection:close(ConnectionRef, Id),
+    receive
+    after 10000 ->
+	    {error,channel_closed} = ssh_connection:session_channel(ConnectionRef, 1000)
+    end,
+    ssh:stop_daemon(Pid).
+%%--------------------------------------------------------------------
 shell(doc) ->
     ["Test that ssh:shell/2 works"];
-
-shell(suite) ->
-    [];
-
 shell(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     SystemDir = filename:join(?config(priv_dir, Config), system),
@@ -277,76 +265,22 @@ shell(Config) when is_list(Config) ->
    
     {_Pid, _Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},{user_dir, UserDir},
 					       {failfun, fun ssh_test_lib:failfun/2}]),
-    test_server:sleep(500),
+    ct:sleep(500),
 
     IO = ssh_test_lib:start_io_server(),
     Shell = ssh_test_lib:start_shell(Port, IO, UserDir),
     receive
 	{'EXIT', _, _} ->
-	    test_server:fail(no_ssh_connection);  
+	    ct:fail(no_ssh_connection);  
 	ErlShellStart ->
-	    test_server:format("Erlang shell start: ~p~n", [ErlShellStart]),
+	    ct:pal("Erlang shell start: ~p~n", [ErlShellStart]),
 	    do_shell(IO, Shell)
     end.
     
-do_shell(IO, Shell) ->
-    receive
-	ErlPrompt0 ->
-	    test_server:format("Erlang prompt: ~p~n", [ErlPrompt0])
-    end,
-    IO ! {input, self(), "1+1.\r\n"},
-     receive
-	Echo0 ->
-	     test_server:format("Echo: ~p ~n", [Echo0])
-    end,
-    receive
-	?NEWLINE ->
-	    ok
-    end,
-    receive
-	Result0 = <<"2">> ->
-	    test_server:format("Result: ~p~n", [Result0])
-    end,
-    receive
-	?NEWLINE ->
-	    ok
-    end,
-    receive
-	ErlPrompt1 ->
-	    test_server:format("Erlang prompt: ~p~n", [ErlPrompt1])
-    end,
-    exit(Shell, kill),
-    %% Does not seem to work in the testserver!
-    %%   IO ! {input, self(), "q().\r\n"},
-    %%     receive
-    %% 	?NEWLINE ->
-    %% 	    ok
-    %%     end,
-    %%     receive
-    %% 	Echo1 ->
-    %% 	     test_server:format("Echo: ~p ~n", [Echo1])
-    %%     end,
-    %%     receive
-    %% 	?NEWLINE ->
-    %% 	    ok
-    %%     end,
-    %%     receive
-    %% 	Result1 ->
-    %% 	    test_server:format("Result: ~p~n", [Result1])
-    %%     end,
-    receive
-	{'EXIT', Shell, killed} ->
-	    ok
-    end.
-
 %%--------------------------------------------------------------------
 daemon_already_started(doc) ->
     ["Test that get correct error message if you try to start a daemon",
     "on an adress that already runs a daemon see also seq10667" ];
-
-daemon_already_started(suite) ->
-    [];
-
 daemon_already_started(Config) when is_list(Config) ->
     SystemDir = ?config(data_dir, Config),
     UserDir = ?config(priv_dir, Config),
@@ -363,8 +297,6 @@ daemon_already_started(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 server_password_option(doc) ->
     ["validate to server that uses the 'password' option"];
-server_password_option(suite) ->
-    [];
 server_password_option(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
@@ -390,7 +322,7 @@ server_password_option(Config) when is_list(Config) ->
 				 {user_interaction, false},
 				 {user_dir, UserDir}]),
     
-    test_server:format("Test of wrong password: Error msg: ~p ~n", [Reason]),
+    ct:pal("Test of wrong password: Error msg: ~p ~n", [Reason]),
 
     ssh:close(ConnectionRef),
     ssh:stop_daemon(Pid).
@@ -399,8 +331,6 @@ server_password_option(Config) when is_list(Config) ->
 
 server_userpassword_option(doc) ->
     ["validate to server that uses the 'password' option"];
-server_userpassword_option(suite) ->
-    [];
 server_userpassword_option(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
@@ -437,8 +367,6 @@ server_userpassword_option(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 known_hosts(doc) ->
     ["check that known_hosts is updated correctly"];
-known_hosts(suite) ->
-    [];
 known_hosts(Config) when is_list(Config) ->
     SystemDir = ?config(data_dir, Config),
     PrivDir = ?config(priv_dir, Config), 
@@ -466,10 +394,6 @@ known_hosts(Config) when is_list(Config) ->
 
 pass_phrase(doc) ->
     ["Test that we can use keyes protected by pass phrases"];
-
-pass_phrase(suite) ->
-    [];
-
 pass_phrase(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     SystemDir = filename:join(?config(priv_dir, Config), system),
@@ -491,30 +415,44 @@ pass_phrase(Config) when is_list(Config) ->
 
 internal_error(doc) ->
     ["Test that client does not hang if disconnects due to internal error"];
-
-internal_error(suite) ->
-    [];
-
 internal_error(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     SystemDir = filename:join(?config(priv_dir, Config), system),
     UserDir = ?config(priv_dir, Config),
     
-    {_Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
 					     {user_dir, UserDir},
 					     {failfun, fun ssh_test_lib:failfun/2}]),
     {error,"Internal error"} =
 	ssh:connect(Host, Port, [{silently_accept_hosts, true},
 				 {user_dir, UserDir},
-				 {user_interaction, false}]).
+				 {user_interaction, false}]),
+    ssh:stop_daemon(Pid).
 
 %%--------------------------------------------------------------------
-close(doc) ->
-    ["Simulate that we try to close an already closed connection"];
+send(doc) ->
+    ["Test ssh_connection:send/3"];
+send(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    SystemDir = filename:join(?config(priv_dir, Config), system),
+    UserDir = ?config(priv_dir, Config),
+
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+					     {user_dir, UserDir},
+					     {failfun, fun ssh_test_lib:failfun/2}]),
+    ConnectionRef =
+	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user_dir, UserDir},
+					  {user_interaction, false}]),
+    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
+    ok = ssh_connection:send(ConnectionRef, ChannelId, <<"Data">>),
+    ok = ssh_connection:send(ConnectionRef, ChannelId, << >>),
+    ssh:stop_daemon(Pid).
 
-close(suite) ->
-    [];
 
+%%--------------------------------------------------------------------
+close(doc) ->
+    ["Simulate that we try to close an already closed connection"];
 close(Config) when is_list(Config) ->
     SystemDir = ?config(data_dir, Config),
     PrivDir = ?config(priv_dir, Config), 
@@ -534,8 +472,65 @@ close(Config) when is_list(Config) ->
     exit(CM, {shutdown, normal}),
     ok = ssh:close(CM).
     
-
-
 %%--------------------------------------------------------------------
-%% Internal functions
+%% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
+  
+basic_test(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    
+    {Pid, Host, Port} = ssh_test_lib:daemon(ServerOpts),
+    {ok, CM} = ssh:connect(Host, Port, ClientOpts),
+    ok = ssh:close(CM),
+    ssh:stop_daemon(Pid).
+
+do_shell(IO, Shell) ->
+    receive
+	ErlPrompt0 ->
+	    ct:pal("Erlang prompt: ~p~n", [ErlPrompt0])
+    end,
+    IO ! {input, self(), "1+1.\r\n"},
+     receive
+	Echo0 ->
+	     ct:pal("Echo: ~p ~n", [Echo0])
+    end,
+    receive
+	?NEWLINE ->
+	    ok
+    end,
+    receive
+	Result0 = <<"2">> ->
+	    ct:pal("Result: ~p~n", [Result0])
+    end,
+    receive
+	?NEWLINE ->
+	    ok
+    end,
+    receive
+	ErlPrompt1 ->
+	    ct:pal("Erlang prompt: ~p~n", [ErlPrompt1])
+    end,
+    exit(Shell, kill).
+    %%Does not seem to work in the testserver!
+    %% 	IO ! {input, self(), "q().\r\n"},
+    %% receive
+    %%  	?NEWLINE ->
+    %%  	    ok
+    %% end,
+    %% receive
+    %%  	Echo1 ->
+    %% 	    ct:pal("Echo: ~p ~n", [Echo1])
+    %% end,
+    %% receive
+    %% 	?NEWLINE ->
+    %%  	    ok
+    %% end,
+    %% receive
+    %%  	Result1 ->
+    %%  	    ct:pal("Result: ~p~n", [Result1])
+    %%      end,
+    %% receive
+    %% 	{'EXIT', Shell, killed} ->
+    %% 	    ok
+    %% end.
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
new file mode 100644
index 0000000000..acaf3d6eeb
--- /dev/null
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -0,0 +1,313 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+-module(ssh_connection_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+
+-compile(export_all).
+
+-define(SSH_DEFAULT_PORT, 22).
+-define(EXEC_TIMEOUT, 10000).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [
+     {group, openssh_payload},
+     interrupted_send
+    ].
+groups() ->
+    [{openssh_payload, [], [simple_exec,
+			    small_cat,
+			    big_cat,
+			    send_after_exit
+			   ]}].
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    case catch crypto:start() of
+	ok ->
+	    Config;
+	_Else ->
+	    {skip, "Crypto could not be started!"}
+    end.
+
+end_per_suite(_Config) ->
+    crypto:stop().
+
+%%--------------------------------------------------------------------
+init_per_group(openssh_payload, _Config) ->
+    case gen_tcp:connect("localhost", 22, []) of
+	{error,econnrefused} ->
+	    {skip,"No openssh deamon"};
+	{ok, Socket} ->
+	    gen_tcp:close(Socket)
+     end;
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    ssh:start(),
+    Config.
+
+end_per_testcase(_Config) ->
+    ssh:stop().
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+simple_exec(doc) ->
+    ["Simple openssh connectivity test for ssh_connection:exec"];
+
+simple_exec(Config) when is_list(Config) ->
+    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
+							     {user_interaction, false}]),
+    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
+    success = ssh_connection:exec(ConnectionRef, ChannelId0,
+				  "echo testing", infinity),
+
+    %% receive response to input
+    receive
+	{ssh_cm, ConnectionRef, {data, ChannelId0, 0, <<"testing\n">>}} ->
+	    ok
+    end,
+
+    %% receive close messages
+    receive
+	{ssh_cm, ConnectionRef, {eof, ChannelId0}} ->
+	    ok
+    end,
+    receive
+	{ssh_cm, ConnectionRef, {exit_status, ChannelId0, 0}} ->
+	    ok
+    end,
+    receive
+	{ssh_cm, ConnectionRef,{closed, ChannelId0}} ->
+	    ok
+    end.
+
+%%--------------------------------------------------------------------
+small_cat(doc) ->
+    ["Use 'cat' to echo small data block back to us."];
+
+small_cat(Config) when is_list(Config) ->
+    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
+							     {user_interaction, false}]),
+    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
+    success = ssh_connection:exec(ConnectionRef, ChannelId0,
+				  "cat", infinity),
+
+    Data = <<"I like spaghetti squash">>,
+    ok = ssh_connection:send(ConnectionRef, ChannelId0, Data),
+    ok = ssh_connection:send_eof(ConnectionRef, ChannelId0),
+
+    %% receive response to input
+    receive
+	{ssh_cm, ConnectionRef, {data, ChannelId0, 0, Data}} ->
+	    ok
+    end,
+
+    %% receive close messages
+    receive
+	{ssh_cm, ConnectionRef, {eof, ChannelId0}} ->
+	    ok
+    end,
+    receive
+	{ssh_cm, ConnectionRef, {exit_status, ChannelId0, 0}} ->
+	    ok
+    end,
+    receive
+	{ssh_cm, ConnectionRef,{closed, ChannelId0}} ->
+	    ok
+    end.
+
+%%--------------------------------------------------------------------
+big_cat(doc) ->
+    ["Use 'cat' to echo large data block back to us."];
+
+big_cat(Config) when is_list(Config) ->
+    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
+							     {user_interaction, false}]),
+    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
+    success = ssh_connection:exec(ConnectionRef, ChannelId0,
+				  "cat", infinity),
+
+    %% build 10MB binary
+    Data = << <<X:32>> || X <- lists:seq(1,2500000)>>,
+
+    %% pre-adjust receive window so the other end doesn't block
+    ssh_connection:adjust_window(ConnectionRef, ChannelId0, size(Data)),
+
+    ct:pal("sending ~p byte binary~n",[size(Data)]),
+    ok = ssh_connection:send(ConnectionRef, ChannelId0, Data, 10000),
+    ok = ssh_connection:send_eof(ConnectionRef, ChannelId0),
+
+    %% collect echoed data until eof
+    case big_cat_rx(ConnectionRef, ChannelId0) of
+	{ok, Data} ->
+	    ok;
+	{ok, Other} ->
+	    case size(Data) =:= size(Other) of
+		true ->
+		    ct:pal("received and sent data are same"
+				       "size but do not match~n",[]);
+		false ->
+		    ct:pal("sent ~p but only received ~p~n",
+				       [size(Data), size(Other)])
+	    end,
+	    ct:fail(receive_data_mismatch);
+	Else ->
+	    ct:fail(Else)
+    end,
+
+    %% receive close messages (eof already consumed)
+    receive
+	{ssh_cm, ConnectionRef, {exit_status, ChannelId0, 0}} ->
+	    ok
+    end,
+    receive
+	{ssh_cm, ConnectionRef,{closed, ChannelId0}} ->
+	    ok
+    end.
+
+%%--------------------------------------------------------------------
+send_after_exit(doc) ->
+    ["Send channel data after the channel has been closed."];
+
+send_after_exit(Config) when is_list(Config) ->
+    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
+							     {user_interaction, false}]),
+    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
+
+    %% Shell command "false" will exit immediately
+    success = ssh_connection:exec(ConnectionRef, ChannelId0,
+				  "false", infinity),
+
+    timer:sleep(2000), %% Allow incoming eof/close/exit_status ssh messages to be processed
+
+    Data = <<"I like spaghetti squash">>,
+    case ssh_connection:send(ConnectionRef, ChannelId0, Data, 2000) of
+	{error, closed} -> ok;
+	ok ->
+	    ct:fail({expected,{error,closed}});
+	{error, timeout} ->
+	    ct:fail({expected,{error,closed}});
+	Else ->
+	    ct:fail(Else)
+    end,
+
+    %% receive close messages
+    receive
+	{ssh_cm, ConnectionRef, {eof, ChannelId0}} ->
+	    ok
+    end,
+    receive
+	{ssh_cm, ConnectionRef, {exit_status, ChannelId0, _}} ->
+	    ok
+    end,
+    receive
+	{ssh_cm, ConnectionRef,{closed, ChannelId0}} ->
+	    ok
+    end.
+%%--------------------------------------------------------------------
+interrupted_send(doc) ->
+    ["Use a subsystem that echos n char and then sends eof to cause a channel exit partway through a large send."];
+
+interrupted_send(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = ?config(data_dir, Config),
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					     {user_dir, UserDir},
+					     {password, "morot"},
+					     {subsystems, [{"echo_n", {ssh_echo_server, [4000000]}}]}]),
+
+    ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user, "foo"},
+					  {password, "morot"},
+					  {user_interaction, false},
+					  {user_dir, UserDir}]),
+
+    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
+
+    success = ssh_connection:subsystem(ConnectionRef, ChannelId, "echo_n", infinity),
+
+    %% build 10MB binary
+    Data = << <<X:32>> || X <- lists:seq(1,2500000)>>,
+
+    %% expect remote end to send us 4MB back
+    <<ExpectedData:4000000/binary, _/binary>> = Data,
+
+    %% pre-adjust receive window so the other end doesn't block
+    ssh_connection:adjust_window(ConnectionRef, ChannelId, size(ExpectedData) + 1),
+
+    case ssh_connection:send(ConnectionRef, ChannelId, Data, 10000) of
+	{error, closed} ->
+	    ok;
+	Msg ->
+	    ct:fail({expected,{error,closed}, got, Msg})
+    end,
+    receive_data(ExpectedData, ConnectionRef, ChannelId),
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid).
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+big_cat_rx(ConnectionRef, ChannelId) ->
+    big_cat_rx(ConnectionRef, ChannelId, []).
+
+big_cat_rx(ConnectionRef, ChannelId, Acc) ->
+    receive
+	{ssh_cm, ConnectionRef, {data, ChannelId, 0, Data}} ->
+	    %% ssh_connection:adjust_window(ConnectionRef, ChannelId, size(Data)),
+	    %% window was pre-adjusted, don't adjust again here
+	    big_cat_rx(ConnectionRef, ChannelId, [Data | Acc]);
+	{ssh_cm, ConnectionRef, {eof, ChannelId}} ->
+	    {ok, iolist_to_binary(lists:reverse(Acc))}
+    after ?EXEC_TIMEOUT ->
+	    timeout
+    end.
+
+receive_data(ExpectedData, ConnectionRef, ChannelId) ->
+    ExpectedData = collect_data(ConnectionRef, ChannelId).
+
+collect_data(ConnectionRef, ChannelId) ->
+    collect_data(ConnectionRef, ChannelId, []).
+
+collect_data(ConnectionRef, ChannelId, Acc) ->
+    receive
+	{ssh_cm, ConnectionRef, {data, ChannelId, 0, Data}} ->
+	    collect_data(ConnectionRef, ChannelId, [Data | Acc]);
+	{ssh_cm, ConnectionRef, {eof, ChannelId}} ->
+	    iolist_to_binary(lists:reverse(Acc))
+    after 5000 ->
+	    timeout
+    end.
diff --git a/lib/ssh/test/ssh_connection_SUITE_data/ssh_host_rsa_key b/lib/ssh/test/ssh_connection_SUITE_data/ssh_host_rsa_key
new file mode 100644
index 0000000000..6ae7ee023d
--- /dev/null
+++ b/lib/ssh/test/ssh_connection_SUITE_data/ssh_host_rsa_key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDCZX+4FBDwZIh9y/Uxee1VJnEXlowpz2yDKwj8semM4q843337
+zbNfxHmladB1lpz2NqyxI175xMIJuDxogyZdsOxGnFAzAnthR4dqL/RWRWzjaxSB
+6IAO9SPYVVlrpZ+1hsjLW79fwXK/yc8VdhRuWTeQiRgYY2ek8+OKbOqz4QIDAQAB
+AoGANmvJzJO5hkLuvyDZHKfAnGTtpifcR1wtSa9DjdKUyn8vhKF0mIimnbnYQEmW
+NUUb3gXCZLi9PvkpRSVRrASDOZwcjoU/Kvww163vBUVb2cOZfFhyn6o2Sk88Tt++
+udH3hdjpf9i7jTtUkUe+QYPsia+wgvvrmn4QrahLAH86+kECQQDx5gFeXTME3cnW
+WMpFz3PPumduzjqgqMMWEccX4FtQkMX/gyGa5UC7OHFyh0N/gSWvPbRHa8A6YgIt
+n8DO+fh5AkEAzbqX4DOn8NY6xJIi42q7l/2jIA0RkB6P7YugW5NblhqBZ0XDnpA5
+sMt+rz+K07u9XZtxgh1xi7mNfwY6lEAMqQJBAJBEauCKmRj35Z6OyeQku59SPsnY
++SJEREVvSNw2lH9SOKQQ4wPsYlTGbvKtNVZgAcen91L5MmYfeckYE/fdIZECQQCt
+64zxsTnM1I8iFxj/gP/OYlJBikrKt8udWmjaghzvLMEw+T2DExJyb9ZNeT53+UMB
+m6O+B/4xzU/djvp+0hbhAkAemIt+rA5kTmYlFndhpvzkSSM8a2EXsO4XIPgGWCTT
+tQKS/tTly0ADMjN/TVy11+9d6zcqadNVuHXHGtR4W0GR
+-----END RSA PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_echo_server.erl b/lib/ssh/test/ssh_echo_server.erl
new file mode 100644
index 0000000000..739aabe6fb
--- /dev/null
+++ b/lib/ssh/test/ssh_echo_server.erl
@@ -0,0 +1,71 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+%%% Description: Example ssh server
+-module(ssh_echo_server).
+-behaviour(ssh_channel).
+-record(state, {
+	  n,
+	  id,
+	  cm
+	 }).
+-export([init/1, handle_msg/2, handle_ssh_msg/2, terminate/2]).
+
+init([N]) ->
+    {ok, #state{n = N}}.
+
+handle_msg({ssh_channel_up, ChannelId, ConnectionManager}, State) ->
+    {ok, State#state{id = ChannelId,
+		     cm = ConnectionManager}}.
+
+handle_ssh_msg({ssh_cm, CM, {data, ChannelId, 0, Data}}, #state{n = N} = State) ->
+    M = N - size(Data),
+    case M > 0 of
+	true ->
+	    ssh_connection:send(CM, ChannelId, Data),
+	    {ok, State#state{n = M}};
+	false ->
+	    <<SendData:N/binary, _/binary>> = Data,
+	    ssh_connection:send(CM, ChannelId, SendData),
+	    ssh_connection:send_eof(CM, ChannelId),
+	    {stop, ChannelId, State}
+    end;
+handle_ssh_msg({ssh_cm, _ConnectionManager,
+		{data, _ChannelId, 1, Data}}, State) ->
+    error_logger:format("ssh: STDERR: ~s\n", [binary_to_list(Data)]),
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, _ConnectionManager, {eof, _ChannelId}}, State) ->
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, _, {signal, _, _}}, State) ->
+    %% Ignore signals according to RFC 4254 section 6.9.
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, _, {exit_signal, ChannelId, _, _Error, _}},
+	       State) ->
+    {stop, ChannelId,  State};
+
+handle_ssh_msg({ssh_cm, _, {exit_status, ChannelId, _Status}}, State) ->
+    {stop, ChannelId, State}.
+
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index d40b1d544d..232161d029 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -24,7 +24,6 @@
 -compile(export_all).
 
 -include_lib("common_test/include/ct.hrl").
-
 -include_lib("kernel/include/file.hrl").
 
 % Default timetrap timeout
@@ -33,16 +32,18 @@
 -define(USER, "Alladin").
 -define(PASSWD, "Sesame").
 
-%% Test server callback functions
 %%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initiation before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, erlang_server},
+     {group, openssh_server}].
+
+
 init_per_suite(Config) ->
     case (catch crypto:start()) of
 	ok ->
@@ -52,35 +53,58 @@ init_per_suite(Config) ->
 	    {skip,"Could not start crypto!"}
     end.
 
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config) -> _
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after the whole suite
-%%--------------------------------------------------------------------
 end_per_suite(Config) ->
     ssh:stop(),
     crypto:stop(),
     Config.
 
 %%--------------------------------------------------------------------
-%% Function: init_per_testcase(TestCase, Config) -> Config
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Initiation before each test case
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%% Description: Initiation before each test case
+groups() -> 
+    [{erlang_server, [], [open_close_file, open_close_dir, read_file, read_dir,
+			  write_file, rename_file, mk_rm_dir, remove_file, links,
+			  retrieve_attributes, set_attributes, async_read,
+			  async_write, position, pos_read, pos_write]},
+     {openssh_server, [], [open_close_file, open_close_dir, read_file, read_dir,
+			   write_file, rename_file, mk_rm_dir, remove_file, links,
+			   retrieve_attributes, set_attributes, async_read,
+			   async_write, position, pos_read, pos_write]}].
+     
+init_per_group(erlang_server, Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    SysDir =  ?config(data_dir, Config),
+    Sftpd = 		       
+	ssh_test_lib:daemon([{system_dir, SysDir},
+			     {user_dir, PrivDir},
+			     {user_passwords,
+			      [{?USER, ?PASSWD}]},
+			     {failfun,
+			      fun ssh_test_lib:failfun/2}]),
+    [{group, erlang_server}, {sftpd, Sftpd} | Config];
+
+init_per_group(openssh_server, Config) ->
+    Host = ssh_test_lib:hostname(),
+    case (catch ssh_sftp:start_channel(Host,					      
+				       [{user_interaction, false},
+					{silently_accept_hosts, true}])) of
+	{ok, _ChannelPid, Connection} ->
+	    ssh:close(Connection),
+	    [{group, openssh_server} | Config];
+	_ ->
+	    {skip, "No openssh server"} 
+    end.
+
+end_per_group(erlang_server, Config) ->
+    Config;
+end_per_group(_, Config) ->
+    Config.
+
 %%--------------------------------------------------------------------
+
 init_per_testcase(Case, Config) ->
     prep(Config),
     TmpConfig0 = lists:keydelete(watchdog, 1, Config),
     TmpConfig = lists:keydelete(sftp, 1, TmpConfig0),
-    Dog = test_server:timetrap(?default_timeout),
+    Dog = ct:timetrap(?default_timeout),
 
     case ?config(group, Config) of 
 	erlang_server ->
@@ -105,14 +129,6 @@ init_per_testcase(Case, Config) ->
 	    [{sftp, Sftp}, {watchdog, Dog} | TmpConfig]
     end.
 
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
-%%--------------------------------------------------------------------
 end_per_testcase(rename_file, Config) ->
     PrivDir = ?config(priv_dir, Config),
     NewFileName = filename:join(PrivDir, "test.txt"),
@@ -124,69 +140,13 @@ end_per_testcase(_, Config) ->
 end_per_testcase(Config) ->
     {Sftp, Connection} = ?config(sftp, Config),
     ssh_sftp:stop_channel(Sftp),
-    ssh:close(Connection),
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
+    ssh:close(Connection).
 
 %%--------------------------------------------------------------------
-%% Function: all(Clause) -> TestCases
-%% Clause - atom() - suite | doc
-%% TestCases - [Case]
-%% Case - atom()
-%%   Name of a test case.
-%% Description: Returns a list of all test cases in this test suite
-%%--------------------------------------------------------------------
-all() -> 
-    [{group, erlang_server},
-     {group, openssh_server}].
-
-groups() -> 
-    [{erlang_server, [], [open_close_file, open_close_dir, read_file, read_dir,
-			  write_file, rename_file, mk_rm_dir, remove_file, links,
-			  retrieve_attributes, set_attributes, async_read,
-			  async_write, position, pos_read, pos_write]},
-     {openssh_server, [], [open_close_file, open_close_dir, read_file, read_dir,
-			   write_file, rename_file, mk_rm_dir, remove_file, links,
-			   retrieve_attributes, set_attributes, async_read,
-			   async_write, position, pos_read, pos_write]}].
-     
-init_per_group(erlang_server, Config) ->
-    PrivDir = ?config(priv_dir, Config),
-    SysDir =  ?config(data_dir, Config),
-    Sftpd = 		       
-	ssh_test_lib:daemon([{system_dir, SysDir},
-			     {user_dir, PrivDir},
-			     {user_passwords,
-			      [{?USER, ?PASSWD}]},
-			     {failfun,
-			      fun ssh_test_lib:failfun/2}]),
-    [{group, erlang_server}, {sftpd, Sftpd} | Config];
-
-init_per_group(openssh_server, Config) ->
-    Host = ssh_test_lib:hostname(),
-    case (catch ssh_sftp:start_channel(Host,					      
-				       [{user_interaction, false},
-					{silently_accept_hosts, true}])) of
-	{ok, _ChannelPid, Connection} ->
-	    ssh:close(Connection),
-	    [{group, openssh_server} | Config];
-	_ ->
-	    {skip, "No openssh server"} 
-    end.
-
-end_per_group(erlang_server, Config) ->
-    Config;
-end_per_group(_, Config) ->
-    Config.
-
-
-%% Test cases starts here.
+%% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
 open_close_file(doc) ->
     ["Test API functions open/3 and close/2"];
-open_close_file(suite) ->
-    [];
 open_close_file(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "sftp.txt"),
@@ -198,21 +158,15 @@ open_close_file(Config) when is_list(Config) ->
     ok = open_close_file(Sftp, FileName, [write, creat]),
     ok = open_close_file(Sftp, FileName, [write, trunc]),
     ok = open_close_file(Sftp, FileName, [append]),
-    ok = open_close_file(Sftp, FileName, [read, binary]),
-
-    ok.
+    ok = open_close_file(Sftp, FileName, [read, binary]).
 
 open_close_file(Server, File, Mode) ->
     {ok, Handle} = ssh_sftp:open(Server, File, Mode),
-    ok = ssh_sftp:close(Server, Handle),
-    ok.
-
+    ok = ssh_sftp:close(Server, Handle).
 
 %%--------------------------------------------------------------------
 open_close_dir(doc) ->
     ["Test API functions opendir/2 and close/2"];
-open_close_dir(suite) ->
-    [];
 open_close_dir(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     {Sftp, _} = ?config(sftp, Config),
@@ -220,138 +174,92 @@ open_close_dir(Config) when is_list(Config) ->
 
     {ok, Handle} = ssh_sftp:opendir(Sftp, PrivDir),
     ok = ssh_sftp:close(Sftp, Handle),
-    {error, _} =  ssh_sftp:opendir(Sftp, FileName),
+    {error, _} =  ssh_sftp:opendir(Sftp, FileName).
 
-    ok.
 %%--------------------------------------------------------------------
 read_file(doc) ->
     ["Test API funtion read_file/2"];
-read_file(suite) ->
-    [];
 read_file(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "sftp.txt"),
-
     {Sftp, _} = ?config(sftp, Config),
-
     {ok, Data} = ssh_sftp:read_file(Sftp, FileName),
+    {ok, Data} = file:read_file(FileName).
 
-    {ok, Data} = file:read_file(FileName),
-
-    ok.
 %%--------------------------------------------------------------------
 read_dir(doc) ->
     ["Test API function list_dir/2"];
-read_dir(suite) ->
-    [];
 read_dir(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     {Sftp, _} = ?config(sftp, Config),
     {ok, Files} = ssh_sftp:list_dir(Sftp, PrivDir),
-    test_server:format("sftp list dir: ~p~n", [Files]),
-    ok.
+    ct:pal("sftp list dir: ~p~n", [Files]).
 
 %%--------------------------------------------------------------------
 write_file(doc) ->
     ["Test API function write_file/2"];
-write_file(suite) ->
-    [];
 write_file(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "sftp.txt"),
-
     {Sftp, _} = ?config(sftp, Config),
 
     Data = list_to_binary("Hej hopp!"),
-
     ssh_sftp:write_file(Sftp, FileName, [Data]),
-
-    {ok, Data} = file:read_file(FileName),
-
-    ok.
+    {ok, Data} = file:read_file(FileName).
 
 %%--------------------------------------------------------------------
 remove_file(doc) ->
     ["Test API function delete/2"];
-remove_file(suite) ->
-    [];
 remove_file(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "sftp.txt"),
-
     {Sftp, _} = ?config(sftp, Config),
 
     {ok, Files} = ssh_sftp:list_dir(Sftp, PrivDir),
-
     true = lists:member(filename:basename(FileName), Files),
-
     ok = ssh_sftp:delete(Sftp, FileName),
-
     {ok, NewFiles} = ssh_sftp:list_dir(Sftp, PrivDir),
-
     false = lists:member(filename:basename(FileName), NewFiles),
-
-    {error, _} = ssh_sftp:delete(Sftp, FileName),
-
-    ok.
-
+    {error, _} = ssh_sftp:delete(Sftp, FileName).
 %%--------------------------------------------------------------------
 rename_file(doc) ->
     ["Test API function rename_file/2"];
-rename_file(suite) ->
-    [];
 rename_file(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "sftp.txt"),
     NewFileName = filename:join(PrivDir, "test.txt"),
 
     {Sftp, _} = ?config(sftp, Config),
-
     {ok, Files} = ssh_sftp:list_dir(Sftp, PrivDir),
-
-    test_server:format("FileName: ~p, Files: ~p~n", [FileName, Files]),
-
+    ct:pal("FileName: ~p, Files: ~p~n", [FileName, Files]),
     true = lists:member(filename:basename(FileName), Files),
     false = lists:member(filename:basename(NewFileName), Files),
-
     ok = ssh_sftp:rename(Sftp, FileName, NewFileName),
-
     {ok, NewFiles} = ssh_sftp:list_dir(Sftp, PrivDir),
-
-    test_server:format("FileName: ~p, Files: ~p~n", [FileName, NewFiles]),
+    ct:pal("FileName: ~p, Files: ~p~n", [FileName, NewFiles]),
 
     false = lists:member(filename:basename(FileName), NewFiles),
-    true = lists:member(filename:basename(NewFileName), NewFiles),
-
-    ok.
+    true = lists:member(filename:basename(NewFileName), NewFiles).
 
 %%--------------------------------------------------------------------
 mk_rm_dir(doc) ->
     ["Test API functions make_dir/2, del_dir/2"];
-mk_rm_dir(suite) ->
-    [];
 mk_rm_dir(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     {Sftp, _} = ?config(sftp, Config),
+ 
     DirName = filename:join(PrivDir, "test"),
-
     ok = ssh_sftp:make_dir(Sftp, DirName),
     ok = ssh_sftp:del_dir(Sftp, DirName),
-
     NewDirName = filename:join(PrivDir, "foo/bar"),
-
     {error, _} = ssh_sftp:make_dir(Sftp, NewDirName),
-    {error, _} = ssh_sftp:del_dir(Sftp, PrivDir),
-
-    ok.
+    {error, _} = ssh_sftp:del_dir(Sftp, PrivDir).
 
 %%--------------------------------------------------------------------
 links(doc) ->
     ["Tests API function make_symlink/3"];
-links(suite) ->
-    [];
 links(Config) when is_list(Config) ->
-    case test_server:os_type() of
+    case os:type() of
 	{win32, _} ->
 	    {skip, "Links are not fully supported by windows"};
 	_ ->
@@ -361,74 +269,60 @@ links(Config) when is_list(Config) ->
 	    LinkFileName = filename:join(PrivDir, "link_test.txt"),
 
 	    ok = ssh_sftp:make_symlink(Sftp, LinkFileName, FileName),
-	    {ok, FileName} = ssh_sftp:read_link(Sftp, LinkFileName),
-	    ok
+	    {ok, FileName} = ssh_sftp:read_link(Sftp, LinkFileName)
     end.
 
 %%--------------------------------------------------------------------
 retrieve_attributes(doc) ->
     ["Test API function read_file_info/3"];
-retrieve_attributes(suite) ->
-    [];
 retrieve_attributes(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "sftp.txt"),
-    {Sftp, _} = ?config(sftp, Config),
 
+    {Sftp, _} = ?config(sftp, Config),
     {ok, FileInfo} = ssh_sftp:read_file_info(Sftp, FileName),
-
     {ok, NewFileInfo} = file:read_file_info(FileName),
 
     %% TODO comparison. There are some differences now is that ok?
-    test_server:format("SFTP: ~p   FILE: ~p~n", [FileInfo, NewFileInfo]),
-    ok.
+    ct:pal("SFTP: ~p   FILE: ~p~n", [FileInfo, NewFileInfo]).
 
 %%--------------------------------------------------------------------
 set_attributes(doc) ->
     ["Test API function write_file_info/3"];
-set_attributes(suite) ->
-    [];
 set_attributes(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "test.txt"),
-    {Sftp, _} = ?config(sftp, Config),
 
+    {Sftp, _} = ?config(sftp, Config),
     {ok,Fd} = file:open(FileName, write),
     io:put_chars(Fd,"foo"),
-
     ok = ssh_sftp:write_file_info(Sftp, FileName, #file_info{mode=8#400}),
     {error, eacces} = file:write_file(FileName, "hello again"),
     ssh_sftp:write_file_info(Sftp, FileName, #file_info{mode=8#600}),
-    ok = file:write_file(FileName, "hello again"),
-
-    ok.
+    ok = file:write_file(FileName, "hello again").
 
 %%--------------------------------------------------------------------
 
 async_read(doc) ->
     ["Test API aread/3"];
-async_read(suite) ->
-    [];
 async_read(Config) when is_list(Config) ->
     {Sftp, _} = ?config(sftp, Config),
     PrivDir =  ?config(priv_dir, Config),
+
     FileName = filename:join(PrivDir, "sftp.txt"),
     {ok, Handle} = ssh_sftp:open(Sftp, FileName, [read]),
     {async, Ref} = ssh_sftp:aread(Sftp, Handle, 20),
 
     receive
 	{async_reply, Ref, {ok, Data}} ->
-	    test_server:format("Data: ~p~n", [Data]),
+	    ct:pal("Data: ~p~n", [Data]),
 	    ok;
 	Msg ->
-	    test_server:fail(Msg)
-    end,
-    ok.
+	    ct:fail(Msg)
+    end.
 %%--------------------------------------------------------------------
 async_write(doc) ->
     ["Test API awrite/3"];
-async_write(suite) ->
-    [];
 async_write(Config) when is_list(Config) ->
     {Sftp, _} = ?config(sftp, Config),
     PrivDir =  ?config(priv_dir, Config),
@@ -441,16 +335,13 @@ async_write(Config) when is_list(Config) ->
 	{async_reply, Ref, ok} ->
 	    {ok, Data} = file:read_file(FileName);
 	Msg ->
-	    test_server:fail(Msg)
-    end,
-    ok.
+	    ct:fail(Msg)
+    end.
 
 %%--------------------------------------------------------------------
 
 position(doc) ->
     ["Test API functions position/3"];
-position(suite) ->
-    [];
 position(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "test.txt"),
@@ -458,7 +349,6 @@ position(Config) when is_list(Config) ->
 
     Data = list_to_binary("1234567890"),
     ssh_sftp:write_file(Sftp, FileName, [Data]),
-
     {ok, Handle} = ssh_sftp:open(Sftp, FileName, [read]),
 
     {ok, 3} = ssh_sftp:position(Sftp, Handle, {bof, 3}),
@@ -477,15 +367,11 @@ position(Config) when is_list(Config) ->
     {ok, "1"} = ssh_sftp:read(Sftp, Handle, 1),
 
     {ok, 1} = ssh_sftp:position(Sftp, Handle, cur),
-    {ok, "2"} = ssh_sftp:read(Sftp, Handle, 1),
-
-    ok.
+    {ok, "2"} = ssh_sftp:read(Sftp, Handle, 1).
 
 %%--------------------------------------------------------------------
 pos_read(doc) ->
     ["Test API functions pread/3 and apread/3"];
-pos_read(suite) ->
-    [];
 pos_read(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "test.txt"),
@@ -494,7 +380,6 @@ pos_read(Config) when is_list(Config) ->
     ssh_sftp:write_file(Sftp, FileName, [Data]),
 
     {ok, Handle} = ssh_sftp:open(Sftp, FileName, [read]),
-
     {async, Ref} = ssh_sftp:apread(Sftp, Handle, {bof, 5}, 4),
 
     NewData  = "opp!",
@@ -503,21 +388,17 @@ pos_read(Config) when is_list(Config) ->
 	{async_reply, Ref, {ok, NewData}} ->
 	    ok;
 	Msg ->
-	    test_server:fail(Msg)
+	    ct:fail(Msg)
     end,
 
     NewData1  = "hopp",
 
-    {ok, NewData1} = ssh_sftp:pread(Sftp, Handle, {bof, 4}, 4),
+    {ok, NewData1} = ssh_sftp:pread(Sftp, Handle, {bof, 4}, 4).
 
-    ok.
 %%--------------------------------------------------------------------
 pos_write(doc) ->
     ["Test API functions pwrite/4 and apwrite/4"];
-pos_write(suite) ->
-    [];
 pos_write(Config) when is_list(Config) ->
-
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "test.txt"),
     {Sftp, _} = ?config(sftp, Config),
@@ -533,17 +414,16 @@ pos_write(Config) when is_list(Config) ->
 	{async_reply, Ref, ok} ->
 	    ok;
 	Msg ->
-	    test_server:fail(Msg)
+	    ct:fail(Msg)
     end,
 
     ok = ssh_sftp:pwrite(Sftp, Handle, eof, list_to_binary("!")),
 
     NewData1 = list_to_binary("Bye, see you tomorrow!"),
-    {ok, NewData1} = ssh_sftp:read_file(Sftp, FileName),
+    {ok, NewData1} = ssh_sftp:read_file(Sftp, FileName).
 
-    ok.
-
-%% Internal functions
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
 prep(Config) ->
     PrivDir =  ?config(priv_dir, Config),
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index 695a7caa7d..b995eb9f0e 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -24,12 +24,10 @@
 -compile(export_all).
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
+-include_lib("kernel/include/file.hrl").
 -include("ssh_xfer.hrl").
 -include("ssh.hrl").
 
--include_lib("kernel/include/file.hrl").
-
 -define(USER, "Alladin").
 -define(PASSWD, "Sesame").
 -define(XFER_PACKET_SIZE, 32768).
@@ -41,16 +39,32 @@
 -define(is_set(F, Bits),
 	((F) band (Bits)) == (F)).
 
-%% Test server callback functions
 %%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initiation before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
+
+all() -> 
+    [open_close_file, 
+     open_close_dir, 
+     read_file, 
+     read_dir,
+     write_file, 
+     rename_file, 
+     mk_rm_dir, 
+     remove_file,
+     real_path, 
+     retrieve_attributes, 
+     set_attributes, 
+     links,
+     ver3_rename, 
+     relpath, 
+     sshd_read_file].
+
+groups() -> 
+    [].
+
+%%--------------------------------------------------------------------
+
 init_per_suite(Config) ->
     case (catch crypto:start()) of
 	ok ->
@@ -66,34 +80,24 @@ init_per_suite(Config) ->
 	    {skip,"Could not start crypto!"}
     end.
 
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config) -> _
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after the whole suite
-%%--------------------------------------------------------------------
 end_per_suite(Config) ->
     SysDir = ?config(priv_dir, Config),
     ssh_test_lib:clean_dsa(SysDir),
     UserDir = filename:join(?config(priv_dir, Config), nopubkey),
     file:del_dir(UserDir),
     ssh:stop(),
-    crypto:stop(),
-    ok.
+    crypto:stop().
 
 %%--------------------------------------------------------------------
-%% Function: init_per_testcase(TestCase, Config) -> Config
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Initiation before each test case
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%% Description: Initiation before each test case
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 %%--------------------------------------------------------------------
+
 init_per_testcase(TestCase, Config) ->
     ssh:start(),
     prep(Config),
@@ -138,56 +142,22 @@ init_per_testcase(TestCase, Config) ->
     {ok, <<?SSH_FXP_VERSION, ?UINT32(Version), _Ext/binary>>, _}
 	= reply(Cm, Channel),
 
-    test_server:format("Client: ~p Server ~p~n", [ProtocolVer, Version]),
+    ct:pal("Client: ~p Server ~p~n", [ProtocolVer, Version]),
 
     [{sftp, {Cm, Channel}}, {sftpd, Sftpd }| Config].
 
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
-%%--------------------------------------------------------------------
 end_per_testcase(_TestCase, Config) ->
     ssh_sftpd:stop(?config(sftpd, Config)),
     {Cm, Channel} = ?config(sftp, Config),
     ssh_connection:close(Cm, Channel),
     ssh:close(Cm),
-    ssh:stop(),
-    ok.
+    ssh:stop().
 
 %%--------------------------------------------------------------------
-%% Function: all(Clause) -> TestCases
-%% Clause - atom() - suite | doc
-%% TestCases - [Case]
-%% Case - atom()
-%%   Name of a test case.
-%% Description: Returns a list of all test cases in this test suite
-%%--------------------------------------------------------------------
-all() -> 
-    [open_close_file, open_close_dir, read_file, read_dir,
-     write_file, rename_file, mk_rm_dir, remove_file,
-     real_path, retrieve_attributes, set_attributes, links,
-     ver3_rename_OTP_6352, seq10670, sshd_read_file].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
-%% Test cases starts here.
+%% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
 open_close_file(doc) ->
     ["Test SSH_FXP_OPEN and SSH_FXP_CLOSE commands"];
-open_close_file(suite) ->
-    [];
 open_close_file(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "test.txt"),
@@ -214,15 +184,11 @@ open_close_file(Config) when is_list(Config) ->
 	  ?UINT32(?SSH_FX_FAILURE), _/binary>>, _} =
 	open_file(PrivDir, Cm, Channel, NewReqId1,
 		  ?ACE4_READ_DATA  bor ?ACE4_READ_ATTRIBUTES,
-		  ?SSH_FXF_OPEN_EXISTING),
-
-    ok.
+		  ?SSH_FXF_OPEN_EXISTING).
 
 %%--------------------------------------------------------------------
 open_close_dir(doc) ->
     ["Test SSH_FXP_OPENDIR and SSH_FXP_CLOSE commands"];
-open_close_dir(suite) ->
-    [];
 open_close_dir(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     {Cm, Channel} = ?config(sftp, Config),
@@ -250,8 +216,6 @@ open_close_dir(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 read_file(doc) ->
     ["Test SSH_FXP_READ command"];
-read_file(suite) ->
-    [];
 read_file(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "test.txt"),
@@ -270,28 +234,22 @@ read_file(Config) when is_list(Config) ->
 	  Data/binary>>, _} =
 	read_file(Handle, 100, 0, Cm, Channel, NewReqId),
 
-    {ok, Data} = file:read_file(FileName),
+    {ok, Data} = file:read_file(FileName).
 
-    ok.
 %%--------------------------------------------------------------------
 read_dir(doc) ->
     ["Test SSH_FXP_READDIR command"];
-read_dir(suite) ->
-    [];
 read_dir(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     {Cm, Channel} = ?config(sftp, Config),
     ReqId = 0,
     {ok, <<?SSH_FXP_HANDLE, ?UINT32(ReqId), Handle/binary>>, _} =
 	open_dir(PrivDir, Cm, Channel, ReqId),
-    ok = read_dir(Handle, Cm, Channel, ReqId),
-    ok.
+    ok = read_dir(Handle, Cm, Channel, ReqId).
 
 %%--------------------------------------------------------------------
 write_file(doc) ->
     ["Test SSH_FXP_WRITE command"];
-write_file(suite) ->
-    [];
 write_file(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "test.txt"),
@@ -311,15 +269,11 @@ write_file(Config) when is_list(Config) ->
 	  _/binary>>, _}
 	= write_file(Handle, Data, 0, Cm, Channel, NewReqId),
 
-    {ok, Data} = file:read_file(FileName),
-
-    ok.
+    {ok, Data} = file:read_file(FileName).
 
 %%--------------------------------------------------------------------
 remove_file(doc) ->
     ["Test SSH_FXP_REMOVE command"];
-remove_file(suite) ->
-    [];
 remove_file(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "test.txt"),
@@ -336,15 +290,11 @@ remove_file(Config) when is_list(Config) ->
 
     {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId),
 	  ?UINT32(?SSH_FX_FAILURE), _/binary>>, _} =
-	remove(PrivDir, Cm, Channel, NewReqId),
-
-    ok.
+	remove(PrivDir, Cm, Channel, NewReqId).
 
 %%--------------------------------------------------------------------
 rename_file(doc) ->
     ["Test SSH_FXP_RENAME command"];
-rename_file(suite) ->
-    [];
 rename_file(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "test.txt"),
@@ -377,15 +327,11 @@ rename_file(Config) when is_list(Config) ->
     {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId2),
 	  ?UINT32(?SSH_FX_OP_UNSUPPORTED), _/binary>>, _} =
 	rename(FileName, NewFileName, Cm, Channel, NewReqId2, 6,
-	       ?SSH_FXP_RENAME_ATOMIC),
-
-    ok.
+	       ?SSH_FXP_RENAME_ATOMIC).
 
 %%--------------------------------------------------------------------
 mk_rm_dir(doc) ->
     ["Test SSH_FXP_MKDIR and SSH_FXP_RMDIR command"];
-mk_rm_dir(suite) ->
-    [];
 mk_rm_dir(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     {Cm, Channel} = ?config(sftp, Config),
@@ -404,16 +350,13 @@ mk_rm_dir(Config) when is_list(Config) ->
 
     NewReqId2 = 3,
     {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId2), ?UINT32(?SSH_FX_NO_SUCH_FILE),
-	    _/binary>>, _} = rmdir(DirName, Cm, Channel, NewReqId2),
+	    _/binary>>, _} = rmdir(DirName, Cm, Channel, NewReqId2).
 
-    ok.
 %%--------------------------------------------------------------------
 real_path(doc) ->
     ["Test SSH_FXP_REALPATH command"];
-real_path(suite) ->
-    [];
 real_path(Config) when is_list(Config) ->
-    case test_server:os_type() of
+    case os:type() of
 	{win32, _} ->
 	    {skip,  "Not a relevant test on windows"};
 	_ ->
@@ -432,20 +375,16 @@ real_path(Config) when is_list(Config) ->
 	    RealPath = filename:absname(binary_to_list(Path)),
 	    AbsPrivDir = filename:absname(PrivDir),
 
-	    test_server:format("Path: ~p PrivDir: ~p~n", [RealPath, AbsPrivDir]),
-
-	    true = RealPath == AbsPrivDir,
+	    ct:pal("Path: ~p PrivDir: ~p~n", [RealPath, AbsPrivDir]),
 
-	    ok
+	    true = RealPath == AbsPrivDir
     end.
 
 %%--------------------------------------------------------------------
 links(doc) ->
     [];
-links(suite) ->
-    [];
 links(Config) when is_list(Config) ->
-    case test_server:os_type() of
+    case os:type() of
 	{win32, _} ->
 	    {skip, "Links are not fully supported by windows"};
 	_ ->
@@ -467,15 +406,12 @@ links(Config) when is_list(Config) ->
 
 	    true = binary_to_list(Path) == FileName,
 
-	    test_server:format("Path: ~p~n", [binary_to_list(Path)]),
-	    ok
+	    ct:pal("Path: ~p~n", [binary_to_list(Path)])
     end.
 
 %%--------------------------------------------------------------------
 retrieve_attributes(doc) ->
     ["Test SSH_FXP_STAT, SSH_FXP_LSTAT AND SSH_FXP_FSTAT commands"];
-retrieve_attributes(suite) ->
-    [];
 retrieve_attributes(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "test.txt"),
@@ -536,16 +472,13 @@ retrieve_attributes(Config) when is_list(Config) ->
 
 			  Owner = list_to_integer(binary_to_list(BinOwner)),
 			  Group =  list_to_integer(binary_to_list(BinGroup))
-		  end, AttrValues),
+		  end, AttrValues).
 
-    ok.
 %%--------------------------------------------------------------------
 set_attributes(doc) ->
     ["Test SSH_FXP_SETSTAT AND SSH_FXP_FSETSTAT commands"];
-set_attributes(suite) ->
-    [];
 set_attributes(Config) when is_list(Config) ->
-    case test_server:os_type() of
+    case os:type() of
 	{win32, _} ->
 	    {skip,  "Known error bug in erts file:read_file_info"};
 	_ ->
@@ -574,10 +507,10 @@ set_attributes(Config) when is_list(Config) ->
 	    %% Can not test that NewPermissions = Permissions as
 	    %% on Unix platforms, other bits than those listed in the
 	    %% API may be set.
-	    test_server:format("Org: ~p New: ~p~n", [OrigPermissions, NewPermissions]),
+	    ct:pal("Org: ~p New: ~p~n", [OrigPermissions, NewPermissions]),
 	    true = OrigPermissions =/= NewPermissions,
 
-	    test_server:format("Try to open the file"),
+	    ct:pal("Try to open the file"),
 	    NewReqId = 2,
 	    {ok, <<?SSH_FXP_HANDLE, ?UINT32(NewReqId), Handle/binary>>, _} =
 		open_file(FileName, Cm, Channel, NewReqId,
@@ -589,25 +522,20 @@ set_attributes(Config) when is_list(Config) ->
 
 	    NewReqId1 = 3,
 
-	    test_server:format("Set original permissions on the now open file"),
+	    ct:pal("Set original permissions on the now open file"),
 
 	    {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId1),
 		   ?UINT32(?SSH_FX_OK), _/binary>>, _} =
 		set_attributes_open_file(Handle, NewAtters, Cm, Channel, NewReqId1),
 
 	    {ok, NewFileInfo1} = file:read_file_info(FileName),
-	    OrigPermissions = NewFileInfo1#file_info.mode,
-	    ok
+	    OrigPermissions = NewFileInfo1#file_info.mode
     end.
 
 %%--------------------------------------------------------------------
-ver3_rename_OTP_6352(doc) ->
-    ["Test that ver3 rename message is handled"];
-
-ver3_rename_OTP_6352(suite) ->
-    [];
-
-ver3_rename_OTP_6352(Config) when is_list(Config) ->
+ver3_rename(doc) ->
+    ["Test that ver3 rename message is handled OTP 6352"];
+ver3_rename(Config) when is_list(Config) ->
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(PrivDir, "test.txt"),
     NewFileName = filename:join(PrivDir, "test1.txt"),
@@ -616,22 +544,16 @@ ver3_rename_OTP_6352(Config) when is_list(Config) ->
 
     {ok, <<?SSH_FXP_STATUS, ?UINT32(ReqId),
 	  ?UINT32(?SSH_FX_OK), _/binary>>, _} =
-	rename(FileName, NewFileName, Cm, Channel, ReqId, 3, 0),
-
-    ok.
+	rename(FileName, NewFileName, Cm, Channel, ReqId, 3, 0).
 
 %%--------------------------------------------------------------------
-seq10670(doc) ->
-    ["Check that realpath works ok"];
-
-seq10670(suite) ->
-    [];
-
-seq10670(Config) when is_list(Config) ->
+relpath(doc) ->
+    ["Check that realpath works ok seq10670"];
+relpath(Config) when is_list(Config) ->
     ReqId = 0,
     {Cm, Channel} = ?config(sftp, Config),
 
-    case test_server:os_type() of
+    case os:type() of
 	{win32, _} ->
 	    {skip,  "Not a relevant test on windows"};
 	_ ->
@@ -644,11 +566,34 @@ seq10670(Config) when is_list(Config) ->
 	    {ok, <<?SSH_FXP_NAME, ?UINT32(ReqId), ?UINT32(_), ?UINT32(Len),
 		  Path:Len/binary, _/binary>>, _}
 		= real_path("/usr/bin/../..", Cm, Channel, ReqId),
-
 	    Root = Path
     end.
 
-%% Internal functions
+%%--------------------------------------------------------------------
+sshd_read_file(doc) ->
+    ["Test SSH_FXP_READ command, using sshd-server"];
+sshd_read_file(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    FileName = filename:join(PrivDir, "test.txt"),
+
+    ReqId = 0,
+    {Cm, Channel} = ?config(sftp, Config),
+
+    {ok, <<?SSH_FXP_HANDLE, ?UINT32(ReqId), Handle/binary>>, _} =
+	open_file(FileName, Cm, Channel, ReqId,
+		  ?ACE4_READ_DATA  bor ?ACE4_READ_ATTRIBUTES,
+		  ?SSH_FXF_OPEN_EXISTING),
+
+    NewReqId = 1,
+
+    {ok, <<?SSH_FXP_DATA, ?UINT32(NewReqId), ?UINT32(_Length),
+	  Data/binary>>, _} =
+	read_file(Handle, 100, 0, Cm, Channel, NewReqId),
+
+    {ok, Data} = file:read_file(FileName).
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
 prep(Config) ->
     PrivDir =  ?config(priv_dir, Config),
@@ -684,7 +629,7 @@ reply(Cm, Channel, RBuf) ->
 	{ssh_cm, Cm, {closed, Channel}} ->
 	    closed;
 	{ssh_cm, Cm, Msg} ->
-	    test_server:fail(Msg)
+	    ct:fail(Msg)
     end.
 
 
@@ -778,7 +723,7 @@ read_dir(Handle, Cm, Channel, ReqId) ->
     case reply(Cm, Channel) of
 	{ok, <<?SSH_FXP_NAME, ?UINT32(ReqId), ?UINT32(Count),
 	       ?UINT32(Len), Listing:Len/binary, _/binary>>, _} ->
-	    test_server:format("Count: ~p Listing: ~p~n",
+	    ct:pal("Count: ~p Listing: ~p~n",
 			       [Count, binary_to_list(Listing)]),
 	    read_dir(Handle, Cm, Channel, ReqId);
 	{ok, <<?SSH_FXP_STATUS, ?UINT32(ReqId),
@@ -921,32 +866,5 @@ encode_file_type(Type) ->
 	undefined -> ?SSH_FILEXFER_TYPE_UNKNOWN
     end.
 
-%%--------------------------------------------------------------------
-sshd_read_file(doc) ->
-    ["Test SSH_FXP_READ command, using sshd-server"];
-sshd_read_file(suite) ->
-    [];
-sshd_read_file(Config) when is_list(Config) ->
-    PrivDir =  ?config(priv_dir, Config),
-    FileName = filename:join(PrivDir, "test.txt"),
-
-    ReqId = 0,
-    {Cm, Channel} = ?config(sftp, Config),
-
-    {ok, <<?SSH_FXP_HANDLE, ?UINT32(ReqId), Handle/binary>>, _} =
-	open_file(FileName, Cm, Channel, ReqId,
-		  ?ACE4_READ_DATA  bor ?ACE4_READ_ATTRIBUTES,
-		  ?SSH_FXF_OPEN_EXISTING),
-
-    NewReqId = 1,
-
-    {ok, <<?SSH_FXP_DATA, ?UINT32(NewReqId), ?UINT32(_Length),
-	  Data/binary>>, _} =
-	read_file(Handle, 100, 0, Cm, Channel, NewReqId),
-
-    {ok, Data} = file:read_file(FileName),
-
-    ok.
-
 not_default_permissions() ->
     8#600. %% User read-write-only
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index 4c469ed5f7..7fc2312661 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -24,24 +24,31 @@
 -compile(export_all).
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
-
 -include_lib("kernel/include/file.hrl").
 
 -define(USER, "Alladin").
 -define(PASSWD, "Sesame").
 -define(SSH_MAX_PACKET_SIZE, 32768).
 
-%% Test server callback functions
 %%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initiation before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [close_file, 
+     quit, 
+     file_cb,
+     root_dir, 
+     list_dir_limited].
+
+groups() -> 
+    [].
+
+%%--------------------------------------------------------------------
+
 init_per_suite(Config) ->
     catch ssh:stop(),
     case catch crypto:start() of
@@ -60,12 +67,6 @@ init_per_suite(Config) ->
 	    {skip,"Could not start ssh!"}
     end.
 
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config) -> _
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after the whole suite
-%%--------------------------------------------------------------------
 end_per_suite(Config) -> 
     UserDir = filename:join(?config(priv_dir, Config), nopubkey),
     file:del_dir(UserDir),
@@ -75,18 +76,14 @@ end_per_suite(Config) ->
     ok.
 
 %%--------------------------------------------------------------------
-%% Function: init_per_testcase(TestCase, Config) -> Config
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Initiation before each test case
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%% Description: Initiation before each test case
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
 %%--------------------------------------------------------------------
+
 init_per_testcase(TestCase, Config) ->
     ssh:start(),
     PrivDir = ?config(priv_dir, Config),
@@ -132,53 +129,21 @@ init_per_testcase(TestCase, Config) ->
     NewConfig = lists:keydelete(sftpd, 1, TmpConfig),
     [{port, Port}, {sftp, {ChannelPid, Connection}}, {sftpd, Sftpd} | NewConfig].
 
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
-%%--------------------------------------------------------------------
 end_per_testcase(_TestCase, Config) ->
     catch ssh_sftpd:stop(?config(sftpd, Config)),
     {Sftp, Connection} = ?config(sftp, Config),
     catch ssh_sftp:stop_channel(Sftp),
     catch ssh:close(Connection),
-    ssh:stop(),
-    ok.
+    ssh:stop().
 
 %%--------------------------------------------------------------------
-%% Function: all(Clause) -> TestCases
-%% Clause - atom() - suite | doc
-%% TestCases - [Case]
-%% Case - atom()
-%%   Name of a test case.
-%% Description: Returns a list of all test cases in this test suite
-%%--------------------------------------------------------------------
-all() -> 
-    [close_file_OTP_6350, quit_OTP_6349, file_cb_OTP_6356,
-     root_dir, list_dir_limited].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-%% Test cases starts here.
+%% Test cases starts here. -------------------------------------------
 %%--------------------------------------------------------------------
-close_file_OTP_6350(doc) ->
+close_file(doc) ->
     ["Test that sftpd closes its fildescriptors after compleating the "
-     "transfer"];
-
-close_file_OTP_6350(suite) ->
-    [];
+     "transfer OTP-6350"];
 
-close_file_OTP_6350(Config) when is_list(Config) ->
+close_file(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
     FileName = filename:join(DataDir, "test.txt"),
 
@@ -186,28 +151,20 @@ close_file_OTP_6350(Config) when is_list(Config) ->
 
     NumOfPorts = length(erlang:ports()),
 
-    test_server:format("Number of open ports:  ~p~n", [NumOfPorts]),
+    ct:pal("Number of open ports:  ~p~n", [NumOfPorts]),
 
     {ok, <<_/binary>>} = ssh_sftp:read_file(Sftp, FileName),
 
-    NumOfPorts = length(erlang:ports()),
-
-    test_server:format("Number of open ports:  ~p~n",
-		       [length(erlang:ports())]),
-
-    ok.
+    NumOfPorts = length(erlang:ports()).
 
 %%--------------------------------------------------------------------
 
-quit_OTP_6349(doc) ->
+quit(doc) ->
     [" When the sftp client ends the session the "
      "server will now behave correctly and not leave the "
-     "client hanging."];
-
-quit_OTP_6349(suite) ->
-    [];
+     "client hanging. OTP-6349"];
 
-quit_OTP_6349(Config) when is_list(Config) ->
+quit(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
     FileName = filename:join(DataDir, "test.txt"),
     UserDir = ?config(priv_dir, Config), 
@@ -230,19 +187,15 @@ quit_OTP_6349(Config) when is_list(Config) ->
 
     {ok, <<_/binary>>} = ssh_sftp:read_file(NewSftp, FileName),
 
-    ok = ssh_sftp:stop_channel(NewSftp),
-    ok.
+    ok = ssh_sftp:stop_channel(NewSftp).
 
 %%--------------------------------------------------------------------
 
-file_cb_OTP_6356(doc) ->
+file_cb(doc) ->
     ["Test that it is possible to change the callback module for"
-    " the sftpds filehandling."];
-
-file_cb_OTP_6356(suite) ->
-    [];
+    " the sftpds filehandling. OTP-6356"];
 
-file_cb_OTP_6356(Config) when is_list(Config) ->
+file_cb(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
     PrivDir =  ?config(priv_dir, Config),
     FileName = filename:join(DataDir, "test.txt"),
@@ -283,13 +236,11 @@ file_cb_OTP_6356(Config) when is_list(Config) ->
     ok = ssh_sftp:del_dir(Sftp, NewDir),
     alt_file_handler_check(alt_read_link_info),
     alt_file_handler_check(alt_write_file_info),
-    alt_file_handler_check(alt_del_dir),
-    ok.
+    alt_file_handler_check(alt_del_dir).
+%%--------------------------------------------------------------------
 
 root_dir(doc) ->
     [""];
-root_dir(suite) ->
-    [];
 root_dir(Config) when is_list(Config) ->
     {Sftp, _} = ?config(sftp, Config),
     FileName = "test.txt",
@@ -298,26 +249,27 @@ root_dir(Config) when is_list(Config) ->
     {ok, Bin} = ssh_sftp:read_file(Sftp, FileName),
     {ok, Listing} =
 	ssh_sftp:list_dir(Sftp, "."),
-    test_server:format("Listing: ~p~n", [Listing]),
-    ok.
+    ct:pal("Listing: ~p~n", [Listing]).
 
+%%--------------------------------------------------------------------
 list_dir_limited(doc) ->
     [""];
-list_dir_limited(suite) ->
-    [];
 list_dir_limited(Config) when is_list(Config) ->
     {Sftp, _} = ?config(sftp, Config),
     {ok, Listing} =
 	ssh_sftp:list_dir(Sftp, "."),
-    test_server:format("Listing: ~p~n", [Listing]),
-    ok.
+    ct:pal("Listing: ~p~n", [Listing]).
 
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+ 
 alt_file_handler_check(Msg) ->
     receive
 	Msg ->
 	    ok;
 	Other ->
-	    test_server:fail({Msg, Other})
+	    ct:fail({Msg, Other})
     after 10000 ->
-	    test_server:fail("Not alt file handler")
+	    ct:fail("Not alt file handler")
     end.
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 609663c87a..6ed3dfa68c 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -25,8 +25,7 @@
 -compile(export_all).
 
 -include_lib("public_key/include/public_key.hrl").
--include("test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(TIMEOUT, 50000).
 
@@ -129,16 +128,16 @@ reply(TestCase, Result) ->
     TestCase ! Result.
 
 receive_exec_result(Msg) ->
-    test_server:format("Expect data! ~p", [Msg]),
+    ct:pal("Expect data! ~p", [Msg]),
     receive
 	{ssh_cm,_,{data,_,1, Data}} ->
-	    test_server:format("StdErr: ~p~n", [Data]),
+	    ct:pal("StdErr: ~p~n", [Data]),
 	    receive_exec_result(Msg);
 	Msg ->
-	    test_server:format("1: Collected data ~p", [Msg]),
+	    ct:pal("1: Collected data ~p", [Msg]),
 	    expected;
 	Other ->
-	    test_server:format("Other ~p", [Other]),
+	    ct:pal("Other ~p", [Other]),
 	    {unexpected_msg, Other}
     end.
 
@@ -150,19 +149,19 @@ receive_exec_end(ConnectionRef, ChannelId) ->
     case receive_exec_result(ExitStatus) of
 	{unexpected_msg, Eof} -> %% Open ssh seems to not allways send these messages
 	    %% in the same order!
-	    test_server:format("2: Collected data ~p", [Eof]),
+	    ct:pal("2: Collected data ~p", [Eof]),
 	    case receive_exec_result(ExitStatus) of
 		expected ->
 		    expected = receive_exec_result(Closed);
 		{unexpected_msg, Closed} ->
-		    test_server:format("3: Collected data ~p", [Closed])
+		    ct:pal("3: Collected data ~p", [Closed])
 	    end;
 	expected ->
-	    test_server:format("4: Collected data ~p", [ExitStatus]),
+	    ct:pal("4: Collected data ~p", [ExitStatus]),
 	    expected = receive_exec_result(Eof),
 	    expected = receive_exec_result(Closed);
 	Other ->
-	    test_server:fail({unexpected_msg, Other})
+	    ct:fail({unexpected_msg, Other})
     end.
 
 receive_exec_result(Data, ConnectionRef, ChannelId) ->
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index c337617ee4..99dc76e12d 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -21,7 +21,6 @@
 -module(ssh_to_openssh_SUITE).
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -29,76 +28,10 @@
 -define(TIMEOUT, 50000).
 -define(SSH_DEFAULT_PORT, 22).
 
-%% Test server callback functions
 %%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initialization before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    case catch crypto:start() of
-	ok ->
-	    case gen_tcp:connect("localhost", 22, []) of
-		{error,econnrefused} ->
-		    {skip,"No openssh deamon"};
-		_ ->
-		    Config
-	    end;
-	_Else ->
-	    {skip,"Could not start crypto!"}
-    end.
-
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config) -> _
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after the whole suite
-%%--------------------------------------------------------------------
-end_per_suite(_Config) ->
-    crypto:stop(),
-    ok.
-
-%%--------------------------------------------------------------------
-%% Function: init_per_testcase(TestCase, Config) -> Config
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Initialization before each test case
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%% Description: Initialization before each test case
-%%--------------------------------------------------------------------
-init_per_testcase(_TestCase, Config) ->
-    ssh:start(),
-    Config.
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
-end_per_testcase(_TestCase, _Config) ->
-    ssh:stop(),
-    ok.
 
-%%--------------------------------------------------------------------
-%% Function: all(Clause) -> TestCases
-%% Clause - atom() - suite | doc
-%% TestCases - [Case]
-%% Case - atom()
-%%   Name of a test case.
-%% Description: Returns a list of all test cases in this test suite
-%%--------------------------------------------------------------------
 all() -> 
     case os:find_executable("ssh") of
 	false -> 
@@ -122,6 +55,23 @@ groups() ->
 			  erlang_server_openssh_client_pulic_key_dsa]}
     ].
 
+init_per_suite(Config) ->
+    case catch crypto:start() of
+	ok ->
+	    case gen_tcp:connect("localhost", 22, []) of
+		{error,econnrefused} ->
+		    {skip,"No openssh deamon"};
+		_ ->
+		    Config
+	    end;
+	_Else ->
+	    {skip,"Could not start crypto!"}
+    end.
+
+end_per_suite(_Config) ->
+    crypto:stop(),
+    ok.
+
 init_per_group(erlang_server, Config) ->
     DataDir = ?config(data_dir, Config),
     UserDir = ?config(priv_dir, Config),
@@ -137,14 +87,21 @@ end_per_group(erlang_server, Config) ->
 end_per_group(_, Config) ->
     Config.
 
-%% TEST cases starts here.
+init_per_testcase(_TestCase, Config) ->
+    ssh:start(),
+    Config.
+
+end_per_testcase(_TestCase, _Config) ->
+    ssh:stop(),
+    ok.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
+
 erlang_shell_client_openssh_server(doc) ->
     ["Test that ssh:shell/2 works"];
 
-erlang_shell_client_openssh_server(suite) ->
-    [];
-
 erlang_shell_client_openssh_server(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     IO = ssh_test_lib:start_io_server(),
@@ -159,22 +116,19 @@ erlang_shell_client_openssh_server(Config) when is_list(Config) ->
 		    ok
 	    end;
 	Other0 ->
-	    test_server:fail({unexpected_msg, Other0})
+	    ct:fail({unexpected_msg, Other0})
     end,
     receive
 	{'EXIT', Shell, normal} ->
 	    ok;
 	Other1 ->
-	    test_server:fail({unexpected_msg, Other1})
+	    ct:fail({unexpected_msg, Other1})
     end.
 
 %--------------------------------------------------------------------
 erlang_client_openssh_server_exec(doc) ->
     ["Test api function ssh_connection:exec"];
 
-erlang_client_openssh_server_exec(suite) ->
-    [];
-
 erlang_client_openssh_server_exec(Config) when is_list(Config) ->
     ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
 							     {user_interaction, false}]),
@@ -187,11 +141,11 @@ erlang_client_openssh_server_exec(Config) when is_list(Config) ->
 	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId0);
 	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId0, 0}}
 	 = ExitStatus0} ->
-	    test_server:format("0: Collected data ~p", [ExitStatus0]),
+	    ct:pal("0: Collected data ~p", [ExitStatus0]),
 	    ssh_test_lib:receive_exec_result(Data0,
 					     ConnectionRef, ChannelId0);
 	Other0 ->
-	    test_server:fail(Other0)
+	    ct:fail(Other0)
     end,
 
     {ok, ChannelId1} = ssh_connection:session_channel(ConnectionRef, infinity),
@@ -203,20 +157,17 @@ erlang_client_openssh_server_exec(Config) when is_list(Config) ->
 	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId1);
 	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId1, 0}}
 	 = ExitStatus1} ->
-	    test_server:format("0: Collected data ~p", [ExitStatus1]),
+	    ct:pal("0: Collected data ~p", [ExitStatus1]),
 	    ssh_test_lib:receive_exec_result(Data1,
 					     ConnectionRef, ChannelId1);
 	Other1 ->
-	    test_server:fail(Other1)
+	    ct:fail(Other1)
     end.
 
 %%--------------------------------------------------------------------
 erlang_client_openssh_server_exec_compressed(doc) ->
     ["Test that compression option works"];
 
-erlang_client_openssh_server_exec_compressed(suite) ->
-    [];
-
 erlang_client_openssh_server_exec_compressed(Config) when is_list(Config) ->
     ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
 							     {user_interaction, false},
@@ -230,19 +181,16 @@ erlang_client_openssh_server_exec_compressed(Config) when is_list(Config) ->
 	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId);
 	{unexpected_msg,{ssh_cm, ConnectionRef,
 			 {exit_status, ChannelId, 0}} = ExitStatus} ->
-	    test_server:format("0: Collected data ~p", [ExitStatus]),
+	    ct:pal("0: Collected data ~p", [ExitStatus]),
 	    ssh_test_lib:receive_exec_result(Data,  ConnectionRef, ChannelId);
 	Other ->
-	    test_server:fail(Other)
+	    ct:fail(Other)
     end.
 
 %%--------------------------------------------------------------------
 erlang_server_openssh_client_exec(doc) ->
     ["Test that exec command works."];
 
-erlang_server_openssh_client_exec(suite) ->
-    [];
-
 erlang_server_openssh_client_exec(Config) when is_list(Config) ->
     SystemDir = ?config(data_dir, Config),
     PrivDir = ?config(priv_dir, Config),
@@ -252,12 +200,12 @@ erlang_server_openssh_client_exec(Config) when is_list(Config) ->
 					     {failfun, fun ssh_test_lib:failfun/2}]),
     
 
-    test_server:sleep(500),
+    ct:sleep(500),
 
     Cmd = "ssh -p " ++ integer_to_list(Port) ++
 	" -o UserKnownHostsFile=" ++ KnownHosts ++ " " ++ Host ++ " 1+1.",
 
-    test_server:format("Cmd: ~p~n", [Cmd]),
+    ct:pal("Cmd: ~p~n", [Cmd]),
 
     SshPort = open_port({spawn, Cmd}, [binary]),
 
@@ -265,7 +213,7 @@ erlang_server_openssh_client_exec(Config) when is_list(Config) ->
         {SshPort,{data, <<"2\n">>}} ->
 	    ok
     after ?TIMEOUT ->
-	    test_server:fail("Did not receive answer")
+	    ct:fail("Did not receive answer")
 
     end,
      ssh:stop_daemon(Pid).
@@ -274,9 +222,6 @@ erlang_server_openssh_client_exec(Config) when is_list(Config) ->
 erlang_server_openssh_client_exec_compressed(doc) ->
     ["Test that exec command works."];
 
-erlang_server_openssh_client_exec_compressed(suite) ->
-    [];
-
 erlang_server_openssh_client_exec_compressed(Config) when is_list(Config) ->
     SystemDir = ?config(data_dir, Config),
     PrivDir = ?config(priv_dir, Config),
@@ -286,7 +231,7 @@ erlang_server_openssh_client_exec_compressed(Config) when is_list(Config) ->
 					     {compression, zlib},
 					     {failfun, fun ssh_test_lib:failfun/2}]),
 
-    test_server:sleep(500),
+    ct:sleep(500),
 
     Cmd = "ssh -p " ++ integer_to_list(Port) ++
 	" -o UserKnownHostsFile=" ++ KnownHosts ++ " -C "++ Host ++ " 1+1.",
@@ -296,7 +241,7 @@ erlang_server_openssh_client_exec_compressed(Config) when is_list(Config) ->
         {SshPort,{data, <<"2\n">>}} ->
 	    ok
     after ?TIMEOUT ->
-	    test_server:fail("Did not receive answer")
+	    ct:fail("Did not receive answer")
 
     end,
     ssh:stop_daemon(Pid).
@@ -305,9 +250,6 @@ erlang_server_openssh_client_exec_compressed(Config) when is_list(Config) ->
 erlang_client_openssh_server_setenv(doc) ->
     ["Test api function ssh_connection:setenv"];
 
-erlang_client_openssh_server_setenv(suite) ->
-    [];
-
 erlang_client_openssh_server_setenv(Config) when is_list(Config) ->
     ConnectionRef =
 	ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
@@ -332,15 +274,15 @@ erlang_client_openssh_server_setenv(Config) when is_list(Config) ->
 			 {data,0,1, UnxpectedData}}} ->
 	    %% Some os may return things as
 	    %% ENV_TEST: Undefined variable.\n"
-	    test_server:format("UnxpectedData: ~p", [UnxpectedData]),
+	    ct:pal("UnxpectedData: ~p", [UnxpectedData]),
 	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId);
 	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId, 0}}
 	 = ExitStatus} ->
-	    test_server:format("0: Collected data ~p", [ExitStatus]),
+	    ct:pal("0: Collected data ~p", [ExitStatus]),
 	    ssh_test_lib:receive_exec_result(Data,
 					     ConnectionRef, ChannelId);
 	Other ->
-	    test_server:fail(Other)
+	    ct:fail(Other)
     end.
 
 %%--------------------------------------------------------------------
@@ -350,8 +292,6 @@ erlang_client_openssh_server_setenv(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 erlang_client_openssh_server_publickey_rsa(doc) ->
     ["Validate using rsa publickey."];
-erlang_client_openssh_server_publickey_rsa(suite) ->
-    [];
 erlang_client_openssh_server_publickey_rsa(Config) when is_list(Config) ->
     {ok,[[Home]]} = init:get_argument(home),
     KeyFile =  filename:join(Home, ".ssh/id_rsa"),
@@ -379,8 +319,6 @@ erlang_client_openssh_server_publickey_rsa(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 erlang_client_openssh_server_publickey_dsa(doc) ->
     ["Validate using dsa publickey."];
-erlang_client_openssh_server_publickey_dsa(suite) ->
-    [];
 erlang_client_openssh_server_publickey_dsa(Config) when is_list(Config) ->
     {ok,[[Home]]} = init:get_argument(home),
     KeyFile =  filename:join(Home, ".ssh/id_dsa"),
@@ -406,10 +344,6 @@ erlang_client_openssh_server_publickey_dsa(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 erlang_server_openssh_client_pulic_key_dsa(doc) ->
     ["Validate using dsa publickey."];
-
-erlang_server_openssh_client_pulic_key_dsa(suite) ->
-    [];
-
 erlang_server_openssh_client_pulic_key_dsa(Config) when is_list(Config) ->
     SystemDir = ?config(data_dir, Config),
     PrivDir = ?config(priv_dir, Config),
@@ -419,7 +353,7 @@ erlang_server_openssh_client_pulic_key_dsa(Config) when is_list(Config) ->
 					     {public_key_alg, ssh_dsa},
 					     {failfun, fun ssh_test_lib:failfun/2}]),
     
-    test_server:sleep(500),
+    ct:sleep(500),
 
     Cmd = "ssh -p " ++ integer_to_list(Port) ++
 	" -o UserKnownHostsFile=" ++ KnownHosts ++
@@ -430,17 +364,13 @@ erlang_server_openssh_client_pulic_key_dsa(Config) when is_list(Config) ->
         {SshPort,{data, <<"2\n">>}} ->
 	    ok
     after ?TIMEOUT ->
-	    test_server:fail("Did not receive answer")
+	    ct:fail("Did not receive answer")
     end,
      ssh:stop_daemon(Pid).
 
 %%--------------------------------------------------------------------
 erlang_client_openssh_server_password(doc) ->
     ["Test client password option"];
-
-erlang_client_openssh_server_password(suite) ->
-    [];
-
 erlang_client_openssh_server_password(Config) when is_list(Config) ->
     %% to make sure we don't public-key-auth
     UserDir = ?config(data_dir, Config),
@@ -451,7 +381,7 @@ erlang_client_openssh_server_password(Config) when is_list(Config) ->
 						 {user_interaction, false},
 						 {user_dir, UserDir}]),
     
-    test_server:format("Test of user foo that does not exist. "
+    ct:pal("Test of user foo that does not exist. "
 		       "Error msg: ~p~n", [Reason0]),
 
     User = string:strip(os:cmd("whoami"), right, $\n),
@@ -465,10 +395,10 @@ erlang_client_openssh_server_password(Config) when is_list(Config) ->
 			     {password, "foo"},
 			     {user_interaction, false},
 			     {user_dir, UserDir}]),
-	    test_server:format("Test of wrong Pasword.  "
+	    ct:pal("Test of wrong Pasword.  "
 			       "Error msg: ~p~n", [Reason1]);
 	_ ->
-	    test_server:format("Whoami failed reason: ~n", [])
+	    ct:pal("Whoami failed reason: ~n", [])
 	end.
 
 %%--------------------------------------------------------------------
@@ -477,13 +407,13 @@ erlang_client_openssh_server_password(Config) when is_list(Config) ->
 %%
 %%--------------------------------------------------------------------
 %%--------------------------------------------------------------------
-%%% Internal functions
+%%% Internal functions -----------------------------------------------
 %%--------------------------------------------------------------------
 receive_hej() ->
     receive
 	<<"Hej\n">> = Hej->
-	    test_server:format("Expected result: ~p~n", [Hej]);
+	    ct:pal("Expected result: ~p~n", [Hej]);
 	Info ->
-	    test_server:format("Extra info: ~p~n", [Info]),
+	    ct:pal("Extra info: ~p~n", [Info]),
 	    receive_hej()
     end.
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index bff73a1b40..921ec2206a 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 2.1
+SSH_VSN = 2.1.2
 APP_VSN    = "ssh-$(SSH_VSN)"
 
diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile
index 5d808d6727..fb12499ef7 100644
--- a/lib/ssl/doc/src/Makefile
+++ b/lib/ssl/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -117,15 +117,15 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6_FILES) $(RELEASE_PATH)/man/man6
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6_FILES) "$(RELEASE_PATH)/man/man6"
 
 release_spec:
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index a4da939d3e..49bbd5d27d 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2011</year>
+      <year>1999</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,7 +30,117 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
   
-  <section><title>SSL 5.0.1</title>
+  <section><title>SSL 5.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    ssl:ssl_accept/2 timeout is no longer ignored</p>
+          <p>
+	    Own Id: OTP-10600</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 5.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    ssl:recv/3 could "loose" data when the timeout occurs. If
+	    the timout in ssl:connect or ssl:ssl_accept expired the
+	    ssl connection process was not terminated as it should,
+	    this due to gen_fsm:send_all_state_event timout is a
+	    client side time out. These timouts are now handled by
+	    the gen_fsm-procss instead.</p>
+          <p>
+	    Own Id: OTP-10569</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Better termination handling that avoids hanging.</p>
+          <p>
+	    Own Id: OTP-10574</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Sometimes the client process could receive an extra
+	    {error, closed} message after ssl:recv had returned
+	    {error, closed}.</p>
+          <p>
+	    Own Id: OTP-10118</p>
+        </item>
+        <item>
+          <p>
+	    ssl v3 alert number 41 (no_certificate_RESERVED) is now
+	    recognized</p>
+          <p>
+	    Own Id: OTP-10196</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Experimental support for TLS 1.1 is now available, will
+	    be officially supported from OTP-R16. Thanks to Andreas
+	    Schultz for implementing the first version.</p>
+          <p>
+	    Own Id: OTP-8871</p>
+        </item>
+        <item>
+          <p>
+	    Experimental support for TLS 1.2 is now available, will
+	    be officially supported from OTP-R16. Thanks to Andreas
+	    Schultz for implementing the first version.</p>
+          <p>
+	    Own Id: OTP-8872</p>
+        </item>
+        <item>
+          <p>
+	    Removed some bottlenecks increasing the applications
+	    parallelism especially for the client side.</p>
+          <p>
+	    Own Id: OTP-10113</p>
+        </item>
+        <item>
+          <p>
+	    Workaround for handling certificates that wrongly encode
+	    X509countryname in utf-8 when the actual value is a valid
+	    ASCCI value of length 2. Such certificates are accepted
+	    by many browsers such as Chrome and Fierfox so for
+	    interoperability reasons we will too.</p>
+          <p>
+	    Own Id: OTP-10222</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 5.0.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index e019654685..f0eac76264 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -36,12 +36,16 @@
 
     <list type="bulleted">
       <item>ssl requires the crypto and public_key applications.</item>
-      <item>Supported SSL/TLS-versions are SSL-3.0 and TLS-1.0 </item>
+      <item>Supported SSL/TLS-versions are SSL-3.0 and TLS-1.0, experimental
+      support for TLS-1.1 and TLS-1.2 is also available (no support for elliptic curve cipher suites yet).</item>
       <item>For security reasons sslv2 is not supported.</item>
       <item>Ephemeral Diffie-Hellman cipher suites are supported
       but not Diffie Hellman Certificates cipher suites.</item>
       <item>Export cipher suites are not supported as the
       U.S. lifted its export restrictions in early 2000.</item>
+      <item>IDEA cipher suites are not supported as they have
+      become deprecated by the latest TLS spec so there is not any
+      real motivation to implement them.</item>
       <item>CRL and policy certificate
             extensions are not supported yet. </item>
     </list>
@@ -75,7 +79,9 @@
       {keyfile, path()} | {password, string()} |
       {cacerts, [der_encoded()]} | {cacertfile, path()} |
       |{dh, der_encoded()} | {dhfile, path()} | {ciphers, ciphers()} |
-      {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} | {reuse_session, fun()} 
+      {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} | {reuse_session, fun()}
+      {next_protocols_advertised, list(binary()} |
+      {client_preferred_next_protocols, binary(), client | server, list(binary())}
     </c></p>
 
     <p><c>transportoption() = {CallbackModule, DataTag, ClosedTag}
@@ -106,7 +112,7 @@
 
     <p><c>sslsocket() - opaque to the user. </c></p>
     
-    <p><c>protocol() = sslv3 | tlsv1 </c></p>
+    <p><c>protocol() = sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2' </c></p>
     
     <p><c>ciphers() = [ciphersuite()] | string() (according to old API)</c></p>
     
@@ -193,13 +199,13 @@
       </item>
 
       <tag>{depth, integer()}</tag>
-      <item>Specifies the maximum
-      verification depth, i.e. how far in a chain of certificates the
-      verification process can proceed before the verification is
-      considered to fail. Peer certificate = 0, CA certificate = 1,
-      higher level CA certificate = 2, etc.  The value 2 thus means
-      that a chain can at most contain peer cert, CA cert, next CA
-      cert, and an additional CA cert. The default value is 1.
+      <item>
+	The depth is the maximum number of non-self-issued
+	intermediate certificates that may follow the peer certificate
+	in a valid certification path.  So if depth is 0 the PEER must
+	be signed by the trusted ROOT-CA directly, if 1 the path can
+	be PEER, CA, ROOT-CA, if it is 2 PEER, CA, CA, ROOT-CA and so
+	on.  The default value is 1.
       </item>
 
       <tag>{verify_fun, {Verifyfun :: fun(), InitialUserState :: term()}}</tag>
@@ -297,8 +303,29 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
       when possible.
       </item>
 
+      <tag>{client_preferred_next_protocols,  Precedence:: server | client, ClientPrefs::[binary()]}
+           {client_preferred_next_protocols,  Precedence:: server | client, ClientPrefs::[binary()] , Default :: binary()}}</tag>
+
+	   <item> <p>Indicates the client will try to perform Next Protocol
+	   Negotiation.</p>
+
+	    <p>If precedence is server the negaotiated protocol will be the
+	   first protocol that appears on the server advertised list that is
+	   also on the clients preference list.</p>
+
+	   <p>If the precedence is client the negaotiated protocol will be the
+	   first protocol that appears on the clients preference list that is
+	   also on the server advertised list.</p>
+
+	  <p> If the client does not support any of the servers advertised
+	   protocols or the server does not advertise any protocols the
+	   client will fallback to the first protocol in its list or if a
+	   default is supplied it will fallback to that instead. If the
+	   server does not support next protocol renegotiation the
+	   connection will be aborted if no default protocol is supplied.</p>
+	   </item>
     </taglist>
-  </section>
+   </section>
 
   <section>
     <title>SSL OPTION DESCRIPTIONS - SERVER SIDE</title>
@@ -349,6 +376,14 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
       SuggestedSessionId is a binary(),  PeerCert is a DER encoded
       certificate, Compression is an enumeration integer
       and CipherSuite is of type ciphersuite().
+    </item>
+
+      <tag>{next_protocols_advertised, Protocols :: list(binary())}</tag>
+      <item>The list of protocols to send to the client if the client indicates
+      it supports the Next Protocol extension. The client may select a protocol
+      that is not on this list. The list of protocols must not contain an empty
+      binary. If the server negotiates a Next Protocol it can be accessed
+      using <c>negotiated_next_protocol/1</c> method.
       </item>
 
     </taglist>
@@ -762,8 +797,23 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
 	  ssl application.</p>
       </desc>
     </func>
+    <func>
+      <name>negotiated_next_protocol(Socket) -> {ok, Protocol} | {error, next_protocol_not_negotiated}</name>
+      <fsummary>Returns the Next Protocol negotiated.</fsummary>
+      <type>
+        <v>Socket = sslsocket()</v>
+        <v>Protocol = binary()</v>
+      </type>
+      <desc>
+        <p>
+          Returns the Next Protocol negotiated.
+        </p>
+      </desc>
+    </func>
+
+
   </funcs> 
-      
+
   <section>
     <title>SEE ALSO</title>
     <p><seealso marker="kernel:inet">inet(3) </seealso> and 
diff --git a/lib/ssl/examples/certs/Makefile b/lib/ssl/examples/certs/Makefile
index a4f067ade6..be2546fe82 100644
--- a/lib/ssl/examples/certs/Makefile
+++ b/lib/ssl/examples/certs/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2010. All Rights Reserved.
+# Copyright Ericsson AB 2003-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -54,8 +54,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/certs
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/certs"
 	tar cf - etc | \
-		(cd $(RELSYSDIR)/examples/certs; tar xf -)
-	chmod -R ug+rw $(RELSYSDIR)/examples
+		(cd "$(RELSYSDIR)/examples/certs"; tar xf -)
+	chmod -R ug+rw "$(RELSYSDIR)/examples"
 release_docs_spec:
diff --git a/lib/ssl/examples/src/Makefile b/lib/ssl/examples/src/Makefile
index c5f31b689c..3e033c08d9 100644
--- a/lib/ssl/examples/src/Makefile
+++ b/lib/ssl/examples/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2011. All Rights Reserved.
+# Copyright Ericsson AB 2003-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -63,10 +63,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/src
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/ebin
-	(cd ..; tar cf - src ebin  | (cd $(RELSYSDIR)/examples; tar xf -))
-	chmod -R ug+w $(RELSYSDIR)/examples
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/ebin"
+	(cd ..; tar cf - src ebin  | (cd "$(RELSYSDIR)/examples"; tar xf -))
+	chmod -R ug+w "$(RELSYSDIR)/examples"
 
 release_docs_spec:
 
diff --git a/lib/ssl/examples/src/client_server.erl b/lib/ssl/examples/src/client_server.erl
index baf5a9185e..133a1764bc 100644
--- a/lib/ssl/examples/src/client_server.erl
+++ b/lib/ssl/examples/src/client_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -21,18 +21,14 @@
 
 -module(client_server).
 
--export([start/0, start/1, init_connect/1]).
+-export([start/0, init_connect/1]).
 
 start() ->
-    start([ssl, subject]).
-
-start(CertOpts) ->
     %% Start ssl application
+    application:start(crypto),
+    application:start(public_key),
     application:start(ssl),
 
-    %% Always seed 
-    ssl:seed("ellynatefttidppohjeh"),
-
     %% Let the current process be the server that listens and accepts
     %% Listen
     {ok, LSock} = ssl:listen(0, mk_opts(listen)),
@@ -40,14 +36,14 @@ start(CertOpts) ->
     io:fwrite("Listen: port = ~w.~n", [LPort]),
 
     %% Spawn the client process that connects to the server
-    spawn(?MODULE, init_connect, [{LPort, CertOpts}]),
+    spawn(?MODULE, init_connect, [LPort]),
 
     %% Accept
     {ok, ASock} = ssl:transport_accept(LSock),
     ok = ssl:ssl_accept(ASock),
     io:fwrite("Accept: accepted.~n"),
-    {ok, Cert} = ssl:peercert(ASock, CertOpts),
-    io:fwrite("Accept: peer cert:~n~p~n", [Cert]),
+    {ok, Cert} = ssl:peercert(ASock),
+    io:fwrite("Accept: peer cert:~n~p~n", [public_key:pkix_decode_cert(Cert, otp)]),
     io:fwrite("Accept: sending \"hello\".~n"),
     ssl:send(ASock, "hello"),
     {error, closed} = ssl:recv(ASock, 0),
@@ -59,12 +55,12 @@ start(CertOpts) ->
 
 
 %% Client connect
-init_connect({LPort, CertOpts}) ->
+init_connect(LPort) ->
     {ok, Host} = inet:gethostname(), 
     {ok, CSock} = ssl:connect(Host, LPort, mk_opts(connect)),
     io:fwrite("Connect: connected.~n"),
-    {ok, Cert} = ssl:peercert(CSock, CertOpts),
-    io:fwrite("Connect: peer cert:~n~p~n", [Cert]),
+    {ok, Cert} = ssl:peercert(CSock),
+    io:fwrite("Connect: peer cert:~n~p~n", [public_key:pkix_decode_cert(Cert, otp)]),
     {ok, Data} = ssl:recv(CSock, 0),
     io:fwrite("Connect: got data: ~p~n", [Data]),
     io:fwrite("Connect: closing and terminating.~n"),
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index dc69b53b28..6be8a1456e 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -37,6 +37,9 @@ RELSYSDIR = $(RELEASE_PATH)/lib/ssl-$(VSN)
 # Common Macros
 # ----------------------------------------------------
 
+BEHAVIOUR_MODULES= \
+        ssl_session_cache_api
+
 MODULES= \
 	ssl \
 	ssl_alert \
@@ -53,7 +56,6 @@ MODULES= \
 	ssl_handshake \
 	ssl_manager \
 	ssl_session \
-        ssl_session_cache_api \
 	ssl_session_cache \
 	ssl_record \
 	ssl_ssl2 \
@@ -66,10 +68,15 @@ INTERNAL_HRL_FILES = \
 	 ssl_alert.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_internal.hrl \
 	 ssl_record.hrl
 
-ERL_FILES= $(MODULES:%=%.erl)
+ERL_FILES= \
+	$(MODULES:%=%.erl) \
+	$(BEHAVIOUR_MODULES:%=%.erl)
+
 
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
+BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR))
+
 APP_FILE= ssl.app
 APPUP_FILE= ssl.appup
 
@@ -83,6 +90,7 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 # ----------------------------------------------------
 EXTRA_ERLC_FLAGS = +warn_unused_vars
 ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
+	-pz $(EBIN) \
 	-pz $(ERL_TOP)/lib/public_key/ebin \
 	$(EXTRA_ERLC_FLAGS) -DVSN=\"$(VSN)\"
 
@@ -91,6 +99,8 @@ ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
 # Targets
 # ----------------------------------------------------
 
+$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
+
 debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) 
 
 clean:
@@ -105,23 +115,38 @@ $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
 
 docs:
 
+
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
-	$(APPUP_TARGET) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
+	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
-
-
-
-
+# ----------------------------------------------------
+# Dependencies
+# ----------------------------------------------------
+$(EBIN)/inet_tls_dist.$(EMULATOR): ../../kernel/include/net_address.hrl  ../../kernel/include/dist.hrl  ../../kernel/include/dist_util.hrl
+$(EBIN)/ssl.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl ssl_handshake.hrl ../../public_key/include/public_key.hrl
+$(EBIN)/ssl_alert.$(EMULATOR): ssl_alert.hrl ssl_record.hrl  
+$(EBIN)/ssl_certificate.$(EMULATOR): ssl_internal.hrl ssl_alert.hrl ssl_handshake.hrl ../../public_key/include/public_key.hrl
+$(EBIN)/ssl_certificate_db.$(EMULATOR): ssl_internal.hrl ../../public_key/include/public_key.hrl ../../kernel/include/file.hrl
+$(EBIN)/ssl_cipher.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
+$(EBIN)/ssl_connection.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
+$(EBIN)/ssl_handshake.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
+$(EBIN)/ssl_manager.$(EMULATOR): ssl_internal.hrl ssl_handshake.hrl ../../kernel/include/file.hrl
+$(EBIN)/ssl_record.$(EMULATOR):  ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_alert.hrl
+$(EBIN)/ssl_session.$(EMULATOR):  ssl_internal.hrl ssl_handshake.hrl
+$(EBIN)/ssl_session_cache.$(EMULATOR):  ssl_internal.hrl ssl_handshake.hrl
+$(EBIN)/ssl_session_cache_api.$(EMULATOR):  ssl_internal.hrl ssl_handshake.hrl
+$(EBIN)/ssl_ssl3.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl
+$(EBIN)/ssl_tls1.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl
 
 
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index e346b1e9e6..9b1227fa7f 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,12 +1,25 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
-  {"5.0", [{restart_application, ssl}]},
+  {"5.1.1", [{restart_application, ssl}]
+  },
+  {"5.1", [
+	   {load_module, ssl_connection, soft_purge, soft_purge, []}
+	  ]
+  },
+  {<<"5.0\\*">>, [{restart_application, ssl}]},
   {<<"4\\.*">>, [{restart_application, ssl}]},
   {<<"3\\.*">>, [{restart_application, ssl}]}
  ], 
  [
-  {"5.0", [{restart_application, ssl}]},
+  {"5.1.1", [{restart_application, ssl}]
+  },
+  {"5.1", [
+	   {load_module, ssl_connection, soft_purge, soft_purge, []}
+	  ]
+  },
+  {"5.1", [{restart_application, ssl}]},
+  {<<"5.0\\*">>, [{restart_application, ssl}]},
   {<<"4\\.*">>, [{restart_application, ssl}]},
   {<<"3\\.*">>, [{restart_application, ssl}]}
  ]}.
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 0bcdffbeff..6224334a6e 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -25,18 +25,21 @@
 
 -export([start/0, start/1, stop/0, transport_accept/1,
 	 transport_accept/2, ssl_accept/1, ssl_accept/2, ssl_accept/3,
-	 cipher_suites/0, cipher_suites/1, close/1, shutdown/2,
+	 cipher_suites/0, cipher_suites/1, suite_definition/1,
+	 close/1, shutdown/2,
 	 connect/3, connect/2, connect/4, connection_info/1,
 	 controlling_process/2, listen/2, pid/1, peername/1, peercert/1,
 	 recv/2, recv/3, send/2, getopts/2, setopts/2, sockname/1,
 	 versions/0, session_info/1, format_error/1,
-	 renegotiate/1, prf/5]).
+	 renegotiate/1, prf/5, clear_pem_cache/0, random_bytes/1, negotiated_next_protocol/1]).
+
 
 -deprecated({pid, 1, next_major_release}).
 
 -include("ssl_internal.hrl").
 -include("ssl_record.hrl").
 -include("ssl_cipher.hrl").
+-include("ssl_handshake.hrl").
 
 -include_lib("public_key/include/public_key.hrl"). 
 
@@ -44,7 +47,7 @@
 -export_type([connect_option/0, listen_option/0, ssl_option/0, transport_option/0,
 	      erl_cipher_suite/0, %% From ssl_cipher.hrl 
 	      tls_atom_version/0, %% From ssl_internal.hrl
-	      prf_random/0]).
+	      prf_random/0, sslsocket/0]).
 
 -record(config, {ssl,               %% SSL parameters
 		 inet_user,         %% User set inet options
@@ -52,6 +55,8 @@
 		 inet_ssl,          %% inet options for internal ssl socket 
 		 cb                 %% Callback info
 		}).
+
+-type sslsocket()                :: #sslsocket{}.
 -type connect_option()           :: socket_connect_option() | ssl_option() | transport_option().
 -type socket_connect_option()    :: gen_tcp:connect_option().
 -type listen_option()            :: socket_listen_option() | ssl_option() | transport_option().
@@ -64,7 +69,9 @@
                         {keyfile, path()} | {password, string()} | {cacerts, [Der::binary()]} |
                         {cacertfile, path()} | {dh, Der::binary()} | {dhfile, path()} |
                         {ciphers, ciphers()} | {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} |
-                        {reuse_session, fun()} | {hibernate_after, integer()|undefined}.
+                        {reuse_session, fun()} | {hibernate_after, integer()|undefined} |
+                        {next_protocols_advertised, list(binary())} |
+                        {client_preferred_next_protocols, binary(), client | server, list(binary())}.
 
 -type verify_type()  :: verify_none | verify_peer.
 -type path()         :: string().
@@ -160,7 +167,7 @@ listen(Port, Options0) ->
 	#config{cb={CbModule, _, _, _},inet_user=Options} = Config,
 	case CbModule:listen(Port, Options) of
 	    {ok, ListenSocket} ->
-		{ok, #sslsocket{pid = {ListenSocket, Config}, fd = new_ssl}};
+		{ok, #sslsocket{pid = {ListenSocket, Config}}};
 	    Err = {error, _} ->
 		Err
 	end
@@ -240,18 +247,20 @@ ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket) ->
 %%
 %% Description: Close an ssl connection
 %%--------------------------------------------------------------------  
+close(#sslsocket{pid = Pid}) when is_pid(Pid) ->
+    ssl_connection:close(Pid);
 close(#sslsocket{pid = {ListenSocket, #config{cb={CbMod,_, _, _}}}}) ->
-    CbMod:close(ListenSocket);
-close(#sslsocket{pid = Pid}) ->
-    ssl_connection:close(Pid).
+    CbMod:close(ListenSocket).
 
 %%--------------------------------------------------------------------
 -spec send(#sslsocket{}, iodata()) -> ok | {error, reason()}.
 %% 
 %% Description: Sends data over the ssl connection
 %%--------------------------------------------------------------------
-send(#sslsocket{pid = Pid}, Data) ->
-    ssl_connection:send(Pid, Data).
+send(#sslsocket{pid = Pid}, Data) when is_pid(Pid) ->
+    ssl_connection:send(Pid, Data);
+send(#sslsocket{pid = {ListenSocket, #config{cb={CbModule, _, _, _}}}}, Data) ->
+    CbModule:send(ListenSocket, Data). %% {error,enotconn}
 
 %%--------------------------------------------------------------------
 -spec recv(#sslsocket{}, integer()) -> {ok, binary()| list()} | {error, reason()}.
@@ -261,8 +270,10 @@ send(#sslsocket{pid = Pid}, Data) ->
 %%--------------------------------------------------------------------
 recv(Socket, Length) ->
     recv(Socket, Length, infinity).
-recv(#sslsocket{pid = Pid, fd = new_ssl}, Length, Timeout) ->
-    ssl_connection:recv(Pid, Length, Timeout).
+recv(#sslsocket{pid = Pid}, Length, Timeout) when is_pid(Pid) ->
+    ssl_connection:recv(Pid, Length, Timeout);
+recv(#sslsocket{pid = {Listen, #config{cb={CbModule, _, _, _}}}}, _,_) when is_port(Listen)->
+    CbModule:recv(Listen, 0). %% {error,enotconn}
 
 %%--------------------------------------------------------------------
 -spec controlling_process(#sslsocket{}, pid()) -> ok | {error, reason()}.
@@ -270,8 +281,12 @@ recv(#sslsocket{pid = Pid, fd = new_ssl}, Length, Timeout) ->
 %% Description: Changes process that receives the messages when active = true
 %% or once. 
 %%--------------------------------------------------------------------
-controlling_process(#sslsocket{pid = Pid}, NewOwner) when is_pid(Pid) ->
-    ssl_connection:new_user(Pid, NewOwner).
+controlling_process(#sslsocket{pid = Pid}, NewOwner) when is_pid(Pid), is_pid(NewOwner) ->
+    ssl_connection:new_user(Pid, NewOwner);
+controlling_process(#sslsocket{pid = {Listen,
+				      #config{cb={CbModule, _, _, _}}}}, NewOwner) when is_port(Listen),
+											is_pid(NewOwner) ->
+    CbModule:controlling_process(Listen, NewOwner).
 
 %%--------------------------------------------------------------------
 -spec connection_info(#sslsocket{}) -> 	{ok, {tls_atom_version(), erl_cipher_suite()}} | 
@@ -279,31 +294,54 @@ controlling_process(#sslsocket{pid = Pid}, NewOwner) when is_pid(Pid) ->
 %%
 %% Description: Returns ssl protocol and cipher used for the connection
 %%--------------------------------------------------------------------
-connection_info(#sslsocket{pid = Pid}) ->
-    ssl_connection:info(Pid).
+connection_info(#sslsocket{pid = Pid}) when is_pid(Pid) ->
+    ssl_connection:info(Pid);
+connection_info(#sslsocket{pid = {Listen, _}}) when is_port(Listen) ->
+    {error, enotconn}.
 
 %%--------------------------------------------------------------------
 -spec peername(#sslsocket{}) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}.
 %%
 %% Description: same as inet:peername/1.
 %%--------------------------------------------------------------------
-peername(#sslsocket{pid = Pid}) ->
-    ssl_connection:peername(Pid).
+peername(#sslsocket{pid = Pid, fd = Socket}) when is_pid(Pid)->
+    inet:peername(Socket);
+peername(#sslsocket{pid = {ListenSocket, _}}) ->
+    inet:peername(ListenSocket). %% Will return {error, enotconn}
 
 %%--------------------------------------------------------------------
 -spec peercert(#sslsocket{}) ->{ok, DerCert::binary()} | {error, reason()}.
 %%
 %% Description: Returns the peercert.
 %%--------------------------------------------------------------------
-peercert(#sslsocket{pid = Pid}) ->
+peercert(#sslsocket{pid = Pid}) when is_pid(Pid) ->
     case ssl_connection:peer_certificate(Pid) of
 	{ok, undefined} ->
 	    {error, no_peercert};
         Result ->
 	    Result
-    end.
+    end;
+peercert(#sslsocket{pid = {Listen, _}}) when is_port(Listen) ->
+    {error, enotconn}.
 
 %%--------------------------------------------------------------------
+-spec suite_definition(cipher_suite()) -> erl_cipher_suite().
+%%
+%% Description: Return erlang cipher suite definition.
+%%--------------------------------------------------------------------
+suite_definition(S) ->
+    {KeyExchange, Cipher, Hash, _} = ssl_cipher:suite_definition(S),
+    {KeyExchange, Cipher, Hash}.
+
+%%--------------------------------------------------------------------
+-spec negotiated_next_protocol(#sslsocket{}) -> {ok, binary()} | {error, reason()}.
+%%
+%% Description: Returns the next protocol that has been negotiated. If no
+%% protocol has been negotiated will return {error, next_protocol_not_negotiated}
+%%--------------------------------------------------------------------
+negotiated_next_protocol(#sslsocket{pid = Pid}) ->
+    ssl_connection:negotiated_next_protocol(Pid).
+
 -spec cipher_suites() -> [erl_cipher_suite()].
 -spec cipher_suites(erlang | openssl) -> [erl_cipher_suite()] | [string()].
 			   
@@ -314,7 +352,7 @@ cipher_suites() ->
   
 cipher_suites(erlang) ->
     Version = ssl_record:highest_protocol_version([]),
-    [ssl_cipher:suite_definition(S) || S <- ssl_cipher:suites(Version)];    
+    [suite_definition(S) || S <- ssl_cipher:suites(Version)];
 
 cipher_suites(openssl) ->
     Version = ssl_record:highest_protocol_version([]),
@@ -374,8 +412,9 @@ setopts(#sslsocket{}, Options) ->
 %%		      
 %% Description: Same as gen_tcp:shutdown/2
 %%--------------------------------------------------------------------
-shutdown(#sslsocket{pid = {ListenSocket, #config{cb={CbMod,_, _, _}}}}, How) ->
-    CbMod:shutdown(ListenSocket, How);
+shutdown(#sslsocket{pid = {Listen, #config{cb={CbMod,_, _, _}}}},
+	 How) when is_port(Listen) ->
+    CbMod:shutdown(Listen, How);
 shutdown(#sslsocket{pid = Pid}, How) ->
     ssl_connection:shutdown(Pid, How).
 
@@ -384,11 +423,11 @@ shutdown(#sslsocket{pid = Pid}, How) ->
 %%		     
 %% Description: Same as inet:sockname/1
 %%--------------------------------------------------------------------
-sockname(#sslsocket{pid = {ListenSocket, _}}) ->
-    inet:sockname(ListenSocket);
+sockname(#sslsocket{pid = {Listen, _}}) when is_port(Listen) ->
+    inet:sockname(Listen);
 
-sockname(#sslsocket{pid = Pid}) ->
-    ssl_connection:sockname(Pid).
+sockname(#sslsocket{pid = Pid, fd = Socket}) when is_pid(Pid) ->
+    inet:sockname(Socket).
 
 %%---------------------------------------------------------------
 -spec session_info(#sslsocket{}) -> {ok, list()} | {error, reason()}.
@@ -396,19 +435,21 @@ sockname(#sslsocket{pid = Pid}) ->
 %% Description: Returns list of session info currently [{session_id, session_id(),
 %% {cipher_suite, cipher_suite()}]
 %%--------------------------------------------------------------------
-session_info(#sslsocket{pid = Pid, fd = new_ssl}) ->
-    ssl_connection:session_info(Pid).
+session_info(#sslsocket{pid = Pid}) when is_pid(Pid) ->
+    ssl_connection:session_info(Pid);
+session_info(#sslsocket{pid = {Listen,_}}) when is_port(Listen) ->
+    {error, enotconn}.
 
 %%---------------------------------------------------------------
 -spec versions() -> [{ssl_app, string()} | {supported, [tls_atom_version()]} | 
-		      {available, [tls_atom_version()]}]. 
+		     {available, [tls_atom_version()]}].
 %%
 %% Description: Returns a list of relevant versions.
 %%--------------------------------------------------------------------
 versions() ->
     Vsns = ssl_record:supported_protocol_versions(),
     SupportedVsns = [ssl_record:protocol_version(Vsn) || Vsn <- Vsns],
-    AvailableVsns = ?DEFAULT_SUPPORTED_VERSIONS,
+    AvailableVsns = ?ALL_SUPPORTED_VERSIONS,
     [{ssl_app, ?VSN}, {supported, SupportedVsns}, {available, AvailableVsns}].
 
 
@@ -417,8 +458,10 @@ versions() ->
 %% 
 %% Description: Initiates a renegotiation.
 %%--------------------------------------------------------------------
-renegotiate(#sslsocket{pid = Pid, fd = new_ssl}) ->
-    ssl_connection:renegotiation(Pid).
+renegotiate(#sslsocket{pid = Pid}) when is_pid(Pid) ->
+    ssl_connection:renegotiation(Pid);
+renegotiate(#sslsocket{pid = {Listen,_}}) when is_port(Listen) ->
+    {error, enotconn}.
 
 %%--------------------------------------------------------------------
 -spec prf(#sslsocket{}, binary() | 'master_secret', binary(),
@@ -427,9 +470,19 @@ renegotiate(#sslsocket{pid = Pid, fd = new_ssl}) ->
 %%
 %% Description: use a ssl sessions TLS PRF to generate key material
 %%--------------------------------------------------------------------
-prf(#sslsocket{pid = Pid, fd = new_ssl},
-    Secret, Label, Seed, WantedLength) ->
-    ssl_connection:prf(Pid, Secret, Label, Seed, WantedLength).
+prf(#sslsocket{pid = Pid},
+    Secret, Label, Seed, WantedLength) when is_pid(Pid) ->
+    ssl_connection:prf(Pid, Secret, Label, Seed, WantedLength);
+prf(#sslsocket{pid = {Listen,_}}, _,_,_,_) when is_port(Listen) ->
+    {error, enotconn}.
+
+%%--------------------------------------------------------------------
+-spec clear_pem_cache() -> ok.
+%%
+%% Description: Clear the PEM cache
+%%--------------------------------------------------------------------
+clear_pem_cache() ->
+    ssl_manager:clear_pem_cache().
 
 %%---------------------------------------------------------------
 -spec format_error({error, term()}) -> list().
@@ -465,6 +518,23 @@ format_error(Error) ->
             Other
     end.
 
+%%--------------------------------------------------------------------
+-spec random_bytes(integer()) -> binary().
+
+%%
+%% Description: Generates cryptographically secure random sequence if possible
+%% fallbacks on pseudo random function
+%%--------------------------------------------------------------------
+random_bytes(N) ->
+    try crypto:strong_rand_bytes(N) of
+	RandBytes ->
+	    RandBytes
+    catch
+	error:low_entropy ->
+	    crypto:rand_bytes(N)
+    end.
+
+
 %%%--------------------------------------------------------------
 %%% Internal functions
 %%%--------------------------------------------------------------------
@@ -532,7 +602,7 @@ handle_options(Opts0, _Role) ->
 		throw({error, {eoptions, {verify, Value}}})
 	end,
 
-    CertFile = handle_option(certfile, Opts, ""),
+    CertFile = handle_option(certfile, Opts, <<>>),
     
     SSLOptions = #ssl_options{
       versions   = handle_option(versions, Opts, []),
@@ -558,7 +628,9 @@ handle_options(Opts0, _Role) ->
       renegotiate_at = handle_option(renegotiate_at, Opts, ?DEFAULT_RENEGOTIATE_AT),
       debug      = handle_option(debug, Opts, []),
       hibernate_after = handle_option(hibernate_after, Opts, undefined),
-      erl_dist = handle_option(erl_dist, Opts, false)
+      erl_dist = handle_option(erl_dist, Opts, false),
+      next_protocols_advertised = handle_option(next_protocols_advertised, Opts, undefined),
+      next_protocol_selector = make_next_protocol_selector(handle_option(client_preferred_next_protocols, Opts, undefined))
      },
 
     CbInfo  = proplists:get_value(cb_info, Opts, {gen_tcp, tcp, tcp_closed, tcp_error}),    
@@ -567,7 +639,8 @@ handle_options(Opts0, _Role) ->
 		  depth, cert, certfile, key, keyfile,
 		  password, cacerts, cacertfile, dh, dhfile, ciphers,
 		  debug, reuse_session, reuse_sessions, ssl_imp,
-		  cb_info, renegotiate_at, secure_renegotiate, hibernate_after, erl_dist],
+		  cb_info, renegotiate_at, secure_renegotiate, hibernate_after, erl_dist, next_protocols_advertised,
+		  client_preferred_next_protocols],
     
     SockOpts = lists:foldl(fun(Key, PropList) -> 
 				   proplists:delete(Key, PropList)
@@ -619,8 +692,12 @@ validate_option(depth, Value) when is_integer(Value),
 validate_option(cert, Value) when Value == undefined;
                                  is_binary(Value) ->
     Value;
-validate_option(certfile, Value) when Value == undefined; is_list(Value) ->
+validate_option(certfile, undefined = Value) ->
+    Value;
+validate_option(certfile, Value) when is_binary(Value) ->
     Value;
+validate_option(certfile, Value) when is_list(Value) ->
+    list_to_binary(Value);
 
 validate_option(key, undefined) ->
     undefined;
@@ -631,8 +708,13 @@ validate_option(key, {KeyType, Value}) when is_binary(Value),
 					    KeyType == 'DSAPrivateKey';
 					    KeyType == 'PrivateKeyInfo' ->
     {KeyType, Value};
-validate_option(keyfile, Value) when is_list(Value) ->
+
+validate_option(keyfile, undefined) ->
+   <<>>;
+validate_option(keyfile, Value) when is_binary(Value) ->
     Value;
+validate_option(keyfile, Value) when is_list(Value), Value =/= "" ->
+    list_to_binary(Value);
 validate_option(password, Value) when is_list(Value) ->
     Value;
 
@@ -642,16 +724,20 @@ validate_option(cacerts, Value) when Value == undefined;
 %% certfile must be present in some cases otherwhise it can be set
 %% to the empty string.
 validate_option(cacertfile, undefined) ->
-    "";
-validate_option(cacertfile, Value) when is_list(Value), Value =/= "" ->
+   <<>>;
+validate_option(cacertfile, Value) when is_binary(Value) ->
     Value;
+validate_option(cacertfile, Value) when is_list(Value), Value =/= ""->
+    list_to_binary(Value);
 validate_option(dh, Value) when Value == undefined;
 				is_binary(Value) ->
     Value;
 validate_option(dhfile, undefined = Value)  ->
     Value;
-validate_option(dhfile, Value) when is_list(Value), Value =/= "" ->
+validate_option(dhfile, Value) when is_binary(Value) ->
     Value;
+validate_option(dhfile, Value) when is_list(Value), Value =/= "" ->
+    list_to_binary(Value);
 validate_option(ciphers, Value)  when is_list(Value) ->
     Version = ssl_record:highest_protocol_version([]),
     try cipher_suites(Version, Value)
@@ -679,15 +765,68 @@ validate_option(hibernate_after, undefined) ->
     undefined;
 validate_option(hibernate_after, Value) when is_integer(Value), Value >= 0 ->
     Value;
-validate_option(erl_dist,Value) when Value == true; 
+validate_option(erl_dist,Value) when Value == true;
 				     Value == false ->
     Value;
+validate_option(client_preferred_next_protocols = Opt, {Precedence, PreferredProtocols} = Value)
+  when is_list(PreferredProtocols) ->
+    case ssl_record:highest_protocol_version([]) of
+	{3,0} ->
+	    throw({error, {eoptions, {not_supported_in_sslv3, {Opt, Value}}}});
+	_ ->
+	    validate_binary_list(client_preferred_next_protocols, PreferredProtocols),
+	    validate_npn_ordering(Precedence),
+	    {Precedence, PreferredProtocols, ?NO_PROTOCOL}
+    end;
+validate_option(client_preferred_next_protocols = Opt, {Precedence, PreferredProtocols, Default} = Value)
+      when is_list(PreferredProtocols), is_binary(Default),
+           byte_size(Default) > 0, byte_size(Default) < 256 ->
+    case ssl_record:highest_protocol_version([]) of
+	{3,0} ->
+	    throw({error, {eoptions, {not_supported_in_sslv3, {Opt, Value}}}});
+	_ ->
+	    validate_binary_list(client_preferred_next_protocols, PreferredProtocols),
+	    validate_npn_ordering(Precedence),
+	    Value
+    end;
+	
+validate_option(client_preferred_next_protocols, undefined) ->
+    undefined;
+validate_option(next_protocols_advertised = Opt, Value) when is_list(Value) ->
+    case ssl_record:highest_protocol_version([]) of
+	{3,0} ->
+	    throw({error, {eoptions, {not_supported_in_sslv3, {Opt, Value}}}});
+	_ ->
+	    validate_binary_list(next_protocols_advertised, Value),
+	    Value
+    end;
+
+validate_option(next_protocols_advertised, undefined) ->
+    undefined;
 validate_option(Opt, Value) ->
     throw({error, {eoptions, {Opt, Value}}}).
-    
+
+validate_npn_ordering(client) ->
+    ok;
+validate_npn_ordering(server) ->
+    ok;
+validate_npn_ordering(Value) ->
+    throw({error, {eoptions, {client_preferred_next_protocols, {invalid_precedence, Value}}}}).
+
+validate_binary_list(Opt, List) ->
+    lists:foreach(
+        fun(Bin) when is_binary(Bin),
+                      byte_size(Bin) > 0,
+                      byte_size(Bin) < 256 ->
+            ok;
+           (Bin) ->
+            throw({error, {eoptions, {Opt, {invalid_protocol, Bin}}}})
+        end, List).
+
 validate_versions([], Versions) ->
     Versions;
-validate_versions([Version | Rest], Versions) when Version == 'tlsv1.1'; 
+validate_versions([Version | Rest], Versions) when Version == 'tlsv1.2';
+                                                   Version == 'tlsv1.1';
                                                    Version == tlsv1; 
                                                    Version == sslv3 ->
     validate_versions(Rest, Versions);					   
@@ -732,10 +871,10 @@ internal_inet_values() ->
 
 socket_options(InetValues) ->
     #socket_options{
-		mode   = proplists:get_value(mode, InetValues),
-		header = proplists:get_value(header, InetValues),
-		active = proplists:get_value(active, InetValues),
-		packet = proplists:get_value(packet, InetValues),
+		mode   = proplists:get_value(mode, InetValues, lists),
+		header = proplists:get_value(header, InetValues, 0),
+		active = proplists:get_value(active, InetValues, active),
+		packet = proplists:get_value(packet, InetValues, 0),
 		packet_size = proplists:get_value(packet_size, InetValues)	     
 	       }.
 
@@ -789,6 +928,34 @@ cipher_suites(Version, Ciphers0)  ->
 
 no_format(Error) ->    
     lists:flatten(io_lib:format("No format string for error: \"~p\" available.", [Error])).
+
+detect(_Pred, []) ->
+    undefined;
+detect(Pred, [H|T]) ->
+    case Pred(H) of
+        true ->
+            H;
+        _ ->
+            detect(Pred, T)
+    end.
+
+make_next_protocol_selector(undefined) ->
+    undefined;
+make_next_protocol_selector({client, AllProtocols, DefaultProtocol}) ->
+    fun(AdvertisedProtocols) ->
+        case detect(fun(PreferredProtocol) -> lists:member(PreferredProtocol, AdvertisedProtocols) end, AllProtocols) of
+            undefined -> DefaultProtocol;
+            PreferredProtocol -> PreferredProtocol
+        end
+    end;
+
+make_next_protocol_selector({server, AllProtocols, DefaultProtocol}) ->
+    fun(AdvertisedProtocols) ->
+        case detect(fun(PreferredProtocol) -> lists:member(PreferredProtocol, AllProtocols) end, AdvertisedProtocols) of
+            undefined -> DefaultProtocol;
+            PreferredProtocol -> PreferredProtocol
+        end
+    end.
                                 
 %% Only used to remove exit messages from old ssl
 %% First is a nonsense clause to provide some
@@ -796,7 +963,5 @@ no_format(Error) ->
 %% function in a none recommended way, but will
 %% work correctly if a valid pid is returned.
 %% Deprcated to be removed in r16
-pid(#sslsocket{fd = new_ssl}) ->
-     whereis(ssl_connection_sup);
-pid(#sslsocket{pid = Pid}) ->
-     Pid.
+pid(#sslsocket{})->
+    whereis(ssl_connection_sup).
diff --git a/lib/ssl/src/ssl_alert.erl b/lib/ssl/src/ssl_alert.erl
index eb1228afa4..222b3f1ad7 100644
--- a/lib/ssl/src/ssl_alert.erl
+++ b/lib/ssl/src/ssl_alert.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -84,6 +84,8 @@ description_txt(?DECOMPRESSION_FAILURE) ->
     "decompression failure";
 description_txt(?HANDSHAKE_FAILURE) ->
     "handshake failure";
+description_txt(?NO_CERTIFICATE_RESERVED) ->
+    "No certificate reserved";
 description_txt(?BAD_CERTIFICATE) ->
     "bad certificate";
 description_txt(?UNSUPPORTED_CERTIFICATE) ->
diff --git a/lib/ssl/src/ssl_alert.hrl b/lib/ssl/src/ssl_alert.hrl
index 6470b82d50..92548edab7 100644
--- a/lib/ssl/src/ssl_alert.hrl
+++ b/lib/ssl/src/ssl_alert.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -43,6 +43,7 @@
 %%       record_overflow(22),
 %%       decompression_failure(30),
 %%       handshake_failure(40),
+%%       no_certificate_RESERVED(41), %% Only sslv3
 %%       bad_certificate(42),
 %%       unsupported_certificate(43),
 %%       certificate_revoked(44),
@@ -69,6 +70,7 @@
 -define(RECORD_OVERFLOW, 22).
 -define(DECOMPRESSION_FAILURE, 30).
 -define(HANDSHAKE_FAILURE, 40).
+-define(NO_CERTIFICATE_RESERVED, 41).
 -define(BAD_CERTIFICATE, 42).
 -define(UNSUPPORTED_CERTIFICATE, 43).
 -define(CERTIFICATE_REVOKED, 44).
diff --git a/lib/ssl/src/ssl_certificate.erl b/lib/ssl/src/ssl_certificate.erl
index 0931b86782..86f5617b54 100644
--- a/lib/ssl/src/ssl_certificate.erl
+++ b/lib/ssl/src/ssl_certificate.erl
@@ -103,7 +103,7 @@ certificate_chain(OwnCert, CertDbHandle, CertsDbRef) ->
     ErlCert = public_key:pkix_decode_cert(OwnCert, otp),
     certificate_chain(ErlCert, OwnCert, CertDbHandle, CertsDbRef, [OwnCert]).
 %%--------------------------------------------------------------------
--spec file_to_certificats(string(), term()) -> [der_cert()].
+-spec file_to_certificats(binary(), term()) -> [der_cert()].
 %%
 %% Description: Return list of DER encoded certificates.
 %%--------------------------------------------------------------------
@@ -172,7 +172,12 @@ extensions_list(Extensions) ->
 %% Description: 
 %%--------------------------------------------------------------------
 signature_type(RSA) when RSA == ?sha1WithRSAEncryption;
-			 RSA == ?md5WithRSAEncryption ->
+			 RSA == ?md5WithRSAEncryption;
+			 RSA == ?sha224WithRSAEncryption;
+			 RSA == ?sha256WithRSAEncryption;
+			 RSA == ?sha384WithRSAEncryption;
+			 RSA == ?sha512WithRSAEncryption
+			 ->
     rsa;
 signature_type(?'id-dsa-with-sha1') ->
     dsa.
diff --git a/lib/ssl/src/ssl_certificate_db.erl b/lib/ssl/src/ssl_certificate_db.erl
index cb2473576a..67d00f0da7 100644
--- a/lib/ssl/src/ssl_certificate_db.erl
+++ b/lib/ssl/src/ssl_certificate_db.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -24,12 +24,13 @@
 -module(ssl_certificate_db).
 -include("ssl_internal.hrl").
 -include_lib("public_key/include/public_key.hrl").
+-include_lib("kernel/include/file.hrl").
 
 -export([create/0, remove/1, add_trusted_certs/3, 
-	 remove_trusted_certs/2, lookup_trusted_cert/4, foldl/3, 
-	 lookup_cached_certs/2, cache_pem_file/4, uncache_pem_file/2, lookup/2]).
-
--type time()      :: {non_neg_integer(), non_neg_integer(), non_neg_integer()}.
+	 remove_trusted_certs/2, insert/3, remove/2, clear/1, db_size/1,
+	 ref_count/3, lookup_trusted_cert/4, foldl/3,
+	 lookup_cached_pem/2, cache_pem_file/2, cache_pem_file/3,
+	 lookup/2]).
 
 %%====================================================================
 %% Internal application API
@@ -43,9 +44,14 @@
 %% the process that called create may call the other functions.
 %%--------------------------------------------------------------------
 create() ->
-    [ets:new(ssl_otp_certificate_db, [set, protected]),
-     ets:new(ssl_file_to_ref, [set, protected]),
-     ets:new(ssl_pid_to_file, [bag, private])]. 
+    [%% Let connection process delete trusted certs
+     %% that can only belong to one connection. (Supplied directly
+     %% on DER format to ssl:connect/listen.)
+     ets:new(ssl_otp_cacertificate_db, [set, public]),
+     %% Let connection processes call ref_count/3 directly
+     ets:new(ssl_otp_ca_file_ref, [set, public]),
+     ets:new(ssl_otp_pem_cache, [set, protected])
+    ].
 
 %%--------------------------------------------------------------------
 -spec remove([db_handle()]) -> term().
@@ -53,7 +59,9 @@ create() ->
 %% Description: Removes database db  
 %%--------------------------------------------------------------------
 remove(Dbs) ->
-    lists:foreach(fun(Db) -> true = ets:delete(Db) end, Dbs).
+    lists:foreach(fun(Db) ->
+			  true = ets:delete(Db)
+		  end, Dbs).
 
 %%--------------------------------------------------------------------
 -spec lookup_trusted_cert(db_handle(), certdb_ref(), serialnumber(), issuer()) ->
@@ -72,11 +80,14 @@ lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer) ->
 	    {ok, Certs}
     end.
 
-lookup_cached_certs(DbHandle, File) ->
-    ets:lookup(DbHandle, {file, File}).
+lookup_cached_pem([_, _, PemChache], MD5) ->
+    lookup_cached_pem(PemChache, MD5);
+lookup_cached_pem(PemChache, MD5) ->
+    lookup(MD5, PemChache).
 
 %%--------------------------------------------------------------------
--spec add_trusted_certs(pid(), string() | {der, list()}, [db_handle()]) -> {ok, [db_handle()]}.
+-spec add_trusted_certs(pid(), {erlang:timestamp(), string()} |
+			{der, list()}, [db_handle()]) -> {ok, [db_handle()]}.
 %%
 %% Description: Adds the trusted certificates from file <File> to the
 %% runtime database. Returns Ref that should be handed to lookup_trusted_cert
@@ -86,82 +97,55 @@ add_trusted_certs(_Pid, {der, DerList}, [CerDb, _,_]) ->
     NewRef = make_ref(),
     add_certs_from_der(DerList, NewRef, CerDb),
     {ok, NewRef};
-add_trusted_certs(Pid, File, [CertsDb, FileToRefDb, PidToFileDb]) ->
-    Ref = case lookup(File, FileToRefDb) of
-	      undefined ->
-		  NewRef = make_ref(),
-		  add_certs_from_file(File, NewRef, CertsDb),
-		  insert(File, NewRef, 1, FileToRefDb),
-		  NewRef;
-	      [OldRef] ->
-		  ref_count(File,FileToRefDb,1),
-		  OldRef
-	  end,
-    insert(Pid, File, PidToFileDb),
-    {ok, Ref}.
+
+add_trusted_certs(_Pid, File, [CertsDb, RefDb, PemChache] = Db) ->
+    MD5 = crypto:md5(File),
+    case lookup_cached_pem(Db, MD5) of
+	[{_Content, Ref}] ->
+	    ref_count(Ref, RefDb, 1),
+	    {ok, Ref};
+	[Content] ->
+	    Ref = make_ref(),
+	    update_counter(Ref, 1, RefDb),
+	    insert(MD5, {Content, Ref}, PemChache),
+	    add_certs_from_pem(Content, Ref, CertsDb),
+	    {ok, Ref};
+	undefined ->
+	    new_trusted_cert_entry({MD5, File}, Db)
+    end.
 %%--------------------------------------------------------------------
--spec cache_pem_file(pid(), string(), time(), [db_handle()]) -> term().
+-spec cache_pem_file({binary(), binary()}, [db_handle()]) -> term().
+-spec cache_pem_file(reference(), {binary(), binary()}, [db_handle()]) -> term().
 %%
 %% Description: Cache file as binary in DB
 %%--------------------------------------------------------------------
-cache_pem_file(Pid, File, Time, [CertsDb, _FileToRefDb, PidToFileDb]) ->
-    {ok, PemBin} = file:read_file(File), 
+cache_pem_file({MD5, File}, [_CertsDb, _RefDb, PemChache]) ->
+    {ok, PemBin} = file:read_file(File),
     Content = public_key:pem_decode(PemBin),
-    insert({file, File}, {Time, Content}, CertsDb),
-    insert(Pid, File, PidToFileDb),
+    insert(MD5, Content, PemChache),
     {ok, Content}.
 
-%--------------------------------------------------------------------
--spec uncache_pem_file(string(), [db_handle()]) -> no_return().
-%%
-%% Description: If a cached file is no longer valid (changed on disk)
-%% we must terminate the connections using the old file content, and
-%% when those processes are finish the cache will be cleaned. It is
-%% a rare but possible case a new ssl client/server is started with
-%% a filename with the same name as previously started client/server
-%% but with different content.
-%% --------------------------------------------------------------------
-uncache_pem_file(File, [_CertsDb, _FileToRefDb, PidToFileDb]) ->
-    Pids = select(PidToFileDb, [{{'$1', File},[],['$$']}]),
-    lists:foreach(fun([Pid]) ->
-			  exit(Pid, shutdown)
-		  end, Pids).
-
-%%--------------------------------------------------------------------
--spec remove_trusted_certs(pid(), [db_handle()]) -> term().
-				  
-%%
-%% Description: Removes trusted certs originating from 
-%% the file associated to Pid from the runtime database.  
-%%--------------------------------------------------------------------
-remove_trusted_certs(Pid, [CertsDb, FileToRefDb, PidToFileDb]) ->
-    Files = lookup(Pid, PidToFileDb),
-    delete(Pid, PidToFileDb),
-    Clear = fun(File) ->
-		    delete({file,File}, CertsDb),
-		    try
-			0 = ref_count(File, FileToRefDb, -1),
-			case lookup(File, FileToRefDb) of
-			    [Ref] when is_reference(Ref) ->
-				remove_certs(Ref, CertsDb);
-			    _ -> ok
-			end,
-			delete(File, FileToRefDb)
-		    catch _:_ ->
-			    ok
-		    end
-	    end,
-    case Files of 
-	undefined -> ok;
-	_ -> 
-	    [Clear(File) || File <- Files],
-	    ok
-    end.
+cache_pem_file(Ref, {MD5, File}, [_CertsDb, _RefDb, PemChache]) ->
+    {ok, PemBin} = file:read_file(File),
+    Content = public_key:pem_decode(PemBin),
+    insert(MD5, {Content, Ref}, PemChache),
+    {ok, Content}.
+
+remove_trusted_certs(Ref, CertsDb) ->
+    remove_certs(Ref, CertsDb).
+
+%%--------------------------------------------------------------------
+-spec remove(term(), db_handle()) -> term().
+%%
+%% Description: Removes an element in a <Db>.
+%%--------------------------------------------------------------------
+remove(Key, Db) ->
+    _ = ets:delete(Db, Key).
 
 %%--------------------------------------------------------------------
 -spec lookup(term(), db_handle()) -> term() | undefined.
 %%
-%% Description: Looks up an element in a certificat <Db>.
+%% Description: Looks up an element in a <Db>.
 %%--------------------------------------------------------------------
 lookup(Key, Db) ->
     case ets:lookup(Db, Key) of
@@ -184,24 +168,44 @@ lookup(Key, Db) ->
 %%--------------------------------------------------------------------
 foldl(Fun, Acc0, Cache) ->
     ets:foldl(Fun, Acc0, Cache).
-  
+
 %%--------------------------------------------------------------------
-%%% Internal functions
+-spec ref_count(term(), db_handle(), integer()) -> integer().
+%%
+%% Description: Updates a reference counter in a <Db>.
 %%--------------------------------------------------------------------
-insert(Key, Data, Db) ->
-    true = ets:insert(Db, {Key, Data}).
+ref_count(Key, Db, N) ->
+    ets:update_counter(Db,Key,N).
 
-insert(Key, Data, Count, Db) ->
-    true = ets:insert(Db, {Key, Count, Data}).
+%%--------------------------------------------------------------------
+-spec clear(db_handle()) -> term().
+%%
+%% Description: Clears the cache
+%%--------------------------------------------------------------------
+clear(Db) ->
+    ets:delete_all_objects(Db).
 
-ref_count(Key, Db,N) ->
-    ets:update_counter(Db,Key,N).
+%%--------------------------------------------------------------------
+-spec db_size(db_handle()) -> integer().
+%%
+%% Description: Returns the size of the db
+%%--------------------------------------------------------------------
+db_size(Db) ->
+    ets:info(Db, size).
 
-delete(Key, Db) ->
-    _ = ets:delete(Db, Key).
+%%--------------------------------------------------------------------
+%%-spec insert(Key::term(), Data::term(), Db::db_handle()) -> no_return().
+%%
+%% Description: Inserts data into <Db>
+%%--------------------------------------------------------------------
+insert(Key, Data, Db) ->
+    true = ets:insert(Db, {Key, Data}).
 
-select(Db, MatchSpec)->
-    ets:select(Db, MatchSpec).
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+update_counter(Key, Count, Db) ->
+    true = ets:insert(Db, {Key, Count}).
 
 remove_certs(Ref, CertsDb) ->
     ets:match_delete(CertsDb, {{Ref, '_', '_'}, '_'}).
@@ -210,10 +214,8 @@ add_certs_from_der(DerList, Ref, CertsDb) ->
     Add = fun(Cert) -> add_certs(Cert, Ref, CertsDb) end,
      [Add(Cert) || Cert <- DerList].
 
-add_certs_from_file(File, Ref, CertsDb) ->   
+add_certs_from_pem(PemEntries, Ref, CertsDb) ->
     Add = fun(Cert) -> add_certs(Cert, Ref, CertsDb) end,
-    {ok, PemBin} = file:read_file(File),
-    PemEntries = public_key:pem_decode(PemBin),
     [Add(Cert) || {'Certificate', Cert, not_encrypted} <- PemEntries].
     
 add_certs(Cert, Ref, CertsDb) ->
@@ -229,3 +231,10 @@ add_certs(Cert, Ref, CertsDb) ->
 				   "it could not be correctly decoded.~n", []),
 	    error_logger:info_report(Report)
     end.
+
+new_trusted_cert_entry(FileRef, [CertsDb, RefDb, _] = Db) ->
+    Ref = make_ref(),
+    update_counter(Ref, 1, RefDb),
+    {ok, Content} = cache_pem_file(Ref, FileRef, Db),
+    add_certs_from_pem(Content, Ref, CertsDb),
+    {ok, Ref}.
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index d43d312be8..567690a413 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -28,25 +28,27 @@
 -include("ssl_internal.hrl").
 -include("ssl_record.hrl").
 -include("ssl_cipher.hrl").
+-include("ssl_handshake.hrl").
 -include("ssl_alert.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
--export([security_parameters/2, suite_definition/1,
-	 decipher/5, cipher/4, 
+-export([security_parameters/3, suite_definition/1,
+	 decipher/5, cipher/5,
 	 suite/1, suites/1, anonymous_suites/0,
-	 openssl_suite/1, openssl_suite_name/1, filter/2]).
+	 openssl_suite/1, openssl_suite_name/1, filter/2,
+	 hash_algorithm/1, sign_algorithm/1]).
 
 -compile(inline).
 
 %%--------------------------------------------------------------------
--spec security_parameters(cipher_suite(), #security_parameters{}) -> 
+-spec security_parameters(tls_version(), cipher_suite(), #security_parameters{}) ->
 				 #security_parameters{}.
 %%
 %% Description: Returns a security parameters record where the
 %% cipher values has been updated according to <CipherSuite> 
 %%-------------------------------------------------------------------
-security_parameters(CipherSuite, SecParams) ->
-    { _, Cipher, Hash} = suite_definition(CipherSuite),
+security_parameters(Version, CipherSuite, SecParams) ->
+    { _, Cipher, Hash, PrfHashAlg} = suite_definition(CipherSuite),
     SecParams#security_parameters{
       cipher_suite = CipherSuite,
       bulk_cipher_algorithm = bulk_cipher_algorithm(Cipher),
@@ -55,20 +57,21 @@ security_parameters(CipherSuite, SecParams) ->
       expanded_key_material_length = expanded_key_material(Cipher),
       key_material_length = key_material(Cipher),
       iv_size = iv_size(Cipher),
-      mac_algorithm = mac_algorithm(Hash),
+      mac_algorithm = hash_algorithm(Hash),
+      prf_algorithm = prf_algorithm(PrfHashAlg, Version),
       hash_size = hash_size(Hash)}.
 
 %%--------------------------------------------------------------------
--spec cipher(cipher_enum(), #cipher_state{}, binary(), binary()) -> 
+-spec cipher(cipher_enum(), #cipher_state{}, binary(), binary(), tls_version()) ->
 		    {binary(), #cipher_state{}}. 
 %%
 %% Description: Encrypts the data and the MAC using chipher described
 %% by cipher_enum() and updating the cipher state
 %%-------------------------------------------------------------------
-cipher(?NULL, CipherState, <<>>, Fragment) ->
+cipher(?NULL, CipherState, <<>>, Fragment, _Version) ->
     GenStreamCipherList = [Fragment, <<>>],
     {GenStreamCipherList, CipherState};
-cipher(?RC4, CipherState, Mac, Fragment) ->
+cipher(?RC4, CipherState, Mac, Fragment, _Version) ->
     State0 = case CipherState#cipher_state.state of
                  undefined -> crypto:rc4_set_key(CipherState#cipher_state.key);
                  S -> S
@@ -76,32 +79,41 @@ cipher(?RC4, CipherState, Mac, Fragment) ->
     GenStreamCipherList = [Fragment, Mac],
     {State1, T} = crypto:rc4_encrypt_with_state(State0, GenStreamCipherList),
     {T, CipherState#cipher_state{state = State1}};
-cipher(?DES, CipherState, Mac, Fragment) ->
+cipher(?DES, CipherState, Mac, Fragment, Version) ->
     block_cipher(fun(Key, IV, T) ->
 			 crypto:des_cbc_encrypt(Key, IV, T)
-		 end, block_size(des_cbc), CipherState, Mac, Fragment);
-cipher(?'3DES', CipherState, Mac, Fragment) ->
+		 end, block_size(des_cbc), CipherState, Mac, Fragment, Version);
+cipher(?'3DES', CipherState, Mac, Fragment, Version) ->
     block_cipher(fun(<<K1:8/binary, K2:8/binary, K3:8/binary>>, IV, T) ->
 			 crypto:des3_cbc_encrypt(K1, K2, K3, IV, T)
-		 end, block_size(des_cbc), CipherState, Mac, Fragment);
-cipher(?AES, CipherState, Mac, Fragment) ->
+		 end, block_size(des_cbc), CipherState, Mac, Fragment, Version);
+cipher(?AES, CipherState, Mac, Fragment, Version) ->
     block_cipher(fun(Key, IV, T) when byte_size(Key) =:= 16 ->
 			 crypto:aes_cbc_128_encrypt(Key, IV, T);
 		    (Key, IV, T) when byte_size(Key) =:= 32 ->
 			 crypto:aes_cbc_256_encrypt(Key, IV, T)
-		 end, block_size(aes_128_cbc), CipherState, Mac, Fragment).
-%% cipher(?IDEA, CipherState, Mac, Fragment) ->
-%%     block_cipher(fun(Key, IV, T) ->
-%% 			 crypto:idea_cbc_encrypt(Key, IV, T)
-%% 		 end, block_size(idea_cbc), CipherState, Mac, Fragment);
-
-block_cipher(Fun, BlockSz, #cipher_state{key=Key, iv=IV} = CS0, 
-	     Mac, Fragment) ->
+		 end, block_size(aes_128_cbc), CipherState, Mac, Fragment, Version).
+
+build_cipher_block(BlockSz, Mac, Fragment) ->
     TotSz = byte_size(Mac) + erlang:iolist_size(Fragment) + 1,
     {PaddingLength, Padding} = get_padding(TotSz, BlockSz),
-    L = [Fragment, Mac, PaddingLength, Padding],
+    [Fragment, Mac, PaddingLength, Padding].
+
+block_cipher(Fun, BlockSz, #cipher_state{key=Key, iv=IV} = CS0,
+	     Mac, Fragment, {3, N})
+  when N == 0; N == 1 ->
+    L = build_cipher_block(BlockSz, Mac, Fragment),
     T = Fun(Key, IV, L),
     NextIV = next_iv(T, IV),
+    {T, CS0#cipher_state{iv=NextIV}};
+
+block_cipher(Fun, BlockSz, #cipher_state{key=Key, iv=IV} = CS0,
+	     Mac, Fragment, {3, N})
+  when N == 2; N == 3 ->
+    NextIV = random_iv(IV),
+    L0 = build_cipher_block(BlockSz, Mac, Fragment),
+    L = [NextIV|L0],
+    T = Fun(Key, IV, L),
     {T, CS0#cipher_state{iv=NextIV}}.
 
 %%--------------------------------------------------------------------
@@ -147,19 +159,16 @@ decipher(?AES, HashSz, CipherState, Fragment, Version) ->
 		      (Key, IV, T) when byte_size(Key) =:= 32 ->
 			   crypto:aes_cbc_256_decrypt(Key, IV, T)
 		   end, CipherState, HashSz, Fragment, Version).
-%% decipher(?IDEA, HashSz, CipherState, Fragment, Version) ->
-%%     block_decipher(fun(Key, IV, T) ->
-%%  			   crypto:idea_cbc_decrypt(Key, IV, T)
-%%  		   end, CipherState, HashSz, Fragment, Version);
 
 block_decipher(Fun, #cipher_state{key=Key, iv=IV} = CipherState0, 
 	       HashSz, Fragment, Version) ->
     try 
 	Text = Fun(Key, IV, Fragment),
-	GBC = generic_block_cipher_from_bin(Text, HashSz),
+	NextIV = next_iv(Fragment, IV),
+	GBC = generic_block_cipher_from_bin(Version, Text, NextIV, HashSz),
 	Content = GBC#generic_block_cipher.content,
 	Mac = GBC#generic_block_cipher.mac,
-	CipherState1 = CipherState0#cipher_state{iv=next_iv(Fragment, IV)},
+	CipherState1 = CipherState0#cipher_state{iv=GBC#generic_block_cipher.next_iv},
 	case is_correct_padding(GBC, Version) of
 	    true ->
 		{Content, Mac, CipherState1};
@@ -187,8 +196,8 @@ block_decipher(Fun, #cipher_state{key=Key, iv=IV} = CipherState0,
 %%--------------------------------------------------------------------
 suites({3, 0}) ->
     ssl_ssl3:suites();
-suites({3, N}) when N == 1; N == 2 ->
-    ssl_tls1:suites().
+suites({3, N}) ->
+    ssl_tls1:suites(N).
 
 %%--------------------------------------------------------------------
 -spec anonymous_suites() -> [cipher_suite()].
@@ -201,10 +210,12 @@ anonymous_suites() ->
      ?TLS_DH_anon_WITH_DES_CBC_SHA,
      ?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA,
      ?TLS_DH_anon_WITH_AES_128_CBC_SHA,
-     ?TLS_DH_anon_WITH_AES_256_CBC_SHA].
+     ?TLS_DH_anon_WITH_AES_256_CBC_SHA,
+     ?TLS_DH_anon_WITH_AES_128_CBC_SHA256,
+     ?TLS_DH_anon_WITH_AES_256_CBC_SHA256].
 
 %%--------------------------------------------------------------------
--spec suite_definition(cipher_suite()) -> erl_cipher_suite().
+-spec suite_definition(cipher_suite()) -> int_cipher_suite().
 %%
 %% Description: Return erlang cipher suite definition.
 %% Note: Currently not supported suites are commented away.
@@ -212,56 +223,81 @@ anonymous_suites() ->
 %%-------------------------------------------------------------------
 %% TLS v1.1 suites
 suite_definition(?TLS_NULL_WITH_NULL_NULL) ->
-    {null, null, null};
+    {null, null, null, null};
 %% suite_definition(?TLS_RSA_WITH_NULL_MD5) ->
-%%     {rsa, null, md5};
+%%     {rsa, null, md5, default_prf};
 %% suite_definition(?TLS_RSA_WITH_NULL_SHA) ->
-%%     {rsa, null, sha};	
+%%     {rsa, null, sha, default_prf};
 suite_definition(?TLS_RSA_WITH_RC4_128_MD5) ->	
-    {rsa, rc4_128, md5};
-suite_definition(?TLS_RSA_WITH_RC4_128_SHA) ->	
-    {rsa, rc4_128, sha};
-%% suite_definition(?TLS_RSA_WITH_IDEA_CBC_SHA) -> 
-%%     {rsa, idea_cbc, sha};
-suite_definition(?TLS_RSA_WITH_DES_CBC_SHA) ->	
-    {rsa, des_cbc, sha}; 
+    {rsa, rc4_128, md5, default_prf};
+suite_definition(?TLS_RSA_WITH_RC4_128_SHA) ->
+    {rsa, rc4_128, sha, default_prf};
+suite_definition(?TLS_RSA_WITH_DES_CBC_SHA) ->
+    {rsa, des_cbc, sha, default_prf};
 suite_definition(?TLS_RSA_WITH_3DES_EDE_CBC_SHA) ->
-    {rsa, '3des_ede_cbc', sha}; 
+    {rsa, '3des_ede_cbc', sha, default_prf};
 suite_definition(?TLS_DHE_DSS_WITH_DES_CBC_SHA) ->
-    {dhe_dss, des_cbc, sha};
+    {dhe_dss, des_cbc, sha, default_prf};
 suite_definition(?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA) ->
-    {dhe_dss, '3des_ede_cbc', sha};
+    {dhe_dss, '3des_ede_cbc', sha, default_prf};
 suite_definition(?TLS_DHE_RSA_WITH_DES_CBC_SHA) ->
-    {dhe_rsa, des_cbc, sha};
+    {dhe_rsa, des_cbc, sha, default_prf};
 suite_definition(?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA) ->
-    {dhe_rsa, '3des_ede_cbc', sha}; 
+    {dhe_rsa, '3des_ede_cbc', sha, default_prf};
 
 %%% TSL V1.1 AES suites
 suite_definition(?TLS_RSA_WITH_AES_128_CBC_SHA) -> 
-    {rsa, aes_128_cbc, sha};
+    {rsa, aes_128_cbc, sha, default_prf};
 suite_definition(?TLS_DHE_DSS_WITH_AES_128_CBC_SHA) ->
-    {dhe_dss, aes_128_cbc, sha};
+    {dhe_dss, aes_128_cbc, sha, default_prf};
 suite_definition(?TLS_DHE_RSA_WITH_AES_128_CBC_SHA) ->
-    {dhe_rsa, aes_128_cbc, sha};
+    {dhe_rsa, aes_128_cbc, sha, default_prf};
 suite_definition(?TLS_RSA_WITH_AES_256_CBC_SHA) -> 
-    {rsa, aes_256_cbc, sha};
+    {rsa, aes_256_cbc, sha, default_prf};
 suite_definition(?TLS_DHE_DSS_WITH_AES_256_CBC_SHA) ->
-    {dhe_dss, aes_256_cbc, sha};
+    {dhe_dss, aes_256_cbc, sha, default_prf};
 suite_definition(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA) ->
-    {dhe_rsa, aes_256_cbc, sha};
+    {dhe_rsa, aes_256_cbc, sha, default_prf};
+
+%% TLS v1.2 suites
+
+%% suite_definition(?TLS_RSA_WITH_NULL_SHA) ->
+%%     {rsa, null, sha, default_prf};
+suite_definition(?TLS_RSA_WITH_AES_128_CBC_SHA256) ->
+    {rsa, aes_128_cbc, sha256, default_prf};
+suite_definition(?TLS_RSA_WITH_AES_256_CBC_SHA256) ->
+    {rsa, aes_256_cbc, sha256, default_prf};
+suite_definition(?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256) ->
+    {dhe_dss, aes_128_cbc, sha256, default_prf};
+suite_definition(?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256) ->
+    {dhe_rsa, aes_128_cbc, sha256, default_prf};
+suite_definition(?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256) ->
+    {dhe_dss, aes_256_cbc, sha256, default_prf};
+suite_definition(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256) ->
+    {dhe_rsa, aes_256_cbc, sha256, default_prf};
+
+%% not defined YET:
+%%   TLS_DH_DSS_WITH_AES_128_CBC_SHA256      DH_DSS       AES_128_CBC  SHA256
+%%   TLS_DH_RSA_WITH_AES_128_CBC_SHA256      DH_RSA       AES_128_CBC  SHA256
+%%   TLS_DH_DSS_WITH_AES_256_CBC_SHA256      DH_DSS       AES_256_CBC  SHA256
+%%   TLS_DH_RSA_WITH_AES_256_CBC_SHA256      DH_RSA       AES_256_CBC  SHA256
 
 %%% DH-ANON deprecated by TLS spec and not available
 %%% by default, but good for testing purposes.
 suite_definition(?TLS_DH_anon_WITH_RC4_128_MD5) ->
-    {dh_anon, rc4_128, md5};
+    {dh_anon, rc4_128, md5, default_prf};
 suite_definition(?TLS_DH_anon_WITH_DES_CBC_SHA) ->
-    {dh_anon, des_cbc, sha};
+    {dh_anon, des_cbc, sha, default_prf};
 suite_definition(?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA) ->
-    {dh_anon, '3des_ede_cbc', sha};
+    {dh_anon, '3des_ede_cbc', sha, default_prf};
 suite_definition(?TLS_DH_anon_WITH_AES_128_CBC_SHA) ->
-    {dh_anon, aes_128_cbc, sha};
+    {dh_anon, aes_128_cbc, sha, default_prf};
 suite_definition(?TLS_DH_anon_WITH_AES_256_CBC_SHA) ->
-    {dh_anon, aes_256_cbc, sha}.
+    {dh_anon, aes_256_cbc, sha, default_prf};
+suite_definition(?TLS_DH_anon_WITH_AES_128_CBC_SHA256) ->
+    {dh_anon, aes_128_cbc, sha256, default_prf};
+suite_definition(?TLS_DH_anon_WITH_AES_256_CBC_SHA256) ->
+    {dh_anon, aes_256_cbc, sha256, default_prf}.
 
 %%--------------------------------------------------------------------
 -spec suite(erl_cipher_suite()) -> cipher_suite().
@@ -278,8 +314,6 @@ suite({rsa, rc4_128, md5}) ->
     ?TLS_RSA_WITH_RC4_128_MD5;
 suite({rsa, rc4_128, sha}) ->
     ?TLS_RSA_WITH_RC4_128_SHA;
-%% suite({rsa, idea_cbc, sha}) -> 
-%%     ?TLS_RSA_WITH_IDEA_CBC_SHA;
 suite({rsa, des_cbc, sha}) ->
     ?TLS_RSA_WITH_DES_CBC_SHA; 
 suite({rsa, '3des_ede_cbc', sha}) ->
@@ -315,7 +349,28 @@ suite({dhe_dss, aes_256_cbc, sha}) ->
 suite({dhe_rsa, aes_256_cbc, sha}) ->
     ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
 suite({dh_anon, aes_256_cbc, sha}) ->
-    ?TLS_DH_anon_WITH_AES_256_CBC_SHA.
+    ?TLS_DH_anon_WITH_AES_256_CBC_SHA;
+
+%% TLS v1.2 suites
+
+%% suite_definition(?TLS_RSA_WITH_NULL_SHA) ->
+%%     {rsa, null, sha, sha256};
+suite({rsa, aes_128_cbc, sha256}) ->
+    ?TLS_RSA_WITH_AES_128_CBC_SHA256;
+suite({rsa, aes_256_cbc, sha256}) ->
+    ?TLS_RSA_WITH_AES_256_CBC_SHA256;
+suite({dhe_dss, aes_128_cbc, sha256}) ->
+    ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256;
+suite({dhe_rsa, aes_128_cbc, sha256}) ->
+    ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256;
+suite({dhe_dss, aes_256_cbc, sha256}) ->
+    ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256;
+suite({dhe_rsa, aes_256_cbc, sha256}) ->
+    ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256;
+suite({dh_anon, aes_128_cbc, sha256}) ->
+    ?TLS_DH_anon_WITH_AES_128_CBC_SHA256;
+suite({dh_anon, aes_256_cbc, sha256}) ->
+    ?TLS_DH_anon_WITH_AES_256_CBC_SHA256.
 
 %%--------------------------------------------------------------------
 -spec openssl_suite(openssl_cipher_suite()) -> cipher_suite().
@@ -323,6 +378,18 @@ suite({dh_anon, aes_256_cbc, sha}) ->
 %% Description: Return TLS cipher suite definition.
 %%--------------------------------------------------------------------
 %% translate constants <-> openssl-strings
+openssl_suite("DHE-RSA-AES256-SHA256") ->
+    ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256;
+openssl_suite("DHE-DSS-AES256-SHA256") ->
+    ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256;
+openssl_suite("AES256-SHA256") ->
+    ?TLS_RSA_WITH_AES_256_CBC_SHA256;
+openssl_suite("DHE-RSA-AES128-SHA256") ->
+    ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256;
+openssl_suite("DHE-DSS-AES128-SHA256") ->
+    ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256;
+openssl_suite("AES128-SHA256") ->
+    ?TLS_RSA_WITH_AES_128_CBC_SHA256;
 openssl_suite("DHE-RSA-AES256-SHA") ->
     ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
 openssl_suite("DHE-DSS-AES256-SHA") ->
@@ -341,8 +408,6 @@ openssl_suite("DHE-DSS-AES128-SHA") ->
     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA;
 openssl_suite("AES128-SHA") ->
     ?TLS_RSA_WITH_AES_128_CBC_SHA;
-%%openssl_suite("IDEA-CBC-SHA") ->
-%%    ?TLS_RSA_WITH_IDEA_CBC_SHA;
 openssl_suite("RC4-SHA") ->
     ?TLS_RSA_WITH_RC4_128_SHA;
 openssl_suite("RC4-MD5") -> 
@@ -374,8 +439,6 @@ openssl_suite_name(?TLS_DHE_DSS_WITH_AES_128_CBC_SHA) ->
     "DHE-DSS-AES128-SHA";
 openssl_suite_name(?TLS_RSA_WITH_AES_128_CBC_SHA) ->
     "AES128-SHA";
-%% openssl_suite_name(?TLS_RSA_WITH_IDEA_CBC_SHA) ->
-%%     "IDEA-CBC-SHA";
 openssl_suite_name(?TLS_RSA_WITH_RC4_128_SHA) ->
     "RC4-SHA";
 openssl_suite_name(?TLS_RSA_WITH_RC4_128_MD5) -> 
@@ -384,6 +447,28 @@ openssl_suite_name(?TLS_DHE_RSA_WITH_DES_CBC_SHA) ->
     "EDH-RSA-DES-CBC-SHA";
 openssl_suite_name(?TLS_RSA_WITH_DES_CBC_SHA) ->
     "DES-CBC-SHA";
+openssl_suite_name(?TLS_RSA_WITH_NULL_SHA256) ->
+    "NULL-SHA256";
+openssl_suite_name(?TLS_RSA_WITH_AES_128_CBC_SHA256) ->
+    "AES128-SHA256";
+openssl_suite_name(?TLS_RSA_WITH_AES_256_CBC_SHA256) ->
+    "AES256-SHA256";
+openssl_suite_name(?TLS_DH_DSS_WITH_AES_128_CBC_SHA256) ->
+    "DH-DSS-AES128-SHA256";
+openssl_suite_name(?TLS_DH_RSA_WITH_AES_128_CBC_SHA256) ->
+    "DH-RSA-AES128-SHA256";
+openssl_suite_name(?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256) ->
+    "DHE-DSS-AES128-SHA256";
+openssl_suite_name(?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256) ->
+    "DHE-RSA-AES128-SHA256";
+openssl_suite_name(?TLS_DH_DSS_WITH_AES_256_CBC_SHA256) ->
+    "DH-DSS-AES256-SHA256";
+openssl_suite_name(?TLS_DH_RSA_WITH_AES_256_CBC_SHA256) ->
+    "DH-RSA-AES256-SHA256";
+openssl_suite_name(?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256) ->
+    "DHE-DSS-AES256-SHA256";
+openssl_suite_name(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256) ->
+    "DHE-RSA-AES256-SHA256";
 %% No oppenssl name
 openssl_suite_name(Cipher) ->
     suite_definition(Cipher).
@@ -411,9 +496,6 @@ filter(DerCert, Ciphers) ->
 
 bulk_cipher_algorithm(null) ->
     ?NULL;
-%% Not supported yet
-%% bulk_cipher_algorithm(idea_cbc) ->
-%%     ?IDEA;
 bulk_cipher_algorithm(rc4_128) ->
     ?RC4;
 bulk_cipher_algorithm(des_cbc) ->
@@ -428,8 +510,7 @@ type(Cipher) when Cipher == null;
 		  Cipher == rc4_128 ->
     ?STREAM;
 
-type(Cipher) when Cipher == idea_cbc;
-		  Cipher == des_cbc;
+type(Cipher) when Cipher == des_cbc;
 		  Cipher == '3des_ede_cbc';
 		  Cipher == aes_128_cbc;
 		  Cipher == aes_256_cbc ->
@@ -437,8 +518,7 @@ type(Cipher) when Cipher == idea_cbc;
 
 key_material(null) ->
     0;
-key_material(Cipher) when Cipher == idea_cbc;
- 			  Cipher == rc4_128 ->
+key_material(rc4_128) ->
     16;
 key_material(des_cbc) ->
     8;
@@ -451,8 +531,7 @@ key_material(aes_256_cbc) ->
 
 expanded_key_material(null) ->
     0;
-expanded_key_material(Cipher) when Cipher == idea_cbc;
- 				   Cipher == rc4_128 ->
+expanded_key_material(rc4_128) ->
     16;
 expanded_key_material(Cipher) when Cipher == des_cbc ->
     8;
@@ -467,8 +546,7 @@ effective_key_bits(null) ->
     0;
 effective_key_bits(des_cbc) ->
     56;
-effective_key_bits(Cipher) when Cipher == idea_cbc;
-				Cipher == rc4_128;
+effective_key_bits(Cipher) when Cipher == rc4_128;
 				Cipher == aes_128_cbc ->
     128;
 effective_key_bits('3des_ede_cbc') ->
@@ -482,8 +560,7 @@ iv_size(Cipher) when Cipher == null;
 iv_size(Cipher) ->
     block_size(Cipher).
 
-block_size(Cipher) when Cipher == idea_cbc;
-			Cipher == des_cbc;
+block_size(Cipher) when Cipher == des_cbc;
 			Cipher == '3des_ede_cbc' -> 
     8;
 
@@ -491,19 +568,51 @@ block_size(Cipher) when Cipher == aes_128_cbc;
 			Cipher == aes_256_cbc ->
     16.
 
-mac_algorithm(null) ->
-    ?NULL;
-mac_algorithm(md5) ->
-    ?MD5;
-mac_algorithm(sha) ->
-    ?SHA.
+prf_algorithm(default_prf, {3, N}) when N >= 3 ->
+    ?SHA256;
+prf_algorithm(default_prf, {3, _}) ->
+    ?MD5SHA;
+prf_algorithm(Algo, _) ->
+    hash_algorithm(Algo).
+
+hash_algorithm(null)   -> ?NULL;
+hash_algorithm(md5)    -> ?MD5;
+hash_algorithm(sha)   -> ?SHA; %% Only sha always refers to "SHA-1"
+hash_algorithm(sha224) -> ?SHA224;
+hash_algorithm(sha256) -> ?SHA256;
+hash_algorithm(sha384) -> ?SHA384;
+hash_algorithm(sha512) -> ?SHA512;
+hash_algorithm(?NULL) -> null;
+hash_algorithm(?MD5) -> md5;
+hash_algorithm(?SHA) -> sha;
+hash_algorithm(?SHA224) -> sha224;
+hash_algorithm(?SHA256) -> sha256;
+hash_algorithm(?SHA384) -> sha384;
+hash_algorithm(?SHA512) -> sha512.
+
+sign_algorithm(anon)  -> ?ANON;
+sign_algorithm(rsa)   -> ?RSA;
+sign_algorithm(dsa)   -> ?DSA;
+sign_algorithm(ecdsa) -> ?ECDSA;
+sign_algorithm(?ANON) -> anon;
+sign_algorithm(?RSA) -> rsa;
+sign_algorithm(?DSA) -> dsa;
+sign_algorithm(?ECDSA) -> ecdsa.
 
 hash_size(null) ->
     0;
 hash_size(md5) ->
     16;
 hash_size(sha) ->
-    20.
+    20;
+hash_size(sha256) ->
+    32.
+%% Currently no supported cipher suites defaults to sha384 or sha512
+%% so these clauses are not needed at the moment.
+%% hash_size(sha384) ->
+%%     48;
+%% hash_size(sha512) ->
+%%     64.
 
 %% RFC 5246: 6.2.3.2.  CBC Block Cipher
 %%
@@ -525,7 +634,8 @@ hash_size(sha) ->
 %%   We return the original (possibly invalid) PadLength in any case.
 %%   An invalid PadLength will be caught by is_correct_padding/2
 %%
-generic_block_cipher_from_bin(T, HashSize) ->
+generic_block_cipher_from_bin({3, N}, T, IV, HashSize)
+  when N == 0; N == 1 ->
     Sz1 = byte_size(T) - 1,
     <<_:Sz1/binary, ?BYTE(PadLength0)>> = T,
     PadLength = if
@@ -536,7 +646,20 @@ generic_block_cipher_from_bin(T, HashSize) ->
     <<Content:CompressedLength/binary, Mac:HashSize/binary,
      Padding:PadLength/binary, ?BYTE(PadLength0)>> = T,
     #generic_block_cipher{content=Content, mac=Mac,
-			  padding=Padding, padding_length=PadLength0}.
+			  padding=Padding, padding_length=PadLength0,
+			  next_iv = IV};
+
+generic_block_cipher_from_bin({3, N}, T, IV, HashSize)
+  when N == 2; N == 3 ->
+    Sz1 = byte_size(T) - 1,
+    <<_:Sz1/binary, ?BYTE(PadLength)>> = T,
+    IVLength = byte_size(IV),
+    CompressedLength = byte_size(T) - IVLength - PadLength - 1 - HashSize,
+    <<NextIV:IVLength/binary, Content:CompressedLength/binary, Mac:HashSize/binary,
+      Padding:PadLength/binary, ?BYTE(PadLength)>> = T,
+    #generic_block_cipher{content=Content, mac=Mac,
+			  padding=Padding, padding_length=PadLength,
+			  next_iv = NextIV}.
 
 generic_stream_cipher_from_bin(T, HashSz) ->
     Sz = byte_size(T),
@@ -567,6 +690,10 @@ get_padding_aux(BlockSize, PadLength) ->
     N = BlockSize - PadLength,
     {N, list_to_binary(lists:duplicate(N, N))}.
 
+random_iv(IV) ->
+    IVSz = byte_size(IV),
+    ssl:random_bytes(IVSz).
+
 next_iv(Bin, IV) ->
     BinSz = byte_size(Bin),
     IVSz = byte_size(IV),
@@ -578,16 +705,19 @@ rsa_signed_suites() ->
     dhe_rsa_suites() ++ rsa_suites().
 
 dhe_rsa_suites() ->
-    [?TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
+    [?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
+     ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
      ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
      ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
      ?TLS_DHE_RSA_WITH_DES_CBC_SHA].
 
 rsa_suites() ->
-    [?TLS_RSA_WITH_AES_256_CBC_SHA,
+    [?TLS_RSA_WITH_AES_256_CBC_SHA256,
+     ?TLS_RSA_WITH_AES_256_CBC_SHA,
      ?TLS_RSA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_RSA_WITH_AES_128_CBC_SHA256,
      ?TLS_RSA_WITH_AES_128_CBC_SHA,
-     %%?TLS_RSA_WITH_IDEA_CBC_SHA,
      ?TLS_RSA_WITH_RC4_128_SHA,
      ?TLS_RSA_WITH_RC4_128_MD5,
      ?TLS_RSA_WITH_DES_CBC_SHA].
@@ -596,8 +726,10 @@ dsa_signed_suites() ->
     dhe_dss_suites().
 
 dhe_dss_suites()  ->
-    [?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
+    [?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,
+     ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
      ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,
      ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
      ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA].
 
diff --git a/lib/ssl/src/ssl_cipher.hrl b/lib/ssl/src/ssl_cipher.hrl
index 8bd68cc190..0f439f8ed5 100644
--- a/lib/ssl/src/ssl_cipher.hrl
+++ b/lib/ssl/src/ssl_cipher.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -28,8 +28,9 @@
 
 -type cipher()            :: null |rc4_128 | idea_cbc | des40_cbc | des_cbc | '3des_ede_cbc' 
 			   | aes_128_cbc |  aes_256_cbc.
--type hash()              :: null | sha | md5.
+-type hash()              :: null | sha | md5 | sha256 | sha384 | sha512.
 -type erl_cipher_suite()  :: {key_algo(), cipher(), hash()}.
+-type int_cipher_suite()  :: {key_algo(), cipher(), hash(), hash()}.
 -type cipher_suite()      :: binary().
 -type cipher_enum()        :: integer().
 -type openssl_cipher_suite()  :: string().
@@ -177,6 +178,47 @@
 %%	TLS_DH_anon_WITH_AES_256_CBC_SHA  = { 0x00, 0x3A };
 -define(TLS_DH_anon_WITH_AES_256_CBC_SHA, <<?BYTE(16#00), ?BYTE(16#3A)>>).   
 
+%%% TLS 1.2 Cipher Suites RFC 5246
+
+%%      TLS_RSA_WITH_NULL_SHA256              = { 0x00,0x3B };
+-define(TLS_RSA_WITH_NULL_SHA256, <<?BYTE(16#00), ?BYTE(16#3B)>>).
+
+%%      TLS_RSA_WITH_AES_128_CBC_SHA256       = { 0x00,0x3C };
+-define(TLS_RSA_WITH_AES_128_CBC_SHA256, <<?BYTE(16#00), ?BYTE(16#3C)>>).
+
+%%      TLS_RSA_WITH_AES_256_CBC_SHA256       = { 0x00,0x3D };
+-define(TLS_RSA_WITH_AES_256_CBC_SHA256, <<?BYTE(16#00), ?BYTE(16#3D)>>).
+
+%%      TLS_DH_DSS_WITH_AES_128_CBC_SHA256    = { 0x00,0x3E };
+-define(TLS_DH_DSS_WITH_AES_128_CBC_SHA256, <<?BYTE(16#00), ?BYTE(16#3E)>>).
+
+%%      TLS_DH_RSA_WITH_AES_128_CBC_SHA256    = { 0x00,0x3F };
+-define(TLS_DH_RSA_WITH_AES_128_CBC_SHA256, <<?BYTE(16#00), ?BYTE(16#3F)>>).
+
+%%      TLS_DHE_DSS_WITH_AES_128_CBC_SHA256   = { 0x00,0x40 };
+-define(TLS_DHE_DSS_WITH_AES_128_CBC_SHA256, <<?BYTE(16#00), ?BYTE(16#40)>>).
+
+%%      TLS_DHE_RSA_WITH_AES_128_CBC_SHA256   = { 0x00,0x67 };
+-define(TLS_DHE_RSA_WITH_AES_128_CBC_SHA256, <<?BYTE(16#00), ?BYTE(16#67)>>).
+
+%%      TLS_DH_DSS_WITH_AES_256_CBC_SHA256    = { 0x00,0x68 };
+-define(TLS_DH_DSS_WITH_AES_256_CBC_SHA256, <<?BYTE(16#00), ?BYTE(16#68)>>).
+
+%%      TLS_DH_RSA_WITH_AES_256_CBC_SHA256    = { 0x00,0x69 };
+-define(TLS_DH_RSA_WITH_AES_256_CBC_SHA256, <<?BYTE(16#00), ?BYTE(16#69)>>).
+
+%%      TLS_DHE_DSS_WITH_AES_256_CBC_SHA256   = { 0x00,0x6A };
+-define(TLS_DHE_DSS_WITH_AES_256_CBC_SHA256, <<?BYTE(16#00), ?BYTE(16#6A)>>).
+
+%%      TLS_DHE_RSA_WITH_AES_256_CBC_SHA256   = { 0x00,0x6B };
+-define(TLS_DHE_RSA_WITH_AES_256_CBC_SHA256, <<?BYTE(16#00), ?BYTE(16#6B)>>).
+
+%%      TLS_DH_anon_WITH_AES_128_CBC_SHA256   = { 0x00,0x6C };
+-define(TLS_DH_anon_WITH_AES_128_CBC_SHA256, <<?BYTE(16#00), ?BYTE(16#6C)>>).
+
+%%      TLS_DH_anon_WITH_AES_256_CBC_SHA256   = { 0x00,0x6D };
+-define(TLS_DH_anon_WITH_AES_256_CBC_SHA256, <<?BYTE(16#00), ?BYTE(16#6D)>>).
+
 %%% Kerberos Cipher Suites 
 
 %%      TLS_KRB5_WITH_DES_CBC_SHA            = { 0x00,0x1E };
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 6c06baff98..cde13069b5 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -40,15 +40,14 @@
 -export([send/2, recv/3, connect/7, ssl_accept/6, handshake/2,
 	 socket_control/3, close/1, shutdown/2,
 	 new_user/2, get_opts/2, set_opts/2, info/1, session_info/1, 
-	 peer_certificate/1, sockname/1, peername/1, renegotiation/1,
-	 prf/5]).
+	 peer_certificate/1, renegotiation/1, negotiated_next_protocol/1, prf/5]).
 
 %% Called by ssl_connection_sup
 -export([start_link/7]). 
 
 %% gen_fsm callbacks
--export([init/1, hello/2, certify/2, cipher/2, connection/2, 
-	 abbreviated/2, handle_event/3,
+-export([init/1, hello/2, certify/2, cipher/2,
+	 abbreviated/2, connection/2, handle_event/3,
          handle_sync_event/4, handle_info/3, terminate/3, code_change/4]).
 
 -record(state, {
@@ -67,8 +66,7 @@
 	  tls_packets = [],        % Not yet handled decode ssl/tls packets.
           tls_record_buffer,  % binary() buffer of incomplete records
           tls_handshake_buffer, % binary() buffer of incomplete handshakes
-	  %% {{md5_hash, sha_hash}, {prev_md5, prev_sha}} (binary())
-          tls_handshake_hashes, % see above 
+          tls_handshake_history, % tls_handshake_history()
           tls_cipher_texts,     % list() received but not deciphered yet
 	  cert_db,              %
           session,              % #session{} from ssl_handshake.hrl
@@ -78,21 +76,25 @@
           supported_protocol_versions, % [atom()]
           client_certificate_requested = false,
 	  key_algorithm,       % atom as defined by cipher_suite
+	  hashsign_algorithm,  % atom as defined by cipher_suite
           public_key_info,     % PKIX: {Algorithm, PublicKey, PublicKeyParams}
           private_key,         % PKIX: #'RSAPrivateKey'{}
 	  diffie_hellman_params, % PKIX: #'DHParameter'{} relevant for server side
 	  diffie_hellman_keys, % {PublicKey, PrivateKey}
           premaster_secret,    %
-          cert_db_ref,         % ets_table()
-          from,                % term(), where to reply
+	  file_ref_db,         % ets()
+          cert_db_ref,         % ref()
           bytes_to_read,       % integer(), # bytes to read in passive mode
           user_data_buffer,    % binary()
 	  log_alert,           % boolean() 
 	  renegotiation,       % {boolean(), From | internal | peer}
-	  recv_from,           %
+	  start_or_recv_from,  % "gen_fsm From"
+	  timer,               % start_or_recv_timer
 	  send_queue,          % queue()
 	  terminated = false,  %
-	  allow_renegotiate = true
+	  allow_renegotiate = true,
+          expecting_next_protocol_negotiation = false :: boolean(),
+          next_protocol = undefined :: undefined | binary()
 	 }).
 
 -define(DEFAULT_DIFFIE_HELLMAN_PARAMS, 
@@ -118,7 +120,7 @@ send(Pid, Data) ->
     sync_send_all_state_event(Pid, {application_data, 
 				    %% iolist_to_binary should really
 				    %% be called iodata_to_binary()
-				    erlang:iolist_to_binary(Data)}, infinity).
+				    erlang:iolist_to_binary(Data)}).
 
 %%--------------------------------------------------------------------
 -spec recv(pid(), integer(), timeout()) ->  
@@ -127,7 +129,7 @@ send(Pid, Data) ->
 %% Description:  Receives data when active = false
 %%--------------------------------------------------------------------
 recv(Pid, Length, Timeout) -> 
-    sync_send_all_state_event(Pid, {recv, Length}, Timeout).
+    sync_send_all_state_event(Pid, {recv, Length, Timeout}).
 %%--------------------------------------------------------------------
 -spec connect(host(), inet:port_number(), port(), {#ssl_options{}, #socket_options{}},
 	      pid(), tuple(), timeout()) ->
@@ -164,7 +166,7 @@ ssl_accept(Port, Socket, Opts, User, CbInfo, Timeout) ->
 %% Description: Starts ssl handshake. 
 %%--------------------------------------------------------------------
 handshake(#sslsocket{pid = Pid}, Timeout) ->  
-    case sync_send_all_state_event(Pid, start, Timeout) of
+    case sync_send_all_state_event(Pid, {start, Timeout}) of
 	connected ->
 	    ok;
  	Error ->
@@ -179,7 +181,7 @@ handshake(#sslsocket{pid = Pid}, Timeout) ->
 socket_control(Socket, Pid, CbModule) ->
     case CbModule:controlling_process(Socket, Pid) of
 	ok ->
-	    {ok, sslsocket(Pid)};
+	    {ok, sslsocket(Pid, Socket)};
 	{error, Reason}	->
 	    {error, Reason}
     end.
@@ -213,20 +215,15 @@ shutdown(ConnectionPid, How) ->
 %%--------------------------------------------------------------------
 new_user(ConnectionPid, User) ->
     sync_send_all_state_event(ConnectionPid, {new_user, User}).
+
 %%--------------------------------------------------------------------
--spec sockname(pid()) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}.
-%%
-%% Description:  Same as inet:sockname/1
-%%--------------------------------------------------------------------
-sockname(ConnectionPid) ->
-    sync_send_all_state_event(ConnectionPid, sockname).
-%%--------------------------------------------------------------------
--spec peername(pid()) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}.
+-spec negotiated_next_protocol(pid()) -> {ok, binary()} | {error, reason()}.
 %%
-%% Description:  Same as inet:peername/1
+%% Description:  Returns the negotiated protocol
 %%--------------------------------------------------------------------
-peername(ConnectionPid) ->
-    sync_send_all_state_event(ConnectionPid, peername).
+negotiated_next_protocol(ConnectionPid) ->
+    sync_send_all_state_event(ConnectionPid, negotiated_next_protocol).
+
 %%--------------------------------------------------------------------
 -spec get_opts(pid(), list()) -> {ok, list()} | {error, reason()}.    
 %%
@@ -297,39 +294,31 @@ prf(ConnectionPid, Secret, Label, Seed, WantedLength) ->
 %% does not return until Module:init/1 has returned.  
 %%--------------------------------------------------------------------
 start_link(Role, Host, Port, Socket, Options, User, CbInfo) ->
-    gen_fsm:start_link(?MODULE, [Role, Host, Port, Socket, Options,
-				 User, CbInfo], []).
+    {ok, proc_lib:spawn_link(?MODULE, init, [[Role, Host, Port, Socket, Options, User, CbInfo]])}.
 
-%%====================================================================
-%% gen_fsm callbacks
-%%====================================================================
-%%--------------------------------------------------------------------
-%% Description:Whenever a gen_fsm is started using gen_fsm:start/[3,4] or
-%% gen_fsm:start_link/3,4, this function is called by the new process to 
-%% initialize. 
-%%--------------------------------------------------------------------
-init([Role, Host, Port, Socket, {SSLOpts0, _} = Options, 
-      User, CbInfo]) ->
+init([Role, Host, Port, Socket, {SSLOpts0, _} = Options,  User, CbInfo]) ->
     State0 = initial_state(Role, Host, Port, Socket, Options, User, CbInfo),
-    Hashes0 = ssl_handshake:init_hashes(),    
+    Handshake = ssl_handshake:init_handshake_history(),
     TimeStamp = calendar:datetime_to_gregorian_seconds({date(), time()}),
     try ssl_init(SSLOpts0, Role) of
-	{ok, Ref, CertDbHandle, CacheHandle, OwnCert, Key, DHParams} ->
+	{ok, Ref, CertDbHandle, FileRefHandle, CacheHandle, OwnCert, Key, DHParams} ->
 	    Session = State0#state.session,
-	    State = State0#state{tls_handshake_hashes = Hashes0,
+	    State = State0#state{
+				 tls_handshake_history = Handshake,
 				 session = Session#session{own_certificate = OwnCert,
 							   time_stamp = TimeStamp},
+				 file_ref_db = FileRefHandle,
 				 cert_db_ref = Ref,
 				 cert_db = CertDbHandle,
 				 session_cache = CacheHandle,
 				 private_key = Key,
 				 diffie_hellman_params = DHParams},
-	    {ok, hello, State, get_timeout(State)}
-    catch   
+	    gen_fsm:enter_loop(?MODULE, [], hello, State, get_timeout(State))
+    catch
 	throw:Error ->
-	    {stop, Error}
+	    gen_fsm:enter_loop(?MODULE, [], error, {Error,State0}, get_timeout(State0))
     end.
-   
+
 %%--------------------------------------------------------------------
 %% Description:There should be one instance of this function for each
 %% possible state name. Whenever a gen_fsm receives an event sent
@@ -337,30 +326,31 @@ init([Role, Host, Port, Socket, {SSLOpts0, _} = Options,
 %% same name as the current state name StateName is called to handle
 %% the event. It is also called if a timeout occurs.
 %%
+
 %%--------------------------------------------------------------------
 -spec hello(start | #hello_request{} | #client_hello{} | #server_hello{} | term(),
 	    #state{}) -> gen_fsm_state_return().    
 %%--------------------------------------------------------------------
 hello(start, #state{host = Host, port = Port, role = client,
-		    ssl_options = SslOpts, 
-		    session = #session{own_certificate = Cert} = Session0,
-		    transport_cb = Transport, socket = Socket,
-		    connection_states = ConnectionStates,
-		    renegotiation = {Renegotiation, _}} = State0) ->
-    Hello = ssl_handshake:client_hello(Host, Port, 
-				       ConnectionStates, 
-				       SslOpts, Renegotiation, Cert),
-
+			      ssl_options = SslOpts, 
+			      session = #session{own_certificate = Cert} = Session0,
+			      session_cache = Cache, session_cache_cb = CacheCb,
+			      transport_cb = Transport, socket = Socket,
+			      connection_states = ConnectionStates0,
+			      renegotiation = {Renegotiation, _}} = State0) ->
+    Hello = ssl_handshake:client_hello(Host, Port, ConnectionStates0, SslOpts,
+				       Cache, CacheCb, Renegotiation, Cert),
+    
     Version = Hello#client_hello.client_version,
-    Hashes0 = ssl_handshake:init_hashes(),
-    {BinMsg, CS2, Hashes1} = 
-        encode_handshake(Hello, Version, ConnectionStates, Hashes0),
+    Handshake0 = ssl_handshake:init_handshake_history(),
+    {BinMsg, ConnectionStates, Handshake} =
+        encode_handshake(Hello, Version, ConnectionStates0, Handshake0),
     Transport:send(Socket, BinMsg),
-    State1 = State0#state{connection_states = CS2,
-			 negotiated_version = Version, %% Requested version
+    State1 = State0#state{connection_states = ConnectionStates,
+			  negotiated_version = Version, %% Requested version
 			  session =
 			      Session0#session{session_id = Hello#client_hello.session_id},
-			  tls_handshake_hashes = Hashes1},
+			  tls_handshake_history = Handshake},
     {Record, State} = next_record(State1),
     next_state(hello, hello, Record, State);
 
@@ -381,29 +371,40 @@ hello(#server_hello{cipher_suite = CipherSuite,
 	     renegotiation = {Renegotiation, _},
 	     ssl_options = SslOptions} = State0) ->
     case ssl_handshake:hello(Hello, SslOptions, ConnectionStates0, Renegotiation) of
-	{Version, NewId, ConnectionStates} ->
-	    {KeyAlgorithm, _, _} =
+	#alert{} = Alert ->
+	    handle_own_alert(Alert, ReqVersion, hello, State0), 
+            {stop, {shutdown, own_alert}, State0};
+	{Version, NewId, ConnectionStates, NextProtocol} ->
+	    {KeyAlgorithm, _, _, _} =
 		ssl_cipher:suite_definition(CipherSuite),
-	    
+
 	    PremasterSecret = make_premaster_secret(ReqVersion, KeyAlgorithm),
 	    
+	    NewNextProtocol = case NextProtocol of
+				  undefined ->
+				      State0#state.next_protocol;
+				  _ ->
+				      NextProtocol
+			      end,
+	    
 	    State = State0#state{key_algorithm = KeyAlgorithm,
+				 hashsign_algorithm = default_hashsign(Version, KeyAlgorithm),
 				 negotiated_version = Version,
 				 connection_states = ConnectionStates,
-				 premaster_secret = PremasterSecret},
+				 premaster_secret = PremasterSecret,
+				 expecting_next_protocol_negotiation = NextProtocol =/= undefined,
+				 next_protocol = NewNextProtocol},
 	    
 	    case ssl_session:is_new(OldId, NewId) of
 		true ->
-		    handle_new_session(NewId, CipherSuite, Compression, State);
+		    handle_new_session(NewId, CipherSuite, Compression,
+				       State#state{connection_states = ConnectionStates});
 		false ->
 		    handle_resumed_session(NewId, State#state{connection_states = ConnectionStates}) 
-	    end;
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, ReqVersion, hello, State0), 
-            {stop, normal, State0}
+	    end
     end;
 
-hello(Hello = #client_hello{client_version = ClientVersion}, 
+hello(Hello = #client_hello{client_version = ClientVersion},
       State = #state{connection_states = ConnectionStates0,
 		     port = Port, session = #session{own_certificate = Cert} = Session0,
 		     renegotiation = {Renegotiation, _},
@@ -412,14 +413,13 @@ hello(Hello = #client_hello{client_version = ClientVersion},
 		     ssl_options = SslOpts}) ->
     case ssl_handshake:hello(Hello, SslOpts, {Port, Session0, Cache, CacheCb,
 				     ConnectionStates0, Cert}, Renegotiation) of
-        {Version, {Type, Session}, ConnectionStates} ->       
-            do_server_hello(Type, State#state{connection_states  = 
+        {Version, {Type, Session}, ConnectionStates, ProtocolsToAdvertise} ->
+            do_server_hello(Type, ProtocolsToAdvertise, State#state{connection_states  =
 					      ConnectionStates,
 					      negotiated_version = Version,
 					      session = Session});
         #alert{} = Alert ->
-            handle_own_alert(Alert, ClientVersion, hello, State), 
-            {stop, normal, State}
+            handle_own_alert(Alert, ClientVersion, hello, State)
     end;
 
 hello(timeout, State) ->
@@ -438,39 +438,39 @@ abbreviated(#hello_request{}, State0) ->
 abbreviated(#finished{verify_data = Data} = Finished,
 	    #state{role = server,
 		   negotiated_version = Version,
-		   tls_handshake_hashes = Hashes,
+		   tls_handshake_history = Handshake,
 		   session = #session{master_secret = MasterSecret},
 		  connection_states = ConnectionStates0} = 
 	    State) ->
     case ssl_handshake:verify_connection(Version, Finished, client,
-					 MasterSecret, Hashes) of
+					 get_current_connection_state_prf(ConnectionStates0, write),
+					 MasterSecret, Handshake) of
         verified ->  
 	    ConnectionStates = ssl_record:set_client_verify_data(current_both, Data, ConnectionStates0),
 	    next_state_connection(abbreviated, 
 				  ack_connection(State#state{connection_states = ConnectionStates}));
 	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, abbreviated, State),
-            {stop, normal, State} 
+	    handle_own_alert(Alert, Version, abbreviated, State)
     end;
 
 abbreviated(#finished{verify_data = Data} = Finished,
-	    #state{role = client, tls_handshake_hashes = Hashes0,
+	    #state{role = client, tls_handshake_history = Handshake0,
 		   session = #session{master_secret = MasterSecret},
 		   negotiated_version = Version,
 		   connection_states = ConnectionStates0} = State) ->
     case ssl_handshake:verify_connection(Version, Finished, server,
-					 MasterSecret, Hashes0) of
+					 get_pending_connection_state_prf(ConnectionStates0, write),
+					 MasterSecret, Handshake0) of
         verified ->
 	    ConnectionStates1 = ssl_record:set_server_verify_data(current_read, Data, ConnectionStates0),
-	    {ConnectionStates, Hashes} = 
+	    {ConnectionStates, Handshake} =
 		finalize_handshake(State#state{connection_states = ConnectionStates1}, abbreviated),
 	    next_state_connection(abbreviated, 
-				  ack_connection(State#state{tls_handshake_hashes = Hashes,
+				  ack_connection(State#state{tls_handshake_history = Handshake,
 							     connection_states = 
 							     ConnectionStates}));
         #alert{} = Alert ->
-	    handle_own_alert(Alert, Version, abbreviated, State),
-            {stop, normal, State} 
+	    handle_own_alert(Alert, Version, abbreviated, State)
     end;
 
 abbreviated(timeout, State) ->
@@ -494,8 +494,7 @@ certify(#certificate{asn1_certificates = []},
 					  fail_if_no_peer_cert = true}} = 
 	State) ->
     Alert =  ?ALERT_REC(?FATAL,?HANDSHAKE_FAILURE),
-    handle_own_alert(Alert, Version, certify, State),
-    {stop, normal, State};
+    handle_own_alert(Alert, Version, certify, State);
 
 certify(#certificate{asn1_certificates = []}, 
 	#state{role = server,
@@ -518,8 +517,7 @@ certify(#certificate{} = Cert,
 	    handle_peer_cert(PeerCert, PublicKeyInfo, 
 			     State#state{client_certificate_requested = false});
 	#alert{} = Alert ->
-            handle_own_alert(Alert, Version, certify, State),
-            {stop, normal, State}
+            handle_own_alert(Alert, Version, certify, State)
     end;
 
 certify(#server_key_exchange{} = KeyExchangeMsg, 
@@ -531,8 +529,7 @@ certify(#server_key_exchange{} = KeyExchangeMsg,
 	    {Record, State} = next_record(State1),
 	    next_state(certify, certify, Record, State);
 	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0),
-	    {stop, normal, State0}
+	    handle_own_alert(Alert, Version, certify, State0)
     end;
 
 certify(#server_key_exchange{} = Msg, 
@@ -552,12 +549,11 @@ certify(#server_hello_done{},
 	       role = client} = State0) ->
     case ssl_handshake:master_secret(Version, Session, 
 				     ConnectionStates0, client) of
-	{MasterSecret, ConnectionStates1} -> 
-	    State = State0#state{connection_states = ConnectionStates1},
+	{MasterSecret, ConnectionStates} ->
+	    State = State0#state{connection_states = ConnectionStates},
 	    client_certify_and_key_exchange(State);
 	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0),
-	    {stop, normal, State0} 
+	    handle_own_alert(Alert, Version, certify, State0)
     end;
 
 %% Master secret is calculated from premaster_secret
@@ -569,14 +565,13 @@ certify(#server_hello_done{},
 	       role = client} = State0) ->    
     case ssl_handshake:master_secret(Version, PremasterSecret, 
 				     ConnectionStates0, client) of
-	{MasterSecret, ConnectionStates1} -> 
+	{MasterSecret, ConnectionStates} ->
 	    Session = Session0#session{master_secret = MasterSecret},
-	    State = State0#state{connection_states = ConnectionStates1,
-				  session = Session},
+	    State = State0#state{connection_states = ConnectionStates,
+				 session = Session},
 	    client_certify_and_key_exchange(State);
 	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0),
-	    {stop, normal, State0} 
+	    handle_own_alert(Alert, Version, certify, State0)
     end;
 
 certify(#client_key_exchange{} = Msg,
@@ -592,10 +587,10 @@ certify(#client_key_exchange{exchange_keys = Keys},
 	certify_client_key_exchange(ssl_handshake:decode_client_key(Keys, KeyAlg, Version), State)
     catch 
 	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State),
-	    {stop, normal, State}
+	    handle_own_alert(Alert, Version, certify, State)
     end;
 
+
 certify(timeout, State) ->
     { next_state, certify, State, hibernate };
 
@@ -617,8 +612,7 @@ certify_client_key_exchange(#encrypted_premaster_secret{premaster_secret= EncPMS
 	    {Record, State} = next_record(State1),
 	    next_state(certify, cipher, Record, State);
 	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0),
-	    {stop, normal, State0} 
+	    handle_own_alert(Alert, Version, certify, State0)
     end;
 
 certify_client_key_exchange(#client_diffie_hellman_public{dh_public = ClientPublicDhKey},
@@ -631,8 +625,7 @@ certify_client_key_exchange(#client_diffie_hellman_public{dh_public = ClientPubl
 	    {Record, State} = next_record(State1),
 	    next_state(certify, cipher, Record, State);
 	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0),
-	    {stop, normal, State0} 
+	    handle_own_alert(Alert, Version, certify, State0)
     end.
 
 %%--------------------------------------------------------------------
@@ -643,23 +636,33 @@ cipher(#hello_request{}, State0) ->
     {Record, State} = next_record(State0),
     next_state(cipher, hello, Record, State);
 
-cipher(#certificate_verify{signature = Signature}, 
+cipher(#certificate_verify{signature = Signature, hashsign_algorithm = CertHashSign},
        #state{role = server, 
 	      public_key_info = PublicKeyInfo,
 	      negotiated_version = Version,
 	      session = #session{master_secret = MasterSecret},
-	      tls_handshake_hashes = Hashes
+	      hashsign_algorithm = ConnectionHashSign,
+	      tls_handshake_history = Handshake
 	     } = State0) -> 
+    HashSign = case CertHashSign of
+		   {_, _} -> CertHashSign;
+		   _      -> ConnectionHashSign
+	       end,
     case ssl_handshake:certificate_verify(Signature, PublicKeyInfo,
-					  Version, MasterSecret, Hashes) of
+					  Version, HashSign, MasterSecret, Handshake) of
 	valid ->
 	    {Record, State} = next_record(State0),
 	    next_state(cipher, cipher, Record, State);
 	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, cipher, State0), 
-	    {stop, normal, State0}
+	    handle_own_alert(Alert, Version, cipher, State0)
     end;
 
+% client must send a next protocol message if we are expecting it
+cipher(#finished{}, #state{role = server, expecting_next_protocol_negotiation = true,
+			   next_protocol = undefined, negotiated_version = Version} = State0) ->
+       handle_own_alert(?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE), Version, cipher, State0),
+       {stop, normal, State0};
+
 cipher(#finished{verify_data = Data} = Finished, 
        #state{negotiated_version = Version,
 	      host = Host,
@@ -667,18 +670,26 @@ cipher(#finished{verify_data = Data} = Finished,
 	      role = Role,
 	      session = #session{master_secret = MasterSecret} 
 	      = Session0,
-	      tls_handshake_hashes = Hashes0} = State) ->
+		  connection_states = ConnectionStates0,
+	      tls_handshake_history = Handshake0} = State) ->
     case ssl_handshake:verify_connection(Version, Finished, 
 					 opposite_role(Role), 
-                                         MasterSecret, Hashes0) of
+					 get_current_connection_state_prf(ConnectionStates0, read),
+					 MasterSecret, Handshake0) of
         verified ->
 	    Session = register_session(Role, Host, Port, Session0),
 	    cipher_role(Role, Data, Session, State);
         #alert{} = Alert ->
-	    handle_own_alert(Alert, Version, cipher, State),
-            {stop, normal, State} 
+	    handle_own_alert(Alert, Version, cipher, State)
     end;
 
+% only allowed to send next_protocol message after change cipher spec
+% & before finished message and it is not allowed during renegotiation
+cipher(#next_protocol{selected_protocol = SelectedProtocol},
+       #state{role = server, expecting_next_protocol_negotiation = true} = State0) ->
+    {Record, State} = next_record(State0#state{next_protocol = SelectedProtocol}),
+    next_state(cipher, cipher, Record, State);
+
 cipher(timeout, State) ->
     { next_state, cipher, State, hibernate };
 
@@ -691,22 +702,24 @@ cipher(Msg, State) ->
 %%--------------------------------------------------------------------
 connection(#hello_request{}, #state{host = Host, port = Port,
 				    socket = Socket,
-				    session = #session{own_certificate = Cert},
+				    session = #session{own_certificate = Cert} = Session0,
+				    session_cache = Cache, session_cache_cb = CacheCb,
 				    ssl_options = SslOpts,
 				    negotiated_version = Version,
 				    transport_cb = Transport,
 				    connection_states = ConnectionStates0,
 				    renegotiation = {Renegotiation, _},
-				    tls_handshake_hashes = Hashes0} = State0) ->
-    Hello = ssl_handshake:client_hello(Host, Port, ConnectionStates0,
-				       SslOpts, Renegotiation, Cert),
+				    tls_handshake_history = Handshake0} = State0) ->
+    Hello = ssl_handshake:client_hello(Host, Port, ConnectionStates0, SslOpts,
+				       Cache, CacheCb, Renegotiation, Cert),
   
-    {BinMsg, ConnectionStates1, Hashes1} =
-        encode_handshake(Hello, Version, ConnectionStates0, Hashes0),
+    {BinMsg, ConnectionStates, Handshake} =
+        encode_handshake(Hello, Version, ConnectionStates0, Handshake0),
     Transport:send(Socket, BinMsg),
     {Record, State} = next_record(State0#state{connection_states =  
-					       ConnectionStates1,
-					       tls_handshake_hashes = Hashes1}),
+						   ConnectionStates,
+					       session = Session0#session{session_id = Hello#client_hello.session_id},
+					       tls_handshake_history = Handshake}),
     next_state(connection, hello, Record, State);
 connection(#client_hello{} = Hello, #state{role = server, allow_renegotiate = true} = State) ->
     %% Mitigate Computational DoS attack
@@ -732,6 +745,7 @@ connection(timeout, State) ->
 
 connection(Msg, State) ->
     handle_unexpected_message(Msg, connection, State).
+
 %%--------------------------------------------------------------------
 %% Description: Whenever a gen_fsm receives an event sent using
 %% gen_fsm:send_all_state_event/2, this function is called to handle
@@ -761,8 +775,10 @@ handle_sync_event({application_data, Data}, From, StateName,
      State#state{send_queue = queue:in({From, Data}, Queue)},
      get_timeout(State)};
 
-handle_sync_event(start, From, hello, State) ->
-    hello(start, State#state{from = From});
+handle_sync_event({start, Timeout}, StartFrom, hello, State) ->
+    Timer = start_or_recv_cancel_timer(Timeout, StartFrom),
+    hello(start, State#state{start_or_recv_from = StartFrom,
+			     timer = Timer});
 
 %% The two clauses below could happen if a server upgrades a socket in
 %% active mode. Note that in this case we are lucky that
@@ -771,11 +787,16 @@ handle_sync_event(start, From, hello, State) ->
 %% mode before telling the client that it is willing to upgrade
 %% and before calling ssl:ssl_accept/2. These clauses are 
 %% here to make sure it is the users problem and not owers if
-%% they upgrade a active socket. 
-handle_sync_event(start, _, connection, State) ->
+%% they upgrade an active socket. 
+handle_sync_event({start,_}, _, connection, State) ->
     {reply, connected, connection, State, get_timeout(State)};
-handle_sync_event(start, From, StateName, State) ->
-    {next_state, StateName, State#state{from = From}, get_timeout(State)};
+handle_sync_event({start,_}, _From, error, {Error, State = #state{}}) ->
+    {stop, {shutdown, Error}, {error, Error}, State};
+
+handle_sync_event({start, Timeout}, StartFrom, StateName, State) ->
+    Timer = start_or_recv_cancel_timer(Timeout, StartFrom),
+    {next_state, StateName, State#state{start_or_recv_from = StartFrom,
+					timer = Timer}, get_timeout(State)};
 
 handle_sync_event(close, _, StateName, State) ->
     %% Run terminate before returning
@@ -806,13 +827,17 @@ handle_sync_event({shutdown, How0}, _, StateName,
 	    {stop, normal, Error, State}
     end;
     
-handle_sync_event({recv, N}, From, connection = StateName, State0) ->
-    passive_receive(State0#state{bytes_to_read = N, recv_from = From}, StateName);
+handle_sync_event({recv, N, Timeout}, RecvFrom, connection = StateName, State0) ->
+    Timer = start_or_recv_cancel_timer(Timeout, RecvFrom),
+    passive_receive(State0#state{bytes_to_read = N,
+				 start_or_recv_from = RecvFrom, timer = Timer}, StateName);
 
 %% Doing renegotiate wait with handling request until renegotiate is
 %% finished. Will be handled by next_state_is_connection/2.
-handle_sync_event({recv, N}, From, StateName, State) ->
-    {next_state, StateName, State#state{bytes_to_read = N, recv_from = From},
+handle_sync_event({recv, N, Timeout}, RecvFrom, StateName, State) ->
+    Timer = start_or_recv_cancel_timer(Timeout, RecvFrom),
+    {next_state, StateName, State#state{bytes_to_read = N, start_or_recv_from = RecvFrom,
+					timer = Timer},
      get_timeout(State)};
 
 handle_sync_event({new_user, User}, _From, StateName, 
@@ -828,15 +853,10 @@ handle_sync_event({get_opts, OptTags}, _From, StateName,
     OptsReply = get_socket_opts(Socket, OptTags, SockOpts, []),
     {reply, OptsReply, StateName, State, get_timeout(State)};
 
-handle_sync_event(sockname, _From, StateName,
-		  #state{socket = Socket} = State) ->
-    SockNameReply = inet:sockname(Socket),
-    {reply, SockNameReply, StateName, State, get_timeout(State)};
-
-handle_sync_event(peername, _From, StateName,
-		  #state{socket = Socket} = State) ->
-    PeerNameReply = inet:peername(Socket),
-    {reply, PeerNameReply, StateName, State, get_timeout(State)};
+handle_sync_event(negotiated_next_protocol, _From, StateName, #state{next_protocol = undefined} = State) ->
+    {reply, {error, next_protocol_not_negotiated}, StateName, State, get_timeout(State)};
+handle_sync_event(negotiated_next_protocol, _From, StateName, #state{next_protocol = NextProtocol} = State) ->
+    {reply, {ok, NextProtocol}, StateName, State, get_timeout(State)};
 
 handle_sync_event({set_opts, Opts0}, _From, StateName, 
 		  #state{socket_options = Opts1, 
@@ -910,14 +930,14 @@ handle_sync_event(info, _, StateName,
 			 session = #session{cipher_suite = Suite}} = State) ->
     
     AtomVersion = ssl_record:protocol_version(Version),
-    {reply, {ok, {AtomVersion, ssl_cipher:suite_definition(Suite)}}, 
+    {reply, {ok, {AtomVersion, ssl:suite_definition(Suite)}},
      StateName, State, get_timeout(State)};
 
 handle_sync_event(session_info, _, StateName, 
 		  #state{session = #session{session_id = Id,
 					    cipher_suite = Suite}} = State) ->
     {reply, [{session_id, Id}, 
-	     {cipher_suite, ssl_cipher:suite_definition(Suite)}], 
+	     {cipher_suite, ssl:suite_definition(Suite)}],
      StateName, State, get_timeout(State)};
 
 handle_sync_event(peer_certificate, _, StateName, 
@@ -939,7 +959,7 @@ handle_info({Protocol, _, Data}, StateName,
 	    next_state(StateName, StateName, Record, State);
 	#alert{} = Alert ->
 	    handle_normal_shutdown(Alert, StateName, State0), 
-	    {stop, normal, State0}
+	    {stop, {shutdown, own_alert}, State0}
     end;
 
 handle_info({CloseTag, Socket}, StateName,
@@ -960,12 +980,12 @@ handle_info({CloseTag, Socket}, StateName,
 	    ok
     end,
     handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
-    {stop, normal, State};
+    {stop, {shutdown, transport_closed}, State};
 
 handle_info({ErrorTag, Socket, econnaborted}, StateName,  
-	    #state{socket = Socket, from = User, role = Role, 
+	    #state{socket = Socket, start_or_recv_from = StartFrom, role = Role,
 		   error_tag = ErrorTag} = State)  when StateName =/= connection ->
-    alert_user(User, ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE), Role),
+    alert_user(Socket, StartFrom, ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE), Role),
     {stop, normal, State};
 
 handle_info({ErrorTag, Socket, Reason}, StateName, #state{socket = Socket,
@@ -981,7 +1001,21 @@ handle_info({'DOWN', MonitorRef, _, _, _}, _,
 
 handle_info(allow_renegotiate, StateName, State) ->
     {next_state, StateName, State#state{allow_renegotiate = true}, get_timeout(State)};
-    
+
+handle_info({cancel_start_or_recv, StartFrom}, StateName,
+	    #state{renegotiation = {false, first}} = State) when StateName =/= connection ->
+    gen_fsm:reply(StartFrom, {error, timeout}),
+    {stop, {shutdown, user_timeout}, State#state{timer = undefined}};
+
+handle_info({cancel_start_or_recv, RecvFrom}, StateName, #state{start_or_recv_from = RecvFrom} = State) ->
+    gen_fsm:reply(RecvFrom, {error, timeout}),
+    {next_state, StateName, State#state{start_or_recv_from = undefined,
+					bytes_to_read = undefined,
+					timer = undefined}, get_timeout(State)};
+
+handle_info({cancel_start_or_recv, _RecvFrom}, StateName, State) ->
+    {next_state, StateName, State#state{timer = undefined}, get_timeout(State)};
+
 handle_info(Msg, StateName, State) ->
     Report = io_lib:format("SSL: Got unexpected info: ~p ~n", [Msg]),
     error_logger:info_report(Report),
@@ -998,23 +1032,38 @@ terminate(_, _, #state{terminated = true}) ->
     %% we want to guarantee that Transport:close has been called
     %% when ssl:close/1 returns.
     ok;
+
+terminate({shutdown, transport_closed}, StateName, #state{send_queue = SendQueue,
+							  renegotiation = Renegotiate} = State) ->
+    handle_unrecv_data(StateName, State),
+    handle_trusted_certs_db(State),
+    notify_senders(SendQueue),
+    notify_renegotiater(Renegotiate);
+
+terminate({shutdown, own_alert}, _StateName, #state{send_queue = SendQueue,
+				      renegotiation = Renegotiate} = State) ->
+    handle_trusted_certs_db(State),
+    notify_senders(SendQueue),
+    notify_renegotiater(Renegotiate);
+
 terminate(Reason, connection, #state{negotiated_version = Version,
 				      connection_states = ConnectionStates,
 				      transport_cb = Transport,
 				      socket = Socket, send_queue = SendQueue,
-				      renegotiation = Renegotiate}) ->
+				      renegotiation = Renegotiate} = State) ->
+    handle_trusted_certs_db(State),
     notify_senders(SendQueue),
     notify_renegotiater(Renegotiate),
     BinAlert = terminate_alert(Reason, Version, ConnectionStates),
     Transport:send(Socket, BinAlert),
-    workaround_transport_delivery_problems(Socket, Transport, Reason),
-    Transport:close(Socket);
-terminate(Reason, _StateName, #state{transport_cb = Transport,
+    workaround_transport_delivery_problems(Socket, Transport);
+
+terminate(_Reason, _StateName, #state{transport_cb = Transport,
 				      socket = Socket, send_queue = SendQueue,
-				      renegotiation = Renegotiate}) ->
+				      renegotiation = Renegotiate} = State) ->
+    handle_trusted_certs_db(State),
     notify_senders(SendQueue),
     notify_renegotiater(Renegotiate),
-    workaround_transport_delivery_problems(Socket, Transport, Reason),
     Transport:close(Socket).
 
 %%--------------------------------------------------------------------
@@ -1059,12 +1108,12 @@ ssl_init(SslOpts, Role) ->
     
     init_manager_name(SslOpts#ssl_options.erl_dist),
 
-    {ok, CertDbRef, CertDbHandle, CacheHandle, OwnCert} = init_certificates(SslOpts, Role),
+    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, OwnCert} = init_certificates(SslOpts, Role),
     PrivateKey =
-	init_private_key(CertDbHandle, SslOpts#ssl_options.key, SslOpts#ssl_options.keyfile,
+	init_private_key(PemCacheHandle, SslOpts#ssl_options.key, SslOpts#ssl_options.keyfile,
 			 SslOpts#ssl_options.password, Role),
-    DHParams = init_diffie_hellman(CertDbHandle, SslOpts#ssl_options.dh, SslOpts#ssl_options.dhfile, Role),
-    {ok, CertDbRef, CertDbHandle, CacheHandle, OwnCert, PrivateKey, DHParams}.
+    DHParams = init_diffie_hellman(PemCacheHandle, SslOpts#ssl_options.dh, SslOpts#ssl_options.dhfile, Role),
+    {ok, CertDbRef, CertDbHandle, FileRefHandle, CacheHandle, OwnCert, PrivateKey, DHParams}.
 
 init_manager_name(false) ->
     put(ssl_manager, ssl_manager);
@@ -1075,7 +1124,7 @@ init_certificates(#ssl_options{cacerts = CaCerts,
 			       cacertfile = CACertFile,
 			       certfile = CertFile,
 			       cert = Cert}, Role) ->
-    {ok, CertDbRef, CertDbHandle, CacheHandle} =
+    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle} =
 	try 
 	    Certs = case CaCerts of
 			undefined ->
@@ -1083,38 +1132,38 @@ init_certificates(#ssl_options{cacerts = CaCerts,
 			_ ->
 			    {der, CaCerts}
 		    end,
-	    {ok, _, _, _} = ssl_manager:connection_init(Certs, Role)
+	    {ok, _, _, _, _, _} = ssl_manager:connection_init(Certs, Role)
 	catch
 	    Error:Reason ->
 		handle_file_error(?LINE, Error, Reason, CACertFile, ecacertfile,
 				  erlang:get_stacktrace())
 	end,
-    init_certificates(Cert, CertDbRef, CertDbHandle, CacheHandle, CertFile, Role).
+    init_certificates(Cert, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, CertFile, Role).
 
-init_certificates(undefined, CertDbRef, CertDbHandle, CacheHandle, "", _) ->
-    {ok, CertDbRef, CertDbHandle, CacheHandle, undefined};
+init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, <<>>, _) ->
+    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, undefined};
 
-init_certificates(undefined, CertDbRef, CertDbHandle, CacheHandle, CertFile, client) ->
+init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, CertFile, client) ->
     try 
-	[OwnCert] = ssl_certificate:file_to_certificats(CertFile, CertDbHandle),
-	{ok, CertDbRef, CertDbHandle, CacheHandle, OwnCert}
+	[OwnCert] = ssl_certificate:file_to_certificats(CertFile, PemCacheHandle),
+	{ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, OwnCert}
     catch _Error:_Reason  ->
-	    {ok, CertDbRef, CertDbHandle, CacheHandle, undefined}
+	    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, undefined}
     end;
 
-init_certificates(undefined, CertDbRef, CertDbHandle, CacheRef, CertFile, server) ->
+init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, CertFile, server) ->
     try
-	[OwnCert] = ssl_certificate:file_to_certificats(CertFile, CertDbHandle),
-	{ok, CertDbRef, CertDbHandle, CacheRef, OwnCert}
+	[OwnCert] = ssl_certificate:file_to_certificats(CertFile, PemCacheHandle),
+	{ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, OwnCert}
     catch
 	Error:Reason ->
 	    handle_file_error(?LINE, Error, Reason, CertFile, ecertfile,
 			      erlang:get_stacktrace())
     end;
-init_certificates(Cert, CertDbRef, CertDbHandle, CacheRef, _, _) ->
-    {ok, CertDbRef, CertDbHandle, CacheRef, Cert}.
+init_certificates(Cert, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, _, _) ->
+    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, Cert}.
 
-init_private_key(_, undefined, "", _Password, _Client) ->
+init_private_key(_, undefined, <<>>, _Password, _Client) ->
     undefined;
 init_private_key(DbHandle, undefined, KeyFile, Password, _) ->
     try
@@ -1189,18 +1238,13 @@ init_diffie_hellman(DbHandle,_, DHParamFile, server) ->
     end.
 
 sync_send_all_state_event(FsmPid, Event) ->
-    sync_send_all_state_event(FsmPid, Event, infinity).
-
-sync_send_all_state_event(FsmPid, Event, Timeout) ->
-    try gen_fsm:sync_send_all_state_event(FsmPid, Event, Timeout)
+    try gen_fsm:sync_send_all_state_event(FsmPid, Event, infinity)
     catch
  	exit:{noproc, _} ->
  	    {error, closed};
- 	exit:{timeout, _} ->
- 	    {error, timeout};
 	exit:{normal, _} ->
 	    {error, closed};
-	exit:{shutdown, _} -> 
+	exit:{{shutdown, _},_} ->
 	    {error, closed}
     end.
 
@@ -1223,13 +1267,13 @@ certify_client(#state{client_certificate_requested = true, role = client,
                       cert_db_ref = CertDbRef,
 		      session = #session{own_certificate = OwnCert},
                       socket = Socket,
-                      tls_handshake_hashes = Hashes0} = State) ->
+                      tls_handshake_history = Handshake0} = State) ->
     Certificate = ssl_handshake:certificate(OwnCert, CertDbHandle, CertDbRef, client),
-    {BinCert, ConnectionStates1, Hashes1} =
-        encode_handshake(Certificate, Version, ConnectionStates0, Hashes0),
+    {BinCert, ConnectionStates, Handshake} =
+        encode_handshake(Certificate, Version, ConnectionStates0, Handshake0),
     Transport:send(Socket, BinCert),
-            State#state{connection_states = ConnectionStates1, 
-                        tls_handshake_hashes = Hashes1};
+            State#state{connection_states = ConnectionStates,
+                        tls_handshake_history = Handshake};
 certify_client(#state{client_certificate_requested = false} = State) ->
     State.
 
@@ -1241,17 +1285,19 @@ verify_client_cert(#state{client_certificate_requested = true, role = client,
 			  private_key = PrivateKey,
 			  session = #session{master_secret = MasterSecret,
 					     own_certificate = OwnCert},
-			  tls_handshake_hashes = Hashes0} = State) ->
+			  hashsign_algorithm = HashSign,
+			  tls_handshake_history = Handshake0} = State) ->
 
+    %%TODO: for TLS 1.2 we can choose a different/stronger HashSign combination for this.
     case ssl_handshake:client_certificate_verify(OwnCert, MasterSecret, 
-						 Version, PrivateKey, Hashes0) of
+						 Version, HashSign, PrivateKey, Handshake0) of
         #certificate_verify{} = Verified ->
-            {BinVerified, ConnectionStates1, Hashes1} = 
+            {BinVerified, ConnectionStates, Handshake} =
                 encode_handshake(Verified, Version,
-                                 ConnectionStates0, Hashes0),
+                                 ConnectionStates0, Handshake0),
             Transport:send(Socket, BinVerified),
-            State#state{connection_states = ConnectionStates1,
-                        tls_handshake_hashes = Hashes1};
+            State#state{connection_states = ConnectionStates,
+                        tls_handshake_history = Handshake};
 	ignore ->
 	    State;
 	#alert{} = Alert ->
@@ -1260,38 +1306,23 @@ verify_client_cert(#state{client_certificate_requested = true, role = client,
 verify_client_cert(#state{client_certificate_requested = false} = State) ->
     State.
 
-do_server_hello(Type, #state{negotiated_version = Version,
-			     session = #session{session_id = SessId} = Session,
-			     connection_states = ConnectionStates0,
-			     renegotiation = {Renegotiation, _}} 
-		= State0) when is_atom(Type) -> 
+do_server_hello(Type, NextProtocolsToSend, #state{negotiated_version = Version,
+						  session = #session{session_id = SessId},
+						  connection_states = ConnectionStates0,
+						  renegotiation = {Renegotiation, _}}
+		= State0) when is_atom(Type) ->
 
     ServerHello = 
         ssl_handshake:server_hello(SessId, Version, 
-                                   ConnectionStates0, Renegotiation),
-    State1 = server_hello(ServerHello, State0),
-    
+                                   ConnectionStates0, Renegotiation, NextProtocolsToSend),
+    State = server_hello(ServerHello,
+			 State0#state{expecting_next_protocol_negotiation =
+					  NextProtocolsToSend =/= undefined}),
     case Type of	
 	new ->
-	    new_server_hello(ServerHello, State1);
+	    new_server_hello(ServerHello, State);
 	resumed ->
-	    ConnectionStates1 = State1#state.connection_states,
-	    case ssl_handshake:master_secret(Version, Session,
-					     ConnectionStates1, server) of
-		{_, ConnectionStates2} ->
-		    State2 = State1#state{connection_states=ConnectionStates2, 
-					  session = Session},		    
-		    {ConnectionStates, Hashes} = 
-			finalize_handshake(State2, abbreviated),
-		    State3 = State2#state{connection_states = 
-					  ConnectionStates,
-					  tls_handshake_hashes = Hashes},
-		    {Record, State} = next_record(State3),
-		    next_state(hello, abbreviated, Record, State);
-		#alert{} = Alert ->
-		    handle_own_alert(Alert, Version, hello, State1), 
-		    {stop, normal, State1}
-	    end
+	    resumed_server_hello(State)
     end.
 
 new_server_hello(#server_hello{cipher_suite = CipherSuite,
@@ -1310,8 +1341,27 @@ new_server_hello(#server_hello{cipher_suite = CipherSuite,
 	    next_state(hello, certify, Record, State)
     catch        
         #alert{} = Alert ->  
-	    handle_own_alert(Alert, Version, hello, State0),
-	    {stop, normal, State0}
+	    handle_own_alert(Alert, Version, hello, State0)
+    end.
+
+resumed_server_hello(#state{session = Session,
+			    connection_states = ConnectionStates0,
+			    negotiated_version = Version} = State0) ->
+
+    case ssl_handshake:master_secret(Version, Session,
+				     ConnectionStates0, server) of
+	{_, ConnectionStates1} ->
+	    State1 = State0#state{connection_states = ConnectionStates1,
+				  session = Session},
+	    {ConnectionStates, Handshake} =
+		finalize_handshake(State1, abbreviated),
+	    State2 = State1#state{connection_states =
+				      ConnectionStates,
+				  tls_handshake_history = Handshake},
+	    {Record, State} = next_record(State2),
+	    next_state(hello, abbreviated, Record, State);
+	#alert{} = Alert ->
+	    handle_own_alert(Alert, Version, hello, State0)
     end.
 
 handle_new_session(NewId, CipherSuite, Compression, #state{session = Session0} = State0) ->
@@ -1329,15 +1379,14 @@ handle_resumed_session(SessId, #state{connection_states = ConnectionStates0,
     Session = CacheCb:lookup(Cache, {{Host, Port}, SessId}),
     case ssl_handshake:master_secret(Version, Session, 
 				     ConnectionStates0, client) of
-	{_, ConnectionStates1} ->	
+	{_, ConnectionStates} ->
 	    {Record, State} = 
 		next_record(State0#state{
-			      connection_states = ConnectionStates1,
+			      connection_states = ConnectionStates,
 			      session = Session}),
 	    next_state(hello, abbreviated, Record, State);
 	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, hello, State0), 
-	    {stop, normal, State0}
+	    handle_own_alert(Alert, Version, hello, State0)
     end.
 
 
@@ -1345,17 +1394,16 @@ client_certify_and_key_exchange(#state{negotiated_version = Version} =
 				State0) ->
     try do_client_certify_and_key_exchange(State0) of 
         State1 = #state{} ->
-	    {ConnectionStates, Hashes} = finalize_handshake(State1, certify),
+	    {ConnectionStates, Handshake} = finalize_handshake(State1, certify),
             State2 = State1#state{connection_states = ConnectionStates,
 				 %% Reinitialize 
 				 client_certificate_requested = false,
-				 tls_handshake_hashes = Hashes},
+				 tls_handshake_history = Handshake},
 	    {Record, State} = next_record(State2),
 	    next_state(certify, cipher, Record, State)
     catch        
         throw:#alert{} = Alert ->  
-	    handle_own_alert(Alert, Version, certify, State0),
-            {stop, normal, State0}
+	    handle_own_alert(Alert, Version, certify, State0)
     end.
 
 do_client_certify_and_key_exchange(State0) ->
@@ -1372,29 +1420,30 @@ server_hello(ServerHello, #state{transport_cb = Transport,
                                  socket = Socket,
                                  negotiated_version = Version,
                                  connection_states = ConnectionStates0,
-                                 tls_handshake_hashes = Hashes0} = State) ->
+                                 tls_handshake_history = Handshake0} = State) ->
     CipherSuite = ServerHello#server_hello.cipher_suite,
-    {KeyAlgorithm, _, _} = ssl_cipher:suite_definition(CipherSuite),
-    {BinMsg, ConnectionStates1, Hashes1} = 
-        encode_handshake(ServerHello, Version, ConnectionStates0, Hashes0),
+    {KeyAlgorithm, _, _, _} = ssl_cipher:suite_definition(CipherSuite),
+    {BinMsg, ConnectionStates1, Handshake1} =
+        encode_handshake(ServerHello, Version, ConnectionStates0, Handshake0),
     Transport:send(Socket, BinMsg),
     State#state{connection_states = ConnectionStates1,
-                tls_handshake_hashes = Hashes1,
-                key_algorithm = KeyAlgorithm}.
+                tls_handshake_history = Handshake1,
+                key_algorithm = KeyAlgorithm,
+                hashsign_algorithm = default_hashsign(Version, KeyAlgorithm)}.
    
 server_hello_done(#state{transport_cb = Transport,
                          socket = Socket,
                          negotiated_version = Version,
-                         connection_states = ConnectionStates,
-                         tls_handshake_hashes = Hashes} = State) ->
+                         connection_states = ConnectionStates0,
+                         tls_handshake_history = Handshake0} = State) ->
     
     HelloDone = ssl_handshake:server_hello_done(),
     
-    {BinHelloDone, NewConnectionStates, NewHashes} =
-        encode_handshake(HelloDone, Version, ConnectionStates, Hashes),
+    {BinHelloDone, ConnectionStates, Handshake} =
+        encode_handshake(HelloDone, Version, ConnectionStates0, Handshake0),
     Transport:send(Socket, BinHelloDone),
-    State#state{connection_states = NewConnectionStates,
-		tls_handshake_hashes = NewHashes}.
+    State#state{connection_states = ConnectionStates,
+		tls_handshake_history = Handshake}.
 
 certify_server(#state{key_algorithm = dh_anon} = State) ->
     State;
@@ -1402,18 +1451,18 @@ certify_server(#state{key_algorithm = dh_anon} = State) ->
 certify_server(#state{transport_cb = Transport,
 		      socket = Socket,
 		      negotiated_version = Version,
-		      connection_states = ConnectionStates,
-		      tls_handshake_hashes = Hashes,
+		      connection_states = ConnectionStates0,
+		      tls_handshake_history = Handshake0,
 		      cert_db = CertDbHandle,
 		      cert_db_ref = CertDbRef,
 		      session = #session{own_certificate = OwnCert}} = State) ->
     case ssl_handshake:certificate(OwnCert, CertDbHandle, CertDbRef, server) of
 	CertMsg = #certificate{} ->
-	    {BinCertMsg, NewConnectionStates, NewHashes} =
-		encode_handshake(CertMsg, Version, ConnectionStates, Hashes),
+	    {BinCertMsg, ConnectionStates, Handshake} =
+		encode_handshake(CertMsg, Version, ConnectionStates0, Handshake0),
 	    Transport:send(Socket, BinCertMsg),
-	    State#state{connection_states = NewConnectionStates,
-			tls_handshake_hashes = NewHashes
+	    State#state{connection_states = ConnectionStates,
+			tls_handshake_history = Handshake
 		       };
 	Alert = #alert{} ->
 	    throw(Alert)
@@ -1422,11 +1471,12 @@ certify_server(#state{transport_cb = Transport,
 key_exchange(#state{role = server, key_algorithm = rsa} = State) ->
     State;
 key_exchange(#state{role = server, key_algorithm = Algo,
+		    hashsign_algorithm = HashSignAlgo,
 		    diffie_hellman_params = #'DHParameter'{prime = P, base = G} = Params,
 		    private_key = PrivateKey,
 		    connection_states = ConnectionStates0,
 		    negotiated_version = Version,
-		    tls_handshake_hashes = Hashes0,
+		    tls_handshake_history = Handshake0,
 		    socket = Socket,
 		    transport_cb = Transport
 		   } = State) 
@@ -1439,16 +1489,16 @@ key_exchange(#state{role = server, key_algorithm = Algo,
     SecParams = ConnectionState#connection_state.security_parameters,
     #security_parameters{client_random = ClientRandom,
 			 server_random = ServerRandom} = SecParams, 
-    Msg =  ssl_handshake:key_exchange(server, {dh, Keys, Params,
-					       Algo, ClientRandom, 
+    Msg =  ssl_handshake:key_exchange(server, Version, {dh, Keys, Params,
+					       HashSignAlgo, ClientRandom,
 					       ServerRandom,
 					       PrivateKey}),
-    {BinMsg, ConnectionStates, Hashes1} =
-        encode_handshake(Msg, Version, ConnectionStates0, Hashes0),
+    {BinMsg, ConnectionStates, Handshake} =
+        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
     Transport:send(Socket, BinMsg),
     State#state{connection_states = ConnectionStates,
 		diffie_hellman_keys = Keys,
-                tls_handshake_hashes = Hashes1};
+                tls_handshake_history = Handshake};
 
 key_exchange(#state{role = client, 
 		    connection_states = ConnectionStates0,
@@ -1457,67 +1507,93 @@ key_exchange(#state{role = client,
 		    negotiated_version = Version,
 		    premaster_secret = PremasterSecret,
 		    socket = Socket, transport_cb = Transport,
-		    tls_handshake_hashes = Hashes0} = State) ->
-    Msg = rsa_key_exchange(PremasterSecret, PublicKeyInfo),    
-    {BinMsg, ConnectionStates1, Hashes1} =
-        encode_handshake(Msg, Version, ConnectionStates0, Hashes0),
+		    tls_handshake_history = Handshake0} = State) ->
+    Msg = rsa_key_exchange(Version, PremasterSecret, PublicKeyInfo),
+    {BinMsg, ConnectionStates, Handshake} =
+        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
     Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates1,
-                tls_handshake_hashes = Hashes1};
+    State#state{connection_states = ConnectionStates,
+                tls_handshake_history = Handshake};
 key_exchange(#state{role = client, 
 		    connection_states = ConnectionStates0,
 		    key_algorithm = Algorithm,
 		    negotiated_version = Version,
 		    diffie_hellman_keys = {DhPubKey, _},
 		    socket = Socket, transport_cb = Transport,
-		    tls_handshake_hashes = Hashes0} = State) 
+		    tls_handshake_history = Handshake0} = State)
   when Algorithm == dhe_dss;
        Algorithm == dhe_rsa;
        Algorithm == dh_anon ->
-    Msg =  ssl_handshake:key_exchange(client, {dh, DhPubKey}),
-    {BinMsg, ConnectionStates1, Hashes1} =
-        encode_handshake(Msg, Version, ConnectionStates0, Hashes0),
+    Msg =  ssl_handshake:key_exchange(client, Version, {dh, DhPubKey}),
+    {BinMsg, ConnectionStates, Handshake} =
+        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
     Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates1,
-                tls_handshake_hashes = Hashes1}.
+    State#state{connection_states = ConnectionStates,
+                tls_handshake_history = Handshake}.
 
-rsa_key_exchange(PremasterSecret, PublicKeyInfo = {Algorithm, _, _})  
+rsa_key_exchange(Version, PremasterSecret, PublicKeyInfo = {Algorithm, _, _})
   when Algorithm == ?rsaEncryption;
        Algorithm == ?md2WithRSAEncryption;
        Algorithm == ?md5WithRSAEncryption;
-       Algorithm == ?sha1WithRSAEncryption ->
-    ssl_handshake:key_exchange(client, 
+       Algorithm == ?sha1WithRSAEncryption;
+       Algorithm == ?sha224WithRSAEncryption;
+       Algorithm == ?sha256WithRSAEncryption;
+       Algorithm == ?sha384WithRSAEncryption;
+       Algorithm == ?sha512WithRSAEncryption
+       ->
+    ssl_handshake:key_exchange(client, Version,
 			       {premaster_secret, PremasterSecret,
 				PublicKeyInfo});
-rsa_key_exchange(_, _) ->
+rsa_key_exchange(_, _, _) ->
     throw (?ALERT_REC(?FATAL,?HANDSHAKE_FAILURE)).
 
 request_client_cert(#state{ssl_options = #ssl_options{verify = verify_peer},
 			   connection_states = ConnectionStates0,
 			   cert_db = CertDbHandle,
 			   cert_db_ref = CertDbRef,
-			   tls_handshake_hashes = Hashes0,
+			   tls_handshake_history = Handshake0,
 			   negotiated_version = Version,
 			   socket = Socket,
 			   transport_cb = Transport} = State) ->
     Msg = ssl_handshake:certificate_request(ConnectionStates0, CertDbHandle, CertDbRef),
-    {BinMsg, ConnectionStates1, Hashes1} =
-        encode_handshake(Msg, Version, ConnectionStates0, Hashes0),
+    {BinMsg, ConnectionStates, Handshake} =
+        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
     Transport:send(Socket, BinMsg),
     State#state{client_certificate_requested = true,
-		connection_states = ConnectionStates1,      
-		tls_handshake_hashes = Hashes1};
+		connection_states = ConnectionStates,
+		tls_handshake_history = Handshake};
 request_client_cert(#state{ssl_options = #ssl_options{verify = verify_none}} =
 		    State) ->
     State.
 
 finalize_handshake(State, StateName) ->
-    ConnectionStates0 = cipher_protocol(State),    
+    ConnectionStates0 = cipher_protocol(State),
+
     ConnectionStates =
         ssl_record:activate_pending_connection_state(ConnectionStates0,
                                                      write),
-    finished(State#state{connection_states = ConnectionStates}, StateName).
-    
+
+    State1 = State#state{connection_states = ConnectionStates},
+    State2 = next_protocol(State1),
+    finished(State2, StateName).
+
+next_protocol(#state{role = server} = State) ->
+    State;
+next_protocol(#state{next_protocol = undefined} = State) ->
+    State;
+next_protocol(#state{expecting_next_protocol_negotiation = false} = State) ->
+    State;
+next_protocol(#state{transport_cb = Transport, socket = Socket,
+		     negotiated_version = Version,
+		     next_protocol = NextProtocol,
+		     connection_states = ConnectionStates0,
+		     tls_handshake_history = Handshake0} = State) ->
+    NextProtocolMessage = ssl_handshake:next_protocol(NextProtocol),
+    {BinMsg, ConnectionStates, Handshake} = encode_handshake(NextProtocolMessage, Version, ConnectionStates0, Handshake0),
+    Transport:send(Socket, BinMsg),
+    State#state{connection_states = ConnectionStates,
+                tls_handshake_history = Handshake}.
+
 cipher_protocol(#state{connection_states = ConnectionStates0,
                        socket = Socket,
                        negotiated_version = Version,
@@ -1532,14 +1608,16 @@ finished(#state{role = Role, socket = Socket, negotiated_version = Version,
                 transport_cb = Transport,
 		session = Session,
                 connection_states = ConnectionStates0,
-                tls_handshake_hashes = Hashes0}, StateName) ->
+                tls_handshake_history = Handshake0}, StateName) ->
     MasterSecret = Session#session.master_secret,
-    Finished = ssl_handshake:finished(Version, Role, MasterSecret, Hashes0),
+    Finished = ssl_handshake:finished(Version, Role,
+				       get_current_connection_state_prf(ConnectionStates0, write),
+				       MasterSecret, Handshake0),
     ConnectionStates1 = save_verify_data(Role, Finished, ConnectionStates0, StateName),
-    {BinFinished, ConnectionStates, Hashes} = 
-        encode_handshake(Finished, Version, ConnectionStates1, Hashes0),
+    {BinFinished, ConnectionStates, Handshake} =
+        encode_handshake(Finished, Version, ConnectionStates1, Handshake0),
     Transport:send(Socket, BinFinished),
-    {ConnectionStates, Hashes}.
+    {ConnectionStates, Handshake}.
 
 save_verify_data(client, #finished{verify_data = Data}, ConnectionStates, certify) ->
     ssl_record:set_client_verify_data(current_write, Data, ConnectionStates);
@@ -1563,36 +1641,41 @@ handle_server_key(
 		       #server_dh_params{dh_p = P,
 					 dh_g = G,
 					 dh_y = ServerPublicDhKey}, 
-		       signed_params = Signed}, 
-  #state{public_key_info = PubKeyInfo,
-	 key_algorithm = KeyAlgo,
+		       signed_params = Signed,
+		       hashsign = HashSign},
+  #state{negotiated_version = Version,
+	 public_key_info = PubKeyInfo,
 	 connection_states = ConnectionStates} = State) ->
      
     PLen = size(P),
     GLen = size(G),
     YLen = size(ServerPublicDhKey),
+    HashAlgo = connection_hash_algo(HashSign, State),
 
     ConnectionState = 
 	ssl_record:pending_connection_state(ConnectionStates, read),
     SecParams = ConnectionState#connection_state.security_parameters,
     #security_parameters{client_random = ClientRandom,
 			 server_random = ServerRandom} = SecParams, 
-    Hash = ssl_handshake:server_key_exchange_hash(KeyAlgo,
+    Hash = ssl_handshake:server_key_exchange_hash(HashAlgo,
 						  <<ClientRandom/binary, 
 						   ServerRandom/binary, 
 						   ?UINT16(PLen), P/binary, 
 						   ?UINT16(GLen), G/binary,
 						   ?UINT16(YLen),
 						   ServerPublicDhKey/binary>>),
-    
-    case verify_dh_params(Signed, Hash, PubKeyInfo) of
+
+    case verify_dh_params(Version, Signed, Hash, HashAlgo, PubKeyInfo) of
 	true ->
 	    dh_master_secret(P, G, ServerPublicDhKey, undefined, State);
 	false ->
 	    ?ALERT_REC(?FATAL, ?DECRYPT_ERROR)
     end.
 
-verify_dh_params(Signed, Hashes, {?rsaEncryption, PubKey, _PubKeyParams}) ->
+verify_dh_params({3, Minor}, Signed, Hashes, HashAlgo, {?rsaEncryption, PubKey, _PubKeyParams})
+  when Minor >= 3 ->
+    public_key:verify({digest, Hashes}, HashAlgo, Signed, PubKey);
+verify_dh_params(_Version, Signed, Hashes, _HashAlgo, {?rsaEncryption, PubKey, _PubKeyParams}) ->
     case public_key:decrypt_public(Signed, PubKey, 
 				   [{rsa_pad, rsa_pkcs1_padding}]) of
 	Hashes ->
@@ -1600,8 +1683,8 @@ verify_dh_params(Signed, Hashes, {?rsaEncryption, PubKey, _PubKeyParams}) ->
 	_ ->
 	    false
     end;
-verify_dh_params(Signed, Hash, {?'id-dsa', PublicKey, PublicKeyParams}) ->
-    public_key:verify(Hash, none, Signed, {PublicKey, PublicKeyParams}). 
+verify_dh_params(_Version, Signed, Hash, HashAlgo, {?'id-dsa', PublicKey, PublicKeyParams}) ->
+    public_key:verify({digest, Hash}, HashAlgo, Signed, {PublicKey, PublicKeyParams}).
 
 dh_master_secret(Prime, Base, PublicDhKey, undefined, State) ->
     PMpint = mpint_binary(Prime),
@@ -1635,26 +1718,26 @@ cipher_role(client, Data, Session, #state{connection_states = ConnectionStates0}
      
 cipher_role(server, Data, Session,  #state{connection_states = ConnectionStates0} = State) -> 
     ConnectionStates1 = ssl_record:set_client_verify_data(current_read, Data, ConnectionStates0),
-    {ConnectionStates, Hashes} = 
+    {ConnectionStates, Handshake} =
 	finalize_handshake(State#state{connection_states = ConnectionStates1,
 				       session = Session}, cipher),
     next_state_connection(cipher, ack_connection(State#state{connection_states = 
 							     ConnectionStates,
 							     session = Session,
-							     tls_handshake_hashes =
-							     Hashes})).
+							     tls_handshake_history =
+								 Handshake})).
 encode_alert(#alert{} = Alert, Version, ConnectionStates) ->
     ssl_record:encode_alert_record(Alert, Version, ConnectionStates).
 
 encode_change_cipher(#change_cipher_spec{}, Version, ConnectionStates) ->
     ssl_record:encode_change_cipher_spec(Version, ConnectionStates).
 
-encode_handshake(HandshakeRec, Version, ConnectionStates0, Hashes0) ->
+encode_handshake(HandshakeRec, Version, ConnectionStates0, Handshake0) ->
     Frag = ssl_handshake:encode_handshake(HandshakeRec, Version),
-    Hashes1 = ssl_handshake:update_hashes(Hashes0, Frag),
+    Handshake1 = ssl_handshake:update_handshake_history(Handshake0, Frag),
     {E, ConnectionStates1} =
         ssl_record:encode_handshake(Frag, Version, ConnectionStates0),
-    {E, ConnectionStates1, Hashes1}.
+    {E, ConnectionStates1, Handshake1}.
 
 encode_packet(Data, #socket_options{packet=Packet}) ->
     case Packet of
@@ -1695,10 +1778,12 @@ passive_receive(State0 = #state{user_data_buffer = Buffer}, StateName) ->
     end.
 
 read_application_data(Data, #state{user_application = {_Mon, Pid},
-                              socket_options = SOpts,
-                              bytes_to_read = BytesToRead,
-                              recv_from = From,
-                              user_data_buffer = Buffer0} = State0) ->
+				   socket = Socket,
+				   socket_options = SOpts,
+				   bytes_to_read = BytesToRead,
+				   start_or_recv_from = RecvFrom,
+				   timer = Timer,
+				   user_data_buffer = Buffer0} = State0) ->
     Buffer1 = if 
 		  Buffer0 =:= <<>> -> Data;
 		  Data =:= <<>> -> Buffer0;
@@ -1706,10 +1791,12 @@ read_application_data(Data, #state{user_application = {_Mon, Pid},
 	      end,
     case get_data(SOpts, BytesToRead, Buffer1) of
 	{ok, ClientData, Buffer} -> % Send data
-	    SocketOpt = deliver_app_data(SOpts, ClientData, Pid, From),
+	    SocketOpt = deliver_app_data(Socket, SOpts, ClientData, Pid, RecvFrom),
+	    cancel_timer(Timer),
 	    State = State0#state{user_data_buffer = Buffer,
-				 recv_from = undefined,
-				 bytes_to_read = 0,
+				 start_or_recv_from = undefined,
+				 timer = undefined,
+				 bytes_to_read = undefined,
 				 socket_options = SocketOpt 
 				},
 	    if
@@ -1722,8 +1809,10 @@ read_application_data(Data, #state{user_application = {_Mon, Pid},
 	    end;
 	{more, Buffer} -> % no reply, we need more data
 	    next_record(State0#state{user_data_buffer = Buffer});
+	{passive, Buffer} ->
+	    next_record_if_active(State0#state{user_data_buffer = Buffer});
 	{error,_Reason} -> %% Invalid packet in packet mode
-	    deliver_packet_error(SOpts, Buffer1, Pid, From),
+	    deliver_packet_error(Socket, SOpts, Buffer1, Pid, RecvFrom),
 	    {stop, normal, State0}
     end.
 
@@ -1763,6 +1852,9 @@ is_time_to_renegotiate(_,_) ->
 %% Picks ClientData 
 get_data(_, _, <<>>) ->
     {more, <<>>};
+%% Recv timed out save buffer data until next recv
+get_data(#socket_options{active=false}, undefined, Buffer) ->
+    {passive, Buffer};
 get_data(#socket_options{active=Active, packet=Raw}, BytesToRead, Buffer) 
   when Raw =:= raw; Raw =:= 0 ->   %% Raw Mode
     if 
@@ -1802,9 +1894,9 @@ decode_packet(Type, Buffer, PacketOpts) ->
 %% Note that if the user has explicitly configured the socket to expect
 %% HTTP headers using the {packet, httph} option, we don't do any automatic
 %% switching of states.
-deliver_app_data(SOpts = #socket_options{active=Active, packet=Type},
-			Data, Pid, From) ->
-    send_or_reply(Active, Pid, From, format_reply(SOpts, Data)),
+deliver_app_data(Socket, SOpts = #socket_options{active=Active, packet=Type},
+		 Data, Pid, From) ->
+    send_or_reply(Active, Pid, From, format_reply(Socket, SOpts, Data)),
     SO = case Data of
 	     {P, _, _, _} when ((P =:= http_request) or (P =:= http_response)),
 			       ((Type =:= http) or (Type =:= http_bin)) ->
@@ -1823,34 +1915,35 @@ deliver_app_data(SOpts = #socket_options{active=Active, packet=Type},
 	    SO
     end.
 
-format_reply(#socket_options{active = false, mode = Mode, packet = Packet,
+format_reply(_,#socket_options{active = false, mode = Mode, packet = Packet,
 			     header = Header}, Data) ->
-    {ok, format_reply(Mode, Packet, Header, Data)};
-format_reply(#socket_options{active = _, mode = Mode, packet = Packet, 
+    {ok, do_format_reply(Mode, Packet, Header, Data)};
+format_reply(Socket, #socket_options{active = _, mode = Mode, packet = Packet,
 			     header = Header}, Data) ->
-    {ssl, sslsocket(), format_reply(Mode, Packet, Header, Data)}.
+    {ssl, sslsocket(self(), Socket), do_format_reply(Mode, Packet, Header, Data)}.
 
-deliver_packet_error(SO= #socket_options{active = Active}, Data, Pid, From) ->
-    send_or_reply(Active, Pid, From, format_packet_error(SO, Data)).
+deliver_packet_error(Socket, SO= #socket_options{active = Active}, Data, Pid, From) ->
+    send_or_reply(Active, Pid, From, format_packet_error(Socket, SO, Data)).
 
-format_packet_error(#socket_options{active = false, mode = Mode}, Data) ->
-    {error, {invalid_packet, format_reply(Mode, raw, 0, Data)}};
-format_packet_error(#socket_options{active = _, mode = Mode}, Data) ->
-    {ssl_error, sslsocket(), {invalid_packet, format_reply(Mode, raw, 0, Data)}}.
+format_packet_error(_,#socket_options{active = false, mode = Mode}, Data) ->
+    {error, {invalid_packet, do_format_reply(Mode, raw, 0, Data)}};
+format_packet_error(Socket, #socket_options{active = _, mode = Mode}, Data) ->
+    {ssl_error, sslsocket(self(), Socket), {invalid_packet, do_format_reply(Mode, raw, 0, Data)}}.
 
-format_reply(binary, _, N, Data) when N > 0 ->  % Header mode
+do_format_reply(binary, _, N, Data) when N > 0 ->  % Header mode
     header(N, Data);
-format_reply(binary, _, _, Data) ->  
+do_format_reply(binary, _, _, Data) ->
     Data;
-format_reply(list, Packet, _, Data)
-  when Packet == http; Packet == {http, headers};  Packet == http_bin; Packet == {http_bin, headers}; Packet == httph;
-       Packet == httph_bin->
+do_format_reply(list, Packet, _, Data)
+  when Packet == http; Packet == {http, headers};
+       Packet == http_bin; Packet == {http_bin, headers};
+       Packet == httph; Packet == httph_bin ->
     Data;
-format_reply(list, _,_, Data) ->
+do_format_reply(list, _,_, Data) ->
     binary_to_list(Data).
 
 header(0, <<>>) ->
-    <<>>;
+    [];
 header(_, <<>>) ->
     [];
 header(0, Binary) ->
@@ -1890,8 +1983,7 @@ handle_tls_handshake(Handle, StateName, #state{tls_packets = [Packet | Packets]}
     end.
 
 next_state(Current,_, #alert{} = Alert, #state{negotiated_version = Version} = State) ->
-    handle_own_alert(Alert, Version, Current, State),
-    {stop, normal, State};
+    handle_own_alert(Alert, Version, Current, State);
 
 next_state(_,Next, no_record, State) ->
     {next_state, Next, State, get_timeout(State)};
@@ -1906,30 +1998,30 @@ next_state(Current, Next, #ssl_tls{type = ?HANDSHAKE, fragment = Data},
    	fun({#hello_request{} = Packet, _}, {next_state, connection = SName, State}) ->
    		%% This message should not be included in handshake
    		%% message hashes. Starts new handshake (renegotiation)
-   		Hs0 = ssl_handshake:init_hashes(),
-   		?MODULE:SName(Packet, State#state{tls_handshake_hashes=Hs0,
+		Hs0 = ssl_handshake:init_handshake_history(),
+		?MODULE:SName(Packet, State#state{tls_handshake_history=Hs0,
    						  renegotiation = {true, peer}});
    	   ({#hello_request{} = Packet, _}, {next_state, SName, State}) ->
    		%% This message should not be included in handshake
    		%% message hashes. Already in negotiation so it will be ignored!
    		?MODULE:SName(Packet, State);
 	   ({#client_hello{} = Packet, Raw}, {next_state, connection = SName, State}) ->
-   		Hs0 = ssl_handshake:init_hashes(),
-   		Hs1 = ssl_handshake:update_hashes(Hs0, Raw),
-   		?MODULE:SName(Packet, State#state{tls_handshake_hashes=Hs1,
+		Version = Packet#client_hello.client_version,
+		Hs0 = ssl_handshake:init_handshake_history(),
+		Hs1 = ssl_handshake:update_handshake_history(Hs0, Raw),
+		?MODULE:SName(Packet, State#state{tls_handshake_history=Hs1,
    						  renegotiation = {true, peer}});
- 	   ({Packet, Raw}, {next_state, SName, State = #state{tls_handshake_hashes=Hs0}}) ->
-   		Hs1 = ssl_handshake:update_hashes(Hs0, Raw),
-   		?MODULE:SName(Packet, State#state{tls_handshake_hashes=Hs1});
+	   ({Packet, Raw}, {next_state, SName, State = #state{tls_handshake_history=Hs0}}) ->
+		Hs1 = ssl_handshake:update_handshake_history(Hs0, Raw),
+		?MODULE:SName(Packet, State#state{tls_handshake_history=Hs1});
    	   (_, StopState) -> StopState
    	end,
     try
-	{Packets, Buf} = ssl_handshake:get_tls_handshake(Data,Buf0),
+	{Packets, Buf} = ssl_handshake:get_tls_handshake(Version,Data,Buf0),
 	State = State0#state{tls_packets = Packets, tls_handshake_buffer = Buf},
 	handle_tls_handshake(Handle, Next, State)
     catch throw:#alert{} = Alert ->
-   	    handle_own_alert(Alert, Version, Current, State0), 
-   	    {stop, normal, State0}
+	    handle_own_alert(Alert, Version, Current, State0)
     end;
 
 next_state(_, StateName, #ssl_tls{type = ?APPLICATION_DATA, fragment = Data}, State0) ->
@@ -2004,22 +2096,22 @@ next_state_connection(StateName, #state{send_queue = Queue0,
 	    next_state_is_connection(StateName, State)
     end.
 
-%% In next_state_is_connection/1: clear tls_handshake_hashes,
+%% In next_state_is_connection/1: clear tls_handshake,
 %% premaster_secret and public_key_info (only needed during handshake)
 %% to reduce memory foot print of a connection.
 next_state_is_connection(_, State = 
-		      #state{recv_from = From,
+		      #state{start_or_recv_from = RecvFrom,
 			     socket_options =
-			     #socket_options{active = false}}) when From =/= undefined ->
+			     #socket_options{active = false}}) when RecvFrom =/= undefined ->
     passive_receive(State#state{premaster_secret = undefined,
 				public_key_info = undefined,
-				tls_handshake_hashes = {<<>>, <<>>}}, connection);
+				tls_handshake_history = ssl_handshake:init_handshake_history()}, connection);
 
 next_state_is_connection(StateName, State0) ->
     {Record, State} = next_record_if_active(State0),
     next_state(StateName, connection, Record, State#state{premaster_secret = undefined,
-					       public_key_info = undefined,
-					       tls_handshake_hashes = {<<>>, <<>>}}).
+							  public_key_info = undefined,
+							  tls_handshake_history = ssl_handshake:init_handshake_history()}).
 
 register_session(client, Host, Port, #session{is_resumable = new} = Session0) ->
     Session = Session0#session{is_resumable = true},
@@ -2068,20 +2160,16 @@ initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions}, User,
 	   tls_record_buffer = <<>>,
 	   tls_cipher_texts = [],
 	   user_application = {Monitor, User},
-	   bytes_to_read = 0,
 	   user_data_buffer = <<>>,
 	   log_alert = true,
 	   session_cache_cb = SessionCacheCb,
 	   renegotiation = {false, first},
-	   recv_from = undefined,
+	   start_or_recv_from = undefined,
 	   send_queue = queue:new()
 	  }.
 
-sslsocket(Pid) ->
-    #sslsocket{pid = Pid, fd = new_ssl}.
-
-sslsocket() ->
-    sslsocket(self()).
+sslsocket(Pid, Socket) ->
+    #sslsocket{pid = Pid, fd = Socket}.
 
 get_socket_opts(_,[], _, Acc) ->
     {ok, Acc};
@@ -2177,24 +2265,24 @@ handle_alerts([Alert | Alerts], {next_state, StateName, State, _Timeout}) ->
     handle_alerts(Alerts, handle_alert(Alert, StateName, State)).
 
 handle_alert(#alert{level = ?FATAL} = Alert, StateName,
-	     #state{from = From, host = Host, port = Port, session = Session,
-		    user_application = {_Mon, Pid},
+	     #state{socket = Socket, start_or_recv_from = From, host = Host,
+		    port = Port, session = Session, user_application = {_Mon, Pid},
 		    log_alert = Log, role = Role, socket_options = Opts} = State) ->
     invalidate_session(Role, Host, Port, Session),
     log_alert(Log, StateName, Alert),
-    alert_user(StateName, Opts, Pid, From, Alert, Role),
+    alert_user(Socket, StateName, Opts, Pid, From, Alert, Role),
     {stop, normal, State};
 
 handle_alert(#alert{level = ?WARNING, description = ?CLOSE_NOTIFY} = Alert, 
 	     StateName, State) -> 
     handle_normal_shutdown(Alert, StateName, State),
-    {stop, normal, State};
+    {stop, {shutdown, peer_close}, State};
 
 handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert, StateName, 
 	     #state{log_alert = Log, renegotiation = {true, internal}} = State) ->
     log_alert(Log, StateName, Alert),
     handle_normal_shutdown(Alert, StateName, State),
-    {stop, normal, State};
+    {stop, {shutdown, peer_close}, State};
 
 handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert, StateName, 
 	     #state{log_alert = Log, renegotiation = {true, From}} = State0) ->
@@ -2209,28 +2297,28 @@ handle_alert(#alert{level = ?WARNING, description = ?USER_CANCELED} = Alert, Sta
     {Record, State} = next_record(State0),
     next_state(StateName, StateName, Record, State).
 
-alert_user(connection, Opts, Pid, From, Alert, Role) ->
-    alert_user(Opts#socket_options.active, Pid, From, Alert, Role);
-alert_user(_, _, _, From, Alert, Role) ->
-    alert_user(From, Alert, Role).
+alert_user(Socket, connection, Opts, Pid, From, Alert, Role) ->
+    alert_user(Socket, Opts#socket_options.active, Pid, From, Alert, Role);
+alert_user(Socket,_, _, _, From, Alert, Role) ->
+    alert_user(Socket, From, Alert, Role).
 
-alert_user(From, Alert, Role) ->
-    alert_user(false, no_pid, From, Alert, Role).
+alert_user(Socket, From, Alert, Role) ->
+    alert_user(Socket, false, no_pid, From, Alert, Role).
 
-alert_user(false = Active, Pid, From,  Alert, Role) ->
+alert_user(_Socket, false = Active, Pid, From,  Alert, Role) ->
     %% If there is an outstanding ssl_accept | recv
     %% From will be defined and send_or_reply will
     %% send the appropriate error message.
     ReasonCode = ssl_alert:reason_code(Alert, Role),
     send_or_reply(Active, Pid, From, {error, ReasonCode});
-alert_user(Active, Pid, From, Alert, Role) ->
+alert_user(Socket, Active, Pid, From, Alert, Role) ->
     case ssl_alert:reason_code(Alert, Role) of
 	closed ->
 	    send_or_reply(Active, Pid, From,
-			  {ssl_closed, sslsocket()});
+			  {ssl_closed, sslsocket(self(), Socket)});
 	ReasonCode ->
 	    send_or_reply(Active, Pid, From,
-			  {ssl_error, sslsocket(), ReasonCode})
+			  {ssl_error, sslsocket(self(), Socket), ReasonCode})
     end.
 
 log_alert(true, Info, Alert) ->
@@ -2247,8 +2335,8 @@ handle_own_alert(Alert, Version, StateName,
     try %% Try to tell the other side
 	{BinMsg, _} =
 	encode_alert(Alert, Version, ConnectionStates),
-	linux_workaround_transport_delivery_problems(Alert, Socket),
-	Transport:send(Socket, BinMsg)
+	Transport:send(Socket, BinMsg),
+	workaround_transport_delivery_problems(Socket, Transport)
     catch _:_ ->  %% Can crash if we are in a uninitialized state
 	    ignore
     end,
@@ -2257,23 +2345,26 @@ handle_own_alert(Alert, Version, StateName,
 	handle_normal_shutdown(Alert,StateName, State)
     catch _:_ ->
 	    ok
-    end.
+    end,
+    {stop, {shutdown, own_alert}, State}.
 
-handle_normal_shutdown(Alert, _, #state{from = User, role = Role, renegotiation = {false, first}}) ->
-    alert_user(User, Alert, Role);
+handle_normal_shutdown(Alert, _, #state{socket = Socket,
+					start_or_recv_from = StartFrom,
+					role = Role, renegotiation = {false, first}}) ->
+    alert_user(Socket, StartFrom, Alert, Role);
 
-handle_normal_shutdown(Alert, StateName, #state{socket_options = Opts,
+handle_normal_shutdown(Alert, StateName, #state{socket = Socket,
+						socket_options = Opts,
 						user_application = {_Mon, Pid},
-						from = User, role = Role}) ->
-    alert_user(StateName, Opts, Pid, User, Alert, Role).
+						start_or_recv_from = RecvFrom, role = Role}) ->
+    alert_user(Socket, StateName, Opts, Pid, RecvFrom, Alert, Role).
 
 handle_unexpected_message(Msg, Info, #state{negotiated_version = Version} = State) ->
     Alert =  ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE),
-    handle_own_alert(Alert, Version, {Info, Msg}, State),
-    {stop, normal, State}.
+    handle_own_alert(Alert, Version, {Info, Msg}, State).
 
 make_premaster_secret({MajVer, MinVer}, rsa) ->
-    Rand = crypto:rand_bytes(?NUM_OF_PREMASTERSECRET_BYTES-2),
+    Rand = ssl:random_bytes(?NUM_OF_PREMASTERSECRET_BYTES-2),
     <<?BYTE(MajVer), ?BYTE(MinVer), Rand/binary>>;
 make_premaster_secret(_, _) ->
     undefined.
@@ -2291,17 +2382,19 @@ ack_connection(#state{renegotiation = {true, From}} = State) ->
     gen_fsm:reply(From, ok),
     State#state{renegotiation = undefined};
 ack_connection(#state{renegotiation = {false, first}, 
-				  from = From} = State) when From =/= undefined ->
-    gen_fsm:reply(From, connected),
-    State#state{renegotiation = undefined};
+		      start_or_recv_from = StartFrom,
+		      timer = Timer} = State) when StartFrom =/= undefined ->
+    gen_fsm:reply(StartFrom, connected),
+    cancel_timer(Timer),
+    State#state{renegotiation = undefined, start_or_recv_from = undefined, timer = undefined};
 ack_connection(State) ->
     State.
 
 renegotiate(#state{role = client} = State) ->
     %% Handle same way as if server requested
     %% the renegotiation
-    Hs0 = ssl_handshake:init_hashes(),
-    connection(#hello_request{}, State#state{tls_handshake_hashes = Hs0});  
+    Hs0 = ssl_handshake:init_handshake_history(),
+    connection(#hello_request{}, State#state{tls_handshake_history = Hs0});
 renegotiate(#state{role = server,
 		   socket = Socket,
 		   transport_cb = Transport,
@@ -2309,13 +2402,13 @@ renegotiate(#state{role = server,
 		   connection_states = ConnectionStates0} = State0) ->
     HelloRequest = ssl_handshake:hello_request(),
     Frag = ssl_handshake:encode_handshake(HelloRequest, Version),
-    Hs0 = ssl_handshake:init_hashes(),
+    Hs0 = ssl_handshake:init_handshake_history(),
     {BinMsg, ConnectionStates} = 
 	ssl_record:encode_handshake(Frag, Version, ConnectionStates0),
     Transport:send(Socket, BinMsg),
     {Record, State} = next_record(State0#state{connection_states = 
 					       ConnectionStates,
-					       tls_handshake_hashes = Hs0}),
+					       tls_handshake_history = Hs0}),
     next_state(connection, hello, Record, State#state{allow_renegotiate = true}).
 
 notify_senders(SendQueue) -> 
@@ -2328,38 +2421,132 @@ notify_renegotiater({true, From}) when not is_atom(From)  ->
 notify_renegotiater(_) ->
     ok.
 
-terminate_alert(Reason, Version, ConnectionStates) when Reason == normal; Reason == shutdown;
+terminate_alert(Reason, Version, ConnectionStates) when Reason == normal;
 							Reason == user_close ->
     {BinAlert, _} = encode_alert(?ALERT_REC(?WARNING, ?CLOSE_NOTIFY),
 				 Version, ConnectionStates),
     BinAlert;
+terminate_alert({shutdown, _}, Version, ConnectionStates) ->
+    {BinAlert, _} = encode_alert(?ALERT_REC(?WARNING, ?CLOSE_NOTIFY),
+				 Version, ConnectionStates),
+    BinAlert;
+
 terminate_alert(_, Version, ConnectionStates) ->
     {BinAlert, _} = encode_alert(?ALERT_REC(?FATAL, ?INTERNAL_ERROR),
 				 Version, ConnectionStates),
     BinAlert.
 
-workaround_transport_delivery_problems(_,_, user_close) ->
-    ok;
-workaround_transport_delivery_problems(Socket, Transport, _) ->
+workaround_transport_delivery_problems(Socket, gen_tcp = Transport) ->
     %% Standard trick to try to make sure all
-    %% data sent to to tcp port is really sent
-    %% before tcp port is closed so that the peer will
-    %% get a correct error message.
+    %% data sent to the tcp port is really delivered to the
+    %% peer application before tcp port is closed so that the peer will
+    %% get the correct TLS alert message and not only a transport close.
     inet:setopts(Socket, [{active, false}]),
     Transport:shutdown(Socket, write),
-    Transport:recv(Socket, 0).
+    %% Will return when other side has closed or after 30 s
+    %% e.g. we do not want to hang if something goes wrong
+    %% with the network but we want to maximise the odds that
+    %% peer application gets all data sent on the tcp connection.
+    Transport:recv(Socket, 0, 30000);
+workaround_transport_delivery_problems(Socket, Transport) ->
+    Transport:close(Socket).
 
-linux_workaround_transport_delivery_problems(#alert{level = ?FATAL}, Socket) ->
-    case os:type() of
-	{unix, linux} ->
-	    inet:setopts(Socket, [{nodelay, true}]);
+get_timeout(#state{ssl_options=#ssl_options{hibernate_after = undefined}}) ->
+    infinity;
+get_timeout(#state{ssl_options=#ssl_options{hibernate_after = HibernateAfter}}) ->
+    HibernateAfter.
+
+handle_trusted_certs_db(#state{ssl_options = #ssl_options{cacertfile = <<>>}}) ->
+    %% No trusted certs specified
+    ok;
+handle_trusted_certs_db(#state{cert_db_ref = Ref,
+			       cert_db = CertDb,
+			       ssl_options = #ssl_options{cacertfile = undefined}}) ->
+    %% Certs provided as DER directly can not be shared
+    %% with other connections and it is safe to delete them when the connection ends.
+    ssl_certificate_db:remove_trusted_certs(Ref, CertDb);
+handle_trusted_certs_db(#state{file_ref_db = undefined}) ->
+    %% Something went wrong early (typically cacertfile does not exist) so there is nothing to handle
+    ok;
+handle_trusted_certs_db(#state{cert_db_ref = Ref,
+			       file_ref_db = RefDb,
+			       ssl_options = #ssl_options{cacertfile = File}}) ->
+    case ssl_certificate_db:ref_count(Ref, RefDb, -1) of
+	0 ->
+	    ssl_manager:clean_cert_db(Ref, File);
 	_ ->
 	    ok
-    end;
-linux_workaround_transport_delivery_problems(_, _) ->
-    ok.
+    end.
 
-get_timeout(#state{ssl_options=#ssl_options{hibernate_after=undefined}}) ->
-    infinity;
-get_timeout(#state{ssl_options=#ssl_options{hibernate_after=HibernateAfter}}) ->
-    HibernateAfter.
+get_current_connection_state_prf(CStates, Direction) ->
+	CS = ssl_record:current_connection_state(CStates, Direction),
+	CS#connection_state.security_parameters#security_parameters.prf_algorithm.
+get_pending_connection_state_prf(CStates, Direction) ->
+	CS = ssl_record:pending_connection_state(CStates, Direction),
+	CS#connection_state.security_parameters#security_parameters.prf_algorithm.
+
+connection_hash_algo({HashAlgo, _}, _State) ->
+    HashAlgo;
+connection_hash_algo(_, #state{hashsign_algorithm = {HashAlgo, _}}) ->
+    HashAlgo.
+
+%% RFC 5246, Sect. 7.4.1.4.1.  Signature Algorithms
+%% If the client does not send the signature_algorithms extension, the
+%% server MUST do the following:
+%%
+%% -  If the negotiated key exchange algorithm is one of (RSA, DHE_RSA,
+%%    DH_RSA, RSA_PSK, ECDH_RSA, ECDHE_RSA), behave as if client had
+%%    sent the value {sha1,rsa}.
+%%
+%% -  If the negotiated key exchange algorithm is one of (DHE_DSS,
+%%    DH_DSS), behave as if the client had sent the value {sha1,dsa}.
+%%
+%% -  If the negotiated key exchange algorithm is one of (ECDH_ECDSA,
+%%    ECDHE_ECDSA), behave as if the client had sent value {sha1,ecdsa}.
+
+default_hashsign(_Version = {Major, Minor}, KeyExchange)
+  when Major == 3 andalso Minor >= 3 andalso
+       (KeyExchange == rsa orelse
+	KeyExchange == dhe_rsa orelse
+	KeyExchange == dh_rsa) ->
+    {sha, rsa};
+default_hashsign(_Version, KeyExchange)
+  when KeyExchange == rsa;
+       KeyExchange == dhe_rsa;
+       KeyExchange == dh_rsa ->
+    {md5sha, rsa};
+default_hashsign(_Version, KeyExchange)
+  when KeyExchange == dhe_dss;
+       KeyExchange == dh_dss ->
+    {sha, dsa};
+default_hashsign(_Version, KeyExchange)
+  when KeyExchange == dh_anon ->
+    {null, anon}.
+
+start_or_recv_cancel_timer(infinity, _RecvFrom) ->
+    undefined;
+start_or_recv_cancel_timer(Timeout, RecvFrom) ->
+    erlang:send_after(Timeout, self(), {cancel_start_or_recv, RecvFrom}).    
+
+cancel_timer(undefined) ->
+    ok;
+cancel_timer(Timer) ->
+    erlang:cancel_timer(Timer).
+
+handle_unrecv_data(StateName, #state{socket = Socket, transport_cb = Transport} = State) ->
+    inet:setopts(Socket, [{active, false}]),
+    case Transport:recv(Socket, 0, 0) of
+	{error, closed} ->
+	    ok;
+	{ok, Data} ->
+	    handle_close_alert(Data, StateName, State)
+    end.
+
+handle_close_alert(Data, StateName, State0) ->
+    case next_tls_record(Data, State0) of
+	{#ssl_tls{type = ?ALERT, fragment = EncAlerts}, State} ->
+	    [Alert|_] = decode_alerts(EncAlerts),
+	    handle_normal_shutdown(Alert, StateName, State);
+	_ ->
+	    ok
+    end.
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 2e0a3de182..db21dac942 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -30,35 +30,38 @@
 -include("ssl_internal.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
--export([master_secret/4, client_hello/6, server_hello/4, hello/4,
+-export([master_secret/4, client_hello/8, server_hello/5, hello/4,
 	 hello_request/0, certify/7, certificate/4,
-	 client_certificate_verify/5, certificate_verify/5,
-	 certificate_request/3, key_exchange/2, server_key_exchange_hash/2,
-	 finished/4, verify_connection/5, get_tls_handshake/2,
+	 client_certificate_verify/6, certificate_verify/6,
+	 certificate_request/3, key_exchange/3, server_key_exchange_hash/2,
+	 finished/5, verify_connection/6, get_tls_handshake/3,
 	 decode_client_key/3, server_hello_done/0,
-	 encode_handshake/2, init_hashes/0, update_hashes/2,
-	 decrypt_premaster_secret/2, prf/5]).
+	 encode_handshake/2, init_handshake_history/0, update_handshake_history/2,
+	 decrypt_premaster_secret/2, prf/5, next_protocol/1]).
 
 -export([dec_hello_extensions/2]).
 
 -type tls_handshake() :: #client_hello{} | #server_hello{} |
 			 #server_hello_done{} | #certificate{} | #certificate_request{} |
 			 #client_key_exchange{} | #finished{} | #certificate_verify{} |
-			 #hello_request{}.
+			 #hello_request{} | #next_protocol{}.
 
 %%====================================================================
 %% Internal application API
 %%====================================================================
 %%--------------------------------------------------------------------
 -spec client_hello(host(), inet:port_number(), #connection_states{},
-		   #ssl_options{}, boolean(), der_cert()) -> #client_hello{}.
+		   #ssl_options{}, integer(), atom(), boolean(), der_cert()) ->
+			  #client_hello{}.
 %%
 %% Description: Creates a client hello message.
 %%--------------------------------------------------------------------
-client_hello(Host, Port, ConnectionStates, #ssl_options{versions = Versions,
-							ciphers = UserSuites} 
-	     = SslOpts, Renegotiation, OwnCert) ->
-    
+client_hello(Host, Port, ConnectionStates,
+	     #ssl_options{versions = Versions,
+			  ciphers = UserSuites
+			 } = SslOpts,
+	     Cache, CacheCb, Renegotiation, OwnCert) ->
+
     Fun = fun(Version) ->
 		  ssl_record:protocol_version(Version)
 	  end,
@@ -67,24 +70,38 @@ client_hello(Host, Port, ConnectionStates, #ssl_options{versions = Versions,
     SecParams = Pending#connection_state.security_parameters,
     Ciphers = available_suites(UserSuites, Version),
 
-    Id = ssl_manager:client_session_id(Host, Port, SslOpts, OwnCert),
+    Id = ssl_session:client_id({Host, Port, SslOpts}, Cache, CacheCb, OwnCert),
 
-    #client_hello{session_id = Id, 
+    #client_hello{session_id = Id,
 		  client_version = Version,
 		  cipher_suites = cipher_suites(Ciphers, Renegotiation),
 		  compression_methods = ssl_record:compressions(),
 		  random = SecParams#security_parameters.client_random,
-		  renegotiation_info  = 
-		  renegotiation_info(client, ConnectionStates, Renegotiation)
+
+		  renegotiation_info =
+		      renegotiation_info(client, ConnectionStates, Renegotiation),
+		  hash_signs = default_hash_signs(),
+		  next_protocol_negotiation =
+		      encode_client_protocol_negotiation(SslOpts#ssl_options.next_protocol_selector, Renegotiation)
 		 }.
 
+encode_protocol(Protocol, Acc) ->
+	Len = byte_size(Protocol),
+	<<Acc/binary, ?BYTE(Len), Protocol/binary>>.
+
+encode_protocols_advertised_on_server(undefined) ->
+	undefined;
+
+encode_protocols_advertised_on_server(Protocols) ->
+	#next_protocol_negotiation{extension_data = lists:foldl(fun encode_protocol/2, <<>>, Protocols)}.
+
 %%--------------------------------------------------------------------
 -spec server_hello(session_id(), tls_version(), #connection_states{}, 
-		   boolean()) -> #server_hello{}.
+		   boolean(), [binary()] | undefined) -> #server_hello{}.
 %%
 %% Description: Creates a server hello message.
 %%--------------------------------------------------------------------
-server_hello(SessionId, Version, ConnectionStates, Renegotiation) ->
+server_hello(SessionId, Version, ConnectionStates, Renegotiation, ProtocolsAdvertisedOnServer) ->
     Pending = ssl_record:pending_connection_state(ConnectionStates, read),
     SecParams = Pending#connection_state.security_parameters,
     #server_hello{server_version = Version,
@@ -94,7 +111,8 @@ server_hello(SessionId, Version, ConnectionStates, Renegotiation) ->
 		  random = SecParams#security_parameters.server_random,
 		  session_id = SessionId,
 		  renegotiation_info = 
-		  renegotiation_info(server, ConnectionStates, Renegotiation)
+		  renegotiation_info(server, ConnectionStates, Renegotiation),
+		  next_protocol_negotiation = encode_protocols_advertised_on_server(ProtocolsAdvertisedOnServer)
 		 }.
 
 %%--------------------------------------------------------------------
@@ -109,28 +127,35 @@ hello_request() ->
 %%--------------------------------------------------------------------
 -spec hello(#server_hello{} | #client_hello{}, #ssl_options{},
 	    #connection_states{} | {inet:port_number(), #session{}, db_handle(),
- 				    atom(), #connection_states{}, binary()},
- 	    boolean()) -> {tls_version(), session_id(), #connection_states{}}| 
- 			  {tls_version(), {resumed | new, #session{}}, 
- 			   #connection_states{}} | #alert{}.
+				    atom(), #connection_states{}, binary()},
+	    boolean()) ->
+			  {tls_version(), session_id(), #connection_states{}, binary() | undefined}|
+			  {tls_version(), {resumed | new, #session{}}, #connection_states{}, list(binary()) | undefined} |
+			  #alert{}.
 %%
 %% Description: Handles a recieved hello message
 %%--------------------------------------------------------------------
 hello(#server_hello{cipher_suite = CipherSuite, server_version = Version,
 		    compression_method = Compression, random = Random,
-		    session_id = SessionId, renegotiation_info = Info},
-      #ssl_options{secure_renegotiate = SecureRenegotation},
+		    session_id = SessionId, renegotiation_info = Info,
+		    hash_signs = _HashSigns} = Hello,
+      #ssl_options{secure_renegotiate = SecureRenegotation, next_protocol_selector = NextProtocolSelector},
       ConnectionStates0, Renegotiation) ->
-
+    %%TODO: select hash and signature algorigthm
     case ssl_record:is_acceptable_version(Version) of
 	true ->
 	    case handle_renegotiation_info(client, Info, ConnectionStates0, 
 					   Renegotiation, SecureRenegotation, []) of
 		{ok, ConnectionStates1} ->
 		    ConnectionStates =
-			hello_pending_connection_states(client, CipherSuite, Random, 
+			hello_pending_connection_states(client, Version, CipherSuite, Random,
 							Compression, ConnectionStates1),
-		    {Version, SessionId, ConnectionStates};
+		    case handle_next_protocol(Hello, NextProtocolSelector, Renegotiation) of
+			#alert{} = Alert ->
+			    Alert;
+			    Protocol ->
+			    {Version, SessionId, ConnectionStates, Protocol}
+		    end;
 		#alert{} = Alert ->
 		    Alert
 	    end;
@@ -141,9 +166,10 @@ hello(#server_hello{cipher_suite = CipherSuite, server_version = Version,
 hello(#client_hello{client_version = ClientVersion, random = Random,
 		    cipher_suites = CipherSuites,
 		    renegotiation_info = Info} = Hello,
-      #ssl_options{versions = Versions, 
+      #ssl_options{versions = Versions,
 		   secure_renegotiate = SecureRenegotation} = SslOpts,
       {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert}, Renegotiation) ->
+%% TODO: select hash and signature algorithm
     Version = select_version(ClientVersion, Versions),
     case ssl_record:is_acceptable_version(Version) of
 	true ->
@@ -161,11 +187,17 @@ hello(#client_hello{client_version = ClientVersion, random = Random,
 			{ok, ConnectionStates1} ->
 			    ConnectionStates =
 				hello_pending_connection_states(server, 
+								Version,
 								CipherSuite,
 								Random, 
 								Compression,
 								ConnectionStates1),
-			    {Version, {Type, Session}, ConnectionStates};
+				case handle_next_protocol_on_server(Hello, Renegotiation, SslOpts) of
+					#alert{} = Alert ->
+						Alert;
+					ProtocolsToAdvertise ->
+						{Version, {Type, Session}, ConnectionStates, ProtocolsToAdvertise}
+			    end;
 			#alert{} = Alert ->
 			    Alert
 		    end
@@ -212,18 +244,23 @@ certify(#certificate{asn1_certificates = ASN1Certs}, CertDbHandle, CertDbRef,
 		 end, {Role, UserState0}}
 	end,
 
-    {TrustedErlCert, CertPath}  =
-	ssl_certificate:trusted_cert_and_path(ASN1Certs, CertDbHandle, CertDbRef),
-
-    case public_key:pkix_path_validation(TrustedErlCert,
-					 CertPath,
-					 [{max_path_length,
-					   MaxPathLen},
-					  {verify_fun, ValidationFunAndState}]) of
-	{ok, {PublicKeyInfo,_}} ->
-	    {PeerCert, PublicKeyInfo};
-	{error, Reason} ->
-	    path_validation_alert(Reason)
+    try
+	{TrustedErlCert, CertPath}  =
+	    ssl_certificate:trusted_cert_and_path(ASN1Certs, CertDbHandle, CertDbRef),
+	case public_key:pkix_path_validation(TrustedErlCert,
+					      CertPath,
+					     [{max_path_length,
+					       MaxPathLen},
+					      {verify_fun, ValidationFunAndState}]) of
+	    {ok, {PublicKeyInfo,_}} ->
+		{PeerCert, PublicKeyInfo};
+	    {error, Reason} ->
+		path_validation_alert(Reason)
+	end
+    catch
+	error:_ ->
+	    %% ASN-1 decode of certificate somehow failed
+	    ?ALERT_REC(?FATAL, ?CERTIFICATE_UNKNOWN)
     end.
 
 %%--------------------------------------------------------------------
@@ -254,54 +291,51 @@ certificate(OwnCert, CertDbHandle, CertDbRef, server) ->
 
 %%--------------------------------------------------------------------
 -spec client_certificate_verify(undefined | der_cert(), binary(),
-				tls_version(), private_key(),
-				{{binary(), binary()},{binary(), binary()}}) ->  
+				tls_version(), term(), private_key(),
+				tls_handshake_history()) ->
     #certificate_verify{} | ignore | #alert{}.
 %%
 %% Description: Creates a certificate_verify message, called by the client.
 %%--------------------------------------------------------------------
-client_certificate_verify(undefined, _, _, _, _) ->
+client_certificate_verify(undefined, _, _, _, _, _) ->
     ignore;
-client_certificate_verify(_, _, _, undefined, _) ->
+client_certificate_verify(_, _, _, _, undefined, _) ->
     ignore;
 client_certificate_verify(OwnCert, MasterSecret, Version,
-			  PrivateKey, {Hashes0, _}) ->
+			  {HashAlgo, SignAlgo},
+			  PrivateKey, {Handshake, _}) ->
     case public_key:pkix_is_fixed_dh_cert(OwnCert) of
 	true ->
 	    ?ALERT_REC(?FATAL, ?UNSUPPORTED_CERTIFICATE);
-	false ->	    
-	    Hashes = 
-		calc_certificate_verify(Version, MasterSecret,
-					alg_oid(PrivateKey), Hashes0),
-	    Signed = digitally_signed(Hashes, PrivateKey),
-	    #certificate_verify{signature = Signed}
+	false ->
+	    Hashes =
+		calc_certificate_verify(Version, HashAlgo, MasterSecret, Handshake),
+	    Signed = digitally_signed(Version, Hashes, HashAlgo, PrivateKey),
+	    #certificate_verify{signature = Signed, hashsign_algorithm = {HashAlgo, SignAlgo}}
     end.
 
 %%--------------------------------------------------------------------
--spec certificate_verify(binary(), public_key_info(), tls_version(),
-			 binary(), {_, {binary(), binary()}}) -> valid | #alert{}.
+-spec certificate_verify(binary(), public_key_info(), tls_version(), term(),
+			 binary(), tls_handshake_history()) -> valid | #alert{}.
 %%
 %% Description: Checks that the certificate_verify message is valid.
 %%--------------------------------------------------------------------
-certificate_verify(Signature, {?'rsaEncryption'= Algorithm, PublicKey, _}, Version,
-		   MasterSecret, {_, Hashes0}) ->
-    Hashes = calc_certificate_verify(Version, MasterSecret,
-					   Algorithm, Hashes0),
-    case public_key:decrypt_public(Signature, PublicKey,
-				   [{rsa_pad, rsa_pkcs1_padding}]) of
-	Hashes ->
+certificate_verify(Signature, {?'rsaEncryption', PublicKey, _}, Version,
+		   {HashAlgo, _SignAlgo}, MasterSecret, {_, Handshake}) ->
+    Hashes = calc_certificate_verify(Version, HashAlgo, MasterSecret, Handshake),
+    case certificate_verify_rsa(Hashes, HashAlgo, Signature, PublicKey, Version) of
+	true ->
 	    valid;
 	_ ->
 	    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE)
     end;
-certificate_verify(Signature, {?'id-dsa' = Algorithm, PublicKey, PublicKeyParams}, Version,
-		   MasterSecret, {_, Hashes0}) ->
-    Hashes = calc_certificate_verify(Version, MasterSecret,
-				     Algorithm, Hashes0),
-    case public_key:verify(Hashes, none, Signature, {PublicKey, PublicKeyParams}) of
-    	true ->
-    	    valid;
-    	false ->
+certificate_verify(Signature, {?'id-dsa', PublicKey, PublicKeyParams}, Version,
+		   {HashAlgo, _SignAlgo}, MasterSecret, {_, Handshake}) ->
+    Hashes = calc_certificate_verify(Version, HashAlgo, MasterSecret, Handshake),
+    case public_key:verify({digest, Hashes}, sha, Signature, {PublicKey, PublicKeyParams}) of
+	true ->
+	    valid;
+	false ->
     	    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE)
     end.
 
@@ -317,36 +351,38 @@ certificate_request(ConnectionStates, CertDbHandle, CertDbRef) ->
 		      #security_parameters{cipher_suite = CipherSuite}} =
 	ssl_record:pending_connection_state(ConnectionStates, read),
     Types = certificate_types(CipherSuite),
+    HashSigns = default_hash_signs(),
     Authorities = certificate_authorities(CertDbHandle, CertDbRef),
     #certificate_request{
 		    certificate_types = Types,
+		    hashsign_algorithms = HashSigns,
 		    certificate_authorities = Authorities
 		   }.
 
 %%--------------------------------------------------------------------
--spec key_exchange(client | server, 
+-spec key_exchange(client | server, tls_version(),
 		   {premaster_secret, binary(), public_key_info()} |
 		   {dh, binary()} |
-		   {dh, {binary(), binary()}, #'DHParameter'{}, key_algo(),
+		   {dh, {binary(), binary()}, #'DHParameter'{}, {HashAlgo::atom(), SignAlgo::atom()},
 		   binary(), binary(), private_key()}) ->
     #client_key_exchange{} | #server_key_exchange{}.
 %%
 %% Description: Creates a keyexchange message.
 %%--------------------------------------------------------------------
-key_exchange(client, {premaster_secret, Secret, {_, PublicKey, _}}) ->
+key_exchange(client, _Version, {premaster_secret, Secret, {_, PublicKey, _}}) ->
     EncPremasterSecret =
 	encrypted_premaster_secret(Secret, PublicKey),
     #client_key_exchange{exchange_keys = EncPremasterSecret};
 
-key_exchange(client, {dh, <<?UINT32(Len), PublicKey:Len/binary>>}) ->
+key_exchange(client, _Version, {dh, <<?UINT32(Len), PublicKey:Len/binary>>}) ->
     #client_key_exchange{
 	      exchange_keys = #client_diffie_hellman_public{
 		dh_public = PublicKey}
 	       };
 
-key_exchange(server, {dh, {<<?UINT32(Len), PublicKey:Len/binary>>, _}, 
+key_exchange(server, Version, {dh, {<<?UINT32(Len), PublicKey:Len/binary>>, _},
 		      #'DHParameter'{prime = P, base = G},
-		      KeyAlgo, ClientRandom, ServerRandom, PrivateKey}) ->
+		      {HashAlgo, SignAlgo}, ClientRandom, ServerRandom, PrivateKey}) ->
     <<?UINT32(_), PBin/binary>> = crypto:mpint(P),
     <<?UINT32(_), GBin/binary>> = crypto:mpint(G),
     PLen = byte_size(PBin),
@@ -355,20 +391,22 @@ key_exchange(server, {dh, {<<?UINT32(Len), PublicKey:Len/binary>>, _},
     ServerDHParams = #server_dh_params{dh_p = PBin, 
 				       dh_g = GBin, dh_y = PublicKey},    
 
-    case KeyAlgo of
-	dh_anon ->
+    case HashAlgo of
+	null ->
 	    #server_key_exchange{params = ServerDHParams,
-				 signed_params = <<>>};
+				 signed_params = <<>>,
+				 hashsign = {null, anon}};
 	_ ->
 	    Hash =
-		server_key_exchange_hash(KeyAlgo, <<ClientRandom/binary,
+		server_key_exchange_hash(HashAlgo, <<ClientRandom/binary,
 						    ServerRandom/binary,
 						    ?UINT16(PLen), PBin/binary,
 						    ?UINT16(GLen), GBin/binary,
 						    ?UINT16(YLen), PublicKey/binary>>),
-	    Signed = digitally_signed(Hash, PrivateKey),
+	    Signed = digitally_signed(Version, Hash, HashAlgo, PrivateKey),
 	    #server_key_exchange{params = ServerDHParams,
-				 signed_params = Signed}
+				 signed_params = Signed,
+				 hashsign = {HashAlgo, SignAlgo}}
     end.
 
 %%--------------------------------------------------------------------
@@ -398,10 +436,11 @@ master_secret(Version, PremasterSecret, ConnectionStates, Role) ->
     ConnectionState = 
 	ssl_record:pending_connection_state(ConnectionStates, read),
     SecParams = ConnectionState#connection_state.security_parameters,
-    #security_parameters{client_random = ClientRandom,
+    #security_parameters{prf_algorithm = PrfAlgo,
+			 client_random = ClientRandom,
 			 server_random = ServerRandom} = SecParams, 
     try master_secret(Version, 
-		      calc_master_secret(Version,PremasterSecret,
+		      calc_master_secret(Version,PrfAlgo,PremasterSecret,
 				       ClientRandom, ServerRandom),
 		      SecParams, ConnectionStates, Role) 
     catch
@@ -412,27 +451,32 @@ master_secret(Version, PremasterSecret, ConnectionStates, Role) ->
 	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)
     end.
 
+-spec next_protocol(binary()) -> #next_protocol{}.
+
+next_protocol(SelectedProtocol) ->
+  #next_protocol{selected_protocol = SelectedProtocol}.
+
 %%--------------------------------------------------------------------
--spec finished(tls_version(), client | server, binary(), {{binary(), binary()},_}) ->
+-spec finished(tls_version(), client | server, integer(), binary(), tls_handshake_history()) ->
     #finished{}.
 %%
 %% Description: Creates a handshake finished message
 %%-------------------------------------------------------------------
-finished(Version, Role, MasterSecret, {Hashes, _}) -> % use the current hashes
+finished(Version, Role, PrfAlgo, MasterSecret, {Handshake, _}) -> % use the current handshake
     #finished{verify_data = 
-	      calc_finished(Version, Role, MasterSecret, Hashes)}.
+	      calc_finished(Version, Role, PrfAlgo, MasterSecret, Handshake)}.
 
 %%--------------------------------------------------------------------
--spec verify_connection(tls_version(), #finished{}, client | server, binary(), 
-			{_, {binary(), binary()}}) -> verified | #alert{}.
+-spec verify_connection(tls_version(), #finished{}, client | server, integer(), binary(),
+			tls_handshake_history()) -> verified | #alert{}.
 %%
 %% Description: Checks the ssl handshake finished message to verify
 %%              the connection.
 %%-------------------------------------------------------------------
 verify_connection(Version, #finished{verify_data = Data}, 
-		  Role, MasterSecret, {_, {MD5, SHA}}) -> 
+		  Role, PrfAlgo, MasterSecret, {_, Handshake}) ->
     %% use the previous hashes
-    case calc_finished(Version, Role, MasterSecret, {MD5, SHA}) of
+    case calc_finished(Version, Role, PrfAlgo, MasterSecret, Handshake) of
 	Data ->
 	    verified;
 	_ ->
@@ -457,17 +501,17 @@ encode_handshake(Package, Version) ->
     [MsgType, ?uint24(Len), Bin].
 
 %%--------------------------------------------------------------------
--spec get_tls_handshake(binary(), binary() | iolist()) ->
+-spec get_tls_handshake(tls_version(), binary(), binary() | iolist()) ->
      {[tls_handshake()], binary()}.
 %%
 %% Description: Given buffered and new data from ssl_record, collects
 %% and returns it as a list of handshake messages, also returns leftover
 %% data.
 %%--------------------------------------------------------------------
-get_tls_handshake(Data, <<>>) ->
-    get_tls_handshake_aux(Data, []);
-get_tls_handshake(Data, Buffer) ->
-    get_tls_handshake_aux(list_to_binary([Buffer, Data]), []).
+get_tls_handshake(Version, Data, <<>>) ->
+    get_tls_handshake_aux(Version, Data, []);
+get_tls_handshake(Version, Data, Buffer) ->
+    get_tls_handshake_aux(Version, list_to_binary([Buffer, Data]), []).
 
 %%--------------------------------------------------------------------
 -spec decode_client_key(binary(), key_algo(), tls_version()) ->
@@ -479,39 +523,34 @@ decode_client_key(ClientKey, Type, Version) ->
     dec_client_key(ClientKey, key_exchange_alg(Type), Version).
 
 %%--------------------------------------------------------------------
--spec init_hashes() ->{{binary(), binary()}, {binary(), binary()}}.
+-spec init_handshake_history() -> tls_handshake_history().
 
 %%
-%% Description: Calls crypto hash (md5 and sha) init functions to
-%% initalize the hash context.
+%% Description: Initialize the empty handshake history buffer.
 %%--------------------------------------------------------------------
-init_hashes() ->
-    T = {crypto:md5_init(), crypto:sha_init()},
-    {T, T}.
+init_handshake_history() ->
+    {[], []}.
 
 %%--------------------------------------------------------------------
--spec update_hashes({{binary(), binary()}, {binary(), binary()}}, Data ::term()) ->
-			   {{binary(), binary()}, {binary(), binary()}}.
+-spec update_handshake_history(tls_handshake_history(), Data ::term()) ->
+				      tls_handshake_history().
 %%
-%% Description: Calls crypto hash (md5 and sha) update functions to
-%% update the hash context with Data.
+%% Description: Update the handshake history buffer with Data.
 %%--------------------------------------------------------------------
-update_hashes(Hashes, % special-case SSL2 client hello
-	      <<?CLIENT_HELLO, ?UINT24(_), ?BYTE(Major), ?BYTE(Minor),
-		?UINT16(CSLength), ?UINT16(0),
-		?UINT16(CDLength),
-	       CipherSuites:CSLength/binary,
-	       ChallengeData:CDLength/binary>>) ->
-    update_hashes(Hashes,
-		  <<?CLIENT_HELLO, ?BYTE(Major), ?BYTE(Minor),
-		   ?UINT16(CSLength), ?UINT16(0),
-		   ?UINT16(CDLength),
-		   CipherSuites:CSLength/binary,
-		   ChallengeData:CDLength/binary>>);
-update_hashes({{MD50, SHA0}, _Prev}, Data) ->
-    {MD51, SHA1} = {crypto:md5_update(MD50, Data),
-		    crypto:sha_update(SHA0, Data)},
-    {{MD51, SHA1}, {MD50, SHA0}}.
+update_handshake_history(Handshake, % special-case SSL2 client hello
+			 <<?CLIENT_HELLO, ?UINT24(_), ?BYTE(Major), ?BYTE(Minor),
+			   ?UINT16(CSLength), ?UINT16(0),
+			   ?UINT16(CDLength),
+			   CipherSuites:CSLength/binary,
+			   ChallengeData:CDLength/binary>>) ->
+    update_handshake_history(Handshake,
+			     <<?CLIENT_HELLO, ?BYTE(Major), ?BYTE(Minor),
+			       ?UINT16(CSLength), ?UINT16(0),
+			       ?UINT16(CDLength),
+			       CipherSuites:CSLength/binary,
+			       ChallengeData:CDLength/binary>>);
+update_handshake_history({Handshake0, _Prev}, Data) ->
+    {[Data|Handshake0], Handshake0}.
 
 %%--------------------------------------------------------------------
 -spec decrypt_premaster_secret(binary(), #'RSAPrivateKey'{}) -> binary().
@@ -524,23 +563,22 @@ decrypt_premaster_secret(Secret, RSAPrivateKey) ->
 				   [{rsa_pad, rsa_pkcs1_padding}])
     catch
 	_:_ ->
+			io:format("decrypt_premaster_secret error"),
 	    throw(?ALERT_REC(?FATAL, ?DECRYPT_ERROR))
     end.
 
 %%--------------------------------------------------------------------
--spec server_key_exchange_hash(rsa | dhe_rsa| dhe_dss | dh_anon, binary()) -> binary().
-
+-spec server_key_exchange_hash(md5sha | md5 | sha | sha224 |sha256 | sha384 | sha512, binary()) -> binary().
 %%
 %% Description: Calculate server key exchange hash
 %%--------------------------------------------------------------------
-server_key_exchange_hash(Algorithm, Value) when Algorithm == rsa;
-						Algorithm == dhe_rsa ->
+server_key_exchange_hash(md5sha, Value) ->
     MD5 = crypto:md5(Value),
-    SHA =  crypto:sha(Value),
+    SHA = crypto:sha(Value),
     <<MD5/binary, SHA/binary>>;
 
-server_key_exchange_hash(dhe_dss, Value) ->
-    crypto:sha(Value).
+server_key_exchange_hash(Hash, Value) ->
+    crypto:hash(Hash, Value).
 
 %%--------------------------------------------------------------------
 -spec prf(tls_version(), binary(), binary(), [binary()], non_neg_integer()) ->
@@ -550,19 +588,20 @@ server_key_exchange_hash(dhe_dss, Value) ->
 %%--------------------------------------------------------------------
 prf({3,0}, _, _, _, _) ->
     {error, undefined};
-prf({3,N}, Secret, Label, Seed, WantedLength)
-  when N == 1; N == 2 ->
-    {ok, ssl_tls1:prf(Secret, Label, Seed, WantedLength)}.
+prf({3,1}, Secret, Label, Seed, WantedLength) ->
+    {ok, ssl_tls1:prf(?MD5SHA, Secret, Label, Seed, WantedLength)};
+prf({3,_N}, Secret, Label, Seed, WantedLength) ->
+    {ok, ssl_tls1:prf(?SHA256, Secret, Label, Seed, WantedLength)}.
 
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-get_tls_handshake_aux(<<?BYTE(Type), ?UINT24(Length), 
+get_tls_handshake_aux(Version, <<?BYTE(Type), ?UINT24(Length),
 			Body:Length/binary,Rest/binary>>, Acc) ->
     Raw = <<?BYTE(Type), ?UINT24(Length), Body/binary>>,
-    H = dec_hs(Type, Body),
-    get_tls_handshake_aux(Rest, [{H,Raw} | Acc]);
-get_tls_handshake_aux(Data, Acc) ->
+    H = dec_hs(Version, Type, Body),
+    get_tls_handshake_aux(Version, Rest, [{H,Raw} | Acc]);
+get_tls_handshake_aux(_Version, Data, Acc) ->
     {lists:reverse(Acc), Data}.
 
 path_validation_alert({bad_cert, cert_expired}) ->
@@ -584,24 +623,23 @@ path_validation_alert({bad_cert, unknown_ca}) ->
 path_validation_alert(_) ->
     ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE).
 
-select_session(Hello, Port, Session, Version, 
+select_session(Hello, Port, Session, Version,
 	       #ssl_options{ciphers = UserSuites} = SslOpts, Cache, CacheCb, Cert) ->
     SuggestedSessionId = Hello#client_hello.session_id,
-    SessionId = ssl_manager:server_session_id(Port, SuggestedSessionId, 
-					      SslOpts, Cert),
-    
-    Suites = available_suites(Cert, UserSuites, Version), 
-    case ssl_session:is_new(SuggestedSessionId, SessionId) of
-        true ->
-	    CipherSuite = 
-		select_cipher_suite(Hello#client_hello.cipher_suites, Suites),
+    {SessionId, Resumed} = ssl_session:server_id(Port, SuggestedSessionId,
+						 SslOpts, Cert,
+						 Cache, CacheCb),
+    Suites = available_suites(Cert, UserSuites, Version),
+    case Resumed of
+        undefined ->
+	    CipherSuite = select_cipher_suite(Hello#client_hello.cipher_suites, Suites),
 	    Compressions = Hello#client_hello.compression_methods,
 	    Compression = select_compression(Compressions),
 	    {new, Session#session{session_id = SessionId,
 				  cipher_suite = CipherSuite,
 				  compression_method = Compression}};
-	false ->	    
-	    {resumed, CacheCb:lookup(Cache, {Port, SessionId})}
+	_ ->
+	    {resumed, Resumed}
     end.
 
 available_suites(UserSuites, Version) ->
@@ -651,6 +689,57 @@ renegotiation_info(server, ConnectionStates, true) ->
 	    #renegotiation_info{renegotiated_connection = undefined}
     end. 
 
+decode_next_protocols({next_protocol_negotiation, Protocols}) ->
+    decode_next_protocols(Protocols, []).
+decode_next_protocols(<<>>, Acc) ->
+    lists:reverse(Acc);
+decode_next_protocols(<<?BYTE(Len), Protocol:Len/binary, Rest/binary>>, Acc) ->
+    case Len of
+        0 ->
+            {error, invalid_next_protocols};
+        _ ->
+            decode_next_protocols(Rest, [Protocol|Acc])
+    end;
+decode_next_protocols(_Bytes, _Acc) ->
+    {error, invalid_next_protocols}.
+
+next_protocol_extension_allowed(NextProtocolSelector, Renegotiating) ->
+    NextProtocolSelector =/= undefined andalso not Renegotiating.
+
+handle_next_protocol_on_server(#client_hello{next_protocol_negotiation = undefined}, _Renegotiation, _SslOpts) ->
+    undefined;
+
+handle_next_protocol_on_server(#client_hello{next_protocol_negotiation = {next_protocol_negotiation, <<>>}},
+			       false, #ssl_options{next_protocols_advertised = Protocols}) ->
+    Protocols;
+
+handle_next_protocol_on_server(_Hello, _Renegotiation, _SSLOpts) ->
+    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE). % unexpected next protocol extension
+
+handle_next_protocol(#server_hello{next_protocol_negotiation = undefined},
+    _NextProtocolSelector, _Renegotiating) ->
+    undefined;
+
+handle_next_protocol(#server_hello{next_protocol_negotiation = Protocols},
+    NextProtocolSelector, Renegotiating) ->
+
+    case next_protocol_extension_allowed(NextProtocolSelector, Renegotiating) of
+        true ->
+            select_next_protocol(decode_next_protocols(Protocols), NextProtocolSelector);
+        false ->
+            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE) % unexpected next protocol extension
+    end.
+
+select_next_protocol({error, _Reason}, _NextProtocolSelector) ->
+    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE);
+select_next_protocol(Protocols, NextProtocolSelector) ->
+    case NextProtocolSelector(Protocols) of
+	?NO_PROTOCOL ->
+	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE);
+	Protocol when is_binary(Protocol)  ->
+	    Protocol
+    end.
+
 handle_renegotiation_info(_, #renegotiation_info{renegotiated_connection = ?byte(0)}, 
 			  ConnectionStates, false, _, _) ->
     {ok, ssl_record:set_renegotiation_flag(true, ConnectionStates)};
@@ -720,7 +809,7 @@ handle_renegotiation_info(ConnectionStates, SecureRenegotation) ->
 %% hello messages
 %% NOTE : Role is the role of the receiver of the hello message
 %%        currently being processed.
-hello_pending_connection_states(Role, CipherSuite, Random, Compression,
+hello_pending_connection_states(Role, Version, CipherSuite, Random, Compression,
 				 ConnectionStates) ->    
     ReadState =  
 	ssl_record:pending_connection_state(ConnectionStates, read),
@@ -728,30 +817,30 @@ hello_pending_connection_states(Role, CipherSuite, Random, Compression,
 	ssl_record:pending_connection_state(ConnectionStates, write),
     
     NewReadSecParams = 
-	hello_security_parameters(Role, ReadState, CipherSuite, 
+	hello_security_parameters(Role, Version, ReadState, CipherSuite,
 			    Random, Compression),
     
     NewWriteSecParams =
-	hello_security_parameters(Role, WriteState, CipherSuite,
+	hello_security_parameters(Role, Version, WriteState, CipherSuite,
 			    Random, Compression),
  
     ssl_record:update_security_params(NewReadSecParams,
 				    NewWriteSecParams,
 				    ConnectionStates).
 
-hello_security_parameters(client, ConnectionState, CipherSuite, Random,
+hello_security_parameters(client, Version, ConnectionState, CipherSuite, Random,
 			  Compression) ->   
     SecParams = ConnectionState#connection_state.security_parameters,
-    NewSecParams = ssl_cipher:security_parameters(CipherSuite, SecParams),
+    NewSecParams = ssl_cipher:security_parameters(Version, CipherSuite, SecParams),
     NewSecParams#security_parameters{
       server_random = Random,
       compression_algorithm = Compression
      };
 
-hello_security_parameters(server, ConnectionState, CipherSuite, Random, 
+hello_security_parameters(server, Version, ConnectionState, CipherSuite, Random,
 			  Compression) ->
     SecParams = ConnectionState#connection_state.security_parameters,
-    NewSecParams = ssl_cipher:security_parameters(CipherSuite, SecParams),
+    NewSecParams = ssl_cipher:security_parameters(Version, CipherSuite, SecParams),
     NewSecParams#security_parameters{
       client_random = Random,
       compression_algorithm = Compression
@@ -785,13 +874,14 @@ master_secret(Version, MasterSecret, #security_parameters{
 			 client_random = ClientRandom,
 			 server_random = ServerRandom,
 			 hash_size = HashSize,
+			 prf_algorithm = PrfAlgo,
 			 key_material_length = KML,
 			 expanded_key_material_length = EKML,
 			 iv_size = IVS},
 	      ConnectionStates, Role) ->
     {ClientWriteMacSecret, ServerWriteMacSecret, ClientWriteKey,
      ServerWriteKey, ClientIV, ServerIV} =
-	setup_keys(Version, MasterSecret, ServerRandom, 
+	setup_keys(Version, PrfAlgo, MasterSecret, ServerRandom,
 		   ClientRandom, HashSize, KML, EKML, IVS),
 
     ConnStates1 = ssl_record:set_master_secret(MasterSecret, ConnectionStates),
@@ -806,17 +896,21 @@ master_secret(Version, MasterSecret, #security_parameters{
 					 ServerCipherState, Role)}.
 
 
-dec_hs(?HELLO_REQUEST, <<>>) ->
+dec_hs(_, ?NEXT_PROTOCOL, <<?BYTE(SelectedProtocolLength), SelectedProtocol:SelectedProtocolLength/binary,
+                         ?BYTE(PaddingLength), _Padding:PaddingLength/binary>>) ->
+	#next_protocol{selected_protocol = SelectedProtocol};
+
+dec_hs(_, ?HELLO_REQUEST, <<>>) ->
     #hello_request{};
 
 %% Client hello v2.
 %% The server must be able to receive such messages, from clients that
 %% are willing to use ssl v3 or higher, but have ssl v2 compatibility.
-dec_hs(?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor),
-		       ?UINT16(CSLength), ?UINT16(0),
-		       ?UINT16(CDLength), 
-		       CipherSuites:CSLength/binary, 
-		       ChallengeData:CDLength/binary>>) ->
+dec_hs(_Version, ?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor),
+				  ?UINT16(CSLength), ?UINT16(0),
+				  ?UINT16(CDLength),
+				  CipherSuites:CSLength/binary,
+				  ChallengeData:CDLength/binary>>) ->
     #client_hello{client_version = {Major, Minor},
 		  random = ssl_ssl2:client_random(ChallengeData, CDLength),
 		  session_id = 0,
@@ -824,24 +918,29 @@ dec_hs(?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor),
 		  compression_methods = [?NULL],
 		  renegotiation_info = undefined
 		 };
-dec_hs(?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+dec_hs(_Version, ?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 		       ?BYTE(SID_length), Session_ID:SID_length/binary,
 		       ?UINT16(Cs_length), CipherSuites:Cs_length/binary,
 		       ?BYTE(Cm_length), Comp_methods:Cm_length/binary,
 		       Extensions/binary>>) ->
-    
-    RenegotiationInfo = proplists:get_value(renegotiation_info, dec_hello_extensions(Extensions),
-					   undefined),    
-    #client_hello{
-	client_version = {Major,Minor},
-	random = Random,
-	session_id = Session_ID,
-	cipher_suites = from_2bytes(CipherSuites),
-	compression_methods = Comp_methods,
-	renegotiation_info = RenegotiationInfo 
-       };
 
-dec_hs(?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+    DecodedExtensions = dec_hello_extensions(Extensions),
+    RenegotiationInfo = proplists:get_value(renegotiation_info, DecodedExtensions, undefined),
+    HashSigns = proplists:get_value(hash_signs, DecodedExtensions, undefined),
+    NextProtocolNegotiation = proplists:get_value(next_protocol_negotiation, DecodedExtensions, undefined),
+
+    #client_hello{
+       client_version = {Major,Minor},
+       random = Random,
+       session_id = Session_ID,
+       cipher_suites = from_2bytes(CipherSuites),
+       compression_methods = Comp_methods,
+       renegotiation_info = RenegotiationInfo,
+       hash_signs = HashSigns,
+       next_protocol_negotiation = NextProtocolNegotiation
+      };
+
+dec_hs(_Version, ?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 		       ?BYTE(SID_length), Session_ID:SID_length/binary,
 		       Cipher_suite:2/binary, ?BYTE(Comp_method)>>) ->
     #server_hello{
@@ -850,53 +949,84 @@ dec_hs(?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 	session_id = Session_ID,
 	cipher_suite = Cipher_suite,
 	compression_method = Comp_method,
-	renegotiation_info = undefined};
+	renegotiation_info = undefined,
+	hash_signs = undefined};
 
-dec_hs(?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+dec_hs(_Version, ?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 		       ?BYTE(SID_length), Session_ID:SID_length/binary,
-		       Cipher_suite:2/binary, ?BYTE(Comp_method), 
+		       Cipher_suite:2/binary, ?BYTE(Comp_method),
 		       ?UINT16(ExtLen), Extensions:ExtLen/binary>>) ->
     
-    RenegotiationInfo = proplists:get_value(renegotiation_info, dec_hello_extensions(Extensions, []),
-					   undefined),   
+    HelloExtensions = dec_hello_extensions(Extensions, []),
+    RenegotiationInfo = proplists:get_value(renegotiation_info, HelloExtensions,
+					   undefined),
+    HashSigns = proplists:get_value(hash_signs, HelloExtensions,
+					   undefined),
+    NextProtocolNegotiation = proplists:get_value(next_protocol_negotiation, HelloExtensions, undefined),
+
     #server_hello{
 	server_version = {Major,Minor},
 	random = Random,
 	session_id = Session_ID,
 	cipher_suite = Cipher_suite,
 	compression_method = Comp_method,
-	renegotiation_info = RenegotiationInfo};
-dec_hs(?CERTIFICATE, <<?UINT24(ACLen), ASN1Certs:ACLen/binary>>) ->
+	renegotiation_info = RenegotiationInfo,
+	hash_signs = HashSigns,
+       next_protocol_negotiation = NextProtocolNegotiation};
+dec_hs(_Version, ?CERTIFICATE, <<?UINT24(ACLen), ASN1Certs:ACLen/binary>>) ->
     #certificate{asn1_certificates = certs_to_list(ASN1Certs)};
 
-dec_hs(?SERVER_KEY_EXCHANGE, <<?UINT16(PLen), P:PLen/binary,
+dec_hs(_Version, ?SERVER_KEY_EXCHANGE, <<?UINT16(PLen), P:PLen/binary,
 			      ?UINT16(GLen), G:GLen/binary,
 			      ?UINT16(YLen), Y:YLen/binary,
 			       ?UINT16(0)>>) -> %% May happen if key_algorithm is dh_anon
     #server_key_exchange{params = #server_dh_params{dh_p = P,dh_g = G,
 						    dh_y = Y},
-			 signed_params = <<>>};
-dec_hs(?SERVER_KEY_EXCHANGE, <<?UINT16(PLen), P:PLen/binary,
+			 signed_params = <<>>, hashsign = {null, anon}};
+dec_hs({Major, Minor}, ?SERVER_KEY_EXCHANGE, <<?UINT16(PLen), P:PLen/binary,
+			      ?UINT16(GLen), G:GLen/binary,
+			      ?UINT16(YLen), Y:YLen/binary,
+			      ?BYTE(HashAlgo), ?BYTE(SignAlgo),
+			      ?UINT16(Len), Sig:Len/binary>>)
+  when Major == 3, Minor >= 3 ->
+    #server_key_exchange{params = #server_dh_params{dh_p = P,dh_g = G,
+						    dh_y = Y},
+			 signed_params = Sig,
+			 hashsign = {ssl_cipher:hash_algorithm(HashAlgo), ssl_cipher:sign_algorithm(SignAlgo)}};
+dec_hs(_Version, ?SERVER_KEY_EXCHANGE, <<?UINT16(PLen), P:PLen/binary,
 			      ?UINT16(GLen), G:GLen/binary,
 			      ?UINT16(YLen), Y:YLen/binary,
 			      ?UINT16(Len), Sig:Len/binary>>) ->
     #server_key_exchange{params = #server_dh_params{dh_p = P,dh_g = G, 
 						    dh_y = Y},
-			 signed_params = Sig};
-dec_hs(?CERTIFICATE_REQUEST,
+			 signed_params = Sig, hashsign = undefined};
+dec_hs({Major, Minor}, ?CERTIFICATE_REQUEST,
+       <<?BYTE(CertTypesLen), CertTypes:CertTypesLen/binary,
+	?UINT16(HashSignsLen), HashSigns:HashSignsLen/binary,
+	?UINT16(CertAuthsLen), CertAuths:CertAuthsLen/binary>>)
+  when Major == 3, Minor >= 3 ->
+    HashSignAlgos = [{ssl_cipher:hash_algorithm(Hash), ssl_cipher:sign_algorithm(Sign)} ||
+			<<?BYTE(Hash), ?BYTE(Sign)>> <= HashSigns],
+    #certificate_request{certificate_types = CertTypes,
+			 hashsign_algorithms = #hash_sign_algos{hash_sign_algos = HashSignAlgos},
+			 certificate_authorities = CertAuths};
+dec_hs(_Version, ?CERTIFICATE_REQUEST,
        <<?BYTE(CertTypesLen), CertTypes:CertTypesLen/binary,
 	?UINT16(CertAuthsLen), CertAuths:CertAuthsLen/binary>>) ->
     #certificate_request{certificate_types = CertTypes,
 			 certificate_authorities = CertAuths};
-dec_hs(?SERVER_HELLO_DONE, <<>>) ->
+dec_hs(_Version, ?SERVER_HELLO_DONE, <<>>) ->
     #server_hello_done{};
-dec_hs(?CERTIFICATE_VERIFY,<<?UINT16(_), Signature/binary>>)->
+dec_hs({Major, Minor}, ?CERTIFICATE_VERIFY,<<HashSign:2/binary, ?UINT16(SignLen), Signature:SignLen/binary>>)
+  when Major == 3, Minor >= 3 ->
+    #certificate_verify{hashsign_algorithm = hashsign_dec(HashSign), signature = Signature};
+dec_hs(_Version, ?CERTIFICATE_VERIFY,<<?UINT16(SignLen), Signature:SignLen/binary>>)->
     #certificate_verify{signature = Signature};
-dec_hs(?CLIENT_KEY_EXCHANGE, PKEPMS) ->
+dec_hs(_Version, ?CLIENT_KEY_EXCHANGE, PKEPMS) ->
     #client_key_exchange{exchange_keys = PKEPMS};
-dec_hs(?FINISHED, VerifyData) ->
+dec_hs(_Version, ?FINISHED, VerifyData) ->
     #finished{verify_data = VerifyData};
-dec_hs(_, _) ->
+dec_hs(_, _, _) ->
     throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)).
 
 dec_client_key(PKEPMS, ?KEY_EXCHANGE_RSA, {3, 0}) ->
@@ -918,6 +1048,9 @@ dec_hello_extensions(_) ->
 
 dec_hello_extensions(<<>>, Acc) ->
     Acc;
+dec_hello_extensions(<<?UINT16(?NEXTPROTONEG_EXT), ?UINT16(Len), ExtensionData:Len/binary, Rest/binary>>, Acc) ->
+    Prop = {next_protocol_negotiation, #next_protocol_negotiation{extension_data = ExtensionData}},
+    dec_hello_extensions(Rest, [Prop | Acc]);
 dec_hello_extensions(<<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), Info:Len/binary, Rest/binary>>, Acc) ->
     RenegotiateInfo = case Len of
 			  1 ->  % Initial handshake
@@ -930,8 +1063,18 @@ dec_hello_extensions(<<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), Info:Len/binar
     dec_hello_extensions(Rest, [{renegotiation_info, 
 			   #renegotiation_info{renegotiated_connection = RenegotiateInfo}} | Acc]);
 
+dec_hello_extensions(<<?UINT16(?SIGNATURE_ALGORITHMS_EXT), ?UINT16(Len),
+		       ExtData:Len/binary, Rest/binary>>, Acc) ->
+    SignAlgoListLen = Len - 2,
+    <<?UINT16(SignAlgoListLen), SignAlgoList/binary>> = ExtData,
+    HashSignAlgos = [{ssl_cipher:hash_algorithm(Hash), ssl_cipher:sign_algorithm(Sign)} ||
+			<<?BYTE(Hash), ?BYTE(Sign)>> <= SignAlgoList],
+    dec_hello_extensions(Rest, [{hash_signs,
+				 #hash_sign_algos{hash_sign_algos = HashSignAlgos}} | Acc]);
+
 %% Ignore data following the ClientHello (i.e.,
 %% extensions) if not understood.
+
 dec_hello_extensions(<<?UINT16(_), ?UINT16(Len), _Unknown:Len/binary, Rest/binary>>, Acc) ->
     dec_hello_extensions(Rest, Acc);
 %% This theoretically should not happen if the protocol is followed, but if it does it is ignored.
@@ -964,6 +1107,11 @@ certs_from_list(ACList) ->
                         <<?UINT24(CertLen), Cert/binary>>
 		    end || Cert <- ACList]).
 
+enc_hs(#next_protocol{selected_protocol = SelectedProtocol}, _Version) ->
+    PaddingLength = 32 - ((byte_size(SelectedProtocol) + 2) rem 32),
+
+    {?NEXT_PROTOCOL, <<?BYTE((byte_size(SelectedProtocol))), SelectedProtocol/binary,
+                         ?BYTE(PaddingLength), 0:(PaddingLength * 8)>>};
 enc_hs(#hello_request{}, _Version) ->
     {?HELLO_REQUEST, <<>>};
 enc_hs(#client_hello{client_version = {Major, Minor},
@@ -971,15 +1119,22 @@ enc_hs(#client_hello{client_version = {Major, Minor},
 		     session_id = SessionID,
 		     cipher_suites = CipherSuites,
 		     compression_methods = CompMethods, 
-		     renegotiation_info = RenegotiationInfo}, _Version) ->
+		     renegotiation_info = RenegotiationInfo,
+		     hash_signs = HashSigns,
+		     next_protocol_negotiation = NextProtocolNegotiation}, _Version) ->
     SIDLength = byte_size(SessionID),
     BinCompMethods = list_to_binary(CompMethods),
     CmLength = byte_size(BinCompMethods),
     BinCipherSuites = list_to_binary(CipherSuites),
     CsLength = byte_size(BinCipherSuites),
-    Extensions  = hello_extensions(RenegotiationInfo),
-    ExtensionsBin = enc_hello_extensions(Extensions),
-    {?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+    Extensions0 = hello_extensions(RenegotiationInfo, NextProtocolNegotiation),
+    Extensions1 = if
+		      Major == 3, Minor >=3 -> Extensions0 ++ hello_extensions(HashSigns);
+		      true -> Extensions0
+		  end,
+    ExtensionsBin = enc_hello_extensions(Extensions1),
+
+ {?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 		     ?BYTE(SIDLength), SessionID/binary,
 		     ?UINT16(CsLength), BinCipherSuites/binary,
 		     ?BYTE(CmLength), BinCompMethods/binary, ExtensionsBin/binary>>};
@@ -989,9 +1144,10 @@ enc_hs(#server_hello{server_version = {Major, Minor},
 		     session_id = Session_ID,
 		     cipher_suite = Cipher_suite,
 		     compression_method = Comp_method,
-		     renegotiation_info = RenegotiationInfo}, _Version) ->
+		     renegotiation_info = RenegotiationInfo,
+		     next_protocol_negotiation = NextProtocolNegotiation}, _Version) ->
     SID_length = byte_size(Session_ID),
-    Extensions  = hello_extensions(RenegotiationInfo),
+    Extensions  = hello_extensions(RenegotiationInfo, NextProtocolNegotiation),
     ExtensionsBin = enc_hello_extensions(Extensions),
     {?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 		     ?BYTE(SID_length), Session_ID/binary,
@@ -1002,15 +1158,30 @@ enc_hs(#certificate{asn1_certificates = ASN1CertList}, _Version) ->
     {?CERTIFICATE, <<?UINT24(ACLen), ASN1Certs:ACLen/binary>>};
 enc_hs(#server_key_exchange{params = #server_dh_params{
 			      dh_p = P, dh_g = G, dh_y = Y},
-	signed_params = SignedParams}, _Version) ->
+	signed_params = SignedParams, hashsign = HashSign}, Version) ->
     PLen = byte_size(P),
     GLen = byte_size(G),
     YLen = byte_size(Y),
-    SignedLen = byte_size(SignedParams),
+    Signature = enc_sign(HashSign, SignedParams, Version),
     {?SERVER_KEY_EXCHANGE, <<?UINT16(PLen), P/binary, 
 			    ?UINT16(GLen), G/binary,
 			    ?UINT16(YLen), Y/binary,
-			    ?UINT16(SignedLen), SignedParams/binary>>
+			    Signature/binary>>
+    };
+enc_hs(#certificate_request{certificate_types = CertTypes,
+			    hashsign_algorithms = #hash_sign_algos{hash_sign_algos = HashSignAlgos},
+			    certificate_authorities = CertAuths},
+       {Major, Minor})
+  when Major == 3, Minor >= 3 ->
+    HashSigns= << <<(ssl_cipher:hash_algorithm(Hash)):8, (ssl_cipher:sign_algorithm(Sign)):8>> ||
+		   {Hash, Sign} <- HashSignAlgos >>,
+    CertTypesLen = byte_size(CertTypes),
+    HashSignsLen = byte_size(HashSigns),
+    CertAuthsLen = byte_size(CertAuths),
+    {?CERTIFICATE_REQUEST,
+       <<?BYTE(CertTypesLen), CertTypes/binary,
+	?UINT16(HashSignsLen), HashSigns/binary,
+	?UINT16(CertAuthsLen), CertAuths/binary>>
     };
 enc_hs(#certificate_request{certificate_types = CertTypes,
 			    certificate_authorities = CertAuths}, 
@@ -1025,8 +1196,8 @@ enc_hs(#server_hello_done{}, _Version) ->
     {?SERVER_HELLO_DONE, <<>>};
 enc_hs(#client_key_exchange{exchange_keys = ExchangeKeys}, Version) ->
     {?CLIENT_KEY_EXCHANGE, enc_cke(ExchangeKeys, Version)};
-enc_hs(#certificate_verify{signature = BinSig}, _) ->
-    EncSig = enc_bin_sig(BinSig),
+enc_hs(#certificate_verify{signature = BinSig, hashsign_algorithm = HashSign}, Version) ->
+    EncSig = enc_sign(HashSign, BinSig, Version),
     {?CERTIFICATE_VERIFY, EncSig};
 enc_hs(#finished{verify_data = VerifyData}, _Version) ->
     {?FINISHED, VerifyData}.
@@ -1040,14 +1211,29 @@ enc_cke(#client_diffie_hellman_public{dh_public = DHPublic}, _) ->
     Len = byte_size(DHPublic),
     <<?UINT16(Len), DHPublic/binary>>.
 
-enc_bin_sig(BinSig) ->
-    Size = byte_size(BinSig),
-    <<?UINT16(Size), BinSig/binary>>.
+enc_sign({HashAlg, SignAlg}, Signature, _Version = {Major, Minor})
+  when Major == 3, Minor >= 3->
+	SignLen = byte_size(Signature),
+	HashSign = hashsign_enc(HashAlg, SignAlg),
+	<<HashSign/binary, ?UINT16(SignLen), Signature/binary>>;
+enc_sign(_HashSign, Sign, _Version) ->
+	SignLen = byte_size(Sign),
+	<<?UINT16(SignLen), Sign/binary>>.
+
+hello_extensions(RenegotiationInfo, NextProtocolNegotiation) ->
+    hello_extensions(RenegotiationInfo) ++ next_protocol_extension(NextProtocolNegotiation).
 
-%% Renegotiation info, only current extension
+%% Renegotiation info
 hello_extensions(#renegotiation_info{renegotiated_connection = undefined}) ->
     [];
 hello_extensions(#renegotiation_info{} = Info) ->
+    [Info];
+hello_extensions(#hash_sign_algos{} = Info) ->
+    [Info].
+
+next_protocol_extension(undefined) ->
+    [];
+next_protocol_extension(#next_protocol_negotiation{} = Info) ->
     [Info].
 
 enc_hello_extensions(Extensions) ->
@@ -1058,6 +1244,9 @@ enc_hello_extensions([], Acc) ->
     Size = byte_size(Acc),
     <<?UINT16(Size), Acc/binary>>;
 
+enc_hello_extensions([#next_protocol_negotiation{extension_data = ExtensionData} | Rest], Acc) ->
+    Len = byte_size(ExtensionData),
+    enc_hello_extensions(Rest, <<?UINT16(?NEXTPROTONEG_EXT), ?UINT16(Len), ExtensionData/binary, Acc/binary>>);
 enc_hello_extensions([#renegotiation_info{renegotiated_connection = ?byte(0) = Info} | Rest], Acc) ->
     Len = byte_size(Info),
     enc_hello_extensions(Rest, <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), Info/binary, Acc/binary>>);
@@ -1065,8 +1254,22 @@ enc_hello_extensions([#renegotiation_info{renegotiated_connection = ?byte(0) = I
 enc_hello_extensions([#renegotiation_info{renegotiated_connection = Info} | Rest], Acc) ->
     InfoLen = byte_size(Info),
     Len = InfoLen +1,
-    enc_hello_extensions(Rest, <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), ?BYTE(InfoLen), Info/binary, Acc/binary>>).
-
+    enc_hello_extensions(Rest, <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), ?BYTE(InfoLen), Info/binary, Acc/binary>>);
+
+enc_hello_extensions([#hash_sign_algos{hash_sign_algos = HashSignAlgos} | Rest], Acc) ->
+    SignAlgoList = << <<(ssl_cipher:hash_algorithm(Hash)):8, (ssl_cipher:sign_algorithm(Sign)):8>> ||
+		       {Hash, Sign} <- HashSignAlgos >>,
+    ListLen = byte_size(SignAlgoList),
+    Len = ListLen + 2,
+    enc_hello_extensions(Rest, <<?UINT16(?SIGNATURE_ALGORITHMS_EXT), 
+				 ?UINT16(Len), ?UINT16(ListLen), SignAlgoList/binary, Acc/binary>>).
+
+encode_client_protocol_negotiation(undefined, _) ->
+    undefined;
+encode_client_protocol_negotiation(_, false) ->
+	#next_protocol_negotiation{extension_data = <<>>};
+encode_client_protocol_negotiation(_, _) ->
+	undefined.
 
 from_3bytes(Bin3) ->
     from_3bytes(Bin3, []).
@@ -1093,6 +1296,14 @@ certificate_types({KeyExchange, _, _, _})
 certificate_types(_) ->
     <<?BYTE(?RSA_SIGN)>>.
 
+hashsign_dec(<<?BYTE(HashAlgo), ?BYTE(SignAlgo)>>) ->
+    {ssl_cipher:hash_algorithm(HashAlgo), ssl_cipher:sign_algorithm(SignAlgo)}.
+
+hashsign_enc(HashAlgo, SignAlgo) ->
+    Hash = ssl_cipher:hash_algorithm(HashAlgo),
+    Sign = ssl_cipher:sign_algorithm(SignAlgo),
+    <<?BYTE(Hash), ?BYTE(Sign)>>.
+
 certificate_authorities(CertDbHandle, CertDbRef) ->
     Authorities = certificate_authorities_from_db(CertDbHandle, CertDbRef),
     Enc = fun(#'OTPCertificate'{tbsCertificate=TBSCert}) ->
@@ -1111,43 +1322,43 @@ certificate_authorities_from_db(CertDbHandle, CertDbRef) ->
 			      [Cert | Acc];
 			 (_, Acc) ->
 			      Acc
-		      end,	
+		      end,
     ssl_certificate_db:foldl(ConnectionCerts, [], CertDbHandle).
 
-digitally_signed(Hash, #'RSAPrivateKey'{} = Key) ->
+
+digitally_signed({3, Minor}, Hash, HashAlgo, Key) when Minor >= 3 ->
+    public_key:sign({digest, Hash}, HashAlgo, Key);
+digitally_signed(_Version, Hash, _HashAlgo, #'DSAPrivateKey'{} = Key) ->
+    public_key:sign({digest, Hash}, sha, Key);
+digitally_signed(_Version, Hash, _HashAlgo, #'RSAPrivateKey'{} = Key) ->
     public_key:encrypt_private(Hash, Key,
-			       [{rsa_pad, rsa_pkcs1_padding}]);
-digitally_signed(Hash, #'DSAPrivateKey'{} = Key) ->
-    public_key:sign(Hash, none, Key).
-    
-calc_master_secret({3,0}, PremasterSecret, ClientRandom, ServerRandom) ->
+			       [{rsa_pad, rsa_pkcs1_padding}]).
+
+calc_master_secret({3,0}, _PrfAlgo, PremasterSecret, ClientRandom, ServerRandom) ->
     ssl_ssl3:master_secret(PremasterSecret, ClientRandom, ServerRandom);
 
-calc_master_secret({3,N},PremasterSecret, ClientRandom, ServerRandom) 
-  when N == 1; N == 2 ->
-    ssl_tls1:master_secret(PremasterSecret, ClientRandom, ServerRandom).
+calc_master_secret({3,_}, PrfAlgo, PremasterSecret, ClientRandom, ServerRandom) ->
+    ssl_tls1:master_secret(PrfAlgo, PremasterSecret, ClientRandom, ServerRandom).
 
-setup_keys({3,0}, MasterSecret,
+setup_keys({3,0}, _PrfAlgo, MasterSecret,
 	   ServerRandom, ClientRandom, HashSize, KML, EKML, IVS) ->
-    ssl_ssl3:setup_keys(MasterSecret, ServerRandom, 
+    ssl_ssl3:setup_keys(MasterSecret, ServerRandom,
 			ClientRandom, HashSize, KML, EKML, IVS);
 
-setup_keys({3,1}, MasterSecret,
+setup_keys({3,N}, PrfAlgo, MasterSecret,
 	   ServerRandom, ClientRandom, HashSize, KML, _EKML, IVS) ->
-    ssl_tls1:setup_keys(MasterSecret, ServerRandom, ClientRandom, HashSize, 
+    ssl_tls1:setup_keys(N, PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize,
 			KML, IVS).
 
-calc_finished({3, 0}, Role, MasterSecret, Hashes) ->
-    ssl_ssl3:finished(Role, MasterSecret, Hashes);
-calc_finished({3, N}, Role, MasterSecret, Hashes) 
-  when  N == 1; N == 2 ->
-    ssl_tls1:finished(Role, MasterSecret, Hashes).
+calc_finished({3, 0}, Role, _PrfAlgo, MasterSecret, Handshake) ->
+    ssl_ssl3:finished(Role, MasterSecret, lists:reverse(Handshake));
+calc_finished({3, N}, Role, PrfAlgo, MasterSecret, Handshake) ->
+    ssl_tls1:finished(Role, N, PrfAlgo, MasterSecret, lists:reverse(Handshake)).
 
-calc_certificate_verify({3, 0}, MasterSecret, Algorithm, Hashes) ->
-    ssl_ssl3:certificate_verify(Algorithm, MasterSecret, Hashes);
-calc_certificate_verify({3, N}, _, Algorithm, Hashes) 
-  when  N == 1; N == 2 ->
-    ssl_tls1:certificate_verify(Algorithm, Hashes).
+calc_certificate_verify({3, 0}, HashAlgo, MasterSecret, Handshake) ->
+    ssl_ssl3:certificate_verify(HashAlgo, MasterSecret, lists:reverse(Handshake));
+calc_certificate_verify({3, N}, HashAlgo, _MasterSecret, Handshake) ->
+    ssl_tls1:certificate_verify(HashAlgo, N, lists:reverse(Handshake)).
 
 key_exchange_alg(rsa) ->
     ?KEY_EXCHANGE_RSA;
@@ -1167,7 +1378,30 @@ apply_user_fun(Fun, OtpCert, ExtensionOrError, UserState0, SslState) ->
 	    {unknown, {SslState, UserState}}
     end.
 
-alg_oid(#'RSAPrivateKey'{}) ->
-    ?'rsaEncryption';
-alg_oid(#'DSAPrivateKey'{}) ->
-    ?'id-dsa'.
+certificate_verify_rsa(Hashes, sha, Signature, PublicKey, {Major, Minor})
+  when Major == 3, Minor >= 3 ->
+    public_key:verify({digest, Hashes}, sha, Signature, PublicKey);
+certificate_verify_rsa(Hashes, HashAlgo, Signature, PublicKey, {Major, Minor})
+  when Major == 3, Minor >= 3 ->
+    public_key:verify({digest, Hashes}, HashAlgo, Signature, PublicKey);
+certificate_verify_rsa(Hashes, _HashAlgo, Signature, PublicKey, _Version) ->
+    case public_key:decrypt_public(Signature, PublicKey,
+				   [{rsa_pad, rsa_pkcs1_padding}]) of
+	Hashes -> true;
+	_      -> false
+    end.
+
+-define(TLSEXT_SIGALG_RSA(MD), {MD, rsa}).
+-define(TLSEXT_SIGALG_DSA(MD), {MD, dsa}).
+
+-define(TLSEXT_SIGALG(MD), ?TLSEXT_SIGALG_RSA(MD)).
+
+default_hash_signs() ->
+    #hash_sign_algos{hash_sign_algos =
+			 [?TLSEXT_SIGALG(sha512),
+			  ?TLSEXT_SIGALG(sha384),
+			  ?TLSEXT_SIGALG(sha256),
+			  ?TLSEXT_SIGALG(sha224),
+			  ?TLSEXT_SIGALG(sha),
+			  ?TLSEXT_SIGALG_DSA(sha),
+			  ?TLSEXT_SIGALG_RSA(md5)]}.
diff --git a/lib/ssl/src/ssl_handshake.hrl b/lib/ssl/src/ssl_handshake.hrl
index fb0ebac7d1..9af6511d68 100644
--- a/lib/ssl/src/ssl_handshake.hrl
+++ b/lib/ssl/src/ssl_handshake.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -31,6 +31,15 @@
 -type algo_oid()          :: ?'rsaEncryption' | ?'id-dsa'.
 -type public_key_params() :: #'Dss-Parms'{} | term().
 -type public_key_info()   :: {algo_oid(), #'RSAPublicKey'{} | integer() , public_key_params()}.
+-type tls_handshake_history() :: {[binary()], [binary()]}.
+
+-define(NO_PROTOCOL, <<>>).
+
+%% Signature algorithms
+-define(ANON, 0).
+-define(RSA, 1).
+-define(DSA, 2).
+-define(ECDSA, 3).
 
 -record(session, {
 	  session_id,
@@ -89,7 +98,9 @@
 	  session_id,         % opaque SessionID<0..32>
 	  cipher_suites,      % cipher_suites<2..2^16-1>
 	  compression_methods, % compression_methods<1..2^8-1>,
-	  renegotiation_info
+	  renegotiation_info,
+	  hash_signs,          % supported combinations of hashes/signature algos
+	  next_protocol_negotiation = undefined % [binary()]
 	 }).
 
 -record(server_hello, {
@@ -98,7 +109,9 @@
 	  session_id,         % opaque SessionID<0..32>
 	  cipher_suite,       % cipher_suites
 	  compression_method, % compression_method
-	  renegotiation_info
+	  renegotiation_info,
+	  hash_signs,          % supported combinations of hashes/signature algos
+	  next_protocol_negotiation = undefined % [binary()]
 	 }).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,7 +142,8 @@
   
 -record(server_key_exchange, {
 	  params, %% #server_rsa_params{} | #server_dh_params{}
-	  signed_params %% #signature{}
+	  signed_params, %% #signature{}
+	  hashsign %% term(atom(), atom())
 	 }).
 	
 %% enum { anonymous, rsa, dsa } SignatureAlgorithm;
@@ -159,6 +173,7 @@
 
 -record(certificate_request, {
 	  certificate_types,        %ClientCertificateType   <1..2^8-1>
+	  hashsign_algorithms,      %%SignatureAndHashAlgorithm <2^16-1>;
 	  certificate_authorities   %DistinguishedName       <0..2^16-1>
 	 }).
 
@@ -193,6 +208,7 @@
 %%% Certificate verify - RFC 4346 section 7.4.8
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -record(certificate_verify, {
+	  hashsign_algorithm,
 	  signature % binary()
 	 }).
 
@@ -213,6 +229,27 @@
 	  renegotiated_connection
 	 }).
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Signature Algorithms  RFC 5746 section 7.4.1.4.1.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-define(SIGNATURE_ALGORITHMS_EXT, 13).
+
+-record(hash_sign_algos, {
+	  hash_sign_algos
+	 }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Next Protocol Negotiation
+%% (http://tools.ietf.org/html/draft-agl-tls-nextprotoneg-02)
+%% (http://technotes.googlecode.com/git/nextprotoneg.html)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-define(NEXTPROTONEG_EXT, 13172).
+-define(NEXT_PROTOCOL, 67).
+-record(next_protocol_negotiation, {extension_data}).
+
+-record(next_protocol, {selected_protocol}).
+
 -endif. % -ifdef(ssl_handshake).
 
 
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
index 18cfcdcd68..a5db2dcee7 100644
--- a/lib/ssl/src/ssl_internal.hrl
+++ b/lib/ssl/src/ssl_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -34,7 +34,7 @@
 -type host()		  :: inet:ip_address() | inet:hostname().
 -type session_id()        :: 0 | binary().
 -type tls_version()       :: {integer(), integer()}.
--type tls_atom_version()  :: sslv3 | tlsv1.
+-type tls_atom_version()  :: sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2'.
 -type certdb_ref()        :: reference().
 -type db_handle()         :: term().
 -type key_algo()          :: null | rsa | dhe_rsa | dhe_dss | dh_anon.
@@ -69,11 +69,11 @@
 -define(TRUE, 0).
 -define(FALSE, 1).
 
--define(DEFAULT_SUPPORTED_VERSIONS, [tlsv1, sslv3]). % TODO: This is temporary
-%-define(DEFAULT_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1, sslv3]).
+-define(DEFAULT_SUPPORTED_VERSIONS, [tlsv1, sslv3]). %% Add 'tlsv1.1' in R16
+-define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]).
 
 -record(ssl_options, {
-	  versions,   % 'tlsv1.1' | tlsv1 | sslv3
+	  versions,   % 'tlsv1.2' | 'tlsv1.1' | tlsv1 | sslv3
 	  verify,     %   verify_none | verify_peer
 	  verify_fun, % fun(CertVerifyErrors) -> boolean()
 	  fail_if_no_peer_cert, % boolean()
@@ -106,7 +106,9 @@
 			  % after which ssl_connection will
                           % go into hibernation
 	  %% This option should only be set to true by inet_tls_dist
-	  erl_dist = false 
+	  erl_dist = false,
+	  next_protocols_advertised = undefined, %% [binary()],
+	  next_protocol_selector = undefined  %% fun([binary()]) -> binary())
 	  }).
 
 -record(socket_options,
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index 6389ff03f5..13689ce7d8 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -24,15 +24,13 @@
 -module(ssl_manager).
 -behaviour(gen_server).
 
--include("ssl_internal.hrl").
-
 %% Internal application API
 -export([start_link/1, start_link_dist/1,
 	 connection_init/2, cache_pem_file/2,
 	 lookup_trusted_cert/4,
-	 client_session_id/4, server_session_id/4,
+	 new_session_id/1, clean_cert_db/2,
 	 register_session/2, register_session/3, invalidate_session/2,
-	 invalidate_session/3]).
+	 invalidate_session/3, clear_pem_cache/0]).
 
 % Spawn export
 -export([init_session_validator/1]).
@@ -56,9 +54,12 @@
 
 -define('24H_in_msec', 8640000).
 -define('24H_in_sec', 8640).
+-define(GEN_UNIQUE_ID_MAX_TRIES, 10).
 -define(SESSION_VALIDATION_INTERVAL, 60000).
--define(CERTIFICATE_CACHE_CLEANUP, 30000).
+-define(CLEAR_PEM_CACHE, 120000).
 -define(CLEAN_SESSION_DB, 60000).
+-define(CLEAN_CERT_DB, 500).
+-define(NOT_TO_BIG, 10).
 
 %%====================================================================
 %% API
@@ -82,26 +83,46 @@ start_link_dist(Opts) ->
     gen_server:start_link({local, ssl_manager_dist}, ?MODULE, [ssl_manager_dist, Opts], []).
 
 %%--------------------------------------------------------------------
--spec connection_init(string()| {der, list()}, client | server) ->
-			     {ok, certdb_ref(), db_handle(), db_handle()}.
+-spec connection_init(binary()| {der, list()}, client | server) ->
+			     {ok, certdb_ref(), db_handle(), db_handle(), db_handle(), db_handle()}.
 %%			     
 %% Description: Do necessary initializations for a new connection.
 %%--------------------------------------------------------------------
+connection_init({der, _} = Trustedcerts, Role) ->
+    call({connection_init, Trustedcerts, Role});
+
+connection_init(<<>> = Trustedcerts, Role) ->
+    call({connection_init, Trustedcerts, Role});
+
 connection_init(Trustedcerts, Role) ->
     call({connection_init, Trustedcerts, Role}).
+
 %%--------------------------------------------------------------------
--spec cache_pem_file(string(), term()) -> {ok, term()} | {error, reason()}.
+-spec cache_pem_file(binary(), term()) -> {ok, term()} | {error, reason()}.
 %%		    
 %% Description: Cach a pem file and return its content.
 %%--------------------------------------------------------------------
 cache_pem_file(File, DbHandle) ->
-    try file:read_file_info(File) of
-	{ok, #file_info{mtime = LastWrite}} ->
-	    cache_pem_file(File, LastWrite, DbHandle)
-    catch
-	_:Reason ->
-	    {error, Reason}
+    MD5 = crypto:md5(File),
+    case ssl_certificate_db:lookup_cached_pem(DbHandle, MD5) of
+	[{Content,_}] ->
+	    {ok, Content};
+	[Content] ->
+	   {ok, Content};
+	undefined ->
+	    call({cache_pem, {MD5, File}})
     end.
+
+%%--------------------------------------------------------------------
+-spec clear_pem_cache() -> ok.
+%%
+%% Description: Clear the PEM cache
+%%--------------------------------------------------------------------
+clear_pem_cache() ->
+    %% Not supported for distribution at the moement, should it be?
+    put(ssl_manager, ssl_manager),
+    call(unconditionally_clear_pem_cache).
+
 %%--------------------------------------------------------------------
 -spec lookup_trusted_cert(term(), reference(), serialnumber(), issuer()) ->
 				 undefined | 
@@ -114,22 +135,15 @@ lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer) ->
     ssl_certificate_db:lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer).
 
 %%--------------------------------------------------------------------
--spec client_session_id(host(), inet:port_number(), #ssl_options{},
-			der_cert() | undefined) -> session_id().
+-spec new_session_id(integer()) -> session_id().
 %%
-%% Description: Select a session id for the client.
+%% Description: Creates a session id for the server.
 %%--------------------------------------------------------------------
-client_session_id(Host, Port, SslOpts, OwnCert) ->
-    call({client_session_id, Host, Port, SslOpts, OwnCert}).
+new_session_id(Port) ->
+    call({new_session_id, Port}).
 
-%%--------------------------------------------------------------------
--spec server_session_id(host(), inet:port_number(), #ssl_options{},
-			der_cert()) -> session_id().
-%%
-%% Description: Select a session id for the server.
-%%--------------------------------------------------------------------
-server_session_id(Port, SuggestedSessionId, SslOpts, OwnCert) ->
-    call({server_session_id, Port, SuggestedSessionId, SslOpts, OwnCert}).
+clean_cert_db(Ref, File) ->
+    erlang:send_after(?CLEAN_CERT_DB, self(), {clean_cert_db, Ref, File}).
 
 %%--------------------------------------------------------------------
 -spec register_session(inet:port_number(), #session{}) -> ok.
@@ -175,8 +189,9 @@ init([Name, Opts]) ->
 	proplists:get_value(session_lifetime, Opts, ?'24H_in_sec'),
     CertDb = ssl_certificate_db:create(),
     SessionCache = CacheCb:init(proplists:get_value(session_cb_init_args, Opts, [])),
-    Timer = erlang:send_after(SessionLifeTime * 1000, 
+    Timer = erlang:send_after(SessionLifeTime * 1000 + 5000, 
 			      self(), validate_sessions),
+    erlang:send_after(?CLEAR_PEM_CACHE, self(), clear_pem_cache),
     {ok, #state{certificate_db = CertDb,
 		session_cache = SessionCache,
 		session_cache_cb = CacheCb,
@@ -194,55 +209,44 @@ init([Name, Opts]) ->
 %%
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
-handle_call({{connection_init, "", _Role}, Pid}, _From, 
-	    #state{certificate_db = [CertDb |_],
+handle_call({{connection_init, <<>>, _Role}, _Pid}, _From,
+	    #state{certificate_db = [CertDb, FileRefDb, PemChace],
 		   session_cache = Cache} = State) ->
-    erlang:monitor(process, Pid),
-    Result = {ok, make_ref(),CertDb, Cache},
+    Result = {ok, make_ref(),CertDb, FileRefDb, PemChace, Cache},
     {reply, Result, State};
 
 handle_call({{connection_init, Trustedcerts, _Role}, Pid}, _From,
-	    #state{certificate_db = [CertDb|_] =Db,
+	    #state{certificate_db = [CertDb, FileRefDb, PemChace] = Db,
 		   session_cache = Cache} = State) ->
-    erlang:monitor(process, Pid),
     Result = 
 	try
 	    {ok, Ref} = ssl_certificate_db:add_trusted_certs(Pid, Trustedcerts, Db),
-	    {ok, Ref, CertDb, Cache}
+	    {ok, Ref, CertDb, FileRefDb, PemChace, Cache}
 	catch
 	    _:Reason ->
 		{error, Reason}
 	end,
     {reply, Result, State};
 
-handle_call({{client_session_id, Host, Port, SslOpts, OwnCert}, _}, _,
-	    #state{session_cache = Cache,
-		  session_cache_cb = CacheCb} = State) ->
-    Id = ssl_session:id({Host, Port, SslOpts}, Cache, CacheCb, OwnCert),
-    {reply, Id, State};
-
-handle_call({{server_session_id, Port, SuggestedSessionId, SslOpts, OwnCert}, _},
+handle_call({{new_session_id,Port}, _},
 	    _, #state{session_cache_cb = CacheCb,
-		      session_cache = Cache,
-		      session_lifetime = LifeTime} = State) ->
-    Id = ssl_session:id(Port, SuggestedSessionId, SslOpts,
-			Cache, CacheCb, LifeTime, OwnCert),
+		      session_cache = Cache} = State) ->
+    Id = new_id(Port, ?GEN_UNIQUE_ID_MAX_TRIES, Cache, CacheCb),
     {reply, Id, State};
 
-handle_call({{cache_pem, File, LastWrite}, Pid}, _, 
+
+handle_call({{cache_pem, File}, _Pid}, _,
 	    #state{certificate_db = Db} = State) ->
-    try ssl_certificate_db:cache_pem_file(Pid, File, LastWrite, Db) of
+    try ssl_certificate_db:cache_pem_file(File, Db) of
 	Result ->
 	    {reply, Result, State}
     catch 
 	_:Reason ->
 	    {reply, {error, Reason}, State}
     end;
-handle_call({{recache_pem, File, LastWrite}, Pid}, From,
-	    #state{certificate_db = Db} = State) ->
-    ssl_certificate_db:uncache_pem_file(File, Db),
-    cast({recache_pem, File, LastWrite, Pid, From}),
-    {noreply, State}.
+handle_call({unconditionally_clear_pem_cache, _},_, #state{certificate_db = [_,_,PemChace]} = State) ->
+    ssl_certificate_db:clear(PemChace),
+    {reply, ok,  State}.
 
 %%--------------------------------------------------------------------
 -spec  handle_cast(msg(), #state{}) -> {noreply, #state{}}.
@@ -278,22 +282,7 @@ handle_cast({invalidate_session, Host, Port,
 handle_cast({invalidate_session, Port, #session{session_id = ID} = Session},
 	    #state{session_cache = Cache,
 		   session_cache_cb = CacheCb} = State) ->
-    invalidate_session(Cache, CacheCb, {Port, ID}, Session, State);
-
-handle_cast({recache_pem, File, LastWrite, Pid, From},
-	    #state{certificate_db = [_, FileToRefDb, _]} = State0) ->
-    case ssl_certificate_db:lookup(File, FileToRefDb) of
-	undefined ->
-	    {reply, Msg, State} =
-		handle_call({{cache_pem, File, LastWrite}, Pid}, From, State0),
-	    gen_server:reply(From, Msg),
-	    {noreply, State};
-	_ -> %% Send message to self letting cleanup messages be handled
-	     %% first so that no reference to the old version of file
-             %% exists when we cache the new one.
-	    cast({recache_pem, File, LastWrite, Pid, From}),
-	    {noreply, State0}
-    end.
+    invalidate_session(Cache, CacheCb, {Port, ID}, Session, State).
 
 %%--------------------------------------------------------------------
 -spec handle_info(msg(), #state{}) -> {noreply, #state{}}.
@@ -318,23 +307,38 @@ handle_info({delayed_clean_session, Key}, #state{session_cache = Cache,
     CacheCb:delete(Cache, Key),
     {noreply, State};
 
-handle_info({'EXIT', _, _}, State) ->
-    %% Session validator died!! Do we need to take any action?
-    %% maybe error log
+handle_info(clear_pem_cache, #state{certificate_db = [_,_,PemChace]} = State) ->
+    case ssl_certificate_db:db_size(PemChace) of
+	N  when N < ?NOT_TO_BIG ->
+	    ok;
+	_ ->
+	    ssl_certificate_db:clear(PemChace)
+    end,
+    erlang:send_after(?CLEAR_PEM_CACHE, self(), clear_pem_cache),
     {noreply, State};
 
-handle_info({'DOWN', _Ref, _Type, _Pid, ecacertfile}, State) ->
-    {noreply, State};
 
-handle_info({'DOWN', _Ref, _Type, Pid, shutdown}, State) ->
-    handle_info({remove_trusted_certs, Pid}, State);
-handle_info({'DOWN', _Ref, _Type, Pid, _Reason}, State) ->
-    erlang:send_after(?CERTIFICATE_CACHE_CLEANUP, self(), 
-		      {remove_trusted_certs, Pid}),
+handle_info({clean_cert_db, Ref, File},
+	    #state{certificate_db = [CertDb,RefDb, PemCache]} = State) ->
+    case ssl_certificate_db:ref_count(Ref, RefDb, 0) of
+	0 ->
+	    MD5 = crypto:md5(File),
+	    case ssl_certificate_db:lookup_cached_pem(PemCache, MD5) of
+		[{Content, Ref}] ->
+		    ssl_certificate_db:insert(MD5, Content, PemCache);
+		undefined ->
+		    ok
+	    end,
+	    ssl_certificate_db:remove(Ref, RefDb),
+	    ssl_certificate_db:remove_trusted_certs(Ref, CertDb);
+	_ ->
+	    ok
+    end,
     {noreply, State};
-handle_info({remove_trusted_certs, Pid}, 
-	    #state{certificate_db = Db} = State) ->
-    ssl_certificate_db:remove_trusted_certs(Pid, Db),
+
+handle_info({'EXIT', _, _}, State) ->
+    %% Session validator died!! Do we need to take any action?
+    %% maybe error log
     {noreply, State};
 
 handle_info(_Info, State) ->
@@ -406,19 +410,6 @@ session_validation({{Port, _}, Session}, LifeTime) ->
     validate_session(Port, Session, LifeTime),
     LifeTime.
 
-cache_pem_file(File, LastWrite, DbHandle) ->
-    case ssl_certificate_db:lookup_cached_certs(DbHandle,File) of
-	[{_, {Mtime, Content}}] ->
-	    case LastWrite of
-		Mtime ->
-		    {ok, Content};
-		_ ->
-		    call({recache_pem, File, LastWrite})
-	    end;
-	[] ->
-	    call({cache_pem, File, LastWrite})
-    end.
-
 delay_time() ->
     case application:get_env(ssl, session_delay_cleanup_time) of
 	{ok, Time} when is_integer(Time) ->
@@ -448,3 +439,28 @@ last_delay_timer({{_,_},_}, TRef, {LastServer, _}) ->
     {LastServer, TRef};
 last_delay_timer({_,_}, TRef, {_, LastClient}) ->
     {TRef, LastClient}.
+
+%% If we can not generate a not allready in use session ID in
+%% ?GEN_UNIQUE_ID_MAX_TRIES we make the new session uncacheable The
+%% value of ?GEN_UNIQUE_ID_MAX_TRIES is stolen from open SSL which
+%% states : "If we can not find a session id in
+%% ?GEN_UNIQUE_ID_MAX_TRIES either the RAND code is broken or someone
+%% is trying to open roughly very close to 2^128 (or 2^256) SSL
+%% sessions to our server"
+new_id(_, 0, _, _) ->
+    <<>>;
+new_id(Port, Tries, Cache, CacheCb) ->
+    Id = crypto:rand_bytes(?NUM_OF_SESSION_ID_BYTES),
+    case CacheCb:lookup(Cache, {Port, Id}) of
+	undefined ->
+	    Now =  calendar:datetime_to_gregorian_seconds({date(), time()}),
+	    %% New sessions can not be set to resumable
+	    %% until handshake is compleate and the
+	    %% other session values are set.
+	    CacheCb:update(Cache, {Port, Id}, #session{session_id = Id,
+						       is_resumable = false,
+						       time_stamp = Now}),
+	    Id;
+	_ ->
+	    new_id(Port, Tries - 1, Cache, CacheCb)
+    end.
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index 830026c825..8e93ce4634 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -383,6 +383,8 @@ get_tls_records_aux(Data, Acc) ->
 %% Description: Creates a protocol version record from a version atom
 %% or vice versa.
 %%--------------------------------------------------------------------
+protocol_version('tlsv1.2') ->
+    {3, 3};
 protocol_version('tlsv1.1') ->
     {3, 2};
 protocol_version(tlsv1) ->
@@ -391,6 +393,8 @@ protocol_version(sslv3) ->
     {3, 0};
 protocol_version(sslv2) -> %% Backwards compatibility
     {2, 0};
+protocol_version({3, 3}) ->
+    'tlsv1.2';
 protocol_version({3, 2}) ->
     'tlsv1.1';
 protocol_version({3, 1}) ->
@@ -445,9 +449,9 @@ supported_protocol_versions() ->
 	  end,
     case application:get_env(ssl, protocol_version) of
 	undefined ->
-	    lists:map(Fun, ?DEFAULT_SUPPORTED_VERSIONS);
+	    lists:map(Fun, supported_protocol_versions([]));
 	{ok, []} ->
-	    lists:map(Fun, ?DEFAULT_SUPPORTED_VERSIONS);
+	    lists:map(Fun, supported_protocol_versions([]));
 	{ok, Vsns} when is_list(Vsns) ->
 	    Versions = lists:filter(fun is_acceptable_version/1, lists:map(Fun, Vsns)),
 	    supported_protocol_versions(Versions);
@@ -457,7 +461,16 @@ supported_protocol_versions() ->
     end.
 
 supported_protocol_versions([]) ->
-    ?DEFAULT_SUPPORTED_VERSIONS;
+    Vsns = case sufficient_tlsv1_2_crypto_support() of
+	       true ->
+		   %%?ALL_SUPPORTED_VERSIONS; %% Add TlS-1.2 as default in R16
+		   ?DEFAULT_SUPPORTED_VERSIONS;
+	       false ->
+		   ?DEFAULT_SUPPORTED_VERSIONS
+	   end,
+    application:set_env(ssl, protocol_version, Vsns),
+    Vsns;
+
 supported_protocol_versions([_|_] = Vsns) ->
     Vsns.
 
@@ -561,14 +574,14 @@ highest_protocol_version() ->
 
 initial_connection_state(ConnectionEnd) ->
     #connection_state{security_parameters =
-                      initial_security_params(ConnectionEnd),
+			  initial_security_params(ConnectionEnd),
                       sequence_number = 0
                      }.
 
 initial_security_params(ConnectionEnd) ->
     SecParams = #security_parameters{connection_end = ConnectionEnd,
 				     compression_algorithm = ?NULL},
-    ssl_cipher:security_parameters(?TLS_NULL_WITH_NULL_NULL, 
+    ssl_cipher:security_parameters(highest_protocol_version(), ?TLS_NULL_WITH_NULL_NULL,
 				   SecParams).
 
 empty_connection_state(ConnectionEnd) ->
@@ -633,7 +646,7 @@ cipher(Type, Version, Fragment, CS0) ->
 						      BCA}
 				}} = 
 	hash_and_bump_seqno(CS0, Type, Version, Length, Fragment),
-    {Ciphered, CipherS1} = ssl_cipher:cipher(BCA, CipherS0, MacHash, Fragment),
+    {Ciphered, CipherS1} = ssl_cipher:cipher(BCA, CipherS0, MacHash, Fragment, Version),
     CS2 = CS1#connection_state{cipher_state=CipherS1},
     {Ciphered, CS2}.
 
@@ -687,6 +700,17 @@ mac_hash({_,_}, ?NULL, _MacSecret, _SeqNo, _Type,
 mac_hash({3, 0}, MacAlg, MacSecret, SeqNo, Type, Length, Fragment) ->
     ssl_ssl3:mac_hash(MacAlg, MacSecret, SeqNo, Type, Length, Fragment);
 mac_hash({3, N} = Version, MacAlg, MacSecret, SeqNo, Type, Length, Fragment)  
-  when N =:= 1; N =:= 2 ->
+  when N =:= 1; N =:= 2; N =:= 3 ->
     ssl_tls1:mac_hash(MacAlg, MacSecret, SeqNo, Type, Version, 
 		      Length, Fragment).
+
+sufficient_tlsv1_2_crypto_support() ->
+    Data = "Sampl",
+    Data2 = "e #1",
+    Key = <<0,1,2,3,16,17,18,19,32,33,34,35,48,49,50,51,4,5,6,7,20,21,22,23,36,37,38,39,
+	    52,53,54,55,8,9,10,11,24,25,26,27,40,41,42,43,56,57,58,59>>,
+    try
+	crypto:sha256_mac(Key, lists:flatten([Data, Data2])),
+	true
+    catch _:_ -> false
+    end.
diff --git a/lib/ssl/src/ssl_record.hrl b/lib/ssl/src/ssl_record.hrl
index 282d642138..f73da92a52 100644
--- a/lib/ssl/src/ssl_record.hrl
+++ b/lib/ssl/src/ssl_record.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -47,6 +47,7 @@
           key_material_length,			% unit 8 
           expanded_key_material_length,		% unit 8 
           mac_algorithm,			% unit 8  
+          prf_algorithm,			% unit 8
           hash_size,				% unit 8
           compression_algorithm,		% unit 8 
           master_secret,			% opaque 48
@@ -97,10 +98,15 @@
 %-define(TRUE, 0).  %% Already defined by ssl_internal.hrl
 %-define(FALSE, 1). %% Already defined by ssl_internal.hrl
 
-%% MACAlgorithm
+%% MAC and PRF Algorithms
 %-define(NULL, 0). %% Already defined by ssl_internal.hrl
 -define(MD5, 1).
 -define(SHA, 2).
+-define(MD5SHA, 4711). %% Not defined in protocol used to represent old prf
+-define(SHA224, 3).
+-define(SHA256, 4).
+-define(SHA384, 5).
+-define(SHA512, 6).
 
 %% CompressionMethod
 % -define(NULL, 0). %% Already defined by ssl_internal.hrl
@@ -176,7 +182,8 @@
           content, % opaque content[TLSCompressed.length];
           mac,     % opaque MAC[CipherSpec.hash_size];
           padding, % unit 8 padding[GenericBlockCipher.padding_length];
-          padding_length % uint8 padding_length;
+          padding_length, % uint8 padding_length;
+          next_iv  % opaque IV[SecurityParameters.record_iv_length];
          }). 
 
 -endif. % -ifdef(ssl_record).
diff --git a/lib/ssl/src/ssl_session.erl b/lib/ssl/src/ssl_session.erl
index df5d7e0146..a24b2d9444 100644
--- a/lib/ssl/src/ssl_session.erl
+++ b/lib/ssl/src/ssl_session.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -28,9 +28,9 @@
 -include("ssl_internal.hrl").
 
 %% Internal application API
--export([is_new/2, id/4, id/7, valid_session/2]).
+-export([is_new/2, client_id/4, server_id/6, valid_session/2]).
 
--define(GEN_UNIQUE_ID_MAX_TRIES, 10).
+-define('24H_in_sec', 8640).
 
 -type seconds()   :: integer(). 
 
@@ -48,13 +48,13 @@ is_new(_ClientSuggestion, _ServerDecision) ->
     true.
 
 %%--------------------------------------------------------------------
--spec id({host(), inet:port_number(), #ssl_options{}}, db_handle(), atom(),
+-spec client_id({host(), inet:port_number(), #ssl_options{}}, db_handle(), atom(),
 	 undefined | binary()) -> binary().
 %%
-%% Description: Should be called by the client side to get an id 
+%% Description: Should be called by the client side to get an id
 %%              for the client hello message.
 %%--------------------------------------------------------------------
-id(ClientInfo, Cache, CacheCb, OwnCert) ->
+client_id(ClientInfo, Cache, CacheCb, OwnCert) ->
     case select_session(ClientInfo, Cache, CacheCb, OwnCert) of
 	no_session ->
 	    <<>>;
@@ -62,27 +62,6 @@ id(ClientInfo, Cache, CacheCb, OwnCert) ->
 	    SessionId
     end.
 
-%%--------------------------------------------------------------------
--spec id(inet:port_number(), binary(), #ssl_options{}, db_handle(),
-	 atom(), seconds(), binary()) -> binary().
-%%
-%% Description: Should be called by the server side to get an id 
-%%              for the server hello message.
-%%--------------------------------------------------------------------
-id(Port, <<>>, _, Cache, CacheCb, _, _) ->
-    new_id(Port, ?GEN_UNIQUE_ID_MAX_TRIES, Cache, CacheCb);
-
-id(Port, SuggestedSessionId, #ssl_options{reuse_sessions = ReuseEnabled,
-					  reuse_session = ReuseFun}, 
-   Cache, CacheCb, SecondLifeTime, OwnCert) ->
-    case is_resumable(SuggestedSessionId, Port, ReuseEnabled, 
-		      ReuseFun, Cache, CacheCb, SecondLifeTime, OwnCert) of
-	true ->
-	    SuggestedSessionId;
-	false ->
-	    new_id(Port, ?GEN_UNIQUE_ID_MAX_TRIES, Cache, CacheCb)
-    end.
-%%--------------------------------------------------------------------
 -spec valid_session(#session{}, seconds()) -> boolean().
 %%
 %% Description: Check that the session has not expired
@@ -91,57 +70,48 @@ valid_session(#session{time_stamp = TimeStamp}, LifeTime) ->
     Now =  calendar:datetime_to_gregorian_seconds({date(), time()}),
     Now - TimeStamp < LifeTime.
 
+server_id(Port, <<>>, _SslOpts, _Cert, _, _) ->
+    {ssl_manager:new_session_id(Port), undefined};
+server_id(Port, SuggestedId, Options, Cert, Cache, CacheCb) ->
+    LifeTime = case application:get_env(ssl, session_lifetime) of
+		   {ok, Time} when is_integer(Time) -> Time;
+		   _ -> ?'24H_in_sec'
+	       end,
+    case is_resumable(SuggestedId, Port, Options,
+		      Cache, CacheCb, LifeTime, Cert)
+    of
+	{true, Resumed} ->
+	    {SuggestedId, Resumed};
+	{false, undefined} ->
+	    {ssl_manager:new_session_id(Port), undefined}
+    end.
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
+select_session({_, _, #ssl_options{reuse_sessions=false}}, _Cache, _CacheCb, _OwnCert) ->
+    no_session;
 select_session({HostIP, Port, SslOpts}, Cache, CacheCb, OwnCert) ->
     Sessions = CacheCb:select_session(Cache, {HostIP, Port}),
     select_session(Sessions, SslOpts, OwnCert).
 
 select_session([], _, _) ->
     no_session;
-
-select_session(Sessions, #ssl_options{ciphers = Ciphers,
-				      reuse_sessions = ReuseSession}, OwnCert) ->
-    IsResumable =
-	fun(Session) ->
-		ReuseSession andalso resumable(Session#session.is_resumable) andalso
- 		    lists:member(Session#session.cipher_suite, Ciphers)
-		    andalso (OwnCert == Session#session.own_certificate)
+select_session(Sessions, #ssl_options{ciphers = Ciphers}, OwnCert) ->
+    IsNotResumable =
+	fun([_Id, Session]) ->
+		not (resumable(Session#session.is_resumable) andalso
+		     lists:member(Session#session.cipher_suite, Ciphers)
+		     andalso (OwnCert == Session#session.own_certificate))
  	end,
-    case [Id || [Id, Session] <- Sessions, IsResumable(Session)] of
- 	[] ->
- 	    no_session;
- 	List ->
- 	    hd(List)
+    case lists:dropwhile(IsNotResumable, Sessions) of
+	[] ->   no_session;
+	[[Id, _]|_] -> Id
     end.
 
-%% If we can not generate a not allready in use session ID in
-%% ?GEN_UNIQUE_ID_MAX_TRIES we make the new session uncacheable The
-%% value of ?GEN_UNIQUE_ID_MAX_TRIES is stolen from open SSL which
-%% states : "If we can not find a session id in
-%% ?GEN_UNIQUE_ID_MAX_TRIES either the RAND code is broken or someone
-%% is trying to open roughly very close to 2^128 (or 2^256) SSL
-%% sessions to our server"
-new_id(_, 0, _, _) ->
-    <<>>;
-new_id(Port, Tries, Cache, CacheCb) ->
-    Id = crypto:rand_bytes(?NUM_OF_SESSION_ID_BYTES),
-    case CacheCb:lookup(Cache, {Port, Id}) of
-	undefined ->
-	    Now =  calendar:datetime_to_gregorian_seconds({date(), time()}),
-	    %% New sessions can not be set to resumable
-	    %% until handshake is compleate and the
-	    %% other session values are set.
-	    CacheCb:update(Cache, {Port, Id}, #session{session_id = Id,
-						       is_resumable = false,
-						       time_stamp = Now}),
-	    Id;
-	_ ->
-	    new_id(Port, Tries - 1, Cache, CacheCb)
-    end.
-
-is_resumable(SuggestedSessionId, Port, ReuseEnabled, ReuseFun, Cache, 
+is_resumable(_, _, #ssl_options{reuse_sessions = false}, _, _, _, _) ->
+    {false, undefined};
+is_resumable(SuggestedSessionId, Port, #ssl_options{reuse_session = ReuseFun} = Options, Cache,
 	     CacheCb, SecondLifeTime, OwnCert) ->
     case CacheCb:lookup(Cache, {Port, SuggestedSessionId}) of
 	#session{cipher_suite = CipherSuite,
@@ -149,17 +119,27 @@ is_resumable(SuggestedSessionId, Port, ReuseEnabled, ReuseFun, Cache,
 		 compression_method = Compression,
 		 is_resumable = IsResumable,
 		 peer_certificate = PeerCert} = Session ->
-	    ReuseEnabled 
-		andalso resumable(IsResumable)
+	    case resumable(IsResumable)
 		andalso (OwnCert == SessionOwnCert)
-		andalso valid_session(Session, SecondLifeTime) 
-		andalso ReuseFun(SuggestedSessionId, PeerCert, 
-				 Compression, CipherSuite);
+		andalso valid_session(Session, SecondLifeTime)
+		andalso reusable_options(Options, Session)
+		andalso ReuseFun(SuggestedSessionId, PeerCert,
+				 Compression, CipherSuite)
+	    of
+		true  -> {true, Session};
+		false -> {false, undefined}
+	    end;
 	undefined ->
-	    false
+	    {false, undefined}
     end.
 
 resumable(new) ->
     false;
 resumable(IsResumable) ->
     IsResumable.
+
+reusable_options(#ssl_options{fail_if_no_peer_cert = true,
+			   verify = verify_peer}, Session) ->
+    (Session#session.peer_certificate =/= undefined);
+reusable_options(_,_) ->
+    true.
diff --git a/lib/ssl/src/ssl_session_cache.erl b/lib/ssl/src/ssl_session_cache.erl
index f9bbf905e1..5c6ee3c54c 100644
--- a/lib/ssl/src/ssl_session_cache.erl
+++ b/lib/ssl/src/ssl_session_cache.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -32,7 +32,7 @@
 %% Description: Return table reference. Called by ssl_manager process. 
 %%--------------------------------------------------------------------
 init(_) ->
-    ets:new(cache_name(), [set, protected]).
+    ets:new(cache_name(), [ordered_set, protected]).
 
 %%--------------------------------------------------------------------
 %% Description: Handles cache table at termination of ssl manager. 
diff --git a/lib/ssl/src/ssl_ssl3.erl b/lib/ssl/src/ssl_ssl3.erl
index f2926b2d2f..a11c5b8c0c 100644
--- a/lib/ssl/src/ssl_ssl3.erl
+++ b/lib/ssl/src/ssl_ssl3.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -54,9 +54,9 @@ master_secret(PremasterSecret, ClientRandom, ServerRandom) ->
     Block = generate_keyblock(PremasterSecret, ClientRandom, ServerRandom, 48),
     Block.
 
--spec finished(client | server, binary(), {binary(), binary()}) -> binary().
+-spec finished(client | server, binary(), [binary()]) -> binary().
 
-finished(Role, MasterSecret, {MD5Hash, SHAHash}) ->
+finished(Role, MasterSecret, Handshake) ->
    %%  draft-ietf-tls-ssl-version3-00 - 5.6.9 Finished
    %%     struct {
    %%      opaque md5_hash[16];
@@ -70,13 +70,13 @@ finished(Role, MasterSecret, {MD5Hash, SHAHash}) ->
    %%                      SHA(handshake_messages + Sender +
    %%                          master_secret + pad1));
     Sender = get_sender(Role),
-    MD5 = handshake_hash(?MD5, MasterSecret, Sender, MD5Hash),
-    SHA = handshake_hash(?SHA, MasterSecret, Sender, SHAHash),
+    MD5 = handshake_hash(?MD5, MasterSecret, Sender, Handshake),
+    SHA = handshake_hash(?SHA, MasterSecret, Sender, Handshake),
     <<MD5/binary, SHA/binary>>.
 
--spec certificate_verify(OID::tuple(), binary(), {binary(), binary()}) -> binary().
+-spec certificate_verify(md5sha | sha, binary(), [binary()]) -> binary().
 
-certificate_verify(?'rsaEncryption', MasterSecret, {MD5Hash, SHAHash}) ->
+certificate_verify(md5sha, MasterSecret, Handshake) ->
      %% md5_hash
      %%           MD5(master_secret + pad_2 +
      %%               MD5(handshake_messages + master_secret + pad_1));
@@ -84,15 +84,16 @@ certificate_verify(?'rsaEncryption', MasterSecret, {MD5Hash, SHAHash}) ->
      %%           SHA(master_secret + pad_2 +
      %%               SHA(handshake_messages + master_secret + pad_1));
 
-    MD5 = handshake_hash(?MD5, MasterSecret, undefined, MD5Hash),
-    SHA = handshake_hash(?SHA, MasterSecret, undefined, SHAHash),
+    MD5 = handshake_hash(?MD5, MasterSecret, undefined, Handshake),
+    SHA = handshake_hash(?SHA, MasterSecret, undefined, Handshake),
     <<MD5/binary, SHA/binary>>;
 
-certificate_verify(?'id-dsa', MasterSecret, {_, SHAHash}) ->
+certificate_verify(sha, MasterSecret, Handshake) ->
      %% sha_hash
      %%           SHA(master_secret + pad_2 +
      %%               SHA(handshake_messages + master_secret + pad_1));
-    handshake_hash(?SHA, MasterSecret, undefined, SHAHash).
+
+    handshake_hash(?SHA, MasterSecret, undefined, Handshake).
 
 -spec mac_hash(integer(), binary(), integer(), integer(), integer(), binary()) -> binary(). 
 
@@ -152,28 +153,17 @@ suites() ->
 %%% Internal functions
 %%--------------------------------------------------------------------
 
-hash(?MD5, Data) -> 
+hash(?MD5, Data) ->
     crypto:md5(Data);
-hash(?SHA, Data) -> 
+hash(?SHA, Data) ->
     crypto:sha(Data).
 
-hash_update(?MD5, Context, Data) -> 
-    crypto:md5_update(Context, Data);
-hash_update(?SHA, Context, Data) -> 
-    crypto:sha_update(Context, Data).
-
-hash_final(?MD5, Context) -> 
-    crypto:md5_final(Context);
-hash_final(?SHA, Context) -> 
-    crypto:sha_final(Context).
-
 %%pad_1(?NULL) ->
 %%    "";
 pad_1(?MD5) ->
     <<"666666666666666666666666666666666666666666666666">>;
 pad_1(?SHA) ->
     <<"6666666666666666666666666666666666666666">>.
-
 %%pad_2(?NULL) ->
 %%    "";
 pad_2(?MD5) ->
@@ -189,19 +179,11 @@ mac_hash(Method, Secret, Data) ->
     InnerHash = hash(Method, [Secret, pad_1(Method), Data]),
     hash(Method, [Secret, pad_2(Method), InnerHash]).
 
-handshake_hash(Method, HandshakeHash, Extra) ->
-    HSH = hash_update(Method, HandshakeHash, Extra),
-    hash_final(Method, HSH).
-
-handshake_hash(Method, MasterSecret, undefined, HandshakeHash) ->
-    InnerHash = 
-	handshake_hash(Method, HandshakeHash, 
-		       [MasterSecret, pad_1(Method)]),
+handshake_hash(Method, MasterSecret, undefined, Handshake) ->
+    InnerHash = hash(Method, [Handshake, MasterSecret, pad_1(Method)]),
     hash(Method, [MasterSecret, pad_2(Method), InnerHash]);
-handshake_hash(Method, MasterSecret, Sender, HandshakeHash) ->
-    InnerHash = 
-	handshake_hash(Method, HandshakeHash, 
-		       [Sender, MasterSecret, pad_1(Method)]),
+handshake_hash(Method, MasterSecret, Sender, Handshake) ->
+    InnerHash = hash(Method, [Handshake, Sender, MasterSecret, pad_1(Method)]),
     hash(Method, [MasterSecret, pad_2(Method), InnerHash]).
 
 get_sender(client) -> "CLNT";
diff --git a/lib/ssl/src/ssl_tls1.erl b/lib/ssl/src/ssl_tls1.erl
index c8aae34892..41dc1bf0dc 100644
--- a/lib/ssl/src/ssl_tls1.erl
+++ b/lib/ssl/src/ssl_tls1.erl
@@ -26,27 +26,29 @@
 
 -include("ssl_cipher.hrl").
 -include("ssl_internal.hrl").
--include("ssl_record.hrl"). 			
+-include("ssl_record.hrl").
 
--export([master_secret/3, finished/3, certificate_verify/2, mac_hash/7, 
-	 setup_keys/6, suites/0, prf/4]).
+-export([master_secret/4, finished/5, certificate_verify/3, mac_hash/7,
+	 setup_keys/8, suites/1, prf/5]).
 
 %%====================================================================
 %% Internal application API
 %%====================================================================
 
--spec master_secret(binary(), binary(), binary()) -> binary().
+-spec master_secret(integer(), binary(), binary(), binary()) -> binary().
 
-master_secret(PreMasterSecret, ClientRandom, ServerRandom) ->
-    %% RFC 2246 & 4346 - 8.1 %% master_secret = PRF(pre_master_secret,
-    %%                           "master secret", ClientHello.random +
-    %%                           ServerHello.random)[0..47];
-    prf(PreMasterSecret, <<"master secret">>, 
+master_secret(PrfAlgo, PreMasterSecret, ClientRandom, ServerRandom) ->
+    %% RFC 2246 & 4346 && RFC 5246 - 8.1 %% master_secret = PRF(pre_master_secret,
+    %%                                      "master secret", ClientHello.random +
+    %%                                      ServerHello.random)[0..47];
+
+    prf(PrfAlgo, PreMasterSecret, <<"master secret">>,
 	[ClientRandom, ServerRandom], 48).
 
--spec finished(client | server, binary(), {binary(), binary()}) -> binary().
+-spec finished(client | server, integer(), integer(), binary(), [binary()]) -> binary().
 
-finished(Role, MasterSecret, {MD5Hash, SHAHash}) ->
+finished(Role, Version, PrfAlgo, MasterSecret, Handshake)
+  when Version == 1; Version == 2; PrfAlgo == ?MD5SHA ->
     %% RFC 2246 & 4346 - 7.4.9. Finished
     %% struct {
     %%          opaque verify_data[12];
@@ -55,26 +57,39 @@ finished(Role, MasterSecret, {MD5Hash, SHAHash}) ->
     %%      verify_data
     %%          PRF(master_secret, finished_label, MD5(handshake_messages) +
     %%          SHA-1(handshake_messages)) [0..11];
-    MD5 = hash_final(?MD5, MD5Hash),
-    SHA = hash_final(?SHA, SHAHash),
-    prf(MasterSecret, finished_label(Role), [MD5, SHA], 12).
+    MD5 = crypto:md5(Handshake),
+    SHA = crypto:sha(Handshake),
+    prf(?MD5SHA, MasterSecret, finished_label(Role), [MD5, SHA], 12);
+
+finished(Role, Version, PrfAlgo, MasterSecret, Handshake)
+  when Version == 3 ->
+    %% RFC 5246 - 7.4.9. Finished
+    %% struct {
+    %%          opaque verify_data[12];
+    %%      } Finished;
+    %%
+    %%      verify_data
+    %%          PRF(master_secret, finished_label, Hash(handshake_messages)) [0..11];
+    Hash = crypto:hash(mac_algo(PrfAlgo), Handshake),
+    prf(PrfAlgo, MasterSecret, finished_label(Role), Hash, 12).
 
--spec certificate_verify(OID::tuple(), {binary(), binary()}) -> binary().
+-spec certificate_verify(md5sha | sha, integer(), [binary()]) -> binary().
 
-certificate_verify(?'rsaEncryption', {MD5Hash, SHAHash}) ->
-    MD5 = hash_final(?MD5, MD5Hash),
-    SHA = hash_final(?SHA, SHAHash),
+certificate_verify(md5sha, _Version, Handshake) ->
+    MD5 = crypto:md5(Handshake),
+    SHA = crypto:sha(Handshake),
     <<MD5/binary, SHA/binary>>;
 
-certificate_verify(?'id-dsa', {_, SHAHash}) ->
-    hash_final(?SHA, SHAHash).
+certificate_verify(HashAlgo, _Version, Handshake) ->
+    crypto:hash(HashAlgo, Handshake).
 
--spec setup_keys(binary(), binary(), binary(), integer(), 
-		 integer(), integer()) -> {binary(), binary(), binary(), 
+-spec setup_keys(integer(), integer(), binary(), binary(), binary(), integer(),
+		 integer(), integer()) -> {binary(), binary(), binary(),
 					  binary(), binary(), binary()}.  
 
-setup_keys(MasterSecret, ServerRandom, ClientRandom, HashSize,
-	   KeyMatLen, IVSize) ->
+setup_keys(Version, _PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize,
+	   KeyMatLen, IVSize)
+  when Version == 1 ->
     %% RFC 2246 - 6.3. Key calculation
     %% key_block = PRF(SecurityParameters.master_secret,
     %%                      "key expansion",
@@ -88,36 +103,67 @@ setup_keys(MasterSecret, ServerRandom, ClientRandom, HashSize,
     %%  client_write_IV[SecurityParameters.IV_size]
     %%  server_write_IV[SecurityParameters.IV_size]
     WantedLength = 2 * (HashSize + KeyMatLen + IVSize),
-    KeyBlock = prf(MasterSecret, "key expansion",
+    KeyBlock = prf(?MD5SHA, MasterSecret, "key expansion",
 		   [ServerRandom, ClientRandom], WantedLength),
     <<ClientWriteMacSecret:HashSize/binary, 
      ServerWriteMacSecret:HashSize/binary,
      ClientWriteKey:KeyMatLen/binary, ServerWriteKey:KeyMatLen/binary,
      ClientIV:IVSize/binary, ServerIV:IVSize/binary>> = KeyBlock,
     {ClientWriteMacSecret, ServerWriteMacSecret, ClientWriteKey,
-     ServerWriteKey, ClientIV, ServerIV}.
+     ServerWriteKey, ClientIV, ServerIV};
+
+%% TLS v1.1
+setup_keys(Version, _PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize,
+	   KeyMatLen, IVSize)
+  when Version == 2 ->
+    %% RFC 4346 - 6.3. Key calculation
+    %% key_block = PRF(SecurityParameters.master_secret,
+    %%                      "key expansion",
+    %%                      SecurityParameters.server_random +
+    %%                      SecurityParameters.client_random);
+    %% Then the key_block is partitioned as follows:
+    %%  client_write_MAC_secret[SecurityParameters.hash_size]
+    %%  server_write_MAC_secret[SecurityParameters.hash_size]
+    %%  client_write_key[SecurityParameters.key_material_length]
+    %%  server_write_key[SecurityParameters.key_material_length]
+    %%
+    %% RFC 4346 is incomplete, the client and server IVs have to
+    %% be generated just like for TLS 1.0
+    WantedLength = 2 * (HashSize + KeyMatLen + IVSize),
+    KeyBlock = prf(?MD5SHA, MasterSecret, "key expansion",
+		   [ServerRandom, ClientRandom], WantedLength),
+    <<ClientWriteMacSecret:HashSize/binary,
+     ServerWriteMacSecret:HashSize/binary,
+     ClientWriteKey:KeyMatLen/binary, ServerWriteKey:KeyMatLen/binary,
+     ClientIV:IVSize/binary, ServerIV:IVSize/binary>> = KeyBlock,
+    {ClientWriteMacSecret, ServerWriteMacSecret, ClientWriteKey,
+     ServerWriteKey, ClientIV, ServerIV};
 
-%% TLS v1.1 uncomment when supported.
-%% setup_keys(MasterSecret, ServerRandom, ClientRandom, HashSize, KeyMatLen) ->
-%%     %% RFC 4346 - 6.3. Key calculation
-%%     %% key_block = PRF(SecurityParameters.master_secret,
-%%     %%                      "key expansion",
-%%     %%                      SecurityParameters.server_random +
-%%     %%                      SecurityParameters.client_random);
-%%     %% Then the key_block is partitioned as follows:
-%%     %%  client_write_MAC_secret[SecurityParameters.hash_size]
-%%     %%  server_write_MAC_secret[SecurityParameters.hash_size]
-%%     %%  client_write_key[SecurityParameters.key_material_length]
-%%     %%  server_write_key[SecurityParameters.key_material_length]
-%%     WantedLength = 2 * (HashSize + KeyMatLen),
-%%     KeyBlock = prf(MasterSecret, "key expansion",
-%% 		   [ServerRandom, ClientRandom], WantedLength),
-%%     <<ClientWriteMacSecret:HashSize/binary, 
-%%      ServerWriteMacSecret:HashSize/binary,
-%%      ClientWriteKey:KeyMatLen/binary, ServerWriteKey:KeyMatLen/binary>> 
-%% 	= KeyBlock,
-%%     {ClientWriteMacSecret, ServerWriteMacSecret, ClientWriteKey,
-%%      ServerWriteKey, undefined, undefined}.
+%% TLS v1.2
+setup_keys(Version, PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize,
+	   KeyMatLen, IVSize)
+  when Version == 3 ->
+    %% RFC 5246 - 6.3. Key calculation
+    %% key_block = PRF(SecurityParameters.master_secret,
+    %%                      "key expansion",
+    %%                      SecurityParameters.server_random +
+    %%                      SecurityParameters.client_random);
+    %% Then the key_block is partitioned as follows:
+    %%  client_write_MAC_secret[SecurityParameters.hash_size]
+    %%  server_write_MAC_secret[SecurityParameters.hash_size]
+    %%  client_write_key[SecurityParameters.key_material_length]
+    %%  server_write_key[SecurityParameters.key_material_length]
+    %%  client_write_IV[SecurityParameters.fixed_iv_length]
+    %%  server_write_IV[SecurityParameters.fixed_iv_length]
+    WantedLength = 2 * (HashSize + KeyMatLen + IVSize),
+    KeyBlock = prf(PrfAlgo, MasterSecret, "key expansion",
+		   [ServerRandom, ClientRandom], WantedLength),
+    <<ClientWriteMacSecret:HashSize/binary,
+     ServerWriteMacSecret:HashSize/binary,
+     ClientWriteKey:KeyMatLen/binary, ServerWriteKey:KeyMatLen/binary,
+     ClientIV:IVSize/binary, ServerIV:IVSize/binary>> = KeyBlock,
+    {ClientWriteMacSecret, ServerWriteMacSecret, ClientWriteKey,
+     ServerWriteKey, ClientIV, ServerIV}.
 
 -spec mac_hash(integer(), binary(), integer(), integer(), tls_version(),
 	       integer(), binary()) -> binary(). 
@@ -134,9 +180,9 @@ mac_hash(Method, Mac_write_secret, Seq_num, Type, {Major, Minor},
 		     Fragment]),
     Mac.
 
--spec suites() -> [cipher_suite()].
+-spec suites(1|2|3) -> [cipher_suite()].
     
-suites() ->
+suites(Minor) when Minor == 1; Minor == 2->
     [ 
       ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
       ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
@@ -152,7 +198,19 @@ suites() ->
       ?TLS_RSA_WITH_RC4_128_MD5,
       ?TLS_DHE_RSA_WITH_DES_CBC_SHA,
       ?TLS_RSA_WITH_DES_CBC_SHA
-     ].
+     ];
+
+suites(Minor) when Minor == 3 ->
+    [
+     ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
+     ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,
+     ?TLS_RSA_WITH_AES_256_CBC_SHA256,
+     ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
+     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,
+     ?TLS_RSA_WITH_AES_128_CBC_SHA256
+     %% ?TLS_DH_anon_WITH_AES_128_CBC_SHA256,
+     %% ?TLS_DH_anon_WITH_AES_256_CBC_SHA256
+	] ++ suites(2).
 
 %%--------------------------------------------------------------------
 %%% Internal functions
@@ -163,7 +221,19 @@ hmac_hash(?NULL, _, _) ->
 hmac_hash(?MD5, Key, Value) ->
     crypto:md5_mac(Key, Value);
 hmac_hash(?SHA, Key, Value) ->
-    crypto:sha_mac(Key, Value).
+    crypto:sha_mac(Key, Value);
+hmac_hash(?SHA256, Key, Value) ->
+    crypto:sha256_mac(Key, Value);
+hmac_hash(?SHA384, Key, Value) ->
+    crypto:sha384_mac(Key, Value);
+hmac_hash(?SHA512, Key, Value) ->
+    crypto:sha512_mac(Key, Value).
+
+mac_algo(?MD5)    -> md5;
+mac_algo(?SHA)    -> sha;
+mac_algo(?SHA256) -> sha256;
+mac_algo(?SHA384) -> sha384;
+mac_algo(?SHA512) -> sha512.
 
 % First, we define a data expansion function, P_hash(secret, data) that
 % uses a single hash function to expand a secret and seed into an
@@ -182,7 +252,7 @@ p_hash(_Secret, _Seed, WantedLength, _Method, _N, [Last | Acc])
   when WantedLength =< 0 ->
     Keep = byte_size(Last) + WantedLength,
     <<B:Keep/binary, _/binary>> = Last,
-    lists:reverse(Acc, [B]);
+    list_to_binary(lists:reverse(Acc, [B]));
 p_hash(Secret, Seed, WantedLength, Method, N, Acc) ->
     N1 = N+1,
     Bin = hmac_hash(Method, Secret, [a(N1, Secret, Seed, Method), Seed]),
@@ -214,13 +284,18 @@ split_secret(BinSecret) ->
     <<_:Div/binary, Secret2:EvenLength/binary>> = BinSecret,
     {Secret1, Secret2}.
 
-prf(Secret, Label, Seed, WantedLength) -> 
+prf(?MD5SHA, Secret, Label, Seed, WantedLength) ->
     %% PRF(secret, label, seed) = P_MD5(S1, label + seed) XOR
     %%                            P_SHA-1(S2, label + seed);
     {S1, S2} = split_secret(Secret),
     LS = list_to_binary([Label, Seed]),
     crypto:exor(p_hash(S1, LS, WantedLength, ?MD5),
-		p_hash(S2, LS, WantedLength, ?SHA)).
+		p_hash(S2, LS, WantedLength, ?SHA));
+
+prf(MAC, Secret, Label, Seed, WantedLength) ->
+    %% PRF(secret, label, seed) = P_SHA256(secret, label + seed);
+    LS = list_to_binary([Label, Seed]),
+    p_hash(Secret, LS, WantedLength, MAC).
 
 %%%% Misc help functions %%%%
 
@@ -228,8 +303,3 @@ finished_label(client) ->
     <<"client finished">>;
 finished_label(server) ->
     <<"server finished">>.
-
-hash_final(?MD5, Conntext) -> 
-    crypto:md5_final(Conntext);
-hash_final(?SHA, Conntext) -> 
-    crypto:sha_final(Conntext).
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile
index 6b1da63d08..d36dcb588b 100644
--- a/lib/ssl/test/Makefile
+++ b/lib/ssl/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
+# Copyright Ericsson AB 1999-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -44,6 +44,8 @@ MODULES = \
 	ssl_to_openssl_SUITE \
 	ssl_session_cache_SUITE	\
 	ssl_dist_SUITE \
+	ssl_npn_hello_SUITE \
+	ssl_npn_handshake_SUITE \
 	make_certs\
 	erl_make_certs
 
@@ -120,11 +122,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(HRL_FILES_NEEDED_IN_TEST) $(COVER_FILE) $(RELSYSDIR)
-	$(INSTALL_DATA) ssl.spec ssl.cover $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(HRL_FILES_NEEDED_IN_TEST) $(COVER_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DATA) ssl.spec ssl.cover "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
 
diff --git a/lib/ssl/test/erl_make_certs.erl b/lib/ssl/test/erl_make_certs.erl
index 254aa6d2f9..d6bdd05d01 100644
--- a/lib/ssl/test/erl_make_certs.erl
+++ b/lib/ssl/test/erl_make_certs.erl
@@ -137,10 +137,10 @@ decode_key(PemBin, Pw) ->
 
 encode_key(Key = #'RSAPrivateKey'{}) ->
     {ok, Der} = 'OTP-PUB-KEY':encode('RSAPrivateKey', Key),
-    {'RSAPrivateKey', list_to_binary(Der), not_encrypted};   
+    {'RSAPrivateKey', Der, not_encrypted};
 encode_key(Key = #'DSAPrivateKey'{}) ->
     {ok, Der} = 'OTP-PUB-KEY':encode('DSAPrivateKey', Key),
-    {'DSAPrivateKey', list_to_binary(Der), not_encrypted}.
+    {'DSAPrivateKey', Der, not_encrypted}.
 
 make_tbs(SubjectKey, Opts) ->    
     Version = list_to_atom("v"++integer_to_list(proplists:get_value(version, Opts, 3))),
diff --git a/lib/ssl/test/make_certs.erl b/lib/ssl/test/make_certs.erl
index 693289990c..4603a9f846 100644
--- a/lib/ssl/test/make_certs.erl
+++ b/lib/ssl/test/make_certs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -121,7 +121,19 @@ create_self_signed_cert(Root, OpenSSLCmd, CAName, Cnf) ->
 	   " -keyout ", KeyFile, 
 	   " -out ", CertFile], 
     Env = [{"ROOTDIR", Root}],  
-    cmd(Cmd, Env).
+    cmd(Cmd, Env),
+    fix_key_file(OpenSSLCmd, KeyFile).
+
+% openssl 1.0 generates key files in pkcs8 format by default and we don't handle this format
+fix_key_file(OpenSSLCmd, KeyFile) ->
+    KeyFileTmp = KeyFile ++ ".tmp",
+    Cmd = [OpenSSLCmd, " rsa",
+           " -in ",
+           KeyFile,
+           " -out ",
+           KeyFileTmp],
+    cmd(Cmd, []),
+    ok = file:rename(KeyFileTmp, KeyFile).
 
 create_ca_dir(Root, CAName, Cnf) ->
     CARoot = filename:join([Root, CAName]),
@@ -139,7 +151,8 @@ create_req(Root, OpenSSLCmd, CnfFile, KeyFile, ReqFile) ->
 	   " -keyout ", KeyFile, 
 	   " -out ", ReqFile], 
     Env = [{"ROOTDIR", Root}], 
-    cmd(Cmd, Env).
+    cmd(Cmd, Env),
+    fix_key_file(OpenSSLCmd, KeyFile).
 
 sign_req(Root, OpenSSLCmd, CA, CertType, ReqFile, CertFile) ->
     CACnfFile = filename:join([Root, CA, "ca.cnf"]),
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 590ecf33ca..faed91e559 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -27,9 +27,11 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
+-include("ssl_internal.hrl").
 -include("ssl_alert.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_record.hrl").
+-include("ssl_handshake.hrl").
 
 -define('24H_in_sec', 86400).  
 -define(TIMEOUT, 60000).
@@ -37,6 +39,7 @@
 -define(EXPIRE, 10).
 -define(SLEEP, 500).
 -define(RENEGOTIATION_DISABLE_TIME, 12000).
+-define(CLEAN_SESSION_DB, 60000).
 
 %% Test server callback functions
 %%--------------------------------------------------------------------
@@ -50,10 +53,10 @@
 %%--------------------------------------------------------------------
 init_per_suite(Config0) ->
     Dog = ssl_test_lib:timetrap(?LONG_TIMEOUT *2),
+    catch crypto:stop(),
     try crypto:start() of
 	ok ->
 	    application:start(public_key),
-	    ssl:start(),
 
 	    %% make rsa certs using oppenssl
 	    Result =
@@ -90,44 +93,26 @@ end_per_suite(_Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %% Description: Initialization before each test case
 %%--------------------------------------------------------------------
-init_per_testcase(session_cache_process_list, Config) ->
-    init_customized_session_cache(list, Config);
-
-init_per_testcase(session_cache_process_mnesia, Config) ->
-    mnesia:start(),
-    init_customized_session_cache(mnesia, Config);
-
-init_per_testcase(reuse_session_expired, Config0) ->
-    Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = ssl_test_lib:timetrap(?EXPIRE * 1000 * 5),
-    ssl:stop(),
-    application:load(ssl),
-    application:set_env(ssl, session_lifetime, ?EXPIRE),
-    ssl:start(),
-    [{watchdog, Dog} | Config];
-
 init_per_testcase(no_authority_key_identifier, Config) ->
     %% Clear cach so that root cert will not
     %% be found.
-    ssl:stop(),
-    ssl:start(), 
+    ssl:clear_pem_cache(),
     Config;
 
-init_per_testcase(TestCase, Config) when TestCase == ciphers_rsa_signed_certs_ssl3; 
-					 TestCase == ciphers_rsa_signed_certs_openssl_names_ssl3;
-					 TestCase == ciphers_dsa_signed_certs_ssl3; 
-					 TestCase == ciphers_dsa_signed_certs_openssl_names_ssl3 ->
+init_per_testcase(protocol_versions, Config)  ->
     ssl:stop(),
     application:load(ssl),
-    application:set_env(ssl, protocol_version, sslv3),
+    %% For backwards compatibility sslv2 should be filtered out.
+    application:set_env(ssl, protocol_version, [sslv2, sslv3, tlsv1]),
     ssl:start(),
     Config;
 
-init_per_testcase(protocol_versions, Config)  ->
+init_per_testcase(reuse_session_expired, Config0) ->
+    Config = lists:keydelete(watchdog, 1, Config0),
     ssl:stop(),
     application:load(ssl),
-    %% For backwards compatibility sslv2 should be filtered out.
-    application:set_env(ssl, protocol_version, [sslv2, sslv3, tlsv1]),
+    application:set_env(ssl, session_lifetime, ?EXPIRE),
+    application:set_env(ssl, session_delay_cleanup_time, 500),
     ssl:start(),
     Config;
 
@@ -138,24 +123,15 @@ init_per_testcase(empty_protocol_versions, Config)  ->
     ssl:start(),
     Config;
 
-init_per_testcase(different_ca_peer_sign, Config0) ->
-    ssl_test_lib:make_mix_cert(Config0);
+%% init_per_testcase(different_ca_peer_sign, Config0) ->
+%%     ssl_test_lib:make_mix_cert(Config0);
 
 init_per_testcase(_TestCase, Config0) ->
+    test_server:format("TLS/SSL version ~p~n ", [ssl_record:supported_protocol_versions()]),
     Config = lists:keydelete(watchdog, 1, Config0),
     Dog = test_server:timetrap(?TIMEOUT),
    [{watchdog, Dog} | Config].
 
-init_customized_session_cache(Type, Config0) ->
-    Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = test_server:timetrap(?TIMEOUT),
-    ssl:stop(),
-    application:load(ssl),
-    application:set_env(ssl, session_cb, ?MODULE),
-    application:set_env(ssl, session_cb_init_args, [Type]),
-    ssl:start(),
-    [{watchdog, Dog} | Config].
-
 %%--------------------------------------------------------------------
 %% Function: end_per_testcase(TestCase, Config) -> _
 %% Case - atom()
@@ -164,27 +140,11 @@ init_customized_session_cache(Type, Config0) ->
 %%   A list of key/value pairs, holding the test case configuration.
 %% Description: Cleanup after each test case
 %%--------------------------------------------------------------------
-end_per_testcase(session_cache_process_list, Config) ->
-    application:unset_env(ssl, session_cb),
-    end_per_testcase(default_action, Config);
-end_per_testcase(session_cache_process_mnesia, Config) ->
-    application:unset_env(ssl, session_cb),
-    application:unset_env(ssl, session_cb_init_args),
-    mnesia:stop(),
-    ssl:stop(),
-    ssl:start(),
-    end_per_testcase(default_action, Config);
 end_per_testcase(reuse_session_expired, Config) ->
     application:unset_env(ssl, session_lifetime),
+    application:unset_env(ssl, session_delay_cleanup_time),
     end_per_testcase(default_action, Config);
-end_per_testcase(TestCase, Config) when TestCase == ciphers_rsa_signed_certs_ssl3; 
-					TestCase == ciphers_rsa_signed_certs_openssl_names_ssl3;
-					TestCase == ciphers_dsa_signed_certs_ssl3; 
-					TestCase == ciphers_dsa_signed_certs_openssl_names_ssl3;
-					TestCase == protocol_versions;
-					TestCase == empty_protocol_versions->
-    application:unset_env(ssl, protocol_version),
-    end_per_testcase(default_action, Config);
+
 end_per_testcase(_TestCase, Config) ->
     Dog = ?config(watchdog, Config),
     case Dog of 
@@ -205,73 +165,175 @@ end_per_testcase(_TestCase, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [app, alerts, connection_info, protocol_versions,
-     empty_protocol_versions, controlling_process,
-     controller_dies, client_closes_socket,
-     connect_dist, peername, peercert, sockname, socket_options,
-     invalid_inet_get_option, invalid_inet_get_option_not_list,
+    [
+     {group, basic},
+     {group, options},
+     {group, session},
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'}
+    ].
+
+groups() ->
+    [{basic, [], basic_tests()},
+     {options, [], options_tests()},
+     {'tlsv1.2', [], all_versions_groups()},
+     {'tlsv1.1', [], all_versions_groups()},
+     {'tlsv1', [], all_versions_groups() ++ rizzo_tests()},
+     {'sslv3', [], all_versions_groups() ++ rizzo_tests()},
+     {api,[], api_tests()},
+     {certificate_verify, [], certificate_verify_tests()},
+     {session, [], session_tests()},
+     {renegotiate, [], renegotiate_tests()},
+     {ciphers, [], cipher_tests()},
+     {error_handling_tests, [], error_handling_tests()}
+    ].
+
+all_versions_groups ()->
+    [{group, api},
+     {group, certificate_verify},
+     {group, renegotiate},
+     {group, ciphers},
+     {group, error_handling_tests}].
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    ssl_test_lib:init_tls_version(GroupName),
+		    Config;
+		false ->
+		    {skip, "Missing crypto support"}
+	    end;
+	_ ->
+	    ssl:start(),
+	    Config
+    end.
+
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+basic_tests() ->
+    [app,
+     alerts,
+     send_close,
+     connect_twice,
+     connect_dist
+    ].
+
+options_tests() ->
+    [der_input,
+     misc_ssl_options,
+     socket_options,
+     invalid_inet_get_option,
+     invalid_inet_get_option_not_list,
      invalid_inet_get_option_improper_list,
-     invalid_inet_set_option, invalid_inet_set_option_not_list,
+     invalid_inet_set_option,
+     invalid_inet_set_option_not_list,
      invalid_inet_set_option_improper_list,
-     misc_ssl_options, versions, cipher_suites, upgrade,
-     upgrade_with_timeout, tcp_connect, tcp_connect_big, ipv6, ekeyfile,
-     ecertfile, ecacertfile, eoptions, shutdown,
-     shutdown_write, shutdown_both, shutdown_error,
-     ciphers_rsa_signed_certs, ciphers_rsa_signed_certs_ssl3,
-     ciphers_rsa_signed_certs_openssl_names,
-     ciphers_rsa_signed_certs_openssl_names_ssl3,
-     ciphers_dsa_signed_certs, ciphers_dsa_signed_certs_ssl3,
-     ciphers_dsa_signed_certs_openssl_names,
-     ciphers_dsa_signed_certs_openssl_names_ssl3,
-     anonymous_cipher_suites,
-     default_reject_anonymous,
-     send_close,
-     close_transport_accept, dh_params,
-     server_verify_peer_passive, server_verify_peer_active,
+     dh_params,
+     ecertfile,
+     ecacertfile,
+     ekeyfile,
+     eoptions,
+     protocol_versions,
+     empty_protocol_versions,
+     ipv6,
+     reuseaddr].
+
+api_tests() ->
+    [connection_info,
+     peername,
+     peercert,
+     peercert_with_client_cert,
+     sockname,
+     versions,
+     controlling_process,
+     upgrade,
+     upgrade_with_timeout,
+     shutdown,
+     shutdown_write,
+     shutdown_both,
+     shutdown_error,
+     hibernate,
+     listen_socket,
+     ssl_accept_timeout,
+     ssl_recv_timeout
+    ].
+
+certificate_verify_tests() ->
+    [server_verify_peer_passive,
+     server_verify_peer_active,
      server_verify_peer_active_once,
-     server_verify_none_passive, server_verify_none_active,
+     server_verify_none_passive,
+     server_verify_none_active,
      server_verify_none_active_once,
-     server_verify_no_cacerts, server_require_peer_cert_ok,
+     server_verify_no_cacerts,
+     server_require_peer_cert_ok,
      server_require_peer_cert_fail,
      server_verify_client_once_passive,
      server_verify_client_once_active,
      server_verify_client_once_active_once,
-     client_verify_none_passive, client_verify_none_active,
+     new_server_wants_peer_cert,
+     client_verify_none_passive,
+     client_verify_none_active,
      client_verify_none_active_once,
-     reuse_session,
-     reuse_session_expired,
-     server_does_not_want_to_reuse_session,
-     client_renegotiate, server_renegotiate,
-     client_renegotiate_reused_session,
-     server_renegotiate_reused_session,
-     client_no_wrap_sequence_number,
-     server_no_wrap_sequence_number, extended_key_usage_verify_peer,
+     extended_key_usage_verify_peer,
      extended_key_usage_verify_none,
-     no_authority_key_identifier, invalid_signature_client,
-     invalid_signature_server, cert_expired,
+     invalid_signature_client,
+     invalid_signature_server,
+     cert_expired,
      client_with_cert_cipher_suites_handshake,
      verify_fun_always_run_client,
      verify_fun_always_run_server,
-     unknown_server_ca_fail, der_input,
+     unknown_server_ca_fail,
      unknown_server_ca_accept_verify_none,
      unknown_server_ca_accept_verify_peer,
      unknown_server_ca_accept_backwardscompatibility,
-     %%different_ca_peer_sign,
-     no_reuses_session_server_restart_new_cert,
-     no_reuses_session_server_restart_new_cert_file, reuseaddr,
-     hibernate, connect_twice, renegotiate_dos_mitigate_active,
-     renegotiate_dos_mitigate_passive,
-     tcp_error_propagation_in_active_mode, rizzo, no_rizzo_rc4
+     no_authority_key_identifier
     ].
 
-groups() -> 
-    [].
+session_tests() ->
+    [reuse_session,
+     reuse_session_expired,
+     server_does_not_want_to_reuse_session,
+     no_reuses_session_server_restart_new_cert,
+     no_reuses_session_server_restart_new_cert_file].
 
-init_per_group(_GroupName, Config) ->
-    Config.
+renegotiate_tests() ->
+    [client_renegotiate,
+     server_renegotiate,
+     client_renegotiate_reused_session,
+     server_renegotiate_reused_session,
+     client_no_wrap_sequence_number,
+     server_no_wrap_sequence_number,
+     renegotiate_dos_mitigate_active,
+     renegotiate_dos_mitigate_passive].
 
-end_per_group(_GroupName, Config) ->
-    Config.
+cipher_tests() ->
+    [cipher_suites,
+     ciphers_rsa_signed_certs,
+     ciphers_rsa_signed_certs_openssl_names,
+     ciphers_dsa_signed_certs,
+     ciphers_dsa_signed_certs_openssl_names,
+     anonymous_cipher_suites,
+     default_reject_anonymous].
+
+error_handling_tests()->
+    [controller_dies,
+     client_closes_socket,
+     tcp_error_propagation_in_active_mode,
+     tcp_connect,
+     tcp_connect_big,
+     close_transport_accept
+    ].
+
+rizzo_tests() ->
+    [rizzo,
+     no_rizzo_rc4].
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
@@ -730,6 +792,43 @@ peercert(Config) when is_list(Config) ->
 
 peercert_result(Socket) ->
     ssl:peercert(Socket).
+%%--------------------------------------------------------------------
+
+peercert_with_client_cert(doc) ->
+    [""];
+peercert_with_client_cert(suite) ->
+    [];
+peercert_with_client_cert(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_dsa_opts, Config),
+    ServerOpts = ?config(server_dsa_verify_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+			   {mfa, {?MODULE, peercert_result, []}},
+			   {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, {?MODULE, peercert_result, []}},
+			   {options, ClientOpts}]),
+
+    ServerCertFile = proplists:get_value(certfile, ServerOpts),
+    [{'Certificate', ServerBinCert, _}]= ssl_test_lib:pem_to_der(ServerCertFile),
+     ClientCertFile = proplists:get_value(certfile, ClientOpts),
+    [{'Certificate', ClientBinCert, _}]= ssl_test_lib:pem_to_der(ClientCertFile),
+
+    ServerMsg = {ok, ClientBinCert},
+    ClientMsg = {ok, ServerBinCert},
+
+    test_server:format("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+
+    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
 sockname(doc) -> 
@@ -1724,21 +1823,7 @@ ciphers_rsa_signed_certs(Config) when is_list(Config) ->
 	ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
 
     Ciphers = ssl_test_lib:rsa_suites(),
-    test_server:format("tls1 erlang cipher suites ~p~n", [Ciphers]),
-    run_suites(Ciphers, Version, Config, rsa).
-
-ciphers_rsa_signed_certs_ssl3(doc) -> 
-    ["Test all rsa ssl cipher suites in ssl3"];
-       
-ciphers_rsa_signed_certs_ssl3(suite) -> 
-    [];
-
-ciphers_rsa_signed_certs_ssl3(Config) when is_list(Config) ->
-    Version = 
-	ssl_record:protocol_version({3,0}),
-
-    Ciphers = ssl_test_lib:rsa_suites(),
-    test_server:format("ssl3 erlang cipher suites ~p~n", [Ciphers]),
+    test_server:format("~p erlang cipher suites ~p~n", [Version, Ciphers]),
     run_suites(Ciphers, Version, Config, rsa).
 
 ciphers_rsa_signed_certs_openssl_names(doc) -> 
@@ -1755,18 +1840,6 @@ ciphers_rsa_signed_certs_openssl_names(Config) when is_list(Config) ->
     run_suites(Ciphers, Version, Config, rsa).
 
 
-ciphers_rsa_signed_certs_openssl_names_ssl3(doc) -> 
-    ["Test all dsa ssl cipher suites in ssl3"];
-       
-ciphers_rsa_signed_certs_openssl_names_ssl3(suite) -> 
-    [];
-
-ciphers_rsa_signed_certs_openssl_names_ssl3(Config) when is_list(Config) ->
-    Version = ssl_record:protocol_version({3,0}),
-    Ciphers = ssl_test_lib:openssl_rsa_suites(),
-    run_suites(Ciphers, Version, Config, rsa).
-
-
 ciphers_dsa_signed_certs(doc) -> 
     ["Test all dsa ssl cipher suites in highest support ssl/tls version"];
        
@@ -1778,23 +1851,8 @@ ciphers_dsa_signed_certs(Config) when is_list(Config) ->
 	ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
 
     Ciphers = ssl_test_lib:dsa_suites(),
-    test_server:format("tls1 erlang cipher suites ~p~n", [Ciphers]),
-    run_suites(Ciphers, Version, Config, dsa).
-
-ciphers_dsa_signed_certs_ssl3(doc) -> 
-    ["Test all dsa ssl cipher suites in ssl3"];
-       
-ciphers_dsa_signed_certs_ssl3(suite) -> 
-    [];
-
-ciphers_dsa_signed_certs_ssl3(Config) when is_list(Config) ->
-    Version = 
-	ssl_record:protocol_version({3,0}),
-
-    Ciphers = ssl_test_lib:dsa_suites(),
-    test_server:format("ssl3 erlang cipher suites ~p~n", [Ciphers]),  
+    test_server:format("~p erlang cipher suites ~p~n", [Version, Ciphers]),
     run_suites(Ciphers, Version, Config, dsa).
-    
 
 ciphers_dsa_signed_certs_openssl_names(doc) -> 
     ["Test all dsa ssl cipher suites in highest support ssl/tls version"];
@@ -1810,18 +1868,6 @@ ciphers_dsa_signed_certs_openssl_names(Config) when is_list(Config) ->
     test_server:format("tls1 openssl cipher suites ~p~n", [Ciphers]),
     run_suites(Ciphers, Version, Config, dsa).
 
-
-ciphers_dsa_signed_certs_openssl_names_ssl3(doc) -> 
-    ["Test all dsa ssl cipher suites in ssl3"];
-       
-ciphers_dsa_signed_certs_openssl_names_ssl3(suite) -> 
-    [];
-
-ciphers_dsa_signed_certs_openssl_names_ssl3(Config) when is_list(Config) ->
-    Version = ssl_record:protocol_version({3,0}),
-    Ciphers = ssl_test_lib:openssl_dsa_suites(),
-    run_suites(Ciphers, Version, Config, dsa).
-
 anonymous_cipher_suites(doc)->
     ["Test the anonymous ciphersuites"];
 anonymous_cipher_suites(suite) ->
@@ -1858,7 +1904,7 @@ run_suites(Ciphers, Version, Config, Type) ->
     end.
 
 erlang_cipher_suite(Suite) when is_list(Suite)->
-    ssl_cipher:suite_definition(ssl_cipher:openssl_suite(Suite));
+    ssl:suite_definition(ssl_cipher:openssl_suite(Suite));
 erlang_cipher_suite(Suite) ->
     Suite.
 
@@ -2085,13 +2131,16 @@ reuse_session_expired(Config) when is_list(Config) ->
     Server ! listen,
 
     %% Make sure session is unregistered due to expiration
-    test_server:sleep((?EXPIRE+1) * 1000),
+    test_server:sleep((?EXPIRE+1)),
+    [{session_id, Id} |_] = SessionInfo,
+
+    make_sure_expired(Hostname, Port, Id),
     
     Client2 =
 	ssl_test_lib:start_client([{node, ClientNode}, 
-		      {port, Port}, {host, Hostname},
+				   {port, Port}, {host, Hostname},
 				   {mfa, {ssl_test_lib, session_info_result, []}},
-				   {from, self()},  {options, ClientOpts}]),   
+				   {from, self()}, {options, ClientOpts}]),   
     receive
 	{Client2, SessionInfo} ->
 	    test_server:fail(session_reused_when_session_expired);
@@ -2104,6 +2153,22 @@ reuse_session_expired(Config) when is_list(Config) ->
     ssl_test_lib:close(Client1),
     ssl_test_lib:close(Client2).
 
+make_sure_expired(Host, Port, Id) ->
+    {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)),
+    [_, _,_, _, Prop] = StatusInfo,
+    State = ssl_test_lib:state(Prop),
+    Cache = element(2, State),
+
+    case ssl_session_cache:lookup(Cache, {{Host,  Port}, Id}) of
+	undefined ->
+	   ok;
+	#session{is_resumable = false} ->
+	   ok;
+	_ ->
+	    test_server:sleep(?SLEEP),
+	    make_sure_expired(Host, Port, Id)
+    end.     
+
 %%--------------------------------------------------------------------
 server_does_not_want_to_reuse_session(doc) -> 
     ["Test reuse of sessions (short handshake)"];
@@ -3586,9 +3651,14 @@ no_reuses_session_server_restart_new_cert(Config) when is_list(Config) ->
 
     %% Make sure session is registered
     test_server:sleep(?SLEEP),
+    Monitor = erlang:monitor(process, Server),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client0),
-
+    receive
+	{'DOWN', Monitor, _, _, _} ->
+	    ok
+    end,
+    
     Server1 =
 	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
 				   {from, self()},
@@ -3649,6 +3719,8 @@ no_reuses_session_server_restart_new_cert_file(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client0),
 
+    ssl:clear_pem_cache(),
+
     NewServerOpts = new_config(PrivDir, DsaServerOpts),
 
     Server1 =
@@ -3693,10 +3765,14 @@ reuseaddr(Config) when is_list(Config) ->
 				   {from, self()},
 				   {mfa, {ssl_test_lib, no_result, []}},
 				   {options, [{active, false} | ClientOpts]}]),
-    test_server:sleep(?SLEEP),
+    Monitor = erlang:monitor(process, Server),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client),
-
+    receive
+	{'DOWN', Monitor, _, _, _} ->
+	    ok
+    end,
+    
     Server1 =
 	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
 				   {from, self()},
@@ -3752,6 +3828,90 @@ hibernate(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
+listen_socket(doc) ->
+    ["Check error handling and inet compliance when calling API functions with listen sockets."];
+
+listen_socket(suite) ->
+    [];
+
+listen_socket(Config) ->
+    ServerOpts = ?config(server_opts, Config),
+    {ok, ListenSocket} = ssl:listen(0, ServerOpts),
+
+    %% This can be a valid thing to do as
+    %% options are inherited by the accept socket
+    ok = ssl:controlling_process(ListenSocket, self()),
+
+    {ok, _} = ssl:sockname(ListenSocket),
+
+    {error, enotconn} = ssl:send(ListenSocket, <<"data">>),
+    {error, enotconn} = ssl:recv(ListenSocket, 0),
+    {error, enotconn} = ssl:connection_info(ListenSocket),
+    {error, enotconn} = ssl:peername(ListenSocket),
+    {error, enotconn} = ssl:peercert(ListenSocket),
+    {error, enotconn} = ssl:session_info(ListenSocket),
+    {error, enotconn} = ssl:renegotiate(ListenSocket),
+    {error, enotconn} = ssl:prf(ListenSocket, 'master_secret', <<"Label">>, client_random, 256),
+    {error, enotconn} = ssl:shutdown(ListenSocket, read_write),
+
+    ok = ssl:close(ListenSocket).
+%%--------------------------------------------------------------------
+ssl_accept_timeout(doc) ->
+    ["Test ssl:ssl_accept timeout"];
+ssl_accept_timeout(suite) ->
+    [];
+ssl_accept_timeout(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ?config(server_opts, Config),
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+					{timeout, 5000},
+					{mfa, {ssl_test_lib,
+					       no_result_msg, []}},
+					{options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    {ok, CSocket} = gen_tcp:connect(Hostname, Port, [binary, {active, true}]),
+
+    receive
+	{tcp_closed, CSocket} ->
+	    ssl_test_lib:check_result(Server, {error, timeout}),
+	    receive
+		{'EXIT', Server, _} ->
+		    [] = supervisor:which_children(ssl_connection_sup)
+	    end
+    end.
+
+%%--------------------------------------------------------------------
+ssl_recv_timeout(doc) ->
+    ["Test ssl:ssl_accept timeout"];
+ssl_recv_timeout(suite) ->
+    [];
+ssl_recv_timeout(Config) ->
+    ServerOpts = ?config(server_opts, Config),
+    ClientOpts = ?config(client_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+				   {from, self()},
+				   {mfa, {?MODULE, send_recv_result_timeout_server, []}},
+				   {options, [{active, false} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE,
+					       send_recv_result_timeout_client, []}},
+					{options, [{active, false} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Client, ok, Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
 
 connect_twice(doc) ->
     [""];
@@ -3872,16 +4032,16 @@ tcp_error_propagation_in_active_mode(Config) when is_list(Config) ->
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
 
     Server  = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					  {from, self()},
-					  {mfa, {ssl_test_lib, no_result, []}},
-					  {options, ServerOpts}]),
+					 {from, self()},
+					 {mfa, {ssl_test_lib, no_result, []}},
+					 {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     {Client, #sslsocket{pid=Pid} = SslSocket} = ssl_test_lib:start_client([return_socket,
-							       {node, ClientNode}, {port, Port},
-							       {host, Hostname},
-							       {from, self()},
-							       {mfa, {?MODULE, receive_msg, []}},
-							       {options, ClientOpts}]),
+									   {node, ClientNode}, {port, Port},
+									   {host, Hostname},
+									   {from, self()},
+									   {mfa, {?MODULE, receive_msg, []}},
+									   {options, ClientOpts}]),
 
     {status, _, _, StatusInfo} = sys:get_status(Pid),
     [_, _,_, _, Prop] = StatusInfo,
@@ -3892,6 +4052,32 @@ tcp_error_propagation_in_active_mode(Config) when is_list(Config) ->
     Pid ! {tcp_error, Socket, etimedout},
 
     ssl_test_lib:check_result(Client, {ssl_closed, SslSocket}).
+
+
+%%--------------------------------------------------------------------
+
+recv_error_handling(doc) ->
+    ["Special case of call error handling"];
+recv_error_handling(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server  = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					  {from, self()},
+					  {mfa, {?MODULE, recv_close, []}},
+					 {options, [{active, false} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    {_Client, #sslsocket{} = SslSocket} = ssl_test_lib:start_client([return_socket,
+									   {node, ClientNode}, {port, Port},
+									   {host, Hostname},
+									   {from, self()},
+									   {mfa, {ssl_test_lib, no_result, []}},
+									   {options, ClientOpts}]),
+    ssl:close(SslSocket),
+    ssl_test_lib:check_result(Server, ok).
+
+
 %%--------------------------------------------------------------------
 
 rizzo(doc) -> ["Test that there is a 1/n-1-split for non RC4 in 'TLS < 1.1' as it is
@@ -3899,21 +4085,22 @@ rizzo(doc) -> ["Test that there is a 1/n-1-split for non RC4 in 'TLS < 1.1' as i
 
 rizzo(Config) when is_list(Config) ->
     Ciphers  = [X || X ={_,Y,_} <- ssl:cipher_suites(), Y  =/= rc4_128],
-    run_send_recv_rizzo(Ciphers, Config, sslv3,
-			 {?MODULE, send_recv_result_active_rizzo, []}),
-    run_send_recv_rizzo(Ciphers, Config, tlsv1,
+    Prop = ?config(tc_group_properties, Config),
+    Version = proplists:get_value(name, Prop),
+    run_send_recv_rizzo(Ciphers, Config, Version,
 			 {?MODULE, send_recv_result_active_rizzo, []}).
-
+%%--------------------------------------------------------------------
 no_rizzo_rc4(doc) -> 
     ["Test that there is no 1/n-1-split for RC4 as it is not vunrable to Rizzo/Dungon attack"];
 
 no_rizzo_rc4(Config) when is_list(Config) ->
     Ciphers = [X || X ={_,Y,_} <- ssl:cipher_suites(),Y == rc4_128],
-    run_send_recv_rizzo(Ciphers, Config, sslv3,
-			{?MODULE, send_recv_result_active_no_rizzo, []}),
-    run_send_recv_rizzo(Ciphers, Config, tlsv1,
+    Prop = ?config(tc_group_properties, Config),
+    Version = proplists:get_value(name, Prop),
+    run_send_recv_rizzo(Ciphers, Config, Version,
 			{?MODULE, send_recv_result_active_no_rizzo, []}).
 
+%%--------------------------------------------------------------------
 run_send_recv_rizzo(Ciphers, Config, Version, Mfa) ->
     Result =  lists:map(fun(Cipher) -> 
 				rizzo_test(Cipher, Config, Version, Mfa) end,
@@ -3959,6 +4146,67 @@ client_server_opts({KeyAlgo,_,_}, Config) when KeyAlgo == dss orelse KeyAlgo ==
     {?config(client_dsa_opts, Config),
      ?config(server_dsa_opts, Config)}.
 
+
+%%--------------------------------------------------------------------
+
+new_server_wants_peer_cert(doc) ->
+    ["Test that server configured to do client certification does"
+     " not reuse session without a client certificate."];
+new_server_wants_peer_cert(suite) ->
+    [];
+new_server_wants_peer_cert(Config) when is_list(Config) ->
+    ServerOpts = ?config(server_opts, Config),
+    VServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
+		  | ?config(server_verification_opts, Config)],
+    ClientOpts = ?config(client_verification_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+				   {from, self()},
+				   {mfa, {?MODULE, peercert_result, []}},
+				   {options,  [ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client =
+	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+				   {host, Hostname},
+				   {from, self()},
+				   {mfa, {ssl_test_lib, no_result, []}},
+				   {options, ClientOpts}]),
+
+    Monitor = erlang:monitor(process, Server),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client),
+    receive
+	{'DOWN', Monitor, _, _, _} ->
+	    ok
+    end,
+    
+    Server1 = ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
+					 {from, self()},
+					 {mfa, {?MODULE, peercert_result, []}},
+					 {options,  VServerOpts}]), 
+    Client1 =
+	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+				   {host, Hostname},
+				   {from, self()},
+				   {mfa, {ssl_test_lib, no_result, []}},
+				   {options, [ClientOpts]}]),
+
+    CertFile = proplists:get_value(certfile, ClientOpts),
+    [{'Certificate', BinCert, _}]= ssl_test_lib:pem_to_der(CertFile),
+
+    ServerMsg = {error, no_peercert},
+    Sever1Msg = {ok, BinCert},
+   
+    ssl_test_lib:check_result(Server, ServerMsg, Server1, Sever1Msg),
+
+    ssl_test_lib:close(Server1),
+    ssl_test_lib:close(Client),
+    ssl_test_lib:close(Client1).
+
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
@@ -3967,6 +4215,32 @@ send_recv_result(Socket) ->
     {ok,"Hello world"} = ssl:recv(Socket, 11),
     ok.
 
+send_recv_result_timeout_client(Socket) ->
+    {error, timeout} = ssl:recv(Socket, 11, 500),
+    ssl:send(Socket, "Hello world"),
+    receive
+	Msg ->
+	    io:format("Msg ~p~n",[Msg])
+    after 500 ->
+	    ok
+    end,
+    {ok, "Hello world"} = ssl:recv(Socket, 11, 500),
+    ok.
+send_recv_result_timeout_server(Socket) ->
+    ssl:send(Socket, "Hello"),
+    {ok, "Hello world"} = ssl:recv(Socket, 11),
+    ssl:send(Socket, " world"),
+    ok.
+
+recv_close(Socket) ->
+    {error, closed} = ssl:recv(Socket, 11),
+    receive
+	{_,{error,closed}} ->
+	    error_extra_close_sent_to_user_process
+    after 500 ->
+	    ok
+    end.
+
 send_recv_result_active(Socket) ->
     ssl:send(Socket, "Hello world"),
     receive 
diff --git a/lib/ssl/test/ssl_cipher_SUITE.erl b/lib/ssl/test/ssl_cipher_SUITE.erl
index 99bc21e820..ea1d9dc90c 100644
--- a/lib/ssl/test/ssl_cipher_SUITE.erl
+++ b/lib/ssl/test/ssl_cipher_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -27,6 +27,7 @@
 -include("ssl_internal.hrl").
 -include("ssl_record.hrl").
 -include("ssl_cipher.hrl").
+-include("ssl_alert.hrl").
 
 -define(TIMEOUT, 600000).
 
@@ -103,7 +104,7 @@ end_per_testcase(_TestCase, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [aes_decipher_good, aes_decipher_fail].
+    [aes_decipher_good, aes_decipher_good_tls11, aes_decipher_fail, aes_decipher_fail_tls11].
 
 groups() -> 
     [].
@@ -131,10 +132,39 @@ aes_decipher_good(Config) when is_list(Config) ->
 		 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160,
 		 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122,
 		 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>,
-    Version = {3,3},
-    Content = <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56,72,69,76,76,79,10>>,
+    Content = <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56, "HELLO\n">>,
     Mac = <<71,136,212,107,223,200,70,232,127,116,148,205,232,35,158,113,237,174,15,217,192,168,35,8,6,107,107,233,25,174,90,111>>,
+    Version = {3,0},
     {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version),
+    Version1 = {3,1},
+    {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1),
+    ok.
+
+%%--------------------------------------------------------------------
+
+aes_decipher_good_tls11(doc) ->
+    ["Decipher a known TLS 1.1 cryptotext."];
+
+aes_decipher_good_tls11(suite) ->
+    [];
+
+%% the fragment is actuall a TLS 1.1 record, with
+%% Version = TLS 1.1, we get the correct NextIV in #cipher_state
+aes_decipher_good_tls11(Config) when is_list(Config) ->
+    HashSz = 32,
+    CipherState = #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>,
+				key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,148>>},
+    Fragment = <<220,193,179,139,171,33,143,245,202,47,123,251,13,232,114,8,
+		 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160,
+		 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122,
+		 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>,
+    Content = <<"HELLO\n">>,
+    NextIV = <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56>>,
+    Mac = <<71,136,212,107,223,200,70,232,127,116,148,205,232,35,158,113,237,174,15,217,192,168,35,8,6,107,107,233,25,174,90,111>>,
+    Version = {3,2},
+    {Content, Mac, #cipher_state{iv = NextIV}} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version),
+    Version1 = {3,2},
+    {Content, Mac, #cipher_state{iv = NextIV}} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1),
     ok.
 
 %%--------------------------------------------------------------------
@@ -154,10 +184,38 @@ aes_decipher_fail(Config) when is_list(Config) ->
 		 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160,
 		 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122,
 		 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>,
-    Version = {3,3},
+    Version = {3,0},
     {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version),
     32 = byte_size(Content),
     32 = byte_size(Mac),
+    Version1 = {3,1},
+    {Content1, Mac1, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1),
+    32 = byte_size(Content1),
+    32 = byte_size(Mac1),
+    ok.
+
+%%--------------------------------------------------------------------
+
+aes_decipher_fail_tls11(doc) ->
+    ["Decipher a known TLS 1.1 cryptotext."];
+
+aes_decipher_fail_tls11(suite) ->
+    [];
+
+%% same as above, last byte of key replaced
+%% stricter padding checks in TLS 1.1 mean we get an alert instead
+aes_decipher_fail_tls11(Config) when is_list(Config) ->
+    HashSz = 32,
+    CipherState = #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>,
+				key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,254>>},
+    Fragment = <<220,193,179,139,171,33,143,245,202,47,123,251,13,232,114,8,
+		 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160,
+		 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122,
+		 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>,
+    Version = {3,2},
+    #alert{level = ?FATAL, description = ?BAD_RECORD_MAC} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version),
+    Version1 = {3,3},
+    #alert{level = ?FATAL, description = ?BAD_RECORD_MAC} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1),
     ok.
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
index 12d92c8ca1..818f7f1897 100644
--- a/lib/ssl/test/ssl_dist_SUITE.erl
+++ b/lib/ssl/test/ssl_dist_SUITE.erl
@@ -369,7 +369,7 @@ mk_node_cmdline(ListenPort, Name, Args) ->
 		 _ -> "-name "
 	     end,
     {ok, Pwd} = file:get_cwd(),
-    Prog ++ " "
+    "\"" ++ Prog ++ "\" "
 	++ Static ++ " "
 	++ NameSw ++ " " ++ Name ++ " "
 	++ "-pa " ++ Pa ++ " "
@@ -729,7 +729,7 @@ add_ssl_opts_config(Config) ->
 	[{ssl_opts, "-boot " ++ Script} | Config]
     catch
 	_:_ ->
-	    [{ssl_opts, "-pa " ++ filename:dirname(code:which(ssl))}
+	    [{ssl_opts, "-pa \"" ++ filename:dirname(code:which(ssl))++"\""}
 	     | add_comment_config(
 		 "Bootscript wasn't used since the test wasn't run on an "
 		 "installed OTP system.",
diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl
index 08c23b2d47..363a0be594 100644
--- a/lib/ssl/test/ssl_handshake_SUITE.erl
+++ b/lib/ssl/test/ssl_handshake_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -48,7 +48,8 @@ decode_hello_handshake(_Config) ->
 	16#00, 16#00, 16#33, 16#74, 16#00, 16#07, 16#06, 16#73,
 	16#70, 16#64, 16#79, 16#2f, 16#32>>,
 	
-	{Records, _Buffer} = ssl_handshake:get_tls_handshake(HelloPacket, <<>>),
+	Version = {3, 0},
+	{Records, _Buffer} = ssl_handshake:get_tls_handshake(Version, HelloPacket, <<>>),
 	
 	{Hello, _Data} = hd(Records),
 	#renegotiation_info{renegotiated_connection = <<0>>} = Hello#server_hello.renegotiation_info.
diff --git a/lib/ssl/test/ssl_npn_handshake_SUITE.erl b/lib/ssl/test/ssl_npn_handshake_SUITE.erl
new file mode 100644
index 0000000000..8597aa6740
--- /dev/null
+++ b/lib/ssl/test/ssl_npn_handshake_SUITE.erl
@@ -0,0 +1,310 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+-module(ssl_npn_handshake_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+-include_lib("common_test/include/ct.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [{group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'}].
+
+groups() ->
+    [
+     {'tlsv1.2', [], next_protocol_tests()},
+     {'tlsv1.1', [], next_protocol_tests()},
+     {'tlsv1', [], next_protocol_tests()},
+     {'sslv3', [], next_protocol_not_supported()}
+    ].
+
+next_protocol_tests() ->
+    [validate_empty_protocols_are_not_allowed,
+     validate_empty_advertisement_list_is_allowed,
+     validate_advertisement_must_be_a_binary_list,
+     validate_client_protocols_must_be_a_tuple,
+     normal_npn_handshake_server_preference,
+     normal_npn_handshake_client_preference,
+     fallback_npn_handshake,
+     fallback_npn_handshake_server_preference,
+     client_negotiate_server_does_not_support,
+     no_client_negotiate_but_server_supports_npn,
+     renegotiate_from_client_after_npn_handshake
+    ].
+
+next_protocol_not_supported() ->
+    [npn_not_supported_client,
+     npn_not_supported_server
+    ].
+
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    ssl:start(),
+	    Result =
+		(catch make_certs:all(?config(data_dir, Config),
+				      ?config(priv_dir, Config))),
+	    test_server:format("Make certs  ~p~n", [Result]),
+	    ssl_test_lib:cert_options(Config)
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
+
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    ssl_test_lib:init_tls_version(GroupName),
+		    Config;
+		false ->
+		    {skip, "Missing crypto support"}
+	    end;
+	_ ->
+	    ssl:start(),
+	    Config
+    end.
+
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%% Test cases starts here.
+%%--------------------------------------------------------------------
+
+validate_empty_protocols_are_not_allowed(Config) when is_list(Config) ->
+    {error, {eoptions, {next_protocols_advertised, {invalid_protocol, <<>>}}}}
+	= (catch ssl:listen(9443,
+			    [{next_protocols_advertised, [<<"foo/1">>, <<"">>]}])),
+    {error, {eoptions, {client_preferred_next_protocols, {invalid_protocol, <<>>}}}}
+	= (catch ssl:connect({127,0,0,1}, 9443,
+			     [{client_preferred_next_protocols,
+			       {client, [<<"foo/1">>, <<"">>], <<"foox/1">>}}], infinity)),
+    Option = {client_preferred_next_protocols, {invalid_protocol, <<"">>}},
+    {error, {eoptions, Option}} = (catch ssl:connect({127,0,0,1}, 9443, [Option], infinity)).
+
+%--------------------------------------------------------------------------------
+
+validate_empty_advertisement_list_is_allowed(Config) when is_list(Config) ->
+    Option = {next_protocols_advertised, []},
+    {ok, Socket} = ssl:listen(0, [Option]),
+    ssl:close(Socket).
+%--------------------------------------------------------------------------------
+
+validate_advertisement_must_be_a_binary_list(Config) when is_list(Config) ->
+    Option = {next_protocols_advertised, blah},
+    {error, {eoptions, Option}} = (catch ssl:listen(9443, [Option])).
+%--------------------------------------------------------------------------------
+
+validate_client_protocols_must_be_a_tuple(Config) when is_list(Config)  ->
+    Option = {client_preferred_next_protocols, [<<"foo/1">>]},
+    {error, {eoptions, Option}} = (catch ssl:connect({127,0,0,1}, 9443, [Option])).
+
+%--------------------------------------------------------------------------------
+
+normal_npn_handshake_server_preference(Config) when is_list(Config) ->
+    run_npn_handshake(Config,
+			   [{client_preferred_next_protocols,
+			     {server, [<<"http/1.0">>, <<"http/1.1">>], <<"http/1.1">>}}],
+			   [{next_protocols_advertised, [<<"spdy/2">>, <<"http/1.1">>, <<"http/1.0">>]}],
+			   {ok, <<"http/1.1">>}).
+%--------------------------------------------------------------------------------
+
+normal_npn_handshake_client_preference(Config) when is_list(Config) ->
+    run_npn_handshake(Config,
+			   [{client_preferred_next_protocols,
+			     {client, [<<"http/1.0">>, <<"http/1.1">>], <<"http/1.1">>}}],
+			   [{next_protocols_advertised, [<<"spdy/2">>, <<"http/1.1">>, <<"http/1.0">>]}],
+			   {ok, <<"http/1.0">>}).
+
+%--------------------------------------------------------------------------------
+
+fallback_npn_handshake(Config) when is_list(Config) ->
+    run_npn_handshake(Config,
+			   [{client_preferred_next_protocols, {client, [<<"spdy/2">>], <<"http/1.1">>}}],
+			   [{next_protocols_advertised, [<<"spdy/1">>, <<"http/1.1">>, <<"http/1.0">>]}],
+			   {ok, <<"http/1.1">>}).
+%--------------------------------------------------------------------------------
+
+fallback_npn_handshake_server_preference(Config) when is_list(Config) ->
+    run_npn_handshake(Config,
+			   [{client_preferred_next_protocols, {server, [<<"spdy/2">>], <<"http/1.1">>}}],
+			   [{next_protocols_advertised, [<<"spdy/1">>, <<"http/1.1">>, <<"http/1.0">>]}],
+			   {ok, <<"http/1.1">>}).
+
+%--------------------------------------------------------------------------------
+
+no_client_negotiate_but_server_supports_npn(Config) when is_list(Config) ->
+    run_npn_handshake(Config,
+			   [],
+			   [{next_protocols_advertised, [<<"spdy/1">>, <<"http/1.1">>, <<"http/1.0">>]}],
+			   {error, next_protocol_not_negotiated}).
+%--------------------------------------------------------------------------------
+
+
+client_negotiate_server_does_not_support(Config) when is_list(Config) ->
+    run_npn_handshake(Config,
+			   [{client_preferred_next_protocols, {client, [<<"spdy/2">>], <<"http/1.1">>}}],
+			   [],
+			   {error, next_protocol_not_negotiated}).
+
+%--------------------------------------------------------------------------------
+renegotiate_from_client_after_npn_handshake(Config) when is_list(Config) ->
+    Data = "hello world",
+    
+    ClientOpts0 = ?config(client_opts, Config),
+    ClientOpts = [{client_preferred_next_protocols,
+		   {client, [<<"http/1.0">>], <<"http/1.1">>}}] ++ ClientOpts0,
+    ServerOpts0 = ?config(server_opts, Config),
+    ServerOpts = [{next_protocols_advertised,
+		   [<<"spdy/2">>, <<"http/1.1">>, <<"http/1.0">>]}] ++  ServerOpts0,
+    ExpectedProtocol = {ok, <<"http/1.0">>},
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                    {from, self()},
+                    {mfa, {?MODULE, ssl_receive_and_assert_npn, [ExpectedProtocol, Data]}},
+                    {options, ServerOpts}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+               {host, Hostname},
+               {from, self()},
+               {mfa, {?MODULE, assert_npn_and_renegotiate_and_send_data, [ExpectedProtocol, Data]}},
+               {options, ClientOpts}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok).
+
+%--------------------------------------------------------------------------------
+npn_not_supported_client(Config) when is_list(Config) ->
+    ClientOpts0 = ?config(client_opts, Config),
+    PrefProtocols = {client_preferred_next_protocols,
+		     {client, [<<"http/1.0">>], <<"http/1.1">>}},
+    ClientOpts = [PrefProtocols] ++ ClientOpts0,
+    {ClientNode, _ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, 
+			    {port, 8888}, {host, Hostname},
+			    {from, self()},  {options, ClientOpts}]),
+    
+    ssl_test_lib:check_result(Client, {error, 
+				       {eoptions, 
+					{not_supported_in_sslv3, PrefProtocols}}}).
+
+%--------------------------------------------------------------------------------
+npn_not_supported_server(Config) when is_list(Config)->
+    ServerOpts0 = ?config(server_opts, Config),
+    AdvProtocols = {next_protocols_advertised, [<<"spdy/2">>, <<"http/1.1">>, <<"http/1.0">>]},
+    ServerOpts = [AdvProtocols] ++  ServerOpts0,
+  
+    {error, {eoptions, {not_supported_in_sslv3, AdvProtocols}}} = ssl:listen(0, ServerOpts).
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+
+run_npn_handshake(Config, ClientExtraOpts, ServerExtraOpts, ExpectedProtocol) ->
+    Data = "hello world",
+
+    ClientOpts0 = ?config(client_opts, Config),
+    ClientOpts = ClientExtraOpts ++ ClientOpts0,
+    ServerOpts0 = ?config(server_opts, Config),
+    ServerOpts = ServerExtraOpts ++  ServerOpts0,
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                    {from, self()},
+                    {mfa, {?MODULE, ssl_receive_and_assert_npn, [ExpectedProtocol, Data]}},
+                    {options, ServerOpts}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+               {host, Hostname},
+               {from, self()},
+               {mfa, {?MODULE, ssl_send_and_assert_npn, [ExpectedProtocol, Data]}},
+               {options, ClientOpts}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok).
+
+
+assert_npn(Socket, Protocol) ->
+    test_server:format("Negotiated Protocol ~p, Expecting: ~p ~n",
+		       [ssl:negotiated_next_protocol(Socket), Protocol]),
+    Protocol = ssl:negotiated_next_protocol(Socket).
+
+assert_npn_and_renegotiate_and_send_data(Socket, Protocol, Data) ->
+    assert_npn(Socket, Protocol),
+    test_server:format("Renegotiating ~n", []),
+    ok = ssl:renegotiate(Socket),
+    ssl:send(Socket, Data),
+    assert_npn(Socket, Protocol),
+    ok.
+
+ssl_send_and_assert_npn(Socket, Protocol, Data) ->
+    assert_npn(Socket, Protocol),
+    ssl_send(Socket, Data).
+
+ssl_receive_and_assert_npn(Socket, Protocol, Data) ->
+    assert_npn(Socket, Protocol),
+    ssl_receive(Socket, Data).
+
+ssl_send(Socket, Data) ->
+    test_server:format("Connection info: ~p~n",
+               [ssl:connection_info(Socket)]),
+    ssl:send(Socket, Data).
+
+ssl_receive(Socket, Data) ->
+    ssl_receive(Socket, Data, []).
+
+ssl_receive(Socket, Data, Buffer) ->
+    test_server:format("Connection info: ~p~n",
+               [ssl:connection_info(Socket)]),
+    receive
+    {ssl, Socket, MoreData} ->
+        test_server:format("Received ~p~n",[MoreData]),
+        NewBuffer = Buffer ++ MoreData,
+        case NewBuffer of
+            Data ->
+                ssl:send(Socket, "Got it"),
+                ok;
+            _ ->
+                ssl_receive(Socket, Data, NewBuffer)
+        end;
+    Other ->
+        test_server:fail({unexpected_message, Other})
+    after 4000 ->
+        test_server:fail({did_not_get, Data})
+    end.
+
+
+connection_info_result(Socket) ->
+    ssl:connection_info(Socket).
diff --git a/lib/ssl/test/ssl_npn_hello_SUITE.erl b/lib/ssl/test/ssl_npn_hello_SUITE.erl
new file mode 100644
index 0000000000..5102c74e87
--- /dev/null
+++ b/lib/ssl/test/ssl_npn_hello_SUITE.erl
@@ -0,0 +1,117 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+-module(ssl_npn_hello_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+-include("ssl_handshake.hrl").
+-include("ssl_record.hrl").
+-include_lib("common_test/include/ct.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [encode_and_decode_npn_client_hello_test,
+     encode_and_decode_npn_server_hello_test,
+     encode_and_decode_client_hello_test,
+     encode_and_decode_server_hello_test,
+     create_server_hello_with_advertised_protocols_test,
+     create_server_hello_with_no_advertised_protocols_test].
+
+
+create_client_handshake(Npn) ->
+    ssl_handshake:encode_handshake(#client_hello{
+        client_version = {1, 2},
+        random = <<1:256>>,
+        session_id = <<>>,
+        cipher_suites = "",
+        compression_methods = "",
+        next_protocol_negotiation = Npn,
+        renegotiation_info = #renegotiation_info{}
+    }, vsn).
+
+
+encode_and_decode_client_hello_test(_Config) ->
+    HandShakeData = create_client_handshake(undefined),
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    {[{DecodedHandshakeMessage, _Raw}], _} = ssl_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
+    NextProtocolNegotiation = DecodedHandshakeMessage#client_hello.next_protocol_negotiation,
+    NextProtocolNegotiation = undefined.
+
+encode_and_decode_npn_client_hello_test(_Config) ->
+    HandShakeData = create_client_handshake(#next_protocol_negotiation{extension_data = <<>>}),
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    {[{DecodedHandshakeMessage, _Raw}], _} = ssl_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
+    NextProtocolNegotiation = DecodedHandshakeMessage#client_hello.next_protocol_negotiation,
+    NextProtocolNegotiation = #next_protocol_negotiation{extension_data = <<>>}.
+
+create_server_handshake(Npn) ->
+    ssl_handshake:encode_handshake(#server_hello{
+        server_version = {1, 2},
+        random = <<1:256>>,
+        session_id = <<>>,
+        cipher_suite = <<1,2>>,
+        compression_method = 1,
+        next_protocol_negotiation = Npn,
+        renegotiation_info = #renegotiation_info{}
+    }, vsn).
+
+encode_and_decode_server_hello_test(_Config) ->
+    HandShakeData = create_server_handshake(undefined),
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    {[{DecodedHandshakeMessage, _Raw}], _} =
+	ssl_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
+    NextProtocolNegotiation = DecodedHandshakeMessage#server_hello.next_protocol_negotiation,
+    NextProtocolNegotiation = undefined.
+
+encode_and_decode_npn_server_hello_test(_Config) ->
+    HandShakeData = create_server_handshake(#next_protocol_negotiation{extension_data = <<6, "spdy/2">>}),
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    {[{DecodedHandshakeMessage, _Raw}], _} = ssl_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
+    NextProtocolNegotiation = DecodedHandshakeMessage#server_hello.next_protocol_negotiation,
+    ct:print("~p ~n", [NextProtocolNegotiation]),
+    NextProtocolNegotiation = #next_protocol_negotiation{extension_data = <<6, "spdy/2">>}.
+
+create_connection_states() ->
+    #connection_states{
+        pending_read = #connection_state{
+            security_parameters = #security_parameters{
+                server_random = <<1:256>>,
+                compression_algorithm = 1,
+                cipher_suite = <<1, 2>>
+            }
+        },
+
+        current_read = #connection_state {
+            secure_renegotiation = false
+        }
+    }.
+
+create_server_hello_with_no_advertised_protocols_test(_Config) ->
+    Hello = ssl_handshake:server_hello(<<>>, {3, 0}, create_connection_states(),  false, undefined),
+    undefined = Hello#server_hello.next_protocol_negotiation.
+
+create_server_hello_with_advertised_protocols_test(_Config) ->
+    Hello = ssl_handshake:server_hello(<<>>, {3, 0}, create_connection_states(),  
+				       false, [<<"spdy/1">>, <<"http/1.0">>, <<"http/1.1">>]),
+    #next_protocol_negotiation{extension_data = <<6, "spdy/1", 8, "http/1.0", 8, "http/1.1">>} = 
+	Hello#server_hello.next_protocol_negotiation.
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl
index 4b74f57a60..8ce80cb725 100644
--- a/lib/ssl/test/ssl_packet_SUITE.erl
+++ b/lib/ssl/test/ssl_packet_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -53,6 +53,7 @@
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
+    catch crypto:stop(),
     try crypto:start() of
 	ok ->
 	    application:start(public_key),
@@ -121,15 +122,56 @@ end_per_testcase(_TestCase, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
+    [
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'}
+    ].
+
+groups() ->
+    [{'tlsv1.2', [], packet_tests()},
+     {'tlsv1.1', [], packet_tests()},
+     {'tlsv1', [], packet_tests()},
+     {'sslv3', [], packet_tests()}].
+
+packet_tests() ->
+    active_packet_tests() ++ active_once_packet_tests() ++ passive_packet_tests() ++
+	[packet_send_to_large,
+	 packet_cdr_decode, packet_cdr_decode_list,
+	 packet_http_decode, packet_http_decode_list,
+	 packet_http_bin_decode_multi,
+	 packet_line_decode, packet_line_decode_list,
+	 packet_asn1_decode, packet_asn1_decode_list,
+	 packet_tpkt_decode, packet_tpkt_decode_list,
+	 packet_sunrm_decode, packet_sunrm_decode_list].
+
+passive_packet_tests() ->
     [packet_raw_passive_many_small,
      packet_0_passive_many_small,
      packet_1_passive_many_small,
      packet_2_passive_many_small,
      packet_4_passive_many_small,
-     packet_raw_passive_some_big, packet_0_passive_some_big,
-     packet_1_passive_some_big, packet_2_passive_some_big,
+     packet_raw_passive_some_big,
+     packet_0_passive_some_big,
+     packet_1_passive_some_big,
+     packet_2_passive_some_big,
      packet_4_passive_some_big,
-     packet_raw_active_once_many_small,
+     packet_httph_passive,
+     packet_httph_bin_passive,
+     packet_http_error_passive,
+     packet_wait_passive,
+     packet_size_passive,
+     packet_baddata_passive,
+     %% inet header option should be deprecated!
+     header_decode_one_byte_passive,
+     header_decode_two_bytes_passive,
+     header_decode_two_bytes_two_sent_passive,
+     header_decode_two_bytes_one_sent_passive
+    ].
+
+active_once_packet_tests() ->
+    [packet_raw_active_once_many_small,
      packet_0_active_once_many_small,
      packet_1_active_once_many_small,
      packet_2_active_once_many_small,
@@ -139,44 +181,49 @@ all() ->
      packet_1_active_once_some_big,
      packet_2_active_once_some_big,
      packet_4_active_once_some_big,
-     packet_raw_active_many_small,
-     packet_0_active_many_small, packet_1_active_many_small,
-     packet_2_active_many_small, packet_4_active_many_small,
-     packet_raw_active_some_big, packet_0_active_some_big,
-     packet_1_active_some_big, packet_2_active_some_big,
-     packet_4_active_some_big, packet_send_to_large,
-     packet_wait_passive, packet_wait_active,
-     packet_baddata_passive, packet_baddata_active,
-     packet_size_passive, packet_size_active,
-     packet_cdr_decode, packet_cdr_decode_list,
-     packet_http_decode, packet_http_decode_list,
-     packet_http_bin_decode_multi, packet_http_error_passive,
-     packet_httph_active, packet_httph_bin_active,
-     packet_httph_active_once, packet_httph_bin_active_once,
-     packet_httph_passive, packet_httph_bin_passive,
-     packet_line_decode, packet_line_decode_list,
-     packet_asn1_decode, packet_asn1_decode_list,
-     packet_tpkt_decode, packet_tpkt_decode_list,
-     packet_sunrm_decode, packet_sunrm_decode_list,
-     {group, header}
+     packet_httph_active_once,
+     packet_httph_bin_active_once
     ].
 
-groups() -> 
-    [{header, [], [ header_decode_one_byte,  
-		    header_decode_two_bytes, 
-		    header_decode_two_bytes_one_sent,
-		    header_decode_two_bytes_two_sent]}].
+active_packet_tests() ->
+    [packet_raw_active_many_small,
+     packet_0_active_many_small,
+     packet_1_active_many_small,
+     packet_2_active_many_small,
+     packet_4_active_many_small,
+     packet_raw_active_some_big,
+     packet_0_active_some_big,
+     packet_1_active_some_big,
+     packet_2_active_some_big,
+     packet_4_active_some_big,
+     packet_httph_active,
+     packet_httph_bin_active,
+     packet_wait_active,
+     packet_baddata_active,
+     packet_size_active,
+     %% inet header option should be deprecated!
+     header_decode_one_byte_active,
+     header_decode_two_bytes_active,
+     header_decode_two_bytes_two_sent_active,
+     header_decode_two_bytes_one_sent_active
+    ].
 
-init_per_group(header, Config) ->
-    case ssl_record:highest_protocol_version(ssl_record:supported_protocol_versions()) of
-	{3, N} when N < 2 ->
-	    {skip, ""};
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    ssl_test_lib:init_tls_version(GroupName),
+		    Config;
+		false ->
+		    {skip, "Missing crypto support"}
+	    end;
 	_ ->
+	    ssl:start(),
 	    Config
-    end;
+    end.
 
-init_per_group(_, Config) ->
-    Config.
 
 end_per_group(_GroupName, Config) ->
     Config.
@@ -2435,11 +2482,11 @@ packet_sunrm_decode_list(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
 
-header_decode_one_byte(doc) ->
+header_decode_one_byte_active(doc) ->
     ["Test setting the packet option {header, 1}"];
-header_decode_one_byte(suite) ->
+header_decode_one_byte_active(suite) ->
     [];
-header_decode_one_byte(Config) when is_list(Config) ->
+header_decode_one_byte_active(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -2448,7 +2495,7 @@ header_decode_one_byte(Config) when is_list(Config) ->
     
     Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
 					{from, self()},
-					{mfa, {?MODULE, server_header_decode,
+					{mfa, {?MODULE, server_header_decode_active,
 					       [Data, [11 | <<"Hello world">>]]}},
 					{options, [{active, true}, binary, 
 						   {header,1}|ServerOpts]}]),
@@ -2457,7 +2504,7 @@ header_decode_one_byte(Config) when is_list(Config) ->
     Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
 					{host, Hostname},
 					{from, self()},
-					{mfa, {?MODULE, client_header_decode, 
+					{mfa, {?MODULE, client_header_decode_active,
 					       [Data, [11 | <<"Hello world">> ]]}},
 					{options, [{active, true}, {header, 1},
 						   binary | ClientOpts]}]),
@@ -2469,11 +2516,11 @@ header_decode_one_byte(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-header_decode_two_bytes(doc) ->
+header_decode_two_bytes_active(doc) ->
     ["Test setting the packet option {header, 2}"];
-header_decode_two_bytes(suite) ->
+header_decode_two_bytes_active(suite) ->
     [];
-header_decode_two_bytes(Config) when is_list(Config) ->
+header_decode_two_bytes_active(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -2482,7 +2529,7 @@ header_decode_two_bytes(Config) when is_list(Config) ->
     
     Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
 					{from, self()},
-					{mfa, {?MODULE, server_header_decode,
+					{mfa, {?MODULE, server_header_decode_active,
 					       [Data, [11, $H | <<"ello world">> ]]}},
 					{options, [{active, true}, binary, 
 						   {header,2}|ServerOpts]}]),
@@ -2491,7 +2538,7 @@ header_decode_two_bytes(Config) when is_list(Config) ->
     Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
 					{host, Hostname},
 					{from, self()},
-					{mfa, {?MODULE, client_header_decode, 
+					{mfa, {?MODULE, client_header_decode_active,
 					       [Data, [11, $H | <<"ello world">> ]]}},
 					{options, [{active, true}, {header, 2},
 						   binary | ClientOpts]}]),
@@ -2504,11 +2551,11 @@ header_decode_two_bytes(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-header_decode_two_bytes_two_sent(doc) ->
-    ["Test setting the packet option {header, 2} and sending on byte"];
-header_decode_two_bytes_two_sent(suite) ->
+header_decode_two_bytes_two_sent_active(doc) ->
+    ["Test setting the packet option {header, 2} and sending two byte"];
+header_decode_two_bytes_two_sent_active(suite) ->
     [];
-header_decode_two_bytes_two_sent(Config) when is_list(Config) ->
+header_decode_two_bytes_two_sent_active(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -2517,8 +2564,8 @@ header_decode_two_bytes_two_sent(Config) when is_list(Config) ->
     
     Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
 					{from, self()},
-					{mfa, {?MODULE, server_header_decode,
-					       [Data, [$H, $e | <<>> ]]}},
+					{mfa, {?MODULE, server_header_decode_active,
+					       [Data, [$H, $e]]}},
 					{options, [{active, true}, binary, 
 						   {header,2}|ServerOpts]}]),
 
@@ -2526,8 +2573,8 @@ header_decode_two_bytes_two_sent(Config) when is_list(Config) ->
     Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
 					{host, Hostname},
 					{from, self()},
-					{mfa, {?MODULE, client_header_decode, 
-					       [Data, [$H, $e | <<>> ]]}},
+					{mfa, {?MODULE, client_header_decode_active,
+					       [Data, [$H, $e]]}},
 					{options, [{active, true}, {header, 2},
 						   binary | ClientOpts]}]),
 
@@ -2539,11 +2586,11 @@ header_decode_two_bytes_two_sent(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-header_decode_two_bytes_one_sent(doc) ->
-    ["Test setting the packet option {header, 2} and sending on byte"];
-header_decode_two_bytes_one_sent(suite) ->
+header_decode_two_bytes_one_sent_active(doc) ->
+    ["Test setting the packet option {header, 2} and sending one byte"];
+header_decode_two_bytes_one_sent_active(suite) ->
     [];
-header_decode_two_bytes_one_sent(Config) when is_list(Config) ->
+header_decode_two_bytes_one_sent_active(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -2552,7 +2599,7 @@ header_decode_two_bytes_one_sent(Config) when is_list(Config) ->
     
     Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
 					{from, self()},
-					{mfa, {?MODULE, server_header_decode,
+					{mfa, {?MODULE, server_header_decode_active,
 					       [Data, "H"]}},
 					{options, [{active, true}, binary, 
 						   {header,2}|ServerOpts]}]),
@@ -2561,7 +2608,7 @@ header_decode_two_bytes_one_sent(Config) when is_list(Config) ->
     Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
 					{host, Hostname},
 					{from, self()},
-					{mfa, {?MODULE, client_header_decode, 
+					{mfa, {?MODULE, client_header_decode_active,
 					       [Data, "H"]}},
 					{options, [{active, true}, {header, 2},
 						   binary | ClientOpts]}]),
@@ -2571,6 +2618,143 @@ header_decode_two_bytes_one_sent(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
+%%--------------------------------------------------------------------
+
+header_decode_one_byte_passive(doc) ->
+    ["Test setting the packet option {header, 1}"];
+header_decode_one_byte_passive(suite) ->
+    [];
+header_decode_one_byte_passive(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = <<11:8, "Hello world">>,
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_header_decode_passive,
+					       [Data, [11 | <<"Hello world">>]]}},
+					{options, [{active, false}, binary,
+						   {header,1}|ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_header_decode_passive,
+					       [Data, [11 | <<"Hello world">> ]]}},
+					{options, [{active, false}, {header, 1},
+						   binary | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+
+header_decode_two_bytes_passive(doc) ->
+    ["Test setting the packet option {header, 2}"];
+header_decode_two_bytes_passive(suite) ->
+    [];
+header_decode_two_bytes_passive(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = <<11:8, "Hello world">>,
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_header_decode_passive,
+					       [Data, [11, $H | <<"ello world">> ]]}},
+					{options, [{active, false}, binary,
+						   {header,2}|ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_header_decode_passive,
+					       [Data, [11, $H | <<"ello world">> ]]}},
+					{options, [{active, false}, {header, 2},
+						   binary | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+%%--------------------------------------------------------------------
+
+header_decode_two_bytes_two_sent_passive(doc) ->
+    ["Test setting the packet option {header, 2} and sending two byte"];
+header_decode_two_bytes_two_sent_passive(suite) ->
+    [];
+header_decode_two_bytes_two_sent_passive(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = <<"He">>,
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_header_decode_passive,
+					       [Data, [$H, $e]]}},
+					{options, [{active, false}, binary,
+						   {header,2}|ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_header_decode_passive,
+					       [Data, [$H, $e]]}},
+					{options, [{active, false}, {header, 2},
+						   binary | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+%%--------------------------------------------------------------------
+
+header_decode_two_bytes_one_sent_passive(doc) ->
+    ["Test setting the packet option {header, 2} and sending one byte"];
+header_decode_two_bytes_one_sent_passive(suite) ->
+    [];
+header_decode_two_bytes_one_sent_passive(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = <<"H">>,
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_header_decode_passive,
+					       [Data, "H"]}},
+					{options, [{active, false}, binary,
+						   {header,2}|ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_header_decode_passive,
+					       [Data, "H"]}},
+					{options, [{active, false}, {header, 2},
+						   binary | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
 %% Internal functions
@@ -2757,29 +2941,52 @@ client_packet_decode(Socket, P1, P2, Packet) ->
 	Other2 -> exit({?LINE, Other2})
     end.
 
-server_header_decode(Socket, Packet, Result) ->
+server_header_decode_active(Socket, Packet, Result) ->
     receive
-	{ssl, Socket, Result}  -> ok;
-	Other1 -> exit({?LINE, Other1})
-    end,
-    ok = ssl:send(Socket, Packet),
-    receive
-	{ssl, Socket, Result}  -> ok;
-	Other2 -> exit({?LINE, Other2})
+	{ssl, Socket, Result}  ->
+	    ok;
+	{ssl, Socket, Other1} ->
+	    check_header_result(Result, Other1)
     end,
     ok = ssl:send(Socket, Packet).
 
-client_header_decode(Socket, Packet, Result) ->
+client_header_decode_active(Socket, Packet, Result) ->
     ok = ssl:send(Socket, Packet),
     receive
-	{ssl, Socket, Result}  -> ok;
-	Other1 -> exit({?LINE, Other1})
+	{ssl, Socket, Result}  ->
+	    ok;
+	{ssl, Socket, Other1} ->
+	    check_header_result(Result, Other1)
+    end.
+
+server_header_decode_passive(Socket, Packet, Result) ->
+    case ssl:recv(Socket, 0) of
+	{ok, Result} ->
+	    ok;
+	{ok, Other} ->
+	    check_header_result(Result, Other)
     end,
+    ok = ssl:send(Socket, Packet).
+
+client_header_decode_passive(Socket, Packet, Result) ->
     ok = ssl:send(Socket, Packet),
-    receive
-	{ssl, Socket, Result}  -> ok;
-	Other2 -> exit({?LINE, Other2})
+
+    case ssl:recv(Socket, 0) of
+	{ok, Result} ->
+	    ok;
+	{ok, Other} ->
+	    check_header_result(Result, Other)
     end.
+
+%% The inet header option is a broken option as it does not buffer until it gets enough data.
+%% This check only checks that it has the same behavior as inet, but it is a quite useless
+%% option and the bitsynax makes it obsolete!
+check_header_result([Byte1 | _], [Byte1]) ->
+    ok;
+check_header_result([Byte1, Byte2 | _], [Byte1, Byte2]) ->
+    ok;
+check_header_result(_,Got) ->
+    exit({?LINE, Got}).
     
 server_line_packet_decode(Socket, Packet) when is_binary(Packet) ->
     [L1, L2] = string:tokens(binary_to_list(Packet), "\n"),
diff --git a/lib/ssl/test/ssl_payload_SUITE.erl b/lib/ssl/test/ssl_payload_SUITE.erl
index 24e86b3913..c97f97e70b 100644
--- a/lib/ssl/test/ssl_payload_SUITE.erl
+++ b/lib/ssl/test/ssl_payload_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -37,6 +37,7 @@
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
+    catch crypto:stop(),
     try crypto:start() of
 	ok ->
 	    application:start(public_key),
@@ -102,23 +103,56 @@ end_per_testcase(_TestCase, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
+    [
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'}
+    ].
+
+groups() ->
+    [
+     {'tlsv1.2', [], payload_tests()},
+     {'tlsv1.1', [], payload_tests()},
+     {'tlsv1', [], payload_tests()},
+     {'sslv3', [], payload_tests()}
+    ].
+
+payload_tests() ->
     [server_echos_passive_small,
      server_echos_active_once_small,
-     server_echos_active_small, client_echos_passive_small,
+     server_echos_active_small,
+     client_echos_passive_small,
      client_echos_active_once_small,
-     client_echos_active_small, server_echos_passive_big,
-     server_echos_active_once_big, server_echos_active_big,
-     client_echos_passive_big, client_echos_active_once_big,
-     client_echos_active_big, server_echos_passive_huge,
-     server_echos_active_once_huge, server_echos_active_huge,
+     client_echos_active_small,
+     server_echos_passive_big,
+     server_echos_active_once_big,
+     server_echos_active_big,
+     client_echos_passive_big,
+     client_echos_active_once_big,
+     client_echos_active_big,
+     server_echos_passive_huge,
+     server_echos_active_once_huge,
+     server_echos_active_huge,
      client_echos_passive_huge,
-     client_echos_active_once_huge, client_echos_active_huge].
+     client_echos_active_once_huge,
+     client_echos_active_huge].
 
-groups() -> 
-    [].
 
-init_per_group(_GroupName, Config) ->
-    Config.
+init_per_group(GroupName, Config) ->
+     case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    ssl_test_lib:init_tls_version(GroupName),
+		    Config;
+		false ->
+		    {skip, "Missing crypto support"}
+	    end;
+	_ ->
+	    ssl:start(),
+	    Config
+    end.
 
 end_per_group(_GroupName, Config) ->
     Config.
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl
index 491aa893c2..1d71efd40c 100644
--- a/lib/ssl/test/ssl_session_cache_SUITE.erl
+++ b/lib/ssl/test/ssl_session_cache_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -49,6 +49,7 @@
 %%--------------------------------------------------------------------
 init_per_suite(Config0) ->
     Dog = ssl_test_lib:timetrap(?LONG_TIMEOUT *2),
+    catch crypto:stop(),
     try crypto:start() of
 	ok ->
 	    application:start(public_key),
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index fa8a1826f2..f1f5b9ae0a 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -72,7 +72,13 @@ run_server(Opts) ->
     run_server(ListenSocket, Opts).
 
 run_server(ListenSocket, Opts) ->
-    AcceptSocket = connect(ListenSocket, Opts),
+    do_run_server(ListenSocket, connect(ListenSocket, Opts), Opts).
+
+do_run_server(_, {error, timeout} = Result, Opts)  ->
+    Pid = proplists:get_value(from, Opts),
+    Pid ! {self(), Result};
+
+do_run_server(ListenSocket, AcceptSocket, Opts) ->
     Node = proplists:get_value(node, Opts),
     Pid = proplists:get_value(from, Opts),
     {Module, Function, Args} = proplists:get_value(mfa, Opts),
@@ -102,7 +108,8 @@ run_server(ListenSocket, Opts) ->
 connect(ListenSocket, Opts) ->
     Node = proplists:get_value(node, Opts),
     ReconnectTimes =  proplists:get_value(reconnect_times, Opts, 0),
-    AcceptSocket = connect(ListenSocket, Node, 1 + ReconnectTimes, dummy),
+    Timeout = proplists:get_value(timeout, Opts, infinity),
+    AcceptSocket = connect(ListenSocket, Node, 1 + ReconnectTimes, dummy, Timeout),
     case ReconnectTimes of
 	0 ->
 	    AcceptSocket;
@@ -111,15 +118,21 @@ connect(ListenSocket, Opts) ->
 	  AcceptSocket
     end.
     
-connect(_, _, 0, AcceptSocket) ->
+connect(_, _, 0, AcceptSocket, _) ->
     AcceptSocket;
-connect(ListenSocket, Node, N, _) ->
+connect(ListenSocket, Node, N, _, Timeout) ->
     test_server:format("ssl:transport_accept(~p)~n", [ListenSocket]),
     {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
 				  [ListenSocket]),    
-    test_server:format("ssl:ssl_accept(~p)~n", [AcceptSocket]),
-    ok = rpc:call(Node, ssl, ssl_accept, [AcceptSocket]),
-    connect(ListenSocket, Node, N-1, AcceptSocket).
+    test_server:format("ssl:ssl_accept(~p, ~p)~n", [AcceptSocket, Timeout]),
+
+    case rpc:call(Node, ssl, ssl_accept, [AcceptSocket, Timeout]) of
+	ok ->
+	    connect(ListenSocket, Node, N-1, AcceptSocket, Timeout);
+	Result ->
+	    Result
+    end.
+
   
 remove_close_msg(0) ->
     ok;
@@ -150,7 +163,7 @@ run_client(Opts) ->
 	{ok, Socket} ->
 	    Pid ! { connected, Socket },
 	    test_server:format("Client: connected~n", []), 
-	    %% In specail cases we want to know the client port, it will
+	    %% In special cases we want to know the client port, it will
 	    %% be indicated by sending {port, 0} in options list!
 	    send_selected_port(Pid,  proplists:get_value(port, Options), Socket),
 	    {Module, Function, Args} = proplists:get_value(mfa, Opts),
@@ -708,3 +721,33 @@ state([{data,[{"StateData", State}]} | _]) ->
     State;
 state([_ | Rest]) ->
     state(Rest).
+
+is_tls_version('tlsv1.2') ->
+    true;
+is_tls_version('tlsv1.1') ->
+    true;
+is_tls_version('tlsv1') ->
+    true;
+is_tls_version('sslv3') ->
+    true;
+is_tls_version(_) ->
+    false.
+
+init_tls_version(Version) ->
+    ssl:stop(),
+    application:load(ssl),
+    application:set_env(ssl, protocol_version, Version),
+    ssl:start().
+
+sufficient_crypto_support('tlsv1.2') ->
+    Data = "Sampl",
+    Data2 = "e #1",
+    Key = <<0,1,2,3,16,17,18,19,32,33,34,35,48,49,50,51,4,5,6,7,20,21,22,23,36,37,38,39,
+	    52,53,54,55,8,9,10,11,24,25,26,27,40,41,42,43,56,57,58,59>>,
+    try
+	crypto:sha256_mac(Key, lists:flatten([Data, Data2])),
+	true
+    catch _:_ -> false
+    end;
+sufficient_crypto_support(_) ->
+    true.
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 01fca1f166..f4e19b3f87 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -29,7 +29,7 @@
 -define(TIMEOUT, 120000).
 -define(LONG_TIMEOUT, 600000).
 -define(SLEEP, 1000).
--define(OPENSSL_RENEGOTIATE, "r\n").
+-define(OPENSSL_RENEGOTIATE, "R\n").
 -define(OPENSSL_QUIT, "Q\n").
 -define(OPENSSL_GARBAGE, "P\n").
 -define(EXPIRE, 10).
@@ -50,6 +50,7 @@ init_per_suite(Config0) ->
 	false ->
 	    {skip, "Openssl not found"};
 	_ ->
+	    catch crypto:stop(),
 	    try crypto:start() of
 		ok ->
 		    application:start(public_key),
@@ -106,12 +107,24 @@ init_per_testcase(TestCase, Config0) ->
 special_init(TestCase, Config) 
   when TestCase == erlang_client_openssl_server_renegotiate;
        TestCase == erlang_client_openssl_server_no_wrap_sequence_number;
-       TestCase == erlang_server_openssl_client_no_wrap_sequence_number ->
+       TestCase == erlang_server_openssl_client_no_wrap_sequence_number
+       ->
     check_sane_openssl_renegotaite(Config);
 
 special_init(ssl2_erlang_server_openssl_client, Config) ->
     check_sane_openssl_sslv2(Config);
 
+special_init(TestCase, Config)
+    when TestCase == erlang_client_openssl_server_npn;
+         TestCase == erlang_server_openssl_client_npn;
+         TestCase == erlang_server_openssl_client_npn_renegotiate;
+         TestCase == erlang_client_openssl_server_npn_renegotiate;
+         TestCase == erlang_server_openssl_client_npn_only_server;
+         TestCase == erlang_server_openssl_client_npn_only_client;
+         TestCase == erlang_client_openssl_server_npn_only_client;
+         TestCase == erlang_client_openssl_server_npn_only_server ->
+    check_openssl_npn_support(Config);
+
 special_init(_, Config) ->
     Config.
     
@@ -149,37 +162,69 @@ end_per_testcase(_, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [erlang_client_openssl_server,
+    [
+     {group, basic},
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'}
+    ].
+
+groups() ->
+    [{basic, [], basic_tests()},
+     {'tlsv1.2', [], all_versions_tests() ++ npn_tests()},
+     {'tlsv1.1', [], all_versions_tests() ++ npn_tests()},
+     {'tlsv1', [], all_versions_tests()++ npn_tests()},
+     {'sslv3', [], all_versions_tests()}].
+
+basic_tests() ->
+    [basic_erlang_client_openssl_server,
+     basic_erlang_server_openssl_client,
+     expired_session].
+
+all_versions_tests() ->
+    [
+     erlang_client_openssl_server,
      erlang_server_openssl_client,
-     tls1_erlang_client_openssl_server_dsa_cert,
-     tls1_erlang_server_openssl_client_dsa_cert,
-     ssl3_erlang_client_openssl_server_dsa_cert,
-     ssl3_erlang_server_openssl_client_dsa_cert,
+     erlang_client_openssl_server_dsa_cert,
+     erlang_server_openssl_client_dsa_cert,
      erlang_server_openssl_client_reuse_session,
      erlang_client_openssl_server_renegotiate,
-     erlang_client_openssl_server_no_wrap_sequence_number,
-     erlang_server_openssl_client_no_wrap_sequence_number,
+     erlang_client_openssl_server_nowrap_seqnum,
+     erlang_server_openssl_client_nowrap_seqnum,
      erlang_client_openssl_server_no_server_ca_cert,
-     ssl3_erlang_client_openssl_server,
-     ssl3_erlang_server_openssl_client,
-     ssl3_erlang_client_openssl_server_client_cert,
-     ssl3_erlang_server_openssl_client_client_cert,
-     ssl3_erlang_server_erlang_client_client_cert,
-     tls1_erlang_client_openssl_server,
-     tls1_erlang_server_openssl_client,
-     tls1_erlang_client_openssl_server_client_cert,
-     tls1_erlang_server_openssl_client_client_cert,
-     tls1_erlang_server_erlang_client_client_cert,
-     ciphers_rsa_signed_certs, ciphers_dsa_signed_certs,
+     erlang_client_openssl_server_client_cert,
+     erlang_server_openssl_client_client_cert,
+     ciphers_rsa_signed_certs,
+     ciphers_dsa_signed_certs,
      erlang_client_bad_openssl_server,
      expired_session,
      ssl2_erlang_server_openssl_client].
 
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
+npn_tests() ->
+    [erlang_client_openssl_server_npn,
+     erlang_server_openssl_client_npn,
+     erlang_server_openssl_client_npn_renegotiate,
+     erlang_client_openssl_server_npn_renegotiate,
+     erlang_server_openssl_client_npn_only_client,
+     erlang_server_openssl_client_npn_only_server,
+     erlang_client_openssl_server_npn_only_client,
+     erlang_client_openssl_server_npn_only_server].
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    case check_sane_openssl_version(GroupName) of
+		true ->
+		    ssl_test_lib:init_tls_version(GroupName),
+		    Config;
+		false ->
+		    {skip, openssl_does_not_support_version}
+	    end;
+	_ ->
+	    ssl:start(),
+	    Config
+    end.
 
 end_per_group(_GroupName, Config) ->
     Config.
@@ -187,12 +232,11 @@ end_per_group(_GroupName, Config) ->
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
-
-erlang_client_openssl_server(doc) ->
+basic_erlang_client_openssl_server(doc) ->
     ["Test erlang client with openssl server"];
-erlang_client_openssl_server(suite) ->
+basic_erlang_client_openssl_server(suite) ->
     [];
-erlang_client_openssl_server(Config) when is_list(Config) ->
+basic_erlang_client_openssl_server(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
     ClientOpts = ?config(client_opts, Config),  
@@ -204,8 +248,8 @@ erlang_client_openssl_server(Config) when is_list(Config) ->
     Port = ssl_test_lib:inet_port(node()),
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
-   
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
+
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++
 	" -cert " ++ CertFile  ++ " -key " ++ KeyFile, 
     
     test_server:format("openssl cmd: ~p~n", [Cmd]),
@@ -230,13 +274,12 @@ erlang_client_openssl_server(Config) when is_list(Config) ->
     process_flag(trap_exit, false),
     ok.
 
-
 %%--------------------------------------------------------------------    
-erlang_server_openssl_client(doc) ->
+basic_erlang_server_openssl_client(doc) ->
     ["Test erlang server with openssl client"];
-erlang_server_openssl_client(suite) ->
+basic_erlang_server_openssl_client(suite) ->
     [];
-erlang_server_openssl_client(Config) when is_list(Config) ->
+basic_erlang_server_openssl_client(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
 
@@ -249,8 +292,8 @@ erlang_server_openssl_client(Config) when is_list(Config) ->
 			   {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
 			   {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
-    
-    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ 
+
+    Cmd = "openssl s_client -port " ++ integer_to_list(Port) ++
 	" -host localhost",
 
     test_server:format("openssl cmd: ~p~n", [Cmd]),
@@ -265,30 +308,26 @@ erlang_server_openssl_client(Config) when is_list(Config) ->
     close_port(OpenSslPort),
     process_flag(trap_exit, false),
     ok.
-
-%%-------------------------------------------------------------------- 
-
-tls1_erlang_client_openssl_server_dsa_cert(doc) ->
-    ["Test erlang server with openssl client"];
-tls1_erlang_client_openssl_server_dsa_cert(suite) ->
+%%--------------------------------------------------------------------
+erlang_client_openssl_server(doc) ->
+    ["Test erlang client with openssl server"];
+erlang_client_openssl_server(suite) ->
     [];
-tls1_erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
+erlang_client_openssl_server(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
-    ClientOpts = ?config(client_dsa_opts, Config),  
-    ServerOpts = ?config(server_dsa_opts, Config),  
+    ServerOpts = ?config(server_opts, Config),
+    ClientOpts = ?config(client_opts, Config),
 
     {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-  
+
     Data = "From openssl to erlang",
 
     Port = ssl_test_lib:inet_port(node()),
-    CaCertFile =  proplists:get_value(cacertfile, ServerOpts),
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
-   
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
-	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile  
-	++ " -key " ++ KeyFile ++ " -Verify 2 -tls1 -msg", 
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
+	" -cert " ++ CertFile  ++ " -key " ++ KeyFile,
     
     test_server:format("openssl cmd: ~p~n", [Cmd]),
 
@@ -302,44 +341,39 @@ tls1_erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
 					{mfa, {?MODULE, 
 					       erlang_ssl_receive, [Data]}},
 					{options, ClientOpts}]),
-
     port_command(OpensslPort, Data),
     
-    ssl_test_lib:check_result(Client, ok), 
-   
+    ssl_test_lib:check_result(Client, ok),
+
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
     ok.
 
-%%-------------------------------------------------------------------- 
 
-tls1_erlang_server_openssl_client_dsa_cert(doc) ->
+%%--------------------------------------------------------------------
+erlang_server_openssl_client(doc) ->
     ["Test erlang server with openssl client"];
-tls1_erlang_server_openssl_client_dsa_cert(suite) ->
+erlang_server_openssl_client(suite) ->
     [];
-tls1_erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
+erlang_server_openssl_client(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
-    ClientOpts = ?config(client_dsa_opts, Config),
-    ServerOpts = ?config(server_dsa_verify_opts, Config),  
+    ServerOpts = ?config(server_opts, Config),
 
     {_, ServerNode, _} = ssl_test_lib:run_where(Config),
     
     Data = "From openssl to erlang",
-    CaCertFile =  proplists:get_value(cacertfile, ClientOpts),
-    CertFile = proplists:get_value(certfile, ClientOpts),
-    KeyFile = proplists:get_value(keyfile, ClientOpts),
-    
+
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
 					{from, self()}, 
 			   {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
 			   {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
-    
-    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ 
-	" -host localhost " ++	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile  
-	++ " -key " ++ KeyFile ++ " -tls1 -msg",
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+
+    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+	" -host localhost",
 
     test_server:format("openssl cmd: ~p~n", [Cmd]),
     
@@ -347,7 +381,7 @@ tls1_erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
     port_command(OpenSslPort, Data),
     
     ssl_test_lib:check_result(Server, ok),
-    
+
     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
     close_port(OpenSslPort),
@@ -356,11 +390,11 @@ tls1_erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------- 
 
-ssl3_erlang_client_openssl_server_dsa_cert(doc) ->
+erlang_client_openssl_server_dsa_cert(doc) ->
     ["Test erlang server with openssl client"];
-ssl3_erlang_client_openssl_server_dsa_cert(suite) ->
+erlang_client_openssl_server_dsa_cert(suite) ->
     [];
-ssl3_erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
+erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ClientOpts = ?config(client_dsa_opts, Config),  
     ServerOpts = ?config(server_dsa_opts, Config),  
@@ -373,10 +407,11 @@ ssl3_erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
     CaCertFile =  proplists:get_value(cacertfile, ServerOpts),
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
-   
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile  
-	++ " -key " ++ KeyFile ++ " -Verify 2 -ssl3 -msg", 
+	++ " -key " ++ KeyFile ++ " -Verify 2 -msg",
     
     test_server:format("openssl cmd: ~p~n", [Cmd]),
 
@@ -400,49 +435,46 @@ ssl3_erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
     ok.
-
-%%-------------------------------------------------------------------- 
-
-ssl3_erlang_server_openssl_client_dsa_cert(doc) ->
+%%--------------------------------------------------------------------
+erlang_server_openssl_client_dsa_cert(doc) ->
     ["Test erlang server with openssl client"];
-ssl3_erlang_server_openssl_client_dsa_cert(suite) ->
+erlang_server_openssl_client_dsa_cert(suite) ->
     [];
-ssl3_erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
+erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ClientOpts = ?config(client_dsa_opts, Config),
-    ServerOpts = ?config(server_dsa_verify_opts, Config),  
+    ServerOpts = ?config(server_dsa_verify_opts, Config),
 
     {_, ServerNode, _} = ssl_test_lib:run_where(Config),
-    
+
     Data = "From openssl to erlang",
     CaCertFile =  proplists:get_value(cacertfile, ClientOpts),
     CertFile = proplists:get_value(certfile, ClientOpts),
     KeyFile = proplists:get_value(keyfile, ClientOpts),
-    
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
-			   {options, ServerOpts}]),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                                       {from, self()},
+                          {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+                          {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
-    
-    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ 
-	" -host localhost " ++	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile  
-	++ " -key " ++ KeyFile ++ " -ssl3 -msg",
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+       " -host localhost " ++  " -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile
+       ++ " -key " ++ KeyFile ++ " -msg",
 
     test_server:format("openssl cmd: ~p~n", [Cmd]),
-    
-    OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
+
+    OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
     port_command(OpenSslPort, Data),
-    
+
     ssl_test_lib:check_result(Server, ok),
-    
+
     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
     close_port(OpenSslPort),
     process_flag(trap_exit, false),
     ok.
 
-
 %%-------------------------------------------------------------------- 
 
 erlang_server_openssl_client_reuse_session(doc) ->
@@ -464,8 +496,8 @@ erlang_server_openssl_client_reuse_session(Config) when is_list(Config) ->
 			   {reconnect_times, 5},		
 			   {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
-    
-    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ 
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -host localhost -reconnect",
 
     test_server:format("openssl cmd: ~p~n", [Cmd]),
@@ -501,8 +533,9 @@ erlang_client_openssl_server_renegotiate(Config) when is_list(Config) ->
     Port = ssl_test_lib:inet_port(node()),
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
-   
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ " -msg", 
     
     test_server:format("openssl cmd: ~p~n", [Cmd]),
@@ -532,14 +565,14 @@ erlang_client_openssl_server_renegotiate(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-erlang_client_openssl_server_no_wrap_sequence_number(doc) ->
+erlang_client_openssl_server_nowrap_seqnum(doc) ->
     ["Test that erlang client will renegotiate session when",  
      "max sequence number celing is about to be reached. Although"
      "in the testcase we use the test option renegotiate_at" 
      " to lower treashold substantially."];
-erlang_client_openssl_server_no_wrap_sequence_number(suite) ->
+erlang_client_openssl_server_nowrap_seqnum(suite) ->
     [];
-erlang_client_openssl_server_no_wrap_sequence_number(Config) when is_list(Config) ->
+erlang_client_openssl_server_nowrap_seqnum(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
     ClientOpts = ?config(client_opts, Config),  
@@ -552,8 +585,8 @@ erlang_client_openssl_server_no_wrap_sequence_number(Config) when is_list(Config
     Port = ssl_test_lib:inet_port(node()),
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
-   
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ " -msg", 
     
     test_server:format("openssl cmd: ~p~n", [Cmd]),
@@ -578,15 +611,15 @@ erlang_client_openssl_server_no_wrap_sequence_number(Config) when is_list(Config
     process_flag(trap_exit, false),
     ok.
 %%--------------------------------------------------------------------
-erlang_server_openssl_client_no_wrap_sequence_number(doc) ->
+erlang_server_openssl_client_nowrap_seqnum(doc) ->
     ["Test that erlang client will renegotiate session when",  
      "max sequence number celing is about to be reached. Although"
      "in the testcase we use the test option renegotiate_at" 
      " to lower treashold substantially."];
 
-erlang_server_openssl_client_no_wrap_sequence_number(suite) ->
+erlang_server_openssl_client_nowrap_seqnum(suite) ->
     [];
-erlang_server_openssl_client_no_wrap_sequence_number(Config) when is_list(Config) ->
+erlang_server_openssl_client_nowrap_seqnum(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
 
@@ -600,10 +633,10 @@ erlang_server_openssl_client_no_wrap_sequence_number(Config) when is_list(Config
 					{from, self()}, 
 					{mfa, {ssl_test_lib, 
 					       trigger_renegotiate, [[Data, N+2]]}},
-					{options, [{renegotiate_at, N} | ServerOpts]}]),
+					{options, [{renegotiate_at, N}, {reuse_sessions, false} | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
-    
-    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ 
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -host localhost -msg",
 
     test_server:format("openssl cmd: ~p~n", [Cmd]),
@@ -639,8 +672,8 @@ erlang_client_openssl_server_no_server_ca_cert(Config) when is_list(Config) ->
     Port = ssl_test_lib:inet_port(node()),
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
-   
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ " -msg", 
     
     test_server:format("openssl cmd: ~p~n", [Cmd]),
@@ -667,85 +700,11 @@ erlang_client_openssl_server_no_server_ca_cert(Config) when is_list(Config) ->
     ok.
 
 %%--------------------------------------------------------------------
-ssl3_erlang_client_openssl_server(doc) ->
-    ["Test erlang client with openssl server"];
-ssl3_erlang_client_openssl_server(suite) ->
-    [];
-ssl3_erlang_client_openssl_server(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ?config(server_opts, Config),  
-    ClientOpts = ?config(client_opts, Config),  
-
-    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Port = ssl_test_lib:inet_port(node()),
-    CertFile = proplists:get_value(certfile, ServerOpts),
-    KeyFile = proplists:get_value(keyfile, ServerOpts),
-   
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
-	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ " -ssl3", 
-    
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
-
-    OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
-
-    wait_for_openssl_server(),
-
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       connection_info, [sslv3]}},
-					{options, 
-					 [{versions, [sslv3]} | ClientOpts]}]),
-    ssl_test_lib:check_result(Client, ok),
-
-    %% Clean close down!   Server needs to be closed first !!
-    close_port(OpensslPort),
-    ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
- 
-ssl3_erlang_server_openssl_client(doc) ->
-    ["Test erlang server with openssl client"];
-ssl3_erlang_server_openssl_client(suite) ->
-    [];
-ssl3_erlang_server_openssl_client(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ?config(server_opts, Config),  
-    
-    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
-    
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, 
-					 {?MODULE, connection_info, [sslv3]}},
-					{options, 
-					 [{versions, [sslv3]} | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    
-    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ 
-	" -host localhost -ssl3",
-
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
-    
-    OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
-
-    ssl_test_lib:check_result(Server, ok),
-    %% Clean close down!   Server needs to be closed first !!
-    ssl_test_lib:close(Server),
-    close_port(OpenSslPort),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-ssl3_erlang_client_openssl_server_client_cert(doc) ->
+erlang_client_openssl_server_client_cert(doc) ->
     ["Test erlang client with openssl server when client sends cert"];
-ssl3_erlang_client_openssl_server_client_cert(suite) ->
+erlang_client_openssl_server_client_cert(suite) ->
     [];
-ssl3_erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
+erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_verification_opts, Config),  
     ClientOpts = ?config(client_verification_opts, Config),  
@@ -758,10 +717,10 @@ ssl3_erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
     CertFile = proplists:get_value(certfile, ServerOpts),
     CaCertFile = proplists:get_value(cacertfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
-   
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile 
-	++ " -key " ++ KeyFile ++ " -Verify 2 -ssl3", 
+	++ " -key " ++ KeyFile ++ " -Verify 2",
     
     test_server:format("openssl cmd: ~p~n", [Cmd]),
 
@@ -787,11 +746,11 @@ ssl3_erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------  
 
-ssl3_erlang_server_openssl_client_client_cert(doc) ->
+erlang_server_openssl_client_client_cert(doc) ->
     ["Test erlang server with openssl client when client sends cert"];
-ssl3_erlang_server_openssl_client_client_cert(suite) ->
+erlang_server_openssl_client_client_cert(suite) ->
     [];
-ssl3_erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
+erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_verification_opts, Config),  
     ClientOpts = ?config(client_verification_opts, Config),  
@@ -812,10 +771,10 @@ ssl3_erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
     CaCertFile = proplists:get_value(cacertfile, ClientOpts),
     CertFile = proplists:get_value(certfile, ClientOpts),
     KeyFile = proplists:get_value(keyfile, ClientOpts),
-    
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
     Cmd = "openssl s_client -cert " ++ CertFile  ++ " -CAfile " ++ CaCertFile 
-	++ " -key " ++ KeyFile ++ " -port " ++ integer_to_list(Port)  ++ 
-	" -host localhost -ssl3",
+	++ " -key " ++ KeyFile ++ " -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+	" -host localhost",
 
     test_server:format("openssl cmd: ~p~n", [Cmd]),
     
@@ -833,15 +792,15 @@ ssl3_erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------  
 
-ssl3_erlang_server_erlang_client_client_cert(doc) ->
+erlang_server_erlang_client_client_cert(doc) ->
     ["Test erlang server with erlang client when client sends cert"];
-ssl3_erlang_server_erlang_client_client_cert(suite) ->
+erlang_server_erlang_client_client_cert(suite) ->
     [];
-ssl3_erlang_server_erlang_client_client_cert(Config) when is_list(Config) ->
+erlang_server_erlang_client_client_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_verification_opts, Config),  
     ClientOpts = ?config(client_verification_opts, Config),  
-
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     
     Data = "From erlang to erlang",
@@ -863,7 +822,7 @@ ssl3_erlang_server_erlang_client_client_cert(Config) when is_list(Config) ->
 					%% Due to 1/n-1 splitting countermeasure Rizzo/Duong-Beast
 					{mfa, {ssl, send, [Data]}},
 					{options, 
-					 [{versions, [sslv3]} | ClientOpts]}]),
+					 [{versions, [Version]} | ClientOpts]}]),
     
     ssl_test_lib:check_result(Server, ok, Client, ok),
     
@@ -871,215 +830,8 @@ ssl3_erlang_server_erlang_client_client_cert(Config) when is_list(Config) ->
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
     ok.
-
-
-%%--------------------------------------------------------------------
-
-tls1_erlang_client_openssl_server(doc) ->
-    ["Test erlang client with openssl server"];
-tls1_erlang_client_openssl_server(suite) ->
-    [];
-tls1_erlang_client_openssl_server(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ?config(server_opts, Config),  
-    ClientOpts = ?config(client_opts, Config),  
-
-
-    test_server:format("Server Opts", [ServerOpts]),
-
-    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Port = ssl_test_lib:inet_port(node()),
-    CertFile = proplists:get_value(certfile, ServerOpts),
-    KeyFile = proplists:get_value(keyfile, ServerOpts),
-
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
-	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ " -tls1", 
-    
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
-
-    OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
-
-    wait_for_openssl_server(),
-    
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       connection_info, [tlsv1]}},
-					{options, 
-					 [{versions, [tlsv1]} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Client, ok),
-
-    %% Clean close down!   Server needs to be closed first !!
-    close_port(OpensslPort),
-    ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-
-tls1_erlang_server_openssl_client(doc) ->
-    ["Test erlang server with openssl client"];
-tls1_erlang_server_openssl_client(suite) ->
-    [];
-tls1_erlang_server_openssl_client(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ?config(server_opts, Config),  
-
-    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
-    
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, 
-					 {?MODULE, connection_info, [tlsv1]}},
-					{options, 
-					 [{versions, [tlsv1]} | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-
-    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ 
-	" -host localhost -tls1",
-
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
-    
-    OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
-     
-    ssl_test_lib:check_result(Server, ok),
-    
-    %% Clean close down!   Server needs to be closed first !!
-    ssl_test_lib:close(Server),
-    close_port(OpenSslPort),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-
-tls1_erlang_client_openssl_server_client_cert(doc) ->
-    ["Test erlang client with openssl server when client sends cert"];
-tls1_erlang_client_openssl_server_client_cert(suite) ->
-    [];
-tls1_erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ?config(server_verification_opts, Config),  
-    ClientOpts = ?config(client_verification_opts, Config),  
-
-    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Data = "From openssl to erlang",
-    
-    Port = ssl_test_lib:inet_port(node()),
-    CaCertFile = proplists:get_value(cacertfile, ServerOpts),
-    CertFile = proplists:get_value(certfile, ServerOpts),
-    KeyFile = proplists:get_value(keyfile, ServerOpts),
-   
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
-	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile 
-	++ " -key " ++ KeyFile ++ " -Verify 2 -tls1", 
-    
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
-
-    OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
-
-    wait_for_openssl_server(),
-
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       erlang_ssl_receive, [Data]}},
-					{options, ClientOpts}]),
-    port_command(OpensslPort, Data),
-    
-    ssl_test_lib:check_result(Client, ok),
-  
-    %% Clean close down!   Server needs to be closed first !!
-    close_port(OpensslPort),
-    ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
-    ok.
-
 %%--------------------------------------------------------------------  
 
-tls1_erlang_server_openssl_client_client_cert(doc) ->
-    ["Test erlang server with openssl client when client sends cert"];
-tls1_erlang_server_openssl_client_client_cert(suite) ->
-    [];
-tls1_erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ?config(server_verification_opts, Config),  
-    ClientOpts = ?config(client_verification_opts, Config),  
-
-    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
-    
-    Data = "From openssl to erlang",
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       erlang_ssl_receive, [Data]}},
-					{options, 
-					 [{verify , verify_peer} 
-					  | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    
-    CaCertFile = proplists:get_value(cacertfile, ClientOpts),
-    CertFile = proplists:get_value(certfile, ClientOpts),
-    KeyFile = proplists:get_value(keyfile, ClientOpts),
-    
-    Cmd = "openssl s_client -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile 
-	++ " -key " ++ KeyFile ++ " -port " ++ integer_to_list(Port)  ++ 
-	" -host localhost -tls1",
-
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
-    
-    OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
-    port_command(OpenSslPort, Data),
-    
-    ssl_test_lib:check_result(Server, ok),
-    
-    %% Clean close down!   Server needs to be closed first !!
-    ssl_test_lib:close(Server),
-    close_port(OpenSslPort),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-tls1_erlang_server_erlang_client_client_cert(doc) ->
-    ["Test erlang server with erlang client when client sends cert"];
-tls1_erlang_server_erlang_client_client_cert(suite) ->
-    [];
-tls1_erlang_server_erlang_client_client_cert(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ?config(server_verification_opts, Config),  
-    ClientOpts = ?config(client_verification_opts, Config),  
-
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Data = "From erlang to erlang",
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       erlang_ssl_receive, [Data]}},
-					{options, 
-					 [{verify , verify_peer} 
-					  | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {ssl, send, [Data]}},
-					{options, 
-					 [{versions, [tlsv1]} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    process_flag(trap_exit, false),
-    ok.
-%%--------------------------------------------------------------------
-
 ciphers_rsa_signed_certs(doc) -> 
     ["Test cipher suites that uses rsa certs"];
        
@@ -1186,12 +938,6 @@ cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->
     process_flag(trap_exit, false),
     Return.
 
-
-version_flag(tlsv1) ->
-    " -tls1 ";
-version_flag(sslv3) ->
-    " -ssl3 ".
-
 %%--------------------------------------------------------------------
 erlang_client_bad_openssl_server(doc) ->
     [""];
@@ -1207,8 +953,8 @@ erlang_client_bad_openssl_server(Config) when is_list(Config) ->
     Port = ssl_test_lib:inet_port(node()),
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
-
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
  	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "",
 
     test_server:format("openssl cmd: ~p~n", [Cmd]),
@@ -1222,7 +968,7 @@ erlang_client_bad_openssl_server(Config) when is_list(Config) ->
 					 {from, self()}, 
  					{mfa, {?MODULE, server_sent_garbage, []}},
 					 {options,
-					  [{versions, [tlsv1]} | ClientOpts]}]),
+					  [{versions, [Version]} | ClientOpts]}]),
     
     %% Send garbage
     port_command(OpensslPort, ?OPENSSL_GARBAGE),
@@ -1241,7 +987,7 @@ erlang_client_bad_openssl_server(Config) when is_list(Config) ->
  					 {from, self()},
  					 {mfa, {ssl_test_lib, no_result_msg, []}},
  					 {options,
- 					  [{versions, [tlsv1]} | ClientOpts]}]),
+					  [{versions, [Version]} | ClientOpts]}]),
 
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
@@ -1267,8 +1013,8 @@ expired_session(Config) when is_list(Config) ->
     Port = ssl_test_lib:inet_port(node()),
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
-   
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
+
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "", 
     
     test_server:format("openssl cmd: ~p~n", [Cmd]),
@@ -1334,16 +1080,257 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) ->
     
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
     port_command(OpenSslPort, Data),
-    
+    receive
+	{'EXIT', OpenSslPort, _} ->
+	    ok
+
+    end,
     ssl_test_lib:check_result(Server, {error,"protocol version"}),
-    
+    process_flag(trap_exit, false).
+
+%%--------------------------------------------------------------------
+erlang_client_openssl_server_npn(doc) ->
+    ["Test erlang client with openssl server doing npn negotiation"];
+erlang_client_openssl_server_npn(suite) ->
+    [];
+erlang_client_openssl_server_npn(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, fun(Client, OpensslPort) ->
+        port_command(OpensslPort, Data),
+
+        ssl_test_lib:check_result(Client, ok)
+    end),
+
+    ok.
+
+
+%%--------------------------------------------------------------------
+erlang_client_openssl_server_npn_renegotiate(doc) ->
+    ["Test erlang client with openssl server doing npn negotiation and renegotiate"];
+erlang_client_openssl_server_npn_renegotiate(suite) ->
+    [];
+erlang_client_openssl_server_npn_renegotiate(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, fun(Client, OpensslPort) ->
+        port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
+        test_server:sleep(?SLEEP),
+        port_command(OpensslPort, Data),
+        ssl_test_lib:check_result(Client, ok)
+    end),
+    ok.
+
+
+%%--------------------------------------------------------------------------
+
+
+erlang_server_openssl_client_npn(doc) ->
+    ["Test erlang server with openssl client and npn negotiation"];
+erlang_server_openssl_client_npn(suite) ->
+    [];
+erlang_server_openssl_client_npn(Config) when is_list(Config) ->
+
+    Data = "From openssl to erlang",
+    start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, fun(Server, OpensslPort) ->
+        port_command(OpensslPort, Data),
+        ssl_test_lib:check_result(Server, ok)
+    end),
+    ok.
+
+%%--------------------------------------------------------------------------
+
+erlang_server_openssl_client_npn_renegotiate(doc) ->
+    ["Test erlang server with openssl client and npn negotiation with renegotiation"];
+erlang_server_openssl_client_npn_renegotiate(suite) ->
+    [];
+erlang_server_openssl_client_npn_renegotiate(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, fun(Server, OpensslPort) ->
+        port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
+        test_server:sleep(?SLEEP),
+        port_command(OpensslPort, Data),
+        ssl_test_lib:check_result(Server, ok)
+    end),
+    ok.
+%%--------------------------------------------------------------------------
+
+erlang_client_openssl_server_npn_only_server(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_client_and_openssl_server_with_opts(Config, [], "-nextprotoneg spdy/2", Data, fun(Server, OpensslPort) ->
+        port_command(OpensslPort, Data),
+        ssl_test_lib:check_result(Server, ok)
+    end),
+    ok.
+
+%%--------------------------------------------------------------------------
+
+erlang_client_openssl_server_npn_only_client(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_client_and_openssl_server_with_opts(Config, [{client_preferred_next_protocols, {client, [<<"spdy/2">>], <<"http/1.1">>}}], "", Data, fun(Server, OpensslPort) ->
+        port_command(OpensslPort, Data),
+        ssl_test_lib:check_result(Server, ok)
+    end),
+    ok.
+
+%%--------------------------------------------------------------------------
+erlang_server_openssl_client_npn_only_server(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_server_and_openssl_client_with_opts(Config, [{next_protocols_advertised, [<<"spdy/2">>]}], "", Data, fun(Server, OpensslPort) ->
+        port_command(OpensslPort, Data),
+        ssl_test_lib:check_result(Server, ok)
+    end),
+    ok.
+
+erlang_server_openssl_client_npn_only_client(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_server_and_openssl_client_with_opts(Config, [], "-nextprotoneg spdy/2", Data, fun(Server, OpensslPort) ->
+        port_command(OpensslPort, Data),
+        ssl_test_lib:check_result(Server, ok)
+    end),
+    ok.
+
+%%--------------------------------------------------------------------------
+
+start_erlang_client_and_openssl_server_with_opts(Config, ErlangClientOpts, OpensslServerOpts, Data, Callback) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ?config(server_opts, Config),
+    ClientOpts0 = ?config(client_opts, Config),
+    ClientOpts = ErlangClientOpts ++ ClientOpts0,
+
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From openssl to erlang",
+
+    Port = ssl_test_lib:inet_port(node()),
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    KeyFile = proplists:get_value(keyfile, ServerOpts),
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+
+    Cmd = "openssl s_server " ++ OpensslServerOpts ++ "  -accept " ++ 
+	integer_to_list(Port) ++  version_flag(Version) ++
+	" -cert " ++ CertFile  ++ " -key " ++ KeyFile,
+
+    test_server:format("openssl cmd: ~p~n", [Cmd]),
+
+    OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
+
+    wait_for_openssl_server(),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+                    {host, Hostname},
+                    {from, self()},
+                    {mfa, {?MODULE,
+                           erlang_ssl_receive, [Data]}},
+                    {options, ClientOpts}]),
+
+    Callback(Client, OpensslPort),
+
+    %% Clean close down!   Server needs to be closed first !!
+    close_port(OpensslPort),
+
+    ssl_test_lib:close(Client),
+    process_flag(trap_exit, false).
+
+start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, Callback) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ?config(server_opts, Config),
+    ClientOpts0 = ?config(client_opts, Config),
+    ClientOpts = [{client_preferred_next_protocols, {client, [<<"spdy/2">>], <<"http/1.1">>}} | ClientOpts0],
+
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From openssl to erlang",
+
+    Port = ssl_test_lib:inet_port(node()),
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    KeyFile = proplists:get_value(keyfile, ServerOpts),
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+
+    Cmd = "openssl s_server -msg -nextprotoneg http/1.1,spdy/2  -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
+    " -cert " ++ CertFile  ++ " -key " ++ KeyFile,
+
+    test_server:format("openssl cmd: ~p~n", [Cmd]),
+
+    OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
+
+    wait_for_openssl_server(),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+                    {host, Hostname},
+                    {from, self()},
+                    {mfa, {?MODULE,
+                           erlang_ssl_receive_and_assert_npn, [<<"spdy/2">>, Data]}},
+                    {options, ClientOpts}]),
+
+    Callback(Client, OpensslPort),
+
     %% Clean close down!   Server needs to be closed first !!
+    close_port(OpensslPort),
+
+    ssl_test_lib:close(Client),
+    process_flag(trap_exit, false).
+
+start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, Callback) ->
+    process_flag(trap_exit, true),
+    ServerOpts0 = ?config(server_opts, Config),
+    ServerOpts = [{next_protocols_advertised, [<<"spdy/2">>]}, ServerOpts0],
+
+    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
+
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                    {from, self()},
+                    {mfa, {?MODULE, erlang_ssl_receive_and_assert_npn, [<<"spdy/2">>, Data]}},
+                    {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    Cmd = "openssl s_client -nextprotoneg http/1.0,spdy/2 -msg -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+    " -host localhost",
+
+    test_server:format("openssl cmd: ~p~n", [Cmd]),
+
+    OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
+
+    Callback(Server, OpenSslPort),
+
     ssl_test_lib:close(Server),
+
     close_port(OpenSslPort),
-    process_flag(trap_exit, false),
-    ok.
+    process_flag(trap_exit, false).
 
-%%--------------------------------------------------------------------
+start_erlang_server_and_openssl_client_with_opts(Config, ErlangServerOpts, OpenSSLClientOpts, Data, Callback) ->
+    process_flag(trap_exit, true),
+    ServerOpts0 = ?config(server_opts, Config),
+    ServerOpts = ErlangServerOpts ++  ServerOpts0,
+
+    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
+
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                    {from, self()},
+                    {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+                    {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+
+    Cmd = "openssl s_client " ++ OpenSSLClientOpts ++ " -msg -port " ++ integer_to_list(Port)  ++
+    " -host localhost",
+
+    test_server:format("openssl cmd: ~p~n", [Cmd]),
+
+    OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
+
+    Callback(Server, OpenSslPort),
+
+    ssl_test_lib:close(Server),
+
+    close_port(OpenSslPort),
+    process_flag(trap_exit, false).
+
+
+erlang_ssl_receive_and_assert_npn(Socket, Protocol, Data) ->
+    {ok, Protocol} = ssl:negotiated_next_protocol(Socket),
+    erlang_ssl_receive(Socket, Data),
+    {ok, Protocol} = ssl:negotiated_next_protocol(Socket),
+    ok.
 
 erlang_ssl_receive(Socket, Data) ->
     test_server:format("Connection info: ~p~n", 
@@ -1433,21 +1420,71 @@ wait_for_openssl_server() ->
 	    %% more so than sleep!)
 	    test_server:sleep(?SLEEP)
     end.
-	    
+
+version_flag(tlsv1) ->
+    " -tls1 ";
+version_flag('tlsv1.1') ->
+    " -tls1_1 ";
+version_flag('tlsv1.2') ->
+    " -tls1_2 ";
+version_flag(sslv3) ->
+    " -ssl3 ".
+
+check_openssl_npn_support(Config) ->
+    HelpText = os:cmd("openssl s_client --help"),
+    case string:str(HelpText, "nextprotoneg") of
+        0 ->
+            {skip, "Openssl not compiled with nextprotoneg support"};
+        _ ->
+            Config
+    end.
+
 check_sane_openssl_renegotaite(Config) ->
     case os:cmd("openssl version") of
 	"OpenSSL 0.9.8" ++ _ ->
-	    {skip, "Known renegotiation bug in OppenSSL"};
+	    {skip, "Known renegotiation bug in OpenSSL"};
 	"OpenSSL 0.9.7" ++ _ ->
-	    {skip, "Known renegotiation bug in OppenSSL"};
+	    {skip, "Known renegotiation bug in OpenSSL"};
 	_ ->
 	    Config
     end.
 
 check_sane_openssl_sslv2(Config) ->
-    case os:cmd("openssl version") of
-	"OpenSSL 1.0.0" ++ _ ->
-	    {skip, "sslv2 by default turned of in 1.*"};
-	_ ->
-	    Config
+    Port = open_port({spawn, "openssl s_client  -ssl2 "}, [stderr_to_stdout]),
+    case supports_sslv2(Port) of
+	true ->
+	    Config;
+	false ->
+	    {skip, "sslv2 not supported by openssl"}
+    end.
+
+supports_sslv2(Port) ->
+    receive 
+	{Port, {data, "unknown option -ssl2" ++ _}} -> 
+	    false;
+	{Port, {data, Data}} ->
+	    case lists:member("error", string:tokens(Data, ":")) of
+		true ->
+		    false;
+		false ->
+		    supports_sslv2(Port)
+	    end
+    after 500 ->
+	    true
+    end.
+
+check_sane_openssl_version(Version) ->
+    case {Version, os:cmd("openssl version")} of
+	{_, "OpenSSL 1.0.1" ++ _} ->
+	    true;
+	{'tlsv1.2', "OpenSSL 1.0" ++ _} ->
+	    false;
+	{'tlsv1.1', "OpenSSL 1.0" ++ _} ->
+	    false;
+	{'tlsv1.2', "OpenSSL 0" ++ _} ->
+	    false;
+	{'tlsv1.1', "OpenSSL 0" ++ _} ->
+	    false;
+	{_, _} ->
+	    true
     end.
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 0fccbfe908..adfb29e639 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.0.1
+SSL_VSN = 5.1.2
diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile
index 6c92756ae7..50f6427eaa 100644
--- a/lib/stdlib/doc/src/Makefile
+++ b/lib/stdlib/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -173,15 +173,15 @@ $(SPECDIR)/specs_erl_id_trans.xml:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6_FILES) $(RELEASE_PATH)/man/man6
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6_FILES) "$(RELEASE_PATH)/man/man6"
 
 release_spec:
diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml
index 7b8e279788..06cfad0b0b 100644
--- a/lib/stdlib/doc/src/binary.xml
+++ b/lib/stdlib/doc/src/binary.xml
@@ -77,41 +77,30 @@
   </datatypes>
   <funcs>
     <func>
-      <name>at(Subject, Pos) -> byte()</name>
+    <name name="at" arity="2"/>
       <fsummary>Returns the byte at a specific position in a binary</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>Pos = integer() >= 0</v>
-      </type>
       <desc>
 
-      <p>Returns the byte at position <c>Pos</c> (zero-based) in the binary
-      <c>Subject</c> as an integer. If <c>Pos</c> &gt;= <c>byte_size(Subject)</c>,
+      <p>Returns the byte at position <c><anno>Pos</anno></c> (zero-based) in the binary
+      <c><anno>Subject</anno></c> as an integer. If <c><anno>Pos</anno></c> &gt;= <c>byte_size(<anno>Subject</anno>)</c>,
       a <c>badarg</c>
       exception is raised.</p>
 
       </desc>
     </func>
     <func>
-      <name>bin_to_list(Subject) -> [byte()]</name>
+      <name name="bin_to_list" arity="1"/>
       <fsummary>Convert a binary to a list of integers</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-      </type>
       <desc>
-      <p>The same as <c>bin_to_list(Subject,{0,byte_size(Subject)})</c>.</p>
+      <p>The same as <c>bin_to_list(<anno>Subject</anno>,{0,byte_size(<anno>Subject</anno>)})</c>.</p>
       </desc>
     </func>
     <func>
-      <name>bin_to_list(Subject, PosLen) -> [byte()]</name>
+      <name name="bin_to_list" arity="2"/>
       <fsummary>Convert a binary to a list of integers</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>PosLen = part()</v>
-      </type>
       <desc>
 
-      <p>Converts <c>Subject</c> to a list of <c>byte()</c>s, each representing
+      <p>Converts <c><anno>Subject</anno></c> to a list of <c>byte()</c>s, each representing
       the value of one byte. The <c>part()</c> denotes which part of the
       <c>binary()</c> to convert. Example:</p>
 
@@ -120,27 +109,19 @@
 "rla"
 %% or [114,108,97] in list notation.
 </code>
-      <p>If <c>PosLen</c> in any way references outside the binary, a <c>badarg</c> exception is raised.</p>
+      <p>If <c><anno>PosLen</anno></c> in any way references outside the binary, a <c>badarg</c> exception is raised.</p>
       </desc>
     </func>
     <func>
-      <name>bin_to_list(Subject, Pos, Len) -> [byte()]</name>
+      <name name="bin_to_list" arity="3"/>
       <fsummary>Convert a binary to a list of integers</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>Pos = integer() >= 0</v>
-        <v>Len = integer() >= 0</v>
-      </type>
       <desc>
-      <p>The same as<c> bin_to_list(Subject,{Pos,Len})</c>.</p>
+      <p>The same as<c> bin_to_list(<anno>Subject</anno>,{<anno>Pos</anno>,<anno>Len</anno>})</c>.</p>
       </desc>
     </func>
     <func>
-      <name>compile_pattern(Pattern) -> cp()</name>
+      <name name="compile_pattern" arity="1"/>
       <fsummary>Pre-compiles a binary search pattern</fsummary>
-      <type>
-        <v>Pattern = binary() | [ binary() ]</v>
-      </type>
       <desc>
 
       <p>Builds an internal structure representing a compilation of a
@@ -155,7 +136,7 @@
       <p>When a list of binaries is given, it denotes a set of
       alternative binaries to search for. I.e if
       <c>[&lt;&lt;"functional"&gt;&gt;,&lt;&lt;"programming"&gt;&gt;]</c>
-      is given as <c>Pattern</c>, this
+      is given as <c><anno>Pattern</anno></c>, this
       means "either <c>&lt;&lt;"functional"&gt;&gt;</c> or
       <c>&lt;&lt;"programming"&gt;&gt;</c>". The pattern is a set of
       alternatives; when only a single binary is given, the set has
@@ -163,32 +144,25 @@
 
       <p>The list of binaries used for search alternatives shall be flat and proper.</p>
 
-      <p>If <c>Pattern</c> is not a binary or a flat proper list of binaries with length &gt; 0,
+      <p>If <c><anno>Pattern</anno></c> is not a binary or a flat proper list of binaries with length &gt; 0,
       a <c>badarg</c> exception will be raised.</p>
 
       </desc>
     </func>
     <func>
-      <name>copy(Subject) -> binary()</name>
+      <name name="copy" arity="1"/>
       <fsummary>Creates a duplicate of a binary</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-      </type>
       <desc>
-      <p>The same as <c>copy(Subject, 1)</c>.</p>
+      <p>The same as <c>copy(<anno>Subject</anno>, 1)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>copy(Subject,N) -> binary()</name>
+      <name name="copy" arity="2"/>
       <fsummary>Duplicates a binary N times and creates a new</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>N = integer() >= 0</v>
-      </type>
       <desc>
-      <p>Creates a binary with the content of <c>Subject</c> duplicated <c>N</c> times.</p>
+      <p>Creates a binary with the content of <c><anno>Subject</anno></c> duplicated <c><anno>N</anno></c> times.</p>
 
-      <p>This function will always create a new binary, even if <c>N =
+      <p>This function will always create a new binary, even if <c><anno>N</anno> =
       1</c>. By using <c>copy/1</c> on a binary referencing a larger binary, one
       might free up the larger binary for garbage collection.</p>
 
@@ -201,32 +175,23 @@
       large binaries are no longer used in any process, deliberate
       copying might be a good idea.</p> </note>
 
-      <p>If <c>N</c> &lt; <c>0</c>, a <c>badarg</c> exception is raised.</p>
+      <p>If <c><anno>N</anno></c> &lt; <c>0</c>, a <c>badarg</c> exception is raised.</p>
       </desc>
     </func>
     <func>
-      <name>decode_unsigned(Subject) -> Unsigned</name>
+      <name name="decode_unsigned" arity="1"/>
       <fsummary>Decode a whole binary into an integer of arbitrary size</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>Unsigned = integer() >= 0</v>
-      </type>
       <desc>
-      <p>The same as <c>decode_unsigned(Subject,big)</c>.</p>
+      <p>The same as <c>decode_unsigned(<anno>Subject</anno>, big)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>decode_unsigned(Subject, Endianess) -> Unsigned</name>
+      <name name="decode_unsigned" arity="2"/>
       <fsummary>Decode a whole binary into an integer of arbitrary size</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>Endianess = big | little</v>
-        <v>Unsigned = integer() >= 0</v>
-      </type>
       <desc>
 
       <p>Converts the binary digit representation, in big or little
-      endian, of a positive integer in <c>Subject</c> to an Erlang <c>integer()</c>.</p>
+      endian, of a positive integer in <c><anno>Subject</anno></c> to an Erlang <c>integer()</c>.</p>
 
       <p>Example:</p>
 
@@ -237,22 +202,15 @@
       </desc>
     </func>
     <func>
-      <name>encode_unsigned(Unsigned) -> binary()</name>
+      <name name="encode_unsigned" arity="1"/>
       <fsummary>Encodes an unsigned integer into the minimal binary</fsummary>
-      <type>
-        <v>Unsigned = integer() >= 0</v>
-      </type>
       <desc>
-      <p>The same as <c>encode_unsigned(Unsigned,big)</c>.</p>
+      <p>The same as <c>encode_unsigned(<anno>Unsigned</anno>, big)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>encode_unsigned(Unsigned,Endianess) -> binary()</name>
+      <name name="encode_unsigned" arity="2"/>
       <fsummary>Encodes an unsigned integer into the minimal binary</fsummary>
-      <type>
-        <v>Unsigned = integer() >= 0</v>
-        <v>Endianess = big | little</v>
-      </type>
       <desc>
 
       <p>Converts a positive integer to the smallest possible
@@ -268,51 +226,39 @@
       </desc>
     </func>
     <func>
-      <name>first(Subject) -> byte()</name>
+      <name name="first" arity="1"/>
       <fsummary>Returns the first byte of a binary</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-      </type>
       <desc>
 
-      <p>Returns the first byte of the binary <c>Subject</c> as an integer. If the
-      size of <c>Subject</c> is zero, a <c>badarg</c> exception is raised.</p>
+      <p>Returns the first byte of the binary <c><anno>Subject</anno></c> as an integer. If the
+      size of <c><anno>Subject</anno></c> is zero, a <c>badarg</c> exception is raised.</p>
 
       </desc>
     </func>
     <func>
-      <name>last(Subject) -> byte()</name>
+      <name name="last" arity="1"/>
       <fsummary>Returns the last byte of a binary</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-      </type>
       <desc>
 
-      <p>Returns the last byte of the binary <c>Subject</c> as an integer. If the
-      size of <c>Subject</c> is zero, a <c>badarg</c> exception is raised.</p>
+      <p>Returns the last byte of the binary <c><anno>Subject</anno></c> as an integer. If the
+      size of <c><anno>Subject</anno></c> is zero, a <c>badarg</c> exception is raised.</p>
 
       </desc>
     </func>
     <func>
-      <name>list_to_bin(ByteList) -> binary()</name>
+      <name name="list_to_bin" arity="1"/>
       <fsummary>Convert a list of integers and binaries to a binary</fsummary>
-      <type>
-        <v>ByteList = iodata() (see module erlang)</v>
-      </type>
       <desc>
       <p>Works exactly as <c>erlang:list_to_binary/1</c>, added for completeness.</p>
       </desc>
     </func>
     <func>
-      <name>longest_common_prefix(Binaries) -> integer() >= 0</name>
+      <name name="longest_common_prefix" arity="1"/>
       <fsummary>Returns length of longest common prefix for a set of binaries</fsummary>
-      <type>
-        <v>Binaries = [ binary() ]</v>
-      </type>
       <desc>
 
       <p>Returns the length of the longest common prefix of the
-      binaries in the list <c>Binaries</c>. Example:</p>
+      binaries in the list <c><anno>Binaries</anno></c>. Example:</p>
 
 <code>
 1> binary:longest_common_prefix([&lt;&lt;"erlang"&gt;&gt;,&lt;&lt;"ergonomy"&gt;&gt;]).
@@ -321,19 +267,16 @@
 0
 </code>
 
-      <p>If <c>Binaries</c> is not a flat list of binaries, a <c>badarg</c> exception is raised.</p>
+      <p>If <c><anno>Binaries</anno></c> is not a flat list of binaries, a <c>badarg</c> exception is raised.</p>
       </desc>
     </func>
     <func>
-      <name>longest_common_suffix(Binaries) -> integer() >= 0</name>
+      <name name="longest_common_suffix" arity="1"/>
       <fsummary>Returns length of longest common suffix for a set of binaries</fsummary>
-      <type>
-        <v>Binaries = [ binary() ]</v>
-      </type>
       <desc>
 
       <p>Returns the length of the longest common suffix of the
-      binaries in the list <c>Binaries</c>. Example:</p>
+      binaries in the list <c><anno>Binaries</anno></c>. Example:</p>
 
 <code>
 1> binary:longest_common_suffix([&lt;&lt;"erlang"&gt;&gt;,&lt;&lt;"fang"&gt;&gt;]).
@@ -347,35 +290,24 @@
       </desc>
     </func>
     <func>
-      <name>match(Subject, Pattern) -> Found | <c>nomatch</c></name>
+      <name name="match" arity="2"/>
       <fsummary>Searches for the first match of a pattern in a binary</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-	<v>Pattern = binary() | [ binary() ] | cp()</v>
-	<v>Found = part()</v>
-      </type>
       <desc>
-      <p>The same as <c>match(Subject, Pattern, [])</c>.</p>
+      <p>The same as <c>match(<anno>Subject</anno>, <anno>Pattern</anno>, [])</c>.</p>
       </desc>
     </func>
     <func>
-      <name>match(Subject,Pattern,Options) -> Found | <c>nomatch</c></name>
+      <name name="match" arity="3"/>
+      <type name="part"/>
       <fsummary>Searches for the first match of a pattern in a binary</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-	<v>Pattern = binary() | [ binary() ] | cp()</v>
-	<v>Found = part()</v>
-        <v>Options = [ Option ]</v>
-	<v>Option = {scope, part()}</v>
-      </type>
       <desc>
 
-      <p>Searches for the first occurrence of <c>Pattern</c> in <c>Subject</c> and
+      <p>Searches for the first occurrence of <c><anno>Pattern</anno></c> in <c><anno>Subject</anno></c> and
       returns the position and length.</p>
 
-      <p>The function will return <c>{Pos,Length}</c> for the binary
-      in <c>Pattern</c> starting at the lowest position in
-      <c>Subject</c>, Example:</p>
+      <p>The function will return <c>{Pos, Length}</c> for the binary
+      in <c><anno>Pattern</anno></c> starting at the lowest position in
+      <c><anno>Subject</anno></c>, Example:</p>
 
 <code>
 1> binary:match(&lt;&lt;"abcde"&gt;&gt;, [&lt;&lt;"bcde"&gt;&gt;,&lt;&lt;"cd"&gt;&gt;],[]).
@@ -391,16 +323,16 @@
       <p>Summary of the options:</p>
 
       <taglist>
-      <tag>{scope, {Start, Length}}</tag>
+      <tag>{scope, {<anno>Start</anno>, <anno>Length</anno>}}</tag>
       <item><p>Only the given part is searched. Return values still have
-      offsets from the beginning of <c>Subject</c>. A negative <c>Length</c> is
-      allowed as described in the <c>TYPES</c> section of this manual.</p></item>
+      offsets from the beginning of <c><anno>Subject</anno></c>. A negative <c>Length</c> is
+      allowed as described in the <c>DATA TYPES</c> section of this manual.</p></item>
       </taglist>
 
       <p>If none of the strings in
-      <c>Pattern</c> is found, the atom <c>nomatch</c> is returned.</p>
+      <c><anno>Pattern</anno></c> is found, the atom <c>nomatch</c> is returned.</p>
 
-      <p>For a description of <c>Pattern</c>, see
+      <p>For a description of <c><anno>Pattern</anno></c>, see
       <seealso marker="#compile_pattern-1">compile_pattern/1</seealso>.</p>
 
       <p>If <c>{scope, {Start,Length}}</c> is given in the options
@@ -412,32 +344,21 @@
       </desc>
     </func>
     <func>
-      <name>matches(Subject, Pattern) -> Found</name>
+      <name name="matches" arity="2"/>
       <fsummary>Searches for all matches of a pattern in a binary</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>Pattern = binary() | [ binary() ] | cp()</v>
-        <v>Found = [ part() ] | []</v>
-      </type>
       <desc>
-      <p>The same as <c>matches(Subject, Pattern, [])</c>.</p>
+      <p>The same as <c>matches(<anno>Subject</anno>, <anno>Pattern</anno>, [])</c>.</p>
       </desc>
     </func>
     <func>
-      <name>matches(Subject,Pattern,Options) -> Found</name>
+      <name name="matches" arity="3"/>
+      <type name="part"/>
       <fsummary>Searches for all matches of a pattern in a binary</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>Pattern = binary() | [ binary() ] | cp()</v>
-        <v>Found = [ part() ] | []</v>
-        <v>Options = [ Option ]</v>
-        <v>Option = {scope, part()}</v>
-      </type>
       <desc>
 
-      <p>Works like match, but the <c>Subject</c> is searched until
+      <p>Works like <c>match/2</c>, but the <c><anno>Subject</anno></c> is searched until
       exhausted and a list of all non-overlapping parts matching
-      <c>Pattern</c> is returned (in order). </p>
+      <c><anno>Pattern</anno></c> is returned (in order). </p>
 
       <p>The first and longest match is preferred to a shorter,
       which is illustrated by the following example:</p>
@@ -458,26 +379,22 @@
 
        <p>If none of the strings in pattern is found, an empty list is returned.</p>
 
-       <p>For a description of <c>Pattern</c>, see <seealso marker="#compile_pattern-1">compile_pattern/1</seealso> and for a
+       <p>For a description of <c><anno>Pattern</anno></c>, see <seealso marker="#compile_pattern-1">compile_pattern/1</seealso> and for a
        description of available options, see <seealso marker="#match-3">match/3</seealso>.</p>
 
-       <p>If <c>{scope, {Start,Length}}</c> is given in the options such that
-       <c>Start</c> is larger than the size of <c>Subject</c>, <c>Start + Length</c> is
-       less than zero or <c>Start + Length</c> is larger than the size of
-       <c>Subject</c>, a <c>badarg</c> exception is raised.</p>
+       <p>If <c>{scope, {<anno>Start</anno>,<anno>Length</anno>}}</c> is given in the options such that
+       <c><anno>Start</anno></c> is larger than the size of <c><anno>Subject</anno></c>, <c><anno>Start</anno> + <anno>Length</anno></c> is
+       less than zero or <c><anno>Start</anno> + <anno>Length</anno></c> is larger than the size of
+       <c><anno>Subject</anno></c>, a <c>badarg</c> exception is raised.</p>
 
      </desc>
     </func>
     <func>
-      <name>part(Subject, PosLen) -> binary()</name>
+      <name name="part" arity="2"/>
       <fsummary>Extracts a part of a binary</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>PosLen = part()</v>
-      </type>
       <desc>
 
-      <p>Extracts the part of the binary <c>Subject</c> described by <c>PosLen</c>.</p>
+      <p>Extracts the part of the binary <c><anno>Subject</anno></c> described by <c><anno>PosLen</anno></c>.</p>
 
       <p>Negative length can be used to extract bytes at the end of a binary:</p>
 
@@ -494,25 +411,20 @@
       <c>binary_part/3</c>. Those BIFs are allowed in guard tests.</p>
       </note>
 
-      <p>If <c>PosLen</c> in any way references outside the binary, a <c>badarg</c> exception
+      <p>If <c><anno>PosLen</anno></c> in any way references outside the binary, a <c>badarg</c> exception
       is raised.</p>
 
       </desc>
     </func>
     <func>
-      <name>part(Subject, Pos, Len) -> binary()</name>
+      <name name="part" arity="3"/>
       <fsummary>Extracts a part of a binary</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>Pos = integer() >= 0</v>
-        <v>Len = integer()</v>
-      </type>
       <desc>
-      <p>The same as <c>part(Subject, {Pos, Len})</c>.</p>
+      <p>The same as <c>part(<anno>Subject</anno>, {<anno>Pos</anno>, <anno>Len</anno>})</c>.</p>
       </desc>
     </func>
     <func>
-      <name>referenced_byte_size(binary()) -> integer() >= 0</name>
+      <name name="referenced_byte_size" arity="1"/>
       <fsummary>Determines the size of the actual binary pointed out by a sub-binary</fsummary>
       <desc>
 
diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml
index 488499581f..386ed89fe1 100644
--- a/lib/stdlib/doc/src/epp.xml
+++ b/lib/stdlib/doc/src/epp.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 487b06473f..abaf64fb91 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -128,11 +128,17 @@
 
   <datatypes>
     <datatype>
+      <name name="access"/>
+    </datatype>
+    <datatype>
       <name><marker id="type-continuation">continuation()</marker></name>
       <desc>
         <p>Opaque continuation used by <seealso marker="#select/1">
-          <c>select/1</c></seealso> and <seealso marker="#select/3">
-          <c>select/3</c></seealso>.</p>
+          <c>select/1,3</c></seealso>, <seealso marker="#select_reverse/1">
+          <c>select_reverse/1,3</c></seealso>, <seealso
+          marker="#match/1">
+          <c>match/1,3</c></seealso>, and <seealso marker="#match_object/1">
+          <c>match_object/1,3</c></seealso>.</p>
       </desc>
     </datatype>
     <datatype>
@@ -140,6 +146,10 @@
       <desc><p>A match specification, see above.</p></desc>
     </datatype>
     <datatype>
+      <name name="comp_match_spec"/>
+      <desc><p>A compiled match specification.</p></desc>
+    </datatype>
+    <datatype>
       <name name="match_pattern"/>
     </datatype>
     <datatype>
@@ -149,14 +159,14 @@
       <name name="tid"/>
       <desc><p>A table identifier, as returned by new/2.</p></desc>
     </datatype>
+    <datatype>
+      <name name="type"/>
+    </datatype>
   </datatypes>
   <funcs>
     <func>
-      <name>all() -> [Tab]</name>
+      <name name="all" arity="0"/>
       <fsummary>Return a list of all ETS tables.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-      </type>
       <desc>
         <p>Returns a list of all tables at the node. Named tables are
           given by their names, unnamed tables are given by their
@@ -164,48 +174,34 @@
       </desc>
     </func>
     <func>
-      <name>delete(Tab) -> true</name>
+      <name name="delete" arity="1"/>
       <fsummary>Delete an entire ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-      </type>
       <desc>
-        <p>Deletes the entire table <c>Tab</c>.</p>
+        <p>Deletes the entire table <c><anno>Tab</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>delete(Tab, Key) -> true</name>
+      <name name="delete" arity="2"/>
       <fsummary>Delete all objects with a given key from an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Key = term()</v>
-      </type>
       <desc>
-        <p>Deletes all objects with the key <c>Key</c> from the table
-          <c>Tab</c>.</p>
+        <p>Deletes all objects with the key <c><anno>Key</anno></c> from the table
+          <c><anno>Tab</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>delete_all_objects(Tab) -> true</name>
+      <name name="delete_all_objects" arity="1"/>
       <fsummary>Delete all objects in an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-      </type>
       <desc>
-        <p>Delete all objects in the ETS table <c>Tab</c>. 
+        <p>Delete all objects in the ETS table <c><anno>Tab</anno></c>.
          The operation is guaranteed to be
          <seealso marker="#concurrency">atomic and isolated</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>delete_object(Tab,Object) -> true</name>
+      <name name="delete_object" arity="2"/>
       <fsummary>Deletes a specific from an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Object = tuple()</v>
-      </type>
       <desc>
-        <p>Delete the exact object <c>Object</c> from the ETS table,
+        <p>Delete the exact object <c><anno>Object</anno></c> from the ETS table,
           leaving objects with the same key but other differences
           (useful for type <c>bag</c>). In a <c>duplicate_bag</c>, all
           instances of the object will be deleted.</p>
@@ -257,14 +253,10 @@
       </desc>
     </func>
     <func>
-      <name>first(Tab) -> Key | '$end_of_table'</name>
+      <name name="first" arity="1"/>
       <fsummary>Return the first key in an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Key = term()</v>
-      </type>
       <desc>
-        <p>Returns the first key <c>Key</c> in the table <c>Tab</c>.
+        <p>Returns the first key <c><anno>Key</anno></c> in the table <c><anno>Tab</anno></c>.
           If the table is of the <c>ordered_set</c> type, the first key
           in Erlang term order will be returned. If the table is of any
           other type, the first key according to the table's internal
@@ -336,7 +328,7 @@
           the source file.</p>
         <p>The fun is very restricted, it can take only a single
           parameter (the object to match): a sole variable or a
-          tuple. It needs to use the <c>is_</c>XXX guard tests.
+          tuple. It needs to use the <c>is_</c> guard tests.
           Language constructs that have no representation
           in a match_spec (like <c>if</c>, <c>case</c>, <c>receive</c>
           etc) are not allowed.</p>
@@ -386,19 +378,14 @@ Error: fun containing local Erlang function calls
       </desc>
     </func>
     <func>
-      <name>give_away(Tab, Pid, GiftData) -> true</name>
+      <name name="give_away" arity="3"/>
       <fsummary>Change owner of a table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Pid = pid()</v>
-        <v>GiftData = term()</v>
-      </type>
       <desc>
-        <p>Make process <c>Pid</c> the new owner of table <c>Tab</c>.
+        <p>Make process <c><anno>Pid</anno></c> the new owner of table <c><anno>Tab</anno></c>.
           If successful, the message
-          <c>{'ETS-TRANSFER',Tab,FromPid,GiftData}</c> will be sent
+          <c>{'ETS-TRANSFER',<anno>Tab</anno>,FromPid,<anno>GiftData</anno>}</c> will be sent
           to the new owner.</p>
-        <p>The process <c>Pid</c> must be alive, local and not already the
+        <p>The process <c><anno>Pid</anno></c> must be alive, local and not already the
           owner of the table. The calling process must be the table owner.</p>
         <p>Note that <c>give_away</c> does not at all affect the
           <seealso marker="#heir">heir</seealso> option of the table. A table
@@ -421,81 +408,72 @@ Error: fun containing local Erlang function calls
       </desc>
     </func>
     <func>
-      <name>info(Tab) -> [{Item, Value}] | undefined</name>
+      <name name="info" arity="1"/>
       <fsummary>Return information about an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Item = atom(), see below</v>
-        <v>Value = term(), see below</v>
-      </type>
       <desc>
-        <p>Returns information about the table <c>Tab</c> as a list of
-          <c>{Item, Value}</c> tuples. If <c>Tab</c> has the correct type
+        <p>Returns information about the table <c><anno>Tab</anno></c> as a list of
+          tuples. If <c><anno>Tab</anno></c> has the correct type
 	  for a table identifier, but does not refer to an existing ETS
-	  table, <c>undefined</c> is returned. If <c>Tab</c> is not of the
+	  table, <c>undefined</c> is returned. If <c><anno>Tab</anno></c> is not of the
 	  correct type, this function fails with reason <c>badarg</c>.</p>
 
         <list type="bulleted">
-          <item><c>Item=memory, Value=integer()</c>          <br></br>
+           <item><c>{compressed, boolean()}</c>          <br></br>
 
-           The number of words allocated to the table.</item>
-          <item><c>Item=owner, Value=pid()</c>          <br></br>
-
-           The pid of the owner of the table.</item>
-          <item><c>Item=heir, Value=pid()|none</c>          <br></br>
+            Indicates if the table is compressed or not.</item>
+          <item><c>{heir, pid() | none}</c>          <br></br>
 
            The pid of the heir of the table, or <c>none</c> if no heir is set.</item>
-          <item><c>Item=name, Value=atom()</c>          <br></br>
+          <item><c>{keypos, integer() >= 1}</c>          <br></br>
 
-           The name of the table.</item>
-          <item><c>Item=size, Value=integer()</c>          <br></br>
+           The key position.</item>
+          <item><c>{memory, integer() >= 0</c>          <br></br>
 
-           The number of objects inserted in the table.</item>
-          <item><c>Item=node, Value=atom()</c>          <br></br>
+           The number of words allocated to the table.</item>
+          <item><c>{name, atom()}</c>          <br></br>
 
-           The node where the table is stored. This field is no longer
-           meaningful as tables cannot be accessed from other nodes.</item>
-          <item><c>Item=named_table, Value=true|false</c>          <br></br>
+           The name of the table.</item>
+          <item><c>{named_table, boolean()}</c>          <br></br>
 
            Indicates if the table is named or not.</item>
-          <item><c>Item=type, Value=set|ordered_set|bag|duplicate_bag</c>          <br></br>
+          <item><c>{node, node()}</c>          <br></br>
 
-           The table type.</item>
-          <item><c>Item=keypos, Value=integer()</c>          <br></br>
+           The node where the table is stored. This field is no longer
+           meaningful as tables cannot be accessed from other nodes.</item>
+          <item><c>{owner, pid()}</c>          <br></br>
 
-           The key position.</item>
-          <item><c>Item=protection, Value=public|protected|private</c>          <br></br>
+           The pid of the owner of the table.</item>
+          <item><c>{protection, <seealso marker="#type-access">access()</seealso>}</c>          <br></br>
 
            The table access rights.</item>
-           <item><c>Item=compressed, Value=true|false</c>          <br></br>
+          <item><c>{size, integer() >= 0</c>          <br></br>
 
-            Indicates if the table is compressed or not.</item>
+           The number of objects inserted in the table.</item>
+          <item><c>{type, <seealso marker="#type-type">type()</seealso>}</c>          <br></br>
+
+           The table type.</item>
         </list>
       </desc>
     </func>
     <func>
-      <name>info(Tab, Item) -> Value | undefined</name>
+      <name name="info" arity="2"/>
       <fsummary>Return the information associated with given item for an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Item, Value - see below</v>
-      </type>
       <desc>
         <p>Returns the information associated with <c>Item</c> for
-          the table <c>Tab</c>, or returns <c>undefined</c> if <c>Tab</c>
+          the table <c><anno>Tab</anno></c>, or returns <c>undefined</c> if <c>Tab</c>
 	  does not refer an existing ETS table.
-	  If <c>Tab</c> is not of the correct type, or if <c>Item</c> is not
+	  If <c><anno>Tab</anno></c> is not of the correct type, or if <c><anno>Item</anno></c> is not
 	  one of the allowed values, this function fails with reason <c>badarg</c>.</p>
 
 	  <warning><p>In R11B and earlier, this function would not fail but return
 	  <c>undefined</c> for invalid values for <c>Item</c>.</p>
 	  </warning>
 
-	  <p>In addition to the <c>{Item,Value}</c>
+	  <p>In addition to the <c>{<anno>Item</anno>,<anno>Value</anno>}</c>
           pairs defined for <c>info/1</c>, the following items are
           allowed:</p>
         <list type="bulleted">
-          <item><c>Item=fixed, Value=true|false</c>          <br></br>
+          <item><c>Item=fixed, Value=boolean()</c>          <br></br>
 
            Indicates if the table is fixed by any process or not.</item>
           <item>
@@ -547,15 +525,11 @@ Error: fun containing local Erlang function calls
       </desc>
     </func>
     <func>
-      <name>insert(Tab, ObjectOrObjects) -> true</name>
+      <name name="insert" arity="2"/>
       <fsummary>Insert an object into an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>ObjectOrObjects = tuple() | [tuple()]</v>
-      </type>
       <desc>
         <p>Inserts the object or all of the objects in the list
-          <c>ObjectOrObjects</c> into the table <c>Tab</c>.  
+          <c><anno>ObjectOrObjects</anno></c> into the table <c><anno>Tab</anno></c>.
           If the table is a <c>set</c> and the key of the inserted
           objects <em>matches</em> the key of any object in the table,
           the old object will be replaced. If the table is an
@@ -572,19 +546,15 @@ Error: fun containing local Erlang function calls
       </desc>
     </func>
     <func>
-      <name>insert_new(Tab, ObjectOrObjects) -> boolean()</name>
+      <name name="insert_new" arity="2"/>
       <fsummary>Insert an object into an ETS table if the key is not already present.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>ObjectOrObjects = tuple() | [tuple()]</v>
-      </type>
       <desc>
         <p>This function works exactly like <c>insert/2</c>, with the
           exception that instead of overwriting objects with the same
           key (in the case of <c>set</c> or <c>ordered_set</c>) or
           adding more objects with keys already existing in the table
           (in the case of <c>bag</c> and <c>duplicate_bag</c>), it
-          simply returns <c>false</c>. If <c>ObjectOrObjects</c> is a
+          simply returns <c>false</c>. If <c><anno>ObjectOrObjects</anno></c> is a
           list, the function checks <em>every</em> key prior to
           inserting anything. Nothing will be inserted if not
           <em>all</em> keys present in the list are absent from the
@@ -593,11 +563,8 @@ Error: fun containing local Erlang function calls
       </desc>
     </func>
     <func>
-      <name>is_compiled_ms(Term) -> boolean()</name>
+      <name name="is_compiled_ms" arity="1"/>
       <fsummary>Checks if an Erlang term is the result of ets:match_spec_compile</fsummary>
-      <type>
-        <v>Term = term()</v>
-      </type>
       <desc>
         <p>This function is used to check if a term is a valid
           compiled <seealso marker="#match_spec">match_spec</seealso>.
@@ -626,14 +593,10 @@ ets:is_compiled_ms(Broken).</code>
       </desc>
     </func>
     <func>
-      <name>last(Tab) -> Key | '$end_of_table'</name>
+      <name name="last" arity="1"/>
       <fsummary>Return the last key in an ETS table of type<c>ordered_set</c>.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Key = term()</v>
-      </type>
       <desc>
-        <p>Returns the last key <c>Key</c> according to Erlang term
+        <p>Returns the last key <c><anno>Key</anno></c> according to Erlang term
           order in the table <c>Tab</c> of the <c>ordered_set</c> type.
           If the table is of any other type, the function is synonymous
           to <c>first/2</c>. If the table is empty,
@@ -642,16 +605,11 @@ ets:is_compiled_ms(Broken).</code>
       </desc>
     </func>
     <func>
-      <name>lookup(Tab, Key) -> [Object]</name>
+      <name name="lookup" arity="2"/>
       <fsummary>Return all objects with a given key in an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Key = term()</v>
-        <v>Object = tuple()</v>
-      </type>
       <desc>
-        <p>Returns a list of all objects with the key <c>Key</c> in
-          the table <c>Tab</c>.</p>
+        <p>Returns a list of all objects with the key <c><anno>Key</anno></c> in
+          the table <c><anno>Tab</anno></c>.</p>
         <p>In the case of <c>set, bag and duplicate_bag</c>, an object
           is returned only if the given key <em>matches</em> the key
           of the object in the table. If the table is an
@@ -681,22 +639,16 @@ ets:is_compiled_ms(Broken).</code>
       </desc>
     </func>
     <func>
-      <name>lookup_element(Tab, Key, Pos) -> Elem</name>
+      <name name="lookup_element" arity="3"/>
       <fsummary>Return the <c>Pos</c>:th element of all objects with a given key in an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Key = term()</v>
-        <v>Pos = integer()</v>
-        <v>Elem = term() | [term()]</v>
-      </type>
       <desc>
-        <p>If the table <c>Tab</c> is of type <c>set</c> or
-          <c>ordered_set</c>, the function returns the <c>Pos</c>:th
-          element of the object with the key <c>Key</c>.</p>
+        <p>If the table <c><anno>Tab</anno></c> is of type <c>set</c> or
+          <c>ordered_set</c>, the function returns the <c><anno>Pos</anno></c>:th
+          element of the object with the key <c><anno>Key</anno></c>.</p>
         <p>If the table is of type <c>bag</c> or <c>duplicate_bag</c>,
-          the functions returns a list with the <c>Pos</c>:th element of
-          every object with the key <c>Key</c>.</p>
-        <p>If no object with the key <c>Key</c> exists, the function
+          the functions returns a list with the <c><anno>Pos</anno></c>:th element of
+          every object with the key <c><anno>Key</anno></c>.</p>
+        <p>If no object with the key <c><anno>Key</anno></c> exists, the function
           will exit with reason <c>badarg</c>.</p>
         <p>The difference between <c>set</c>, <c>bag</c> and 
           <c>duplicate_bag</c> on one hand, and <c>ordered_set</c> on
@@ -708,16 +660,11 @@ ets:is_compiled_ms(Broken).</code>
       </desc>
     </func>
     <func>
-      <name>match(Tab, Pattern) -> [Match]</name>
+      <name name="match" arity="2"/>
       <fsummary>Match the objects in an ETS table against a pattern.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Pattern = tuple()</v>
-        <v>Match = [term()]</v>
-      </type>
       <desc>
-        <p>Matches the objects in the table <c>Tab</c> against the
-          pattern <c>Pattern</c>.</p>
+        <p>Matches the objects in the table <c><anno>Tab</anno></c> against the
+          pattern <c><anno>Pattern</anno></c>.</p>
         <p>A pattern is a term that may contain:</p>
         <list type="bulleted">
           <item>bound parts (Erlang terms),</item>
@@ -744,18 +691,12 @@ ets:is_compiled_ms(Broken).</code>
       </desc>
     </func>
     <func>
-      <name>match(Tab, Pattern, Limit) -> {[Match],Continuation} | '$end_of_table'</name>
+      <name name="match" arity="3"/>
       <fsummary>Match the objects in an ETS table against a pattern and returns part of the answers.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Pattern = tuple()</v>
-        <v>Match = [term()]</v>
-        <v>Continuation = term()</v>
-      </type>
       <desc>
         <p>Works like <c>ets:match/2</c> but only returns a limited
-          (<c>Limit</c>) number of matching objects. The
-          <c>Continuation</c> term can then be used in subsequent calls
+          (<c><anno>Limit</anno></c>) number of matching objects. The
+          <c><anno>Continuation</anno></c> term can then be used in subsequent calls
           to <c>ets:match/1</c> to get the next chunk of matching
           objects. This is a space efficient way to work on objects in a
           table which is still faster than traversing the table object
@@ -764,16 +705,12 @@ ets:is_compiled_ms(Broken).</code>
       </desc>
     </func>
     <func>
-      <name>match(Continuation) -> {[Match],Continuation} | '$end_of_table'</name>
+      <name name="match" arity="1"/>
       <fsummary>Continues matching objects in an ETS table.</fsummary>
-      <type>
-        <v>Match = [term()]</v>
-        <v>Continuation = term()</v>
-      </type>
       <desc>
         <p>Continues a match started with <c>ets:match/3</c>. The next
           chunk of the size given in the initial <c>ets:match/3</c>
-          call is returned together with a new <c>Continuation</c>
+          call is returned together with a new <c><anno>Continuation</anno></c>
           that can be used in subsequent calls to this function.</p>
         <p><c>'$end_of_table'</c> is returned when there are no more
           objects in the table.</p>
@@ -789,15 +726,11 @@ ets:is_compiled_ms(Broken).</code>
       </desc>
     </func>
     <func>
-      <name>match_object(Tab, Pattern) -> [Object]</name>
+      <name name="match_object" arity="2"/>
       <fsummary>Match the objects in an ETS table against a pattern.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Pattern = Object = tuple()</v>
-      </type>
       <desc>
-        <p>Matches the objects in the table <c>Tab</c> against the
-          pattern <c>Pattern</c>. See <c>match/2</c> for a description
+        <p>Matches the objects in the table <c><anno>Tab</anno></c> against the
+          pattern <c><anno>Pattern</anno></c>. See <c>match/2</c> for a description
           of patterns. The function returns a list of all objects which
           match the pattern.</p>
         <p>If the key is specified in the pattern, the match is very
@@ -809,18 +742,12 @@ ets:is_compiled_ms(Broken).</code>
       </desc>
     </func>
     <func>
-      <name>match_object(Tab, Pattern, Limit) -> {[Match],Continuation} | '$end_of_table'</name>
+      <name name="match_object" arity="3"/>
       <fsummary>Match the objects in an ETS table against a pattern and returns part of the answers.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Pattern = tuple()</v>
-        <v>Match = [term()]</v>
-        <v>Continuation = term()</v>
-      </type>
       <desc>
         <p>Works like <c>ets:match_object/2</c> but only returns a
-          limited (<c>Limit</c>) number of matching objects. The
-          <c>Continuation</c> term can then be used in subsequent calls
+          limited (<c><anno>Limit</anno></c>) number of matching objects. The
+          <c><anno>Continuation</anno></c> term can then be used in subsequent calls
           to <c>ets:match_object/1</c> to get the next chunk of matching
           objects. This is a space efficient way to work on objects in a
           table which is still faster than traversing the table object
@@ -829,29 +756,21 @@ ets:is_compiled_ms(Broken).</code>
       </desc>
     </func>
     <func>
-      <name>match_object(Continuation) -> {[Match],Continuation} | '$end_of_table'</name>
+      <name name="match_object" arity="1"/>
       <fsummary>Continues matching objects in an ETS table.</fsummary>
-      <type>
-        <v>Match = [term()]</v>
-        <v>Continuation = term()</v>
-      </type>
       <desc>
         <p>Continues a match started with <c>ets:match_object/3</c>.
           The next chunk of the size given in the initial
           <c>ets:match_object/3</c> call is returned together with a
-          new <c>Continuation</c> that can be used in subsequent calls
+          new <c><anno>Continuation</anno></c> that can be used in subsequent calls
           to this function.</p>
         <p><c>'$end_of_table'</c> is returned when there are no more
           objects in the table.</p>
       </desc>
     </func>
     <func>
-      <name>match_spec_compile(MatchSpec) -> CompiledMatchSpec</name>
+      <name name="match_spec_compile" arity="1"/>
       <fsummary>Compiles a match specification into its internal representation</fsummary>
-      <type>
-        <v>MatchSpec = match_spec()</v>
-        <v>CompiledMatchSpec = comp_match_spec()</v>
-      </type>
       <desc>
         <p>This function transforms a
           <seealso marker="#match_spec">match_spec</seealso> into an
@@ -863,7 +782,7 @@ ets:is_compiled_ms(Broken).</code>
           valid compiled match_spec, nor can it be stored on disk).
           The validity of a compiled match_spec can be checked using
           <c>ets:is_compiled_ms/1</c>.</p>
-        <p>If the term <c>MatchSpec</c> can not be compiled (does not
+        <p>If the term <c><anno>MatchSpec</anno></c> can not be compiled (does not
           represent a valid match_spec), a <c>badarg</c> fault is
           thrown.</p>
         <note>
@@ -873,25 +792,21 @@ ets:is_compiled_ms(Broken).</code>
       </desc>
     </func>
     <func>
-      <name>match_spec_run(List,CompiledMatchSpec) -> list()</name>
+      <name name="match_spec_run" arity="2"/>
       <fsummary>Performs matching, using a compiled match_spec, on a list of tuples</fsummary>
-      <type>
-        <v>List = [ tuple() ]</v>
-        <v>CompiledMatchSpec = comp_match_spec()</v>
-      </type>
       <desc>
         <p>This function executes the matching specified in a
           compiled <seealso marker="#match_spec">match_spec</seealso> on
-          a list of tuples. The <c>CompiledMatchSpec</c> term should be
+          a list of tuples. The <c><anno>CompiledMatchSpec</anno></c> term should be
           the result of a call to <c>ets:match_spec_compile/1</c> and
           is hence the internal representation of the match_spec one
           wants to use.</p>
-        <p>The matching will be executed on each element in <c>List</c>
+        <p>The matching will be executed on each element in <c><anno>List</anno></c>
           and the function returns a list containing all results. If an
-          element in <c>List</c> does not match, nothing is returned
+          element in <c><anno>List</anno></c> does not match, nothing is returned
           for that element. The length of the result list is therefore
           equal or less than the the length of the parameter
-          <c>List</c>. The two calls in the following example will give
+          <c><anno>List</anno></c>. The two calls in the following example will give
           the same result (but certainly not the same execution
           time...):</p>
         <code type="none">
@@ -910,37 +825,23 @@ ets:select(Table,MatchSpec),</code>
       </desc>
     </func>
     <func>
-      <name>member(Tab, Key) -> true | false</name>
+      <name name="member" arity="2"/>
       <fsummary>Tests for occurrence of a key in an ETS table</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Key = term()</v>
-      </type>
       <desc>
         <p>Works like <c>lookup/2</c>, but does not return the objects.
           The function returns <c>true</c> if one or more elements in
-          the table has the key <c>Key</c>, <c>false</c> otherwise.</p>
+          the table has the key <c><anno>Key</anno></c>, <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>new(Name, Options) -> tid() | atom()</name>
+      <name name="new" arity="2"/>
       <fsummary>Create a new ETS table.</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>Options = [Option]</v>
-        <v>&nbsp;Option = Type | Access | named_table | {keypos,Pos} | {heir,pid(),HeirData} | {heir,none} | Tweaks</v>
-        <v>&nbsp;&nbsp;Type = set | ordered_set | bag | duplicate_bag</v>
-        <v>&nbsp;&nbsp;Access = public | protected | private</v>
-        <v>&nbsp;&nbsp;Tweaks = {write_concurrency,boolean()} | {read_concurrency,boolean()} | compressed</v>
-        <v>&nbsp;&nbsp;Pos = integer()</v>
-        <v>&nbsp;&nbsp;HeirData = term()</v>
-      </type>
       <desc>
         <p>Creates a new table and returns a table identifier which can
           be used in subsequent operations. The table identifier can be
           sent to other processes so that a table can be shared between
           different processes within a node.</p>
-        <p>The parameter <c>Options</c> is a list of atoms which
+        <p>The parameter <c><anno>Options</anno></c> is a list of atoms which
           specifies table type, access rights, key position and if the
           table is named or not. If one or more options are left out,
           the default values are used. This means that not specifying
@@ -997,27 +898,27 @@ ets:select(Table,MatchSpec),</code>
           </item>
           <item>
             <p><c>named_table</c>
-              If this option is present, the name <c>Name</c> is
+              If this option is present, the name <c><anno>Name</anno></c> is
               associated with the table identifier. The name can then
               be used instead of the table identifier in subsequent
               operations.</p>
           </item>
           <item>
-            <p><c>{keypos,Pos}</c>
+            <p><c>{keypos,<anno>Pos</anno>}</c>
               Specfies which element in the stored tuples should be
               used as key. By default, it is the first element, i.e.
-              <c>Pos=1</c>. However, this is not always appropriate. In
+              <c><anno>Pos</anno>=1</c>. However, this is not always appropriate. In
               particular, we do not want the first element to be the
               key if we want to store Erlang records in a table.</p>
             <p>Note that any tuple stored in the table must have at
-              least <c>Pos</c> number of elements.</p>
+              least <c><anno>Pos</anno></c> number of elements.</p>
           </item>
           <item>
             <marker id="heir"></marker>
-            <p><c>{heir,Pid,HeirData} | {heir,none}</c><br></br>
+            <p><c>{heir,<anno>Pid</anno>,<anno>HeirData</anno>} | {heir,none}</c><br></br>
               Set a process as heir. The heir will inherit the table if
               the owner terminates. The message
-              <c>{'ETS-TRANSFER',tid(),FromPid,HeirData}</c> will be sent to
+              <c>{'ETS-TRANSFER',tid(),FromPid,<anno>HeirData</anno>}</c> will be sent to
               the heir when that happens. The heir must be a local process.
               Default heir is <c>none</c>, which will destroy the table when
               the owner terminates.</p>
@@ -1082,15 +983,11 @@ ets:select(Table,MatchSpec),</code>
       </desc>
     </func>
     <func>
-      <name>next(Tab, Key1) -> Key2 | '$end_of_table'</name>
+      <name name="next" arity="2"/>
       <fsummary>Return the next key in an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Key1 = Key2 = term()</v>
-      </type>
       <desc>
-        <p>Returns the next key <c>Key2</c>, following the key
-          <c>Key1</c> in the table <c>Tab</c>. If the table is of the
+        <p>Returns the next key <c><anno>Key2</anno></c>, following the key
+          <c><anno>Key1</anno></c> in the table <c><anno>Tab</anno></c>. If the table is of the
           <c>ordered_set</c> type, the next key in Erlang term order is
           returned. If the table is of any other type, the next key
           according to the table's internal order is returned. If there
@@ -1105,16 +1002,12 @@ ets:select(Table,MatchSpec),</code>
       </desc>
     </func>
     <func>
-      <name>prev(Tab, Key1) -> Key2 | '$end_of_table'</name>
+      <name name="prev" arity="2"/>
       <fsummary>Return the previous key in an ETS table of type<c>ordered_set</c>.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Key1 = Key2 = term()</v>
-      </type>
       <desc>
-        <p>Returns the previous key <c>Key2</c>, preceding the key
-          <c>Key1</c> according the Erlang term order in the table
-          <c>Tab</c> of the <c>ordered_set</c> type. If the table is of
+        <p>Returns the previous key <c><anno>Key2</anno></c>, preceding the key
+          <c><anno>Key1</anno></c> according the Erlang term order in the table
+          <c><anno>Tab</anno></c> of the <c>ordered_set</c> type. If the table is of
           any other type, the function is synonymous to <c>next/2</c>.
           If there is no previous key, <c>'$end_of_table'</c> is
           returned.</p>
@@ -1122,14 +1015,11 @@ ets:select(Table,MatchSpec),</code>
       </desc>
     </func>
     <func>
-      <name>rename(Tab, Name) -> Name</name>
+      <name name="rename" arity="2"/>
       <fsummary>Rename a named ETS table.</fsummary>
-      <type>
-        <v>Tab = Name = atom()</v>
-      </type>
       <desc>
-        <p>Renames the named table <c>Tab</c> to the new name
-          <c>Name</c>. Afterwards, the old name can not be used to
+        <p>Renames the named table <c><anno>Tab</anno></c> to the new name
+          <c><anno>Name</anno></c>. Afterwards, the old name can not be used to
           access the table. Renaming an unnamed table has no effect.</p>
       </desc>
     </func>
@@ -1186,18 +1076,15 @@ ets:select(ets:repair_continuation(Broken,MS)).</code>
       </desc>
     </func>
     <func>
-      <name>safe_fixtable(Tab, true|false) -> true</name>
+      <name name="safe_fixtable" arity="2"/>
       <fsummary>Fix an ETS table for safe traversal.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-      </type>
       <desc>
         <p>Fixes a table of the <c>set</c>, <c>bag</c> or
           <c>duplicate_bag</c> table type for safe traversal.</p>
         <p>A process fixes a table by calling
-          <c>safe_fixtable(Tab,true)</c>. The table remains fixed until
+          <c>safe_fixtable(<anno>Tab</anno>, true)</c>. The table remains fixed until
           the process releases it by calling
-          <c>safe_fixtable(Tab,false)</c>, or until the process
+          <c>safe_fixtable(<anno>Tab</anno>, false)</c>, or until the process
           terminates.</p>
         <p>If several processes fix a table, the table will remain fixed
           until all processes have released it (or terminated).
@@ -1242,15 +1129,10 @@ clean_all_with_value(Tab,X,Key) ->
       </desc>
     </func>
     <func>
-      <name>select(Tab, MatchSpec) -> [Match]</name>
+      <name name="select" arity="2"/>
       <fsummary>Match the objects in an ETS table against a match_spec.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Match = term()</v>
-        <v>MatchSpec = match_spec()</v>
-      </type>
       <desc>
-        <p>Matches the objects in the table <c>Tab</c> using a
+        <p>Matches the objects in the table <c><anno>Tab</anno></c> using a
           <seealso marker="#match_spec">match_spec</seealso>. This is a
           more general call than the <c>ets:match/2</c> and
           <c>ets:match_object/2</c> calls. In its simplest forms the
@@ -1337,18 +1219,12 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       </desc>
     </func>
     <func>
-      <name>select(Tab, MatchSpec, Limit) -> {[Match],Continuation} | '$end_of_table'</name>
+      <name name="select" arity="3"/>
       <fsummary>Match the objects in an ETS table against a match_spec and returns part of the answers.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Match = term()</v>
-        <v>MatchSpec = match_spec()</v>
-        <v>Continuation = term()</v>
-      </type>
       <desc>
         <p>Works like <c>ets:select/2</c> but only returns a limited
-          (<c>Limit</c>) number of matching objects. The
-          <c>Continuation</c> term can then be used in subsequent calls
+          (<c><anno>Limit</anno></c>) number of matching objects. The
+          <c><anno>Continuation</anno></c> term can then be used in subsequent calls
           to <c>ets:select/1</c> to get the next chunk of matching
           objects. This is a space efficient way to work on objects in a
           table which is still faster than traversing the table object
@@ -1357,33 +1233,23 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       </desc>
     </func>
     <func>
-      <name>select(Continuation) -> {[Match],Continuation} | '$end_of_table'</name>
+      <name name="select" arity="1"/>
       <fsummary>Continue matching objects in an ETS table.</fsummary>
-      <type>
-        <v>Match = term()</v>
-        <v>Continuation = term()</v>
-      </type>
       <desc>
         <p>Continues a match started with
           <c>ets:select/3</c>. The next
           chunk of the size given in the initial <c>ets:select/3</c>
-          call is returned together with a new <c>Continuation</c>
+          call is returned together with a new <c><anno>Continuation</anno></c>
           that can be used in subsequent calls to this function.</p>
         <p><c>'$end_of_table'</c> is returned when there are no more
           objects in the table.</p>
       </desc>
     </func>
     <func>
-      <name>select_count(Tab, MatchSpec) -> NumMatched</name>
+      <name name="select_count" arity="2"/>
       <fsummary>Match the objects in an ETS table against a match_spec and returns the number of objects for which the match_spec returned 'true'</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Object = tuple()</v>
-        <v>MatchSpec = match_spec()</v>
-        <v>NumMatched = integer()</v>
-      </type>
       <desc>
-        <p>Matches the objects in the table <c>Tab</c> using a
+        <p>Matches the objects in the table <c><anno>Tab</anno></c> using a
           <seealso marker="#match_spec">match_spec</seealso>. If the
           match_spec returns <c>true</c> for an object, that object
           considered a match and is counted. For any other result from
@@ -1396,16 +1262,10 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       </desc>
     </func>
     <func>
-      <name>select_delete(Tab, MatchSpec) -> NumDeleted</name>
+      <name name="select_delete" arity="2"/>
       <fsummary>Match the objects in an ETS table against a match_spec and deletes objects where the match_spec returns 'true'</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Object = tuple()</v>
-        <v>MatchSpec = match_spec()</v>
-        <v>NumDeleted = integer()</v>
-      </type>
       <desc>
-        <p>Matches the objects in the table <c>Tab</c> using a
+        <p>Matches the objects in the table <c><anno>Tab</anno></c> using a
           <seealso marker="#match_spec">match_spec</seealso>. If the
           match_spec returns <c>true</c> for an object, that object is
           removed from the table. For any other result from the
@@ -1422,13 +1282,8 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       </desc>
     </func>
     <func>
-      <name>select_reverse(Tab, MatchSpec) -> [Match]</name>
+      <name name="select_reverse" arity="2"/>
       <fsummary>Match the objects in an ETS table against a match_spec.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Match = term()</v>
-        <v>MatchSpec = match_spec()</v>
-      </type>
       <desc>
 
       <p>Works like <c>select/2</c>, but returns the list in reverse
@@ -1438,14 +1293,8 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       </desc>
     </func>
     <func>
-      <name>select_reverse(Tab, MatchSpec, Limit) -> {[Match],Continuation} | '$end_of_table'</name>
+      <name name="select_reverse" arity="3"/>
       <fsummary>Match the objects in an ETS table against a match_spec and returns part of the answers.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Match = term()</v>
-        <v>MatchSpec = match_spec()</v>
-        <v>Continuation = term()</v>
-      </type>
       <desc>
 
       <p>Works like <c>select/3</c>, but for the <c>ordered_set</c>
@@ -1456,18 +1305,14 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
 
       <p>Note that this is <em>not</em> equivalent to
       reversing the result list of a <c>select/3</c> call, as the result list
-      is not only reversed, but also contains the last <c>Limit</c>
+      is not only reversed, but also contains the last <c><anno>Limit</anno></c>
       matching objects in the table, not the first.</p>
 
       </desc>
     </func>
     <func>
-      <name>select_reverse(Continuation) -> {[Match],Continuation} | '$end_of_table'</name>
+      <name name="select_reverse" arity="1"/>
       <fsummary>Continue matching objects in an ETS table.</fsummary>
-      <type>
-        <v>Match = term()</v>
-        <v>Continuation = term()</v>
-      </type>
       <desc>
 
       <p>Continues a match started with
@@ -1477,7 +1322,7 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       returned list will also contain objects with keys in reverse
       order.</p>
 
-      <p>For all other table types, the behaviour is exatly that of <c>select/1</c>.</p>
+      <p>For all other table types, the behaviour is exactly that of <c>select/1</c>.</p>
       <p>Example:</p>
       <code>
 1> T = ets:new(x,[ordered_set]).
@@ -1501,14 +1346,8 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       </desc>
     </func>
     <func>
-      <name>setopts(Tab, Opts) -> true</name>
+      <name name="setopts" arity="2"/>
       <fsummary>Set table options.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Opts = Opt | [Opt]</v>
-        <v>Opt = {heir,pid(),HeirData} | {heir,none}</v>
-        <v>HeirData = term()</v>
-      </type>
       <desc>
         <p>Set table options. The only option that currently is allowed to be
           set after the table has been created is
@@ -1517,28 +1356,23 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       </desc>
     </func>
     <func>
-      <name>slot(Tab, I) -> [Object] | '$end_of_table'</name>
+      <name name="slot" arity="2"/>
       <fsummary>Return all objects in a given slot of an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>I = integer()</v>
-        <v>Object = tuple()</v>
-      </type>
       <desc>
         <p>This function is mostly for debugging purposes, Normally
           one should use <c>first/next</c> or <c>last/prev</c> instead.</p>
-        <p>Returns all objects in the <c>I</c>:th slot of the table
-          <c>Tab</c>. A table can be traversed by repeatedly calling
-          the function, starting with the first slot <c>I=0</c> and
+        <p>Returns all objects in the <c><anno>I</anno></c>:th slot of the table
+          <c><anno>Tab</anno></c>. A table can be traversed by repeatedly calling
+          the function, starting with the first slot <c><anno>I</anno>=0</c> and
           ending when <c>'$end_of_table'</c> is returned.
           The function will fail with reason <c>badarg</c> if the
-          <c>I</c> argument is out of range.</p>
+          <c><anno>I</anno></c> argument is out of range.</p>
         <p>Unless a table of type <c>set</c>, <c>bag</c> or
           <c>duplicate_bag</c> is protected using
           <c>safe_fixtable/2</c>, see above, a traversal may fail if
           concurrent updates are made to the table. If the table is of
           type <c>ordered_set</c>, the function returns a list
-          containing the <c>I</c>:th object in Erlang term order.</p>
+          containing the <c><anno>I</anno></c>:th object in Erlang term order.</p>
       </desc>
     </func>
     <func>
@@ -1754,16 +1588,16 @@ true</pre>
       </desc>
     </func>
     <func> 
-      <name>update_counter(Tab, Key, UpdateOp) -> Result</name>
-      <name>update_counter(Tab, Key, [UpdateOp]) -> [Result]</name>
-      <name>update_counter(Tab, Key, Incr) -> Result</name>
+      <name name="update_counter" arity="3" clause_i="1"/>
+      <name name="update_counter" arity="3" clause_i="2"/>
+      <name name="update_counter" arity="3" clause_i="3"/>
+      <type variable="Tab"/>
+      <type variable="Key"/>
+      <type variable="UpdateOp" name_i="1"/>
+      <type variable="Pos" name_i="1"/>
+      <type variable="Threshold" name_i="1"/>
+      <type variable="SetValue" name_i="1"/>
       <fsummary>Update a counter object in an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Key = term()</v> 
-        <v>UpdateOp = {Pos,Incr} | {Pos,Incr,Threshold,SetValue}</v>
-        <v>Pos = Incr = Threshold = SetValue = Result = integer()</v>
-      </type>
       <desc>
         <p>This function provides an efficient way to update one or more 
           counters, without the hassle of having to look up an object, update 
@@ -1771,22 +1605,22 @@ true</pre>
           into the table again. (The update is done atomically; i.e. no process 
           can access the ets table in the middle of the operation.)
         </p>
-        <p>It will destructively update the object with key <c>Key</c>
-          in the table <c>Tab</c> by adding <c>Incr</c> to the element
-          at the <c>Pos</c>:th position. The new counter value is
+        <p>It will destructively update the object with key <c><anno>Key</anno></c>
+          in the table <c><anno>Tab</anno></c> by adding <c><anno>Incr</anno></c> to the element
+          at the <c><anno>Pos</anno></c>:th position. The new counter value is
           returned. If no position is specified, the element directly
           following the key (<c><![CDATA[<keypos>+1]]></c>) is updated.</p>
-        <p>If a <c>Threshold</c> is specified, the counter will be
-          reset to the value <c>SetValue</c> if the following
+        <p>If a <c><anno>Threshold</anno></c> is specified, the counter will be
+          reset to the value <c><anno>SetValue</anno></c> if the following
           conditions occur:</p>
         <list type="bulleted">
-          <item>The <c>Incr</c> is not negative (<c>>= 0</c>) and the
-           result would be greater than (<c>></c>) <c>Threshold</c></item>
-          <item>The <c>Incr</c> is negative (<c><![CDATA[< 0]]></c>) and the
+          <item>The <c><anno>Incr</anno></c> is not negative (<c>>= 0</c>) and the
+           result would be greater than (<c>></c>) <c><anno>Threshold</anno></c></item>
+          <item>The <c><anno>Incr</anno></c> is negative (<c><![CDATA[< 0]]></c>) and the
            result would be less than (<c><![CDATA[<]]></c>)
-          <c>Threshold</c></item>
+          <c><anno>Threshold</anno></c></item>
         </list>
-        <p>A list of <c>UpdateOp</c> can be supplied to do several update 
+        <p>A list of <c><anno>UpdateOp</anno></c> can be supplied to do several update
             operations within the object. The operations are carried out in the
             order specified in the list. If the same counter position occurs 
             more than one time in the list, the corresponding counter will thus 
@@ -1797,7 +1631,7 @@ true</pre>
             returned. If the function should fail, no updates will be done at 
             all.
         </p>
-        <p>The given Key is used to identify the object by either
+        <p>The given <c><anno>Key</anno></c> is used to identify the object by either
           <em>matching</em> the key of an object in a <c>set</c> table,
           or <em>compare equal</em> to the key of an object in an
           <c>ordered_set</c> table (see 
@@ -1812,29 +1646,28 @@ true</pre>
           <item>the object has the wrong arity,</item>
           <item>the element to update is not an integer,</item>
           <item>the element to update is also the key, or,</item>
-          <item>any of <c>Pos</c>, <c>Incr</c>, <c>Threshold</c> or
-          <c>SetValue</c> is not an integer</item>
+          <item>any of <c><anno>Pos</anno></c>, <c><anno>Incr</anno></c>, <c><anno>Threshold</anno></c> or
+          <c><anno>SetValue</anno></c> is not an integer</item>
         </list>
       </desc>
     </func>
     <func>
-      <name>update_element(Tab, Key, {Pos,Value}) -> true | false</name>
-      <name>update_element(Tab, Key, [{Pos,Value}]) -> true | false</name>
+      <name name="update_element" arity="3" clause_i="1"/>
+      <name name="update_element" arity="3" clause_i="2"/>
+      <type variable="Tab"/>
+      <type variable="Key"/>
+      <type variable="Value"/>
+      <type variable="Pos"/>
       <fsummary>Updates the <c>Pos</c>:th element of the object with a given key in an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Key = Value = term()</v>
-        <v>Pos = integer()</v>
-      </type>
       <desc>
         <p>This function provides an efficient way to update one or more 
           elements within an object, without the hassle of having to look up, 
           update and write back the entire object.
         </p>
-        <p>It will destructively update the object with key <c>Key</c>
-          in the table <c>Tab</c>. The element at the <c>Pos</c>:th position 
-          will be given the value <c>Value</c>. </p>
-        <p>A list of <c>{Pos,Value}</c> can be supplied to update several
+        <p>It will destructively update the object with key <c><anno>Key</anno></c>
+          in the table <c><anno>Tab</anno></c>. The element at the <c><anno>Pos</anno></c>:th position
+          will be given the value <c><anno>Value</anno></c>. </p>
+        <p>A list of <c>{<anno>Pos</anno>,<anno>Value</anno>}</c> can be supplied to update several
             elements within the same object. If the same position occurs more 
             than one in the list, the last value in the list will be written. If 
             the list is empty or the function fails, no updates will be done at
@@ -1842,9 +1675,9 @@ true</pre>
             can never see any intermediate results.
         </p>
         <p>The function returns <c>true</c> if an object with the key
-        <c>Key</c> was found, <c>false</c> otherwise.
+        <c><anno>Key</anno></c> was found, <c>false</c> otherwise.
         </p>
-        <p>The given Key is used to identify the object by either
+        <p>The given <c><anno>Key</anno></c> is used to identify the object by either
           <em>matching</em> the key of an object in a <c>set</c> table,
           or <em>compare equal</em> to the key of an object in an
           <c>ordered_set</c> table (see 
@@ -1855,7 +1688,7 @@ true</pre>
         <list type="bulleted">
           <item>the table is not of type <c>set</c> or
           <c>ordered_set</c>,</item> 
-          <item><c>Pos</c> is less than 1 or greater than the object
+          <item><c><anno>Pos</anno></c> is less than 1 or greater than the object
           arity, or,</item>
           <item>the element to update is also the key</item>
         </list>
diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml
index f3079c7337..cec20aee8e 100644
--- a/lib/stdlib/doc/src/filelib.xml
+++ b/lib/stdlib/doc/src/filelib.xml
@@ -150,6 +150,11 @@
             <p>Matches any number of characters up to the end of
               the filename, the next dot, or the next slash.</p>
           </item>
+          <tag>**</tag>
+          <item>
+            <p>Two adjacent <c>*</c>'s used as a single pattern will
+        match all files and zero or more directories and subdirectories.</p>
+          </item>
           <tag>[Character1,Character2,...]</tag>
           <item>
             <p>Matches any of the characters listed. Two characters
@@ -192,6 +197,10 @@
           <c>src</c> or <c>include</c> directories, use:</p>
         <code type="none">
     filelib:wildcard("lib/*/{src,include}/*.{erl,hrl}")        </code>
+        <p>To find all <c>.erl</c> or <c>.hrl</c> files in any
+          subdirectory, use:</p>
+        <code type="none">
+    filelib:wildcard("lib/**/*.{erl,hrl}")        </code>
       </desc>
     </func>
     <func>
diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml
index 8b31f3ac3d..b6c0fa4e05 100644
--- a/lib/stdlib/doc/src/lists.xml
+++ b/lib/stdlib/doc/src/lists.xml
@@ -248,18 +248,13 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>keyfind(Key, N, TupleList) -> Tuple | false</name>
+      <name name="keyfind" arity="3"/>
+      <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <fsummary>Search for an element in a list of tuples</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>N = 1..tuple_size(Tuple)</v>
-        <v>TupleList = [Tuple]</v>
-        <v>Tuple = tuple()</v>
-      </type>
-      <desc>
-        <p>Searches the list of tuples <c>TupleList</c> for a
-          tuple whose <c>N</c>th element compares equal to <c>Key</c>.
-          Returns <c>Tuple</c> if such a tuple is found,
+      <desc>
+        <p>Searches the list of tuples <c><anno>TupleList</anno></c> for a
+          tuple whose <c><anno>N</anno></c>th element compares equal to <c><anno>Key</anno></c>.
+          Returns <c><anno>Tuple</anno></c> if such a tuple is found,
           otherwise <c>false</c>.</p>
       </desc>
     </func>
@@ -281,17 +276,12 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>keymember(Key, N, TupleList) -> boolean()</name>
+      <name name="keymember" arity="3"/>
+      <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <fsummary>Test for membership of a list of tuples</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>N = 1..tuple_size(Tuple)</v>
-        <v>TupleList = [Tuple]</v>
-        <v>&nbsp;Tuple = tuple()</v>
-      </type>
-      <desc>
-        <p>Returns <c>true</c> if there is a tuple in <c>TupleList</c>
-          whose <c>N</c>th element compares equal to <c>Key</c>, otherwise
+      <desc>
+        <p>Returns <c>true</c> if there is a tuple in <c><anno>TupleList</anno></c>
+          whose <c><anno>N</anno></c>th element compares equal to <c><anno>Key</anno></c>, otherwise
           <c>false</c>.</p>
       </desc>
     </func>
@@ -321,18 +311,13 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>keysearch(Key, N, TupleList) -> {value, Tuple} | false</name>
+      <name name="keysearch" arity="3"/>
+      <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <fsummary>Search for an element in a list of tuples</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>N = 1..tuple_size(Tuple)</v>
-        <v>TupleList = [Tuple]</v>
-        <v>Tuple = tuple()</v>
-      </type>
-      <desc>
-        <p>Searches the list of tuples <c>TupleList</c> for a
-          tuple whose <c>N</c>th element compares equal to <c>Key</c>.
-          Returns <c>{value, Tuple}</c> if such a tuple is found,
+      <desc>
+        <p>Searches the list of tuples <c><anno>TupleList</anno></c> for a
+          tuple whose <c><anno>N</anno></c>th element compares equal to <c><anno>Key</anno></c>.
+          Returns <c>{value, <anno>Tuple</anno>}</c> if such a tuple is found,
           otherwise <c>false</c>.</p>
       <note><p>This function is retained for backward compatibility.
       The function <c>lists:keyfind/3</c> (introduced in R13A)
@@ -425,15 +410,11 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>member(Elem, List) -> boolean()</name>
+      <name name="member" arity="2"/>
       <fsummary>Test for membership of a list</fsummary>
-      <type>
-        <v>Elem = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Elem</c> matches some element of
-          <c>List</c>, otherwise <c>false</c>.</p>
+        <p>Returns <c>true</c> if <c><anno>Elem</anno></c> matches some element of
+          <c><anno>List</anno></c>, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
@@ -562,14 +543,11 @@ c</pre>
       </desc>
     </func>
     <func>
-      <name>reverse(List1, Tail) -> List2</name>
+      <name name="reverse" arity="2"/>
       <fsummary>Reverse a list appending a tail</fsummary>
-      <type>
-        <v>List1 = Tail = List2 = [term()]</v>
-      </type>
       <desc>
-        <p>Returns a list with the elements in <c>List1</c>
-          in reverse order, with the tail <c>Tail</c> appended. For
+        <p>Returns a list with the elements in <c><anno>List1</anno></c>
+          in reverse order, with the tail <c><anno>Tail</anno></c> appended. For
           example:</p>
         <pre>
 > <input>lists:reverse([1, 2, 3, 4], [a, b, c]).</input>
diff --git a/lib/stdlib/doc/src/math.xml b/lib/stdlib/doc/src/math.xml
index 518457d5d8..0219dcce10 100644
--- a/lib/stdlib/doc/src/math.xml
+++ b/lib/stdlib/doc/src/math.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -52,54 +52,47 @@
       </desc>
     </func>
     <func>
-      <name>sin(X)</name>
-      <name>cos(X)</name>
-      <name>tan(X)</name>
-      <name>asin(X)</name>
-      <name>acos(X)</name>
-      <name>atan(X)</name>
-      <name>atan2(Y, X)</name>
-      <name>sinh(X)</name>
-      <name>cosh(X)</name>
-      <name>tanh(X)</name>
-      <name>asinh(X)</name>
-      <name>acosh(X)</name>
-      <name>atanh(X)</name>
-      <name>exp(X)</name>
-      <name>log(X)</name>
-      <name>log10(X)</name>
-      <name>pow(X, Y)</name>
-      <name>sqrt(X)</name>
+      <name name="sin" arity="1"/>
+      <name name="cos" arity="1"/>
+      <name name="tan" arity="1"/>
+      <name name="asin" arity="1"/>
+      <name name="acos" arity="1"/>
+      <name name="atan" arity="1"/>
+      <name name="atan2" arity="2"/>
+      <name name="sinh" arity="1"/>
+      <name name="cosh" arity="1"/>
+      <name name="tanh" arity="1"/>
+      <name name="asinh" arity="1"/>
+      <name name="acosh" arity="1"/>
+      <name name="atanh" arity="1"/>
+      <name name="exp" arity="1"/>
+      <name name="log" arity="1"/>
+      <name name="log10" arity="1"/>
+      <name name="pow" arity="2"/>
+      <name name="sqrt" arity="1"/>
+      <type variable="X" name_i="7"/>
+      <type variable="Y" name_i="7"/>
       <fsummary>Diverse math functions</fsummary>
-      <type>
-        <v>X = Y = number()</v>
-      </type>
       <desc>
         <p>A collection of math functions which return floats. Arguments
           are numbers. </p>
       </desc>
     </func>
     <func>
-      <name>erf(X) -> float()</name>
+      <name name="erf" arity="1"/>
       <fsummary>Error function.</fsummary>
-      <type>
-        <v>X = number()</v>
-      </type>
       <desc>
-        <p>Returns the error function of <c>X</c>, where</p>
+        <p>Returns the error function of <c><anno>X</anno></c>, where</p>
         <pre>
 erf(X) = 2/sqrt(pi)*integral from 0 to X of exp(-t*t) dt.        </pre>
       </desc>
     </func>
     <func>
-      <name>erfc(X) -> float()</name>
+      <name name="erfc" arity="1"/>
       <fsummary>Another error function</fsummary>
-      <type>
-        <v>X = number()</v>
-      </type>
       <desc>
         <p><c>erfc(X)</c> returns  <c>1.0 - erf(X)</c>, computed  by
-          methods that avoid cancellation for large <c>X</c>. </p>
+          methods that avoid cancellation for large <c><anno>X</anno></c>. </p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 4834426d5c..2a308cbe09 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,6 +30,99 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 1.18.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Minor test updates</p>
+          <p>
+	    Own Id: OTP-10591</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 1.18.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed bug where if given an invalid drive letter on
+	    windows ensure dir would go into an infinite loop.</p>
+          <p>
+	    Own Id: OTP-10104</p>
+        </item>
+        <item>
+          <p>
+	    Calls to gen_server:enter_loop/4 where ServerName has a
+	    global scope and no timeout is given now works correctly.</p>
+          <p>
+	    Thanks to Sam Bobroff for reporting the issue.</p>
+          <p>
+	    Own Id: OTP-10130</p>
+        </item>
+        <item>
+          <p>
+	    fix escript/primary archive reloading</p>
+          <p>
+	    If the mtime of an escript/primary archive file changes
+	    after being added to the code path, correctly reload the
+	    archive and update the cache. (Thanks to Tuncer Ayaz)</p>
+          <p>
+	    Own Id: OTP-10151</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug that in some cases could cause corrupted binaries
+	    in ETS tables with <c>compressed</c> option.</p>
+          <p>
+	    Own Id: OTP-10182</p>
+        </item>
+        <item>
+          <p>
+	    Fix filename:nativename/1 on Win32</p>
+          <p>
+	    Don't choke on paths given as binary argument on Win32.
+	    Thanks to Jan Kl�tzke</p>
+          <p>
+	    Own Id: OTP-10188</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug in <c>ets:test_ms/2</c> that could cause emulator
+	    crash when using <c>'$_'</c> in match spec.</p>
+          <p>
+	    Own Id: OTP-10190</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug where zip archives wrongly have a first disk
+	    number set to 1</p>
+          <p>
+	    Own Id: OTP-10223</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> The message printed by the Erlang shell as an
+	    explanation of the <c>badarith</c> error has been
+	    corrected. (Thanks to Matthias Lang.) </p>
+          <p>
+	    Own Id: OTP-10054</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 1.18.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml
index 6d5336796c..2211bfb925 100644
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2007</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -78,28 +78,15 @@
   </datatypes>
   <funcs>
     <func>
-      <name>compile(Regexp) -> {ok, MP} | {error, ErrSpec}</name>
+      <name name="compile" arity="1"/>
       <fsummary>Compile a regular expression into a match program</fsummary>
-      <type>
-        <v>Regexp = iodata()</v>
-      </type>
       <desc>
-      <p>The same as <c>compile(Regexp,[])</c></p>
+      <p>The same as <c>compile(<anno>Regexp</anno>,[])</c></p>
       </desc>
     </func> 
     <func>
-      <name>compile(Regexp,Options) -> {ok, MP} | {error, ErrSpec}</name>
+      <name name="compile" arity="2"/>
       <fsummary>Compile a regular expression into a match program</fsummary>
-      <type>
-        <v>Regexp = iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v>
-	<v>Options = [ Option ]</v>
-	<v>Option = <seealso marker="#type-compile_option">compile_option()</seealso></v>
-	<v>NLSpec = <seealso marker="#type-nl_spec">nl_spec()</seealso></v>
-	<v>MP = <seealso marker="#type-mp">mp()</seealso></v>
-	<v>ErrSpec = {ErrString, Position}</v>
-	<v>ErrString = string()</v>
-	<v>Position = non_neg_integer()</v>
-      </type>
       <desc>
       <p>This function compiles a regular expression with the syntax
       described below into an internal format to be used later as a
@@ -165,44 +152,23 @@ This option makes it possible to include comments inside complicated patterns. N
     </func> 
 
     <func>
-      <name>run(Subject,RE) -> {match, Captured} | nomatch</name>
+      <name name="run" arity="2"/>
       <fsummary>Match a subject against regular expression and capture subpatterns</fsummary>
-      <type>
-	<v>Subject = iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v>
-        <v>RE = <seealso marker="#type-mp">mp()</seealso> | iodata()</v>
-	<v>Captured = [ CaptureData ]</v>
-	<v>CaptureData = {integer(),integer()}</v>
-      </type>
       <desc>
-      <p>The same as <c>run(Subject,RE,[])</c>.</p>
+      <p>The same as <c>run(<anno>Subject</anno>,<anno>RE</anno>,[])</c>.</p>
       </desc>
     </func> 
     <func>
-      <name>run(Subject,RE,Options) -> {match, Captured} | match | nomatch</name>
+      <name name="run" arity="3"/>
+      <type_desc variable="CompileOpt">See <seealso marker="#compile_options">compile/2</seealso> above.</type_desc>
       <fsummary>Match a subject against regular expression and capture subpatterns</fsummary>
-      <type>
-	<v>Subject = iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v>
-        <v>RE = <seealso marker="#type-mp">mp()</seealso> | iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v>
-	<v>Options = [ Option ]</v>
-	<v>Option = anchored | global | notbol | noteol | notempty | {offset, integer() >= 0} | {newline, NLSpec} | bsr_anycrlf | bsr_unicode | {capture, ValueSpec} | {capture, ValueSpec, Type} | CompileOpt</v>
-	<v>Type = index | list | binary</v>
-	<v>ValueSpec = all | all_but_first | first | none | ValueList</v>
-	<v>ValueList = [ ValueID ]</v>
-	<v>ValueID = integer() | string() | atom()</v>
-	<v>CompileOpt = <seealso marker="#type-compile_option">compile_option()</seealso></v>
-        <d>See <seealso marker="#compile_options">compile/2</seealso> above.</d>
-	<v>NLSpec = <seealso marker="#type-nl_spec">nl_spec()</seealso></v>
-	<v>Captured = [ CaptureData ] | [ [ CaptureData ] ... ]</v>
-	<v>CaptureData = {integer(),integer()} | ListConversionData | binary()</v>
-	<v>ListConversionData = string() | {error, string(), binary()} | {incomplete, string(), binary()}</v>
-      </type>
       <desc>
 
       <p>Executes a regexp matching, returning <c>match/{match,
-      Captured}</c> or <c>nomatch</c>. The regular expression can be
+      <anno>Captured</anno>}</c> or <c>nomatch</c>. The regular expression can be
       given either as <c>iodata()</c> in which case it is
       automatically compiled (as by <c>re:compile/2</c>) and executed,
-      or as a pre compiled <c>mp()</c> in which case it is executed
+      or as a pre-compiled <c>mp()</c> in which case it is executed
       against the subject directly.</p>
 
       <p>When compilation is involved, the exception <c>badarg</c> is
@@ -214,23 +180,23 @@ This option makes it possible to include comments inside complicated patterns. N
       list can only contain the options <c>anchored</c>,
       <c>global</c>, <c>notbol</c>, <c>noteol</c>,
       <c>notempty</c>, <c>{offset, integer() >= 0}</c>, <c>{newline,
-      NLSpec}</c> and <c>{capture, ValueSpec}/{capture, ValueSpec,
-      Type}</c>.  Otherwise all options valid for the
+      <anno>NLSpec</anno>}</c> and <c>{capture, <anno>ValueSpec</anno>}/{capture, <anno>ValueSpec</anno>,
+      <anno>Type</anno>}</c>.  Otherwise all options valid for the
       <c>re:compile/2</c> function are allowed as well. Options
       allowed both for compilation and execution of a match, namely
-      <c>anchored</c> and <c>{newline, NLSpec}</c>, will affect both
+      <c>anchored</c> and <c>{newline, <anno>NLSpec</anno>}</c>, will affect both
       the compilation and execution if present together with a non
       pre-compiled regular expression.</p>
 
       <p>If the regular expression was previously compiled with the
-      option <c>unicode</c>, the <c>Subject</c> should be provided as
+      option <c>unicode</c>, the <c><anno>Subject</anno></c> should be provided as
       a valid Unicode <c>charlist()</c>, otherwise any <c>iodata()</c>
       will do. If compilation is involved and the option
-      <c>unicode</c> is given, both the <c>Subject</c> and the regular
+      <c>unicode</c> is given, both the <c><anno>Subject</anno></c> and the regular
       expression should be given as valid Unicode
       <c>charlists()</c>.</p>
 
-      <p>The <c>{capture, ValueSpec}/{capture, ValueSpec, Type}</c>
+      <p>The <c>{capture, <anno>ValueSpec</anno>}/{capture, <anno>ValueSpec</anno>, <anno>Type</anno>}</c>
       defines what to return from the function upon successful
       matching. The <c>capture</c> tuple may contain both a
       value specification telling which of the captured
@@ -244,9 +210,9 @@ This option makes it possible to include comments inside complicated patterns. N
       at all is to be done (<c>{capture, none}</c>), the function will
       return the single atom <c>match</c> upon successful matching,
       otherwise the tuple
-      <c>{match, ValueList}</c> is returned. Disabling capturing can
+      <c>{match, <anno>ValueList</anno>}</c> is returned. Disabling capturing can
       be done either by specifying <c>none</c> or an empty list as
-      <c>ValueSpec</c>.</p>
+      <c><anno>ValueSpec</anno></c>.</p>
 
       <p>The options relevant for execution are:</p>
 
@@ -266,7 +232,7 @@ This option makes it possible to include comments inside complicated patterns. N
       Perl). Each match is returned as a separate
       <c>list()</c> containing the specific match as well as any
       matching subexpressions (or as specified by the <c>capture
-      option</c>). The <c>Captured</c> part of the return value will
+      option</c>). The <c><anno>Captured</anno></c> part of the return value will
       hence be a <c>list()</c> of <c>list()</c>s when this
       option is given.</p>
 
@@ -362,7 +328,7 @@ This option makes it possible to include comments inside complicated patterns. N
       subject string. The offset is zero-based, so that the default is
       <c>{offset,0}</c> (all of the subject string).</item>
 
-      <tag><c>{newline, NLSpec}</c></tag>
+      <tag><c>{newline, <anno>NLSpec</anno>}</c></tag>
       <item>
       <p>Override the default definition of a newline in the subject string, which is LF (ASCII 10) in Erlang.</p>
       <taglist>
@@ -383,7 +349,7 @@ This option makes it possible to include comments inside complicated patterns. N
       <tag><c>bsr_unicode</c></tag>
       <item>Specifies specifically that \R is to match all the Unicode newline characters (including crlf etc, the default).(overrides compilation option)</item>
 
-      <tag><c>{capture, ValueSpec}</c>/<c>{capture, ValueSpec, Type}</c></tag>
+      <tag><c>{capture, <anno>ValueSpec</anno>}</c>/<c>{capture, <anno>ValueSpec</anno>, <anno>Type</anno>}</c></tag>
       <item>
 
       <p>Specifies which captured substrings are returned and in what
@@ -392,7 +358,7 @@ This option makes it possible to include comments inside complicated patterns. N
       substring as well as all capturing subpatterns (all of the
       pattern is automatically captured). The default return type is
       (zero-based) indexes of the captured parts of the string, given as
-      <c>{Offset,Length}</c> pairs (the <c>index</c> <c>Type</c> of
+      <c>{Offset,Length}</c> pairs (the <c>index</c> <c><anno>Type</anno></c> of
       capturing).</p>
 
       <p>As an example of the default behavior, the following call:</p>
@@ -422,8 +388,8 @@ This option makes it possible to include comments inside complicated patterns. N
 
       <p>The capture tuple is built up as follows:</p>
       <taglist>
-      <tag><c>ValueSpec</c></tag>
-      <item><p>Specifies which captured (sub)patterns are to be returned. The ValueSpec can either be an atom describing a predefined set of return values, or a list containing either the indexes or the names of specific subpatterns to return.</p>
+      <tag><c><anno>ValueSpec</anno></c></tag>
+      <item><p>Specifies which captured (sub)patterns are to be returned. The <c><anno>ValueSpec</anno></c> can either be an atom describing a predefined set of return values, or a list containing either the indexes or the names of specific subpatterns to return.</p>
       <p>The predefined sets of subpatterns are:</p>
         <taglist>
         <tag><c>all</c></tag>
@@ -437,7 +403,7 @@ This option makes it possible to include comments inside complicated patterns. N
         </taglist>
       <p>The value list is a list of indexes for the subpatterns to return, where index 0 is for all of the pattern, and 1 is for the first explicit capturing subpattern in the regular expression, and so forth. When using named captured subpatterns (see below) in the regular expression, one can use <c>atom()</c>s or <c>string()</c>s to specify the subpatterns to be returned. For example, consider the regular expression:</p>
       <code>    ".*(abcd).*"</code>
-      <p>matched against the string ""ABCabcdABC", capturing only the "abcd" part (the first explicit subpattern):</p>
+      <p>matched against the string "ABCabcdABC", capturing only the "abcd" part (the first explicit subpattern):</p>
       <code>    re:run("ABCabcdABC",".*(abcd).*",[{capture,[1]}]).</code>
       <p>The call will yield the following result:</p>
       <code>    {match,[{3,4}]}</code>
@@ -460,8 +426,8 @@ This option makes it possible to include comments inside complicated patterns. N
       or list respectively.</p>
 
       </item>      
-      <tag><c>Type</c></tag>
-      <item><p>Optionally specifies how captured substrings are to be returned. If omitted, the default of <c>index</c> is used. The <c>Type</c> can be one of the following:</p>
+      <tag><c><anno>Type</anno></c></tag>
+      <item><p>Optionally specifies how captured substrings are to be returned. If omitted, the default of <c>index</c> is used. The <c><anno>Type</anno></c> can be one of the following:</p>
         <taglist>
         <tag><c>index</c></tag> 
         <item>Return captured substrings as pairs of byte indexes into the subject string and length of the matching string in the subject (as if the subject string was flattened with <c>iolist_to_binary/1</c> or <c>unicode:characters_to_binary/2</c> prior to matching). Note that the <c>unicode</c> option results in <em>byte-oriented</em> indexes in a (possibly virtual) <em>UTF-8 encoded</em> binary. A byte index tuple <c>{0,2}</c> might therefore represent one or two characters when <c>unicode</c> is in effect. This might seem counter-intuitive, but has been deemed the most effective and useful way to way to do it. To return lists instead might result in simpler code if that is desired. This return type is the default.</item>
@@ -478,7 +444,7 @@ This option makes it possible to include comments inside complicated patterns. N
 <code>    "ABCabcdABC"</code>
       <p>the subpattern at index 2 won't match, as "abdd" is not present in the string, but the complete pattern matches (due to the alternative <c>a(..d)</c>. The subpattern at index 2 is therefore unassigned and the default return value will be:</p>
 <code>    {match,[{0,10},{3,4},{-1,0},{4,3}]}</code>
-      <p>Setting the capture <c>Type</c> to <c>binary</c> would give the following:</p>
+      <p>Setting the capture <c><anno>Type</anno></c> to <c>binary</c> would give the following:</p>
 <code>    {match,[&lt;&lt;"ABCabcdABC"&gt;&gt;,&lt;&lt;"abcd"&gt;&gt;,&lt;&lt;&gt;&gt;,&lt;&lt;"bcd"&gt;&gt;]}</code>
       <p>where the empty binary (<c>&lt;&lt;&gt;&gt;</c>) represents the unassigned subpattern. In the <c>binary</c> case, some information about the matching is therefore lost, the <c>&lt;&lt;&gt;&gt;</c> might just as well be an empty string captured.</p>
       <p>If differentiation between empty matches and non existing subpatterns is necessary, use the <c>type</c> <c>index</c>
@@ -524,8 +490,8 @@ This option makes it possible to include comments inside complicated patterns. N
 
       <p>The replacement string can contain the special character
       <c>&amp;</c>, which inserts the whole matching expression in the
-      result, and the special sequence <c>\</c>N (where N is an
-      integer &gt; 0), resulting in the subexpression number N will be
+      result, and the special sequence <c>\</c>N (where N is an integer &gt; 0),
+      <c>\g</c>N or <c>\g{</c>N<c>}</c> resulting in the subexpression number N will be
       inserted in the result. If no subexpression with that number is
       generated by the regular expression, nothing is inserted.</p>
       <p>To insert an <c>&amp;</c> or <c>\</c> in the result, precede it
diff --git a/lib/stdlib/doc/src/string.xml b/lib/stdlib/doc/src/string.xml
index 48867ffe72..549c871aed 100644
--- a/lib/stdlib/doc/src/string.xml
+++ b/lib/stdlib/doc/src/string.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -255,18 +255,12 @@ sub_string("Hello World", 4, 8).
       </desc>
     </func>
     <func>
-      <name>to_float(String) -> {Float,Rest} | {error,Reason} </name>
+      <name name="to_float" arity="1"/>
       <fsummary>Returns a float whose text representation is the integers (ASCII values) in String.</fsummary>
-      <type>
-        <v>String = string()</v>
-        <v>Float = float()</v>
-        <v>Rest = string()</v>
-        <v>Reason = no_float | not_a_list</v>
-      </type>
       <desc>
-        <p>Argument <c>String</c> is expected to start with a valid text
+        <p>Argument <c><anno>String</anno></c> is expected to start with a valid text
           represented float (the digits being ASCII values). Remaining characters 
-          in the string after the float are returned in <c>Rest</c>.</p>
+          in the string after the float are returned in <c><anno>Rest</anno></c>.</p>
         <p>Example:</p>
         <code type="none">
           > {F1,Fs} = string:to_float("1.0-1.0e-1"),
@@ -280,18 +274,12 @@ sub_string("Hello World", 4, 8).
       </desc>
     </func>
     <func>
-      <name>to_integer(String) -> {Int,Rest} | {error,Reason} </name>
+      <name name="to_integer" arity="1"/>
       <fsummary>Returns an integer whose text representation is the integers (ASCII values) in String.</fsummary>
-      <type>
-        <v>String = string()</v>
-        <v>Int = integer()</v>
-        <v>Rest = string()</v>
-        <v>Reason = no_integer | not_a_list</v>
-      </type>
       <desc>
-        <p>Argument <c>String</c> is expected to start with a valid text
+        <p>Argument <c><anno>String</anno></c> is expected to start with a valid text
           represented integer (the digits being ASCII values). Remaining characters 
-          in the string after the integer are returned in <c>Rest</c>.</p>
+          in the string after the integer are returned in <c><anno>Rest</anno></c>.</p>
         <p>Example:</p>
         <code type="none">
           > {I1,Is} = string:to_integer("33+22"),
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index f9a5e245b4..9021d02ade 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -294,10 +294,10 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           is a term with information about the error, and the supervisor
           terminates with reason <c>Term</c>.</p>
         <p>If any child process start function fails or returns an error
-          tuple or an erroneous value, the function returns
-          <c>{error,shutdown}</c> and the supervisor terminates all
-          started child processes and then itself with reason
-          <c>shutdown</c>.</p>
+          tuple or an erroneous value, the supervisor will first terminate
+          all already started child processes with reason <c>shutdown</c>
+          and then terminate itself and return
+          <c>{error, {shutdown, Reason}}</c>.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/stdlib/doc/src/unicode.xml b/lib/stdlib/doc/src/unicode.xml
index 1001ebbae4..1f6cbaccd7 100644
--- a/lib/stdlib/doc/src/unicode.xml
+++ b/lib/stdlib/doc/src/unicode.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -130,34 +130,24 @@
       </desc>
     </func>
     <func>
-      <name>characters_to_list(Data, InEncoding) -> Result</name>
+      <name name="characters_to_list" arity="2"/>
       <fsummary>Convert a collection of characters to list of Unicode characters</fsummary>
-      <type>
-        <v>Data = <seealso marker="#type-latin1_chardata">latin1_chardata()</seealso>
-                | <seealso marker="#type-chardata">chardata()</seealso>
-                | <seealso marker="#type-external_chardata">external_chardata()</seealso></v>
-        <v>Result = list() | {error, list(), RestData} | {incomplete, list(), binary()}</v>
-        <v>RestData = <seealso marker="#type-latin1_chardata">latin1_chardata()</seealso>
-                    | <seealso marker="#type-chardata">chardata()</seealso>
-                    | <seealso marker="#type-external_chardata">external_chardata()</seealso></v>
-        <v>InEncoding = <seealso marker="#type-encoding">encoding()</seealso></v>
-      </type>
       <desc>
 
       <p>This function converts a possibly deep list of integers and
       binaries into a list of integers representing unicode
       characters. The binaries in the input may have characters
       encoded as latin1 (0 - 255, one character per byte), in which
-      case the <c>InEncoding</c> parameter should be given as
+      case the <c><anno>InEncoding</anno></c> parameter should be given as
       <c>latin1</c>, or have characters encoded as one of the
-      UTF-encodings, which is given as the <c>InEncoding</c>
-      parameter. Only when the <c>InEncoding</c> is one of the UTF
+      UTF-encodings, which is given as the <c><anno>InEncoding</anno></c>
+      parameter. Only when the <c><anno>InEncoding</anno></c> is one of the UTF
       encodings, integers in the list are allowed to be grater than
       255.</p>
       
-      <p>If <c>InEncoding</c> is <c>latin1</c>, the <c>Data</c> parameter
+      <p>If <c><anno>InEncoding</anno></c> is <c>latin1</c>, the <c><anno>Data</anno></c> parameter
       corresponds to the <c>iodata()</c> type, but for <c>unicode</c>,
-      the <c>Data</c> parameter can contain integers greater than 255
+      the <c><anno>Data</anno></c> parameter can contain integers greater than 255
       (unicode characters beyond the iso-latin-1 range), which would
       make it invalid as <c>iodata()</c>.</p>
 
@@ -188,16 +178,16 @@
       depth as the original data. The error occurs when traversing the
       list and whatever's left to decode is simply returned as is.</p>
 
-      <p>However, if the input <c>Data</c> is a pure binary, the third
+      <p>However, if the input <c><anno>Data</anno></c> is a pure binary, the third
       part of the error tuple is guaranteed to be a binary as
       well.</p>
 
       <p>Errors occur for the following reasons:</p>
       <list type="bulleted">
 
-           <item>Integers out of range - If <c>InEncoding</c> is
+           <item>Integers out of range - If <c><anno>InEncoding</anno></c> is
 	   <c>latin1</c>, an error occurs whenever an integer greater
-	   than 255 is found in the lists. If <c>InEncoding</c> is
+	   than 255 is found in the lists. If <c><anno>InEncoding</anno></c> is
 	   of a Unicode type, an error occurs whenever an integer
 	   <list type="bulleted">
 	     <item>greater than <c>16#10FFFF</c>
@@ -208,7 +198,7 @@
 	   is found.
 	   </item>
 
-	   <item>UTF encoding incorrect - If <c>InEncoding</c> is
+	   <item>UTF encoding incorrect - If <c><anno>InEncoding</anno></c> is
 	   one of the UTF types, the bytes in any binaries have to be valid
 	   in that encoding. Errors can occur for various
 	   reasons, including &quot;pure&quot; decoding errors 
@@ -220,7 +210,7 @@
 	   number should have been encoded in fewer bytes. The
 	   case of a truncated UTF is handled specially, see the
 	   paragraph about incomplete binaries below. If
-	   <c>InEncoding</c> is <c>latin1</c>, binaries are always valid 
+	   <c><anno>InEncoding</anno></c> is <c>latin1</c>, binaries are always valid
 	   as long as they contain whole bytes,
 	   as each byte falls into the valid iso-latin-1 range.</item>
 
@@ -238,7 +228,7 @@
       the first part of a (so far) valid UTF character.</p>
 
       <p>If one UTF characters is split over two consecutive
-      binaries in the <c>Data</c>, the conversion succeeds. This means
+      binaries in the <c><anno>Data</anno></c>, the conversion succeeds. This means
       that a character can be decoded from a range of binaries as long
       as the whole range is given as input without errors
       occurring. Example:</p>
@@ -274,21 +264,11 @@
       </desc>
     </func>
     <func>    
-     <name>characters_to_binary(Data,InEncoding) -> Result</name>
+     <name name="characters_to_binary" arity="2"/>
       <fsummary>Convert a collection of characters to an UTF-8 binary</fsummary>
 
-      <type>
-        <v>Data = <seealso marker="#type-latin1_chardata">latin1_chardata()</seealso>
-                | <seealso marker="#type-chardata">chardata()</seealso>
-                | <seealso marker="#type-external_chardata">external_chardata()</seealso></v>
-        <v>Result = binary() | {error, binary(), RestData} | {incomplete, binary(), binary()}</v>
-        <v>RestData = <seealso marker="#type-latin1_chardata">latin1_chardata()</seealso>
-                    | <seealso marker="#type-chardata">chardata()</seealso>
-                    | <seealso marker="#type-external_chardata">external_chardata()</seealso></v>
-        <v>InEncoding = <seealso marker="#type-encoding">encoding()</seealso></v>
-      </type>
       <desc>
-      <p>Same as characters_to_binary(Data, InEncoding, unicode).</p>
+      <p>Same as characters_to_binary(<anno>Data</anno>, <anno>InEncoding</anno>, unicode).</p>
       </desc>
     </func>    
     <func>
diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml
index a7e010a05f..bbcd49a934 100644
--- a/lib/stdlib/doc/src/unicode_usage.xml
+++ b/lib/stdlib/doc/src/unicode_usage.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1999</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -53,7 +53,7 @@
 <item>Basically the same as UTF-32, but without some Unicode semantics, defined by IEEE and has little use as a separate encoding standard. For all normal (and possibly abnormal) usages, UTF-32 and UCS-4 are interchangeable.</item>
 </taglist>
 <p>Certain ranges of characters are left unused and certain ranges are even deemed invalid. The most notable invalid range is 16#D800 - 16#DFFF, as the UTF-16 encoding does not allow for encoding of these numbers. It can be speculated that the UTF-16 encoding standard was, from the beginning, expected to be able to hold all Unicode characters in one 16-bit entity, but then had to be extended, leaving a hole in the Unicode range to cope with backward compatibility.</p>
-<p>Additionally, the codepoint 16#FEFF is used for byte order marks (BOM's) and use of that character is not encouraged in other contexts than that. It actually is valid though, as the character "ZWNBS" (Zero Width Non Breaking Space). BOM's are used to identify encodings and byte order for programs where such parameters are not known in advance. Byte order marks are more seldom used than one could expect, put their use is becoming more widely spread as they provide the means for programs to make educated guesses about the Unicode format of a certain file.</p>
+<p>Additionally, the codepoint 16#FEFF is used for byte order marks (BOM's) and use of that character is not encouraged in other contexts than that. It actually is valid though, as the character "ZWNBS" (Zero Width Non Breaking Space). BOM's are used to identify encodings and byte order for programs where such parameters are not known in advance. Byte order marks are more seldom used than one could expect, but their use is becoming more widely spread as they provide the means for programs to make educated guesses about the Unicode format of a certain file.</p>
 </section>
 <section>
 <title>Standard Unicode representation in Erlang</title>
@@ -210,6 +210,12 @@ Eshell V5.7  (abort with ^G)
 </section>
 </section>
 <section>
+<title>Unicode in environment variables and parameters</title>
+<p>Environment variables and their interpretation is handled much in the same way as file names. If Unicode file names are enabled, environment variables as well as parameters to the Erlang VM are expected to be in Unicode.</p>
+<p>If Unicode file names are enabled, the calls to <seealso marker="kernel:os#getenv/0"><c>os:getenv/0</c></seealso>, <seealso marker="kernel:os#getenv/1"><c>os:getenv/1</c></seealso> and <seealso marker="kernel:os#putenv/2"><c>os:putenv/2</c></seealso> will handle Unicode strings. On Unix-like platforms, the built-in functions will translate environment variables in UTF-8 to/from Unicode strings, possibly with codepoints > 255. On Windows the Unicode versions of the environment system API will be used, also allowing for codepoints > 255.</p>
+<p>On Unix-like operating systems, parameters are expected to be UTF-8 without translation if Unicode file names are enabled.</p>
+</section>
+<section>
 <title>Unicode-aware modules</title>
 <p>Most of the modules in Erlang/OTP are of course Unicode-unaware in the sense that they have no notion of Unicode and really shouldn't have. Typically they handle non-textual or byte-oriented data (like <c>gen_tcp</c> etc).</p>
 <p>Modules that actually handle textual data (like <c>io_lib</c>, <c>string</c> etc) are sometimes subject to conversion or extension to be able to handle Unicode characters.</p>
diff --git a/lib/stdlib/examples/Makefile b/lib/stdlib/examples/Makefile
index 25c88d1de3..198aceb3a9 100644
--- a/lib/stdlib/examples/Makefile
+++ b/lib/stdlib/examples/Makefile
@@ -47,6 +47,6 @@ RELSYSDIR = $(RELEASE_PATH)/lib/stdlib-$(STDLIB_VSN)/examples
 EXAMPLES  = erl_id_trans.erl
 
 release_spec:
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(EXAMPLES) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)"
 release_docs_spec:
diff --git a/lib/stdlib/examples/erl_id_trans.erl b/lib/stdlib/examples/erl_id_trans.erl
index 72e41d6473..34c6ecc394 100644
--- a/lib/stdlib/examples/erl_id_trans.erl
+++ b/lib/stdlib/examples/erl_id_trans.erl
@@ -283,15 +283,6 @@ gexpr({call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,F}},As0}) ->
 	true -> As1 = gexpr_list(As0),
 		{call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,F}},As1}
     end;
-% Unfortunately, writing calls as {M,F}(...) is also allowed.
-gexpr({call,Line,{tuple,La,[{atom,Lb,erlang},{atom,Lc,F}]},As0}) ->
-    case erl_internal:guard_bif(F, length(As0)) or
-	 erl_internal:arith_op(F, length(As0)) or 
-	 erl_internal:comp_op(F, length(As0)) or
-	 erl_internal:bool_op(F, length(As0)) of
-	true -> As1 = gexpr_list(As0),
-		{call,Line,{tuple,La,[{atom,Lb,erlang},{atom,Lc,F}]},As1}
-    end;
 gexpr({bin,Line,Fs}) ->
     Fs2 = pattern_grp(Fs),
     {bin,Line,Fs2};
diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
index 90e239b00f..14304824d3 100644
--- a/lib/stdlib/src/Makefile
+++ b/lib/stdlib/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2011. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -167,6 +167,7 @@ docs:
 # This is a trick so that the preloaded files will get the correct type
 # specifications.
 primary_bootstrap_compiler: \
+  $(BOOTSTRAP_COMPILER)/ebin/epp.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_scan.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_parse.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_lint.beam \
@@ -198,13 +199,13 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/stdlib/src/binary.erl b/lib/stdlib/src/binary.erl
index cb1e12ae46..41b6ab1d5f 100644
--- a/lib/stdlib/src/binary.erl
+++ b/lib/stdlib/src/binary.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -18,29 +18,187 @@
 %%
 -module(binary).
 %%
-%% The following functions implemented as BIF's
-%%  binary:compile_pattern/1
-%%  binary:match/{2,3}
-%%  binary:matches/{2,3}
-%%  binary:longest_common_prefix/1
-%%  binary:longest_common_suffix/1
-%%  binary:first/1
-%%  binary:last/1
-%%  binary:at/2
-%%  binary:part/{2,3}
-%%  binary:bin_to_list/{1,2,3}
-%%  binary:list_to_bin/1
-%%  binary:copy/{1,2}
-%%  binary:referenced_byte_size/1
-%%  binary:decode_unsigned/{1,2}
-%% - Not yet:
-%%
 %% Implemented in this module:
 -export([split/2,split/3,replace/3,replace/4]).
 
--opaque cp() :: tuple().
+-export_type([cp/0]).
+
+-opaque cp() :: {'am' | 'bm', binary()}.
 -type part() :: {Start :: non_neg_integer(), Length :: integer()}.
 
+%%% BIFs.
+
+-export([at/2, bin_to_list/1, bin_to_list/2, bin_to_list/3,
+         compile_pattern/1, copy/1, copy/2, decode_unsigned/1,
+         decode_unsigned/2, encode_unsigned/1, encode_unsigned/2,
+         first/1, last/1, list_to_bin/1, longest_common_prefix/1,
+         longest_common_suffix/1, match/2, match/3, matches/2,
+         matches/3, part/2, part/3, referenced_byte_size/1]).
+
+-spec at(Subject, Pos) -> byte() when
+      Subject :: binary(),
+      Pos :: non_neg_integer().
+
+at(_, _) ->
+    erlang:nif_error(undef).
+
+-spec bin_to_list(Subject) -> [byte()] when
+      Subject :: binary().
+
+bin_to_list(_) ->
+    erlang:nif_error(undef).
+
+-spec bin_to_list(Subject, PosLen) -> [byte()] when
+      Subject :: binary(),
+      PosLen :: part().
+
+bin_to_list(_, _) ->
+    erlang:nif_error(undef).
+
+-spec bin_to_list(Subject, Pos, Len) -> [byte()] when
+      Subject :: binary(),
+      Pos :: non_neg_integer(),
+      Len :: non_neg_integer().
+
+bin_to_list(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec compile_pattern(Pattern) -> cp() when
+      Pattern :: binary() | [binary()].
+
+compile_pattern(_) ->
+    erlang:nif_error(undef).
+
+-spec copy(Subject) -> binary() when
+      Subject :: binary().
+
+copy(_) ->
+    erlang:nif_error(undef).
+
+-spec copy(Subject, N) -> binary() when
+      Subject :: binary(),
+      N :: non_neg_integer().
+
+copy(_, _) ->
+    erlang:nif_error(undef).
+
+-spec decode_unsigned(Subject) -> Unsigned when
+      Subject :: binary(),
+      Unsigned :: non_neg_integer().
+
+decode_unsigned(_) ->
+    erlang:nif_error(undef).
+
+-spec decode_unsigned(Subject, Endianess) -> Unsigned when
+      Subject :: binary(),
+      Endianess :: big | little,
+      Unsigned :: non_neg_integer().
+
+decode_unsigned(_, _) ->
+    erlang:nif_error(undef).
+
+-spec encode_unsigned(Unsigned) -> binary() when
+      Unsigned :: non_neg_integer().
+
+encode_unsigned(_) ->
+    erlang:nif_error(undef).
+
+-spec encode_unsigned(Unsigned, Endianess) -> binary() when
+      Unsigned :: non_neg_integer(),
+      Endianess :: big | little.
+
+encode_unsigned(_, _) ->
+    erlang:nif_error(undef).
+
+-spec first(Subject) -> byte() when
+      Subject :: binary().
+
+first(_) ->
+    erlang:nif_error(undef).
+
+-spec last(Subject) -> byte() when
+      Subject :: binary().
+
+last(_) ->
+    erlang:nif_error(undef).
+
+-spec list_to_bin(ByteList) -> binary() when
+      ByteList :: iodata().
+
+list_to_bin(_) ->
+    erlang:nif_error(undef).
+
+-spec longest_common_prefix(Binaries) -> non_neg_integer() when
+      Binaries :: [binary()].
+
+longest_common_prefix(_) ->
+    erlang:nif_error(undef).
+
+-spec longest_common_suffix(Binaries) -> non_neg_integer() when
+      Binaries :: [binary()].
+
+longest_common_suffix(_) ->
+    erlang:nif_error(undef).
+
+-spec match(Subject, Pattern) -> Found | nomatch when
+      Subject :: binary(),
+      Pattern :: binary() | [binary()] | cp(),
+      Found :: part().
+
+match(_, _) ->
+    erlang:nif_error(undef).
+
+-spec match(Subject, Pattern, Options) -> Found | nomatch when
+      Subject :: binary(),
+      Pattern :: binary() | [binary()] | cp(),
+      Found :: part(),
+      Options :: [Option],
+      Option :: {scope, part()}.
+
+match(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec matches(Subject, Pattern) -> Found when
+      Subject :: binary(),
+      Pattern :: binary() | [binary()] | cp(),
+      Found :: [part()].
+
+matches(_, _) ->
+    erlang:nif_error(undef).
+
+-spec matches(Subject, Pattern, Options) -> Found when
+      Subject :: binary(),
+      Pattern :: binary() | [binary()] | cp(),
+      Found :: [part()],
+      Options :: [Option],
+      Option :: {scope, part()}.
+
+matches(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec part(Subject, PosLen) -> binary() when
+      Subject :: binary(),
+      PosLen :: part().
+
+part(_, _) ->
+    erlang:nif_error(undef).
+
+-spec part(Subject, Pos, Len) -> binary() when
+      Subject :: binary(),
+      Pos :: non_neg_integer(),
+      Len :: non_neg_integer().
+
+part(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec referenced_byte_size(Binary) -> non_neg_integer() when
+      Binary :: binary().
+
+referenced_byte_size(_) ->
+    erlang:nif_error(undef).
+
+%%% End of BIFs.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% split
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/stdlib/src/dets.erl b/lib/stdlib/src/dets.erl
index c0f9ce34b0..845fae4bf4 100644
--- a/lib/stdlib/src/dets.erl
+++ b/lib/stdlib/src/dets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -88,7 +88,8 @@
 %% Not documented, or not ready for publication.
 -export([lookup_keys/2]).
 
--export_type([tab_name/0]).
+-export_type([bindings_cont/0, cont/0, object_cont/0, select_cont/0,
+              tab_name/0]).
 
 -compile({inline, [{einval,2},{badarg,2},{undefined,1},
                    {badarg_exit,2},{lookup_reply,2}]}).
@@ -319,7 +320,7 @@ foldr(Fun, Acc, Tab) ->
 
 foldl(Fun, Acc, Tab) ->
     Ref = make_ref(),
-    do_traverse(Fun, Acc, Tab, Ref).
+    badarg(do_traverse(Fun, Acc, Tab, Ref), [Fun, Acc, Tab]).
 
 -spec from_ets(Name, EtsTab) -> 'ok' | {'error', Reason} when
       Name :: tab_name(),
@@ -515,7 +516,7 @@ match(Tab, Pat) ->
       Reason :: term().
 
 match(Tab, Pat, N) ->
-    badarg(init_chunk_match(Tab, Pat, bindings, N), [Tab, Pat, N]).
+    badarg(init_chunk_match(Tab, Pat, bindings, N, no_safe), [Tab, Pat, N]).
     
 -spec match(Continuation) ->
           {[Match], Continuation2} | '$end_of_table' | {'error', Reason} when
@@ -525,7 +526,7 @@ match(Tab, Pat, N) ->
       Reason :: term().
 
 match(State) when State#dets_cont.what =:= bindings ->
-    badarg(chunk_match(State), [State]);
+    badarg(chunk_match(State, no_safe), [State]);
 match(Term) ->
     erlang:error(badarg, [Term]).
 
@@ -538,26 +539,26 @@ match_delete(Tab, Pat) ->
     badarg(match_delete(Tab, Pat, delete), [Tab, Pat]).
 
 match_delete(Tab, Pat, What) ->
-    safe_fixtable(Tab, true),    
     case compile_match_spec(What, Pat) of
 	{Spec, MP} ->
-	    Proc = dets_server:get_pid(Tab),
-	    R = req(Proc, {match_delete_init, MP, Spec}),
-	    do_match_delete(Tab, Proc, R, What, 0);
+            case catch dets_server:get_pid(Tab) of
+                {'EXIT', _Reason} ->
+                    badarg;
+                Proc ->
+                    R = req(Proc, {match_delete_init, MP, Spec}),
+                    do_match_delete(Proc, R, What, 0)
+            end;
 	badarg ->
 	    badarg
     end.
 
-do_match_delete(Tab, _Proc, {done, N1}, select, N) ->
-    safe_fixtable(Tab, false),
+do_match_delete(_Proc, {done, N1}, select, N) ->
     N + N1;
-do_match_delete(Tab, _Proc, {done, _N1}, _What, _N) ->
-    safe_fixtable(Tab, false),
+do_match_delete(_Proc, {done, _N1}, _What, _N) ->
     ok;
-do_match_delete(Tab, Proc, {cont, State, N1}, What, N) ->
-    do_match_delete(Tab, Proc, req(Proc, {match_delete, State}), What, N+N1);
-do_match_delete(Tab, _Proc, Error, _What, _N) ->
-    safe_fixtable(Tab, false),
+do_match_delete(Proc, {cont, State, N1}, What, N) ->
+    do_match_delete(Proc, req(Proc, {match_delete, State}), What, N+N1);
+do_match_delete(_Proc, Error, _What, _N) ->
     Error.
 
 -spec match_object(Name, Pattern) -> Objects | {'error', Reason} when
@@ -579,7 +580,7 @@ match_object(Tab, Pat) ->
       Reason :: term().
 
 match_object(Tab, Pat, N) ->
-    badarg(init_chunk_match(Tab, Pat, object, N), [Tab, Pat, N]).
+    badarg(init_chunk_match(Tab, Pat, object, N, no_safe), [Tab, Pat, N]).
     
 -spec match_object(Continuation) ->
            {Objects, Continuation2} | '$end_of_table' | {'error', Reason} when
@@ -589,7 +590,7 @@ match_object(Tab, Pat, N) ->
       Reason :: term().
 
 match_object(State) when State#dets_cont.what =:= object ->
-    badarg(chunk_match(State), [State]);
+    badarg(chunk_match(State, no_safe), [State]);
 match_object(Term) ->
     erlang:error(badarg, [Term]).
 
@@ -712,7 +713,7 @@ select(Tab, Pat) ->
       Reason :: term().
 
 select(Tab, Pat, N) ->
-    badarg(init_chunk_match(Tab, Pat, select, N), [Tab, Pat, N]).
+    badarg(init_chunk_match(Tab, Pat, select, N, no_safe), [Tab, Pat, N]).
     
 -spec select(Continuation) ->
           {Selection, Continuation2} | '$end_of_table' | {'error', Reason} when
@@ -722,7 +723,7 @@ select(Tab, Pat, N) ->
       Reason :: term().
 
 select(State) when State#dets_cont.what =:= select ->
-    badarg(chunk_match(State), [State]);
+    badarg(chunk_match(State, no_safe), [State]);
 select(Term) ->
     erlang:error(badarg, [Term]).
 
@@ -898,7 +899,7 @@ traverse(Tab, Fun) ->
 			throw({Ref, Other})
 		end
 	end,
-    do_traverse(TFun, [], Tab, Ref).
+    badarg(do_traverse(TFun, [], Tab, Ref), [Tab, Fun]).
 
 -spec update_counter(Name, Key, Increment) -> Result when
       Name :: tab_name(),
@@ -929,20 +930,21 @@ where(Tab, Object) ->
     badarg(treq(Tab, {where, Object}), [Tab, Object]).
 
 do_traverse(Fun, Acc, Tab, Ref) ->
-    safe_fixtable(Tab, true),    
-    Proc = dets_server:get_pid(Tab),
-    try
-        do_trav(Proc, Acc, Fun)
-    catch {Ref, Result} ->
-        Result
-    after 
-        safe_fixtable(Tab, false)
+    case catch dets_server:get_pid(Tab) of
+        {'EXIT', _Reason} ->
+            badarg;
+        Proc ->
+            try
+                do_trav(Proc, Acc, Fun)
+            catch {Ref, Result} ->
+                Result
+            end
     end.
 
 do_trav(Proc, Acc, Fun) ->
     {Spec, MP} = compile_match_spec(object, '_'),
     %% MP not used
-    case req(Proc, {match, MP, Spec, default}) of
+    case req(Proc, {match, MP, Spec, default, safe}) of
 	{cont, State} ->
 	    do_trav(State, Proc, Acc, Fun);
 	Error ->
@@ -952,7 +954,7 @@ do_trav(Proc, Acc, Fun) ->
 do_trav(#dets_cont{bin = eof}, _Proc, Acc, _Fun) ->
     Acc;
 do_trav(State, Proc, Acc, Fun) ->
-    case req(Proc, {match_init, State}) of
+    case req(Proc, {match_init, State, safe}) of
 	{cont, {Bins, NewState}} ->
 	    do_trav_bins(NewState, Proc, Acc, Fun, lists:reverse(Bins));
 	Error ->
@@ -972,44 +974,47 @@ do_trav_bins(State, Proc, Acc, Fun, [Bin | Bins]) ->
     end.
 
 safe_match(Tab, Pat, What) ->
-    safe_fixtable(Tab, true),
-    R = do_safe_match(init_chunk_match(Tab, Pat, What, default), []),
-    safe_fixtable(Tab, false),
-    R.
+    do_safe_match(init_chunk_match(Tab, Pat, What, default, safe), []).
     
 do_safe_match({error, Error}, _L) ->
     {error, Error};
 do_safe_match({L, C}, LL) ->
-    do_safe_match(chunk_match(C), L++LL);
+    do_safe_match(chunk_match(C, safe), L++LL);
 do_safe_match('$end_of_table', L) ->
     L;
 do_safe_match(badarg, _L) ->
     badarg.
 
 %% What = object | bindings | select
-init_chunk_match(Tab, Pat, What, N) when is_integer(N), N >= 0; 
-                                         N =:= default ->
+init_chunk_match(Tab, Pat, What, N, Safe) when is_integer(N), N >= 0;
+                                               N =:= default ->
     case compile_match_spec(What, Pat) of
 	{Spec, MP} ->
-            Proc = dets_server:get_pid(Tab),
-	    case req(Proc, {match, MP, Spec, N}) of
-		{done, L} ->
-		    {L, #dets_cont{tab = Tab, proc = Proc, what = What,
-                                   bin = eof}};
-		{cont, State} ->
-		    chunk_match(State#dets_cont{what = What, tab = Tab,
-                                                proc = Proc});
-		Error ->
-		    Error
+            case catch dets_server:get_pid(Tab) of
+                {'EXIT', _Reason} ->
+                    badarg;
+                Proc ->
+                    case req(Proc, {match, MP, Spec, N, Safe}) of
+                        {done, L} ->
+                            {L, #dets_cont{tab = Tab, proc = Proc,
+                                           what = What, bin = eof}};
+                        {cont, State} ->
+                            chunk_match(State#dets_cont{what = What,
+                                                        tab = Tab,
+                                                        proc = Proc},
+                                       Safe);
+                        Error ->
+                            Error
+                    end
 	    end;
 	badarg ->
 	    badarg
     end;
-init_chunk_match(_Tab, _Pat, _What, _) ->
+init_chunk_match(_Tab, _Pat, _What, _N, _Safe) ->
     badarg.
 
-chunk_match(#dets_cont{proc = Proc}=State) ->
-    case req(Proc, {match_init, State}) of
+chunk_match(#dets_cont{proc = Proc}=State, Safe) ->
+    case req(Proc, {match_init, State, Safe}) of
         '$end_of_table'=Reply ->
             Reply;
         {cont, {Bins, NewState}} ->
@@ -1024,7 +1029,7 @@ chunk_match(#dets_cont{proc = Proc}=State) ->
                             badarg
                     end;
                 [] ->
-                    chunk_match(NewState);
+                    chunk_match(NewState, Safe);
                 Terms ->
                     {Terms, NewState}
             end;
@@ -1301,7 +1306,7 @@ open_file_loop(Head, N) ->
         %% - wait 1 ms after each update.
         %% next is normally followed by lookup, but since lookup is also
         %% used when not traversing the table, it is not prioritized.
-        ?DETS_CALL(From, {match_init, _State} = Op) ->
+        ?DETS_CALL(From, {match_init, _State, _Safe} = Op) ->
             do_apply_op(Op, From, Head, N);
         ?DETS_CALL(From, {bchunk, _State} = Op) ->
             do_apply_op(Op, From, Head, N);
@@ -1558,12 +1563,17 @@ apply_op(Op, From, Head, N) ->
 	    H2;
 	{lookup_keys, _Keys} ->
 	    stream_op(Op, From, [], Head, N);
-	{match_init, State} ->
-	    {H2, Res} = fmatch_init(Head, State),
+	{match_init, State, Safe} ->
+	    {H1, Res} = fmatch_init(Head, State),
+            H2 = case Res of
+                     {cont,_} -> H1;
+                     _ when Safe =:= no_safe-> H1;
+                     _ when Safe =:= safe -> do_safe_fixtable(H1, From, false)
+                 end,
 	    From ! {self(), Res},
 	    H2;
-	{match, MP, Spec, NObjs} ->
-	    {H2, Res} = fmatch(Head, MP, Spec, NObjs),
+	{match, MP, Spec, NObjs, Safe} ->
+	    {H2, Res} = fmatch(Head, MP, Spec, NObjs, Safe, From),
 	    From ! {self(), Res},
 	    H2;
 	{member, Key} when Head#head.version =:= 8 ->
@@ -1577,11 +1587,15 @@ apply_op(Op, From, Head, N) ->
 	    From ! {self(), Res},
 	    H2;
 	{match_delete, State} when Head#head.update_mode =:= dirty ->
-	    {H2, Res} = fmatch_delete(Head, State),
+	    {H1, Res} = fmatch_delete(Head, State),
+            H2 = case Res of
+                     {cont,_S,_N} -> H1;
+                     _ -> do_safe_fixtable(H1, From, false)
+                 end,
 	    From ! {self(), Res},
 	    {N + 1, H2};
 	{match_delete_init, MP, Spec} when Head#head.update_mode =:= dirty ->
-	    {H2, Res} = fmatch_delete_init(Head, MP, Spec),
+	    {H2, Res} = fmatch_delete_init(Head, MP, Spec, From),
 	    From ! {self(), Res},
 	    {N + 1, H2};
 	{safe_fixtable, Bool} ->
@@ -2229,13 +2243,18 @@ fmatch_init(Head, C) ->
     end.
 
 %% -> {NewHead, Result}
-fmatch(Head, MP, Spec, N) ->
+fmatch(Head, MP, Spec, N, Safe, From) ->
     KeyPos = Head#head.keypos,
     case find_all_keys(Spec, KeyPos, []) of
 	[] -> 
 	    %% Complete match
 	    case catch write_cache(Head) of
-		{NewHead, []} ->
+		{Head1, []} ->
+                    NewHead =
+                        case Safe of
+                            safe -> do_safe_fixtable(Head1, From, true);
+                            no_safe -> Head1
+                        end,
 		    C0 = init_scan(NewHead, N),
 		    {NewHead, {cont, C0#dets_cont{match_program = MP}}};
 		{NewHead, _} = HeadError when is_record(NewHead, head) ->
@@ -2300,12 +2319,12 @@ contains_variable(_) ->
     false.
 
 %% -> {NewHead, Res}
-fmatch_delete_init(Head, MP, Spec)  ->
+fmatch_delete_init(Head, MP, Spec, From) ->
     KeyPos = Head#head.keypos,
     case catch 
         case find_all_keys(Spec, KeyPos, []) of
             [] -> 
-                do_fmatch_delete_var_keys(Head, MP, Spec);
+                do_fmatch_delete_var_keys(Head, MP, Spec, From);
             List ->
                 Keys = lists:usort(List),
                 do_fmatch_constant_keys(Head, Keys, MP)
@@ -2336,7 +2355,7 @@ fmatch_delete(Head, C) ->
 	    end
     end.
 
-do_fmatch_delete_var_keys(Head, _MP, ?PATTERN_TO_TRUE_MATCH_SPEC('_')) 
+do_fmatch_delete_var_keys(Head, _MP, ?PATTERN_TO_TRUE_MATCH_SPEC('_'), _From)
             when Head#head.fixed =:= false ->
     %% Handle the case where the file is emptied efficiently.
     %% Empty the cache just to get the number of objects right.
@@ -2348,8 +2367,9 @@ do_fmatch_delete_var_keys(Head, _MP, ?PATTERN_TO_TRUE_MATCH_SPEC('_'))
 	Reply ->
 	    Reply
     end;
-do_fmatch_delete_var_keys(Head, MP, _Spec) ->
-    {NewHead, []} = write_cache(Head),
+do_fmatch_delete_var_keys(Head, MP, _Spec, From) ->
+    Head1 = do_safe_fixtable(Head, From, true),
+    {NewHead, []} = write_cache(Head1),
     C0 = init_scan(NewHead, default),
     {NewHead, {cont, C0#dets_cont{match_program = MP}, 0}}.
 
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index ccc14610d7..2c8d84a9e1 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
diff --git a/lib/stdlib/src/erl_expand_records.erl b/lib/stdlib/src/erl_expand_records.erl
index 9759a8f001..85defacc43 100644
--- a/lib/stdlib/src/erl_expand_records.erl
+++ b/lib/stdlib/src/erl_expand_records.erl
@@ -381,9 +381,6 @@ expr({call,Line,{record_field,_,_,_}=M,As0}, St0) ->
 expr({call,Line,{remote,Lr,M,F},As0}, St0) ->
     {[M1,F1 | As1],St1} = expr_list([M,F | As0], St0),
     {{call,Line,{remote,Lr,M1,F1},As1},St1};
-expr({call,Line,{tuple,Lt,[{atom,_,_}=M,{atom,_,_}=F]},As0}, St0) ->
-    {As,St1} = expr_list(As0, St0),
-    {{call,Line,{tuple,Lt,[M,F]},As},St1};
 expr({call,Line,F,As0}, St0) ->
     {[Fun1 | As1],St1} = expr_list([F | As0], St0),
     {{call,Line,Fun1,As1},St1};
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index abab81d31f..1e5f962375 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -248,6 +248,8 @@ format_error({illegal_guard_local_call, {F,A}}) ->
     io_lib:format("call to local/imported function ~w/~w is illegal in guard",
 		  [F,A]);
 format_error(illegal_guard_expr) -> "illegal guard expression";
+format_error(deprecated_tuple_fun) ->
+    "tuple funs are deprecated and will be removed in R16";
 %% --- exports ---
 format_error({explicit_export,F,A}) ->
     io_lib:format("in this release, the call to ~w/~w must be written "
@@ -363,6 +365,12 @@ format_error(callback_wrong_arity) ->
 format_error({imported_predefined_type, Name}) ->
     io_lib:format("referring to built-in type ~w as a remote type; "
 		  "please take out the module name", [Name]);
+format_error({not_exported_opaque, {TypeName, Arity}}) ->
+    io_lib:format("opaque type ~w~s is not exported",
+                  [TypeName, gen_type_paren(Arity)]);
+format_error({underspecified_opaque, {TypeName, Arity}}) ->
+    io_lib:format("opaque type ~w~s is underspecified and therefore meaningless",
+                  [TypeName, gen_type_paren(Arity)]);
 %% --- obsolete? unused? ---
 format_error({format_error, {Fmt, Args}}) ->
     io_lib:format(Fmt, Args);
@@ -849,7 +857,8 @@ post_traversal_check(Forms, St0) ->
     StC = check_untyped_records(Forms, StB),
     StD = check_on_load(StC),
     StE = check_unused_records(Forms, StD),
-    check_callback_information(StE).
+    StF = check_local_opaque_types(StE),
+    check_callback_information(StF).
 
 %% check_behaviour(State0) -> State
 %% Check that the behaviour attribute is valid.
@@ -1914,8 +1923,6 @@ gexpr({call,Line,{remote,_Lr,{atom,_Lm,erlang},{atom,_Lf,F}},As}, Vt, St0) ->
         true -> {Asvt,St1};
         false -> {Asvt,add_error(Line, illegal_guard_expr, St1)}
     end;
-gexpr({call,L,{tuple,Lt,[{atom,Lm,erlang},{atom,Lf,F}]},As}, Vt, St) ->
-    gexpr({call,L,{remote,Lt,{atom,Lm,erlang},{atom,Lf,F}},As}, Vt, St);
 gexpr({op,Line,Op,A}, Vt, St0) ->
     {Avt,St1} = gexpr(A, Vt, St0),
     case is_gexpr_op(Op, 1) of
@@ -2554,15 +2561,24 @@ find_field(_F, []) -> error.
 %%    Attr :: 'type' | 'opaque'
 %% Checks that a type definition is valid.
 
+-record(typeinfo, {attr, line}).
+
 type_def(_Attr, _Line, {record, _RecName}, Fields, [], St0) ->
     %% The record field names and such are checked in the record format.
     %% We only need to check the types.
     Types = [T || {typed_record_field, _, T} <- Fields],
     check_type({type, -1, product, Types}, St0);
-type_def(_Attr, Line, TypeName, ProtoType, Args, St0) ->
+type_def(Attr, Line, TypeName, ProtoType, Args, St0) ->
     TypeDefs = St0#lint.types,
     Arity = length(Args),
     TypePair = {TypeName, Arity},
+    Info = #typeinfo{attr = Attr, line = Line},
+    StoreType =
+        fun(St) ->
+                NewDefs = dict:store(TypePair, Info, TypeDefs),
+                CheckType = {type, -1, product, [ProtoType|Args]},
+                check_type(CheckType, St#lint{types=NewDefs})
+        end,
     case (dict:is_key(TypePair, TypeDefs) orelse is_var_arity_type(TypeName)) of
 	true ->
 	    case dict:is_key(TypePair, default_types()) of
@@ -2572,20 +2588,29 @@ type_def(_Attr, Line, TypeName, ProtoType, Args, St0) ->
 			true ->
 			    Warn = {new_builtin_type, TypePair},
 			    St1 = add_warning(Line, Warn, St0),
-			    NewDefs = dict:store(TypePair, Line, TypeDefs),
-			    CheckType = {type, -1, product, [ProtoType|Args]},
-			    check_type(CheckType, St1#lint{types=NewDefs});
+                            StoreType(St1);
 			false ->
 			    add_error(Line, {builtin_type, TypePair}, St0)
 		    end;
 	        false -> add_error(Line, {redefine_type, TypePair}, St0)
 	    end;
 	false ->
-	    NewDefs = dict:store(TypePair, Line, TypeDefs),
-	    CheckType = {type, -1, product, [ProtoType|Args]},
-	    check_type(CheckType, St0#lint{types=NewDefs})
+            St1 = case
+                      Attr =:= opaque andalso
+                      is_underspecified(ProtoType, Arity)
+                  of
+                      true ->
+                          Warn = {underspecified_opaque, TypePair},
+                          add_warning(Line, Warn, St0);
+                      false -> St0
+                  end,
+            StoreType(St1)
     end.
 
+is_underspecified({type,_,term,[]}, 0) -> true;
+is_underspecified({type,_,any,[]}, 0) -> true;
+is_underspecified(_ProtType, _Arity) -> false.
+
 check_type(Types, St) ->
     {SeenVars, St1} = check_type(Types, dict:new(), St),
     dict:fold(fun(Var, {seen_once, Line}, AccSt) ->
@@ -2895,7 +2920,7 @@ check_unused_types(Forms, #lint{usage=Usage, types=Ts, exp_types=ExpTs}=St) ->
 		fun(_Type, -1, AccSt) ->
 			%% Default type
 			AccSt;
-		   (Type, FileLine, AccSt) ->
+		   (Type, #typeinfo{line = FileLine}, AccSt) ->
                         case loc(FileLine) of
 			    {FirstFile, _} ->
 				case gb_sets:is_member(Type, UsedTypes) of
@@ -2914,6 +2939,24 @@ check_unused_types(Forms, #lint{usage=Usage, types=Ts, exp_types=ExpTs}=St) ->
 	    St
     end.
 
+check_local_opaque_types(St) ->
+    #lint{types=Ts, exp_types=ExpTs} = St,
+    FoldFun =
+        fun(_Type, -1, AccSt) ->
+                %% Default type
+                AccSt;
+           (_Type, #typeinfo{attr = type}, AccSt) ->
+                AccSt;
+           (Type, #typeinfo{attr = opaque, line = FileLine}, AccSt) ->
+                case gb_sets:is_element(Type, ExpTs) of
+                    true -> AccSt;
+                    false ->
+                        Warn = {not_exported_opaque,Type},
+                        add_warning(FileLine, Warn, AccSt)
+                end
+        end,
+    dict:fold(FoldFun, St, Ts).
+
 %% icrt_clauses(Clauses, In, ImportVarTable, State) ->
 %%      {NewVts,State}.
 
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl
index 10b2ed2e49..0c8735bb6d 100644
--- a/lib/stdlib/src/erl_scan.erl
+++ b/lib/stdlib/src/erl_scan.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -55,7 +55,7 @@
          token_info/1,token_info/2,
          attributes_info/1,attributes_info/2,set_attribute/3]).
 
--export_type([error_info/0, line/0, tokens_result/0]).
+-export_type([error_info/0, line/0, return_cont/0, tokens_result/0]).
 
 %%%
 %%% Defines and type definitions
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index 27e70ac4d4..498d850df3 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -22,7 +22,7 @@
 -export([script_name/0, create/2, extract/2]).
 
 %% Internal API.
--export([start/0, start/1]).
+-export([start/0, start/1, parse_file/1]).
 
 %%-----------------------------------------------------------------------
 
@@ -346,7 +346,8 @@ parse_and_run(File, Args, Options) ->
             case Source of
                 archive ->
 		    {ok, FileInfo} = file:read_file_info(File),
-                    case code:set_primary_archive(File, FormsOrBin, FileInfo) of
+                    case code:set_primary_archive(File, FormsOrBin, FileInfo,
+						  fun escript:parse_file/1) of
                         ok when CheckOnly ->
 			    case code:load_file(Module) of
 				{module, _} ->
@@ -396,6 +397,19 @@ parse_and_run(File, Args, Options) ->
 %% Parse script
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%% Only used as callback by erl_prim_loader
+parse_file(File) ->
+    try parse_file(File, false) of
+	{_Source, _Module, FormsOrBin, _HasRecs, _Mode}
+	  when is_binary(FormsOrBin) ->
+	    {ok, FormsOrBin};
+	_ ->
+	    {error, no_archive_bin}
+    catch
+	throw:Reason ->
+	    {error, Reason}
+    end.
+
 parse_file(File, CheckOnly) ->
     {HeaderSz, NextLineNo, Fd, Sections} =
 	parse_header(File, false),
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index afa914a456..61bb038737 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -42,11 +42,16 @@
 
 -export([i/0, i/1, i/2, i/3]).
 
--export_type([tab/0, tid/0, match_spec/0]).
+-export_type([tab/0, tid/0, match_spec/0, comp_match_spec/0, match_pattern/0]).
 
 %%-----------------------------------------------------------------------------
 
+-type access()     :: public | protected | private.
 -type tab()        :: atom() | tid().
+-type type()       :: set | ordered_set | bag | duplicate_bag.
+-type continuation() :: '$end_of_table'
+                      | {tab(),integer(),integer(),binary(),list(),integer()}
+                      | {tab(),_,_,integer(),binary(),list(),integer(),integer()}.
 
 %% a similar definition is also in erl_types
 -opaque tid()      :: integer().
@@ -57,59 +62,398 @@
 
 %%-----------------------------------------------------------------------------
 
-%% The following functions used to be found in this module, but
-%% are now BIFs (i.e. implemented in C).
-%%
-%% all/0
-%% new/2
-%% delete/1
-%% delete/2
-%% first/1
-%% info/1
-%% info/2
-%% safe_fixtable/2
-%% lookup/2
-%% lookup_element/3
-%% insert/2
-%% is_compiled_ms/1
-%% last/1
-%% member/2
-%% next/2
-%% prev/2
-%% rename/2
-%% slot/2
-%% match/1
-%% match/2
-%% match/3
-%% match_object/1
-%% match_object/2
-%% match_object/3
-%% match_spec_compile/1
-%% match_spec_run_r/3
-%% select/1
-%% select/2
-%% select/3
-%% select_count/2
-%% select_reverse/1
-%% select_reverse/2
-%% select_reverse/3
-%% select_delete/2
-%% setopts/2
-%% update_counter/3
-%% update_element/3
-%%
+%%% BIFs
+
+-export([all/0, delete/1, delete/2, delete_all_objects/1,
+         delete_object/2, first/1, give_away/3, info/1, info/2,
+         insert/2, insert_new/2, is_compiled_ms/1, last/1, lookup/2,
+         lookup_element/3, match/1, match/2, match/3, match_object/1,
+         match_object/2, match_object/3, match_spec_compile/1,
+         match_spec_run_r/3, member/2, new/2, next/2, prev/2,
+         rename/2, safe_fixtable/2, select/1, select/2, select/3,
+         select_count/2, select_delete/2, select_reverse/1,
+         select_reverse/2, select_reverse/3, setopts/2, slot/2,
+         update_counter/3, update_element/3]).
+
+-spec all() -> [Tab] when
+      Tab :: tab().
+
+all() ->
+    erlang:nif_error(undef).
+
+-spec delete(Tab) -> true when
+      Tab :: tab().
+
+delete(_) ->
+    erlang:nif_error(undef).
+
+-spec delete(Tab, Key) -> true when
+      Tab :: tab(),
+      Key :: term().
+
+delete(_, _) ->
+    erlang:nif_error(undef).
+
+-spec delete_all_objects(Tab) -> true when
+      Tab :: tab().
+
+delete_all_objects(_) ->
+    erlang:nif_error(undef).
+
+-spec delete_object(Tab, Object) -> true when
+      Tab :: tab(),
+      Object :: tuple().
+
+delete_object(_, _) ->
+    erlang:nif_error(undef).
+
+-spec first(Tab) -> Key | '$end_of_table' when
+      Tab :: tab(),
+      Key :: term().
+
+first(_) ->
+    erlang:nif_error(undef).
+
+-spec give_away(Tab, Pid, GiftData) -> true when
+      Tab :: tab(),
+      Pid :: pid(),
+      GiftData :: term().
+
+give_away(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec info(Tab) -> InfoList | undefined when
+      Tab :: tab(),
+      InfoList :: [InfoTuple],
+      InfoTuple :: {compressed, boolean()}
+                 | {heir, pid() | none}
+                 | {keypos, pos_integer()}
+                 | {memory, non_neg_integer()}
+                 | {name, atom()}
+                 | {named_table, boolean()}
+                 | {node, node()}
+                 | {owner, pid()}
+                 | {protection, access()}
+                 | {size, non_neg_integer()}
+                 | {type, type()}.
+
+info(_) ->
+    erlang:nif_error(undef).
+
+-spec info(Tab, Item) -> Value | undefined when
+      Tab :: tab(),
+      Item :: compressed | fixed | heir | keypos | memory
+            | name | named_table | node | owner | protection
+            | safe_fixed | size | stats | type,
+      Value :: term().
+
+info(_, _) ->
+    erlang:nif_error(undef).
+
+-spec insert(Tab, ObjectOrObjects) -> true when
+      Tab :: tab(),
+      ObjectOrObjects :: tuple() | [tuple()].
+
+insert(_, _) ->
+    erlang:nif_error(undef).
+
+-spec insert_new(Tab, ObjectOrObjects) -> boolean() when
+      Tab :: tab(),
+      ObjectOrObjects :: tuple() | [tuple()].
+
+insert_new(_, _) ->
+    erlang:nif_error(undef).
+
+-spec is_compiled_ms(Term) -> boolean() when
+      Term :: term().
+
+is_compiled_ms(_) ->
+    erlang:nif_error(undef).
+
+-spec last(Tab) -> Key | '$end_of_table' when
+      Tab :: tab(),
+      Key :: term().
+
+last(_) ->
+    erlang:nif_error(undef).
+
+-spec lookup(Tab, Key) -> [Object] when
+      Tab :: tab(),
+      Key :: term(),
+      Object :: tuple().
+
+lookup(_, _) ->
+    erlang:nif_error(undef).
+
+-spec lookup_element(Tab, Key, Pos) -> Elem when
+      Tab :: tab(),
+      Key :: term(),
+      Pos :: pos_integer(),
+      Elem :: term() | [term()].
+
+lookup_element(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec match(Tab, Pattern) -> [Match] when
+      Tab :: tab(),
+      Pattern :: match_pattern(),
+      Match :: [term()].
+
+match(_, _) ->
+    erlang:nif_error(undef).
+
+-spec match(Tab, Pattern, Limit) -> {[Match], Continuation} |
+                                       '$end_of_table'  when
+      Tab :: tab(),
+      Pattern :: match_pattern(),
+      Limit :: pos_integer(),
+      Match :: [term()],
+      Continuation :: continuation().
+
+match(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec match(Continuation) -> {[Match], Continuation} |
+                                '$end_of_table'  when
+      Match :: [term()],
+      Continuation :: continuation().
+
+match(_) ->
+    erlang:nif_error(undef).
+
+-spec match_object(Tab, Pattern) -> [Object] when
+      Tab :: tab(),
+      Pattern :: match_pattern(),
+      Object :: tuple().
+
+match_object(_, _) ->
+    erlang:nif_error(undef).
+
+-spec match_object(Tab, Pattern, Limit) -> {[Match], Continuation} |
+                                           '$end_of_table' when
+      Tab :: tab(),
+      Pattern :: match_pattern(),
+      Limit :: pos_integer(),
+      Match :: [term()],
+      Continuation :: continuation().
+
+match_object(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec match_object(Continuation) -> {[Match], Continuation} |
+                                    '$end_of_table' when
+      Match :: [term()],
+      Continuation :: continuation().
+
+match_object(_) ->
+    erlang:nif_error(undef).
+
+-spec match_spec_compile(MatchSpec) -> CompiledMatchSpec when
+      MatchSpec :: match_spec(),
+      CompiledMatchSpec :: comp_match_spec().
 
--opaque comp_match_spec() :: any().  %% this one is REALLY opaque
+match_spec_compile(_) ->
+    erlang:nif_error(undef).
 
--spec match_spec_run([tuple()], comp_match_spec()) -> [term()].
+-spec match_spec_run_r(List, CompiledMatchSpec, list()) -> list() when
+      List :: [tuple()],
+      CompiledMatchSpec :: comp_match_spec().
+
+match_spec_run_r(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec member(Tab, Key) -> boolean() when
+      Tab :: tab(),
+      Key :: term().
+
+member(_, _) ->
+    erlang:nif_error(undef).
+
+-spec new(Name, Options) -> tid() | atom() when
+      Name :: atom(),
+      Options :: [Option],
+      Option :: Type | Access | named_table | {keypos,Pos}
+              | {heir, Pid :: pid(), HeirData} | {heir, none} | Tweaks,
+      Type :: type(),
+      Access :: access(),
+      Tweaks :: {write_concurrency, boolean()}
+              | {read_concurrency, boolean()}
+              | compressed,
+      Pos :: pos_integer(),
+      HeirData :: term().
+
+new(_, _) ->
+    erlang:nif_error(undef).
+
+-spec next(Tab, Key1) -> Key2 | '$end_of_table' when
+      Tab :: tab(),
+      Key1 :: term(),
+      Key2 :: term().
+
+next(_, _) ->
+    erlang:nif_error(undef).
+
+-spec prev(Tab, Key1) -> Key2 | '$end_of_table' when
+      Tab :: tab(),
+      Key1 :: term(),
+      Key2 :: term().
+
+prev(_, _) ->
+    erlang:nif_error(undef).
+
+%% Shadowed by erl_bif_types: ets:rename/2
+-spec rename(Tab, Name) -> Name when
+      Tab :: tab(),
+      Name :: atom().
+
+rename(_, _) ->
+    erlang:nif_error(undef).
+
+-spec safe_fixtable(Tab, Fix) -> true when
+      Tab :: tab(),
+      Fix :: boolean().
+
+safe_fixtable(_, _) ->
+    erlang:nif_error(undef).
+
+-spec select(Tab, MatchSpec) -> [Match] when
+      Tab :: tab(),
+      MatchSpec :: match_spec(),
+      Match :: term().
+
+select(_, _) ->
+    erlang:nif_error(undef).
+
+-spec select(Tab, MatchSpec, Limit) -> {[Match],Continuation} |
+                                       '$end_of_table' when
+      Tab :: tab(),
+      MatchSpec :: match_spec(),
+      Limit :: pos_integer(),
+      Match :: term(),
+      Continuation :: continuation().
+
+select(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec select(Continuation) -> {[Match],Continuation} | '$end_of_table' when
+      Match :: term(),
+      Continuation :: continuation().
+
+select(_) ->
+    erlang:nif_error(undef).
+
+-spec select_count(Tab, MatchSpec) -> NumMatched when
+      Tab :: tab(),
+      MatchSpec :: match_spec(),
+      NumMatched :: non_neg_integer().
+
+select_count(_, _) ->
+    erlang:nif_error(undef).
+
+-spec select_delete(Tab, MatchSpec) -> NumDeleted when
+      Tab :: tab(),
+      MatchSpec :: match_spec(),
+      NumDeleted :: non_neg_integer().
+
+select_delete(_, _) ->
+    erlang:nif_error(undef).
+
+-spec select_reverse(Tab, MatchSpec) -> [Match] when
+      Tab :: tab(),
+      MatchSpec :: match_spec(),
+      Match :: term().
+
+select_reverse(_, _) ->
+    erlang:nif_error(undef).
+
+-spec select_reverse(Tab, MatchSpec, Limit) -> {[Match],Continuation} |
+                                               '$end_of_table' when
+      Tab :: tab(),
+      MatchSpec :: match_spec(),
+      Limit :: pos_integer(),
+      Match :: term(),
+      Continuation :: continuation().
+
+select_reverse(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec select_reverse(Continuation) -> {[Match],Continuation} |
+                                      '$end_of_table' when
+      Continuation :: continuation(),
+      Match :: term().
+
+select_reverse(_) ->
+    erlang:nif_error(undef).
+
+-spec setopts(Tab, Opts) -> true when
+      Tab :: tab(),
+      Opts :: Opt | [Opt],
+      Opt :: {heir, pid(), HeirData} | {heir,none},
+      HeirData :: term().
+
+setopts(_, _) ->
+    erlang:nif_error(undef).
+
+-spec slot(Tab, I) -> [Object] | '$end_of_table' when
+      Tab :: tab(),
+      I :: non_neg_integer(),
+      Object :: tuple().
+
+slot(_, _) ->
+    erlang:nif_error(undef).
+
+-spec update_counter(Tab, Key, UpdateOp) -> Result when
+      Tab :: tab(),
+      Key :: term(),
+      UpdateOp :: {Pos, Incr} | {Pos, Incr, Threshold, SetValue},
+      Pos :: integer(),
+      Incr :: integer(),
+      Threshold :: integer(),
+      SetValue :: integer(),
+      Result :: integer();
+                       (Tab, Key, [UpdateOp]) -> [Result] when
+      Tab :: tab(),
+      Key :: term(),
+      UpdateOp :: {Pos, Incr} | {Pos, Incr, Threshold, SetValue},
+      Pos :: integer(),
+      Incr :: integer(),
+      Threshold :: integer(),
+      SetValue :: integer(),
+      Result :: integer();
+                       (Tab, Key, Incr) -> Result when
+      Tab :: tab(),
+      Key :: term(),
+      Incr :: integer(),
+      Result :: integer().
+
+update_counter(_, _, _) ->
+    erlang:nif_error(undef).
+
+-spec update_element(Tab, Key, ElementSpec :: {Pos, Value}) -> boolean() when
+      Tab :: tab(),
+      Key :: term(),
+      Pos :: pos_integer(),
+      Value :: term();
+                       (Tab, Key, ElementSpec :: [{Pos, Value}]) -> boolean() when
+      Tab :: tab(),
+      Key :: term(),
+      Pos :: pos_integer(),
+      Value :: term().
+
+update_element(_, _, _) ->
+    erlang:nif_error(undef).
+
+%%% End of BIFs
+
+-opaque comp_match_spec() :: binary().  %% this one is REALLY opaque
+
+-spec match_spec_run(List, CompiledMatchSpec) -> list() when
+      List :: [tuple()],
+      CompiledMatchSpec :: comp_match_spec().
 
 match_spec_run(List, CompiledMS) ->
     lists:reverse(ets:match_spec_run_r(List, CompiledMS, [])).
 
--type continuation() :: '$end_of_table'
-                      | {tab(),integer(),integer(),binary(),list(),integer()}
-                      | {tab(),_,_,integer(),binary(),list(),integer(),integer()}.
-
 -spec repair_continuation(Continuation, MatchSpec) -> Continuation when
       Continuation :: continuation(),
       MatchSpec :: match_spec().
diff --git a/lib/stdlib/src/filelib.erl b/lib/stdlib/src/filelib.erl
index d532cea187..318f3b87b8 100644
--- a/lib/stdlib/src/filelib.erl
+++ b/lib/stdlib/src/filelib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -132,6 +132,8 @@ do_wildcard_comp({compiled_wildcard,{exists,File}}, Mod) ->
 	{ok,_} -> [File];
 	_ -> []
     end;
+do_wildcard_comp({compiled_wildcard,[cwd,Base|Rest]}, Mod) ->
+    do_wildcard_1([Base], Rest, Mod);
 do_wildcard_comp({compiled_wildcard,[Base|Rest]}, Mod) ->
     do_wildcard_1([Base], Rest, Mod).
 
@@ -143,7 +145,11 @@ do_wildcard_comp({compiled_wildcard,{exists,File}}, Cwd, Mod) ->
 	{ok,_} -> [File];
 	_ -> []
     end;
-do_wildcard_comp({compiled_wildcard,[current|Rest]}, Cwd0, Mod) ->
+do_wildcard_comp({compiled_wildcard,[cwd|Rest0]}, Cwd0, Mod) ->
+    case Rest0 of
+	[current|Rest] -> ok;
+	Rest -> ok
+    end,
     {Cwd,PrefixLen} = case filename:join([Cwd0]) of
 	      Bin when is_binary(Bin) -> {Bin,byte_size(Bin)+1};
 	      Other -> {Other,length(Other)+1}
@@ -264,6 +270,9 @@ ensure_dir(F) ->
     case do_is_dir(Dir, file) of
 	true ->
 	    ok;
+	false when Dir =:= F ->
+	    %% Protect against infinite loop
+	    {error,einval};
 	false ->
 	    ensure_dir(Dir),
 	    case file:make_dir(Dir) of
@@ -292,6 +301,8 @@ do_wildcard_2([File|Rest], Pattern, Result, Mod) ->
 do_wildcard_2([], _, Result, _Mod) ->
     Result.
 
+do_wildcard_3(Base, [[double_star]|Rest], Result, Mod) ->
+    lists:sort(do_double_star(current, [Base], Rest, Result, Mod, true));
 do_wildcard_3(Base, [Pattern|Rest], Result, Mod) ->
     case do_list_dir(Base, Mod) of
 	{ok, Files0} ->
@@ -325,6 +336,8 @@ wildcard_5([question|Rest1], [_|Rest2]) ->
     wildcard_5(Rest1, Rest2);
 wildcard_5([accept], _) ->
     true;
+wildcard_5([double_star], _) ->
+    true;
 wildcard_5([star|Rest], File) ->
     do_star(Rest, File);
 wildcard_5([{one_of, Ordset}|Rest], [C|File]) ->
@@ -345,6 +358,21 @@ wildcard_5([], [_|_]) ->
 wildcard_5([_|_], []) ->
     false.
 
+do_double_star(Base, [H|T], Rest, Result, Mod, Root) ->
+    Full = join(Base, H),
+    Result1 = case do_list_dir(Full, Mod) of
+        {ok, Files} ->
+            do_double_star(Full, Files, Rest, Result, Mod, false);
+        _ -> Result
+    end,
+    Result2 = case Root andalso Rest == [] of
+        true  -> Result1;
+        false -> do_wildcard_3(Full, Rest, Result1, Mod)
+    end,
+    do_double_star(Base, T, Rest, Result2, Mod, Root);
+do_double_star(_Base, [], _Rest, Result, _Mod, _Root) ->
+    Result.
+
 do_star(Pattern, [X|Rest]) ->
     case wildcard_5(Pattern, [X|Rest]) of
 	true  -> true;
@@ -380,7 +408,10 @@ compile_wildcard_1(Pattern) ->
     [Root|Rest] = filename:split(Pattern),
     case filename:pathtype(Root) of
 	relative ->
-	    compile_wildcard_2([Root|Rest], current);
+	    case compile_wildcard_2([Root|Rest], current) of
+		{exists,_}=Wc -> Wc;
+		[_|_]=Wc -> [cwd|Wc]
+	    end;
 	_ ->
 	    compile_wildcard_2(Rest, [Root])
     end.
@@ -413,6 +444,10 @@ compile_part([$}|Rest], true, Result) ->
     {ok, $}, lists:reverse(Result), Rest};
 compile_part([$?|Rest], Upto, Result) ->
     compile_part(Rest, Upto, [question|Result]);
+compile_part([$*,$*], Upto, Result) ->
+    compile_part([], Upto, [double_star|Result]);
+compile_part([$*,$*|Rest], Upto, Result) ->
+    compile_part(Rest, Upto, [star|Result]);
 compile_part([$*], Upto, Result) ->
     compile_part([], Upto, [accept|Result]);
 compile_part([$*|Rest], Upto, Result) ->
diff --git a/lib/stdlib/src/filename.erl b/lib/stdlib/src/filename.erl
index dbfcbea4f7..59d6de5d10 100644
--- a/lib/stdlib/src/filename.erl
+++ b/lib/stdlib/src/filename.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -69,7 +69,7 @@ absname(Name) ->
 
 -spec absname(Filename, Dir) -> file:filename() when
       Filename :: file:name(),
-      Dir :: file:filename().
+      Dir :: file:name().
 absname(Name, AbsBase) when is_binary(Name), is_list(AbsBase) ->
     absname(Name,filename_string_to_binary(AbsBase));
 absname(Name, AbsBase) when is_list(Name), is_binary(AbsBase) ->
@@ -123,7 +123,7 @@ absname_vr([[X, $:]|Name], _, _AbsBase) ->
 %% AbsBase must be absolute and Name must be relative.
 
 -spec absname_join(Dir, Filename) -> file:filename() when
-      Dir :: file:filename(),
+      Dir :: file:name(),
       Filename :: file:name().
 absname_join(AbsBase, Name) ->
     join(AbsBase, flatten(Name)).
@@ -388,7 +388,7 @@ extension([], Result, _OsType) ->
 %% Joins a list of filenames with directory separators.
 
 -spec join(Components) -> file:filename() when
-      Components :: [file:filename()].
+      Components :: [file:name()].
 join([Name1, Name2|Rest]) ->
     join([join(Name1, Name2)|Rest]);
 join([Name]) when is_list(Name) ->
@@ -401,8 +401,8 @@ join([Name]) when is_atom(Name) ->
 %% Joins two filenames with directory separators.
 
 -spec join(Name1, Name2) -> file:filename() when
-      Name1 :: file:filename(),
-      Name2 :: file:filename().
+      Name1 :: file:name(),
+      Name2 :: file:name().
 join(Name1, Name2) when is_list(Name1), is_list(Name2) ->
     OsType = major_os_type(),
     case pathtype(Name2) of
@@ -624,7 +624,7 @@ rootname2([Char|Rest], Ext, Result) when is_integer(Char) ->
 
 -spec split(Filename) -> Components when
       Filename :: file:name(),
-      Components :: [file:filename()].
+      Components :: [file:name()].
 split(Name) when is_binary(Name) ->
     case os:type() of
 	{win32, _} -> win32_splitb(Name);
@@ -718,7 +718,7 @@ split([], Comp, Components, OsType) ->
 %% name will be normalized as done by join/1.
 
 -spec nativename(Path) -> file:filename() when
-      Path :: file:filename().
+      Path :: file:name().
 nativename(Name0) ->
     Name = join([Name0]),			%Normalize.
     case os:type() of
@@ -726,6 +726,8 @@ nativename(Name0) ->
 	_          -> Name
     end.
 
+win32_nativename(Name) when is_binary(Name) ->
+    binary:replace(Name, <<"/">>, <<"\\">>, [global]);
 win32_nativename([$/|Rest]) ->
     [$\\|win32_nativename(Rest)];
 win32_nativename([C|Rest]) ->
@@ -913,10 +915,8 @@ make_abs_path(BasePath, Path) ->
     join(BasePath, Path).
 
 major_os_type() ->
-    case os:type() of
-	{OsT, _} -> OsT;
-	OsT -> OsT
-    end.
+    {OsT, _} = os:type(),
+    OsT.
 
 %% flatten(List)
 %%  Flatten a list, also accepting atoms.
diff --git a/lib/stdlib/src/gb_sets.erl b/lib/stdlib/src/gb_sets.erl
index 91d21d869c..391f1cff64 100644
--- a/lib/stdlib/src/gb_sets.erl
+++ b/lib/stdlib/src/gb_sets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -196,6 +196,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Some types.
 
+-export_type([iter/0]).
+
 -type gb_set_node() :: 'nil' | {term(), _, _}.
 -opaque iter() :: [gb_set_node()].
 
diff --git a/lib/stdlib/src/gb_trees.erl b/lib/stdlib/src/gb_trees.erl
index 6ad861ff5b..258713c90f 100644
--- a/lib/stdlib/src/gb_trees.erl
+++ b/lib/stdlib/src/gb_trees.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -152,6 +152,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Some types.
 
+-export_type([iter/0]).
+
 -type gb_tree_node() :: 'nil' | {_, _, _, _}.
 -opaque iter() :: [gb_tree_node()].
 
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index 59c6d240ba..04308a51b7 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -270,7 +270,7 @@ enter_loop(Mod, Options, State) ->
     enter_loop(Mod, Options, State, self(), infinity).
 
 enter_loop(Mod, Options, State, ServerName = {Scope, _})
-  when Scope == local; Scope == local ->
+  when Scope == local; Scope == global ->
     enter_loop(Mod, Options, State, ServerName, infinity);
 
 enter_loop(Mod, Options, State, ServerName = {via, _, _}) ->
diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index 0252cdf742..513d904c39 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -82,7 +82,10 @@
 -type chars() :: [char() | chars()].
 -type depth() :: -1 | non_neg_integer().
 
--opaque continuation() :: {_, _, _, _}.  % XXX: refine
+-opaque continuation() :: {Format :: string(),
+                           Stack :: chars(),
+                           Nchars :: non_neg_integer(),
+                           Results :: [term()]}.
 
 %%----------------------------------------------------------------------
 
@@ -250,10 +253,10 @@ write_ref(Ref) ->
 write_binary(B, D) when is_integer(D) ->
     [$<,$<,write_binary_body(B, D),$>,$>].
 
-write_binary_body(_B, 1) ->
-    "...";
 write_binary_body(<<>>, _D) ->
     "";
+write_binary_body(_B, 1) ->
+    "...";
 write_binary_body(<<X:8>>, _D) ->
     [integer_to_list(X)];
 write_binary_body(<<X:8,Rest/bitstring>>, D) ->
diff --git a/lib/stdlib/src/lib.erl b/lib/stdlib/src/lib.erl
index 314fd60903..cf4b87d7eb 100644
--- a/lib/stdlib/src/lib.erl
+++ b/lib/stdlib/src/lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -209,7 +209,7 @@ explain_reason(badarg, error, [], _PF, _S) ->
 explain_reason({badarg,V}, error=Cl, [], PF, S) -> % orelse, andalso
     format_value(V, <<"bad argument: ">>, Cl, PF, S);
 explain_reason(badarith, error, [], _PF, _S) ->
-    <<"bad argument in an arithmetic expression">>;
+    <<"an error occurred when evaluating an arithmetic expression">>;
 explain_reason({badarity,{Fun,As}}, error, [], _PF, _S) 
                                       when is_function(Fun) ->
     %% Only the arity is displayed, not the arguments As.
diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl
index e73c087753..961c060019 100644
--- a/lib/stdlib/src/lists.erl
+++ b/lib/stdlib/src/lists.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -33,9 +33,6 @@
 	 keysort/2, keymerge/3, rkeymerge/3, rukeymerge/3, 
 	 ukeysort/2, ukeymerge/3, keymap/3]).
 
-%% Bifs: member/2, reverse/2
-%% Bifs: keymember/3, keysearch/3, keyfind/3
-
 -export([merge/3, rmerge/3, sort/2, umerge/3, rumerge/3, usort/2]).
 
 -export([all/2,any/2,map/2,flatmap/2,foldl/3,foldr/3,filter/2,
@@ -43,6 +40,60 @@
 	 mapfoldl/3,mapfoldr/3,foreach/2,takewhile/2,dropwhile/2,splitwith/2,
 	 split/2]).
 
+%%% BIFs
+-export([keyfind/3, keymember/3, keysearch/3, member/2, reverse/2]).
+
+%% Shadowed by erl_bif_types: lists:keyfind/3
+-spec keyfind(Key, N, TupleList) -> Tuple | false when
+      Key :: term(),
+      N :: pos_integer(),
+      TupleList :: [Tuple],
+      Tuple :: tuple().
+
+keyfind(_, _, _) ->
+    erlang:nif_error(undef).
+
+%% Shadowed by erl_bif_types: lists:keymember/3
+-spec keymember(Key, N, TupleList) -> boolean() when
+      Key :: term(),
+      N :: pos_integer(),
+      TupleList :: [Tuple],
+      Tuple :: tuple().
+
+keymember(_, _, _) ->
+    erlang:nif_error(undef).
+
+%% Shadowed by erl_bif_types: lists:keysearch/3
+-spec keysearch(Key, N, TupleList) -> {value, Tuple} | false when
+      Key :: term(),
+      N :: pos_integer(),
+      TupleList :: [Tuple],
+      Tuple :: tuple().
+
+keysearch(_, _, _) ->
+    erlang:nif_error(undef).
+
+%% Shadowed by erl_bif_types: lists:member/2
+-spec member(Elem, List) -> boolean() when
+      Elem :: T,
+      List :: [T],
+      T :: term().
+
+member(_, _) ->
+    erlang:nif_error(undef).
+
+%% Shadowed by erl_bif_types: lists:reverse/2
+-spec reverse(List1, Tail) -> List2 when
+      List1 :: [T],
+      Tail :: term(),
+      List2 :: [T],
+      T :: term().
+
+reverse(_, _) ->
+    erlang:nif_error(undef).
+
+%%% End of BIFs
+
 %% member(X, L) -> (true | false)
 %%  test if X is a member of the list L
 %%  Now a BIF!
@@ -84,7 +135,7 @@ append([]) -> [].
 
 subtract(L1, L2) -> L1 -- L2.
 
-%% reverse(L) reverse all elements in the list L. Is now a BIF!
+%% reverse(L) reverse all elements in the list L. reverse/2 is now a BIF!
 
 -spec reverse(List1) -> List2 when
       List1 :: [T],
@@ -581,6 +632,7 @@ flatlength([_|T], L) ->
 flatlength([], L) -> L.
 
 %% keymember(Key, Index, [Tuple]) Now a BIF!
+%% keyfind(Key, Index, [Tuple]) A BIF!
 %% keysearch(Key, Index, [Tuple]) Now a BIF!
 %% keydelete(Key, Index, [Tuple])
 %% keyreplace(Key, Index, [Tuple], NewTuple)
@@ -1126,8 +1178,7 @@ rumerge(T1, [H2 | T2]) ->
 %% takewhile(Predicate, List)
 %% dropwhile(Predicate, List)
 %% splitwith(Predicate, List)
-%%  for list programming. Function here is a 'fun'. For backward compatibility,
-%%  {Module,Function} is still accepted.
+%%  for list programming. Function here is a 'fun'.
 %% 
 %%  The name zf is a joke!
 %%
diff --git a/lib/stdlib/src/log_mf_h.erl b/lib/stdlib/src/log_mf_h.erl
index f7f128dac7..19b555a48c 100644
--- a/lib/stdlib/src/log_mf_h.erl
+++ b/lib/stdlib/src/log_mf_h.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -25,6 +25,8 @@
 -export([init/1, handle_event/2, handle_info/2, terminate/2]).
 -export([handle_call/2, code_change/3]). 
 
+-export_type([args/0]).
+
 %%-----------------------------------------------------------------
 
 -type b()    :: non_neg_integer().
diff --git a/lib/stdlib/src/math.erl b/lib/stdlib/src/math.erl
index b2ea6195c5..c3fb684ec3 100644
--- a/lib/stdlib/src/math.erl
+++ b/lib/stdlib/src/math.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -20,6 +20,116 @@
 
 -export([pi/0]).
 
+%%% BIFs
+
+-export([sin/1, cos/1, tan/1, asin/1, acos/1, atan/1, atan2/2, sinh/1,
+         cosh/1, tanh/1, asinh/1, acosh/1, atanh/1, exp/1, log/1,
+         log10/1, pow/2, sqrt/1, erf/1, erfc/1]).
+
+-spec acos(X) -> float() when
+      X :: number().
+acos(_) ->
+    erlang:nif_error(undef).
+
+-spec acosh(X) -> float() when
+      X :: number().
+acosh(_) ->
+    erlang:nif_error(undef).
+
+-spec asin(X) -> float() when
+      X :: number().
+asin(_) ->
+    erlang:nif_error(undef).
+
+-spec asinh(X) -> float() when
+      X :: number().
+asinh(_) ->
+    erlang:nif_error(undef).
+
+-spec atan(X) -> float() when
+      X :: number().
+atan(_) ->
+    erlang:nif_error(undef).
+
+-spec atan2(X, Y) -> float() when
+      X :: number(),
+      Y :: number().
+atan2(_, _) ->
+    erlang:nif_error(undef).
+
+-spec atanh(X) -> float() when
+      X :: number().
+atanh(_) ->
+    erlang:nif_error(undef).
+
+-spec cos(X) -> float() when
+      X :: number().
+cos(_) ->
+    erlang:nif_error(undef).
+
+-spec cosh(X) -> float() when
+      X :: number().
+cosh(_) ->
+    erlang:nif_error(undef).
+
+-spec erf(X) -> float() when
+      X :: number().
+erf(_) ->
+    erlang:nif_error(undef).
+
+-spec erfc(X) -> float() when
+      X :: number().
+erfc(_) ->
+    erlang:nif_error(undef).
+
+-spec exp(X) -> float() when
+      X :: number().
+exp(_) ->
+    erlang:nif_error(undef).
+
+-spec log(X) -> float() when
+      X :: number().
+log(_) ->
+    erlang:nif_error(undef).
+
+-spec log10(X) -> float() when
+      X :: number().
+log10(_) ->
+    erlang:nif_error(undef).
+
+-spec pow(X, Y) -> float() when
+      X :: number(),
+      Y :: number().
+pow(_, _) ->
+    erlang:nif_error(undef).
+
+-spec sin(X) -> float() when
+      X :: number().
+sin(_) ->
+    erlang:nif_error(undef).
+
+-spec sinh(X) -> float() when
+      X :: number().
+sinh(_) ->
+    erlang:nif_error(undef).
+
+-spec sqrt(X) -> float() when
+      X :: number().
+sqrt(_) ->
+    erlang:nif_error(undef).
+
+-spec tan(X) -> float() when
+      X :: number().
+tan(_) ->
+    erlang:nif_error(undef).
+
+-spec tanh(X) -> float() when
+      X :: number().
+tanh(_) ->
+    erlang:nif_error(undef).
+
+%%% End of BIFs
+
 -spec pi() -> float().
 
 pi() -> 3.1415926535897932.
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index b9fbef9ed0..cddf345c76 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -349,7 +349,7 @@ obsolete_1(asn1rt, F, _) when F == load_driver; F == unload_driver ->
 obsolete_1(ssl, pid, 1) ->
     {deprecated,"deprecated (will be removed in R17); is no longer needed"};
 obsolete_1(inviso, _, _) ->
-    {deprecated,"the inviso application has been deprecated and will be removed in R16"};
+    {removed,"the inviso application was removed in R16"};
 
 %% Added in R15B01.
 obsolete_1(gs, _, _) ->
diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl
index 02bcbb5a60..4bca4c1e6d 100644
--- a/lib/stdlib/src/proc_lib.erl
+++ b/lib/stdlib/src/proc_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -184,6 +184,17 @@ check_for_monitor(SpawnOpts) ->
 	    false
     end.
 
+spawn_mon(M,F,A) ->
+    Parent = get_my_name(),
+    Ancestors = get_ancestors(),
+    erlang:spawn_monitor(?MODULE, init_p, [Parent,Ancestors,M,F,A]).
+
+spawn_opt_mon(M, F, A, Opts) when is_atom(M), is_atom(F), is_list(A) ->
+    Parent = get_my_name(),
+    Ancestors = get_ancestors(),
+    check_for_monitor(Opts),
+    erlang:spawn_opt(?MODULE, init_p, [Parent,Ancestors,M,F,A], [monitor|Opts]).
+
 -spec hibernate(Module, Function, Args) -> no_return() when
       Module :: module(),
       Function :: atom(),
@@ -270,8 +281,8 @@ start(M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
       Ret :: term() | {error, Reason :: term()}.
 
 start(M, F, A, Timeout) when is_atom(M), is_atom(F), is_list(A) ->
-    Pid = ?MODULE:spawn(M, F, A),
-    sync_wait(Pid, Timeout).
+    PidRef = spawn_mon(M, F, A),
+    sync_wait_mon(PidRef, Timeout).
 
 -spec start(Module, Function, Args, Time, SpawnOpts) -> Ret when
       Module :: module(),
@@ -282,8 +293,8 @@ start(M, F, A, Timeout) when is_atom(M), is_atom(F), is_list(A) ->
       Ret :: term() | {error, Reason :: term()}.
 
 start(M, F, A, Timeout, SpawnOpts) when is_atom(M), is_atom(F), is_list(A) ->
-    Pid = ?MODULE:spawn_opt(M, F, A, SpawnOpts),
-    sync_wait(Pid, Timeout).
+    PidRef = spawn_opt_mon(M, F, A, SpawnOpts),
+    sync_wait_mon(PidRef, Timeout).
 
 -spec start_link(Module, Function, Args) -> Ret when
       Module :: module(),
@@ -330,6 +341,23 @@ sync_wait(Pid, Timeout) ->
 	    {error, timeout}
     end.
 
+sync_wait_mon({Pid, Ref}, Timeout) ->
+    receive
+	{ack, Pid, Return} ->
+	    erlang:demonitor(Ref, [flush]),
+	    Return;
+	{'DOWN', Ref, _Type, Pid, Reason} ->
+	    {error, Reason};
+	{'EXIT', Pid, Reason} -> %% link as spawn_opt?
+	    erlang:demonitor(Ref, [flush]),
+	    {error, Reason}
+    after Timeout ->
+	    erlang:demonitor(Ref, [flush]),
+	    exit(Pid, kill),
+	    flush(Pid),
+	    {error, timeout}
+    end.
+
 -spec flush(pid()) -> 'true'.
 
 flush(Pid) ->
diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl
index 2b691e6abf..9b71d0edb8 100644
--- a/lib/stdlib/src/qlc.erl
+++ b/lib/stdlib/src/qlc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -125,7 +125,7 @@
 
 -define(THROWN_ERROR, {?MODULE, throw_error, _, _}).
 
--export_type([query_handle/0]).
+-export_type([query_cursor/0, query_handle/0]).
 
 %%% A query handle is a tuple {qlc_handle, Handle} where Handle is one
 %%% of #qlc_append, #qlc_table, #qlc_sort, and #qlc_lc.
diff --git a/lib/stdlib/src/qlc_pt.erl b/lib/stdlib/src/qlc_pt.erl
index 21504d707b..ad25fd559c 100644
--- a/lib/stdlib/src/qlc_pt.erl
+++ b/lib/stdlib/src/qlc_pt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -2186,7 +2186,7 @@ try_ms(E, P, Fltr, State) ->
             {function,L,foo,0,[{clause,L,[],[],[MS0]}]} = lists:last(X),
             MS = erl_parse:normalise(var2const(MS0)),
             XMS = ets:match_spec_compile(MS),
-            true = is_binary(XMS),
+            true = ets:is_compiled_ms(XMS),
             {ok, MS, MS0} 
         end of
         {'EXIT', _Reason} ->
diff --git a/lib/stdlib/src/re.erl b/lib/stdlib/src/re.erl
index 246d535943..c5109ec455 100644
--- a/lib/stdlib/src/re.erl
+++ b/lib/stdlib/src/re.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -30,11 +30,65 @@
                         | {newline, nl_spec()}| bsr_anycrlf
                         | bsr_unicode.
 
-%% Emulator builtins in this module:
-%% re:compile/1
-%% re:compile/2
-%% re:run/2
-%% re:run/3
+%%% BIFs
+
+-export([compile/1, compile/2, run/2, run/3]).
+
+-spec compile(Regexp) -> {ok, MP} | {error, ErrSpec} when
+      Regexp :: iodata(),
+      MP :: mp(),
+      ErrSpec :: {ErrString :: string(), Position :: non_neg_integer()}.
+
+compile(_) ->
+    erlang:nif_error(undef).
+
+-spec compile(Regexp, Options) -> {ok, MP} | {error, ErrSpec} when
+      Regexp :: iodata() | unicode:charlist(),
+      Options :: [Option],
+      Option :: compile_option(),
+      MP :: mp(),
+      ErrSpec :: {ErrString :: string(), Position :: non_neg_integer()}.
+
+compile(_, _) ->
+    erlang:nif_error(undef).
+
+-spec run(Subject, RE) -> {match, Captured} | nomatch when
+      Subject :: iodata() | unicode:charlist(),
+      RE :: mp() | iodata(),
+      Captured :: [CaptureData],
+      CaptureData :: {integer(), integer()}.
+
+run(_, _) ->
+    erlang:nif_error(undef).
+
+-spec run(Subject, RE, Options) -> {match, Captured} |
+                                   match |
+                                   nomatch when
+      Subject :: iodata() | unicode:charlist(),
+      RE :: mp() | iodata() | unicode:charlist(),
+      Options :: [Option],
+      Option :: anchored | global | notbol | noteol | notempty
+              | {offset, non_neg_integer()} |
+                {newline, NLSpec :: nl_spec()} |
+                bsr_anycrlf | bsr_unicode | {capture, ValueSpec} |
+                {capture, ValueSpec, Type} | CompileOpt,
+      Type :: index | list | binary,
+      ValueSpec :: all | all_but_first | first | none | ValueList,
+      ValueList :: [ValueID],
+      ValueID :: integer() | string() | atom(),
+      CompileOpt :: compile_option(),
+      Captured :: [CaptureData] | [[CaptureData]],
+      CaptureData :: {integer(), integer()}
+                   | ListConversionData
+                   | binary(),
+      ListConversionData :: string()
+                          | {error, string(), binary()}
+                          | {incomplete, string(), binary()}.
+
+run(_, _, _) ->
+    erlang:nif_error(undef).
+
+%%% End of BIFs
 
 -spec split(Subject, RE) -> SplitList when
       Subject :: iodata() | unicode:charlist(),
@@ -355,6 +409,12 @@ apply_mlist(Subject,Replacement,Mlist) ->
 
 precomp_repl(<<>>) ->
     [];
+precomp_repl(<<$\\,$g,${,Rest/binary>>) when byte_size(Rest) > 0 ->
+    {NS, <<$},NRest/binary>>} = pick_int(Rest),
+    [list_to_integer(NS) | precomp_repl(NRest)];
+precomp_repl(<<$\\,$g,Rest/binary>>) when byte_size(Rest) > 0 ->
+    {NS,NRest} = pick_int(Rest),
+    [list_to_integer(NS) | precomp_repl(NRest)];
 precomp_repl(<<$\\,X,Rest/binary>>) when X < $1 ; X > $9 ->
     %% Escaped character
     case precomp_repl(Rest) of
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 94e81188b5..55c8087475 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -17,11 +17,11 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max two major revisions back
- [{<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
-  {<<"1\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R14
-  {<<"1\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R13
+ [{<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
+  {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
+  {<<"1\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R14
  %% Down to - max two major revisions back
- [{<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
-  {<<"1\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R14
-  {<<"1\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R13
+ [{<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
+  {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
+  {<<"1\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R14
 }.
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl
index 30eac4f07d..fc029a582f 100644
--- a/lib/stdlib/src/string.erl
+++ b/lib/stdlib/src/string.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -29,6 +29,30 @@
 
 %%---------------------------------------------------------------------------
 
+%%% BIFs
+
+-export([to_float/1, to_integer/1]).
+
+-spec to_float(String) -> {Float, Rest} | {error, Reason} when
+      String :: string(),
+      Float :: float(),
+      Rest :: string(),
+      Reason :: no_float | not_a_list.
+
+to_float(_) ->
+    erlang:nif_error(undef).
+
+-spec to_integer(String) -> {Int, Rest} | {error, Reason} when
+      String :: string(),
+      Int :: integer(),
+      Rest :: string(),
+      Reason :: no_integer | not_a_list.
+
+to_integer(_) ->
+    erlang:nif_error(undef).
+
+%%% End of BIFs
+
 %% Robert's bit
 
 %% len(String)
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
index 7d3c5a0e21..9f93747c3e 100644
--- a/lib/stdlib/src/supervisor.erl
+++ b/lib/stdlib/src/supervisor.erl
@@ -104,7 +104,9 @@
 %%% SupName = {local, atom()} | {global, atom()}.
 %%% ---------------------------------------------------
 
--type startlink_err() :: {'already_started', pid()} | 'shutdown' | term().
+-type startlink_err() :: {'already_started', pid()}
+                         | {'shutdown', term()}
+                         | term().
 -type startlink_ret() :: {'ok', pid()} | 'ignore' | {'error', startlink_err()}.
 
 -spec start_link(Module, Args) -> startlink_ret() when
@@ -221,8 +223,10 @@ cast(Supervisor, Req) ->
 
 -type init_sup_name() :: sup_name() | 'self'.
 
--type stop_rsn() :: 'shutdown' | {'bad_return', {module(),'init', term()}}
-                  | {'bad_start_spec', term()} | {'start_spec', term()}
+-type stop_rsn() :: {'shutdown', term()}
+                  | {'bad_return', {module(),'init', term()}}
+                  | {'bad_start_spec', term()}
+                  | {'start_spec', term()}
                   | {'supervisor_data', term()}.
 
 -spec init({init_sup_name(), module(), [term()]}) ->
@@ -253,9 +257,9 @@ init_children(State, StartSpec) ->
             case start_children(Children, SupName) of
                 {ok, NChildren} ->
                     {ok, State#state{children = NChildren}};
-                {error, NChildren} ->
+                {error, NChildren, Reason} ->
                     terminate_children(NChildren, SupName),
-                    {stop, shutdown}
+                    {stop, {shutdown, Reason}}
             end;
         Error ->
             {stop, {start_spec, Error}}
@@ -275,9 +279,9 @@ init_dynamic(_State, StartSpec) ->
 %% Func: start_children/2
 %% Args: Children = [child_rec()] in start order
 %%       SupName = {local, atom()} | {global, atom()} | {pid(), Mod}
-%% Purpose: Start all children.  The new list contains #child's 
+%% Purpose: Start all children.  The new list contains #child's
 %%          with pids.
-%% Returns: {ok, NChildren} | {error, NChildren}
+%% Returns: {ok, NChildren} | {error, NChildren, Reason}
 %%          NChildren = [child_rec()] in termination order (reversed
 %%                        start order)
 %%-----------------------------------------------------------------
@@ -293,7 +297,8 @@ start_children([Child|Chs], NChildren, SupName) ->
 	    start_children(Chs, [Child#child{pid = Pid}|NChildren], SupName);
 	{error, Reason} ->
 	    report_error(start_error, Reason, Child, SupName),
-	    {error, lists:reverse(Chs) ++ [Child | NChildren]}
+	    {error, lists:reverse(Chs) ++ [Child | NChildren],
+	     {failed_to_start_child,Child#child.name,Reason}}
     end;
 start_children([], NChildren, _SupName) ->
     {ok, NChildren}.
@@ -793,7 +798,7 @@ restart(rest_for_one, Child, State) ->
     case start_children(ChAfter2, State#state.name) of
 	{ok, ChAfter3} ->
 	    {ok, State#state{children = ChAfter3 ++ ChBefore}};
-	{error, ChAfter3} ->
+	{error, ChAfter3, _Reason} ->
 	    NChild = Child#child{pid=restarting(Child#child.pid)},
 	    NState = State#state{children = ChAfter3 ++ ChBefore},
 	    {try_again, replace_child(NChild,NState)}
@@ -804,7 +809,7 @@ restart(one_for_all, Child, State) ->
     case start_children(Children2, State#state.name) of
 	{ok, NChs} ->
 	    {ok, State#state{children = NChs}};
-	{error, NChs} ->
+	{error, NChs, _Reason} ->
 	    NChild = Child#child{pid=restarting(Child#child.pid)},
 	    NState = State#state{children = NChs},
 	    {try_again, replace_child(NChild,NState)}
diff --git a/lib/stdlib/src/sys.erl b/lib/stdlib/src/sys.erl
index f34201604c..4dd70ad425 100644
--- a/lib/stdlib/src/sys.erl
+++ b/lib/stdlib/src/sys.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -32,6 +32,8 @@
 %% Types
 %%-----------------------------------------------------------------
 
+-export_type([dbg_opt/0]).
+
 -type name()         :: pid() | atom() | {'global', atom()}.
 -type system_event() :: {'in', Msg :: _}
                       | {'in', Msg :: _, From :: _}
diff --git a/lib/stdlib/src/unicode.erl b/lib/stdlib/src/unicode.erl
index e9b90befe6..8b9412fb1b 100644
--- a/lib/stdlib/src/unicode.erl
+++ b/lib/stdlib/src/unicode.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -18,13 +18,6 @@
 %%
 -module(unicode).
 
-%% Implemented in the emulator:
-%% characters_to_binary/2 (will trap to characters_to_binary_int/2
-%%                         if InEncoding is not {latin1 | unicode | utf8})
-%% characters_to_list/2   (will trap to characters_to_list_int/2 if 
-%%                         InEncoding is not {latin1 | unicode | utf8})
-%%
-
 -export([characters_to_list/1, characters_to_list_int/2,
 	 characters_to_binary/1, characters_to_binary_int/2,
 	 characters_to_binary/3,
@@ -52,6 +45,45 @@
 -type latin1_charlist() :: [latin1_char() | latin1_binary()
                             | latin1_charlist()].
 
+%%% BIFs
+%%%
+%%% characters_to_binary/2 (will trap to characters_to_binary_int/2
+%%%                         if InEncoding is not {latin1 | unicode | utf8})
+%%% characters_to_list/2   (will trap to characters_to_list_int/2 if
+%%%                         InEncoding is not {latin1 | unicode | utf8})
+
+-export([bin_is_7bit/1, characters_to_binary/2, characters_to_list/2]).
+
+-spec bin_is_7bit(Binary) -> boolean() when
+      Binary :: binary().
+
+bin_is_7bit(_) ->
+    erlang:nif_error(undef).
+
+-spec characters_to_binary(Data, InEncoding) -> Result when
+      Data :: latin1_chardata() | chardata() | external_chardata(),
+      InEncoding :: encoding(),
+      Result :: binary()
+              | {error, binary(), RestData}
+              | {incomplete, binary(), binary()},
+      RestData :: latin1_chardata() | chardata() | external_chardata().
+
+characters_to_binary(_, _) ->
+    erlang:nif_error(undef).
+
+-spec characters_to_list(Data,  InEncoding) -> Result when
+      Data :: latin1_chardata() | chardata() | external_chardata(),
+      InEncoding :: encoding(),
+      Result :: list()
+              | {error, list(), RestData}
+              | {incomplete, list(), binary()},
+      RestData :: latin1_chardata() | chardata() | external_chardata().
+
+characters_to_list(_, _) ->
+    erlang:nif_error(undef).
+
+%%% End of BIFs
+
 -spec characters_to_list(Data) -> Result when
       Data :: latin1_chardata() | chardata() | external_chardata(),
       Result :: list()
diff --git a/lib/stdlib/src/win32reg.erl b/lib/stdlib/src/win32reg.erl
index 598e77ffdc..48a7e262be 100644
--- a/lib/stdlib/src/win32reg.erl
+++ b/lib/stdlib/src/win32reg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -25,6 +25,8 @@
 	 expand/1,
 	 format_error/1]).
 
+-export_type([reg_handle/0]).
+
 %% Key handles (always open).
 -define(hkey_classes_root, 16#80000000).
 -define(hkey_current_user, 16#80000001).
diff --git a/lib/stdlib/src/zip.erl b/lib/stdlib/src/zip.erl
index c82c8159b6..c383540db7 100644
--- a/lib/stdlib/src/zip.erl
+++ b/lib/stdlib/src/zip.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1017,7 +1017,7 @@ cd_file_header_from_lh_and_pos(LH, Pos) ->
 		    file_name_length = FileNameLength,
 		    extra_field_length = ExtraFieldLength,
 		    file_comment_length = 0, % FileCommentLength,
-		    disk_num_start = 1, % DiskNumStart,
+		    disk_num_start = 0, % DiskNumStart,
 		    internal_attr = 0, % InternalAttr,
 		    external_attr = 0, % ExternalAttr,
 		    local_header_offset = Pos}.
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile
index 4de6ea3ee7..29b8e28d3a 100644
--- a/lib/stdlib/test/Makefile
+++ b/lib/stdlib/test/Makefile
@@ -135,10 +135,10 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) stdlib.spec $(EMAKEFILE) \
-		$(ERL_FILES) $(COVERFILE) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+		$(ERL_FILES) $(COVERFILE) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/stdlib/test/base64_SUITE.erl b/lib/stdlib/test/base64_SUITE.erl
index c64a961ffa..7b8650f224 100644
--- a/lib/stdlib/test/base64_SUITE.erl
+++ b/lib/stdlib/test/base64_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -20,7 +20,6 @@
 -module(base64_SUITE).
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
 
 %% Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -33,7 +32,7 @@
 	 mime_decode_to_string/1, roundtrip/1]).
 
 init_per_testcase(_, Config) ->
-    Dog = test_server:timetrap(?t:minutes(2)),
+    Dog = test_server:timetrap(?t:minutes(4)),
     NewConfig = lists:keydelete(watchdog, 1, Config),
     [{watchdog, Dog} | NewConfig].
 
diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index 6f77cff2b9..66799f4d05 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -38,7 +38,7 @@
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
-	 not_run/1, newly_started/1, basic_v8/1, basic_v9/1,
+	 newly_started/1, basic_v8/1, basic_v9/1,
 	 open_v8/1, open_v9/1, sets_v8/1, sets_v9/1, bags_v8/1,
 	 bags_v9/1, duplicate_bags_v8/1, duplicate_bags_v9/1,
 	 access_v8/1, access_v9/1, dirty_mark/1, dirty_mark2/1,
@@ -95,27 +95,25 @@ end_per_testcase(_Case, _Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    case os:type() of
-	vxworks -> [not_run];
-	_ ->
-	    [basic_v8, basic_v9, open_v8, open_v9, sets_v8, sets_v9,
-	     bags_v8, bags_v9, duplicate_bags_v8, duplicate_bags_v9,
-	     newly_started, open_file_v8, open_file_v9,
-	     init_table_v8, init_table_v9, repair_v8, repair_v9,
-	     access_v8, access_v9, oldbugs_v8, oldbugs_v9,
-	     unsafe_assumptions, truncated_segment_array_v8,
-	     truncated_segment_array_v9, dirty_mark, dirty_mark2,
-	     bag_next_v8, bag_next_v9, hash_v8b_v8c, phash, fold_v8,
-	     fold_v9, fixtable_v8, fixtable_v9, match_v8, match_v9,
-	     select_v8, select_v9, update_counter, badarg,
-	     cache_sets_v8, cache_sets_v9, cache_bags_v8,
-	     cache_bags_v9, cache_duplicate_bags_v8,
-	     cache_duplicate_bags_v9, otp_4208, otp_4989,
-	     many_clients, otp_4906, otp_5402, simultaneous_open,
-	     insert_new, repair_continuation, otp_5487, otp_6206,
-	     otp_6359, otp_4738, otp_7146, otp_8070, otp_8856, otp_8898,
-	     otp_8899, otp_8903, otp_8923, otp_9282, otp_9607]
-    end.
+    [
+	basic_v8, basic_v9, open_v8, open_v9, sets_v8, sets_v9,
+	bags_v8, bags_v9, duplicate_bags_v8, duplicate_bags_v9,
+	newly_started, open_file_v8, open_file_v9,
+	init_table_v8, init_table_v9, repair_v8, repair_v9,
+	access_v8, access_v9, oldbugs_v8, oldbugs_v9,
+	unsafe_assumptions, truncated_segment_array_v8,
+	truncated_segment_array_v9, dirty_mark, dirty_mark2,
+	bag_next_v8, bag_next_v9, hash_v8b_v8c, phash, fold_v8,
+	fold_v9, fixtable_v8, fixtable_v9, match_v8, match_v9,
+	select_v8, select_v9, update_counter, badarg,
+	cache_sets_v8, cache_sets_v9, cache_bags_v8,
+	cache_bags_v9, cache_duplicate_bags_v8,
+	cache_duplicate_bags_v9, otp_4208, otp_4989,
+	many_clients, otp_4906, otp_5402, simultaneous_open,
+	insert_new, repair_continuation, otp_5487, otp_6206,
+	otp_6359, otp_4738, otp_7146, otp_8070, otp_8856, otp_8898,
+	otp_8899, otp_8903, otp_8923, otp_9282, otp_9607
+    ].
 
 groups() -> 
     [].
@@ -132,10 +130,6 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-not_run(suite) -> [];
-not_run(Conf) when is_list(Conf) ->
-    {comment, "Not runnable VxWorks/NFS"}.
-
 newly_started(doc) ->
     ["OTP-3621"];
 newly_started(suite) -> 
@@ -1949,7 +1943,7 @@ match(Config, Version) ->
     %% match, badarg
     MSpec = [{'_',[],['$_']}],
     ?line check_badarg(catch dets:match(no_table, '_'),
-		       dets, safe_fixtable, [no_table,true]),
+		       dets, match, [no_table,'_']),
     ?line check_badarg(catch dets:match(T, '_', not_a_number),
 		       dets, match, [T,'_',not_a_number]),
     ?line {EC1, _} = dets:select(T, MSpec, 1),
@@ -1958,7 +1952,7 @@ match(Config, Version) ->
 
     %% match_object, badarg
     ?line check_badarg(catch dets:match_object(no_table, '_'),
-		       dets, safe_fixtable, [no_table,true]),
+		       dets, match_object, [no_table,'_']),
     ?line check_badarg(catch dets:match_object(T, '_', not_a_number),
 		       dets, match_object, [T,'_',not_a_number]),
     ?line {EC2, _} = dets:select(T, MSpec, 1),
@@ -2127,7 +2121,7 @@ select(Config, Version) ->
     %% badarg
     MSpec = [{'_',[],['$_']}],
     ?line check_badarg(catch dets:select(no_table, MSpec),
-		       dets, safe_fixtable, [no_table,true]),
+		       dets, select, [no_table,MSpec]),
     ?line check_badarg(catch dets:select(T, <<17>>),
 		       dets, select, [T,<<17>>]),
     ?line check_badarg(catch dets:select(T, []),
@@ -2330,7 +2324,7 @@ badarg(Config) when is_list(Config) ->
 
     %% match_delete
     ?line check_badarg(catch dets:match_delete(no_table, '_'),
-		       dets, safe_fixtable, [no_table,true]),
+                 dets, match_delete, [no_table,'_']),
 
     %% delete_all_objects
     ?line check_badarg(catch dets:delete_all_objects(no_table),
@@ -2339,17 +2333,19 @@ badarg(Config) when is_list(Config) ->
     %% select_delete
     MSpec = [{'_',[],['$_']}],
     ?line check_badarg(catch dets:select_delete(no_table, MSpec),
-		       dets, safe_fixtable, [no_table,true]),
+                       dets, select_delete, [no_table,MSpec]),
     ?line check_badarg(catch dets:select_delete(T, <<17>>),
 		       dets, select_delete, [T, <<17>>]),
 
     %% traverse, fold
-    ?line check_badarg(catch dets:traverse(no_table, fun(_) -> continue end),
-		       dets, safe_fixtable, [no_table,true]),
-    ?line check_badarg(catch dets:foldl(fun(_, A) -> A end, [], no_table),
-		       dets, safe_fixtable, [no_table,true]),
-    ?line check_badarg(catch dets:foldr(fun(_, A) -> A end, [], no_table),
-		       dets, safe_fixtable, [no_table,true]),
+    TF = fun(_) -> continue end,
+    ?line check_badarg(catch dets:traverse(no_table, TF),
+                       dets, traverse, [no_table,TF]),
+    FF = fun(_, A) -> A end,
+    ?line check_badarg(catch dets:foldl(FF, [], no_table),
+		       dets, foldl, [FF,[],no_table]),
+    ?line check_badarg(catch dets:foldr(FF, [], no_table),
+		       dets, foldl, [FF,[],no_table]),
 
     %% close
     ?line ok = dets:close(T),
diff --git a/lib/stdlib/test/dict_SUITE.erl b/lib/stdlib/test/dict_SUITE.erl
index c46fc47b34..df9c769c67 100644
--- a/lib/stdlib/test/dict_SUITE.erl
+++ b/lib/stdlib/test/dict_SUITE.erl
@@ -53,7 +53,7 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?t:minutes(5)),
+    Dog = ?t:timetrap(?t:minutes(5)),
     [{watchdog,Dog}|Config].
 
 end_per_testcase(_Case, Config) ->
@@ -65,22 +65,22 @@ create(Config) when is_list(Config) ->
     test_all(fun create_1/1).
 
 create_1(M) ->
-    ?line D0 = M:empty(),
-    ?line [] = M:to_list(D0),
-    ?line 0 = M:size(D0),
+    D0 = M(empty, []),
+    [] = M(to_list, D0),
+    0 = M(size, D0),
     D0.
 
 store(Config) when is_list(Config) ->
     test_all([{0,132},{253,258},{510,514}], fun store_1/2).
 
 store_1(List, M) ->
-    ?line D0 = M:from_list(List),
+    D0 = M(from_list, List),
 
     %% Make sure that we get the same result by inserting
     %% elements one at the time.
-    ?line D1 = foldl(fun({K,V}, Dict) -> M:enter(K, V, Dict) end,
-		     M:empty(), List),
-    ?line true = M:equal(D0, D1),
+    D1 = foldl(fun({K,V}, Dict) -> M(enter, {K,V,Dict}) end,
+	       M(empty, []), List),
+    true = M(equal, {D0,D1}),
     D0.
 
 %%%
@@ -98,7 +98,7 @@ dict_mods() ->
     [Orddict,Dict,Gb].
 
 test_all(Tester) ->
-    ?line Pids = [spawn_tester(M, Tester) || M <- dict_mods()],
+    Pids = [spawn_tester(M, Tester) || M <- dict_mods()],
     collect_all(Pids, []).
 
 spawn_tester(M, Tester) ->
@@ -106,7 +106,7 @@ spawn_tester(M, Tester) ->
     spawn_link(fun() ->
 		       random:seed(1, 2, 42),
 		       S = Tester(M),
-		       Res = {M:size(S),lists:sort(M:to_list(S))},
+		       Res = {M(size, S),lists:sort(M(to_list, S))},
 		       Parent ! {result,self(),Res}
 	       end).
 
diff --git a/lib/stdlib/test/dict_test_lib.erl b/lib/stdlib/test/dict_test_lib.erl
index 92a75dad89..7167014310 100644
--- a/lib/stdlib/test/dict_test_lib.erl
+++ b/lib/stdlib/test/dict_test_lib.erl
@@ -17,67 +17,48 @@
 %% %CopyrightEnd%
 %%
 
--module(dict_test_lib, [Mod,Equal]).
+-module(dict_test_lib).
 
--export([module/0,equal/2,empty/0,size/1,to_list/1,from_list/1,
-	 enter/3,delete/2,lookup/2]).
+-export([new/2]).
 
-module() ->
-    Mod.
-
-equal(X, Y) ->
-    Equal(X, Y).
+new(Mod, Eq) ->
+    fun (enter, {K,V,D}) -> enter(Mod, K, V, D);
+	(empty, []) -> empty(Mod);
+	(equal, {D1,D2}) -> Eq(D1, D2);
+	(from_list, L) -> from_list(Mod, L);
+	(module, []) -> Mod;
+	(size, D) -> Mod:size(D);
+	(to_list, D) -> to_list(Mod, D)
+    end.
 
-empty() ->
+empty(Mod) ->
     case erlang:function_exported(Mod, new, 0) of
 	false -> Mod:empty();
 	true -> Mod:new()
     end.
 
-size(S) ->
-    Mod:size(S).
-
-to_list(S) ->
-    Mod:to_list(S).
+to_list(Mod, D) ->
+    Mod:to_list(D).
 
-from_list(S) ->
+from_list(Mod, L) ->
     case erlang:function_exported(Mod, from_orddict, 1) of
 	false ->
-	    Mod:from_list(S);
+	    Mod:from_list(L);
 	true ->
 	    %% The gb_trees module has no from_list/1 function.
 	    %%
 	    %% The keys in S are not unique. To make sure
 	    %% that we pick the same key/value pairs as
 	    %% dict/orddict, first convert the list to an orddict.
-	    Orddict = orddict:from_list(S),
+	    Orddict = orddict:from_list(L),
 	    Mod:from_orddict(Orddict)
     end.
 
 %% Store new value into dictionary or update previous value in dictionary.
-enter(Key, Val, Dict) ->
+enter(Mod, Key, Val, Dict) ->
     case erlang:function_exported(Mod, store, 3) of
 	false ->
 	    Mod:enter(Key, Val, Dict);
 	true ->
 	    Mod:store(Key, Val, Dict)
     end.
-
-%% Delete an EXISTING key.
-delete(Key, Dict) ->
-    case erlang:function_exported(Mod, delete, 2) of
-	true -> Mod:delete(Key, Dict);
-	false -> Mod:erase(Key, Dict)
-    end.
-
-%% -> none | {value,Value}
-lookup(Key, Dict) ->
-    case erlang:function_exported(Mod, lookup, 2) of
-	false ->
-	    case Mod:find(Key, Dict) of
-		error -> none;
-		{ok,Value} -> {value,Value}
-	    end;
-	true ->
-	    Mod:lookup(Key, Dict)
-    end.
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index f79414db49..77c615d6d9 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1236,6 +1236,13 @@ otp_8911(doc) ->
 otp_8911(suite) ->
     [];
 otp_8911(Config) when is_list(Config) ->
+    case test_server:is_cover() of
+	true ->
+	    {skip, "Testing cover, so can not run when cover is already running"};
+	false ->
+	    do_otp_8911(Config)
+    end.
+do_otp_8911(Config) ->
     ?line {ok, CWD} = file:get_cwd(),
     ?line ok = file:set_cwd(?config(priv_dir, Config)),
 
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index b0c7d562d5..47792d1052 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -216,13 +216,13 @@ guard_4(doc) ->
 guard_4(suite) ->
     [];
 guard_4(Config) when is_list(Config) ->
-    ?line check(fun() -> if {erlang,'+'}(3,a) -> true ; true -> false end end,
-                "if {erlang,'+'}(3,a) -> true ; true -> false end.",
-                false),
-    ?line check(fun() -> if {erlang,is_integer}(3) -> true ; true -> false end
-                end,
-                "if {erlang,is_integer}(3) -> true ; true -> false end.",
-                true),
+    check(fun() -> if erlang:'+'(3,a) -> true ; true -> false end end,
+	  "if erlang:'+'(3,a) -> true ; true -> false end.",
+	  false),
+    check(fun() -> if erlang:is_integer(3) -> true ; true -> false end
+	  end,
+	  "if erlang:is_integer(3) -> true ; true -> false end.",
+	  true),
     ?line check(fun() -> [X || X <- [1,2,3], erlang:is_integer(X)] end,
                 "[X || X <- [1,2,3], erlang:is_integer(X)].",
                 [1,2,3]),
@@ -230,11 +230,11 @@ guard_4(Config) when is_list(Config) ->
                 end,
                 "if is_atom(is_integer(a)) -> true ; true -> false end.",
                 true),
-    ?line check(fun() -> if {erlang,is_atom}({erlang,is_integer}(a)) -> true;
-                            true -> false end end,
-                "if {erlang,is_atom}({erlang,is_integer}(a)) -> true; "
-                "true -> false end.",
-                true),
+    check(fun() -> if erlang:is_atom(erlang:is_integer(a)) -> true;
+		      true -> false end end,
+	  "if erlang:is_atom(erlang:is_integer(a)) -> true; "
+	  "true -> false end.",
+	  true),
     ?line check(fun() -> if is_atom(3+a) -> true ; true -> false end end,
                 "if is_atom(3+a) -> true ; true -> false end.",
                 false),
@@ -1077,11 +1077,6 @@ do_funs(LFH, EFH) ->
                 concat(["begin F1 = fun(F,N) -> apply(", M, 
                         ",count_down,[F, N]) end, F1(F1,1000) end."]),
 		0, ['F1'], LFH, EFH),
-    ?line check(fun() -> F1 = fun(F,N) -> {?MODULE,count_down}(F,N)
-                              end, F1(F1, 1000) end,
-                concat(["begin F1 = fun(F,N) -> {", M, 
-                        ",count_down}(F, N) end, F1(F1,1000) end."]),
-		0, ['F1'], LFH, EFH),
     ?line check(fun() -> F = fun(F,N) when N > 0 -> apply(F,[F,N-1]); 
                                 (_F,0) -> ok end, 
                          F(F, 1000)
@@ -1113,11 +1108,11 @@ do_funs(LFH, EFH) ->
                          true = {2,3} == F(2) end,
                 "begin F = fun(X) -> A = 1+X, {X,A} end, 
                        true = {2,3} == F(2) end.", true, ['F'], LFH, EFH),
-    ?line check(fun() -> F = fun(X) -> {erlang,'+'}(X,2) end, 
-                         true = 3 == F(1) end,
-                "begin F = fun(X) -> {erlang,'+'}(X,2) end," 
-                "      true = 3 == F(1) end.", true, ['F'],
-               LFH, EFH),
+    check(fun() -> F = fun(X) -> erlang:'+'(X,2) end,
+		   true = 3 == F(1) end,
+	  "begin F = fun(X) -> erlang:'+'(X,2) end,"
+	  "      true = 3 == F(1) end.", true, ['F'],
+	  LFH, EFH),
     ?line check(fun() -> F = fun(X) -> byte_size(X) end,
                          ?MODULE:do_apply(F,<<"hej">>) end, 
                 concat(["begin F = fun(X) -> size(X) end,",
diff --git a/lib/stdlib/test/erl_expand_records_SUITE.erl b/lib/stdlib/test/erl_expand_records_SUITE.erl
index 01cdb92d7b..e248934e10 100644
--- a/lib/stdlib/test/erl_expand_records_SUITE.erl
+++ b/lib/stdlib/test/erl_expand_records_SUITE.erl
@@ -157,7 +157,7 @@ expr(Config) when is_list(Config) ->
              One = 1 = fun f/1(1),
              2 = fun(X) -> X end(One + One),
              3 = fun exprec_test:f/1(3),
-             4 = {exprec_test,f}(4),
+             4 = exprec_test:f(4),
              5 = ''.f(5),
              L = receive 
                      {a,message,L0} ->
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index dcd622b984..90a37f6441 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -50,7 +50,8 @@
 	  unsafe_vars_try/1,
 	  guard/1, otp_4886/1, otp_4988/1, otp_5091/1, otp_5276/1, otp_5338/1,
 	  otp_5362/1, otp_5371/1, otp_7227/1, otp_5494/1, otp_5644/1, otp_5878/1,
-	  otp_5917/1, otp_6585/1, otp_6885/1, export_all/1,
+	  otp_5917/1, otp_6585/1, otp_6885/1, otp_10436/1,
+          export_all/1,
 	  bif_clash/1,
 	  behaviour_basic/1, behaviour_multiple/1,
 	  otp_7550/1,
@@ -80,7 +81,7 @@ all() ->
      unsafe_vars, unsafe_vars2, unsafe_vars_try, guard,
      otp_4886, otp_4988, otp_5091, otp_5276, otp_5338,
      otp_5362, otp_5371, otp_7227, otp_5494, otp_5644,
-     otp_5878, otp_5917, otp_6585, otp_6885, export_all,
+     otp_5878, otp_5917, otp_6585, otp_6885, otp_10436, export_all,
      bif_clash, behaviour_basic, behaviour_multiple,
      otp_7550, otp_8051, format_warn, {group, on_load},
      too_many_arguments].
@@ -1307,41 +1308,30 @@ guard(Config) when is_list(Config) ->
                    foo;
                t3(A) when erlang:is_record(A, {apa}) ->
                    foo;
-               t3(A) when {erlang,is_record}(A, {apa}) ->
-                   foo;
                t3(A) when is_record(A, {apa}, 1) ->
                    foo;
                t3(A) when erlang:is_record(A, {apa}, 1) ->
                    foo;
-               t3(A) when {erlang,is_record}(A, {apa}, 1) ->
-                   foo;
                t3(A) when is_record(A, apa, []) ->
                    foo;
                t3(A) when erlang:is_record(A, apa, []) ->
                    foo;
-               t3(A) when {erlang,is_record}(A, apa, []) ->
-                   foo;
                t3(A) when record(A, apa) ->
                    foo;
                t3(A) when is_record(A, apa) ->
                    foo;
                t3(A) when erlang:is_record(A, apa) ->
-                   foo;
-               t3(A) when {erlang,is_record}(A, apa) ->
                    foo.
             ">>,
             [warn_unused_vars, nowarn_obsolete_guard],
             {errors,[{2,erl_lint,illegal_guard_expr},
-                     {4,erl_lint,illegal_guard_expr},
-                     {6,erl_lint,illegal_guard_expr},
-                     {8,erl_lint,illegal_guard_expr},
+		     {4,erl_lint,illegal_guard_expr},
+		     {6,erl_lint,illegal_guard_expr},
+		     {8,erl_lint,illegal_guard_expr},
 		     {10,erl_lint,illegal_guard_expr},
 		     {12,erl_lint,illegal_guard_expr},
-		     {14,erl_lint,illegal_guard_expr},
-		     {16,erl_lint,illegal_guard_expr},
-		     {18,erl_lint,illegal_guard_expr},
-		     {20,erl_lint,illegal_guard_expr}],
-             []}},
+		     {14,erl_lint,illegal_guard_expr}],
+	     []}},
            {guard6,
             <<"-record(apa,{a=a,b=foo:bar()}).
               apa() ->
@@ -2397,6 +2387,28 @@ otp_6885(Config) when is_list(Config) ->
 	   []} = run_test2(Config, Ts, []),
     ok.
 
+otp_10436(doc) ->
+    "OTP-6885. Warnings for opaque types.";
+otp_10436(suite) -> [];
+otp_10436(Config) when is_list(Config) ->
+    Ts = <<"-module(otp_10436).
+            -export_type([t1/0]).
+            -opaque t1() :: {i, integer()}.
+            -opaque t2() :: {a, atom()}.
+         ">>,
+    {warnings,[{4,erl_lint,{not_exported_opaque,{t2,0}}},
+               {4,erl_lint,{unused_type,{t2,0}}}]} =
+        run_test2(Config, Ts, []),
+    Ts2 = <<"-module(otp_10436_2).
+             -export_type([t1/0, t2/0]).
+             -opaque t1() :: term().
+             -opaque t2() :: any().
+         ">>,
+    {warnings,[{3,erl_lint,{underspecified_opaque,{t1,0}}},
+               {4,erl_lint,{underspecified_opaque,{t2,0}}}]} =
+        run_test2(Config, Ts2, []),
+    ok.
+
 export_all(doc) ->
     "OTP-7392. Warning for export_all.";
 export_all(Config) when is_list(Config) ->
@@ -2845,10 +2857,10 @@ otp_8051(doc) ->
 otp_8051(Config) when is_list(Config) ->
     Ts = [{otp_8051,
            <<"-opaque foo() :: bar().
+              -export_type([foo/0]).
              ">>,
            [],
-           {error,[{1,erl_lint,{undefined_type,{bar,0}}}],
-            [{1,erl_lint,{unused_type,{foo,0}}}]}}],
+           {errors,[{1,erl_lint,{undefined_type,{bar,0}}}],[]}}],
     ?line [] = run(Config, Ts),
     ok.
 
diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl
index 9f95df062b..5b592c65cc 100644
--- a/lib/stdlib/test/escript_SUITE.erl
+++ b/lib/stdlib/test/escript_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -29,6 +29,7 @@
 	 module_script/1,
 	 beam_script/1,
 	 archive_script/1,
+	 archive_script_file_access/1,
 	 epp/1,
 	 create_and_extract/1,
 	 foldl/1,
@@ -44,7 +45,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     [basic, errors, strange_name, emulator_flags,
      module_script, beam_script, archive_script, epp,
-     create_and_extract, foldl, overflow].
+     create_and_extract, foldl, overflow,
+     archive_script_file_access].
 
 groups() -> 
     [].
@@ -62,7 +64,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?t:minutes(1)),
+    ?line Dog = ?t:timetrap(?t:minutes(5)),
     [{watchdog,Dog}|Config].
 
 end_per_testcase(_Case, Config) ->
@@ -356,7 +358,7 @@ beam_script(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Create an archive file containing two entire applications plus two
 %% alternate main modules. Generate a new escript containing the archive
-%% (with .app and .beam files and ) and the escript header.
+%% (with .app and .beam files and) and the escript header.
 
 archive_script(Config) when is_list(Config) ->
     %% Copy the orig files to priv_dir
@@ -464,6 +466,147 @@ archive_script(Config) when is_list(Config) ->
 
     ok.
 
+%% Test the correction of OTP-10071
+%% The errors identified are
+%%
+%% a) If primary archive was named "xxx", then a file in the same
+%%    directory named "xxxyyy" would be interpreted as a file named yyy
+%%    inside the archive.
+%%
+%% b) erl_prim_loader did not correctly create and normalize absolute
+%%    paths for primary archive and files inside it, so unless given
+%%    with exact same path files inside the archive would not be
+%%    found. E.g. if escript was started as ./xxx then "xxx/file"
+%%    would not be found since erl_prim_loader would try to match
+%%    /full/path/to/xxx with /full/path/to/./xxx. Same problem with
+%%    ../. Also, the use of symlinks in the path to the archive would
+%%    cause problems.
+%%
+%% c) Depending on how the primary archive was built,
+%%    erl_prim_loader:list_dir/1 would sometimes return an empty string
+%%    inside the file list. This was a virtual element representing the
+%%    top directory of the archive. This shall not occur.
+%%
+archive_script_file_access(Config) when is_list(Config) ->
+    %% Copy the orig files to priv_dir
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+
+    MainMod = "archive_script_file_access",
+    MainSrc = MainMod ++ ".erl",
+    MainBeam = MainMod ++ ".beam",
+
+    Archive = filename:join([PrivDir, "archive_script_file_access.zip"]),
+    ?line {ok, _} = zip:create(Archive, ["archive_script_file_access"],
+			       [{compress, []}, {cwd, DataDir}]),
+    ?line {ok, _} = zip:extract(Archive, [{cwd, PrivDir}]),
+    TopDir = filename:join([PrivDir, "archive_script_file_access"]),
+
+    %% Compile the code
+    ?line ok = compile_files([MainSrc], TopDir, TopDir),
+
+    %% First, create a file structure which will be included in the archive:
+    %%
+    %% dir1/
+    %% dir1/subdir1/
+    %% dir1/subdir1/file1
+    %%
+    {ok, OldDir} = file:get_cwd(),
+    ok = file:set_cwd(TopDir),
+    DummyDir = "dir1",
+    DummySubDir = filename:join(DummyDir, "subdir1"),
+    RelDummyFile = filename:join(DummySubDir, "file1"),
+    DummyFile = filename:join(TopDir,RelDummyFile),
+    ok = filelib:ensure_dir(DummyFile),
+    ok = file:write_file(DummyFile, ["foo\nbar\nbaz"]),
+
+    %% 1. Create zip archive by adding the dummy file and the beam
+    %%    file as binaries to zip.
+    %%
+    %% This used to provoke the following issues when the script was run as
+    %% "./<script_name>":
+    %% a. erl_prim_loader:read_file_info/1 returning 'error'
+    %% b. erl_prim_loader:list_dir/1 returning {ok, ["dir1", [], "file1"]}
+    %%    leading to an infinite loop in reltool_target:spec_dir/1
+    Files1 =
+	lists:map(fun(Filename) ->
+			  {ok, Bin} = file:read_file(Filename),
+			  {Filename,Bin}
+		  end,
+		  [RelDummyFile,MainBeam]),
+    {ok, {"mem", Bin1}} = zip:create("mem", Files1, [memory]),
+
+    %% Create the escript
+    ScriptName1 = "archive_script_file_access1",
+    Script1 = filename:join([PrivDir, ScriptName1]),
+    Flags = "-escript main " ++ MainMod,
+    ok = escript:create(Script1,[shebang,{emu_args,Flags},{archive,Bin1}]),
+    ok = file:change_mode(Script1,8#00744),
+
+    %% If supported, create a symlink to the script. This is used to
+    %% test error b) described above this test case.
+    SymlinkName1 = "symlink_to_"++ScriptName1,
+    Symlink1 = filename:join([PrivDir, SymlinkName1]),
+    file:make_symlink(ScriptName1,Symlink1), % will fail if not supported
+
+    %% Also add a dummy file in the same directory with the same name
+    %% as the script except is also has an extension. This used to
+    %% test error a) described above this test case.
+    ok = file:write_file(Script1 ++ ".extension",
+			 <<"same name as script, but with extension">>),
+
+    %% Change to script's directory and run it as "./<script_name>"
+    ok = file:set_cwd(PrivDir),
+    run(PrivDir, "./" ++ ScriptName1 ++ " " ++ ScriptName1,
+	[<<"ExitCode:0">>]),
+    ok = file:set_cwd(TopDir),
+
+
+    %% 2. Create zip archive by letting zip read the files from the file system
+    %%
+    %% The difference compared to the archive_script_file_access1 is
+    %% that this will have a file element for each directory in the
+    %% archive - while archive_script_file_access1 will only have a
+    %% file element per regular file.
+    Files2 = [DummyDir,MainBeam],
+    {ok, {"mem", Bin2}} = zip:create("mem", Files2, [memory]),
+
+    %% Create the escript
+    ScriptName2 = "archive_script_file_access2",
+    Script2 = filename:join([PrivDir, ScriptName2]),
+    ok = escript:create(Script2,[shebang,{emu_args,Flags},{archive,Bin2}]),
+    ok = file:change_mode(Script2,8#00744),
+
+    %% Also add a dummy file in the same directory with the same name
+    %% as the script except is also has an extension. This used to
+    %% test error a) described above this test case.
+    ok = file:write_file(Script2 ++ ".extension",
+			 <<"same name as script, but with extension">>),
+
+    %% If supported, create a symlink to the script. This is used to
+    %% test error b) described above this test case.
+    SymlinkName2 = "symlink_to_"++ScriptName2,
+    Symlink2 = filename:join([PrivDir, SymlinkName2]),
+    file:make_symlink(ScriptName2,Symlink2), % will fail if not supported
+
+    %% Change to script's directory and run it as "./<script_name>"
+    ok = file:set_cwd(PrivDir),
+    run(PrivDir, "./" ++ ScriptName2 ++ " " ++ ScriptName2,
+	[<<"ExitCode:0">>]),
+
+    %% 3. If symlinks are supported, run one of the scripts via a symlink.
+    %%
+    %% This is in order to test error b) described above this test case.
+    case file:read_link(Symlink2) of
+	{ok,_} ->
+	    run(PrivDir, "./" ++ SymlinkName2 ++ " " ++ ScriptName2,
+		[<<"ExitCode:0">>]);
+	_ -> % not supported
+	    ok
+    end,
+    ok = file:set_cwd(OldDir).
+
+
 compile_app(TopDir, AppName) ->
     AppDir = filename:join([TopDir, AppName]),
     SrcDir = filename:join([AppDir, "src"]),
@@ -475,7 +618,7 @@ compile_files([File | Files], SrcDir, OutDir) ->
     case filename:extension(File) of
 	".erl" ->
 	    AbsFile = filename:join([SrcDir, File]),
-	    case compile:file(AbsFile, [{outdir, OutDir}]) of
+	    case compile:file(AbsFile, [{outdir, OutDir},report_errors]) of
 		{ok, _Mod} ->
 		    compile_files(Files, SrcDir, OutDir);
 		Error ->
diff --git a/lib/stdlib/test/escript_SUITE_data/archive_script/archive_script_main2.erl b/lib/stdlib/test/escript_SUITE_data/archive_script/archive_script_main2.erl
index de56579998..1cddef0e3d 100644
--- a/lib/stdlib/test/escript_SUITE_data/archive_script/archive_script_main2.erl
+++ b/lib/stdlib/test/escript_SUITE_data/archive_script/archive_script_main2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -21,6 +21,8 @@
 
 -export([main/1]).
 
+-include_lib("kernel/include/file.hrl").
+
 -define(DUMMY, archive_script_dummy).
 -define(DICT, archive_script_dict).
 
@@ -32,7 +34,7 @@ main(MainArgs) ->
     io:format("dummy:~p\n",[[E || E <- ErlArgs, element(1, E) =:= ?DUMMY]]),
 
     %% Start the applications
-    {error, {not_started, ?DICT}} = application:start(archive_script_dummy),
+    {error, {not_started, ?DICT}} = application:start(?DUMMY),
     ok = application:start(?DICT),
     ok = application:start(?DUMMY),
     
@@ -57,4 +59,17 @@ main(MainArgs) ->
     ok = ?DICT:erase(Tab, Key),
     error = ?DICT:find(Tab, Key),
     ok = ?DICT:erase(Tab),
+
+    %% Check mtime related caching bug with escript/primary archive files
+    Escript = escript:script_name(),
+    {ok, FileInfo} = file:read_file_info(Escript),
+    %% Modify mtime of archive file and try to reload module
+    FileInfo2 = FileInfo#file_info{mtime=calendar:now_to_local_time(now())},
+    ok = file:write_file_info(Escript, FileInfo2),
+    Module = ?DICT,
+    {file, _} = code:is_loaded(Module),
+    true = code:delete(Module),
+    false = code:is_loaded(Module),
+    {module, Module} = code:ensure_loaded(Module),
+
     ok.
diff --git a/lib/stdlib/test/escript_SUITE_data/archive_script_file_access/archive_script_file_access.erl b/lib/stdlib/test/escript_SUITE_data/archive_script_file_access/archive_script_file_access.erl
new file mode 100644
index 0000000000..b03c8ba70d
--- /dev/null
+++ b/lib/stdlib/test/escript_SUITE_data/archive_script_file_access/archive_script_file_access.erl
@@ -0,0 +1,105 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(archive_script_file_access).
+-behaviour(escript).
+
+-export([main/1]).
+
+-include_lib("kernel/include/file.hrl").
+
+main([RelArchiveFile]) ->
+
+    AbsArchiveFile = filename:absname(RelArchiveFile),
+    DotSlashArchiveFile = "./" ++ RelArchiveFile,
+
+    Beam = atom_to_list(?MODULE) ++ ".beam",
+    AbsBeam = filename:join(AbsArchiveFile,Beam),
+    RelBeam = filename:join(RelArchiveFile,Beam),
+    DotSlashBeam = filename:join(DotSlashArchiveFile,Beam),
+    Dir = "dir1",
+    AbsDir = filename:join(AbsArchiveFile,Dir),
+    RelDir = filename:join(RelArchiveFile,Dir),
+    DotSlashDir = filename:join(DotSlashArchiveFile,Dir),
+    SubDir = "subdir1",
+    AbsSubDir = filename:join(AbsDir,SubDir),
+    RelSubDir = filename:join(RelDir,SubDir),
+    DotSlashSubDir = filename:join(DotSlashDir,SubDir),
+
+    {ok,List1} = erl_prim_loader:list_dir(AbsArchiveFile),
+    {ok,List1} = erl_prim_loader:list_dir(RelArchiveFile),
+    {ok,List1} = erl_prim_loader:list_dir(DotSlashArchiveFile),
+    {ok,List1} = erl_prim_loader:list_dir(AbsArchiveFile ++ "/"),
+    {ok,List1} = erl_prim_loader:list_dir(AbsArchiveFile ++ "/."),
+    {ok,List1} = erl_prim_loader:list_dir(filename:join([AbsDir,".."])),
+    {ok,List1} = erl_prim_loader:list_dir(filename:join([RelDir,".."])),
+    {ok,List1} = erl_prim_loader:list_dir(filename:join([DotSlashDir,".."])),
+    {ok,List1} = erl_prim_loader:list_dir(filename:join([AbsSubDir,"..",".."])),
+    {ok,List1} = erl_prim_loader:list_dir(filename:join([RelSubDir,"..",".."])),
+    {ok,List1} = erl_prim_loader:list_dir(filename:join([DotSlashSubDir,"..",".."])),
+    false = lists:member([],List1),
+
+    %% If symlinks are supported on this platform...
+    RelSymlinkArchiveFile = "symlink_to_" ++ RelArchiveFile,
+    case file:read_link(RelSymlinkArchiveFile) of
+	{ok,_} ->
+	    DotSlashSymlinkArchiveFile = "./" ++ RelSymlinkArchiveFile,
+	    AbsSymlinkArchiveFile=filename:join(filename:dirname(AbsArchiveFile),
+						RelSymlinkArchiveFile),
+	    {ok,List1} = erl_prim_loader:list_dir(AbsSymlinkArchiveFile),
+	    {ok,List1} = erl_prim_loader:list_dir(RelSymlinkArchiveFile),
+	    {ok,List1} = erl_prim_loader:list_dir(DotSlashSymlinkArchiveFile);
+	_ -> % not supported
+	    ok
+    end,
+
+
+    {ok,List2} = erl_prim_loader:list_dir(AbsDir),
+    {ok,List2} = erl_prim_loader:list_dir(RelDir),
+    {ok,List2} = erl_prim_loader:list_dir(DotSlashDir),
+    false = lists:member([],List2),
+
+    error = erl_prim_loader:list_dir(AbsBeam),
+    error = erl_prim_loader:list_dir(RelBeam),
+    error = erl_prim_loader:list_dir(DotSlashBeam),
+
+    error = erl_prim_loader:get_file(AbsArchiveFile),
+    error = erl_prim_loader:get_file(RelArchiveFile),
+    error = erl_prim_loader:get_file(DotSlashArchiveFile),
+    error = erl_prim_loader:get_file(AbsArchiveFile ++ "/"),
+    error = erl_prim_loader:get_file(AbsArchiveFile ++ "/."),
+    {ok,Bin,AbsBeam} = erl_prim_loader:get_file(AbsBeam),
+    {ok,Bin,RelBeam} = erl_prim_loader:get_file(RelBeam),
+    {ok,Bin,DotSlashBeam} = erl_prim_loader:get_file(DotSlashBeam),
+
+    {ok,#file_info{type=directory}=DFI} =
+	erl_prim_loader:read_file_info(AbsArchiveFile),
+    {ok,DFI} = erl_prim_loader:read_file_info(RelArchiveFile),
+    {ok,DFI} = erl_prim_loader:read_file_info(DotSlashArchiveFile),
+    {ok,DFI} = erl_prim_loader:read_file_info(AbsArchiveFile ++ "/"),
+    {ok,DFI} = erl_prim_loader:read_file_info(AbsArchiveFile ++ "/."),
+    {ok,#file_info{type=regular}=RFI} = erl_prim_loader:read_file_info(AbsBeam),
+    {ok,RFI} = erl_prim_loader:read_file_info(RelBeam),
+    {ok,RFI} = erl_prim_loader:read_file_info(DotSlashBeam),
+
+    F = AbsArchiveFile ++ ".extension",
+    error = erl_prim_loader:list_dir(F),
+    {ok,_,_} = erl_prim_loader:get_file(F),
+    {ok,#file_info{type=regular}} = erl_prim_loader:read_file_info(F),
+
+    ok.
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 954d19a46f..dc17e5d33c 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -74,6 +74,7 @@
 -export([bad_table/1, types/1]).
 -export([otp_9932/1]).
 -export([otp_9423/1]).
+-export([otp_10182/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 %% Convenience for manual testing
@@ -146,6 +147,7 @@ all() ->
      exit_many_large_table_owner, exit_many_tables_owner,
      exit_many_many_tables_owner, write_concurrency, heir,
      give_away, setopts, bad_table, types,
+     otp_10182,
      otp_9932,
      otp_9423].
 
@@ -715,30 +717,17 @@ adjust_xmem([T1,T2,T3,T4], {A0,B0,C0,D0} = _Mem0) ->
     TabDiff = ?TAB_STRUCT_SZ,
     Mem1 = {A0+TabDiff, B0+TabDiff, C0+TabDiff, D0+TabDiff},
 
-    Mem2 = case {erlang:system_info({wordsize,internal}),erlang:system_info({wordsize,external})} of
-	         %% Halfword, corrections for regular pointers occupying two internal words.
-		 {4,8} ->
-			{A1,B1,C1,D1} = Mem1,
-			{A1+4*ets:info(T1, size)+?DB_TREE_STACK_NEED,
-			 B1+3*ets:info(T2, size)+?DB_HASH_SIZEOF_EXTSEG,
-			 C1+3*ets:info(T3, size)+?DB_HASH_SIZEOF_EXTSEG,
-			 D1+3*ets:info(T4, size)+?DB_HASH_SIZEOF_EXTSEG};
-		 _ ->
-			Mem1
-		end,
-
-    %% Adjust for hybrid and shared heaps:
-    %%   Each record is one word smaller.
-    %%Mem2 = case erlang:system_info(heap_type) of
-    %%    	   private ->
-    %%    	       Mem1;
-    %%    	   _ ->
-    %%    	       {A1,B1,C1,D1} = Mem1,
-    %%    	       {A1-ets:info(T1, size),B1-ets:info(T2, size),
-    %%    		C1-ets:info(T3, size),D1-ets:info(T4, size)}
-    %%          end,
-    %%{Mem2,{ets:info(T1,stats),ets:info(T2,stats),ets:info(T3,stats),ets:info(T4,stats)}}.
-    Mem2.
+    case {erlang:system_info({wordsize,internal}),erlang:system_info({wordsize,external})} of
+	%% Halfword, corrections for regular pointers occupying two internal words.
+	{4,8} ->
+	    {A1,B1,C1,D1} = Mem1,
+	    {A1+4*ets:info(T1, size)+?DB_TREE_STACK_NEED,
+	     B1+3*ets:info(T2, size)+?DB_HASH_SIZEOF_EXTSEG,
+	     C1+3*ets:info(T3, size)+?DB_HASH_SIZEOF_EXTSEG,
+	     D1+3*ets:info(T4, size)+?DB_HASH_SIZEOF_EXTSEG};
+	_ ->
+	    Mem1
+    end.
 
 t_whitebox(doc) ->
     ["Diverse whitebox testes"];
@@ -1037,6 +1026,8 @@ t_test_ms(Config) when is_list(Config) ->
 				   [{{'$1','$2'},[{'<','$1','$2'}],['$$']}]),
     ?line {ok,false} = ets:test_ms({a,b},
 				   [{{'$1','$2'},[{'>','$1','$2'}],['$$']}]),
+    Tpl = {a,gb_sets:new()},
+    ?line {ok,Tpl} = ets:test_ms(Tpl, [{{'_','_'},  [], ['$_']}]), % OTP-10190
     ?line {error,[{error,String}]} = ets:test_ms({a,b},
 						 [{{'$1','$2'},
 						   [{'flurp','$1','$2'}],
@@ -2179,20 +2170,29 @@ heir_do(Opts) ->
     ?line undefined = ets:info(foo),
 
     %% When heir dies and pid reused before founder dies
-    NextPidIx = erts_debug:get_internal_state(next_pid),
-    {Founder4,MrefF4} = my_spawn_monitor(fun()->heir_founder(Master,"The dying heir",Opts)end),
-    {Heir4,MrefH4} = my_spawn_monitor(fun()->heir_heir(Founder4)end),
-    Founder4 ! {go, Heir4},
-    ?line {'DOWN', MrefH4, process, Heir4, normal} = receive_any(),
-    erts_debug:set_internal_state(next_pid, NextPidIx),
-    {Heir4,MrefH4_B} = spawn_monitor_with_pid(Heir4, 
-					      fun()-> ?line die_please = receive_any() end),
-    Founder4 ! die_please,
-    ?line {'DOWN', MrefF4, process, Founder4, normal} = receive_any(),
-    Heir4 ! die_please,
-    ?line {'DOWN', MrefH4_B, process, Heir4, normal} = receive_any(),
-    ?line undefined = ets:info(foo), 
-
+    repeat_while(fun() ->
+			 NextPidIx = erts_debug:get_internal_state(next_pid),
+			 {Founder4,MrefF4} = my_spawn_monitor(fun()->heir_founder(Master,"The dying heir",Opts)end),
+			 {Heir4,MrefH4} = my_spawn_monitor(fun()->heir_heir(Founder4)end),
+			 Founder4 ! {go, Heir4},
+			 ?line {'DOWN', MrefH4, process, Heir4, normal} = receive_any(),
+			 erts_debug:set_internal_state(next_pid, NextPidIx),
+			 DoppelGanger = spawn_monitor_with_pid(Heir4, 
+							       fun()-> ?line die_please = receive_any() end),
+			 Founder4 ! die_please,
+			 ?line {'DOWN', MrefF4, process, Founder4, normal} = receive_any(),
+			 case DoppelGanger of
+			     {Heir4,MrefH4_B} ->
+				 Heir4 ! die_please,
+				 ?line {'DOWN', MrefH4_B, process, Heir4, normal} = receive_any(),
+				 ?line undefined = ets:info(foo),
+				 false;
+			     failed ->
+				 io:format("Failed to spawn process with pid ~p\n", [Heir4]),
+				 true % try again
+			 end			  
+		 end),
+	    
     ?line verify_etsmem(EtsMem).
 
 heir_founder(Master, HeirData, Opts) ->    
@@ -4217,21 +4217,13 @@ heavy_lookup_element(Config) when is_list(Config) ->
     repeat_for_opts(heavy_lookup_element_do).
 
 heavy_lookup_element_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(foobar_table, [set, protected, {keypos, 2} | Opts]),
-    ?line ok = fill_tab2(Tab, 0, 7000),
-    case os:type() of
-	vxworks ->
-	    ?line ?t:do_times(5, ?MODULE, do_lookup_element,
-				       [Tab, 6999, 1]);
-						% lookup ALL elements 5 times.
-	_ ->
-	    ?line ?t:do_times(50, ?MODULE, do_lookup_element,
-				       [Tab, 6999, 1])
-						% lookup ALL elements 50 times.
-    end,
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
+    EtsMem = etsmem(),
+    Tab = ets_new(foobar_table, [set, protected, {keypos, 2} | Opts]),
+    ok = fill_tab2(Tab, 0, 7000),
+    % lookup ALL elements 50 times
+    ?t:do_times(50, ?MODULE, do_lookup_element, [Tab, 6999, 1]),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
 
 do_lookup_element(_Tab, 0, _) -> ok;
 do_lookup_element(Tab, N, M) ->
@@ -5483,6 +5475,20 @@ otp_9423(Config) when is_list(Config) ->
 	Skipped -> Skipped
     end.
 	    
+
+%% Corrupted binary in compressed table
+otp_10182(Config) when is_list(Config) ->
+    Bin = <<"aHR0cDovL2hvb3RzdWl0ZS5jb20vYy9wcm8tYWRyb2xsLWFi">>,
+    Key = {test, Bin},
+    Value = base64:decode(Bin),
+    In = {Key,Value},
+    Db = ets:new(undefined, [set, protected, {read_concurrency, true}, compressed]),
+    ets:insert(Db, In),
+    [Out] = ets:lookup(Db, Key),
+    io:format("In :  ~p\nOut: ~p\n", [In,Out]),
+    ets:delete(Db),
+    In = Out.
+
     
     
 
@@ -5790,25 +5796,20 @@ receive_any_spinning(Loops, N, Tries) when N>0 ->
 
 
 spawn_monitor_with_pid(Pid, Fun) when is_pid(Pid) ->
-    spawn_monitor_with_pid(Pid, Fun, 1, 10).
+    spawn_monitor_with_pid(Pid, Fun, 10).
 
-spawn_monitor_with_pid(Pid, Fun, N, M) when N > M*10 ->
-    spawn_monitor_with_pid(Pid, Fun, N, M*10);
-spawn_monitor_with_pid(Pid, Fun, N, M) ->
-    ?line false = is_process_alive(Pid),
+spawn_monitor_with_pid(_, _, 0) ->
+    failed;
+spawn_monitor_with_pid(Pid, Fun, N) ->
     case my_spawn(fun()-> case self() of
 			      Pid -> Fun();
 			      _ -> die
 			  end
 		  end) of
-	Pid ->	    
+	Pid ->
 	    {Pid, erlang:monitor(process, Pid)};
 	Other ->
-	    case N rem M of
-		0 -> io:format("Failed ~p times to get pid ~p (current = ~p)\n",[N,Pid,Other]);
-		_ -> ok
-	    end,
-	    spawn_monitor_with_pid(Pid,Fun,N+1,M)
+	    spawn_monitor_with_pid(Pid,Fun,N-1)
     end.
 
 
diff --git a/lib/stdlib/test/filelib_SUITE.erl b/lib/stdlib/test/filelib_SUITE.erl
index 1de639a166..1fd7518519 100644
--- a/lib/stdlib/test/filelib_SUITE.erl
+++ b/lib/stdlib/test/filelib_SUITE.erl
@@ -176,9 +176,64 @@ do_wildcard_5(Dir, Wcf) ->
 
     %% Cleanup
     ?line del(Files),
-    ?line foreach(fun(D) -> ok = file:del_dir(filename:join(Dir, D)) end, Dirs).
+    ?line foreach(fun(D) -> ok = file:del_dir(filename:join(Dir, D)) end, Dirs),
+    do_wildcard_6(Dir, Wcf).
+
+do_wildcard_6(Dir, Wcf) ->
+    ok = file:make_dir(filename:join(Dir, "xbin")),
+    All = ["xbin/a.x","xbin/b.x","xbin/c.x"],
+    Files = mkfiles(All, Dir),
+    All = Wcf("xbin/*.x"),
+    All = Wcf("xbin/*"),
+    ["xbin"] = Wcf("*"),
+    All = Wcf("*/*"),
+    del(Files),
+    ok = file:del_dir(filename:join(Dir, "xbin")),
+    do_wildcard_7(Dir, Wcf).
+
+do_wildcard_7(Dir, Wcf) ->
+    Dirs = ["blurf","xa","yyy"],
+    SubDirs = ["blurf/nisse"],
+    foreach(fun(D) ->
+		    ok = file:make_dir(filename:join(Dir, D))
+	    end, Dirs ++ SubDirs),
+    All = ["blurf/nisse/baz","xa/arne","xa/kalle","yyy/arne"],
+    Files = mkfiles(lists:reverse(All), Dir),
 
+    %% Test.
+    Listing = Wcf("**"),
+    ["blurf","blurf/nisse","blurf/nisse/baz",
+     "xa","xa/arne","xa/kalle","yyy","yyy/arne"] = Listing,
+    Listing = Wcf("**/*"),
+    ["xa/arne","yyy/arne"] = Wcf("**/arne"),
+    ["blurf/nisse"] = Wcf("**/nisse"),
+    [] = Wcf("mountain/**"),
+
+    %% Cleanup
+    del(Files),
+    foreach(fun(D) ->
+		    ok = file:del_dir(filename:join(Dir, D))
+	    end, SubDirs ++ Dirs),
+    do_wildcard_8(Dir, Wcf).
+
+do_wildcard_8(Dir, Wcf) ->
+    Dirs0 = ["blurf"],
+    Dirs1 = ["blurf/nisse"],
+    Dirs2 = ["blurf/nisse/a", "blurf/nisse/b"],
+    foreach(fun(D) ->
+		    ok = file:make_dir(filename:join(Dir, D))
+	    end, Dirs0 ++ Dirs1 ++ Dirs2),
+    All = ["blurf/nisse/a/1.txt", "blurf/nisse/b/2.txt", "blurf/nisse/b/3.txt"],
+    Files = mkfiles(lists:reverse(All), Dir),
 
+    %% Test.
+    All = Wcf("**/blurf/**/*.txt"),
+
+    %% Cleanup
+    del(Files),
+    foreach(fun(D) ->
+		    ok = file:del_dir(filename:join(Dir, D))
+	    end, Dirs2 ++ Dirs1 ++ Dirs0).
 
 fold_files(Config) when is_list(Config) ->
     ?line Dir = filename:join(?config(priv_dir, Config), "fold_files"),
diff --git a/lib/stdlib/test/filename_SUITE.erl b/lib/stdlib/test/filename_SUITE.erl
index 4cfa589660..232df6a13f 100644
--- a/lib/stdlib/test/filename_SUITE.erl
+++ b/lib/stdlib/test/filename_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -25,7 +25,7 @@
 -export([pathtype/1,rootname/1,split/1,find_src/1]).
 -export([absname_bin/1, absname_bin_2/1, 
 	 basename_bin_1/1, basename_bin_2/1,
-	 dirname_bin/1, extension_bin/1, join_bin/1]).
+	 dirname_bin/1, extension_bin/1, join_bin/1, t_nativename_bin/1]).
 -export([pathtype_bin/1,rootname_bin/1,split_bin/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -38,7 +38,7 @@ all() ->
      join, pathtype, rootname, split, t_nativename, find_src,
      absname_bin, absname_bin_2, basename_bin_1, basename_bin_2, dirname_bin,
      extension_bin,
-     join_bin, pathtype_bin, rootname_bin, split_bin].
+     join_bin, pathtype_bin, rootname_bin, split_bin, t_nativename_bin].
 
 groups() -> 
     [].
@@ -112,19 +112,6 @@ absname(Config) when is_list(Config) ->
 	    ?line "/erlang/src" = filename:absname(["/erl",'a','ng',"/",'s',"rc"]),
 	    ?line "/erlang/src" = filename:absname("/erlang///src"),
 	    ?line "/file_sorter.erl" = filename:absname([file_sorter|'.erl']),
-	    ok;
-	vxworks ->
-	    Test_dir = ?config(priv_dir, Config),
-	    Test1 = Test_dir ++ "/foo",
-	    Test2 = Test_dir ++ "/ebin",
-	    ?line ok = file:set_cwd(Test_dir),
-	    ?line Test1 = filename:absname(foo),
-	    ?line Test1= filename:absname("foo"),
-	    ?line Test2 = filename:absname("foo/../ebin"),
-	    ?line "/erlang" = filename:absname("/erlang"),
-	    ?line "/erlang/src" = filename:absname("/erlang/src"),
-	    ?line "/erlang/src" = filename:absname(["/erlan",'g/s',"rc"]),
-	    ?line "/erlang/src" = filename:absname("/erlang///src"),
 	    ok
     end.
 
@@ -179,15 +166,6 @@ absname_2(Config) when is_list(Config) ->
 	    ?line "/erlang" = filename:absname("/erlang", "/"),
 	    ?line "/erlang/src" = filename:absname("/erlang/src", "/"),
 	    ?line "/erlang/src" = filename:absname("/erlang///src", "/"),
-	    ok;
-	vxworks ->
-	    ?line "/usr/foo" = filename:absname(foo, "/usr"),
-	    ?line "/usr/foo" = filename:absname("foo", "/usr"),
-	    ?line "/usr/ebin" = filename:absname("../ebin", "/usr"),
-	    ?line "/usr/ebin" = filename:absname("../ebin", "/usr/src"),
-	    ?line "/erlang" = filename:absname("/erlang", "/usr"),
-	    ?line "/erlang/src" = filename:absname("/erlang/src", "/usr"),
-	    ?line "/erlang/src" = filename:absname("/erlang///src", "/usr"),
 	    ok
     end.
 
@@ -213,11 +191,7 @@ basename_1(Config) when is_list(Config) ->
 		  ?line "foo" = filename:basename("A:foo");
 	      {unix, _} ->
 		  ?line "strange\\but\\true" =
-		      filename:basename("strange\\but\\true");
-	      vxworks -> 
-		  ?line "foo" =  filename:basename(["usr\\foo\\"]),
-		  ?line "foo" =  filename:basename("elrond:usr\\foo\\"),
-		  ?line "foo" =  filename:basename("disk:/foo")
+		      filename:basename("strange\\but\\true")
 	  end,
     ?line test_server:timetrap_cancel(Dog),
     ok.
@@ -249,15 +223,7 @@ basename_2(Config) when is_list(Config) ->
 		  ?line "strange\\but\\true" =
 		      filename:basename("strange\\but\\true.erl", ".erl"),
 		  ?line "strange\\but\\true" =
-		      filename:basename("strange\\but\\true", ".erl");
-	      vxworks ->
-		  ?line "foo" = filename:basename("net:foo", ".erl"),
-		  ?line "foo.erl" = filename:basename("net:\\usr\\foo.erl",
-						      ".hrl"),
-		  ?line "foo.erl" =
-		      filename:basename("/disk0:\\usr.hrl\\foo.erl",
-						      ".hrl"),
-		  ?line "foo" = filename:basename("/home\\usr\\foo", ".hrl")
+		      filename:basename("strange\\but\\true", ".erl")
 	  end,
     ?line test_server:timetrap_cancel(Dog),
     ok.
@@ -267,37 +233,25 @@ basename_2(Config) when is_list(Config) ->
 dirname(Config) when is_list(Config) ->
     case os:type() of
        {win32,_} ->
-	    ?line "A:/usr" = filename:dirname("A:/usr/foo.erl"),
-	    ?line "A:usr" = filename:dirname("A:usr/foo.erl"),
-	    ?line "/usr" = filename:dirname("\\usr\\foo.erl"),
-	    ?line "/" = filename:dirname("\\usr"),
-	    ?line "A:" = filename:dirname("A:");
-       vxworks ->
-	    ?line "net:/usr" = filename:dirname("net:/usr/foo.erl"),
-	    ?line "/disk0:/usr" = filename:dirname("/disk0:/usr/foo.erl"),
-	    ?line "/usr" = filename:dirname("\\usr\\foo.erl"),
-	    ?line "/usr" = filename:dirname("\\usr"),
-	    ?line "net:" = filename:dirname("net:");
+	    "A:/usr" = filename:dirname("A:/usr/foo.erl"),
+	    "A:usr" = filename:dirname("A:usr/foo.erl"),
+	    "/usr" = filename:dirname("\\usr\\foo.erl"),
+	    "/" = filename:dirname("\\usr"),
+	    "A:" = filename:dirname("A:");
 	_ -> true
     end,
-    ?line "usr" = filename:dirname("usr///foo.erl"),
-    ?line "." = filename:dirname("foo.erl"),
-    ?line "." = filename:dirname("."),
-    ?line "usr" = filename:dirname('usr/foo.erl'),
-    ?line "usr" = filename:dirname(['usr','/foo.erl']),
-    ?line "usr" = filename:dirname(['us','r/foo.erl']),
-    ?line "usr" = filename:dirname(['usr/','/foo.erl']),
-    ?line "usr" = filename:dirname(['usr/','foo.erl']),
-    ?line "usr" = filename:dirname(['usr/'|'foo.erl']),
-    ?line "usr" = filename:dirname(['usr/f','oo.erl']),
-    case os:type() of
-	vxworks -> 
-	    ?line "/" = filename:dirname("/"),
-	    ?line "/usr" = filename:dirname("/usr");
-	_ ->
-	    ?line "/" = filename:dirname("/"),
-	    ?line "/" = filename:dirname("/usr")
-    end,
+    "usr" = filename:dirname("usr///foo.erl"),
+    "." = filename:dirname("foo.erl"),
+    "." = filename:dirname("."),
+    "usr" = filename:dirname('usr/foo.erl'),
+    "usr" = filename:dirname(['usr','/foo.erl']),
+    "usr" = filename:dirname(['us','r/foo.erl']),
+    "usr" = filename:dirname(['usr/','/foo.erl']),
+    "usr" = filename:dirname(['usr/','foo.erl']),
+    "usr" = filename:dirname(['usr/'|'foo.erl']),
+    "usr" = filename:dirname(['usr/f','oo.erl']),
+    "/" = filename:dirname("/"),
+    "/" = filename:dirname("/usr"),
     ok.
     
 
@@ -319,12 +273,6 @@ extension(Config) when is_list(Config) ->
 		      filename:extension("A:/usr.bar/foo.nisse.erl"),
 		  ?line "" = filename:extension("A:/usr.bar/foo"),
 		  ok;
-	      vxworks ->
-		  ?line "" = filename:extension("/disk0:\\usr\\foo"),
-		  ?line ".erl" =
-		      filename:extension("net:/usr.bar/foo.nisse.erl"),
-		  ?line "" = filename:extension("net:/usr.bar/foo"),
-		  ok;
 	      _ -> ok
 	  end.
 
@@ -369,25 +317,6 @@ join(Config) when is_list(Config) ->
 		      filename:join(["A:","C:usr","foo.erl"]),
 		  ?line "d:/foo" = filename:join([$D, $:, $/, []], "foo"),
 		  ok;
-	      vxworks ->
-		  ?line "Net:" = filename:join(["Net:/"]),
-		  ?line "net:" = filename:join(["net:\\"]),
-		  ?line "net:/abc" = filename:join(["net:/", "abc"]),
-		  ?line "net:/abc" = filename:join(["net:", "abc"]),
-		  ?line "a/b/c/d/e/f/g" =
-		      filename:join(["a//b\\c//\\/\\d/\\e/f\\g"]),
-		  ?line "net:/usr/foo.erl" =
-		      filename:join(["net:","usr","foo.erl"]),
-		  ?line "/usr/foo.erl" =
-		      filename:join(["net:","/usr","foo.erl"]),
-		  ?line "/target:usr" = filename:join("net:","/target:usr"),
-		  ?line "kernel:/usr" = filename:join("net:", "kernel:/usr"),
-		  ?line "foo:/usr/foo.erl" =
-		      filename:join(["A:","foo:/usr","foo.erl"]),
-		  ?line "/disk0:usr/foo.erl" =
-		      filename:join(["kalle:","/disk0:usr","foo.erl"]),
-		  ?line "D:/foo" = filename:join([$D, $:, $/, []], "foo"),
-		  ok;
 	      {unix, _} ->
 		  ok
 	  end.
@@ -406,10 +335,6 @@ pathtype(Config) when is_list(Config) ->
 	{unix, _} ->
 	    ?line absolute = filename:pathtype("/"),
 	    ?line absolute = filename:pathtype("/usr/local/bin"),
-	    ok;
-	vxworks ->
-	    ?line absolute = filename:pathtype("/usr/local/bin"),
-	    ?line absolute = filename:pathtype("net:usr/local/bin"),
 	    ok
     end.
 
@@ -424,12 +349,7 @@ rootname(Config) when is_list(Config) ->
     ok.
 
 split(Config) when is_list(Config) ->
-    case os:type() of 
-	vxworks ->
-	    ?line ["/usr","local","bin"] = filename:split("/usr/local/bin");
-	_ ->
-	    ?line ["/","usr","local","bin"] = filename:split("/usr/local/bin")
-    end,
+    ?line ["/","usr","local","bin"] = filename:split("/usr/local/bin"),
     ?line ["foo","bar"]= filename:split("foo/bar"),
     ?line ["foo", "bar", "hello"]= filename:split("foo////bar//hello"),
     ?line ["foo", "bar", "hello"]= filename:split(["foo//",'//bar//h',"ello"]),
@@ -447,18 +367,6 @@ split(Config) when is_list(Config) ->
 	    ?line ["a:","msdev","include"] =
 		filename:split("a:msdev\\include"),
 	    ok;
-	vxworks ->
-	    ?line ["net:","msdev","include"] =
-		filename:split("net:/msdev/include"),
-	    ?line ["Target:","msdev","include"] =
-		filename:split("Target:/msdev/include"),
-	    ?line ["msdev","include"] =
-		filename:split("msdev\\include"),
-	    ?line ["/disk0:","msdev","include"] =
-		filename:split("/disk0:\\msdev\\include"),
-	    ?line ["a:","msdev","include"] =
-		filename:split("a:msdev\\include"),
-	    ok;
        _ ->
 	    ok
     end.
@@ -657,56 +565,38 @@ basename_bin_2(Config) when is_list(Config) ->
 dirname_bin(Config) when is_list(Config) ->
     case os:type() of
        {win32,_} ->
-	    ?line <<"A:/usr">> = filename:dirname(<<"A:/usr/foo.erl">>),
-	    ?line <<"A:usr">> = filename:dirname(<<"A:usr/foo.erl">>),
-	    ?line <<"/usr">> = filename:dirname(<<"\\usr\\foo.erl">>),
-	    ?line <<"/">> = filename:dirname(<<"\\usr">>),
-	    ?line <<"A:">> = filename:dirname(<<"A:">>);
-       vxworks ->
-	    ?line <<"net:/usr">> = filename:dirname(<<"net:/usr/foo.erl">>),
-	    ?line <<"/disk0:/usr">> = filename:dirname(<<"/disk0:/usr/foo.erl">>),
-	    ?line <<"/usr">> = filename:dirname(<<"\\usr\\foo.erl">>),
-	    ?line <<"/usr">> = filename:dirname(<<"\\usr">>),
-	    ?line <<"net:">> = filename:dirname(<<"net:">>);
+	    <<"A:/usr">> = filename:dirname(<<"A:/usr/foo.erl">>),
+	    <<"A:usr">> = filename:dirname(<<"A:usr/foo.erl">>),
+	    <<"/usr">> = filename:dirname(<<"\\usr\\foo.erl">>),
+	    <<"/">> = filename:dirname(<<"\\usr">>),
+	    <<"A:">> = filename:dirname(<<"A:">>);
 	_ -> true
     end,
-    ?line <<"usr">> = filename:dirname(<<"usr///foo.erl">>),
-    ?line <<".">> = filename:dirname(<<"foo.erl">>),
-    ?line <<".">> = filename:dirname(<<".">>),
-    case os:type() of
-	vxworks -> 
-	    ?line <<"/">> = filename:dirname(<<"/">>),
-	    ?line <<"/usr">> = filename:dirname(<<"/usr">>);
-	_ ->
-	    ?line <<"/">> = filename:dirname(<<"/">>),
-	    ?line <<"/">> = filename:dirname(<<"/usr">>)
-    end,
+    <<"usr">> = filename:dirname(<<"usr///foo.erl">>),
+    <<".">> = filename:dirname(<<"foo.erl">>),
+    <<".">> = filename:dirname(<<".">>),
+    <<"/">> = filename:dirname(<<"/">>),
+    <<"/">> = filename:dirname(<<"/usr">>),
     ok.
     
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 extension_bin(Config) when is_list(Config) ->
-    ?line <<".erl">> = filename:extension(<<"A:/usr/foo.erl">>),
-    ?line <<".erl">> = filename:extension(<<"A:/usr/foo.nisse.erl">>),
-    ?line <<".erl">> = filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
-    ?line <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
-    ?line <<"">> = filename:extension(<<"A:/usr/foo">>),
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line <<"">> = filename:extension(<<"A:\\usr\\foo">>),
-		  ?line <<".erl">> =
-		      filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
-		  ?line <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
-		  ok;
-	      vxworks ->
-		  ?line <<"">> = filename:extension(<<"/disk0:\\usr\\foo">>),
-		  ?line <<".erl">> =
-		      filename:extension(<<"net:/usr.bar/foo.nisse.erl">>),
-		  ?line <<"">> = filename:extension(<<"net:/usr.bar/foo">>),
-		  ok;
-	      _ -> ok
-	  end.
+    <<".erl">> = filename:extension(<<"A:/usr/foo.erl">>),
+    <<".erl">> = filename:extension(<<"A:/usr/foo.nisse.erl">>),
+    <<".erl">> = filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
+    <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
+    <<"">> = filename:extension(<<"A:/usr/foo">>),
+    case os:type() of
+        {win32, _} ->
+            ?line <<"">> = filename:extension(<<"A:\\usr\\foo">>),
+            ?line <<".erl">> =
+                filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
+            ?line <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
+            ok;
+        _ -> ok
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     
@@ -754,53 +644,58 @@ join_bin(Config) when is_list(Config) ->
 	  end.
 
 pathtype_bin(Config) when is_list(Config) ->
-    ?line relative = filename:pathtype(<<"..">>),
-    ?line relative = filename:pathtype(<<"foo">>),
-    ?line relative = filename:pathtype(<<"foo/bar">>),
-    ?line relative = filename:pathtype('foo/bar'),
+    relative = filename:pathtype(<<"..">>),
+    relative = filename:pathtype(<<"foo">>),
+    relative = filename:pathtype(<<"foo/bar">>),
+    relative = filename:pathtype('foo/bar'),
     case os:type() of
 	{win32, _} ->
-	    ?line volumerelative = filename:pathtype(<<"/usr/local/bin">>),
-	    ?line volumerelative = filename:pathtype(<<"A:usr/local/bin">>),
+	    volumerelative = filename:pathtype(<<"/usr/local/bin">>),
+	    volumerelative = filename:pathtype(<<"A:usr/local/bin">>),
 	    ok;
 	{unix, _} ->
-	    ?line absolute = filename:pathtype(<<"/">>),
-	    ?line absolute = filename:pathtype(<<"/usr/local/bin">>),
+	    absolute = filename:pathtype(<<"/">>),
+	    absolute = filename:pathtype(<<"/usr/local/bin">>),
 	    ok
     end.
 
 rootname_bin(Config) when is_list(Config) ->
-    ?line <<"/jam.src/kalle">> = filename:rootname(<<"/jam.src/kalle">>),
-    ?line <<"/jam.src/foo">> = filename:rootname(<<"/jam.src/foo.erl">>),
-    ?line <<"/jam.src/foo">> = filename:rootname(<<"/jam.src/foo.erl">>, <<".erl">>),
-    ?line <<"/jam.src/foo.jam">> = filename:rootname(<<"/jam.src/foo.jam">>, <<".erl">>),
-    ?line <<"/jam.src/foo.jam">> = filename:rootname(["/jam.sr",'c/foo.j',"am"],<<".erl">>),
-    ?line <<"/jam.src/foo.jam">> = filename:rootname(["/jam.sr",'c/foo.j'|am],<<".erl">>),
+    <<"/jam.src/kalle">> = filename:rootname(<<"/jam.src/kalle">>),
+    <<"/jam.src/foo">> = filename:rootname(<<"/jam.src/foo.erl">>),
+    <<"/jam.src/foo">> = filename:rootname(<<"/jam.src/foo.erl">>, <<".erl">>),
+    <<"/jam.src/foo.jam">> = filename:rootname(<<"/jam.src/foo.jam">>, <<".erl">>),
+    <<"/jam.src/foo.jam">> = filename:rootname(["/jam.sr",'c/foo.j',"am"],<<".erl">>),
+    <<"/jam.src/foo.jam">> = filename:rootname(["/jam.sr",'c/foo.j'|am],<<".erl">>),
     ok.
 
 split_bin(Config) when is_list(Config) ->
-    case os:type() of 
-	vxworks ->
-	    ?line [<<"/usr">>,<<"local">>,<<"bin">>] = filename:split(<<"/usr/local/bin">>);
-	_ ->
-	    ?line [<<"/">>,<<"usr">>,<<"local">>,<<"bin">>] = filename:split(<<"/usr/local/bin">>)
-    end,
-    ?line [<<"foo">>,<<"bar">>]= filename:split(<<"foo/bar">>),
-    ?line [<<"foo">>, <<"bar">>, <<"hello">>]= filename:split(<<"foo////bar//hello">>),
+    [<<"/">>,<<"usr">>,<<"local">>,<<"bin">>] = filename:split(<<"/usr/local/bin">>),
+    [<<"foo">>,<<"bar">>]= filename:split(<<"foo/bar">>),
+    [<<"foo">>, <<"bar">>, <<"hello">>]= filename:split(<<"foo////bar//hello">>),
     case os:type() of
        {win32,_} ->
-	    ?line [<<"a:/">>,<<"msdev">>,<<"include">>] =
+	    [<<"a:/">>,<<"msdev">>,<<"include">>] =
 		filename:split(<<"a:/msdev/include">>),
-	    ?line [<<"a:/">>,<<"msdev">>,<<"include">>] =
+	    [<<"a:/">>,<<"msdev">>,<<"include">>] =
 		filename:split(<<"A:/msdev/include">>),
-	    ?line [<<"msdev">>,<<"include">>] =
+	    [<<"msdev">>,<<"include">>] =
 		filename:split(<<"msdev\\include">>),
-	    ?line [<<"a:/">>,<<"msdev">>,<<"include">>] =
+	    [<<"a:/">>,<<"msdev">>,<<"include">>] =
 		filename:split(<<"a:\\msdev\\include">>),
-	    ?line [<<"a:">>,<<"msdev">>,<<"include">>] =
+	    [<<"a:">>,<<"msdev">>,<<"include">>] =
 		filename:split(<<"a:msdev\\include">>),
 	    ok;
        _ ->
 	    ok
     end.
 
+t_nativename_bin(Config) when is_list(Config) ->
+    ?line <<"abcedf">> = filename:nativename(<<"abcedf">>),
+    case os:type() of
+	{win32, _} ->
+	    ?line <<"a:\\temp\\arne.exe">> =
+		filename:nativename(<<"A:/temp//arne.exe/">>);
+	_ ->
+	    ?line <<"/usr/tmp/arne">> =
+		filename:nativename(<<"/usr/tmp//arne/">>)
+    end.
diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index bdb4ea65b5..22f66a6c14 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -281,21 +281,12 @@ start12(Config) when is_list(Config) ->
 %% Check that time outs in calls work
 abnormal1(suite) -> [];
 abnormal1(Config) when is_list(Config) ->
-    ?line {ok, _Pid} = 
-	gen_fsm:start({local, my_fsm}, gen_fsm_SUITE, [], []),
+    {ok, _Pid} = gen_fsm:start({local, my_fsm}, gen_fsm_SUITE, [], []),
 
     %% timeout call.
-    case os:type() of
-	vxworks ->
-	    %% timeout call for VxWorks must be in 16ms increments.
-	    ?line delayed = gen_fsm:sync_send_event(my_fsm, {delayed_answer,1}, 17),
-	    ?line {'EXIT',{timeout,_}} =
-		(catch gen_fsm:sync_send_event(my_fsm, {delayed_answer,17}, 1));
-	_ ->
-	    ?line delayed = gen_fsm:sync_send_event(my_fsm, {delayed_answer,1}, 100),
-	    ?line {'EXIT',{timeout,_}} =
-		(catch gen_fsm:sync_send_event(my_fsm, {delayed_answer,10}, 1))
-    end,
+    delayed = gen_fsm:sync_send_event(my_fsm, {delayed_answer,1}, 100),
+    {'EXIT',{timeout,_}} =
+    (catch gen_fsm:sync_send_event(my_fsm, {delayed_answer,10}, 1)),
     test_server:messages_get(),
     ok.
 
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index cdf15ba017..dffeadb423 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -37,7 +37,8 @@
 
 % spawn export
 -export([spec_init_local/2, spec_init_global/2, spec_init_via/2,
-	 spec_init_default_timeout/2, spec_init_anonymous/1,
+	 spec_init_default_timeout/2, spec_init_global_default_timeout/2,
+         spec_init_anonymous/1,
 	 spec_init_anonymous_default_timeout/1,
 	 spec_init_not_proc_lib/1, cast_fast_messup/0]).
 
@@ -230,14 +231,6 @@ start(Config) when is_list(Config) ->
 	  end,
     test_server:messages_get(),
 
-    %% Must wait for all error messages before going to next test.
-    %% (otherwise it interferes too much with real time characteristics).
-    case os:type() of
-	vxworks ->
-	    receive after 5000 -> ok end;
-	_ ->
-	    ok
-    end,
     process_flag(trap_exit, OldFl),
     ok.
 
@@ -749,7 +742,7 @@ spec_init(suite) ->
 spec_init(Config) when is_list(Config) ->
     
     OldFlag = process_flag(trap_exit, true),
-    
+
     ?line {ok, Pid0} = start_link(spec_init_local, [{ok, my_server}, []]),
     ?line ok = gen_server:call(Pid0, started_p),
     ?line ok = gen_server:call(Pid0, stop),
@@ -819,6 +812,14 @@ spec_init(Config) when is_list(Config) ->
 	    test_server:fail(gen_server_did_not_die)
     end,
 
+    %% Before the OTP-10130 fix this failed because a timeout message
+    %% was generated as the spawned process crashed because a {global, Name}
+    %% was matched as a timeout value instead of matching on scope.
+    {ok, _PidHurra} =
+	start_link(spec_init_global_default_timeout, [{ok, hurra}, []]),
+    timer:sleep(1000),
+    ok = gen_server:call(_PidHurra, started_p),
+    
     ?line Pid5 = 
 	erlang:spawn_link(?MODULE, spec_init_not_proc_lib, [[]]),
     receive 
@@ -1045,8 +1046,9 @@ call_with_huge_message_queue(Config) when is_list(Config) ->
     io:format("Time for empty message queue: ~p", [Time]),
     io:format("Time for huge message queue: ~p", [NewTime]),
 
+    IsCover = test_server:is_cover(),
     case (NewTime+1) / (Time+1) of
-	Q when Q < 10 ->
+	Q when Q < 10; IsCover ->
 	    ok;
 	Q ->
 	    io:format("Q = ~p", [Q]),
@@ -1125,6 +1127,15 @@ spec_init_default_timeout({ok, Name}, Options) ->
     %% Supervised init can occur here  ...
     gen_server:enter_loop(?MODULE, Options, {}, {local, Name}).
 
+%% OTP-10130, A bug was introduced where global scope was not matched when
+%% enter_loop/4 was called (no timeout).
+spec_init_global_default_timeout({ok, Name}, Options) ->
+    process_flag(trap_exit, true),
+    global:register_name(Name, self()),
+    proc_lib:init_ack({ok, self()}),
+    %% Supervised init can occur here  ...
+    gen_server:enter_loop(?MODULE, Options, {}, {global, Name}).
+
 spec_init_anonymous(Options) ->
     process_flag(trap_exit, true),
     proc_lib:init_ack({ok, self()}),
diff --git a/lib/stdlib/test/id_transform_SUITE.erl b/lib/stdlib/test/id_transform_SUITE.erl
index e1972a100e..ee97ffe7b3 100644
--- a/lib/stdlib/test/id_transform_SUITE.erl
+++ b/lib/stdlib/test/id_transform_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -26,7 +26,7 @@
 	 id_transform/1]).
 
 -export([check/2,check2/1,g/0,f/1,t/1,t1/1,t2/1,t3/1,t4/1,
-	 t5/1,t6/1,apa/1,new_fun/0]).
+	 t5/1,apa/1,new_fun/0]).
 
 						% Serves as test...
 -hej(hopp).
@@ -61,7 +61,7 @@ id_transform(Config) when is_list(Config) ->
     ?line {module,erl_id_trans}=code:load_binary(erl_id_trans,File,Bin),
     ?line case test_server:purify_is_running() of
 	      false ->
-		  Dog = ?t:timetrap(?t:hours(1)),
+		  Dog = ct:timetrap(?t:hours(1)),
 		  ?line Res = run_in_test_suite(),
 		  ?t:timetrap_cancel(Dog),
 		  Res;
@@ -388,8 +388,6 @@ t3(A) when is_tuple(A) or is_tuple(A) ->
    is_tuple; 
 t3(A) when record(A, apa) ->
    foo;
-t3(A) when {erlang,is_record}(A, apa) ->
-   foo;
 t3(A) when erlang:is_record(A, apa) ->
    foo;
 t3(A) when is_record(A, apa) ->
@@ -397,13 +395,10 @@ t3(A) when is_record(A, apa) ->
 t3(A) when record({apa}, apa) ->
    {A,foo}.
 
-t4(_) when {erlang,is_record}({apa}, apa) ->
-   foo.
-
-t5(A) when erlang:is_record({apa}, apa) ->
+t4(A) when erlang:is_record({apa}, apa) ->
    {A,foo}.
 
-t6(A) when is_record({apa}, apa) ->
+t5(A) when is_record({apa}, apa) ->
    {A,foo}.
 
 -record(apa2,{a=a,b=foo:bar()}).
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index bb02a879c2..74fcdcc7d2 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -27,7 +27,8 @@
          otp_6282/1, otp_6354/1, otp_6495/1, otp_6517/1, otp_6502/1,
          manpage/1, otp_6708/1, otp_7084/1, otp_7421/1,
 	 io_lib_collect_line_3_wb/1, cr_whitespace_in_string/1,
-	 io_fread_newlines/1, otp_8989/1, io_lib_fread_literal/1]).
+	 io_fread_newlines/1, otp_8989/1, io_lib_fread_literal/1,
+	 io_lib_print_binary_depth_one/1]).
 
 %-define(debug, true).
 
@@ -62,7 +63,8 @@ all() ->
      otp_6282, otp_6354, otp_6495, otp_6517, otp_6502,
      manpage, otp_6708, otp_7084, otp_7421,
      io_lib_collect_line_3_wb, cr_whitespace_in_string,
-     io_fread_newlines, otp_8989, io_lib_fread_literal].
+     io_fread_newlines, otp_8989, io_lib_fread_literal,
+     io_lib_print_binary_depth_one].
 
 groups() -> 
     [].
@@ -2021,3 +2023,14 @@ io_lib_fread_literal(Suite) when is_list(Suite) ->
     ?line {done,{error,{fread,input}},_} = io_lib:fread(C2, eof, " d"),
     ?line {done,{ok,[]},[]} = io_lib:fread(C2, "d\n", " d"),
     ok.
+
+io_lib_print_binary_depth_one(doc) ->
+    "Test binaries printed with a depth of one behave correctly";
+io_lib_print_binary_depth_one(Suite) when is_list(Suite) ->
+    ?line "<<>>" = fmt("~W", [<<>>, 1]),
+    ?line "<<>>" = fmt("~P", [<<>>, 1]),
+    ?line "<<...>>" = fmt("~W", [<<1>>, 1]),
+    ?line "<<...>>" = fmt("~P", [<<1>>, 1]),
+    ?line "<<...>>" = fmt("~W", [<<1:7>>, 1]),
+    ?line "<<...>>" = fmt("~P", [<<1:7>>, 1]),
+    ok.
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index 9bed20f771..17e69f7c1c 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -96,7 +96,8 @@ groups() ->
     [].
 
 init_per_suite(Config) ->
-    Config.
+    DefShell = get_default_shell(),
+    [{default_shell,DefShell}|Config].
 
 end_per_suite(_Config) ->
     ok.
@@ -124,20 +125,25 @@ unicode_prompt(doc) ->
     ["Test that an Unicode prompt does not crash the shell"];
 unicode_prompt(Config) when is_list(Config) ->
     ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline, "2"},
-		  {putline, "shell:prompt_func({io_proto_SUITE,uprompt})."},
-		  {getline, "default"},
-		  {putline, "io:get_line('')."},
-		  {putline, "hej"},
-		  {getline, "\"hej\\n\""},
-		  {putline, "io:setopts([{binary,true}])."},
-		  {getline, "ok"},
-		  {putline, "io:get_line('')."},
-		  {putline, "hej"},
-		  {getline, "<<\"hej\\n\">>"}
-		  ],[],[],"-pa "++ PA),
+    case proplists:get_value(default_shell,Config) of
+	old ->
+	    ok;
+	new ->
+	    ?line rtnode([{putline,""},
+			  {putline, "2."},
+			  {getline, "2"},
+			  {putline, "shell:prompt_func({io_proto_SUITE,uprompt})."},
+			  {getline, "default"},
+			  {putline, "io:get_line('')."},
+			  {putline, "hej"},
+			  {getline, "\"hej\\n\""},
+			  {putline, "io:setopts([{binary,true}])."},
+			  {getline, "ok"},
+			  {putline, "io:get_line('')."},
+			  {putline, "hej"},
+			  {getline, "<<\"hej\\n\">>"}
+			 ],[],[],"-pa \""++ PA++"\"")
+    end,
     %% And one with oldshell
      ?line rtnode([{putline,""},
 		   {putline, "2."},
@@ -153,7 +159,7 @@ unicode_prompt(Config) when is_list(Config) ->
 		   {putline, "io:get_line('')."},
 		   {putline, "hej"},
 		   {getline_re, ".*<<\"hej\\\\n\">>"}
-		  ],[],[],"-oldshell -pa "++PA),
+		  ],[],[],"-oldshell -pa \""++PA++"\""),
     ok.
     
 
@@ -234,21 +240,26 @@ setopts_getopts(Config) when is_list(Config) ->
 	lists:sort(io:getopts(RFile)),
     ?line eof = io:get_line(RFile,''),
     ?line file:close(RFile),
-    %% So, lets test another node with new interactive shell
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline, "2"},
-		  {putline, "lists:keyfind(binary,1,io:getopts())."},
-		  {getline, "{binary,false}"},
-		  {putline, "io:get_line('')."},
-		  {putline, "hej"},
-		  {getline, "\"hej\\n\""},
-		  {putline, "io:setopts([{binary,true}])."},
-		  {getline, "ok"},
-		  {putline, "io:get_line('')."},
-		  {putline, "hej"},
-		  {getline, "<<\"hej\\n\">>"}
-		  ],[]),
+    case proplists:get_value(default_shell,Config) of
+	old ->
+	    ok;
+	new ->
+	    %% So, lets test another node with new interactive shell
+	    ?line rtnode([{putline,""},
+			  {putline, "2."},
+			  {getline, "2"},
+			  {putline, "lists:keyfind(binary,1,io:getopts())."},
+			  {getline, "{binary,false}"},
+			  {putline, "io:get_line('')."},
+			  {putline, "hej"},
+			  {getline, "\"hej\\n\""},
+			  {putline, "io:setopts([{binary,true}])."},
+			  {getline, "ok"},
+			  {putline, "io:get_line('')."},
+			  {putline, "hej"},
+			  {getline, "<<\"hej\\n\">>"}
+			 ],[])
+    end,
     %% And one with oldshell
     ?line rtnode([{putline,""},
 		  {putline, "2."},
@@ -433,21 +444,27 @@ unicode_options(Config) when is_list(Config) ->
 		      end,
     ?line [ ok = CannotWriteFile(F,FailDir) || F <- AllNoBom ],
 
-    %% OK, time for the group_leaders...
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline, "2"},
-		  {putline, "lists:keyfind(encoding,1,io:getopts())."},
-		  {getline, "{encoding,latin1}"},
-		  {putline, "io:format(\"~ts~n\",[[1024]])."},
-		  {getline, "\\x{400}"},
-		  {putline, "io:setopts([unicode])."},
-		  {getline, "ok"},
-		  {putline, "io:format(\"~ts~n\",[[1024]])."},
-		  {getline, 
-		   binary_to_list(unicode:characters_to_binary(
-				    [1024],unicode,utf8))}
-		 ],[],"LC_CTYPE=\""++get_lc_ctype()++"\"; export LC_CTYPE; "),
+    case proplists:get_value(default_shell,Config) of
+	old ->
+	    ok;
+	new ->
+	    %% OK, time for the group_leaders...
+	    ?line rtnode([{putline,""},
+			  {putline, "2."},
+			  {getline, "2"},
+			  {putline, "lists:keyfind(encoding,1,io:getopts())."},
+			  {getline, "{encoding,latin1}"},
+			  {putline, "io:format(\"~ts~n\",[[1024]])."},
+			  {getline, "\\x{400}"},
+			  {putline, "io:setopts([unicode])."},
+			  {getline, "ok"},
+			  {putline, "io:format(\"~ts~n\",[[1024]])."},
+			  {getline,
+			   binary_to_list(unicode:characters_to_binary(
+					    [1024],unicode,utf8))}
+			 ],[],"LC_CTYPE=\""++get_lc_ctype()++"\"; "
+			 "export LC_CTYPE; ")
+    end,
     ?line rtnode([{putline,""},
 		  {putline, "2."},
 		  {getline_re, ".*2."},
@@ -680,23 +697,28 @@ binary_options(Config) when is_list(Config) ->
     ?line file:close(F3),
     %% OK, time for the group_leaders...
     %% io:format(standard_error,"Hmmm:~w~n",["<<\""++binary_to_list(<<"\345\344\366"/utf8>>)++"\\n\">>"]),
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline, "2"},
-		  {putline, "lists:keyfind(binary,1,io:getopts())."},
-		  {getline, "{binary,false}"},
-		  {putline, "io:get_line('')."},
-		  {putline, "hej"},
-		  {getline, "\"hej\\n\""},
-		  {putline, "io:setopts([{binary,true},unicode])."},
-		  {getline, "ok"},
-		  {putline, "io:get_line('')."},
-		  {putline, "hej"},
-		  {getline, "<<\"hej\\n\">>"},
-		  {putline, "io:get_line('')."},
-		  {putline, binary_to_list(<<"\345\344\366"/utf8>>)},
-		  {getline, "<<\""++binary_to_list(unicode:characters_to_binary(<<"\345\344\366"/utf8>>,latin1,utf8))++"\\n\">>"}
-		  ],[]),
+    case proplists:get_value(default_shell,Config) of
+	old ->
+	    ok;
+	new ->
+	    ?line rtnode([{putline,""},
+			  {putline, "2."},
+			  {getline, "2"},
+			  {putline, "lists:keyfind(binary,1,io:getopts())."},
+			  {getline, "{binary,false}"},
+			  {putline, "io:get_line('')."},
+			  {putline, "hej"},
+			  {getline, "\"hej\\n\""},
+			  {putline, "io:setopts([{binary,true},unicode])."},
+			  {getline, "ok"},
+			  {putline, "io:get_line('')."},
+			  {putline, "hej"},
+			  {getline, "<<\"hej\\n\">>"},
+			  {putline, "io:get_line('')."},
+			  {putline, binary_to_list(<<"\345\344\366"/utf8>>)},
+			  {getline, "<<\""++binary_to_list(unicode:characters_to_binary(<<"\345\344\366"/utf8>>,latin1,utf8))++"\\n\">>"}
+			 ],[])
+    end,
    %% And one with oldshell
     ?line rtnode([{putline,""},
 		  {putline, "2."},
@@ -732,7 +754,7 @@ bc_with_r12_1(Config) ->
     PA = filename:dirname(code:which(?MODULE)),
     Name1 = io_proto_r12_1,
     ?line N1 = list_to_atom(atom_to_list(Name1) ++ "@" ++ hostname()),
-    ?line ?t:start_node(Name1, peer, [{args, "-pz "++PA},{erl,[{release,"r12b"}]}]),
+    ?line ?t:start_node(Name1, peer, [{args, "-pz \""++PA++"\""},{erl,[{release,"r12b"}]}]),
     DataDir = ?config(data_dir,Config),
     %PrivDir = ?config(priv_dir,Config),
     FileName1 = filename:join([DataDir,"testdata_latin1.dat"]),
@@ -908,7 +930,7 @@ bc_with_r12_gl_1(_Config,Machine) ->
     PA = filename:dirname(code:which(?MODULE)),
     Name1 = io_proto_r12_gl_1,
     ?line N1 = list_to_atom(atom_to_list(Name1) ++ "@" ++ hostname()),
-    ?line ?t:start_node(Name1, peer, [{args, "-pz "++PA},{erl,[{release,"r12b"}]}]),
+    ?line ?t:start_node(Name1, peer, [{args, "-pz \""++PA++"\""},{erl,[{release,"r12b"}]}]),
     TestDataLine1 = [229,228,246],
     TestDataLine1BinUtf = unicode:characters_to_binary(TestDataLine1),
     TestDataLine1BinLatin = list_to_binary(TestDataLine1),
@@ -1146,9 +1168,11 @@ read_modes_gl(suite) ->
 read_modes_gl(doc) ->
     ["Test various modes when reading from the group leade from another machine"];
 read_modes_gl(Config) when is_list(Config) -> 
-    case get_progs() of
-	{error,Reason} ->
+    case {get_progs(),proplists:get_value(default_shell,Config)} of
+	{{error,Reason},_} ->
 	    {skipped,Reason};
+	{_,old} ->
+	    {skipper,"No new shell"};
 	_ ->
 	    read_modes_gl_1(Config,answering_machine1)
     end.
@@ -1290,7 +1314,7 @@ eof_on_pipe(Config) when is_list(Config) ->
 				   end
 			   end,
 		CommandLine1 = EchoLine ++
-		Erl++" -noshell -eval  "
+		"\""++Erl++"\" -noshell -eval  "
 		"'io:format(\"~p\",[io:get_line(\"\")]),"
 		"io:format(\"~p\",[io:get_line(\"\")]),"
 		"io:format(\"~p\",[io:get_line(\"\")]).' -run init stop",
@@ -1301,7 +1325,7 @@ eof_on_pipe(Config) when is_list(Config) ->
 			exit({unexpected1,Other1})
 		end,
 		CommandLine2 = EchoLine ++
-		Erl++" -noshell -eval  "
+		"\""++Erl++"\" -noshell -eval  "
 		"'io:setopts([binary]),io:format(\"~p\",[io:get_line(\"\")]),"
 		"io:format(\"~p\",[io:get_line(\"\")]),"
 		"io:format(\"~p\",[io:get_line(\"\")]).' -run init stop",
@@ -1340,7 +1364,8 @@ rtnode(Commands,Nodename,ErlPrefix,Extra) ->
 				?line {skip, Reason2};
 			    Tempdir ->
 				?line SPid = 
-				    start_runerl_node(RunErl,ErlPrefix++Erl,
+				    start_runerl_node(RunErl,ErlPrefix++
+							  "\\\""++Erl++"\\\"",
 						      Tempdir,Nodename, Extra),
 				?line CPid = start_toerl_server(ToErl,Tempdir),
 				?line erase(getline_skipped),
@@ -1607,10 +1632,10 @@ start_runerl_node(RunErl,Erl,Tempdir,Nodename,Extra) ->
 		    " "++Extra
 	    end,
     spawn(fun() ->
-		  ?dbg(RunErl++" "++Tempdir++"/ "++Tempdir++" \""++
-			 Erl++XArg++XXArg++"\""),
-		  os:cmd(RunErl++" "++Tempdir++"/ "++Tempdir++" \""++
-			 Erl++XArg++XXArg++"\"")
+		  ?dbg("\""++RunErl++"\" "++Tempdir++"/ "++Tempdir++
+		       " \""++Erl++XArg++XXArg++"\""),
+		  os:cmd("\""++RunErl++"\" "++Tempdir++"/ "++Tempdir++
+			 " \""++Erl++XArg++XXArg++"\"")
 	  end).
 
 start_toerl_server(ToErl,Tempdir) ->
@@ -1640,7 +1665,7 @@ try_to_erl(Command, N) ->
     end.
 
 toerl_server(Parent,ToErl,Tempdir) ->
-    Port = try_to_erl(ToErl++" "++Tempdir++"/ 2>/dev/null",8),
+    Port = try_to_erl("\""++ToErl++"\" "++Tempdir++"/ 2>/dev/null",8),
     case Port of
 	P when is_port(P) ->
 	    Parent ! {self(),started};
@@ -1753,6 +1778,17 @@ get_data_within(Port, Timeout, Acc) ->
 	    timeout
     end.
 
+get_default_shell() ->
+    try
+	rtnode([{putline,""},
+		{putline, "whereis(user_drv)."},
+		{getline, "undefined"}],[]),
+	old
+    catch E:R ->
+	    ?dbg({E,R}),
+	    new
+    end.
+
 %%
 %% Test I/O-server
 %%
diff --git a/lib/stdlib/test/proc_lib_SUITE.erl b/lib/stdlib/test/proc_lib_SUITE.erl
index c95089117c..8dca69bac4 100644
--- a/lib/stdlib/test/proc_lib_SUITE.erl
+++ b/lib/stdlib/test/proc_lib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -28,7 +28,7 @@
 	 crash/1, sync_start_nolink/1, sync_start_link/1,
          spawn_opt/1, sp1/0, sp2/0, sp3/1, sp4/2, sp5/1,
 	 hibernate/1]).
--export([ otp_6345/1]).
+-export([ otp_6345/1, init_dont_hang/1]).
 
 -export([hib_loop/1, awaken/1]).
 
@@ -36,7 +36,7 @@
 	 handle_event/2, handle_call/2, handle_info/2,
 	 terminate/2]).
 
--export([otp_6345_init/1]).
+-export([otp_6345_init/1, init_dont_hang_init/1]).
 
 
 -ifdef(STANDALONE).
@@ -52,7 +52,7 @@ all() ->
      {group, tickets}].
 
 groups() -> 
-    [{tickets, [], [otp_6345]},
+    [{tickets, [], [otp_6345, init_dont_hang]},
      {sync_start, [], [sync_start_nolink, sync_start_link]}].
 
 init_per_suite(Config) ->
@@ -343,6 +343,29 @@ otp_6345_loop() ->
 	    otp_6345_loop()
     end.
 
+%% OTP-9803
+init_dont_hang(suite) ->
+    [];
+init_dont_hang(doc) ->
+    ["Check that proc_lib:start don't hang if spawned process crashes before proc_lib:init_ack/2"];
+init_dont_hang(Config) when is_list(Config) ->
+    %% Start should behave as start_link
+    process_flag(trap_exit, true),
+    StartLinkRes = proc_lib:start_link(?MODULE, init_dont_hang_init, [self()]),
+    try
+	StartLinkRes = proc_lib:start(?MODULE, init_dont_hang_init, [self()], 1000),
+	StartLinkRes = proc_lib:start(?MODULE, init_dont_hang_init, [self()], 1000, []),
+	ok
+    catch _:Error ->
+	    io:format("Error ~p /= ~p ~n",[erlang:get_stacktrace(), StartLinkRes]),
+	    exit(Error)
+    end.
+
+init_dont_hang_init(Parent) ->
+    1 = 2.
+
+
+
 %%-----------------------------------------------------------------
 %% The error_logger handler used.
 %%-----------------------------------------------------------------
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index 1e74ad7727..e3090e4a47 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -2969,13 +2969,6 @@ lookup1(Config) when is_list(Config) ->
                 [3] = lookup_keys(Q)
         end, [{1,a},{3,3}])">>,
 
-       <<"A = 3,
-          etsc(fun(E) ->
-                Q = qlc:q([X || X <- ets:table(E), A =:= {erlang,element}(1, X)]),
-                [{3,3}] = qlc:e(Q),
-                [3] = lookup_keys(Q)
-        end, [{1,a},{3,3}])">>,
-
        <<"etsc(fun(E) ->
                 A = 3,
                 Q = qlc:q([X || X <- ets:table(E), 
@@ -3439,12 +3432,6 @@ lookup2(Config) when is_list(Config) ->
                  [r] = qlc:e(Q),
                  [r] = lookup_keys(Q)
          end, [{keypos,1}], [#r{}])">>,
-       <<"etsc(fun(E) ->
-                Q = qlc:q([element(1, X) || X <- ets:table(E), 
-                                            {erlang,is_record}(X, r, 2)]),
-                 [r] = qlc:e(Q),
-                 [r] = lookup_keys(Q)
-         end, [{keypos,1}], [#r{}])">>,
        {cres,
         <<"etsc(fun(E) ->
                 Q = qlc:q([element(1, X) || X <- ets:table(E), 
@@ -3464,12 +3451,6 @@ lookup2(Config) when is_list(Config) ->
                                             is_record(X, r)]),
                  [r] = qlc:e(Q),
                  [r] = lookup_keys(Q)
-         end, [{keypos,1}], [#r{}])">>,
-       <<"etsc(fun(E) ->
-                Q = qlc:q([element(1, X) || X <- ets:table(E), 
-                                            {erlang,is_record}(X, r)]),
-                 [r] = qlc:e(Q),
-                 [r] = lookup_keys(Q)
          end, [{keypos,1}], [#r{}])">>
 
        ],
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index a542745e67..8ee0a13f4c 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -328,6 +328,12 @@ replace_return(Config) when is_list(Config) ->
     ?line <<"iXk">> = re:replace("abcdefghijk","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\9X",[{return,binary}]),
     ?line <<"jXk">> = re:replace("abcdefghijk","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\10X",[{return,binary}]),
     ?line <<"Xk">> = re:replace("abcdefghijk","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\11X",[{return,binary}]),
+    ?line <<"9X1">> = re:replace("12345678901","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\g9X",[{return,binary}]),
+    ?line <<"0X1">> = re:replace("12345678901","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\g10X",[{return,binary}]),
+    ?line <<"X1">> = re:replace("12345678901","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\g11X",[{return,binary}]),
+    ?line <<"971">> = re:replace("12345678901","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\g{9}7",[{return,binary}]),
+    ?line <<"071">> = re:replace("12345678901","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\g{10}7",[{return,binary}]),
+    ?line <<"71">> = re:replace("12345678901","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\g{11}7",[{return,binary}]),
     ?line "a\x{400}bcX" = re:replace("a\x{400}bcd","d","X",[global,{return,list},unicode]),
     ?line <<"a",208,128,"bcX">> = re:replace("a\x{400}bcd","d","X",[global,{return,binary},unicode]),
     ?line "a\x{400}bcd" = re:replace("a\x{400}bcd","Z","X",[global,{return,list},unicode]),
diff --git a/lib/stdlib/test/sets_SUITE.erl b/lib/stdlib/test/sets_SUITE.erl
index f284276bd7..e2bcdd18ce 100644
--- a/lib/stdlib/test/sets_SUITE.erl
+++ b/lib/stdlib/test/sets_SUITE.erl
@@ -35,7 +35,7 @@
 -import(lists, [foldl/3,reverse/1]).
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?t:minutes(5)),
+    Dog = ?t:timetrap(?t:minutes(5)),
     [{watchdog,Dog}|Config].
 
 end_per_testcase(_Case, Config) ->
@@ -70,65 +70,65 @@ create(Config) when is_list(Config) ->
     test_all(fun create_1/1).
 
 create_1(M) ->
-    ?line S0 = M:empty(),
-    ?line [] = M:to_list(S0),
-    ?line 0 = M:size(S0),
-    ?line true = M:is_empty(S0),
+    S0 = M(empty, []),
+    [] = M(to_list, S0),
+    0 = M(size, S0),
+    true = M(is_empty, S0),
     E = make_ref(),
-    ?line One = M:singleton(E),
-    ?line 1 = M:size(One),
-    ?line false = M:is_empty(One),
-    [E] = M:to_list(One),
+    One = M(singleton, E),
+    1 = M(size, One),
+    false = M(is_empty, One),
+    [E] = M(to_list, One),
     S0.
 
 add_element(Config) when is_list(Config) ->
     test_all([{0,132},{253,258},{510,514}], fun add_element_1/2).
 
 add_element_1(List, M) ->
-    ?line S = M:from_list(List),
-    ?line SortedSet = lists:usort(List),
-    ?line SortedSet = lists:sort(M:to_list(S)),
+    S = M(from_list, List),
+    SortedSet = lists:usort(List),
+    SortedSet = lists:sort(M(to_list, S)),
 
     %% Make sure that we get the same result by inserting
     %% elements one at the time.
-    ?line S2 = foldl(fun(El, Set) -> M:add_element(El, Set) end,
-		     M:empty(), List),
-    ?line true = M:equal(S, S2),
+    S2 = foldl(fun(El, Set) -> M(add_element, {El,Set}) end,
+	       M(empty, []), List),
+    true = M(equal, {S,S2}),
 
     %% Insert elements, randomly delete inserted elements,
     %% and re-inserted all deleted elements at the end.
-    ?line S3 = add_element_del(List, M, M:empty(), [], []),
-    ?line true = M:equal(S2, S3),
-    ?line true = M:equal(S, S3),
+    S3 = add_element_del(List, M, M(empty, []), [], []),
+    true = M(equal, {S2,S3}),
+    true = M(equal, {S,S3}),
     S.
 
 add_element_del([H|T], M, S, Del, []) ->
-    add_element_del(T, M, M:add_element(H, S), Del, [H]);
+    add_element_del(T, M, M(add_element, {H,S}), Del, [H]);
 add_element_del([H|T], M, S0, Del, Inserted) ->
-    S1 = M:add_element(H, S0),
+    S1 = M(add_element, {H,S0}),
     case random:uniform(3) of
 	1 ->
 	    OldEl = lists:nth(random:uniform(length(Inserted)), Inserted),
-	    S = M:del_element(OldEl, S1),
+	    S = M(del_element, {OldEl,S1}),
 	    add_element_del(T, M, S, [OldEl|Del], [H|Inserted]);
 	_ ->
 	    add_element_del(T, M, S1, Del, [H|Inserted])
     end;
 add_element_del([], M, S, Del, _) ->
-    M:union(S, M:from_list(Del)).
+    M(union, {S,M(from_list, Del)}).
 
 del_element(Config) when is_list(Config) ->
     test_all([{0,132},{253,258},{510,514},{1022,1026}], fun del_element_1/2).
 
 del_element_1(List, M) ->    
-    ?line S0 = M:from_list(List),
-    ?line Empty = foldl(fun(El, Set) -> M:del_element(El, Set) end, S0, List),
-    ?line Empty = M:empty(),
-    ?line M:is_empty(Empty),
-    ?line S1 = foldl(fun(El, Set) ->
-			     M:add_element(El, Set)
-		     end, S0, reverse(List)),
-    ?line true = M:equal(S0, S1),
+    S0 = M(from_list, List),
+    Empty = foldl(fun(El, Set) -> M(del_element, {El,Set}) end, S0, List),
+    Empty = M(empty, []),
+    true = M(is_empty, Empty),
+    S1 = foldl(fun(El, Set) ->
+		       M(add_element, {El,Set})
+	       end, S0, reverse(List)),
+    true = M(equal, {S0,S1}),
     S1.
 
 subtract(Config) when is_list(Config) ->
@@ -138,23 +138,23 @@ subtract(Config) when is_list(Config) ->
     test_all([{2,69},{126,130},{253,258},511,512,{1023,1030}], fun subtract_1/2).
 
 subtract_empty(M) ->
-    ?line Empty = M:empty(),
-    ?line true = M:is_empty(M:subtract(Empty, Empty)),
-    M:subtract(Empty, Empty).
+    Empty = M(empty, []),
+    true = M(is_empty, M(subtract, {Empty,Empty})),
+    M(subtract, {Empty,Empty}).
 
 subtract_1(List, M) ->
-    ?line S0 = M:from_list(List),
-    ?line Empty = M:empty(),
+    S0 = M(from_list, List),
+    Empty = M(empty, []),
 
     %% Trivial cases.
-    ?line true = M:is_empty(M:subtract(Empty, S0)),
-    ?line true = M:equal(S0, M:subtract(S0, Empty)),
+    true = M(is_empty, M(subtract, {Empty,S0})),
+    true = M(equal, {S0,M(subtract, {S0,Empty})}),
 
     %% Not so trivial.
-    ?line subtract_check(List, mutate_some(remove_some(List, 0.4)), M),
-    ?line subtract_check(List, rnd_list(length(List) div 2 + 5), M),
-    ?line subtract_check(List, rnd_list(length(List) div 7 + 9), M),
-    ?line subtract_check(List, mutate_some(List), M).
+    subtract_check(List, mutate_some(remove_some(List, 0.4)), M),
+    subtract_check(List, rnd_list(length(List) div 2 + 5), M),
+    subtract_check(List, rnd_list(length(List) div 7 + 9), M),
+    subtract_check(List, mutate_some(List), M).
 
 subtract_check(A, B, M) ->
     one_subtract_check(B, A, M),
@@ -163,12 +163,12 @@ subtract_check(A, B, M) ->
 one_subtract_check(A, B, M) ->
     ASorted = lists:usort(A),
     BSorted = lists:usort(B),
-    ASet = M:from_list(A),
-    BSet = M:from_list(B),
-    DiffSet = M:subtract(ASet, BSet),
+    ASet = M(from_list, A),
+    BSet = M(from_list, B),
+    DiffSet = M(subtract, {ASet,BSet}),
     Diff = ASorted -- BSorted,
-    true = M:equal(DiffSet, M:from_list(Diff)),
-    Diff = lists:sort(M:to_list(DiffSet)),
+    true = M(equal, {DiffSet,M(from_list, Diff)}),
+    Diff = lists:sort(M(to_list, DiffSet)),
     DiffSet.
 
 intersection(Config) when is_list(Config) ->
@@ -176,60 +176,60 @@ intersection(Config) when is_list(Config) ->
     test_all([{1,65},{126,130},{253,259},{499,513},{1023,1025}], fun intersection_1/2).
 
 intersection_1(List, M) ->
-    ?line S0 = M:from_list(List),
+    S0 = M(from_list, List),
 
     %% Intersection with self.
-    ?line true = M:equal(S0, M:intersection(S0, S0)),
-    ?line true = M:equal(S0, M:intersection([S0,S0])),
-    ?line true = M:equal(S0, M:intersection([S0,S0,S0])),
-    ?line true = M:equal(S0, M:intersection([S0])),
+    true = M(equal, {S0,M(intersection, {S0,S0})}),
+    true = M(equal, {S0,M(intersection, [S0,S0])}),
+    true = M(equal, {S0,M(intersection, [S0,S0,S0])}),
+    true = M(equal, {S0,M(intersection, [S0])}),
 
     %% Intersection with empty.
-    ?line Empty = M:empty(),
-    ?line true = M:equal(Empty, M:intersection(S0, Empty)),
-    ?line true = M:equal(Empty, M:intersection([S0,Empty,S0,Empty])),
+    Empty = M(empty, []),
+    true = M(equal, {Empty,M(intersection, {S0,Empty})}),
+    true = M(equal, {Empty,M(intersection, [S0,Empty,S0,Empty])}),
 
     %% The intersection of no sets is undefined.
-    ?line {'EXIT',_} = (catch M:intersection([])),
+    {'EXIT',_} = (catch M(intersection, [])),
 
     %% Disjoint sets.
-    ?line Disjoint = [{El} || El <- List],
-    ?line DisjointSet = M:from_list(Disjoint),
-    ?line M:is_empty(M:intersection(S0, DisjointSet)),
+    Disjoint = [{El} || El <- List],
+    DisjointSet = M(from_list, Disjoint),
+    true = M(is_empty, M(intersection, {S0,DisjointSet})),
 
     %% Disjoint, different sizes.
-    ?line M:is_empty(M:intersection(S0, M:from_list(remove_some(Disjoint, 0.3)))),
-    ?line M:is_empty(M:intersection(S0, M:from_list(remove_some(Disjoint, 0.7)))),
-    ?line M:is_empty(M:intersection(S0, M:from_list(remove_some(Disjoint, 0.9)))),
-    ?line M:is_empty(M:intersection(M:from_list(remove_some(List, 0.3)), DisjointSet)),
-    ?line M:is_empty(M:intersection(M:from_list(remove_some(List, 0.5)), DisjointSet)),
-    ?line M:is_empty(M:intersection(M:from_list(remove_some(List, 0.9)), DisjointSet)),
+    [begin
+	 SomeRemoved = M(from_list, remove_some(Disjoint, HowMuch)),
+	 true = M(is_empty, M(intersection, {S0,SomeRemoved})),
+	 MoreRemoved = M(from_list, remove_some(List, HowMuch)),
+	 true = M(is_empty, M(intersection, {MoreRemoved,DisjointSet}))
+     end || HowMuch <- [0.3,0.5,0.7,0.9]],
 
     %% Partial overlap (one or more elements in result set).
     %% The sets have almost the same size. (Almost because a duplicated
     %% element in the original list could be mutated and not mutated
     %% at the same time.)
-    ?line PartialOverlap = mutate_some(List, []),
-    ?line IntersectionSet = check_intersection(List, PartialOverlap, M),
-    ?line false = M:is_empty(IntersectionSet),
+    PartialOverlap = mutate_some(List, []),
+    IntersectionSet = check_intersection(List, PartialOverlap, M),
+    false = M(is_empty, IntersectionSet),
 
     %% Partial overlap, different set sizes. (Intersection possibly empty.)
-    ?line check_intersection(List, remove_some(PartialOverlap, 0.1), M),
-    ?line check_intersection(List, remove_some(PartialOverlap, 0.3), M),
-    ?line check_intersection(List, remove_some(PartialOverlap, 0.5), M),
-    ?line check_intersection(List, remove_some(PartialOverlap, 0.7), M),
-    ?line check_intersection(List, remove_some(PartialOverlap, 0.9), M),
+    check_intersection(List, remove_some(PartialOverlap, 0.1), M),
+    check_intersection(List, remove_some(PartialOverlap, 0.3), M),
+    check_intersection(List, remove_some(PartialOverlap, 0.5), M),
+    check_intersection(List, remove_some(PartialOverlap, 0.7), M),
+    check_intersection(List, remove_some(PartialOverlap, 0.9), M),
 
     IntersectionSet.
 
 check_intersection(Orig, Mutated, M) ->
-    OrigSet = M:from_list(Orig),
-    MutatedSet = M:from_list(Mutated),
+    OrigSet = M(from_list, Orig),
+    MutatedSet = M(from_list, Mutated),
     Intersection = [El || El <- Mutated, not is_tuple(El)],
     SortedIntersection = lists:usort(Intersection),
-    IntersectionSet = M:intersection(OrigSet, MutatedSet),
-    true = M:equal(IntersectionSet, M:from_list(SortedIntersection)),
-    SortedIntersection = lists:sort(M:to_list(IntersectionSet)),
+    IntersectionSet = M(intersection, {OrigSet,MutatedSet}),
+    true = M(equal, {IntersectionSet,M(from_list, SortedIntersection)}),
+    SortedIntersection = lists:sort(M(to_list, IntersectionSet)),
 
     IntersectionSet.
 
@@ -239,63 +239,63 @@ union(Config) when is_list(Config) ->
     test_all([{1,71},{125,129},{254,259},{510,513},{1023,1025}], fun union_1/2).
 
 union_1(List, M) ->
-    ?line S = M:from_list(List),
+    S = M(from_list, List),
 
     %% Union with self and empty.
-    ?line Empty = M:empty(),
-    ?line true = M:equal(S, M:union(S, S)),
-    ?line true = M:equal(S, M:union([S,S])),
-    ?line true = M:equal(S, M:union([S,S,Empty])),
-    ?line true = M:equal(S, M:union([S,Empty,S])),
-    ?line true = M:equal(S, M:union(S, Empty)),
-    ?line true = M:equal(S, M:union([S])),
-    ?line true = M:is_empty(M:union([])),
+    Empty = M(empty, []),
+    true = M(equal, {S,M(union, {S,S})}),
+    true = M(equal, {S,M(union, [S,S])}),
+    true = M(equal, {S,M(union, [S,S,Empty])}),
+    true = M(equal, {S,M(union, [S,Empty,S])}),
+    true = M(equal, {S,M(union, {S,Empty})}),
+    true = M(equal, {S,M(union, [S])}),
+    true = M(is_empty, M(union, [])),
 
     %% Partial overlap.
-    ?line check_union(List, remove_some(mutate_some(List), 0.9), M),
-    ?line check_union(List, remove_some(mutate_some(List), 0.7), M),
-    ?line check_union(List, remove_some(mutate_some(List), 0.5), M),
-    ?line check_union(List, remove_some(mutate_some(List), 0.3), M),
-    ?line check_union(List, remove_some(mutate_some(List), 0.1), M),
-
-    ?line check_union(List, mutate_some(remove_some(List, 0.9)), M),
-    ?line check_union(List, mutate_some(remove_some(List, 0.7)), M),
-    ?line check_union(List, mutate_some(remove_some(List, 0.5)), M),
-    ?line check_union(List, mutate_some(remove_some(List, 0.3)), M),
-    ?line check_union(List, mutate_some(remove_some(List, 0.1)), M).
+    check_union(List, remove_some(mutate_some(List), 0.9), M),
+    check_union(List, remove_some(mutate_some(List), 0.7), M),
+    check_union(List, remove_some(mutate_some(List), 0.5), M),
+    check_union(List, remove_some(mutate_some(List), 0.3), M),
+    check_union(List, remove_some(mutate_some(List), 0.1), M),
+
+    check_union(List, mutate_some(remove_some(List, 0.9)), M),
+    check_union(List, mutate_some(remove_some(List, 0.7)), M),
+    check_union(List, mutate_some(remove_some(List, 0.5)), M),
+    check_union(List, mutate_some(remove_some(List, 0.3)), M),
+    check_union(List, mutate_some(remove_some(List, 0.1)), M).
 
 check_union(Orig, Other, M) ->
-    OrigSet = M:from_list(Orig),
-    OtherSet = M:from_list(Other),
+    OrigSet = M(from_list, Orig),
+    OtherSet = M(from_list, Other),
     Union = Orig++Other,
     SortedUnion = lists:usort(Union),
-    UnionSet = M:union(OrigSet, OtherSet),
-    SortedUnion = lists:sort(M:to_list(UnionSet)),
-    M:equal(UnionSet, M:from_list(Union)),
+    UnionSet = M(union, {OrigSet,OtherSet}),
+    SortedUnion = lists:sort(M(to_list, UnionSet)),
+    M(equal, {UnionSet,M(from_list, Union)}),
     UnionSet.
 
 is_subset(Config) when is_list(Config) ->
     test_all([{1,132},{253,270},{299,311}], fun is_subset_1/2).
 
 is_subset_1(List, M) ->
-    ?line S = M:from_list(List),
-    ?line Empty = M:empty(),
+    S = M(from_list, List),
+    Empty = M(empty, []),
 
     %% Subset of empty and self.
-    ?line true = M:is_subset(Empty, Empty),
-    ?line true = M:is_subset(Empty, S),
-    ?line false = M:is_subset(S, Empty),
-    ?line true = M:is_subset(S, S),
+    true = M(is_subset, {Empty,Empty}),
+    true = M(is_subset, {Empty,S}),
+    false = M(is_subset, {S,Empty}),
+    true = M(is_subset, {S,S}),
 
     %% Other cases.
-    Res = [?line false = M:is_subset(M:singleton(make_ref()), S),
-	   ?line true = M:is_subset(M:singleton(hd(List)), S),
-	   ?line true = check_subset(remove_some(List, 0.1), List, M),
-	   ?line true = check_subset(remove_some(List, 0.5), List, M),
-	   ?line true = check_subset(remove_some(List, 0.9), List, M),
-	   ?line check_subset(mutate_some(List), List, M),
-	   ?line check_subset(rnd_list(length(List) div 2 + 5), List, M),
-	   ?line subtract_check(List, rnd_list(length(List) div 7 + 9), M)
+    Res = [false = M(is_subset, {M(singleton, make_ref()),S}),
+	   true = M(is_subset, {M(singleton, hd(List)),S}),
+	   true = check_subset(remove_some(List, 0.1), List, M),
+	   true = check_subset(remove_some(List, 0.5), List, M),
+	   true = check_subset(remove_some(List, 0.9), List, M),
+	   check_subset(mutate_some(List), List, M),
+	   check_subset(rnd_list(length(List) div 2 + 5), List, M),
+	   subtract_check(List, rnd_list(length(List) div 7 + 9), M)
 	  ],
     res_to_set(Res, M, 0, []).
 
@@ -304,12 +304,12 @@ check_subset(X, Y, M) ->
     check_one_subset(X, Y, M).
 
 check_one_subset(X, Y, M) ->
-    XSet = M:from_list(X),
-    YSet = M:from_list(Y),
+    XSet = M(from_list, X),
+    YSet = M(from_list, Y),
     SortedX = lists:usort(X),
     SortedY = lists:usort(Y),
     IsSubSet = length(SortedY--SortedX) =:= length(SortedY) - length(SortedX),
-    IsSubSet = M:is_subset(XSet, YSet),
+    IsSubSet = M(is_subset, {XSet,YSet}),
     IsSubSet.
 
 %% Encode all test results as a set to return.
@@ -317,54 +317,54 @@ res_to_set([true|T], M, I, Acc) ->
     res_to_set(T, M, I+1, [I|Acc]);
 res_to_set([_|T], M, I, Acc) ->
     res_to_set(T, M, I+1, Acc);
-res_to_set([], M, _, Acc) -> M:from_list(Acc).
+res_to_set([], M, _, Acc) -> M(from_list, Acc).
 
 is_set(Config) when is_list(Config) ->
     %% is_set/1 is tested in the other test cases when its argument
     %% is a set. Here test some arguments that makes it return false.
 
-    ?line false = gb_sets:is_set([a,b]),
-    ?line false = gb_sets:is_set({a,very,bad,tuple}),
+    false = gb_sets:is_set([a,b]),
+    false = gb_sets:is_set({a,very,bad,tuple}),
 
-    ?line false = sets:is_set([a,b]),
-    ?line false = sets:is_set({a,very,bad,tuple}),
+    false = sets:is_set([a,b]),
+    false = sets:is_set({a,very,bad,tuple}),
 
-    ?line false = ordsets:is_set([b,a]),
-    ?line false = ordsets:is_set({bad,tuple}),
+    false = ordsets:is_set([b,a]),
+    false = ordsets:is_set({bad,tuple}),
 
     %% Now test values that are known to be bad for all set representations.
     test_all(fun is_set_1/1).
 
 is_set_1(M) ->
-    ?line false = M:is_set(self()),
-    ?line false = M:is_set(blurf),
-    ?line false = M:is_set(make_ref()),
-    ?line false = M:is_set(<<1,2,3>>),
-    ?line false = M:is_set(42),
-    ?line false = M:is_set(math:pi()),
-    ?line false = M:is_set({}),
-    M:empty().
+    false = M(is_set, self()),
+    false = M(is_set, blurf),
+    false = M(is_set, make_ref()),
+    false = M(is_set, <<1,2,3>>),
+    false = M(is_set, 42),
+    false = M(is_set, math:pi()),
+    false = M(is_set, {}),
+    M(empty, []).
 
 fold(Config) when is_list(Config) ->
     test_all([{0,71},{125,129},{254,259},{510,513},{1023,1025},{9999,10001}],
 	     fun fold_1/2).
 
 fold_1(List, M) ->
-    ?line S = M:from_list(List),
-    ?line L = M:fold(fun(E, A) -> [E|A] end, [], S),
-    ?line true = lists:sort(L) =:= lists:usort(List),
-    M:empty().
+    S = M(from_list, List),
+    L = M(fold, {fun(E, A) -> [E|A] end,[],S}),
+    true = lists:sort(L) =:= lists:usort(List),
+    M(empty, []).
 
 filter(Config) when is_list(Config) ->
     test_all([{0,69},{126,130},{254,259},{510,513},{1023,1025},{7999,8000}],
 	     fun filter_1/2).
 
 filter_1(List, M) ->
-    ?line S = M:from_list(List),
+    S = M(from_list, List),
     IsNumber = fun(X) -> is_number(X) end,
-    ?line M:equal(M:from_list(lists:filter(IsNumber, List)),
-		  M:filter(IsNumber, S)),
-    ?line M:filter(fun(X) -> is_atom(X) end, S).
+    M(equal, {M(from_list, lists:filter(IsNumber, List)),
+	      M(filter, {IsNumber,S})}),
+    M(filter, {fun(X) -> is_atom(X) end,S}).
 
 %%%
 %%% Test specifics for gb_sets.
@@ -375,26 +375,26 @@ take_smallest(Config) when is_list(Config) ->
 	     fun take_smallest_1/2).
 
 take_smallest_1(List, M) ->
-    case M:module() of
+    case M(module, []) of
 	gb_sets -> take_smallest_2(List, M);
 	_ -> ok
     end,
-    M:empty().
+    M(empty, []).
 
 take_smallest_2(List0, M) ->
-    ?line List = lists:usort(List0),
-    ?line S = M:from_list(List0),
+    List = lists:usort(List0),
+    S = M(from_list, List0),
     take_smallest_3(S, List, M).
 
 take_smallest_3(S0, List0, M) ->
-    case M:is_empty(S0) of
+    case M(is_empty, S0) of
 	true -> ok;
 	false ->
-	    ?line Smallest = hd(List0),
-	    ?line Smallest = gb_sets:smallest(S0),
-	    ?line {Smallest,S} = gb_sets:take_smallest(S0),
-	    ?line List = tl(List0),
-	    ?line true = gb_sets:to_list(S) =:= List,
+	    Smallest = hd(List0),
+	    Smallest = gb_sets:smallest(S0),
+	    {Smallest,S} = gb_sets:take_smallest(S0),
+	    List = tl(List0),
+	    true = gb_sets:to_list(S) =:= List,
 	    take_smallest_3(S, List, M)
     end.
 
@@ -403,26 +403,26 @@ take_largest(Config) when is_list(Config) ->
 	     fun take_largest_1/2).
 
 take_largest_1(List, M) ->
-    case M:module() of
+    case M(module, []) of
 	gb_sets -> take_largest_2(List, M);
 	_ -> ok
     end,
-    M:empty().
+    M(empty, []).
 
 take_largest_2(List0, M) ->
-    ?line List = reverse(lists:usort(List0)),
-    ?line S = M:from_list(List0),
+    List = reverse(lists:usort(List0)),
+    S = M(from_list, List0),
     take_largest_3(S, List, M).
 
 take_largest_3(S0, List0, M) ->
-    case M:is_empty(S0) of
+    case M(is_empty, S0) of
 	true -> ok;
 	false ->
-	    ?line Largest = hd(List0),
-	    ?line Largest = gb_sets:largest(S0),
-	    ?line {Largest,S} = gb_sets:take_largest(S0),
-	    ?line List = tl(List0),
-	    ?line true = gb_sets:to_list(S) =:= reverse(List),
+	    Largest = hd(List0),
+	    Largest = gb_sets:largest(S0),
+	    {Largest,S} = gb_sets:take_largest(S0),
+	    List = tl(List0),
+	    true = gb_sets:to_list(S) =:= reverse(List),
 	    take_largest_3(S, List, M)
     end.
 
@@ -441,23 +441,23 @@ sets_mods() ->
     [Ordsets,Sets,Gb].
 
 test_all(Tester) ->
-    ?line Res = [begin
-		     random:seed(1, 2, 42),
-		     S = Tester(M),
-		     {M:size(S),lists:sort(M:to_list(S))}
-		 end || M <- sets_mods()],
-    ?line all_same(Res).
+    Res = [begin
+	       random:seed(1, 2, 42),
+	       S = Tester(M),
+	       {M(size, S),lists:sort(M(to_list, S))}
+	   end || M <- sets_mods()],
+    all_same(Res).
 
 test_all([{Low,High}|T], Tester) ->
     test_all(lists:seq(Low, High)++T, Tester);
 test_all([Sz|T], Tester) when is_integer(Sz) ->
     List = rnd_list(Sz),
-    ?line Res = [begin
+    Res = [begin
 		     random:seed(19, 2, Sz),
 		     S = Tester(List, M),
-		     {M:size(S),lists:sort(M:to_list(S))}
+		     {M(size, S),lists:sort(M(to_list, S))}
 		 end || M <- sets_mods()],
-    ?line all_same(Res),
+    all_same(Res),
     test_all(T, Tester);
 test_all([], _) -> ok.
 
diff --git a/lib/stdlib/test/sets_test_lib.erl b/lib/stdlib/test/sets_test_lib.erl
index bdfb0d59d2..fd4ec2bac3 100644
--- a/lib/stdlib/test/sets_test_lib.erl
+++ b/lib/stdlib/test/sets_test_lib.erl
@@ -17,91 +17,89 @@
 %% %CopyrightEnd%
 %%
 
--module(sets_test_lib, [Mod,Equal]).
-
--export([module/0,equal/2,empty/0,from_list/1,to_list/1,singleton/1,
-	 add_element/2,del_element/2,size/1,is_empty/1,is_set/1,
-	 intersection/1,intersection/2,subtract/2,
-	 union/1,union/2,is_subset/2,fold/3,filter/2]).
-
-module() ->
-    Mod.
-
-equal(X, Y) ->
-    Equal(X, Y).
-
-empty() ->
-    Mod:new().
-
-from_list(L) ->
-    Mod:from_list(L).
-
-to_list(S) ->
-    Mod:to_list(S).
+-module(sets_test_lib).
+
+-export([new/2]).
+
+new(Mod, Eq) ->
+    fun	(add_element, {El,S}) -> add_element(Mod, El, S);
+	(del_element, {El,S}) -> del_element(Mod, El, S);
+	(empty, []) -> Mod:new();
+	(equal, {S1,S2}) -> Eq(S1, S2);
+	(filter, {F,S}) -> filter(Mod, F, S);
+	(fold, {F,A,S}) -> fold(Mod, F, A, S);
+	(from_list, L) -> Mod:from_list(L);
+	(intersection, {S1,S2}) -> intersection(Mod, Eq, S1, S2);
+	(intersection, Ss) -> intersection(Mod, Eq, Ss);
+	(is_empty, S) -> is_empty(Mod, S);
+	(is_set, S) -> Mod:is_set(S);
+	(is_subset, {S,Set}) -> is_subset(Mod, Eq, S, Set);
+	(module, []) -> Mod;
+	(singleton, E) -> singleton(Mod, E);
+	(size, S) -> Mod:size(S);
+	(subtract, {S1,S2}) -> subtract(Mod, S1, S2);
+	(to_list, S) -> Mod:to_list(S);
+	(union, {S1,S2}) -> union(Mod, Eq, S1, S2);
+	(union, Ss) -> union(Mod, Eq, Ss)
+    end.
 
-singleton(E) ->
+singleton(Mod, E) ->
     case erlang:function_exported(Mod, singleton, 1) of
 	true -> Mod:singleton(E);
-	false -> from_list([E])
+	false -> Mod:from_list([E])
     end.
 
-add_element(El, S0) ->
+add_element(Mod, El, S0) ->
     S = Mod:add_element(El, S0),
     true = Mod:is_element(El, S),
-    false = is_empty(S),
+    false = is_empty(Mod, S),
     true = Mod:is_set(S),
     S.
 
-del_element(El, S0) ->
+del_element(Mod, El, S0) ->
     S = Mod:del_element(El, S0),
     false = Mod:is_element(El, S),
     true = Mod:is_set(S),
     S.
 
-size(S) ->
-    Mod:size(S).
-
-is_empty(S) ->
+is_empty(Mod, S) ->
     true = Mod:is_set(S),
     case erlang:function_exported(Mod, is_empty, 1) of
 	true -> Mod:is_empty(S);
 	false -> Mod:size(S) == 0
     end.
 
-is_set(S) ->
-    Mod:is_set(S).
-
-intersection(S1, S2) ->
+intersection(Mod, Equal, S1, S2) ->
     S = Mod:intersection(S1, S2),
     true = Equal(S, Mod:intersection(S2, S1)),
-    Disjoint = is_empty(S),
+    Disjoint = is_empty(Mod, S),
     Disjoint = Mod:is_disjoint(S1, S2),
     Disjoint = Mod:is_disjoint(S2, S1),
     S.
 
-intersection(Ss) ->
+intersection(Mod, Equal, Ss) ->
     S = Mod:intersection(Ss),
     true = Equal(S, Mod:intersection(lists:reverse(Ss))),
     S.
 
-subtract(S1, S2) ->
+subtract(Mod, S1, S2) ->
     S = Mod:subtract(S1, S2),
     true = Mod:is_set(S),
     true = Mod:size(S) =< Mod:size(S1),
     S.
 	    
-union(S1, S2) ->
+union(Mod, Equal, S1, S2) ->
     S = Mod:union(S1, S2),
     true = Equal(S, Mod:union(S2, S1)),
     true = Mod:is_set(S),
     S.
 
-union(Ss) ->
+union(Mod, Equal, Ss) ->
     S = Mod:union(Ss),
     true = Equal(S, Mod:union(lists:reverse(Ss))),
     S.
 		 
-is_subset(S, Set) ->
+is_subset(Mod, Equal, S, Set) ->
     case Mod:is_subset(S, Set) of
 	false -> false;
 	true ->
@@ -115,10 +113,10 @@ is_subset(S, Set) ->
 	    true
     end.
 
-fold(F, A, S) ->
+fold(Mod, F, A, S) ->
     true = Mod:is_set(S),
     Mod:fold(F, A, S).
 
-filter(F, S) ->
+filter(Mod, F, S) ->
     true = Mod:is_set(S),
     Mod:filter(F, S).
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 5be14767fa..d49416c150 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -153,7 +153,7 @@ start_restricted_from_shell(Config) when is_list(Config) ->
 	comm_err(<<"begin init:stop() end.">>),
     ?line "exception exit: restricted shell does not allow init:stop()" = 
 	comm_err(<<"begin F = fun() -> init:stop() end, F() end.">>),
-    ?line "exception error: bad argument in an arithmetic expression" = 
+    ?line "exception error: an error occurred when evaluating an arithmetic expression" =
 	comm_err(<<"begin +a end.">>),
     ?line "exception exit: restricted shell does not allow a + b" = 
 	comm_err(<<"begin a+b end.">>),
@@ -817,9 +817,6 @@ otp_5916(Config) when is_list(Config) ->
         true = if is_record(#r1{},r1,3) -> true; true ->  false end,
         false = if is_record(#r2{},r1,3) -> true; true ->  false end,
 
-        true = if {erlang,is_record}(#r1{},r1,3) -> true; true ->  false end,
-        false = if {erlang,is_record}(#r2{},r1,3) -> true; true ->  false end,
-
         ok.">>,
     [ok] = scan(C),
     ok.
@@ -2282,12 +2279,6 @@ otp_5990(doc) ->
 otp_5990(suite) -> [];
 otp_5990(Config) when is_list(Config) ->
     ?line [true] = 
-        scan(<<"rd(foo,{bar}), {erlang,is_record}(#foo{}, foo).">>),
-    ?line [3] =
-        scan(<<"rd(foo,{bar}), A = #foo{}, "
-               "{if {erlang,is_record}(A, foo) -> erlang; "
-               "true -> not_a_module end, length}([1,2,3]).">>),
-    ?line [true] = 
         scan(<<"rd('OrdSet', {orddata = {},ordtype = type}), "
                "S = #'OrdSet'{ordtype = {}}, "
                "if tuple(S#'OrdSet'.ordtype) -> true; true -> false end.">>),
@@ -2359,7 +2350,7 @@ otp_6554(Config) when is_list(Config) ->
         comm_err(<<"fun(X) -> not X end(a).">>),
     ?line "exception error: bad argument: a" = 
         comm_err(<<"fun(A, B) -> A orelse B end(a, b).">>),
-    ?line "exception error: bad argument in an arithmetic expression" = 
+    ?line "exception error: an error occurred when evaluating an arithmetic expression" =
         comm_err(<<"math:sqrt(2)/round(math:sqrt(0)).">>),
     ?line "exception error: interpreted function with arity 1 called with no arguments" = 
         comm_err(<<"fun(V) -> V end().">>),
@@ -2478,9 +2469,9 @@ otp_6554(Config) when is_list(Config) ->
                      "  receive {'EXIT', Pid, {{nocatch,foo},_}} -> ok end "
                      "end.">>),
 
-    ?line "exception error: bad argument in an arithmetic expression" = 
+    ?line "exception error: an error occurred when evaluating an arithmetic expression" =
         comm_err(<<"begin catch_exception(true), 1/0 end.">>),
-    ?line "exception error: bad argument in an arithmetic expression" = 
+    ?line "exception error: an error occurred when evaluating an arithmetic expression" =
         comm_err(<<"begin catch_exception(false), 1/0 end.">>),
     ?line "exception error: no function clause matching call to catch_exception/1" = 
         comm_err(<<"catch_exception(1).">>),
@@ -2637,7 +2628,7 @@ otp_8393(Config) when is_list(Config) ->
         prompt_err(<<"shell:prompt_func('> ').">>),
 
     ?line _ = shell:prompt_func(default),
-    ?line "exception error: bad argument in an arithmetic expression"++_ =
+    ?line "exception error: an error occurred when evaluating an arithmetic expression"++_ =
         prompt_err(<<"shell:prompt_func({shell_SUITE,prompt4}).">>),
 
     ?line _ = shell:prompt_func(default),
@@ -2710,7 +2701,7 @@ prompt3(L) ->
     integer_to_list(N).
 
 prompt4(_L) ->
-    erlang:apply({erlang,'/'}, [1,0]).
+    erlang:apply(fun erlang:'/'/2, [1,0]).
 
 prompt5(_L) ->
     [1050,1072,1082,1074,1086,32,1077,32,85,110,105,99,111,100,101,32,63].
diff --git a/lib/stdlib/test/stdlib.cover b/lib/stdlib/test/stdlib.cover
index 61f4f064b9..e71be880cb 100644
--- a/lib/stdlib/test/stdlib.cover
+++ b/lib/stdlib/test/stdlib.cover
@@ -1,17 +1,2 @@
 %% -*- erlang -*-
 {incl_app,stdlib,details}.
-
-{excl_mods,stdlib,
- [erl_parse,
-  erl_eval,
-  ets,
-  filename,
-  gen_event,
-  gen_server,
-  gen,
-  lists,
-  io,
-  io_lib,
-  io_lib_format,
-  io_lib_pretty,
-  proc_lib]}.
diff --git a/lib/stdlib/test/stdlib.spec.vxworks b/lib/stdlib/test/stdlib.spec.vxworks
deleted file mode 100644
index ddc804b831..0000000000
--- a/lib/stdlib/test/stdlib.spec.vxworks
+++ /dev/null
@@ -1,8 +0,0 @@
-{topcase, {dir, "../stdlib_test"}}.
-{skip,{dets_SUITE,"Not runnable VxWorks/NFS"}}.
-{skip,{slave_SUITE,"VxWorks: slave nodes are not supported"}}.
-{skip,{tar_SUITE,errors,"VxWorks filesystem too primitive"}}.
-{skip,{tar_SUITE,create_long_names,"VxWorks names too short"}}.
-{skip,{epp_SUITE,"Test not adopted to VxWorks"}}.
-{skip,{select_SUITE,"Test too memory consuming for VxWorks"}}.
-{skip,{beam_lib_SUITE,error,"All sections not present in stripped beam files"}}.
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index 767ae3d62c..569c66959e 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -46,6 +46,7 @@
 	  temporary_normal/1,
 	  permanent_shutdown/1, transient_shutdown/1,
 	  temporary_shutdown/1,
+          faulty_application_shutdown/1,
 	  permanent_abnormal/1, transient_abnormal/1,
 	  temporary_abnormal/1, temporary_bystander/1]).
 
@@ -98,7 +99,8 @@ groups() ->
      {normal_termination, [],
       [permanent_normal, transient_normal, temporary_normal]},
      {shutdown_termination, [],
-      [permanent_shutdown, transient_shutdown, temporary_shutdown]},
+      [permanent_shutdown, transient_shutdown, temporary_shutdown,
+       faulty_application_shutdown]},
      {abnormal_termination, [],
       [permanent_abnormal, transient_abnormal,
        temporary_abnormal]},
@@ -659,6 +661,39 @@ temporary_shutdown(Config) when is_list(Config) ->
     [0,0,0,0] = get_child_counts(sup_test).
 
 %%-------------------------------------------------------------------------
+%% Faulty application should shutdown and pass on errors
+faulty_application_shutdown(Config) when is_list(Config) ->
+
+    %% Set some paths
+    AppDir  = filename:join(?config(data_dir, Config), "app_faulty"),
+    EbinDir = filename:join(AppDir, "ebin"),
+
+    %% Start faulty app
+    code:add_patha(EbinDir),
+
+    %% {error,
+    %%  {{shutdown,
+    %%    {failed_to_start_child,
+    %% 	app_faulty,
+    %% 	{undef,
+    %% 	 [{an_undefined_module_with,an_undefined_function,[argument1,argument2],
+    %% 	   []},
+    %% 	  {app_faulty_server,init,1,
+    %% 	   [{file,"app_faulty/src/app_faulty_server.erl"},{line,16}]},
+    %% 	  {gen_server,init_it,6,
+    %% 	   [{file,"gen_server.erl"},{line,304}]},
+    %% 	  {proc_lib,init_p_do_apply,3,
+    %% 	   [{file,"proc_lib.erl"},{line,227}]}]}}},
+    %%   {app_faulty,start,[normal,[]]}}}
+
+    {error, Error} = application:start(app_faulty),
+    {{shutdown, {failed_to_start_child,app_faulty,{undef, CallStack}}},
+     {app_faulty,start,_}} = Error,
+    [{an_undefined_module_with,an_undefined_function,_,_}|_] = CallStack,
+    ok = application:unload(app_faulty),
+    ok.
+
+%%-------------------------------------------------------------------------
 %% A permanent child should always be restarted.
 permanent_abnormal(Config) when is_list(Config) ->
     {ok, SupPid} = start_link({ok, {{one_for_one, 2, 3600}, []}}),
diff --git a/lib/stdlib/test/supervisor_SUITE_data/Makefile.src b/lib/stdlib/test/supervisor_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..dbc5729f47
--- /dev/null
+++ b/lib/stdlib/test/supervisor_SUITE_data/Makefile.src
@@ -0,0 +1,15 @@
+EFLAGS=+debug_info
+
+APP_FAULTY= \
+     app_faulty/ebin/app_faulty_sup.@EMULATOR@ \
+     app_faulty/ebin/app_faulty_server.@EMULATOR@ \
+     app_faulty/ebin/app_faulty.@EMULATOR@ \
+
+all: $(APP_FAULTY)
+
+app_faulty/ebin/app_faulty_server.@EMULATOR@: app_faulty/src/app_faulty_server.erl
+	erlc $(EFLAGS) -oapp_faulty/ebin app_faulty/src/app_faulty_server.erl
+app_faulty/ebin/app_faulty_sup.@EMULATOR@: app_faulty/src/app_faulty_sup.erl
+	erlc $(EFLAGS) -oapp_faulty/ebin app_faulty/src/app_faulty_sup.erl
+app_faulty/ebin/app_faulty.@EMULATOR@: app_faulty/src/app_faulty.erl
+	erlc $(EFLAGS) -oapp_faulty/ebin app_faulty/src/app_faulty.erl
diff --git a/lib/stdlib/test/supervisor_SUITE_data/app_faulty/ebin/app_faulty.app b/lib/stdlib/test/supervisor_SUITE_data/app_faulty/ebin/app_faulty.app
new file mode 100644
index 0000000000..d4ab07e485
--- /dev/null
+++ b/lib/stdlib/test/supervisor_SUITE_data/app_faulty/ebin/app_faulty.app
@@ -0,0 +1,10 @@
+{application, app_faulty,
+ [{description, "very simple example faulty application"},
+  {id, "app_faulty"},
+  {vsn, "1.0"},
+  {modules, [app_faulty, app_faulty_sup, app_faulty_server]},
+  {registered, [app_faulty]},
+  {applications, [kernel, stdlib]},
+  {env, [{var,val1}]},
+  {mod, {app_faulty, []}}
+  ]}.
diff --git a/lib/stdlib/test/supervisor_SUITE_data/app_faulty/src/app_faulty.erl b/lib/stdlib/test/supervisor_SUITE_data/app_faulty/src/app_faulty.erl
new file mode 100644
index 0000000000..c65b411cd6
--- /dev/null
+++ b/lib/stdlib/test/supervisor_SUITE_data/app_faulty/src/app_faulty.erl
@@ -0,0 +1,17 @@
+-module(app_faulty).
+
+-behaviour(application).
+
+%% Application callbacks
+-export([start/2, stop/1]).
+
+start(_Type, _StartArgs) ->
+    case app_faulty_sup:start_link() of
+	{ok, Pid} ->
+	    {ok, Pid};
+	Error ->
+	    Error
+    end.
+
+stop(_State) ->
+    ok.
diff --git a/lib/stdlib/test/supervisor_SUITE_data/app_faulty/src/app_faulty_server.erl b/lib/stdlib/test/supervisor_SUITE_data/app_faulty/src/app_faulty_server.erl
new file mode 100644
index 0000000000..6628f92210
--- /dev/null
+++ b/lib/stdlib/test/supervisor_SUITE_data/app_faulty/src/app_faulty_server.erl
@@ -0,0 +1,32 @@
+-module(app_faulty_server).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+init([]) ->
+    an_undefined_module_with:an_undefined_function(argument1, argument2),
+    {ok, []}.
+
+handle_call(_Request, _From, State) ->
+    {reply, ok, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
diff --git a/lib/stdlib/test/supervisor_SUITE_data/app_faulty/src/app_faulty_sup.erl b/lib/stdlib/test/supervisor_SUITE_data/app_faulty/src/app_faulty_sup.erl
new file mode 100644
index 0000000000..8115a88809
--- /dev/null
+++ b/lib/stdlib/test/supervisor_SUITE_data/app_faulty/src/app_faulty_sup.erl
@@ -0,0 +1,17 @@
+-module(app_faulty_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Supervisor callbacks
+-export([init/1]).
+
+start_link() ->
+    supervisor:start_link(?MODULE, []).
+
+init([]) ->
+    AChild = {app_faulty,{app_faulty_server,start_link,[]},
+	      permanent,2000,worker,[app_faulty_server]},
+    {ok,{{one_for_all,0,1}, [AChild]}}.
diff --git a/lib/stdlib/test/sys_SUITE.erl b/lib/stdlib/test/sys_SUITE.erl
index fe039e8bcc..b2e1d12b2a 100644
--- a/lib/stdlib/test/sys_SUITE.erl
+++ b/lib/stdlib/test/sys_SUITE.erl
@@ -56,70 +56,60 @@ end_per_group(_GroupName, Config) ->
 
 log(suite) -> [];
 log(Config) when is_list(Config) ->
-    ?line {ok,_Server} = start(),
-    ?line ok = sys:log(?server,true),
-    ?line {ok,-44} = public_call(44),
-    ?line ok = sys:log(?server,false),
-    ?line ok = sys:log(?server,print),
-    ?line stop(),
+    {ok,_Server} = start(),
+    ok = sys:log(?server,true),
+    {ok,-44} = public_call(44),
+    ok = sys:log(?server,false),
+    ok = sys:log(?server,print),
+    stop(),
     ok.
 
 log_to_file(suite) -> [];
 log_to_file(Config) when is_list(Config) ->
     TempName = test_server:temp_name(?config(priv_dir,Config) ++ "sys."),
-    ?line {ok,_Server} = start(),
-    ?line ok = sys:log_to_file(?server,TempName),
-    ?line {ok,-44} = public_call(44),
-    ?line ok = sys:log_to_file(?server,false),
-    ?line {ok,Fd} = file:open(TempName,[read]),
-    ?line Msg1 = io:get_line(Fd,''),
-    ?line Msg2 = io:get_line(Fd,''),
-    ?line file:close(Fd),
-    ?line lists:prefix("*DBG* sys_SUITE_server got call {req,44} from ",Msg1),
-    ?line lists:prefix("*DBG* sys_SUITE_server sent {ok,-44} to ",Msg2),
-    ?line stop(),
+    {ok,_Server} = start(),
+    ok = sys:log_to_file(?server,TempName),
+    {ok,-44} = public_call(44),
+    ok = sys:log_to_file(?server,false),
+    {ok,Fd} = file:open(TempName,[read]),
+    Msg1 = io:get_line(Fd,''),
+    Msg2 = io:get_line(Fd,''),
+    file:close(Fd),
+    lists:prefix("*DBG* sys_SUITE_server got call {req,44} from ",Msg1),
+    lists:prefix("*DBG* sys_SUITE_server sent {ok,-44} to ",Msg2),
+    stop(),
     ok.
 
 stats(suite) -> [];
 stats(Config) when is_list(Config) ->
-    ?line Self = self(),
-    ?line {ok,_Server} = start(),
-    ?line ok = sys:statistics(?server,true),
-    ?line {ok,-44} = public_call(44),
-    ?line {ok,Stats} = sys:statistics(?server,get),
-    ?line lists:member({messages_in,1},Stats),
-    ?line lists:member({messages_out,1},Stats),
-    ?line ok = sys:statistics(?server,false),
-    ?line {status,_Pid,{module,_Mod},[_PDict,running,Self,_,_]} =
+    Self = self(),
+    {ok,_Server} = start(),
+    ok = sys:statistics(?server,true),
+    {ok,-44} = public_call(44),
+    {ok,Stats} = sys:statistics(?server,get),
+    lists:member({messages_in,1},Stats),
+    lists:member({messages_out,1},Stats),
+    ok = sys:statistics(?server,false),
+    {status,_Pid,{module,_Mod},[_PDict,running,Self,_,_]} =
 	sys:get_status(?server),
-    ?line {ok,no_statistics} = sys:statistics(?server,get),
-    ?line stop(),
+    {ok,no_statistics} = sys:statistics(?server,get),
+    stop(),
     ok.
 
 trace(suite) -> [];
 trace(Config) when is_list(Config) ->
-    ?line {ok,_Server} = start(),
-    case os:type() of
-	vxworks ->
-	    ?line test_server:sleep(20000);
-	_ ->
-	    ?line test_server:sleep(2000)
-    end,
-    ?line test_server:capture_start(),
-    ?line sys:trace(?server,true),
-    ?line {ok,-44} = public_call(44),
+    {ok,_Server} = start(),
+    test_server:sleep(2000),
+    test_server:capture_start(),
+    sys:trace(?server,true),
+    {ok,-44} = public_call(44),
     %% ho, hum, allow for the io to reach us..
-    case os:type() of
-	vxworks ->
-	    ?line test_server:sleep(10000);
-	_ ->
-	    ?line test_server:sleep(1000)
-    end,
-    ?line test_server:capture_stop(),
-    ?line [Msg1,Msg2] = test_server:capture_get(),
-    ?line lists:prefix("*DBG* sys_SUITE_server got call {req,44} from ",Msg1),
-    ?line lists:prefix("*DBG* sys_SUITE_server sent {ok,-44} to ",Msg2),
-    ?line stop(),
+    test_server:sleep(1000),
+    test_server:capture_stop(),
+    [Msg1,Msg2] = test_server:capture_get(),
+    lists:prefix("*DBG* sys_SUITE_server got call {req,44} from ",Msg1),
+    lists:prefix("*DBG* sys_SUITE_server sent {ok,-44} to ",Msg2),
+    stop(),
     ok.
 
 suspend(suite) -> [];
diff --git a/lib/stdlib/test/timer_SUITE.erl b/lib/stdlib/test/timer_SUITE.erl
index f84c72b0f8..1110891ab8 100644
--- a/lib/stdlib/test/timer_SUITE.erl
+++ b/lib/stdlib/test/timer_SUITE.erl
@@ -32,7 +32,6 @@
 %% functions I guess. But I don't have time for that now.
 %%
 %% Expect it to run for at least 5-10 minutes!
-%% Except for VxWorks of course, where a couple of hours is more apropriate...
 
 
 %% The main test case in this module is "do_big_test", which
@@ -77,12 +76,7 @@ end_per_group(_GroupName, Config) ->
 do_big_test(TConfig) when is_list(TConfig) ->
     Dog = ?t:timetrap(?t:minutes(20)),
     Save = process_flag(trap_exit, true),
-    Result = case os:type() of
-		 vxworks ->
-		     big_test(10);
-		 _ ->
-		     big_test(200)
-	     end,
+    Result = big_test(200),
     process_flag(trap_exit, Save),
     ?t:timetrap_cancel(Dog),
     report_result(Result).
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 694d39ce9c..33d7a57cc3 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 1.18.1
+STDLIB_VSN = 1.19
diff --git a/lib/syntax_tools/doc/overview.edoc b/lib/syntax_tools/doc/overview.edoc
index 23eadce8fe..df02ad0b3a 100644
--- a/lib/syntax_tools/doc/overview.edoc
+++ b/lib/syntax_tools/doc/overview.edoc
@@ -1,5 +1,9 @@
+			-*- html -*-
 
-@author Richard Carlsson <[email protected]>
+	Syntax Tools overview page
+
+
+@author Richard Carlsson <[email protected]>
 @copyright 1997-2004 Richard Carlsson
 @version {@version}
 @title Erlang Syntax Tools
diff --git a/lib/syntax_tools/doc/src/Makefile b/lib/syntax_tools/doc/src/Makefile
index 291b3e3047..2502bf877a 100644
--- a/lib/syntax_tools/doc/src/Makefile
+++ b/lib/syntax_tools/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2006-2010. All Rights Reserved.
+# Copyright Ericsson AB 2006-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -125,13 +125,13 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index 434a3e721e..fdfa414ad2 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2011</year>
+      <year>2007</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,24 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 1.6.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Syntax Tools 1.6.9</p>
+          <p>
+	    Minor bugfixes, spec annotations and documentation
+	    cleanup. Thanks to Richard Carlsson</p>
+          <p>
+	    Own Id: OTP-10208</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Syntax_Tools 1.6.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/syntax_tools/examples/Makefile b/lib/syntax_tools/examples/Makefile
index 7cfe9185c2..2724b0899b 100644
--- a/lib/syntax_tools/examples/Makefile
+++ b/lib/syntax_tools/examples/Makefile
@@ -49,8 +49,8 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec:
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples"
 
 release_docs_spec:
 
diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile
index bac138e95a..dca5e78be9 100644
--- a/lib/syntax_tools/src/Makefile
+++ b/lib/syntax_tools/src/Makefile
@@ -80,10 +80,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(SOURCES) $(RELSYSDIR)/src
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(SOURCES) "$(RELSYSDIR)/src"
 
 release_docs_spec:
 
diff --git a/lib/syntax_tools/src/epp_dodger.erl b/lib/syntax_tools/src/epp_dodger.erl
index 9f6f7d815e..b3ced34c14 100644
--- a/lib/syntax_tools/src/epp_dodger.erl
+++ b/lib/syntax_tools/src/epp_dodger.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 2001-2006 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @end
 %% =====================================================================
 
diff --git a/lib/syntax_tools/src/erl_comment_scan.erl b/lib/syntax_tools/src/erl_comment_scan.erl
index 108ab3bffd..b833e1c069 100644
--- a/lib/syntax_tools/src/erl_comment_scan.erl
+++ b/lib/syntax_tools/src/erl_comment_scan.erl
@@ -16,7 +16,7 @@
 %%
 %% =====================================================================
 %% @copyright 1997-2006 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @end
 %% =====================================================================
 
diff --git a/lib/syntax_tools/src/erl_prettypr.erl b/lib/syntax_tools/src/erl_prettypr.erl
index 7caf0b3db6..f4bbf975c3 100644
--- a/lib/syntax_tools/src/erl_prettypr.erl
+++ b/lib/syntax_tools/src/erl_prettypr.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 1997-2006 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @end
 %% =====================================================================
 
diff --git a/lib/syntax_tools/src/erl_recomment.erl b/lib/syntax_tools/src/erl_recomment.erl
index fc7c515700..7b2f9f7adb 100644
--- a/lib/syntax_tools/src/erl_recomment.erl
+++ b/lib/syntax_tools/src/erl_recomment.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 1997-2006 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @end
 %% =====================================================================
 
diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl
index 32fd3722d6..151f04b03b 100644
--- a/lib/syntax_tools/src/erl_syntax.erl
+++ b/lib/syntax_tools/src/erl_syntax.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 1997-2006 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @end
 %% =====================================================================
 
@@ -26,23 +24,20 @@
 %% This module defines an abstract data type for representing Erlang
 %% source code as syntax trees, in a way that is backwards compatible
 %% with the data structures created by the Erlang standard library
-%% parser module <code>erl_parse</code> (often referred to as "parse
+%% parser module `erl_parse' (often referred to as "parse
 %% trees", which is a bit of a misnomer). This means that all
-%% <code>erl_parse</code> trees are valid abstract syntax trees, but the
+%% `erl_parse' trees are valid abstract syntax trees, but the
 %% reverse is not true: abstract syntax trees can in general not be used
-%% as input to functions expecting an <code>erl_parse</code> tree.
+%% as input to functions expecting an `erl_parse' tree.
 %% However, as long as an abstract syntax tree represents a correct
-%% Erlang program, the function <a
-%% href="#revert-1"><code>revert/1</code></a> should be able to
-%% transform it to the corresponding <code>erl_parse</code>
+%% Erlang program, the function {@link revert/1} should be able to
+%% transform it to the corresponding `erl_parse'
 %% representation.
 %%
-%% A recommended starting point for the first-time user is the
-%% documentation of the <a
-%% href="#type-syntaxTree"><code>syntaxTree()</code></a> data type, and
-%% the function <a href="#type-1"><code>type/1</code></a>.
+%% A recommended starting point for the first-time user is the documentation
+%% of the {@link syntaxTree()} data type, and the function {@link type/1}.
 %%
-%% <h3><b>NOTES:</b></h3>
+%% == NOTES: ==
 %%
 %% This module deals with the composition and decomposition of
 %% <em>syntactic</em> entities (as opposed to semantic ones); its
@@ -52,36 +47,31 @@
 %% in general, the user is assumed to pass type-correct arguments - if
 %% this is not done, the effects are not defined.
 %%
-%% With the exception of the <code>erl_parse</code> data structures,
+%% With the exception of the {@link erl_parse()} data structures,
 %% the internal representations of abstract syntax trees are subject to
 %% change without notice, and should not be documented outside this
 %% module. Furthermore, we do not give any guarantees on how an abstract
 %% syntax tree may or may not be represented, <em>with the following
 %% exceptions</em>: no syntax tree is represented by a single atom, such
-%% as <code>none</code>, by a list constructor <code>[X | Y]</code>, or
-%% by the empty list <code>[]</code>. This can be relied on when writing
+%% as `none', by a list constructor `[X | Y]', or
+%% by the empty list `[]'. This can be relied on when writing
 %% functions that operate on syntax trees.
 
-%% @type syntaxTree(). An abstract syntax tree. The
-%% <code>erl_parse</code> "parse tree" representation is a subset of the
-%% <code>syntaxTree()</code> representation.
+%% @type syntaxTree(). An abstract syntax tree. The {@link erl_parse()}
+%% "parse tree" representation is a proper subset of the `syntaxTree()'
+%% representation.
 %%
 %% Every abstract syntax tree node has a <em>type</em>, given by the
-%% function <a href="#type-1"><code>type/1</code></a>. Each node also
-%% has associated <em>attributes</em>; see <a
-%% href="#get_attrs-1"><code>get_attrs/1</code></a> for details. The
-%% functions <a href="#make_tree-2"><code>make_tree/2</code></a> and <a
-%% href="#subtrees-1"><code>subtrees/1</code></a> are generic
+%% function {@link type/1}. Each node also has associated
+%% <em>attributes</em>; see {@link get_attrs/1} for details. The functions
+%% {@link make_tree/2} and {@link subtrees/1} are generic
 %% constructor/decomposition functions for abstract syntax trees. The
-%% functions <a href="#abstract-1"><code>abstract/1</code></a> and <a
-%% href="#concrete-1"><code>concrete/1</code></a> convert between
+%% functions {@link abstract/1} and {@link concrete/1} convert between
 %% constant Erlang terms and their syntactic representations. The set of
-%% syntax tree nodes is extensible through the <a
-%% href="#tree-2"><code>tree/2</code></a> function.
+%% syntax tree nodes is extensible through the {@link tree/2} function.
 %%
-%% A syntax tree can be transformed to the <code>erl_parse</code>
-%% representation with the <a href="#revert-1"><code>revert/1</code></a>
-%% function.
+%% A syntax tree can be transformed to the {@link erl_parse()}
+%% representation with the {@link revert/1} function.
 
 -module(erl_syntax).
 
@@ -309,7 +299,7 @@
 	 data/1,
 	 is_tree/1]).
 
--export_type([forms/0, syntaxTree/0, syntaxTreeAttributes/0]).
+-export_type([forms/0, syntaxTree/0, syntaxTreeAttributes/0, padding/0]).
 
 %% =====================================================================
 %% IMPLEMENTATION NOTES:
@@ -390,11 +380,15 @@
 
 -record(wrapper, {type           :: atom(),
 		  attr = #attr{} :: #attr{},
-		  tree           :: term()}).
+		  tree           :: erl_parse()}).
 
 %% =====================================================================
 
--type syntaxTree() :: #tree{} | #wrapper{} | tuple(). % XXX: refine
+-type syntaxTree() :: #tree{} | #wrapper{} | erl_parse().
+
+-type erl_parse() :: erl_parse:abstract_form() | erl_parse:abstract_expr().
+%% The representation built by the Erlang standard library parser
+%% `erl_parse'. This is a subset of the {@link syntaxTree()} type.
 
 %% =====================================================================
 %%
@@ -404,12 +398,11 @@
 
 
 %% =====================================================================
-%% @spec type(Node::syntaxTree()) -> atom()
-%%
-%% @doc Returns the type tag of <code>Node</code>. If <code>Node</code>
+%% @doc Returns the type tag of `Node'. If `Node'
 %% does not represent a syntax tree, evaluation fails with reason
-%% <code>badarg</code>. Node types currently defined by this module are:
-%% <p><center><table border="1">
+%% `badarg'. Node types currently defined by this module are:
+%%
+%% <center><table border="1">
 %%  <tr>
 %%   <td>application</td>
 %%   <td>arity_qualifier</td>
@@ -476,12 +469,13 @@
 %%   <td>variable</td>
 %%   <td>warning_marker</td>
 %%  </tr>
-%% </table></center></p>
-%% <p>The user may (for special purposes) create additional nodes
-%% with other type tags, using the <code>tree/2</code> function.</p>
+%% </table></center>
+%%
+%% The user may (for special purposes) create additional nodes
+%% with other type tags, using the {@link tree/2} function.
 %%
-%% <p>Note: The primary constructor functions for a node type should
-%% always have the same name as the node type itself.</p>
+%% Note: The primary constructor functions for a node type should
+%% always have the same name as the node type itself.
 %%
 %% @see tree/2
 %% @see application/3
@@ -606,39 +600,38 @@ type(Node) ->
 
 
 %% =====================================================================
-%% @spec is_leaf(Node::syntaxTree()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is a leaf node,
-%% otherwise <code>false</code>. The currently recognised leaf node
+%% @doc Returns `true' if `Node' is a leaf node,
+%% otherwise `false'. The currently recognised leaf node
 %% types are:
-%% <p><center><table border="1">
+%%
+%% <center><table border="1">
 %%  <tr>
-%%   <td><code>atom</code></td>
-%%   <td><code>char</code></td>
-%%   <td><code>comment</code></td>
-%%   <td><code>eof_marker</code></td>
-%%   <td><code>error_marker</code></td>
+%%   <td>`atom'</td>
+%%   <td>`char'</td>
+%%   <td>`comment'</td>
+%%   <td>`eof_marker'</td>
+%%   <td>`error_marker'</td>
 %%  </tr><tr>
-%%   <td><code>float</code></td>
-%%   <td><code>integer</code></td>
-%%   <td><code>nil</code></td>
-%%   <td><code>operator</code></td>
-%%   <td><code>string</code></td>
+%%   <td>`float'</td>
+%%   <td>`integer'</td>
+%%   <td>`nil'</td>
+%%   <td>`operator'</td>
+%%   <td>`string'</td>
 %%  </tr><tr>
-%%   <td><code>text</code></td>
-%%   <td><code>underscore</code></td>
-%%   <td><code>variable</code></td>
-%%   <td><code>warning_marker</code></td>
+%%   <td>`text'</td>
+%%   <td>`underscore'</td>
+%%   <td>`variable'</td>
+%%   <td>`warning_marker'</td>
 %%  </tr>
-%% </table></center></p>
-%% <p>A node of type <code>tuple</code> is a leaf node if and only if
-%% its arity is zero.</p>
+%% </table></center>
 %%
-%% <p>Note: not all literals are leaf nodes, and vice versa. E.g.,
+%% A node of type `tuple' is a leaf node if and only if its arity is zero.
+%%
+%% Note: not all literals are leaf nodes, and vice versa. E.g.,
 %% tuples with nonzero arity and nonempty lists may be literals, but are
 %% not leaf nodes. Variables, on the other hand, are leaf nodes but not
-%% literals.</p>
-%% 
+%% literals.
+%%
 %% @see type/1
 %% @see is_literal/1
 
@@ -666,29 +659,29 @@ is_leaf(Node) ->
 
 
 %% =====================================================================
-%% @spec is_form(Node::syntaxTree()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is a syntax tree
+%% @doc Returns `true' if `Node' is a syntax tree
 %% representing a so-called "source code form", otherwise
-%% <code>false</code>. Forms are the Erlang source code units which,
+%% `false'. Forms are the Erlang source code units which,
 %% placed in sequence, constitute an Erlang program. Current form types
 %% are:
-%% <p><center><table border="1">
+%%
+%% <center><table border="1">
 %%  <tr>
-%%   <td><code>attribute</code></td>
-%%   <td><code>comment</code></td>
-%%   <td><code>error_marker</code></td>
-%%   <td><code>eof_marker</code></td>
-%%   <td><code>form_list</code></td>
+%%   <td>`attribute'</td>
+%%   <td>`comment'</td>
+%%   <td>`error_marker'</td>
+%%   <td>`eof_marker'</td>
+%%   <td>`form_list'</td>
 %%  </tr><tr>
-%%   <td><code>function</code></td>
-%%   <td><code>rule</code></td>
-%%   <td><code>warning_marker</code></td>
-%%   <td><code>text</code></td>
+%%   <td>`function'</td>
+%%   <td>`rule'</td>
+%%   <td>`warning_marker'</td>
+%%   <td>`text'</td>
 %%  </tr>
-%% </table></center></p>
+%% </table></center>
+%%
 %% @see type/1
-%% @see attribute/2 
+%% @see attribute/2
 %% @see comment/2
 %% @see eof_marker/0
 %% @see error_marker/1
@@ -715,10 +708,8 @@ is_form(Node) ->
 
 
 %% =====================================================================
-%% @spec get_pos(Node::syntaxTree()) -> term()
-%%
 %% @doc Returns the position information associated with
-%% <code>Node</code>. This is usually a nonnegative integer (indicating
+%% `Node'. This is usually a nonnegative integer (indicating
 %% the source code line number), but may be any term. By default, all
 %% new tree nodes have their associated position information set to the
 %% integer zero.
@@ -750,10 +741,7 @@ get_pos(Node) ->
 
 
 %% =====================================================================
-%% @spec set_pos(Node::syntaxTree(), Pos::term()) -> syntaxTree()
-%%
-%% @doc Sets the position information of <code>Node</code> to
-%% <code>Pos</code>.
+%% @doc Sets the position information of `Node' to `Pos'.
 %%
 %% @see get_pos/1
 %% @see copy_pos/2
@@ -774,14 +762,10 @@ set_pos(Node, Pos) ->
 
 
 %% =====================================================================
-%% @spec copy_pos(Source::syntaxTree(), Target::syntaxTree()) ->
-%%           syntaxTree()
-%%
-%% @doc Copies the position information from <code>Source</code> to
-%% <code>Target</code>.
+%% @doc Copies the position information from `Source' to `Target'.
 %%
-%% <p>This is equivalent to <code>set_pos(Target,
-%% get_pos(Source))</code>, but potentially more efficient.</p>
+%% This is equivalent to `set_pos(Target,
+%% get_pos(Source))', but potentially more efficient.
 %%
 %% @see get_pos/1
 %% @see set_pos/2
@@ -811,24 +795,20 @@ set_com(Node, Com) ->
 
 
 %% =====================================================================
-%% @spec get_precomments(syntaxTree()) -> [syntaxTree()]
-%%
 %% @doc Returns the associated pre-comments of a node. This is a
 %% possibly empty list of abstract comments, in top-down textual order.
 %% When the code is formatted, pre-comments are typically displayed
 %% directly above the node. For example:
-%% <pre>
-%%         % Pre-comment of function
-%%         foo(X) -> {bar, X}.</pre>
+%% ```% Pre-comment of function
+%%    foo(X) -> {bar, X}.'''
 %%
-%% <p>If possible, the comment should be moved before any preceding
+%% If possible, the comment should be moved before any preceding
 %% separator characters on the same line. E.g.:
-%% <pre>
-%%         foo([X | Xs]) ->
-%%             % Pre-comment of 'bar(X)' node
-%%             [bar(X) | foo(Xs)];
-%%         ...</pre>
-%% (where the comment is moved before the "<code>[</code>").</p>
+%% ```foo([X | Xs]) ->
+%%        % Pre-comment of 'bar(X)' node
+%%        [bar(X) | foo(Xs)];
+%%    ...'''
+%% (where the comment is moved before the "`['").
 %%
 %% @see comment/2
 %% @see set_precomments/2
@@ -846,11 +826,8 @@ get_precomments_1(#attr{com = #com{pre = Cs}}) -> Cs.
 
 
 %% =====================================================================
-%% @spec set_precomments(Node::syntaxTree(),
-%%                       Comments::[syntaxTree()]) -> syntaxTree()
-%%
-%% @doc Sets the pre-comments of <code>Node</code> to
-%% <code>Comments</code>. <code>Comments</code> should be a possibly
+%% @doc Sets the pre-comments of `Node' to
+%% `Comments'. `Comments' should be a possibly
 %% empty list of abstract comments, in top-down textual order.
 %%
 %% @see comment/2
@@ -880,15 +857,11 @@ set_precomments_1(#attr{com = Com} = Attr, Cs) ->
 
 
 %% =====================================================================
-%% @spec add_precomments(Comments::[syntaxTree()],
-%%                       Node::syntaxTree()) -> syntaxTree()
+%% @doc Appends `Comments' to the pre-comments of `Node'.
 %%
-%% @doc Appends <code>Comments</code> to the pre-comments of
-%% <code>Node</code>.
-%%
-%% <p>Note: This is equivalent to <code>set_precomments(Node,
-%% get_precomments(Node) ++ Comments)</code>, but potentially more
-%% efficient.</p>
+%% Note: This is equivalent to `set_precomments(Node,
+%% get_precomments(Node) ++ Comments)', but potentially more
+%% efficient.
 %%
 %% @see comment/2
 %% @see get_precomments/1
@@ -915,24 +888,20 @@ add_precomments_1(Cs, #attr{com = Com} = Attr) ->
 
 
 %% =====================================================================
-%% @spec get_postcomments(syntaxTree()) -> [syntaxTree()]
-%%
 %% @doc Returns the associated post-comments of a node. This is a
 %% possibly empty list of abstract comments, in top-down textual order.
 %% When the code is formatted, post-comments are typically displayed to
 %% the right of and/or below the node. For example:
-%% <pre>
-%%         {foo, X, Y}     % Post-comment of tuple</pre>
+%% ```{foo, X, Y}     % Post-comment of tuple'''
 %%
-%% <p>If possible, the comment should be moved past any following
+%% If possible, the comment should be moved past any following
 %% separator characters on the same line, rather than placing the
 %% separators on the following line. E.g.:
-%% <pre>
-%%         foo([X | Xs], Y) ->
-%%             foo(Xs, bar(X));     % Post-comment of 'bar(X)' node
-%%          ...</pre>
-%% (where the comment is moved past the rightmost "<code>)</code>" and
-%% the "<code>;</code>").</p>
+%% ```foo([X | Xs], Y) ->
+%%        foo(Xs, bar(X));     % Post-comment of 'bar(X)' node
+%%     ...'''
+%% (where the comment is moved past the rightmost "`)'" and
+%% the "`;'").
 %%
 %% @see comment/2
 %% @see set_postcomments/2
@@ -950,11 +919,8 @@ get_postcomments_1(#attr{com = #com{post = Cs}}) -> Cs.
 
 
 %% =====================================================================
-%% @spec set_postcomments(Node::syntaxTree(),
-%%                        Comments::[syntaxTree()]) -> syntaxTree()
-%%
-%% @doc Sets the post-comments of <code>Node</code> to
-%% <code>Comments</code>. <code>Comments</code> should be a possibly
+%% @doc Sets the post-comments of `Node' to
+%% `Comments'. `Comments' should be a possibly
 %% empty list of abstract comments, in top-down textual order
 %%
 %% @see comment/2
@@ -984,15 +950,11 @@ set_postcomments_1(#attr{com = Com} = Attr, Cs) ->
 
 
 %% =====================================================================
-%% @spec add_postcomments(Comments::[syntaxTree()],
-%%                        Node::syntaxTree()) -> syntaxTree()
-%%
-%% @doc Appends <code>Comments</code> to the post-comments of
-%% <code>Node</code>.
+%% @doc Appends `Comments' to the post-comments of `Node'.
 %%
-%% <p>Note: This is equivalent to <code>set_postcomments(Node,
-%% get_postcomments(Node) ++ Comments)</code>, but potentially more
-%% efficient.</p>
+%% Note: This is equivalent to `set_postcomments(Node,
+%% get_postcomments(Node) ++ Comments)', but potentially more
+%% efficient.
 %%
 %% @see comment/2
 %% @see get_postcomments/1
@@ -1019,14 +981,12 @@ add_postcomments_1(Cs, #attr{com = Com} = Attr) ->
 
 
 %% =====================================================================
-%% @spec has_comments(Node::syntaxTree()) -> boolean()
+%% @doc Yields `false' if the node has no associated
+%% comments, and `true' otherwise.
 %%
-%% @doc Yields <code>false</code> if the node has no associated
-%% comments, and <code>true</code> otherwise.
-%%
-%% <p>Note: This is equivalent to <code>(get_precomments(Node) == [])
-%% and (get_postcomments(Node) == [])</code>, but potentially more
-%% efficient.</p>
+%% Note: This is equivalent to `(get_precomments(Node) == [])
+%% and (get_postcomments(Node) == [])', but potentially more
+%% efficient.
 %%
 %% @see get_precomments/1
 %% @see get_postcomments/1
@@ -1050,13 +1010,11 @@ has_comments(_) -> false.
 
 
 %% =====================================================================
-%% @spec remove_comments(Node::syntaxTree()) -> syntaxTree()
-%%
-%% @doc Clears the associated comments of <code>Node</code>.
+%% @doc Clears the associated comments of `Node'.
 %%
-%% <p>Note: This is equivalent to
-%% <code>set_precomments(set_postcomments(Node, []), [])</code>, but
-%% potentially more efficient.</p>
+%% Note: This is equivalent to
+%% `set_precomments(set_postcomments(Node, []), [])', but
+%% potentially more efficient.
 %%
 %% @see set_precomments/2
 %% @see set_postcomments/2
@@ -1075,16 +1033,12 @@ remove_comments(Node) ->
 
 
 %% =====================================================================
-%% @spec copy_comments(Source::syntaxTree(), Target::syntaxTree()) ->
-%%           syntaxTree()
-%%
-%% @doc Copies the pre- and postcomments from <code>Source</code> to
-%% <code>Target</code>.
+%% @doc Copies the pre- and postcomments from `Source' to `Target'.
 %%
-%% <p>Note: This is equivalent to
-%% <code>set_postcomments(set_precomments(Target,
-%% get_precomments(Source)), get_postcomments(Source))</code>, but
-%% potentially more efficient.</p>
+%% Note: This is equivalent to
+%% `set_postcomments(set_precomments(Target,
+%% get_precomments(Source)), get_postcomments(Source))', but
+%% potentially more efficient.
 %%
 %% @see comment/2
 %% @see get_precomments/1
@@ -1099,16 +1053,13 @@ copy_comments(Source, Target) ->
 
 
 %% =====================================================================
-%% @spec join_comments(Source::syntaxTree(), Target::syntaxTree()) ->
-%%           syntaxTree()
+%% @doc Appends the comments of `Source' to the current
+%% comments of `Target'.
 %%
-%% @doc Appends the comments of <code>Source</code> to the current
-%% comments of <code>Target</code>.
-%%
-%% <p>Note: This is equivalent to
-%% <code>add_postcomments(get_postcomments(Source),
-%% add_precomments(get_precomments(Source), Target))</code>, but
-%% potentially more efficient.</p>
+%% Note: This is equivalent to
+%% `add_postcomments(get_postcomments(Source),
+%% add_precomments(get_precomments(Source), Target))', but
+%% potentially more efficient.
 %%
 %% @see comment/2
 %% @see get_precomments/1
@@ -1125,8 +1076,6 @@ join_comments(Source, Target) ->
 
 
 %% =====================================================================
-%% @spec get_ann(syntaxTree()) -> [term()]
-%%
 %% @doc Returns the list of user annotations associated with a syntax
 %% tree node. For a newly created node, this is the empty list. The
 %% annotations may be any terms.
@@ -1142,11 +1091,7 @@ get_ann(_) -> [].
 
 
 %% =====================================================================
-%% @spec set_ann(Node::syntaxTree(), Annotations::[term()]) ->
-%%           syntaxTree()
-%%
-%% @doc Sets the list of user annotations of <code>Node</code> to
-%% <code>Annotations</code>.
+%% @doc Sets the list of user annotations of `Node' to `Annotations'.
 %%
 %% @see get_ann/1
 %% @see add_ann/2
@@ -1168,13 +1113,11 @@ set_ann(Node, As) ->
 
 
 %% =====================================================================
-%% @spec add_ann(Annotation::term(), Node::syntaxTree()) -> syntaxTree()
-%%
-%% @doc Appends the term <code>Annotation</code> to the list of user
-%% annotations of <code>Node</code>.
+%% @doc Appends the term `Annotation' to the list of user
+%% annotations of `Node'.
 %%
-%% <p>Note: this is equivalent to <code>set_ann(Node, [Annotation |
-%% get_ann(Node)])</code>, but potentially more efficient.</p>
+%% Note: this is equivalent to `set_ann(Node, [Annotation |
+%% get_ann(Node)])', but potentially more efficient.
 %%
 %% @see get_ann/1
 %% @see set_ann/2
@@ -1195,14 +1138,10 @@ add_ann(A, Node) ->
 
 
 %% =====================================================================
-%% @spec copy_ann(Source::syntaxTree(), Target::syntaxTree()) ->
-%%           syntaxTree()
+%% @doc Copies the list of user annotations from `Source' to `Target'.
 %%
-%% @doc Copies the list of user annotations from <code>Source</code> to
-%% <code>Target</code>.
-%%
-%% <p>Note: this is equivalent to <code>set_ann(Target,
-%% get_ann(Source))</code>, but potentially more efficient.</p>
+%% Note: this is equivalent to `set_ann(Target,
+%% get_ann(Source))', but potentially more efficient.
 %%
 %% @see get_ann/1
 %% @see set_ann/2
@@ -1214,23 +1153,20 @@ copy_ann(Source, Target) ->
 
 
 %% =====================================================================
-%% @spec get_attrs(syntaxTree()) -> syntaxTreeAttributes()
-%%
 %% @doc Returns a representation of the attributes associated with a
 %% syntax tree node. The attributes are all the extra information that
 %% can be attached to a node. Currently, this includes position
 %% information, source code comments, and user annotations. The result
 %% of this function cannot be inspected directly; only attached to
-%% another node (cf. <code>set_attrs/2</code>).
+%% another node (see {@link set_attrs/2}).
 %%
-%% <p>For accessing individual attributes, see <code>get_pos/1</code>,
-%% <code>get_ann/1</code>, <code>get_precomments/1</code> and
-%% <code>get_postcomments/1</code>.</p>
+%% For accessing individual attributes, see {@link get_pos/1},
+%% {@link get_ann/1}, {@link get_precomments/1} and
+%% {@link get_postcomments/1}.
 %%
 %% @type syntaxTreeAttributes(). This is an abstract representation of
-%% syntax tree node attributes; see the function <a
-%% href="#get_attrs-1"><code>get_attrs/1</code></a>.
-%% 
+%% syntax tree node attributes; see the function {@link get_attrs/1}.
+%%
 %% @see set_attrs/2
 %% @see get_pos/1
 %% @see get_ann/1
@@ -1247,11 +1183,7 @@ get_attrs(Node) -> #attr{pos = get_pos(Node),
 
 
 %% =====================================================================
-%% @spec set_attrs(Node::syntaxTree(),
-%%                 Attributes::syntaxTreeAttributes()) -> syntaxTree()
-%%
-%% @doc Sets the attributes of <code>Node</code> to
-%% <code>Attributes</code>.
+%% @doc Sets the attributes of `Node' to `Attributes'.
 %%
 %% @see get_attrs/1
 %% @see copy_attrs/2
@@ -1270,14 +1202,10 @@ set_attrs(Node, Attr) ->
 
 
 %% =====================================================================
-%% @spec copy_attrs(Source::syntaxTree(), Target::syntaxTree()) ->
-%%           syntaxTree()
+%% @doc Copies the attributes from `Source' to `Target'.
 %%
-%% @doc Copies the attributes from <code>Source</code> to
-%% <code>Target</code>.
-%%
-%% <p>Note: this is equivalent to <code>set_attrs(Target,
-%% get_attrs(Source))</code>, but potentially more efficient.</p>
+%% Note: this is equivalent to `set_attrs(Target,
+%% get_attrs(Source))', but potentially more efficient.
 %%
 %% @see get_attrs/1
 %% @see set_attrs/2
@@ -1289,7 +1217,6 @@ copy_attrs(S, T) ->
 
 
 %% =====================================================================
-%% @spec comment(Strings) -> syntaxTree()
 %% @equiv comment(none, Strings)
 
 -spec comment([string()]) -> syntaxTree().
@@ -1299,22 +1226,19 @@ comment(Strings) ->
 
 
 %% =====================================================================
-%% @spec comment(Padding, Strings::[string()]) -> syntaxTree()
-%%	    Padding = none | integer()
-%%
 %% @doc Creates an abstract comment with the given padding and text. If
-%% <code>Strings</code> is a (possibly empty) list
+%% `Strings' is a (possibly empty) list
 %% <code>["<em>Txt1</em>", ..., "<em>TxtN</em>"]</code>, the result
 %% represents the source code text
 %% <pre>
-%%     %<em>Txt1</em>
-%%     ...
-%%     %<em>TxtN</em></pre>
-%% <code>Padding</code> states the number of empty character positions
+%%    %<em>Txt1</em>
+%%    ...
+%%    %<em>TxtN</em></pre>
+%% `Padding' states the number of empty character positions
 %% to the left of the comment separating it horizontally from
-%% source code on the same line (if any). If <code>Padding</code> is
-%% <code>none</code>, a default positive number is used. If
-%% <code>Padding</code> is an integer less than 1, there should be no
+%% source code on the same line (if any). If `Padding' is
+%% `none', a default positive number is used. If
+%% `Padding' is an integer less than 1, there should be no
 %% separating space. Comments are in themselves regarded as source
 %% program forms.
 %%
@@ -1338,8 +1262,6 @@ comment(Pad, Strings) ->
 
 
 %% =====================================================================
-%% @spec comment_text(syntaxTree()) -> [string()]
-%%
 %% @doc Returns the lines of text of the abstract comment.
 %%
 %% @see comment/2
@@ -1351,11 +1273,8 @@ comment_text(Node) ->
 
 
 %% =====================================================================
-%% @spec comment_padding(syntaxTree()) -> none | integer()
-%%
 %% @doc Returns the amount of padding before the comment, or
-%% <code>none</code>. The latter means that a default padding may be
-%% used.
+%% `none'. The latter means that a default padding may be used.
 %%
 %% @see comment/2
 
@@ -1366,23 +1285,21 @@ comment_padding(Node) ->
 
 
 %% =====================================================================
-%% @spec form_list(Forms::[syntaxTree()]) -> syntaxTree()
-%%
 %% @doc Creates an abstract sequence of "source code forms". If
-%% <code>Forms</code> is <code>[F1, ..., Fn]</code>, where each
-%% <code>Fi</code> is a form (cf. <code>is_form/1</code>, the result
+%% `Forms' is `[F1, ..., Fn]', where each
+%% `Fi' is a form (see {@link is_form/1}, the result
 %% represents
 %% <pre>
-%%     <em>F1</em>
-%%     ...
-%%     <em>Fn</em></pre>
-%% where the <code>Fi</code> are separated by one or more line breaks. A
-%% node of type <code>form_list</code> is itself regarded as a source
-%% code form; cf. <code>flatten_form_list/1</code>.
-%%
-%% <p>Note: this is simply a way of grouping source code forms as a
+%%    <em>F1</em>
+%%    ...
+%%    <em>Fn</em></pre>
+%% where the `Fi' are separated by one or more line breaks. A
+%% node of type `form_list' is itself regarded as a source
+%% code form; see {@link flatten_form_list/1}.
+%%
+%% Note: this is simply a way of grouping source code forms as a
 %% single syntax tree, usually in order to form an Erlang module
-%% definition.</p>
+%% definition.
 %%
 %% @see form_list_elements/1
 %% @see is_form/1
@@ -1401,9 +1318,7 @@ form_list(Forms) ->
 
 
 %% =====================================================================
-%% @spec form_list_elements(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of subnodes of a <code>form_list</code> node.
+%% @doc Returns the list of subnodes of a `form_list' node.
 %%
 %% @see form_list/1
 
@@ -1414,10 +1329,8 @@ form_list_elements(Node) ->
 
 
 %% =====================================================================
-%% @spec flatten_form_list(Node::syntaxTree()) -> syntaxTree()
-%%
-%% @doc Flattens sublists of a <code>form_list</code> node. Returns
-%% <code>Node</code> with all subtrees of type <code>form_list</code>
+%% @doc Flattens sublists of a `form_list' node. Returns
+%% `Node' with all subtrees of type `form_list'
 %% recursively expanded, yielding a single "flat" abstract form
 %% sequence.
 %%
@@ -1443,10 +1356,8 @@ flatten_form_list_1([], As) ->
 
 
 %% =====================================================================
-%% @spec text(String::string()) -> syntaxTree()
-%%
 %% @doc Creates an abstract piece of source code text. The result
-%% represents exactly the sequence of characters in <code>String</code>.
+%% represents exactly the sequence of characters in `String'.
 %% This is useful in cases when one wants full control of the resulting
 %% output, e.g., for the appearance of floating-point numbers or macro
 %% definitions.
@@ -1463,10 +1374,7 @@ text(String) ->
 
 
 %% =====================================================================
-%% @spec text_string(syntaxTree()) -> string()
-%%
-%% @doc Returns the character sequence represented by a
-%% <code>text</code> node.
+%% @doc Returns the character sequence represented by a `text' node.
 %%
 %% @see text/1
 
@@ -1477,18 +1385,15 @@ text_string(Node) ->
 
 
 %% =====================================================================
-%% @spec variable(Name) -> syntaxTree()
-%%	    Name = atom() | string()
-%%
 %% @doc Creates an abstract variable with the given name.
-%% <code>Name</code> may be any atom or string that represents a
+%% `Name' may be any atom or string that represents a
 %% lexically valid variable name, but <em>not</em> a single underscore
-%% character; cf. <code>underscore/0</code>.
+%% character; see {@link underscore/0}.
 %%
-%% <p>Note: no checking is done whether the character sequence
+%% Note: no checking is done whether the character sequence
 %% represents a proper variable name, i.e., whether or not its first
 %% character is an uppercase Erlang character, or whether it does not
-%% contain control characters, whitespace, etc.</p>
+%% contain control characters, whitespace, etc.
 %%
 %% @see variable_name/1
 %% @see variable_literal/1
@@ -1517,9 +1422,7 @@ revert_variable(Node) ->
 
 
 %% =====================================================================
-%% @spec variable_name(syntaxTree()) -> atom()
-%%
-%% @doc Returns the name of a <code>variable</code> node as an atom.
+%% @doc Returns the name of a `variable' node as an atom.
 %%
 %% @see variable/1
 
@@ -1535,9 +1438,7 @@ variable_name(Node) ->
 
 
 %% =====================================================================
-%% @spec variable_literal(syntaxTree()) -> string()
-%%
-%% @doc Returns the name of a <code>variable</code> node as a string.
+%% @doc Returns the name of a `variable' node as a string.
 %%
 %% @see variable/1
 
@@ -1553,9 +1454,7 @@ variable_literal(Node) ->
 
 
 %% =====================================================================
-%% @spec underscore() -> syntaxTree()
-%%
-%% @doc Creates an abstract universal pattern ("<code>_</code>"). The
+%% @doc Creates an abstract universal pattern ("`_'"). The
 %% lexical representation is a single underscore character. Note that
 %% this is <em>not</em> a variable, lexically speaking.
 %%
@@ -1579,10 +1478,8 @@ revert_underscore(Node) ->
 
 
 %% =====================================================================
-%% @spec integer(Value::integer()) -> syntaxTree()
-%%
 %% @doc Creates an abstract integer literal. The lexical representation
-%% is the canonical decimal numeral of <code>Value</code>.
+%% is the canonical decimal numeral of `Value'.
 %%
 %% @see integer_value/1
 %% @see integer_literal/1
@@ -1608,11 +1505,8 @@ revert_integer(Node) ->
 
 
 %% =====================================================================
-%% @spec is_integer(Node::syntaxTree(), Value::integer()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> has type
-%% <code>integer</code> and represents <code>Value</code>, otherwise
-%% <code>false</code>.
+%% @doc Returns `true' if `Node' has type
+%% `integer' and represents `Value', otherwise `false'.
 %%
 %% @see integer/1
 
@@ -1630,9 +1524,7 @@ is_integer(Node, Value) ->
 
 
 %% =====================================================================
-%% @spec integer_value(syntaxTree()) -> integer()
-%%
-%% @doc Returns the value represented by an <code>integer</code> node.
+%% @doc Returns the value represented by an `integer' node.
 %%
 %% @see integer/1
 
@@ -1648,10 +1540,7 @@ integer_value(Node) ->
 
 
 %% =====================================================================
-%% @spec integer_literal(syntaxTree()) -> string()
-%%
-%% @doc Returns the numeral string represented by an
-%% <code>integer</code> node.
+%% @doc Returns the numeral string represented by an `integer' node.
 %%
 %% @see integer/1
 
@@ -1662,11 +1551,8 @@ integer_literal(Node) ->
 
 
 %% =====================================================================
-%% @spec float(Value::float()) -> syntaxTree()
-%%
 %% @doc Creates an abstract floating-point literal. The lexical
-%% representation is the decimal floating-point numeral of
-%% <code>Value</code>.
+%% representation is the decimal floating-point numeral of `Value'.
 %%
 %% @see float_value/1
 %% @see float_literal/1
@@ -1701,9 +1587,7 @@ revert_float(Node) ->
 
 
 %% =====================================================================
-%% @spec float_value(syntaxTree()) -> float()
-%%
-%% @doc Returns the value represented by a <code>float</code> node. Note
+%% @doc Returns the value represented by a `float' node. Note
 %% that floating-point values should usually not be compared for
 %% equality.
 %%
@@ -1721,10 +1605,7 @@ float_value(Node) ->
 
 
 %% =====================================================================
-%% @spec float_literal(syntaxTree()) -> string()
-%%
-%% @doc Returns the numeral string represented by a <code>float</code>
-%% node.
+%% @doc Returns the numeral string represented by a `float' node.
 %%
 %% @see float/1
 
@@ -1735,17 +1616,15 @@ float_literal(Node) ->
 
 
 %% =====================================================================
-%% @spec char(Value::char()) -> syntaxTree()
-%%
 %% @doc Creates an abstract character literal. The result represents
-%% "<code>$<em>Name</em></code>", where <code>Name</code> corresponds to
-%% <code>Value</code>.
+%% "<code>$<em>Name</em></code>", where `Name' corresponds to
+%% `Value'.
 %%
-%% <p>Note: the literal corresponding to a particular character value is
-%% not uniquely defined. E.g., the character "<code>a</code>" can be
-%% written both as "<code>$a</code>" and "<code>$\141</code>", and a Tab
-%% character can be written as "<code>$\11</code>", "<code>$\011</code>"
-%% or "<code>$\t</code>".</p>
+%% Note: the literal corresponding to a particular character value is
+%% not uniquely defined. E.g., the character "`a'" can be
+%% written both as "`$a'" and "`$\141'", and a Tab
+%% character can be written as "`$\11'", "`$\011'"
+%% or "`$\t'".
 %%
 %% @see char_value/1
 %% @see char_literal/1
@@ -1771,11 +1650,8 @@ revert_char(Node) ->
 
 
 %% =====================================================================
-%% @spec is_char(Node::syntaxTree(), Value::char()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> has type
-%% <code>char</code> and represents <code>Value</code>, otherwise
-%% <code>false</code>.
+%% @doc Returns `true' if `Node' has type
+%% `char' and represents `Value', otherwise `false'.
 %%
 %% @see char/1
 
@@ -1793,9 +1669,7 @@ is_char(Node, Value) ->
 
 
 %% =====================================================================
-%% @spec char_value(syntaxTree()) -> char()
-%%
-%% @doc Returns the value represented by a <code>char</code> node.
+%% @doc Returns the value represented by a `char' node.
 %%
 %% @see char/1
 
@@ -1811,10 +1685,8 @@ char_value(Node) ->
 
 
 %% =====================================================================
-%% @spec char_literal(syntaxTree()) -> string()
-%%
-%% @doc Returns the literal string represented by a <code>char</code>
-%% node. This includes the leading "<code>$</code>" character.
+%% @doc Returns the literal string represented by a `char'
+%% node. This includes the leading "`$'" character.
 %%
 %% @see char/1
 
@@ -1825,16 +1697,14 @@ char_literal(Node) ->
 
 
 %% =====================================================================
-%% @spec string(Value::string()) -> syntaxTree()
-%%
 %% @doc Creates an abstract string literal. The result represents
 %% <code>"<em>Text</em>"</code> (including the surrounding
-%% double-quotes), where <code>Text</code> corresponds to the sequence
-%% of characters in <code>Value</code>, but not representing a
-%% <em>specific</em> string literal. E.g., the result of
-%% <code>string("x\ny")</code> represents any and all of
-%% <code>"x\ny"</code>, <code>"x\12y"</code>, <code>"x\012y"</code> and
-%% <code>"x\^Jy"</code>; cf. <code>char/1</code>.
+%% double-quotes), where `Text' corresponds to the sequence
+%% of characters in `Value', but not representing a
+%% <em>specific</em> string literal.
+%%
+%% For example, the result of `string("x\ny")' represents any and all of
+%% `"x\ny"', `"x\12y"', `"x\012y"' and `"x\^Jy"'; see {@link char/1}.
 %%
 %% @see string_value/1
 %% @see string_literal/1
@@ -1861,11 +1731,8 @@ revert_string(Node) ->
 
 
 %% =====================================================================
-%% @spec is_string(Node::syntaxTree(), Value::string()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> has type
-%% <code>string</code> and represents <code>Value</code>, otherwise
-%% <code>false</code>.
+%% @doc Returns `true' if `Node' has type
+%% `string' and represents `Value', otherwise `false'.
 %%
 %% @see string/1
 
@@ -1883,9 +1750,7 @@ is_string(Node, Value) ->
 
 
 %% =====================================================================
-%% @spec string_value(syntaxTree()) -> string()
-%%
-%% @doc Returns the value represented by a <code>string</code> node.
+%% @doc Returns the value represented by a `string' node.
 %%
 %% @see string/1
 
@@ -1901,9 +1766,7 @@ string_value(Node) ->
 
 
 %% =====================================================================
-%% @spec string_literal(syntaxTree()) -> string()
-%%
-%% @doc Returns the literal string represented by a <code>string</code>
+%% @doc Returns the literal string represented by a `string'
 %% node. This includes surrounding double-quote characters.
 %%
 %% @see string/1
@@ -1915,11 +1778,8 @@ string_literal(Node) ->
 
 
 %% =====================================================================
-%% @spec atom(Name) -> syntaxTree()
-%%	    Name = atom() | string()
-%%
 %% @doc Creates an abstract atom literal. The print name of the atom is
-%% the character sequence represented by <code>Name</code>.
+%% the character sequence represented by `Name'.
 %%
 %% @see atom_value/1
 %% @see atom_name/1
@@ -1948,11 +1808,8 @@ revert_atom(Node) ->
 
 
 %% =====================================================================
-%% @spec is_atom(Node::syntaxTree(), Value::atom()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> has type
-%% <code>atom</code> and represents <code>Value</code>, otherwise
-%% <code>false</code>.
+%% @doc Returns `true' if `Node' has type
+%% `atom' and represents `Value', otherwise `false'.
 %%
 %% @see atom/1
 
@@ -1970,9 +1827,7 @@ is_atom(Node, Value) ->
 
 
 %% =====================================================================
-%% @spec atom_value(syntaxTree()) -> atom()
-%%
-%% @doc Returns the value represented by an <code>atom</code> node.
+%% @doc Returns the value represented by an `atom' node.
 %%
 %% @see atom/1
 
@@ -1988,9 +1843,7 @@ atom_value(Node) ->
 
 
 %% =====================================================================
-%% @spec atom_name(syntaxTree()) -> string()
-%%
-%% @doc Returns the printname of an <code>atom</code> node.
+%% @doc Returns the printname of an `atom' node.
 %%
 %% @see atom/1
 
@@ -2001,15 +1854,12 @@ atom_name(Node) ->
 
 
 %% =====================================================================
-%% @spec atom_literal(syntaxTree()) -> string()
-%%
-%% @doc Returns the literal string represented by an <code>atom</code>
+%% @doc Returns the literal string represented by an `atom'
 %% node. This includes surrounding single-quote characters if necessary.
 %%
-%% <p>Note that e.g. the result of <code>atom("x\ny")</code> represents
-%% any and all of <code>'x\ny'</code>, <code>'x\12y'</code>,
-%% <code>'x\012y'</code> and <code>'x\^Jy\'</code>; cf.
-%% <code>string/1</code>.</p>
+%% Note that e.g. the result of `atom("x\ny")' represents
+%% any and all of `'x\ny'', `'x\12y'',
+%% `'x\012y'' and `'x\^Jy\''; see {@link string/1}.
 %%
 %% @see atom/1
 %% @see string/1
@@ -2021,14 +1871,12 @@ atom_literal(Node) ->
 
 
 %% =====================================================================
-%% @spec tuple(Elements::[syntaxTree()]) -> syntaxTree()
-%%
-%% @doc Creates an abstract tuple. If <code>Elements</code> is
-%% <code>[X1, ..., Xn]</code>, the result represents
+%% @doc Creates an abstract tuple. If `Elements' is
+%% `[X1, ..., Xn]', the result represents
 %% "<code>{<em>X1</em>, ..., <em>Xn</em>}</code>".
 %%
-%% <p>Note: The Erlang language has distinct 1-tuples, i.e.,
-%% <code>{X}</code> is always distinct from <code>X</code> itself.</p>
+%% Note: The Erlang language has distinct 1-tuples, i.e.,
+%% `{X}' is always distinct from `X' itself.
 %%
 %% @see tuple_elements/1
 %% @see tuple_size/1
@@ -2055,10 +1903,7 @@ revert_tuple(Node) ->
 
 
 %% =====================================================================
-%% @spec tuple_elements(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of element subtrees of a <code>tuple</code>
-%% node.
+%% @doc Returns the list of element subtrees of a `tuple' node.
 %%
 %% @see tuple/1
 
@@ -2074,13 +1919,11 @@ tuple_elements(Node) ->
 
 
 %% =====================================================================
-%% @spec tuple_size(syntaxTree()) -> integer()
-%%
-%% @doc Returns the number of elements of a <code>tuple</code> node.
+%% @doc Returns the number of elements of a `tuple' node.
 %%
-%% <p>Note: this is equivalent to
-%% <code>length(tuple_elements(Node))</code>, but potentially more
-%% efficient.</p>
+%% Note: this is equivalent to
+%% `length(tuple_elements(Node))', but potentially more
+%% efficient.
 %%
 %% @see tuple/1
 %% @see tuple_elements/1
@@ -2092,7 +1935,6 @@ tuple_size(Node) ->
 
 
 %% =====================================================================
-%% @spec list(List) -> syntaxTree()
 %% @equiv list(List, none)
 
 -spec list([syntaxTree()]) -> syntaxTree().
@@ -2102,35 +1944,31 @@ list(List) ->
 
 
 %% =====================================================================
-%% @spec list(List, Tail) -> syntaxTree()
-%%	    List = [syntaxTree()]
-%%	    Tail = none | syntaxTree()
-%%
 %% @doc Constructs an abstract list skeleton. The result has type
-%% <code>list</code> or <code>nil</code>. If <code>List</code> is a
-%% nonempty list <code>[E1, ..., En]</code>, the result has type
-%% <code>list</code> and represents either "<code>[<em>E1</em>, ...,
-%% <em>En</em>]</code>", if <code>Tail</code> is <code>none</code>, or
+%% `list' or `nil'. If `List' is a
+%% nonempty list `[E1, ..., En]', the result has type
+%% `list' and represents either "<code>[<em>E1</em>, ...,
+%% <em>En</em>]</code>", if `Tail' is `none', or
 %% otherwise "<code>[<em>E1</em>, ..., <em>En</em> |
-%% <em>Tail</em>]</code>". If <code>List</code> is the empty list,
-%% <code>Tail</code> <em>must</em> be <code>none</code>, and in that
-%% case the result has type <code>nil</code> and represents
-%% "<code>[]</code>" (cf. <code>nil/0</code>).
+%% <em>Tail</em>]</code>". If `List' is the empty list,
+%% `Tail' <em>must</em> be `none', and in that
+%% case the result has type `nil' and represents
+%% "`[]'" (see {@link nil/0}).
 %%
-%% <p>The difference between lists as semantic objects (built up of
+%% The difference between lists as semantic objects (built up of
 %% individual "cons" and "nil" terms) and the various syntactic forms
 %% for denoting lists may be bewildering at first. This module provides
 %% functions both for exact control of the syntactic representation as
 %% well as for the simple composition and deconstruction in terms of
-%% cons and head/tail operations.</p>
+%% cons and head/tail operations.
 %%
-%% <p>Note: in <code>list(Elements, none)</code>, the "nil" list
-%% terminator is implicit and has no associated information (cf.
-%% <code>get_attrs/1</code>), while in the seemingly equivalent
-%% <code>list(Elements, Tail)</code> when <code>Tail</code> has type
-%% <code>nil</code>, the list terminator subtree <code>Tail</code> may
+%% Note: in `list(Elements, none)', the "nil" list
+%% terminator is implicit and has no associated information (see
+%% {@link get_attrs/1}), while in the seemingly equivalent
+%% `list(Elements, Tail)' when `Tail' has type
+%% `nil', the list terminator subtree `Tail' may
 %% have attached attributes such as position, comments, and annotations,
-%% which will be preserved in the result.</p>
+%% which will be preserved in the result.
 %%
 %% @see nil/0
 %% @see list/1
@@ -2187,10 +2025,8 @@ revert_list(Node) ->
 		S, P).
 
 %% =====================================================================
-%% @spec nil() -> syntaxTree()
-%%
 %% @doc Creates an abstract empty list. The result represents
-%% "<code>[]</code>". The empty list is traditionally called "nil".
+%% "`[]'". The empty list is traditionally called "nil".
 %%
 %% @see list/2
 %% @see is_list_skeleton/1
@@ -2213,13 +2049,11 @@ revert_nil(Node) ->
 
 
 %% =====================================================================
-%% @spec list_prefix(Node::syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the prefix element subtrees of a <code>list</code> node.
-%% If <code>Node</code> represents "<code>[<em>E1</em>, ...,
+%% @doc Returns the prefix element subtrees of a `list' node.
+%% If `Node' represents "<code>[<em>E1</em>, ...,
 %% <em>En</em>]</code>" or "<code>[<em>E1</em>, ..., <em>En</em> |
-%% <em>Tail</em>]</code>", the returned value is <code>[E1, ...,
-%% En]</code>.
+%% <em>Tail</em>]</code>", the returned value is `[E1, ...,
+%% En]'.
 %%
 %% @see list/2
 
@@ -2227,28 +2061,31 @@ revert_nil(Node) ->
 
 list_prefix(Node) ->
     case unwrap(Node) of
-	{cons, _, Head, _} ->
-	    [Head];
+	{cons, _, Head, Tail} ->
+	    [Head | cons_prefix(Tail)];
 	Node1 ->
 	    (data(Node1))#list.prefix
     end.
 
+%% collects sequences of conses; cf. cons_suffix/1 below
+cons_prefix({cons, _, Head, Tail}) ->
+    [Head | cons_prefix(Tail)];
+cons_prefix(_) ->
+    [].
+
 
 %% =====================================================================
-%% @spec list_suffix(Node::syntaxTree()) -> none | syntaxTree()
-%%
-%% @doc Returns the suffix subtree of a <code>list</code> node, if one
-%% exists. If <code>Node</code> represents "<code>[<em>E1</em>, ...,
+%% @doc Returns the suffix subtree of a `list' node, if one
+%% exists. If `Node' represents "<code>[<em>E1</em>, ...,
 %% <em>En</em> | <em>Tail</em>]</code>", the returned value is
-%% <code>Tail</code>, otherwise, i.e., if <code>Node</code> represents
-%% "<code>[<em>E1</em>, ..., <em>En</em>]</code>", <code>none</code> is
+%% `Tail', otherwise, i.e., if `Node' represents
+%% "<code>[<em>E1</em>, ..., <em>En</em>]</code>", `none' is
 %% returned.
 %%
-%% <p>Note that even if this function returns some <code>Tail</code>
-%% that is not <code>none</code>, the type of <code>Tail</code> can be
-%% <code>nil</code>, if the tail has been given explicitly, and the list
-%% skeleton has not been compacted (cf.
-%% <code>compact_list/1</code>).</p>
+%% Note that even if this function returns some `Tail'
+%% that is not `none', the type of `Tail' can be
+%% `nil', if the tail has been given explicitly, and the list
+%% skeleton has not been compacted (see {@link compact_list/1}).
 %%
 %% @see list/2
 %% @see nil/0
@@ -2259,34 +2096,36 @@ list_prefix(Node) ->
 list_suffix(Node) ->
     case unwrap(Node) of
 	{cons, _, _, Tail} ->
-	    %% If there could be comments/annotations on the tail node,
-	    %% we should not return `none' even if it has type `nil'.
-	    case Tail of
+	    case cons_suffix(Tail) of
 		{nil, _} ->
-		    none;    % no interesting information is lost
-		_ ->
-		    Tail
+		    none;
+		Tail1 ->
+		    Tail1
 	    end;
 	Node1 ->
 	    (data(Node1))#list.suffix
     end.
 
+%% skips sequences of conses; cf. cons_prefix/1 above
+cons_suffix({cons, _, _, Tail}) ->
+    cons_suffix(Tail);
+cons_suffix(Tail) ->
+    Tail.
+
 
 %% =====================================================================
-%% @spec cons(Head::syntaxTree(), Tail::syntaxTree()) -> syntaxTree()
-%%
 %% @doc "Optimising" list skeleton cons operation. Creates an abstract
-%% list skeleton whose first element is <code>Head</code> and whose tail
-%% corresponds to <code>Tail</code>. This is similar to
-%% <code>list([Head], Tail)</code>, except that <code>Tail</code> may
-%% not be <code>none</code>, and that the result does not necessarily
+%% list skeleton whose first element is `Head' and whose tail
+%% corresponds to `Tail'. This is similar to
+%% `list([Head], Tail)', except that `Tail' may
+%% not be `none', and that the result does not necessarily
 %% represent exactly "<code>[<em>Head</em> | <em>Tail</em>]</code>", but
-%% may depend on the <code>Tail</code> subtree. E.g., if
-%% <code>Tail</code> represents <code>[X, Y]</code>, the result may
+%% may depend on the `Tail' subtree. E.g., if
+%% `Tail' represents `[X, Y]', the result may
 %% represent "<code>[<em>Head</em>, X, Y]</code>", rather than
 %% "<code>[<em>Head</em> | [X, Y]]</code>". Annotations on
-%% <code>Tail</code> itself may be lost if <code>Tail</code> represents
-%% a list skeleton, but comments on <code>Tail</code> are propagated to
+%% `Tail' itself may be lost if `Tail' represents
+%% a list skeleton, but comments on `Tail' are propagated to
 %% the result.
 %%
 %% @see list/2
@@ -2308,10 +2147,8 @@ cons(Head, Tail) ->
 
 
 %% =====================================================================
-%% @spec list_head(Node::syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the head element subtree of a <code>list</code> node. If
-%% <code>Node</code> represents "<code>[<em>Head</em> ...]</code>", the
+%% @doc Returns the head element subtree of a `list' node. If
+%% `Node' represents "<code>[<em>Head</em> ...]</code>", the
 %% result will represent "<code><em>Head</em></code>".
 %%
 %% @see list/2
@@ -2325,15 +2162,13 @@ list_head(Node) ->
 
 
 %% =====================================================================
-%% @spec list_tail(Node::syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the tail of a <code>list</code> node. If
-%% <code>Node</code> represents a single-element list
+%% @doc Returns the tail of a `list' node. If
+%% `Node' represents a single-element list
 %% "<code>[<em>E</em>]</code>", then the result has type
-%% <code>nil</code>, representing "<code>[]</code>". If
-%% <code>Node</code> represents "<code>[<em>E1</em>, <em>E2</em>
+%% `nil', representing "`[]'". If
+%% `Node' represents "<code>[<em>E1</em>, <em>E2</em>
 %% ...]</code>", the result will represent "<code>[<em>E2</em>
-%% ...]</code>", and if <code>Node</code> represents
+%% ...]</code>", and if `Node' represents
 %% "<code>[<em>Head</em> | <em>Tail</em>]</code>", the result will
 %% represent "<code><em>Tail</em></code>".
 %%
@@ -2358,10 +2193,8 @@ list_tail(Node) ->
 
 
 %% =====================================================================
-%% @spec is_list_skeleton(syntaxTree()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> has type
-%% <code>list</code> or <code>nil</code>, otherwise <code>false</code>.
+%% @doc Returns `true' if `Node' has type
+%% `list' or `nil', otherwise `false'.
 %%
 %% @see list/2
 %% @see nil/0
@@ -2377,24 +2210,22 @@ is_list_skeleton(Node) ->
 
 
 %% =====================================================================
-%% @spec is_proper_list(Node::syntaxTree()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> represents a
-%% proper list, and <code>false</code> otherwise. A proper list is a
-%% list skeleton either on the form "<code>[]</code>" or
+%% @doc Returns `true' if `Node' represents a
+%% proper list, and `false' otherwise. A proper list is a
+%% list skeleton either on the form "`[]'" or
 %% "<code>[<em>E1</em>, ..., <em>En</em>]</code>", or "<code>[... |
-%% <em>Tail</em>]</code>" where recursively <code>Tail</code> also
+%% <em>Tail</em>]</code>" where recursively `Tail' also
 %% represents a proper list.
 %%
-%% <p>Note: Since <code>Node</code> is a syntax tree, the actual
+%% Note: Since `Node' is a syntax tree, the actual
 %% run-time values corresponding to its subtrees may often be partially
-%% or completely unknown. Thus, if <code>Node</code> represents e.g.
-%% "<code>[... | Ns]</code>" (where <code>Ns</code> is a variable), then
-%% the function will return <code>false</code>, because it is not known
-%% whether <code>Ns</code> will be bound to a list at run-time. If
-%% <code>Node</code> instead represents e.g. "<code>[1, 2, 3]</code>" or
-%% "<code>[A | []]</code>", then the function will return
-%% <code>true</code>.</p>
+%% or completely unknown. Thus, if `Node' represents e.g.
+%% "`[... | Ns]'" (where `Ns' is a variable), then
+%% the function will return `false', because it is not known
+%% whether `Ns' will be bound to a list at run-time. If
+%% `Node' instead represents e.g. "`[1, 2, 3]'" or
+%% "`[A | []]'", then the function will return
+%% `true'.
 %%
 %% @see list/2
 
@@ -2417,14 +2248,11 @@ is_proper_list(Node) ->
 
 
 %% =====================================================================
-%% @spec list_elements(Node::syntaxTree()) -> [syntaxTree()]
-%%
 %% @doc Returns the list of element subtrees of a list skeleton.
-%% <code>Node</code> must represent a proper list. E.g., if
-%% <code>Node</code> represents "<code>[<em>X1</em>, <em>X2</em> |
+%% `Node' must represent a proper list. E.g., if
+%% `Node' represents "<code>[<em>X1</em>, <em>X2</em> |
 %% [<em>X3</em>, <em>X4</em> | []]</code>", then
-%% <code>list_elements(Node)</code> yields the list <code>[X1, X2, X3,
-%% X4]</code>.
+%% `list_elements(Node)' yields the list `[X1, X2, X3, X4]'.
 %%
 %% @see list/2
 %% @see is_proper_list/1
@@ -2450,17 +2278,15 @@ list_elements(Node, As) ->
 
 
 %% =====================================================================
-%% @spec list_length(Node::syntaxTree()) -> integer()
-%%
 %% @doc Returns the number of element subtrees of a list skeleton.
-%% <code>Node</code> must represent a proper list. E.g., if
-%% <code>Node</code> represents "<code>[X1 | [X2, X3 | [X4, X5,
-%% X6]]]</code>", then <code>list_length(Node)</code> returns the
+%% `Node' must represent a proper list. E.g., if
+%% `Node' represents "`[X1 | [X2, X3 | [X4, X5,
+%% X6]]]'", then `list_length(Node)' returns the
 %% integer 6.
 %%
-%% <p>Note: this is equivalent to
-%% <code>length(list_elements(Node))</code>, but potentially more
-%% efficient.</p>
+%% Note: this is equivalent to
+%% `length(list_elements(Node))', but potentially more
+%% efficient.
 %%
 %% @see list/2
 %% @see is_proper_list/1
@@ -2487,18 +2313,16 @@ list_length(Node, A) ->
 
 
 %% =====================================================================
-%% @spec normalize_list(Node::syntaxTree()) -> syntaxTree()
-%%
 %% @doc Expands an abstract list skeleton to its most explicit form. If
-%% <code>Node</code> represents "<code>[<em>E1</em>, ..., <em>En</em> |
+%% `Node' represents "<code>[<em>E1</em>, ..., <em>En</em> |
 %% <em>Tail</em>]</code>", the result represents "<code>[<em>E1</em> |
 %% ... [<em>En</em> | <em>Tail1</em>] ... ]</code>", where
-%% <code>Tail1</code> is the result of
-%% <code>normalize_list(Tail)</code>. If <code>Node</code> represents
+%% `Tail1' is the result of
+%% `normalize_list(Tail)'. If `Node' represents
 %% "<code>[<em>E1</em>, ..., <em>En</em>]</code>", the result simply
 %% represents "<code>[<em>E1</em> | ... [<em>En</em> | []] ...
-%% ]</code>". If <code>Node</code> does not represent a list skeleton,
-%% <code>Node</code> itself is returned.
+%% ]</code>". If `Node' does not represent a list skeleton,
+%% `Node' itself is returned.
 %%
 %% @see list/2
 %% @see compact_list/1
@@ -2528,16 +2352,14 @@ normalize_list_1(Es, Tail) ->
 
 
 %% =====================================================================
-%% @spec compact_list(Node::syntaxTree()) -> syntaxTree()
-%%
 %% @doc Yields the most compact form for an abstract list skeleton. The
 %% result either represents "<code>[<em>E1</em>, ..., <em>En</em> |
-%% <em>Tail</em>]</code>", where <code>Tail</code> is not a list
+%% <em>Tail</em>]</code>", where `Tail' is not a list
 %% skeleton, or otherwise simply "<code>[<em>E1</em>, ...,
-%% <em>En</em>]</code>". Annotations on subtrees of <code>Node</code>
+%% <em>En</em>]</code>". Annotations on subtrees of `Node'
 %% that represent list skeletons may be lost, but comments will be
-%% propagated to the result. Returns <code>Node</code> itself if
-%% <code>Node</code> does not represent a list skeleton.
+%% propagated to the result. Returns `Node' itself if
+%% `Node' does not represent a list skeleton.
 %%
 %% @see list/2
 %% @see normalize_list/1
@@ -2575,10 +2397,8 @@ compact_list(Node) ->
 
 
 %% =====================================================================
-%% @spec binary(Fields::[syntaxTree()]) -> syntaxTree()
-%%
 %% @doc Creates an abstract binary-object template. If
-%% <code>Fields</code> is <code>[F1, ..., Fn]</code>, the result
+%% `Fields' is `[F1, ..., Fn]', the result
 %% represents "<code>&lt;&lt;<em>F1</em>, ...,
 %% <em>Fn</em>&gt;&gt;</code>".
 %%
@@ -2611,10 +2431,7 @@ revert_binary(Node) ->
 
 
 %% =====================================================================
-%% @spec binary_fields(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of field subtrees of a <code>binary</code>
-%% node.
+%% @doc Returns the list of field subtrees of a `binary' node.
 %%
 %% @see binary/1
 %% @see binary_field/2
@@ -2631,7 +2448,6 @@ binary_fields(Node) ->
 
 
 %% =====================================================================
-%% @spec binary_field(Body) -> syntaxTree()
 %% @equiv binary_field(Body, [])
 
 -spec binary_field(syntaxTree()) -> syntaxTree().
@@ -2641,15 +2457,11 @@ binary_field(Body) ->
 
 
 %% =====================================================================
-%% @spec binary_field(Body::syntaxTree(), Size,
-%%                    Types::[syntaxTree()]) -> syntaxTree()
-%%	    Size = none | syntaxTree()
-%%
 %% @doc Creates an abstract binary template field.
-%% If <code>Size</code> is <code>none</code>, this is equivalent to
-%% "<code>binary_field(Body, Types)</code>", otherwise it is
-%% equivalent to "<code>binary_field(size_qualifier(Body, Size),
-%% Types)</code>".
+%% If `Size' is `none', this is equivalent to
+%% "`binary_field(Body, Types)'", otherwise it is
+%% equivalent to "`binary_field(size_qualifier(Body, Size),
+%% Types)'".
 %%
 %% (This is a utility function.)
 %%
@@ -2667,13 +2479,10 @@ binary_field(Body, Size, Types) ->
 
 
 %% =====================================================================
-%% @spec binary_field(Body::syntaxTree(), Types::[syntaxTree()]) ->
-%%           syntaxTree()
-%%
 %% @doc Creates an abstract binary template field. If
-%% <code>Types</code> is the empty list, the result simply represents
-%% "<code><em>Body</em></code>", otherwise, if <code>Types</code> is
-%% <code>[T1, ..., Tn]</code>, the result represents
+%% `Types' is the empty list, the result simply represents
+%% "<code><em>Body</em></code>", otherwise, if `Types' is
+%% `[T1, ..., Tn]', the result represents
 %% "<code><em>Body</em>/<em>T1</em>-...-<em>Tn</em></code>".
 %%
 %% @see binary/1
@@ -2727,9 +2536,7 @@ revert_binary_field(Node) ->
 
 
 %% =====================================================================
-%% @spec binary_field_body(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the body subtree of a <code>binary_field</code>.
+%% @doc Returns the body subtree of a `binary_field'.
 %%
 %% @see binary_field/2
 
@@ -2749,12 +2556,10 @@ binary_field_body(Node) ->
 
 
 %% =====================================================================
-%% @spec binary_field_types(Node::syntaxTree()) -> [syntaxTree()]
-%%
 %% @doc Returns the list of type-specifier subtrees of a
-%% <code>binary_field</code> node. If <code>Node</code> represents
+%% `binary_field' node. If `Node' represents
 %% "<code>.../<em>T1</em>, ..., <em>Tn</em></code>", the result is
-%% <code>[T1, ..., Tn]</code>, otherwise the result is the empty list.
+%% `[T1, ..., Tn]', otherwise the result is the empty list.
 %%
 %% @see binary_field/2
 
@@ -2774,14 +2579,12 @@ binary_field_types(Node) ->
 
 
 %% =====================================================================
-%% @spec binary_field_size(Node::syntaxTree()) -> none | syntaxTree()
-%%
 %% @doc Returns the size specifier subtree of a
-%% <code>binary_field</code> node, if any. If <code>Node</code>
+%% `binary_field' node, if any. If `Node'
 %% represents "<code><em>Body</em>:<em>Size</em></code>" or
 %% "<code><em>Body</em>:<em>Size</em>/<em>T1</em>, ...,
-%% <em>Tn</em></code>", the result is <code>Size</code>, otherwise
-%% <code>none</code> is returned.
+%% <em>Tn</em></code>", the result is `Size', otherwise
+%% `none' is returned.
 %%
 %% (This is a utility function.)
 %%
@@ -2810,9 +2613,6 @@ binary_field_size(Node) ->
 
 
 %% =====================================================================
-%% @spec size_qualifier(Body::syntaxTree(), Size::syntaxTree()) ->
-%%           syntaxTree()
-%%
 %% @doc Creates an abstract size qualifier. The result represents
 %% "<code><em>Body</em>:<em>Size</em></code>".
 %%
@@ -2834,10 +2634,7 @@ size_qualifier(Body, Size) ->
 
 
 %% =====================================================================
-%% @spec size_qualifier_body(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the body subtree of a <code>size_qualifier</code>
-%% node.
+%% @doc Returns the body subtree of a `size_qualifier' node.
 %%
 %% @see size_qualifier/2
 
@@ -2848,10 +2645,8 @@ size_qualifier_body(Node) ->
 
 
 %% =====================================================================
-%% @spec size_qualifier_argument(syntaxTree()) -> syntaxTree()
-%%
 %% @doc Returns the argument subtree (the size) of a
-%% <code>size_qualifier</code> node.
+%% `size_qualifier' node.
 %%
 %% @see size_qualifier/2
 
@@ -2862,16 +2657,14 @@ size_qualifier_argument(Node) ->
 
 
 %% =====================================================================
-%% @spec error_marker(Error::term()) -> syntaxTree()
-%%
 %% @doc Creates an abstract error marker. The result represents an
 %% occurrence of an error in the source code, with an associated Erlang
-%% I/O ErrorInfo structure given by <code>Error</code> (see module
+%% I/O ErrorInfo structure given by `Error' (see module
 %% {@link //stdlib/io} for details). Error markers are regarded as source
 %% code forms, but have no defined lexical form.
 %%
-%% <p>Note: this is supported only for backwards compatibility with
-%% existing parsers and tools.</p>
+%% Note: this is supported only for backwards compatibility with
+%% existing parsers and tools.
 %%
 %% @see error_marker_info/1
 %% @see warning_marker/1
@@ -2902,10 +2695,7 @@ revert_error_marker(Node) ->
 
 
 %% =====================================================================
-%% @spec error_marker_info(syntaxTree()) -> term()
-%%
-%% @doc Returns the ErrorInfo structure of an <code>error_marker</code>
-%% node.
+%% @doc Returns the ErrorInfo structure of an `error_marker' node.
 %%
 %% @see error_marker/1
 
@@ -2921,16 +2711,14 @@ error_marker_info(Node) ->
 
 
 %% =====================================================================
-%% @spec warning_marker(Error::term()) -> syntaxTree()
-%%
 %% @doc Creates an abstract warning marker. The result represents an
 %% occurrence of a possible problem in the source code, with an
-%% associated Erlang I/O ErrorInfo structure given by <code>Error</code>
+%% associated Erlang I/O ErrorInfo structure given by `Error'
 %% (see module {@link //stdlib/io} for details). Warning markers are
 %% regarded as source code forms, but have no defined lexical form.
 %%
-%% <p>Note: this is supported only for backwards compatibility with
-%% existing parsers and tools.</p>
+%% Note: this is supported only for backwards compatibility with
+%% existing parsers and tools.
 %%
 %% @see warning_marker_info/1
 %% @see error_marker/1
@@ -2961,10 +2749,7 @@ revert_warning_marker(Node) ->
 
 
 %% =====================================================================
-%% @spec warning_marker_info(syntaxTree()) -> term()
-%%
-%% @doc Returns the ErrorInfo structure of a <code>warning_marker</code>
-%% node.
+%% @doc Returns the ErrorInfo structure of a `warning_marker' node.
 %%
 %% @see warning_marker/1
 
@@ -2980,16 +2765,14 @@ warning_marker_info(Node) ->
 
 
 %% =====================================================================
-%% @spec eof_marker() -> syntaxTree()
-%%
 %% @doc Creates an abstract end-of-file marker. This represents the
 %% end of input when reading a sequence of source code forms. An
 %% end-of-file marker is itself regarded as a source code form
 %% (namely, the last in any sequence in which it occurs). It has no
 %% defined lexical form.
 %%
-%% <p>Note: this is retained only for backwards compatibility with
-%% existing parsers and tools.</p>
+%% Note: this is retained only for backwards compatibility with
+%% existing parsers and tools.
 %%
 %% @see error_marker/1
 %% @see warning_marker/1
@@ -3013,7 +2796,6 @@ revert_eof_marker(Node) ->
 
 
 %% =====================================================================
-%% @spec attribute(Name) -> syntaxTree()
 %% @equiv attribute(Name, none)
 
 -spec attribute(syntaxTree()) -> syntaxTree().
@@ -3023,23 +2805,20 @@ attribute(Name) ->
 
 
 %% =====================================================================
-%% @spec attribute(Name::syntaxTree(), Arguments) -> syntaxTree()
-%%           Arguments = none | [syntaxTree()]
-%%
 %% @doc Creates an abstract program attribute. If
-%% <code>Arguments</code> is <code>[A1, ..., An]</code>, the result
+%% `Arguments' is `[A1, ..., An]', the result
 %% represents "<code>-<em>Name</em>(<em>A1</em>, ...,
-%% <em>An</em>).</code>". Otherwise, if <code>Arguments</code> is
-%% <code>none</code>, the result represents
+%% <em>An</em>).</code>". Otherwise, if `Arguments' is
+%% `none', the result represents
 %% "<code>-<em>Name</em>.</code>". The latter form makes it possible
 %% to represent preprocessor directives such as
-%% "<code>-endif.</code>". Attributes are source code forms.
+%% "`-endif.'". Attributes are source code forms.
 %%
-%% <p>Note: The preprocessor macro definition directive
+%% Note: The preprocessor macro definition directive
 %% "<code>-define(<em>Name</em>, <em>Body</em>).</code>" has relatively
-%% few requirements on the syntactical form of <code>Body</code> (viewed
-%% as a sequence of tokens). The <code>text</code> node type can be used
-%% for a <code>Body</code> that is not a normal Erlang construct.</p>
+%% few requirements on the syntactical form of `Body' (viewed
+%% as a sequence of tokens). The `text' node type can be used
+%% for a `Body' that is not a normal Erlang construct.
 %%
 %% @see attribute/1
 %% @see attribute_name/1
@@ -3233,9 +3012,7 @@ revert_module_name(A) ->
 
 
 %% =====================================================================
-%% @spec attribute_name(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the name subtree of an <code>attribute</code> node.
+%% @doc Returns the name subtree of an `attribute' node.
 %%
 %% @see attribute/1
 
@@ -3251,15 +3028,12 @@ attribute_name(Node) ->
 
 
 %% =====================================================================
-%% @spec attribute_arguments(Node::syntaxTree()) ->
-%%           none | [syntaxTree()]
-%%
 %% @doc Returns the list of argument subtrees of an
-%% <code>attribute</code> node, if any. If <code>Node</code>
+%% `attribute' node, if any. If `Node'
 %% represents "<code>-<em>Name</em>.</code>", the result is
-%% <code>none</code>. Otherwise, if <code>Node</code> represents
+%% `none'. Otherwise, if `Node' represents
 %% "<code>-<em>Name</em>(<em>E1</em>, ..., <em>En</em>).</code>",
-%% <code>[E1, ..., E1]</code> is returned.
+%% `[E1, ..., E1]' is returned.
 %%
 %% @see attribute/1
 
@@ -3326,9 +3100,6 @@ attribute_arguments(Node) ->
 
 
 %% =====================================================================
-%% @spec arity_qualifier(Body::syntaxTree(), Arity::syntaxTree()) ->
-%%           syntaxTree()
-%%
 %% @doc Creates an abstract arity qualifier. The result represents
 %% "<code><em>Body</em>/<em>Arity</em></code>".
 %%
@@ -3350,10 +3121,7 @@ arity_qualifier(Body, Arity) ->
 
 
 %% =====================================================================
-%% @spec arity_qualifier_body(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the body subtree of an <code>arity_qualifier</code>
-%% node.
+%% @doc Returns the body subtree of an `arity_qualifier' node.
 %%
 %% @see arity_qualifier/2
 
@@ -3364,10 +3132,8 @@ arity_qualifier_body(Node) ->
 
 
 %% =====================================================================
-%% @spec arity_qualifier_argument(syntaxTree()) -> syntaxTree()
-%%
 %% @doc Returns the argument (the arity) subtree of an
-%% <code>arity_qualifier</code> node.
+%% `arity_qualifier' node.
 %%
 %% @see arity_qualifier/2
 
@@ -3378,9 +3144,6 @@ arity_qualifier_argument(Node) ->
 
 
 %% =====================================================================
-%% @spec module_qualifier(Module::syntaxTree(), Body::syntaxTree()) ->
-%%           syntaxTree()
-%%
 %% @doc Creates an abstract module qualifier. The result represents
 %% "<code><em>Module</em>:<em>Body</em></code>".
 %%
@@ -3414,10 +3177,8 @@ revert_module_qualifier(Node) ->
 
 
 %% =====================================================================
-%% @spec module_qualifier_argument(syntaxTree()) -> syntaxTree()
-%%
 %% @doc Returns the argument (the module) subtree of a
-%% <code>module_qualifier</code> node.
+%% `module_qualifier' node.
 %%
 %% @see module_qualifier/2
 
@@ -3433,10 +3194,7 @@ module_qualifier_argument(Node) ->
 
 
 %% =====================================================================
-%% @spec module_qualifier_body(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the body subtree of a <code>module_qualifier</code>
-%% node.
+%% @doc Returns the body subtree of a `module_qualifier' node.
 %%
 %% @see module_qualifier/2
 
@@ -3452,11 +3210,9 @@ module_qualifier_body(Node) ->
 
 
 %% =====================================================================
-%% @spec qualified_name(Segments::[syntaxTree()]) -> syntaxTree()
-%%
 %% @doc Creates an abstract qualified name. The result represents
 %% "<code><em>S1</em>.<em>S2</em>. ... .<em>Sn</em></code>", if
-%% <code>Segments</code> is <code>[S1, S2, ..., Sn]</code>.
+%% `Segments' is `[S1, S2, ..., Sn]'.
 %%
 %% @see qualified_name_segments/1
 
@@ -3484,10 +3240,8 @@ revert_qualified_name(Node) ->
 
 
 %% =====================================================================
-%% @spec qualified_name_segments(syntaxTree()) -> [syntaxTree()]
-%%
 %% @doc Returns the list of name segments of a
-%% <code>qualified_name</code> node.
+%% `qualified_name' node.
 %%
 %% @see qualified_name/1
 
@@ -3503,13 +3257,10 @@ qualified_name_segments(Node) ->
 
 
 %% =====================================================================
-%% @spec function(Name::syntaxTree(), Clauses::[syntaxTree()]) ->
-%%           syntaxTree()
-%%
-%% @doc Creates an abstract function definition. If <code>Clauses</code>
-%% is <code>[C1, ..., Cn]</code>, the result represents
+%% @doc Creates an abstract function definition. If `Clauses'
+%% is `[C1, ..., Cn]', the result represents
 %% "<code><em>Name</em> <em>C1</em>; ...; <em>Name</em>
-%% <em>Cn</em>.</code>". More exactly, if each <code>Ci</code>
+%% <em>Cn</em>.</code>". More exactly, if each `Ci'
 %% represents "<code>(<em>Pi1</em>, ..., <em>Pim</em>) <em>Gi</em> ->
 %% <em>Bi</em></code>", then the result represents
 %% "<code><em>Name</em>(<em>P11</em>, ..., <em>P1m</em>) <em>G1</em> ->
@@ -3523,13 +3274,12 @@ qualified_name_segments(Node) ->
 %% @see is_form/1
 %% @see rule/2
 
--record(function, {name, clauses}).
-%% XXX: This one is problematic because there is a tuple with the same
-%%      tag and size that comes from 'erl_parse'
-%% -record(function, {name :: syntaxTree(), clauses :: [syntaxTree()]}).
+%% Don't use the name 'function' for this record, to avoid confusion with
+%% the tuples on the form {function,Name,Arity} used by erl_parse.
+-record(func, {name :: syntaxTree(), clauses :: [syntaxTree()]}).
 
 %% type(Node) = function
-%% data(Node) = #function{name :: Name, clauses :: Clauses}
+%% data(Node) = #func{name :: Name, clauses :: Clauses}
 %%
 %%	Name = syntaxTree()
 %%	Clauses = [syntaxTree()]
@@ -3556,7 +3306,7 @@ qualified_name_segments(Node) ->
 -spec function(syntaxTree(), [syntaxTree()]) -> syntaxTree().
 
 function(Name, Clauses) ->
-    tree(function, #function{name = Name, clauses = Clauses}).
+    tree(function, #func{name = Name, clauses = Clauses}).
 
 revert_function(Node) ->
     Name = function_name(Node),
@@ -3572,9 +3322,7 @@ revert_function(Node) ->
 
 
 %% =====================================================================
-%% @spec function_name(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the name subtree of a <code>function</code> node.
+%% @doc Returns the name subtree of a `function' node.
 %%
 %% @see function/2
 
@@ -3585,15 +3333,12 @@ function_name(Node) ->
 	{function, Pos, Name, _, _} ->
 	    set_pos(atom(Name), Pos);
 	Node1 ->
-	    (data(Node1))#function.name
+	    (data(Node1))#func.name
     end.
 
 
 %% =====================================================================
-%% @spec function_clauses(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of clause subtrees of a <code>function</code>
-%% node.
+%% @doc Returns the list of clause subtrees of a `function' node.
 %%
 %% @see function/2
 
@@ -3604,21 +3349,19 @@ function_clauses(Node) ->
 	{function, _, _, _, Clauses} ->
 	    Clauses;
 	Node1 ->
-	    (data(Node1))#function.clauses
+	    (data(Node1))#func.clauses
     end.
 
 
 %% =====================================================================
-%% @spec function_arity(Node::syntaxTree()) -> integer()
-%%
-%% @doc Returns the arity of a <code>function</code> node. The result
+%% @doc Returns the arity of a `function' node. The result
 %% is the number of parameter patterns in the first clause of the
 %% function; subsequent clauses are ignored.
 %%
-%% <p>An exception is thrown if <code>function_clauses(Node)</code>
+%% An exception is thrown if `function_clauses(Node)'
 %% returns an empty list, or if the first element of that list is not
-%% a syntax tree <code>C</code> of type <code>clause</code> such that
-%% <code>clause_patterns(C)</code> is a nonempty list.</p>
+%% a syntax tree `C' of type `clause' such that
+%% `clause_patterns(C)' is a nonempty list.
 %%
 %% @see function/2
 %% @see function_clauses/1
@@ -3634,7 +3377,6 @@ function_arity(Node) ->
 
 
 %% =====================================================================
-%% @spec clause(Guard, Body) -> syntaxTree()
 %% @equiv clause([], Guard, Body)
 
 -type guard() :: 'none' | syntaxTree() | [syntaxTree()] | [[syntaxTree()]].
@@ -3646,34 +3388,28 @@ clause(Guard, Body) ->
 
 
 %% =====================================================================
-%% @spec clause(Patterns::[syntaxTree()], Guard,
-%%              Body::[syntaxTree()]) -> syntaxTree()
-%%	    Guard = none | syntaxTree()
-%%                | [syntaxTree()] | [[syntaxTree()]]
-%%
-%% @doc Creates an abstract clause. If <code>Patterns</code> is
-%% <code>[P1, ..., Pn]</code> and <code>Body</code> is <code>[B1, ...,
-%% Bm]</code>, then if <code>Guard</code> is <code>none</code>, the
+%% @doc Creates an abstract clause. If `Patterns' is
+%% `[P1, ..., Pn]' and `Body' is `[B1, ...,
+%% Bm]', then if `Guard' is `none', the
 %% result represents "<code>(<em>P1</em>, ..., <em>Pn</em>) ->
 %% <em>B1</em>, ..., <em>Bm</em></code>", otherwise, unless
-%% <code>Guard</code> is a list, the result represents
+%% `Guard' is a list, the result represents
 %% "<code>(<em>P1</em>, ..., <em>Pn</em>) when <em>Guard</em> ->
 %% <em>B1</em>, ..., <em>Bm</em></code>".
 %%
-%% <p>For simplicity, the <code>Guard</code> argument may also be any
+%% For simplicity, the `Guard' argument may also be any
 %% of the following:
 %% <ul>
-%%   <li>An empty list <code>[]</code>. This is equivalent to passing
-%%       <code>none</code>.</li>
-%%   <li>A nonempty list <code>[E1, ..., Ej]</code> of syntax trees.
-%%       This is equivalent to passing <code>conjunction([E1, ...,
-%%       Ej])</code>.</li>
-%%   <li>A nonempty list of lists of syntax trees <code>[[E1_1, ...,
-%%       E1_k1], ..., [Ej_1, ..., Ej_kj]]</code>, which is equivalent
-%%       to passing <code>disjunction([conjunction([E1_1, ...,
-%%       E1_k1]), ..., conjunction([Ej_1, ..., Ej_kj])])</code>.</li>
+%%   <li>An empty list `[]'. This is equivalent to passing
+%%       `none'.</li>
+%%   <li>A nonempty list `[E1, ..., Ej]' of syntax trees.
+%%       This is equivalent to passing `conjunction([E1, ...,
+%%       Ej])'.</li>
+%%   <li>A nonempty list of lists of syntax trees `[[E1_1, ...,
+%%       E1_k1], ..., [Ej_1, ..., Ej_kj]]', which is equivalent
+%%       to passing `disjunction([conjunction([E1_1, ...,
+%%       E1_k1]), ..., conjunction([Ej_1, ..., Ej_kj])])'.</li>
 %% </ul>
-%% </p>
 %%
 %% @see clause/2
 %% @see clause_patterns/1
@@ -3789,10 +3525,7 @@ unfold_try_clause({clause, Pos, [{tuple, _, [C, V, _]}],
 
 
 %% =====================================================================
-%% @spec clause_patterns(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of pattern subtrees of a <code>clause</code>
-%% node.
+%% @doc Returns the list of pattern subtrees of a `clause' node.
 %%
 %% @see clause/3
 
@@ -3808,13 +3541,11 @@ clause_patterns(Node) ->
 
 
 %% =====================================================================
-%% @spec clause_guard(Node::syntaxTree()) -> none | syntaxTree()
-%%
-%% @doc Returns the guard subtree of a <code>clause</code> node, if
-%% any. If <code>Node</code> represents "<code>(<em>P1</em>, ...,
+%% @doc Returns the guard subtree of a `clause' node, if
+%% any. If `Node' represents "<code>(<em>P1</em>, ...,
 %% <em>Pn</em>) when <em>Guard</em> -> <em>B1</em>, ...,
-%% <em>Bm</em></code>", <code>Guard</code> is returned. Otherwise, the
-%% result is <code>none</code>.
+%% <em>Bm</em></code>", `Guard' is returned. Otherwise, the
+%% result is `none'.
 %%
 %% @see clause/3
 
@@ -3836,10 +3567,7 @@ clause_guard(Node) ->
 
 
 %% =====================================================================
-%% @spec clause_body(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Return the list of body subtrees of a <code>clause</code>
-%% node.
+%% @doc Return the list of body subtrees of a `clause' node.
 %%
 %% @see clause/3
 
@@ -3855,10 +3583,8 @@ clause_body(Node) ->
 
 
 %% =====================================================================
-%% @spec disjunction(List::[syntaxTree()]) -> syntaxTree()
-%%
-%% @doc Creates an abstract disjunction. If <code>List</code> is
-%% <code>[E1, ..., En]</code>, the result represents
+%% @doc Creates an abstract disjunction. If `List' is
+%% `[E1, ..., En]', the result represents
 %% "<code><em>E1</em>; ...; <em>En</em></code>".
 %%
 %% @see disjunction_body/1
@@ -3874,10 +3600,8 @@ disjunction(Tests) ->
 
 
 %% =====================================================================
-%% @spec disjunction_body(syntaxTree()) -> [syntaxTree()]
-%%
 %% @doc Returns the list of body subtrees of a
-%% <code>disjunction</code> node.
+%% `disjunction' node.
 %%
 %% @see disjunction/1
 
@@ -3888,10 +3612,8 @@ disjunction_body(Node) ->
 
 
 %% =====================================================================
-%% @spec conjunction(List::[syntaxTree()]) -> syntaxTree()
-%%
-%% @doc Creates an abstract conjunction. If <code>List</code> is
-%% <code>[E1, ..., En]</code>, the result represents
+%% @doc Creates an abstract conjunction. If `List' is
+%% `[E1, ..., En]', the result represents
 %% "<code><em>E1</em>, ..., <em>En</em></code>".
 %%
 %% @see conjunction_body/1
@@ -3907,10 +3629,8 @@ conjunction(Tests) ->
 
 
 %% =====================================================================
-%% @spec conjunction_body(syntaxTree()) -> [syntaxTree()]
-%%
 %% @doc Returns the list of body subtrees of a
-%% <code>conjunction</code> node.
+%% `conjunction' node.
 %%
 %% @see conjunction/1
 
@@ -3921,8 +3641,6 @@ conjunction_body(Node) ->
 
 
 %% =====================================================================
-%% @spec catch_expr(Expr::syntaxTree()) -> syntaxTree()
-%%
 %% @doc Creates an abstract catch-expression. The result represents
 %% "<code>catch <em>Expr</em></code>".
 %%
@@ -3949,9 +3667,7 @@ revert_catch_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec catch_expr_body(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the body subtree of a <code>catch_expr</code> node.
+%% @doc Returns the body subtree of a `catch_expr' node.
 %%
 %% @see catch_expr/1
 
@@ -3967,9 +3683,6 @@ catch_expr_body(Node) ->
 
 
 %% =====================================================================
-%% @spec match_expr(Pattern::syntaxTree(), Body::syntaxTree()) ->
-%%           syntaxTree()
-%%
 %% @doc Creates an abstract match-expression. The result represents
 %% "<code><em>Pattern</em> = <em>Body</em></code>".
 %%
@@ -4002,9 +3715,7 @@ revert_match_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec match_expr_pattern(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the pattern subtree of a <code>match_expr</code> node.
+%% @doc Returns the pattern subtree of a `match_expr' node.
 %%
 %% @see match_expr/2
 
@@ -4020,9 +3731,7 @@ match_expr_pattern(Node) ->
 
 
 %% =====================================================================
-%% @spec match_expr_body(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the body subtree of a <code>match_expr</code> node.
+%% @doc Returns the body subtree of a `match_expr' node.
 %%
 %% @see match_expr/2
 
@@ -4038,15 +3747,12 @@ match_expr_body(Node) ->
 
 
 %% =====================================================================
-%% @spec operator(Name) -> syntaxTree()
-%%	    Name = atom() | string()
-%%
 %% @doc Creates an abstract operator. The name of the operator is the
-%% character sequence represented by <code>Name</code>. This is
+%% character sequence represented by `Name'. This is
 %% analogous to the print name of an atom, but an operator is never
 %% written within single-quotes; e.g., the result of
-%% <code>operator('++')</code> represents "<code>++</code>" rather
-%% than "<code>'++'</code>".
+%% `operator('++')' represents "`++'" rather
+%% than "`'++''".
 %%
 %% @see operator_name/1
 %% @see operator_literal/1
@@ -4064,9 +3770,7 @@ operator(Name) ->
 
 
 %% =====================================================================
-%% @spec operator_name(syntaxTree()) -> atom()
-%%
-%% @doc Returns the name of an <code>operator</code> node. Note that
+%% @doc Returns the name of an `operator' node. Note that
 %% the name is returned as an atom.
 %%
 %% @see operator/1
@@ -4078,11 +3782,8 @@ operator_name(Node) ->
 
 
 %% =====================================================================
-%% @spec operator_literal(syntaxTree()) -> string()
-%%
 %% @doc Returns the literal string represented by an
-%% <code>operator</code> node. This is simply the operator name as a
-%% string.
+%% `operator' node. This is simply the operator name as a string.
 %%
 %% @see operator/1
 
@@ -4093,9 +3794,6 @@ operator_literal(Node) ->
 
 
 %% =====================================================================
-%% @spec infix_expr(Left::syntaxTree(), Operator::syntaxTree(),
-%%                  Right::syntaxTree()) -> syntaxTree()
-%%
 %% @doc Creates an abstract infix operator expression. The result
 %% represents "<code><em>Left</em> <em>Operator</em>
 %% <em>Right</em></code>".
@@ -4144,10 +3842,8 @@ revert_infix_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec infix_expr_left(syntaxTree()) -> syntaxTree()
-%%
 %% @doc Returns the left argument subtree of an
-%% <code>infix_expr</code> node.
+%% `infix_expr' node.
 %%
 %% @see infix_expr/3
 
@@ -4163,10 +3859,7 @@ infix_expr_left(Node) ->
 
 
 %% =====================================================================
-%% @spec infix_expr_operator(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the operator subtree of an <code>infix_expr</code>
-%% node.
+%% @doc Returns the operator subtree of an `infix_expr' node.
 %%
 %% @see infix_expr/3
 
@@ -4182,10 +3875,8 @@ infix_expr_operator(Node) ->
 
 
 %% =====================================================================
-%% @spec infix_expr_right(syntaxTree()) -> syntaxTree()
-%%
 %% @doc Returns the right argument subtree of an
-%% <code>infix_expr</code> node.
+%% `infix_expr' node.
 %%
 %% @see infix_expr/3
 
@@ -4201,9 +3892,6 @@ infix_expr_right(Node) ->
 
 
 %% =====================================================================
-%% @spec prefix_expr(Operator::syntaxTree(), Argument::syntaxTree()) ->
-%%           syntaxTree()
-%%
 %% @doc Creates an abstract prefix operator expression. The result
 %% represents "<code><em>Operator</em> <em>Argument</em></code>".
 %%
@@ -4247,10 +3935,7 @@ revert_prefix_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec prefix_expr_operator(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the operator subtree of a <code>prefix_expr</code>
-%% node.
+%% @doc Returns the operator subtree of a `prefix_expr' node.
 %%
 %% @see prefix_expr/2
 
@@ -4266,10 +3951,7 @@ prefix_expr_operator(Node) ->
 
 
 %% =====================================================================
-%% @spec prefix_expr_argument(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the argument subtree of a <code>prefix_expr</code>
-%% node.
+%% @doc Returns the argument subtree of a `prefix_expr' node.
 %%
 %% @see prefix_expr/2
 
@@ -4285,7 +3967,6 @@ prefix_expr_argument(Node) ->
 
 
 %% =====================================================================
-%% @spec record_field(Name) -> syntaxTree()
 %% @equiv record_field(Name, none)
 
 -spec record_field(syntaxTree()) -> syntaxTree().
@@ -4295,11 +3976,8 @@ record_field(Name) ->
 
 
 %% =====================================================================
-%% @spec record_field(Name::syntaxTree(), Value) -> syntaxTree()
-%%	    Value = none | syntaxTree()
-%%
 %% @doc Creates an abstract record field specification. If
-%% <code>Value</code> is <code>none</code>, the result represents
+%% `Value' is `none', the result represents
 %% simply "<code><em>Name</em></code>", otherwise it represents
 %% "<code><em>Name</em> = <em>Value</em></code>".
 %%
@@ -4321,9 +3999,7 @@ record_field(Name, Value) ->
 
 
 %% =====================================================================
-%% @spec record_field_name(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the name subtree of a <code>record_field</code> node.
+%% @doc Returns the name subtree of a `record_field' node.
 %%
 %% @see record_field/2
 
@@ -4334,13 +4010,11 @@ record_field_name(Node) ->
 
 
 %% =====================================================================
-%% @spec record_field_value(syntaxTree()) -> none | syntaxTree()
-%%
-%% @doc Returns the value subtree of a <code>record_field</code> node,
-%% if any. If <code>Node</code> represents
-%% "<code><em>Name</em></code>", <code>none</code> is
-%% returned. Otherwise, if <code>Node</code> represents
-%% "<code><em>Name</em> = <em>Value</em></code>", <code>Value</code>
+%% @doc Returns the value subtree of a `record_field' node,
+%% if any. If `Node' represents
+%% "<code><em>Name</em></code>", `none' is
+%% returned. Otherwise, if `Node' represents
+%% "<code><em>Name</em> = <em>Value</em></code>", `Value'
 %% is returned.
 %%
 %% @see record_field/2
@@ -4352,15 +4026,12 @@ record_field_value(Node) ->
 
 
 %% =====================================================================
-%% @spec record_index_expr(Type::syntaxTree(), Field::syntaxTree()) ->
-%%           syntaxTree()
-%%
 %% @doc Creates an abstract record field index expression. The result
 %% represents "<code>#<em>Type</em>.<em>Field</em></code>".
 %%
-%% <p>(Note: the function name <code>record_index/2</code> is reserved
+%% (Note: the function name `record_index/2' is reserved
 %% by the Erlang compiler, which is why that name could not be used
-%% for this constructor.)</p>
+%% for this constructor.)
 %%
 %% @see record_index_expr_type/1
 %% @see record_index_expr_field/1
@@ -4399,10 +4070,7 @@ revert_record_index_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec record_index_expr_type(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the type subtree of a <code>record_index_expr</code>
-%% node.
+%% @doc Returns the type subtree of a `record_index_expr' node.
 %%
 %% @see record_index_expr/2
 
@@ -4418,10 +4086,7 @@ record_index_expr_type(Node) ->
 
 
 %% =====================================================================
-%% @spec record_index_expr_field(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the field subtree of a <code>record_index_expr</code>
-%% node.
+%% @doc Returns the field subtree of a `record_index_expr' node.
 %%
 %% @see record_index_expr/2
 
@@ -4437,7 +4102,6 @@ record_index_expr_field(Node) ->
 
 
 %% =====================================================================
-%% @spec record_access(Argument, Field) -> syntaxTree()
 %% @equiv record_access(Argument, none, Field)
 
 -spec record_access(syntaxTree(), syntaxTree()) -> syntaxTree().
@@ -4447,17 +4111,13 @@ record_access(Argument, Field) ->
 
 
 %% =====================================================================
-%% @spec record_access(Argument::syntaxTree(), Type,
-%%                     Field::syntaxTree()) -> syntaxTree()
-%%	    Type = none | syntaxTree()
-%%
 %% @doc Creates an abstract record field access expression. If
-%% <code>Type</code> is not <code>none</code>, the result represents
+%% `Type' is not `none', the result represents
 %% "<code><em>Argument</em>#<em>Type</em>.<em>Field</em></code>".
 %%
-%% <p>If <code>Type</code> is <code>none</code>, the result represents
+%% If `Type' is `none', the result represents
 %% "<code><em>Argument</em>.<em>Field</em></code>". This is a special
-%% form only allowed within Mnemosyne queries.</p>
+%% form only allowed within Mnemosyne queries.
 %%
 %% @see record_access/2
 %% @see record_access_argument/1
@@ -4512,10 +4172,7 @@ revert_record_access(Node) ->
 
 
 %% =====================================================================
-%% @spec record_access_argument(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the argument subtree of a <code>record_access</code>
-%% node.
+%% @doc Returns the argument subtree of a `record_access' node.
 %%
 %% @see record_access/3
 
@@ -4533,14 +4190,12 @@ record_access_argument(Node) ->
 
 
 %% =====================================================================
-%% @spec record_access_type(syntaxTree()) -> none | syntaxTree()
-%%
-%% @doc Returns the type subtree of a <code>record_access</code> node,
-%% if any. If <code>Node</code> represents
-%% "<code><em>Argument</em>.<em>Field</em></code>", <code>none</code>
-%% is returned, otherwise if <code>Node</code> represents
+%% @doc Returns the type subtree of a `record_access' node,
+%% if any. If `Node' represents
+%% "<code><em>Argument</em>.<em>Field</em></code>", `none'
+%% is returned, otherwise if `Node' represents
 %% "<code><em>Argument</em>#<em>Type</em>.<em>Field</em></code>",
-%% <code>Type</code> is returned.
+%% `Type' is returned.
 %%
 %% @see record_access/3
 
@@ -4558,10 +4213,7 @@ record_access_type(Node) ->
 
 
 %% =====================================================================
-%% @spec record_access_field(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the field subtree of a <code>record_access</code>
-%% node.
+%% @doc Returns the field subtree of a `record_access' node.
 %%
 %% @see record_access/3
 
@@ -4579,7 +4231,6 @@ record_access_field(Node) ->
 
 
 %% =====================================================================
-%% @spec record_expr(Type, Fields) -> syntaxTree()
 %% @equiv record_expr(none, Type, Fields)
 
 -spec record_expr(syntaxTree(), [syntaxTree()]) -> syntaxTree().
@@ -4589,13 +4240,9 @@ record_expr(Type, Fields) ->
 
 
 %% =====================================================================
-%% @spec record_expr(Argument, Type::syntaxTree(),
-%%                   Fields::[syntaxTree()]) -> syntaxTree()
-%%	    Argument = none | syntaxTree()
-%%
-%% @doc Creates an abstract record expression. If <code>Fields</code> is
-%% <code>[F1, ..., Fn]</code>, then if <code>Argument</code> is
-%% <code>none</code>, the result represents
+%% @doc Creates an abstract record expression. If `Fields' is
+%% `[F1, ..., Fn]', then if `Argument' is
+%% `none', the result represents
 %% "<code>#<em>Type</em>{<em>F1</em>, ..., <em>Fn</em>}</code>",
 %% otherwise it represents
 %% "<code><em>Argument</em>#<em>Type</em>{<em>F1</em>, ...,
@@ -4661,14 +4308,12 @@ revert_record_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec record_expr_argument(syntaxTree()) -> none | syntaxTree()
-%%
-%% @doc Returns the argument subtree of a <code>record_expr</code> node,
-%% if any. If <code>Node</code> represents
-%% "<code>#<em>Type</em>{...}</code>", <code>none</code> is returned.
-%% Otherwise, if <code>Node</code> represents
+%% @doc Returns the argument subtree of a `record_expr' node,
+%% if any. If `Node' represents
+%% "<code>#<em>Type</em>{...}</code>", `none' is returned.
+%% Otherwise, if `Node' represents
 %% "<code><em>Argument</em>#<em>Type</em>{...}</code>",
-%% <code>Argument</code> is returned.
+%% `Argument' is returned.
 %%
 %% @see record_expr/3
 
@@ -4686,9 +4331,7 @@ record_expr_argument(Node) ->
 
 
 %% =====================================================================
-%% @spec record_expr_type(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the type subtree of a <code>record_expr</code> node.
+%% @doc Returns the type subtree of a `record_expr' node.
 %%
 %% @see record_expr/3
 
@@ -4706,10 +4349,8 @@ record_expr_type(Node) ->
 
 
 %% =====================================================================
-%% @spec record_expr_fields(syntaxTree()) -> [syntaxTree()]
-%%
 %% @doc Returns the list of field subtrees of a
-%% <code>record_expr</code> node.
+%% `record_expr' node.
 %%
 %% @see record_expr/3
 
@@ -4727,15 +4368,11 @@ record_expr_fields(Node) ->
 
 
 %% =====================================================================
-%% @spec application(Module, Function::syntaxTree(),
-%%                   Arguments::[syntaxTree()]) -> syntaxTree()
-%%	    Module = none | syntaxTree()
-%%
 %% @doc Creates an abstract function application expression. If
-%% <code>Module</code> is <code>none</code>, this is call is equivalent
-%% to <code>application(Function, Arguments)</code>, otherwise it is
-%% equivalent to <code>application(module_qualifier(Module, Function),
-%% Arguments)</code>.
+%% `Module' is `none', this is call is equivalent
+%% to `application(Function, Arguments)', otherwise it is
+%% equivalent to `application(module_qualifier(Module, Function),
+%% Arguments)'.
 %%
 %% (This is a utility function.)
 %%
@@ -4752,11 +4389,8 @@ application(Module, Name, Arguments) ->
 
 
 %% =====================================================================
-%% @spec application(Operator::syntaxTree(),
-%%                   Arguments::[syntaxTree()]) -> syntaxTree()
-%%
 %% @doc Creates an abstract function application expression. If
-%% <code>Arguments</code> is <code>[A1, ..., An]</code>, the result
+%% `Arguments' is `[A1, ..., An]', the result
 %% represents "<code><em>Operator</em>(<em>A1</em>, ...,
 %% <em>An</em>)</code>".
 %%
@@ -4794,14 +4428,11 @@ revert_application(Node) ->
 
 
 %% =====================================================================
-%% @spec application_operator(syntaxTree()) -> syntaxTree()
+%% @doc Returns the operator subtree of an `application' node.
 %%
-%% @doc Returns the operator subtree of an <code>application</code>
-%% node.
-%%
-%% <p>Note: if <code>Node</code> represents
+%% Note: if `Node' represents
 %% "<code><em>M</em>:<em>F</em>(...)</code>", then the result is the
-%% subtree representing "<code><em>M</em>:<em>F</em></code>".</p>
+%% subtree representing "<code><em>M</em>:<em>F</em></code>".
 %%
 %% @see application/2
 %% @see module_qualifier/2
@@ -4818,10 +4449,8 @@ application_operator(Node) ->
 
 
 %% =====================================================================
-%% @spec application_arguments(syntaxTree()) -> [syntaxTree()]
-%%
 %% @doc Returns the list of argument subtrees of an
-%% <code>application</code> node.
+%% `application' node.
 %%
 %% @see application/2
 
@@ -4837,11 +4466,8 @@ application_arguments(Node) ->
 
 
 %% =====================================================================
-%% @spec list_comp(Template::syntaxTree(), Body::[syntaxTree()]) ->
-%%           syntaxTree()
-%%
-%% @doc Creates an abstract list comprehension. If <code>Body</code> is
-%% <code>[E1, ..., En]</code>, the result represents
+%% @doc Creates an abstract list comprehension. If `Body' is
+%% `[E1, ..., En]', the result represents
 %% "<code>[<em>Template</em> || <em>E1</em>, ..., <em>En</em>]</code>".
 %%
 %% @see list_comp_template/1
@@ -4876,9 +4502,7 @@ revert_list_comp(Node) ->
 
 
 %% =====================================================================
-%% @spec list_comp_template(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the template subtree of a <code>list_comp</code> node.
+%% @doc Returns the template subtree of a `list_comp' node.
 %%
 %% @see list_comp/2
 
@@ -4894,10 +4518,7 @@ list_comp_template(Node) ->
 
 
 %% =====================================================================
-%% @spec list_comp_body(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of body subtrees of a <code>list_comp</code>
-%% node.
+%% @doc Returns the list of body subtrees of a `list_comp' node.
 %%
 %% @see list_comp/2
 
@@ -4912,11 +4533,8 @@ list_comp_body(Node) ->
     end.
 
 %% =====================================================================
-%% @spec binary_comp(Template::syntaxTree(), Body::[syntaxTree()]) ->
-%%           syntaxTree()
-%%
-%% @doc Creates an abstract binary comprehension. If <code>Body</code> is
-%% <code>[E1, ..., En]</code>, the result represents
+%% @doc Creates an abstract binary comprehension. If `Body' is
+%% `[E1, ..., En]', the result represents
 %% "<code>&lt;&lt;<em>Template</em> || <em>E1</em>, ..., <em>En</em>&gt;&gt;</code>".
 %%
 %% @see binary_comp_template/1
@@ -4951,9 +4569,7 @@ revert_binary_comp(Node) ->
 
 
 %% =====================================================================
-%% @spec binary_comp_template(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the template subtree of a <code>binary_comp</code> node.
+%% @doc Returns the template subtree of a `binary_comp' node.
 %%
 %% @see binary_comp/2
 
@@ -4969,10 +4585,7 @@ binary_comp_template(Node) ->
 
 
 %% =====================================================================
-%% @spec binary_comp_body(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of body subtrees of a <code>binary_comp</code>
-%% node.
+%% @doc Returns the list of body subtrees of a `binary_comp' node.
 %%
 %% @see binary_comp/2
 
@@ -4988,8 +4601,6 @@ binary_comp_body(Node) ->
 
 
 %% =====================================================================
-%% @spec query_expr(Body::syntaxTree()) -> syntaxTree()
-%%
 %% @doc Creates an abstract Mnemosyne query expression. The result
 %% represents "<code>query <em>Body</em> end</code>".
 %%
@@ -5018,9 +4629,7 @@ revert_query_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec query_expr_body(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the body subtree of a <code>query_expr</code> node.
+%% @doc Returns the body subtree of a `query_expr' node.
 %%
 %% @see query_expr/1
 
@@ -5036,13 +4645,10 @@ query_expr_body(Node) ->
 
 
 %% =====================================================================
-%% @spec rule(Name::syntaxTree(), Clauses::[syntaxTree()]) ->
-%%           syntaxTree()
-%%
-%% @doc Creates an abstract Mnemosyne rule. If <code>Clauses</code> is
-%% <code>[C1, ..., Cn]</code>, the results represents
+%% @doc Creates an abstract Mnemosyne rule. If `Clauses' is
+%% `[C1, ..., Cn]', the results represents
 %% "<code><em>Name</em> <em>C1</em>; ...; <em>Name</em>
-%% <em>Cn</em>.</code>". More exactly, if each <code>Ci</code>
+%% <em>Cn</em>.</code>". More exactly, if each `Ci'
 %% represents "<code>(<em>Pi1</em>, ..., <em>Pim</em>) <em>Gi</em> ->
 %% <em>Bi</em></code>", then the result represents
 %% "<code><em>Name</em>(<em>P11</em>, ..., <em>P1m</em>) <em>G1</em> :-
@@ -5097,9 +4703,7 @@ revert_rule(Node) ->
 
 
 %% =====================================================================
-%% @spec rule_name(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the name subtree of a <code>rule</code> node.
+%% @doc Returns the name subtree of a `rule' node.
 %%
 %% @see rule/2
 
@@ -5114,9 +4718,7 @@ rule_name(Node) ->
     end.
 
 %% =====================================================================
-%% @spec rule_clauses(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of clause subtrees of a <code>rule</code> node.
+%% @doc Returns the list of clause subtrees of a `rule' node.
 %%
 %% @see rule/2
 
@@ -5131,16 +4733,14 @@ rule_clauses(Node) ->
     end.
 
 %% =====================================================================
-%% @spec rule_arity(Node::syntaxTree()) -> integer()
-%%
-%% @doc Returns the arity of a <code>rule</code> node. The result is the
+%% @doc Returns the arity of a `rule' node. The result is the
 %% number of parameter patterns in the first clause of the rule;
 %% subsequent clauses are ignored.
 %%
-%% <p>An exception is thrown if <code>rule_clauses(Node)</code> returns
+%% An exception is thrown if `rule_clauses(Node)' returns
 %% an empty list, or if the first element of that list is not a syntax
-%% tree <code>C</code> of type <code>clause</code> such that
-%% <code>clause_patterns(C)</code> is a nonempty list.</p>
+%% tree `C' of type `clause' such that
+%% `clause_patterns(C)' is a nonempty list.
 %%
 %% @see rule/2
 %% @see rule_clauses/1
@@ -5156,9 +4756,6 @@ rule_arity(Node) ->
 
 
 %% =====================================================================
-%% @spec generator(Pattern::syntaxTree(), Body::syntaxTree()) ->
-%%           syntaxTree()
-%%
 %% @doc Creates an abstract generator. The result represents
 %% "<code><em>Pattern</em> &lt;- <em>Body</em></code>".
 %%
@@ -5193,9 +4790,7 @@ revert_generator(Node) ->
 
 
 %% =====================================================================
-%% @spec generator_pattern(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the pattern subtree of a <code>generator</code> node.
+%% @doc Returns the pattern subtree of a `generator' node.
 %%
 %% @see generator/2
 
@@ -5211,9 +4806,7 @@ generator_pattern(Node) ->
 
 
 %% =====================================================================
-%% @spec generator_body(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the body subtree of a <code>generator</code> node.
+%% @doc Returns the body subtree of a `generator' node.
 %%
 %% @see generator/2
 
@@ -5229,9 +4822,6 @@ generator_body(Node) ->
 
 
 %% =====================================================================
-%% @spec binary_generator(Pattern::syntaxTree(), Body::syntaxTree()) ->
-%%           syntaxTree()
-%%
 %% @doc Creates an abstract binary_generator. The result represents
 %% "<code><em>Pattern</em> &lt;- <em>Body</em></code>".
 %%
@@ -5266,9 +4856,7 @@ revert_binary_generator(Node) ->
 
 
 %% =====================================================================
-%% @spec binary_generator_pattern(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the pattern subtree of a <code>generator</code> node.
+%% @doc Returns the pattern subtree of a `generator' node.
 %%
 %% @see binary_generator/2
 
@@ -5284,9 +4872,7 @@ binary_generator_pattern(Node) ->
 
 
 %% =====================================================================
-%% @spec binary_generator_body(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the body subtree of a <code>generator</code> node.
+%% @doc Returns the body subtree of a `generator' node.
 %%
 %% @see binary_generator/2
 
@@ -5302,10 +4888,8 @@ binary_generator_body(Node) ->
 
 
 %% =====================================================================
-%% @spec block_expr(Body::[syntaxTree()]) -> syntaxTree()
-%%
-%% @doc Creates an abstract block expression. If <code>Body</code> is
-%% <code>[B1, ..., Bn]</code>, the result represents "<code>begin
+%% @doc Creates an abstract block expression. If `Body' is
+%% `[B1, ..., Bn]', the result represents "<code>begin
 %% <em>B1</em>, ..., <em>Bn</em> end</code>".
 %%
 %% @see block_expr_body/1
@@ -5321,7 +4905,7 @@ binary_generator_body(Node) ->
 %%
 %%	    Body = [erl_parse()] \ []
 
--spec block_expr(Body::[syntaxTree()]) -> syntaxTree().
+-spec block_expr([syntaxTree()]) -> syntaxTree().
 
 block_expr(Body) ->
     tree(block_expr, Body).
@@ -5333,10 +4917,7 @@ revert_block_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec block_expr_body(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of body subtrees of a <code>block_expr</code>
-%% node.
+%% @doc Returns the list of body subtrees of a `block_expr' node.
 %%
 %% @see block_expr/1
 
@@ -5352,12 +4933,10 @@ block_expr_body(Node) ->
 
 
 %% =====================================================================
-%% @spec if_expr(Clauses::[syntaxTree()]) -> syntaxTree()
-%%
-%% @doc Creates an abstract if-expression. If <code>Clauses</code> is
-%% <code>[C1, ..., Cn]</code>, the result represents "<code>if
+%% @doc Creates an abstract if-expression. If `Clauses' is
+%% `[C1, ..., Cn]', the result represents "<code>if
 %% <em>C1</em>; ...; <em>Cn</em> end</code>". More exactly, if each
-%% <code>Ci</code> represents "<code>() <em>Gi</em> ->
+%% `Ci' represents "<code>() <em>Gi</em> ->
 %% <em>Bi</em></code>", then the result represents "<code>if
 %% <em>G1</em> -> <em>B1</em>; ...; <em>Gn</em> -> <em>Bn</em>
 %% end</code>".
@@ -5392,10 +4971,7 @@ revert_if_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec if_expr_clauses(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of clause subtrees of an <code>if_expr</code>
-%% node.
+%% @doc Returns the list of clause subtrees of an `if_expr' node.
 %%
 %% @see if_expr/1
 
@@ -5411,13 +4987,10 @@ if_expr_clauses(Node) ->
 
 
 %% =====================================================================
-%% @spec case_expr(Argument::syntaxTree(), Clauses::[syntaxTree()]) ->
-%%           syntaxTree()
-%%
-%% @doc Creates an abstract case-expression. If <code>Clauses</code> is
-%% <code>[C1, ..., Cn]</code>, the result represents "<code>case
+%% @doc Creates an abstract case-expression. If `Clauses' is
+%% `[C1, ..., Cn]', the result represents "<code>case
 %% <em>Argument</em> of <em>C1</em>; ...; <em>Cn</em> end</code>". More
-%% exactly, if each <code>Ci</code> represents "<code>(<em>Pi</em>)
+%% exactly, if each `Ci' represents "<code>(<em>Pi</em>)
 %% <em>Gi</em> -> <em>Bi</em></code>", then the result represents
 %% "<code>case <em>Argument</em> of <em>P1</em> <em>G1</em> ->
 %% <em>B1</em>; ...; <em>Pn</em> <em>Gn</em> -> <em>Bn</em> end</code>".
@@ -5461,9 +5034,7 @@ revert_case_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec case_expr_argument(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the argument subtree of a <code>case_expr</code> node.
+%% @doc Returns the argument subtree of a `case_expr' node.
 %%
 %% @see case_expr/2
 
@@ -5479,10 +5050,7 @@ case_expr_argument(Node) ->
 
 
 %% =====================================================================
-%% @spec case_expr_clauses(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of clause subtrees of a <code>case_expr</code>
-%% node.
+%% @doc Returns the list of clause subtrees of a `case_expr' node.
 %%
 %% @see case_expr/2
 
@@ -5498,12 +5066,10 @@ case_expr_clauses(Node) ->
 
 
 %% =====================================================================
-%% @spec cond_expr(Clauses::[syntaxTree()]) -> syntaxTree()
-%%
-%% @doc Creates an abstract cond-expression. If <code>Clauses</code> is
-%% <code>[C1, ..., Cn]</code>, the result represents "<code>cond
+%% @doc Creates an abstract cond-expression. If `Clauses' is
+%% `[C1, ..., Cn]', the result represents "<code>cond
 %% <em>C1</em>; ...; <em>Cn</em> end</code>". More exactly, if each
-%% <code>Ci</code> represents "<code>() <em>Ei</em> ->
+%% `Ci' represents "<code>() <em>Ei</em> ->
 %% <em>Bi</em></code>", then the result represents "<code>cond
 %% <em>E1</em> -> <em>B1</em>; ...; <em>En</em> -> <em>Bn</em>
 %% end</code>".
@@ -5538,10 +5104,7 @@ revert_cond_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec cond_expr_clauses(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of clause subtrees of a <code>cond_expr</code>
-%% node.
+%% @doc Returns the list of clause subtrees of a `cond_expr' node.
 %%
 %% @see cond_expr/1
 
@@ -5557,7 +5120,6 @@ cond_expr_clauses(Node) ->
 
 
 %% =====================================================================
-%% @spec receive_expr(Clauses) -> syntaxTree()
 %% @equiv receive_expr(Clauses, none, [])
 
 -spec receive_expr([syntaxTree()]) -> syntaxTree().
@@ -5567,25 +5129,21 @@ receive_expr(Clauses) ->
 
 
 %% =====================================================================
-%% @spec receive_expr(Clauses::[syntaxTree()], Timeout,
-%%                    Action::[syntaxTree()]) -> syntaxTree()
-%%	    Timeout = none | syntaxTree()
-%%
-%% @doc Creates an abstract receive-expression. If <code>Timeout</code>
-%% is <code>none</code>, the result represents "<code>receive
-%% <em>C1</em>; ...; <em>Cn</em> end</code>" (the <code>Action</code>
-%% argument is ignored). Otherwise, if <code>Clauses</code> is
-%% <code>[C1, ..., Cn]</code> and <code>Action</code> is <code>[A1, ...,
-%% Am]</code>, the result represents "<code>receive <em>C1</em>; ...;
+%% @doc Creates an abstract receive-expression. If `Timeout'
+%% is `none', the result represents "<code>receive
+%% <em>C1</em>; ...; <em>Cn</em> end</code>" (the `Action'
+%% argument is ignored). Otherwise, if `Clauses' is
+%% `[C1, ..., Cn]' and `Action' is `[A1, ...,
+%% Am]', the result represents "<code>receive <em>C1</em>; ...;
 %% <em>Cn</em> after <em>Timeout</em> -> <em>A1</em>, ..., <em>Am</em>
-%% end</code>". More exactly, if each <code>Ci</code> represents
+%% end</code>". More exactly, if each `Ci' represents
 %% "<code>(<em>Pi</em>) <em>Gi</em> -> <em>Bi</em></code>", then the
 %% result represents "<code>receive <em>P1</em> <em>G1</em> ->
 %% <em>B1</em>; ...; <em>Pn</em> <em>Gn</em> -> <em>Bn</em> ...
 %% end</code>".
 %%
-%% <p>Note that in Erlang, a receive-expression must have at least one
-%% clause if no timeout part is specified.</p>
+%% Note that in Erlang, a receive-expression must have at least one
+%% clause if no timeout part is specified.
 %%
 %% @see receive_expr_clauses/1
 %% @see receive_expr_timeout/1
@@ -5649,11 +5207,8 @@ revert_receive_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec receive_expr_clauses(syntaxTree()) -> [syntaxTree()]
-%%	     type(Node) = receive_expr
-%%
 %% @doc Returns the list of clause subtrees of a
-%% <code>receive_expr</code> node.
+%% `receive_expr' node.
 %%
 %% @see receive_expr/3
 
@@ -5671,15 +5226,12 @@ receive_expr_clauses(Node) ->
 
 
 %% =====================================================================
-%% @spec receive_expr_timeout(Node::syntaxTree()) -> Timeout
-%%	     Timeout = none | syntaxTree()
-%%
-%% @doc Returns the timeout subtree of a <code>receive_expr</code> node,
-%% if any. If <code>Node</code> represents "<code>receive <em>C1</em>;
-%% ...; <em>Cn</em> end</code>", <code>none</code> is returned.
-%% Otherwise, if <code>Node</code> represents "<code>receive
+%% @doc Returns the timeout subtree of a `receive_expr' node,
+%% if any. If `Node' represents "<code>receive <em>C1</em>;
+%% ...; <em>Cn</em> end</code>", `none' is returned.
+%% Otherwise, if `Node' represents "<code>receive
 %% <em>C1</em>; ...; <em>Cn</em> after <em>Timeout</em> -> ... end</code>",
-%% <code>Timeout</code> is returned.
+%% `Timeout' is returned.
 %%
 %% @see receive_expr/3
 
@@ -5697,10 +5249,8 @@ receive_expr_timeout(Node) ->
 
 
 %% =====================================================================
-%% @spec receive_expr_action(Node::syntaxTree()) -> [syntaxTree()]
-%%
 %% @doc Returns the list of action body subtrees of a
-%% <code>receive_expr</code> node. If <code>Node</code> represents
+%% `receive_expr' node. If `Node' represents
 %% "<code>receive <em>C1</em>; ...; <em>Cn</em> end</code>", this is the
 %% empty list.
 %%
@@ -5720,8 +5270,6 @@ receive_expr_action(Node) ->
 
 
 %% =====================================================================
-%% @spec try_expr(Body::syntaxTree(), Handlers::[syntaxTree()]) ->
-%%           syntaxTree()
 %% @equiv try_expr(Body, [], Handlers)
 
 -spec try_expr([syntaxTree()], [syntaxTree()]) -> syntaxTree().
@@ -5731,8 +5279,6 @@ try_expr(Body, Handlers) ->
 
 
 %% =====================================================================
-%% @spec try_expr(Body::syntaxTree(), Clauses::[syntaxTree()],
-%%           Handlers::[syntaxTree()]) -> syntaxTree()
 %% @equiv try_expr(Body, Clauses, Handlers, [])
 
 -spec try_expr([syntaxTree()], [syntaxTree()], [syntaxTree()]) -> syntaxTree().
@@ -5742,8 +5288,6 @@ try_expr(Body, Clauses, Handlers) ->
 
 
 %% =====================================================================
-%% @spec try_after_expr(Body::syntaxTree(), After::[syntaxTree()]) ->
-%%           syntaxTree()
 %% @equiv try_expr(Body, [], [], After)
 
 -spec try_after_expr([syntaxTree()], [syntaxTree()]) -> syntaxTree().
@@ -5753,30 +5297,26 @@ try_after_expr(Body, After) ->
 
 
 %% =====================================================================
-%% @spec try_expr(Body::[syntaxTree()], Clauses::[syntaxTree()],
-%%                Handlers::[syntaxTree()], After::[syntaxTree()]) ->
-%%           syntaxTree()
-%%
-%% @doc Creates an abstract try-expression. If <code>Body</code> is
-%% <code>[B1, ..., Bn]</code>, <code>Clauses</code> is <code>[C1, ...,
-%% Cj]</code>, <code>Handlers</code> is <code>[H1, ..., Hk]</code>, and
-%% <code>After</code> is <code>[A1, ..., Am]</code>, the result
+%% @doc Creates an abstract try-expression. If `Body' is
+%% `[B1, ..., Bn]', `Clauses' is `[C1, ...,
+%% Cj]', `Handlers' is `[H1, ..., Hk]', and
+%% `After' is `[A1, ..., Am]', the result
 %% represents "<code>try <em>B1</em>, ..., <em>Bn</em> of <em>C1</em>;
 %% ...; <em>Cj</em> catch <em>H1</em>; ...; <em>Hk</em> after
 %% <em>A1</em>, ..., <em>Am</em> end</code>". More exactly, if each
-%% <code>Ci</code> represents "<code>(<em>CPi</em>) <em>CGi</em> ->
-%% <em>CBi</em></code>", and each <code>Hi</code> represents
+%% `Ci' represents "<code>(<em>CPi</em>) <em>CGi</em> ->
+%% <em>CBi</em></code>", and each `Hi' represents
 %% "<code>(<em>HPi</em>) <em>HGi</em> -> <em>HBi</em></code>", then the
 %% result represents "<code>try <em>B1</em>, ..., <em>Bn</em> of
 %% <em>CP1</em> <em>CG1</em> -> <em>CB1</em>; ...; <em>CPj</em>
 %% <em>CGj</em> -> <em>CBj</em> catch <em>HP1</em> <em>HG1</em> ->
 %% <em>HB1</em>; ...; <em>HPk</em> <em>HGk</em> -> <em>HBk</em> after
-%% <em>A1</em>, ..., <em>Am</em> end</code>"; cf.
-%% <code>case_expr/2</code>. If <code>Clauses</code> is the empty list,
-%% the <code>of ...</code> section is left out. If <code>After</code> is
-%% the empty list, the <code>after ...</code> section is left out. If
-%% <code>Handlers</code> is the empty list, and <code>After</code> is
-%% nonempty, the <code>catch ...</code> section is left out.
+%% <em>A1</em>, ..., <em>Am</em> end</code>"; see
+%% {@link case_expr/2}. If `Clauses' is the empty list,
+%% the `of ...' section is left out. If `After' is
+%% the empty list, the `after ...' section is left out. If
+%% `Handlers' is the empty list, and `After' is
+%% nonempty, the `catch ...' section is left out.
 %%
 %% @see try_expr_body/1
 %% @see try_expr_clauses/1
@@ -5834,10 +5374,7 @@ revert_try_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec try_expr_body(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of body subtrees of a <code>try_expr</code>
-%% node.
+%% @doc Returns the list of body subtrees of a `try_expr' node.
 %%
 %% @see try_expr/4
 
@@ -5853,10 +5390,8 @@ try_expr_body(Node) ->
 
 
 %% =====================================================================
-%% @spec try_expr_clauses(Node::syntaxTree()) -> [syntaxTree()]
-%%
 %% @doc Returns the list of case-clause subtrees of a
-%% <code>try_expr</code> node. If <code>Node</code> represents
+%% `try_expr' node. If `Node' represents
 %% "<code>try <em>Body</em> catch <em>H1</em>; ...; <em>Hn</em>
 %% end</code>", the result is the empty list.
 %%
@@ -5874,10 +5409,8 @@ try_expr_clauses(Node) ->
 
 
 %% =====================================================================
-%% @spec try_expr_handlers(syntaxTree()) -> [syntaxTree()]
-%%
 %% @doc Returns the list of handler-clause subtrees of a
-%% <code>try_expr</code> node.
+%% `try_expr' node.
 %%
 %% @see try_expr/4
 
@@ -5893,10 +5426,7 @@ try_expr_handlers(Node) ->
 
 
 %% =====================================================================
-%% @spec try_expr_after(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of "after" subtrees of a <code>try_expr</code>
-%% node.
+%% @doc Returns the list of "after" subtrees of a `try_expr' node.
 %%
 %% @see try_expr/4
 
@@ -5912,9 +5442,6 @@ try_expr_after(Node) ->
 
 
 %% =====================================================================
-%% @spec class_qualifier(Class::syntaxTree(), Body::syntaxTree()) ->
-%%           syntaxTree()
-%%
 %% @doc Creates an abstract class qualifier. The result represents
 %% "<code><em>Class</em>:<em>Body</em></code>".
 %%
@@ -5937,10 +5464,8 @@ class_qualifier(Class, Body) ->
 
 
 %% =====================================================================
-%% @spec class_qualifier_argument(syntaxTree()) -> syntaxTree()
-%%
 %% @doc Returns the argument (the class) subtree of a
-%% <code>class_qualifier</code> node.
+%% `class_qualifier' node.
 %%
 %% @see class_qualifier/2
 
@@ -5951,9 +5476,7 @@ class_qualifier_argument(Node) ->
 
 
 %% =====================================================================
-%% @spec class_qualifier_body(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the body subtree of a <code>class_qualifier</code> node.
+%% @doc Returns the body subtree of a `class_qualifier' node.
 %%
 %% @see class_qualifier/2
 
@@ -5964,13 +5487,10 @@ class_qualifier_body(Node) ->
 
 
 %% =====================================================================
-%% @spec implicit_fun(Name::syntaxTree(), Arity::syntaxTree()) ->
-%%           syntaxTree()
-%%
 %% @doc Creates an abstract "implicit fun" expression. If
-%% <code>Arity</code> is <code>none</code>, this is equivalent to
-%% <code>implicit_fun(Name)</code>, otherwise it is equivalent to
-%% <code>implicit_fun(arity_qualifier(Name, Arity))</code>.
+%% `Arity' is `none', this is equivalent to
+%% `implicit_fun(Name)', otherwise it is equivalent to
+%% `implicit_fun(arity_qualifier(Name, Arity))'.
 %%
 %% (This is a utility function.)
 %%
@@ -5986,14 +5506,11 @@ implicit_fun(Name, Arity) ->
 
 
 %% =====================================================================
-%% @spec implicit_fun(Module::syntaxTree(), Name::syntaxTree(),
-%%                    Arity::syntaxTree()) -> syntaxTree()
-%%
 %% @doc Creates an abstract module-qualified "implicit fun" expression.
-%% If <code>Module</code> is <code>none</code>, this is equivalent to
-%% <code>implicit_fun(Name, Arity)</code>, otherwise it is equivalent to
-%% <code>implicit_fun(module_qualifier(Module, arity_qualifier(Name,
-%% Arity))</code>.
+%% If `Module' is `none', this is equivalent to
+%% `implicit_fun(Name, Arity)', otherwise it is equivalent to
+%% `implicit_fun(module_qualifier(Module, arity_qualifier(Name,
+%% Arity))'.
 %%
 %% (This is a utility function.)
 %%
@@ -6010,10 +5527,8 @@ implicit_fun(Module, Name, Arity) ->
 
 
 %% =====================================================================
-%% @spec implicit_fun(Name::syntaxTree()) -> syntaxTree()
-%%
 %% @doc Creates an abstract "implicit fun" expression. The result
-%% represents "<code>fun <em>Name</em></code>". <code>Name</code> should
+%% represents "<code>fun <em>Name</em></code>". `Name' should
 %% represent either <code><em>F</em>/<em>A</em></code> or
 %% <code><em>M</em>:<em>F</em>/<em>A</em></code>
 %%
@@ -6072,15 +5587,13 @@ revert_implicit_fun(Node) ->
 
 
 %% =====================================================================
-%% @spec implicit_fun_name(Node::syntaxTree()) -> syntaxTree()
+%% @doc Returns the name subtree of an `implicit_fun' node.
 %%
-%% @doc Returns the name subtree of an <code>implicit_fun</code> node.
-%%
-%% <p>Note: if <code>Node</code> represents "<code>fun
+%% Note: if `Node' represents "<code>fun
 %% <em>N</em>/<em>A</em></code>" or "<code>fun
 %% <em>M</em>:<em>N</em>/<em>A</em></code>", then the result is the
 %% subtree representing "<code><em>N</em>/<em>A</em></code>" or
-%% "<code><em>M</em>:<em>N</em>/<em>A</em></code>", respectively.</p>
+%% "<code><em>M</em>:<em>N</em>/<em>A</em></code>", respectively.
 %%
 %% @see implicit_fun/1
 %% @see arity_qualifier/2
@@ -6110,12 +5623,10 @@ implicit_fun_name(Node) ->
 
 
 %% =====================================================================
-%% @spec fun_expr(Clauses::[syntaxTree()]) -> syntaxTree()
-%%
-%% @doc Creates an abstract fun-expression. If <code>Clauses</code> is
-%% <code>[C1, ..., Cn]</code>, the result represents "<code>fun
+%% @doc Creates an abstract fun-expression. If `Clauses' is
+%% `[C1, ..., Cn]', the result represents "<code>fun
 %% <em>C1</em>; ...; <em>Cn</em> end</code>". More exactly, if each
-%% <code>Ci</code> represents "<code>(<em>Pi1</em>, ..., <em>Pim</em>)
+%% `Ci' represents "<code>(<em>Pi1</em>, ..., <em>Pim</em>)
 %% <em>Gi</em> -> <em>Bi</em></code>", then the result represents
 %% "<code>fun (<em>P11</em>, ..., <em>P1m</em>) <em>G1</em> ->
 %% <em>B1</em>; ...; (<em>Pn1</em>, ..., <em>Pnm</em>) <em>Gn</em> ->
@@ -6152,10 +5663,7 @@ revert_fun_expr(Node) ->
 
 
 %% =====================================================================
-%% @spec fun_expr_clauses(syntaxTree()) -> [syntaxTree()]
-%%
-%% @doc Returns the list of clause subtrees of a <code>fun_expr</code>
-%% node.
+%% @doc Returns the list of clause subtrees of a `fun_expr' node.
 %%
 %% @see fun_expr/1
 
@@ -6171,16 +5679,14 @@ fun_expr_clauses(Node) ->
 
 
 %% =====================================================================
-%% @spec fun_expr_arity(syntaxTree()) -> integer()
-%%
-%% @doc Returns the arity of a <code>fun_expr</code> node. The result is
+%% @doc Returns the arity of a `fun_expr' node. The result is
 %% the number of parameter patterns in the first clause of the
 %% fun-expression; subsequent clauses are ignored.
 %%
-%% <p>An exception is thrown if <code>fun_expr_clauses(Node)</code>
+%% An exception is thrown if `fun_expr_clauses(Node)'
 %% returns an empty list, or if the first element of that list is not a
-%% syntax tree <code>C</code> of type <code>clause</code> such that
-%% <code>clause_patterns(C)</code> is a nonempty list.</p>
+%% syntax tree `C' of type `clause' such that
+%% `clause_patterns(C)' is a nonempty list.
 %%
 %% @see fun_expr/1
 %% @see fun_expr_clauses/1
@@ -6194,8 +5700,6 @@ fun_expr_arity(Node) ->
 
 
 %% =====================================================================
-%% @spec parentheses(Body::syntaxTree()) -> syntaxTree()
-%%
 %% @doc Creates an abstract parenthesised expression. The result
 %% represents "<code>(<em>Body</em>)</code>", independently of the
 %% context.
@@ -6215,9 +5719,7 @@ revert_parentheses(Node) ->
 
 
 %% =====================================================================
-%% @spec parentheses_body(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the body subtree of a <code>parentheses</code> node.
+%% @doc Returns the body subtree of a `parentheses' node.
 %%
 %% @see parentheses/1
 
@@ -6228,7 +5730,6 @@ parentheses_body(Node) ->
 
 
 %% =====================================================================
-%% @spec macro(Name) -> syntaxTree()
 %% @equiv macro(Name, none)
 
 -spec macro(syntaxTree()) -> syntaxTree().
@@ -6238,25 +5739,22 @@ macro(Name) ->
 
 
 %% =====================================================================
-%% @spec macro(Name::syntaxTree(), Arguments) -> syntaxTree()
-%%	    Arguments = none | [syntaxTree()]
-%%
-%% @doc Creates an abstract macro application. If <code>Arguments</code>
-%% is <code>none</code>, the result represents
-%% "<code>?<em>Name</em></code>", otherwise, if <code>Arguments</code>
-%% is <code>[A1, ..., An]</code>, the result represents
+%% @doc Creates an abstract macro application. If `Arguments'
+%% is `none', the result represents
+%% "<code>?<em>Name</em></code>", otherwise, if `Arguments'
+%% is `[A1, ..., An]', the result represents
 %% "<code>?<em>Name</em>(<em>A1</em>, ..., <em>An</em>)</code>".
 %%
-%% <p>Notes: if <code>Arguments</code> is the empty list, the result
+%% Notes: if `Arguments' is the empty list, the result
 %% will thus represent "<code>?<em>Name</em>()</code>", including a pair
-%% of matching parentheses.</p>
+%% of matching parentheses.
 %%
-%% <p>The only syntactical limitation imposed by the preprocessor on the
+%% The only syntactical limitation imposed by the preprocessor on the
 %% arguments to a macro application (viewed as sequences of tokens) is
 %% that they must be balanced with respect to parentheses, brackets,
-%% <code>begin ... end</code>, <code>case ... end</code>, etc. The
-%% <code>text</code> node type can be used to represent arguments which
-%% are not regular Erlang constructs.</p>
+%% `begin ... end', `case ... end', etc. The
+%% `text' node type can be used to represent arguments which
+%% are not regular Erlang constructs.
 %%
 %% @see macro_name/1
 %% @see macro_arguments/1
@@ -6278,9 +5776,7 @@ macro(Name, Arguments) ->
 
 
 %% =====================================================================
-%% @spec macro_name(syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns the name subtree of a <code>macro</code> node.
+%% @doc Returns the name subtree of a `macro' node.
 %%
 %% @see macro/2
 
@@ -6291,14 +5787,12 @@ macro_name(Node) ->
 
 
 %% =====================================================================
-%% @spec macro_arguments(Node::syntaxTree()) -> none | [syntaxTree()]
-%%
-%% @doc Returns the list of argument subtrees of a <code>macro</code>
-%% node, if any. If <code>Node</code> represents
-%% "<code>?<em>Name</em></code>", <code>none</code> is returned.
-%% Otherwise, if <code>Node</code> represents
+%% @doc Returns the list of argument subtrees of a `macro'
+%% node, if any. If `Node' represents
+%% "<code>?<em>Name</em></code>", `none' is returned.
+%% Otherwise, if `Node' represents
 %% "<code>?<em>Name</em>(<em>A1</em>, ..., <em>An</em>)</code>",
-%% <code>[A1, ..., An]</code> is returned.
+%% `[A1, ..., An]' is returned.
 %%
 %% @see macro/2
 
@@ -6309,15 +5803,13 @@ macro_arguments(Node) ->
 
 
 %% =====================================================================
-%% @spec abstract(Term::term()) -> syntaxTree()
-%%
 %% @doc Returns the syntax tree corresponding to an Erlang term.
-%% <code>Term</code> must be a literal term, i.e., one that can be
+%% `Term' must be a literal term, i.e., one that can be
 %% represented as a source code literal. Thus, it may not contain a
 %% process identifier, port, reference, binary or function value as a
 %% subterm. The function recognises printable strings, in order to get a
 %% compact and readable representation. Evaluation fails with reason
-%% <code>badarg</code> if <code>Term</code> is not a literal term.
+%% `badarg' if `Term' is not a literal term.
 %%
 %% @see concrete/1
 %% @see is_literal/1
@@ -6367,19 +5859,17 @@ abstract_tail(H, T) ->
 
 
 %% =====================================================================
-%% @spec concrete(Node::syntaxTree()) -> term()
-%%
 %% @doc Returns the Erlang term represented by a syntax tree. Evaluation
-%% fails with reason <code>badarg</code> if <code>Node</code> does not
+%% fails with reason `badarg' if `Node' does not
 %% represent a literal term.
 %%
-%% <p>Note: Currently, the set of syntax trees which have a concrete
+%% Note: Currently, the set of syntax trees which have a concrete
 %% representation is larger than the set of trees which can be built
-%% using the function <code>abstract/1</code>. An abstract character
-%% will be concretised as an integer, while <code>abstract/1</code> does
+%% using the function {@link abstract/1}. An abstract character
+%% will be concretised as an integer, while {@link abstract/1} does
 %% not at present yield an abstract character for any input. (Use the
-%% <code>char/1</code> function to explicitly create an abstract
-%% character.)</p>
+%% {@link char/1} function to explicitly create an abstract
+%% character.)
 %%
 %% @see abstract/1
 %% @see is_literal/1
@@ -6422,7 +5912,7 @@ concrete(Node) ->
 					   {value, concrete(F), []}
 				   end, [], true),
 	    B;
-    	_ ->
+        _ ->
 	    erlang:error({badarg, Node})
     end.
 
@@ -6433,12 +5923,10 @@ concrete_list([]) ->
 
 
 %% =====================================================================
-%% @spec is_literal(Node::syntaxTree()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> represents a
-%% literal term, otherwise <code>false</code>. This function returns
-%% <code>true</code> if and only if the value of
-%% <code>concrete(Node)</code> is defined.
+%% @doc Returns `true' if `Node' represents a
+%% literal term, otherwise `false'. This function returns
+%% `true' if and only if the value of
+%% `concrete(Node)' is defined.
 %%
 %% @see abstract/1
 %% @see concrete/1
@@ -6469,21 +5957,19 @@ is_literal(T) ->
 
 
 %% =====================================================================
-%% @spec revert(Tree::syntaxTree()) -> syntaxTree()
-%%
-%% @doc Returns an <code>erl_parse</code>-compatible representation of a
-%% syntax tree, if possible. If <code>Tree</code> represents a
+%% @doc Returns an `erl_parse'-compatible representation of a
+%% syntax tree, if possible. If `Tree' represents a
 %% well-formed Erlang program or expression, the conversion should work
-%% without problems. Typically, <code>is_tree/1</code> yields
-%% <code>true</code> if conversion failed (i.e., the result is still an
-%% abstract syntax tree), and <code>false</code> otherwise.
+%% without problems. Typically, {@link is_tree/1} yields
+%% `true' if conversion failed (i.e., the result is still an
+%% abstract syntax tree), and `false' otherwise.
 %%
-%% <p>The <code>is_tree/1</code> test is not completely foolproof. For a
-%% few special node types (e.g. <code>arity_qualifier</code>), if such a
+%% The {@link is_tree/1} test is not completely foolproof. For a
+%% few special node types (e.g. `arity_qualifier'), if such a
 %% node occurs in a context where it is not expected, it will be left
 %% unchanged as a non-reverted subtree of the result. This can only
-%% happen if <code>Tree</code> does not actually represent legal Erlang
-%% code.</p>
+%% happen if `Tree' does not actually represent legal Erlang
+%% code.
 %%
 %% @see revert_forms/1
 %% @see //stdlib/erl_parse
@@ -6615,16 +6101,12 @@ revert_root(Node) ->
 
 
 %% =====================================================================
-%% @spec revert_forms(Forms) -> [erl_parse()]
-%%
-%%	    Forms = syntaxTree() | [syntaxTree()]
-%%
 %% @doc Reverts a sequence of Erlang source code forms. The sequence can
-%% be given either as a <code>form_list</code> syntax tree (possibly
+%% be given either as a `form_list' syntax tree (possibly
 %% nested), or as a list of "program form" syntax trees. If successful,
-%% the corresponding flat list of <code>erl_parse</code>-compatible
-%% syntax trees is returned (cf. <code>revert/1</code>). If some program
-%% form could not be reverted, <code>{error, Form}</code> is thrown.
+%% the corresponding flat list of `erl_parse'-compatible
+%% syntax trees is returned (see {@link revert/1}). If some program
+%% form could not be reverted, `{error, Form}' is thrown.
 %% Standalone comments in the form sequence are discarded.
 %%
 %% @see revert/1
@@ -6633,10 +6115,10 @@ revert_root(Node) ->
 
 -type forms() :: syntaxTree() | [syntaxTree()].
 
-%% -spec revert_forms(forms()) -> [erl_parse()].
+-spec revert_forms(forms()) -> [erl_parse()].
 
-revert_forms(L) when is_list(L) ->
-    revert_forms(form_list(L));
+revert_forms(Forms) when is_list(Forms) ->
+    revert_forms(form_list(Forms));
 revert_forms(T) ->
     case type(T) of
 	form_list ->
@@ -6673,60 +6155,54 @@ revert_forms_1([]) ->
 
 
 %% =====================================================================
-%% @spec subtrees(Node::syntaxTree()) -> [[syntaxTree()]]
-%%
 %% @doc Returns the grouped list of all subtrees of a syntax tree. If
-%% <code>Node</code> is a leaf node (cf. <code>is_leaf/1</code>), this
+%% `Node' is a leaf node (see {@link is_leaf/1}), this
 %% is the empty list, otherwise the result is always a nonempty list,
-%% containing the lists of subtrees of <code>Node</code>, in
+%% containing the lists of subtrees of `Node', in
 %% left-to-right order as they occur in the printed program text, and
 %% grouped by category. Often, each group contains only a single
 %% subtree.
 %%
-%% <p>Depending on the type of <code>Node</code>, the size of some
+%% Depending on the type of `Node', the size of some
 %% groups may be variable (e.g., the group consisting of all the
 %% elements of a tuple), while others always contain the same number of
 %% elements - usually exactly one (e.g., the group containing the
 %% argument expression of a case-expression). Note, however, that the
 %% exact structure of the returned list (for a given node type) should
 %% in general not be depended upon, since it might be subject to change
-%% without notice.</p>
+%% without notice.
 %%
-%% <p>The function <code>subtrees/1</code> and the constructor functions
-%% <code>make_tree/2</code> and <code>update_tree/2</code> can be a
+%% The function {@link subtrees/1} and the constructor functions
+%% {@link make_tree/2} and {@link update_tree/2} can be a
 %% great help if one wants to traverse a syntax tree, visiting all its
 %% subtrees, but treat nodes of the tree in a uniform way in most or all
 %% cases. Using these functions makes this simple, and also assures that
 %% your code is not overly sensitive to extensions of the syntax tree
 %% data type, because any node types not explicitly handled by your code
-%% can be left to a default case.</p>
+%% can be left to a default case.
 %%
-%% <p>For example:
-%% <pre>
-%%   postorder(F, Tree) ->
+%% For example:
+%% ```postorder(F, Tree) ->
 %%       F(case subtrees(Tree) of
 %%           [] -> Tree;
 %%           List -> update_tree(Tree,
 %%                               [[postorder(F, Subtree)
 %%                                 || Subtree &lt;- Group]
 %%                                || Group &lt;- List])
-%%         end).
-%% </pre>
-%% maps the function <code>F</code> on <code>Tree</code> and all its
+%%         end).'''
+%% maps the function `F' on `Tree' and all its
 %% subtrees, doing a post-order traversal of the syntax tree. (Note the
-%% use of <code>update_tree/2</code> to preserve node attributes.) For a
+%% use of {@link update_tree/2} to preserve node attributes.) For a
 %% simple function like:
-%% <pre>
-%%   f(Node) ->
+%% ```f(Node) ->
 %%       case type(Node) of
 %%           atom -> atom("a_" ++ atom_name(Node));
 %%           _ -> Node
-%%       end.
-%% </pre>
-%% the call <code>postorder(fun f/1, Tree)</code> will yield a new
-%% representation of <code>Tree</code> in which all atom names have been
+%%       end.'''
+%% the call `postorder(fun f/1, Tree)' will yield a new
+%% representation of `Tree' in which all atom names have been
 %% extended with the prefix "a_", but nothing else (including comments,
-%% annotations and line numbers) has been changed.</p>
+%% annotations and line numbers) has been changed.
 %%
 %% @see make_tree/2
 %% @see type/1
@@ -6896,12 +6372,9 @@ subtrees(T) ->
 
 
 %% =====================================================================
-%% @spec update_tree(Node::syntaxTree(), Groups::[[syntaxTree()]]) ->
-%%           syntaxTree()
-%%
 %% @doc Creates a syntax tree with the same type and attributes as the
-%% given tree. This is equivalent to <code>copy_attrs(Node,
-%% make_tree(type(Node), Groups))</code>.
+%% given tree. This is equivalent to `copy_attrs(Node,
+%% make_tree(type(Node), Groups))'.
 %%
 %% @see make_tree/2
 %% @see copy_attrs/2
@@ -6914,23 +6387,20 @@ update_tree(Node, Groups) ->
 
 
 %% =====================================================================
-%% @spec make_tree(Type::atom(), Groups::[[syntaxTree()]]) ->
-%%           syntaxTree()
-%%
 %% @doc Creates a syntax tree with the given type and subtrees.
-%% <code>Type</code> must be a node type name (cf. <code>type/1</code>)
-%% that does not denote a leaf node type (cf. <code>is_leaf/1</code>).
-%% <code>Groups</code> must be a <em>nonempty</em> list of groups of
+%% `Type' must be a node type name (see {@link type/1})
+%% that does not denote a leaf node type (see {@link is_leaf/1}).
+%% `Groups' must be a <em>nonempty</em> list of groups of
 %% syntax trees, representing the subtrees of a node of the given type,
 %% in left-to-right order as they would occur in the printed program
-%% text, grouped by category as done by <code>subtrees/1</code>.
+%% text, grouped by category as done by {@link subtrees/1}.
 %%
-%% <p>The result of <code>copy_attrs(Node, make_tree(type(Node),
-%% subtrees(Node)))</code> (cf. <code>update_tree/2</code>) represents
-%% the same source code text as the original <code>Node</code>, assuming
-%% that <code>subtrees(Node)</code> yields a nonempty list. However, it
+%% The result of `copy_attrs(Node, make_tree(type(Node),
+%% subtrees(Node)))' (see {@link update_tree/2}) represents
+%% the same source code text as the original `Node', assuming
+%% that `subtrees(Node)' yields a nonempty list. However, it
 %% does not necessarily have the same data representation as
-%% <code>Node</code>.</p>
+%% `Node'.
 %%
 %% @see update_tree/2
 %% @see subtrees/1
@@ -6995,42 +6465,40 @@ make_tree(tuple, [E]) -> tuple(E).
 
 
 %% =====================================================================
-%% @spec meta(Tree::syntaxTree()) -> syntaxTree()
-%%
 %% @doc Creates a meta-representation of a syntax tree. The result
 %% represents an Erlang expression "<code><em>MetaTree</em></code>"
 %% which, if evaluated, will yield a new syntax tree representing the
-%% same source code text as <code>Tree</code> (although the actual data
+%% same source code text as `Tree' (although the actual data
 %% representation may be different). The expression represented by
-%% <code>MetaTree</code> is <em>implementation independent</em> with
+%% `MetaTree' is <em>implementation independent</em> with
 %% regard to the data structures used by the abstract syntax tree
-%% implementation. Comments attached to nodes of <code>Tree</code> will
+%% implementation. Comments attached to nodes of `Tree' will
 %% be preserved, but other attributes are lost.
 %%
-%% <p>Any node in <code>Tree</code> whose node type is
-%% <code>variable</code> (cf. <code>type/1</code>), and whose list of
-%% annotations (cf. <code>get_ann/1</code>) contains the atom
-%% <code>meta_var</code>, will remain unchanged in the resulting tree,
-%% except that exactly one occurrence of <code>meta_var</code> is
-%% removed from its annotation list.</p>
+%% Any node in `Tree' whose node type is
+%% `variable' (see {@link type/1}), and whose list of
+%% annotations (see {@link get_ann/1}) contains the atom
+%% `meta_var', will remain unchanged in the resulting tree,
+%% except that exactly one occurrence of `meta_var' is
+%% removed from its annotation list.
 %%
-%% <p>The main use of the function <code>meta/1</code> is to transform a
-%% data structure <code>Tree</code>, which represents a piece of program
+%% The main use of the function `meta/1' is to transform a
+%% data structure `Tree', which represents a piece of program
 %% code, into a form that is <em>representation independent when
-%% printed</em>. E.g., suppose <code>Tree</code> represents a variable
-%% named "V". Then (assuming a function <code>print/1</code> for
-%% printing syntax trees), evaluating <code>print(abstract(Tree))</code>
-%% - simply using <code>abstract/1</code> to map the actual data
+%% printed</em>. E.g., suppose `Tree' represents a variable
+%% named "V". Then (assuming a function `print/1' for
+%% printing syntax trees), evaluating `print(abstract(Tree))'
+%% - simply using {@link abstract/1} to map the actual data
 %% structure onto a syntax tree representation - would output a string
-%% that might look something like "<code>{tree, variable, ..., "V",
-%% ...}</code>", which is obviously dependent on the implementation of
+%% that might look something like "`{tree, variable, ..., "V",
+%% ...}'", which is obviously dependent on the implementation of
 %% the abstract syntax trees. This could e.g. be useful for caching a
 %% syntax tree in a file. However, in some situations like in a program
 %% generator generator (with two "generator"), it may be unacceptable.
-%% Using <code>print(meta(Tree))</code> instead would output a
+%% Using `print(meta(Tree))' instead would output a
 %% <em>representation independent</em> syntax tree generating
 %% expression; in the above case, something like
-%% "<code>erl_syntax:variable("V")</code>".</p>
+%% "`erl_syntax:variable("V")'".
 %%
 %% @see abstract/1
 %% @see type/1
@@ -7161,60 +6629,56 @@ meta_call(F, As) ->
 
 
 %% =====================================================================
-%% @spec tree(Type) -> syntaxTree()
 %% @equiv tree(Type, [])
 
--spec tree(atom()) -> syntaxTree().
+-spec tree(atom()) -> #tree{}.
 
 tree(Type) ->
     tree(Type, []).
 
 %% =====================================================================
-%% @spec tree(Type::atom(), Data::term()) -> syntaxTree()
-%%
 %% @doc <em>For special purposes only</em>. Creates an abstract syntax
-%% tree node with type tag <code>Type</code> and associated data
-%% <code>Data</code>.
+%% tree node with type tag `Type' and associated data
+%% `Data'.
 %%
-%% <p>This function and the related <code>is_tree/1</code> and
-%% <code>data/1</code> provide a uniform way to extend the set of
-%% <code>erl_parse</code> node types. The associated data is any term,
-%% whose format may depend on the type tag.</p>
+%% This function and the related {@link is_tree/1} and
+%% {@link data/1} provide a uniform way to extend the set of
+%% `erl_parse' node types. The associated data is any term,
+%% whose format may depend on the type tag.
 %%
-%% <h4>Notes:</h4>
+%% === Notes: ===
 %% <ul>
 %%  <li>Any nodes created outside of this module must have type tags
 %%      distinct from those currently defined by this module; see
-%%      <code>type/1</code> for a complete list.</li>
+%%      {@link type/1} for a complete list.</li>
 %%  <li>The type tag of a syntax tree node may also be used
-%%      as a primary tag by the <code>erl_parse</code> representation;
+%%      as a primary tag by the `erl_parse' representation;
 %%      in that case, the selector functions for that node type
 %%      <em>must</em> handle both the abstract syntax tree and the
-%%      <code>erl_parse</code> form. The function <code>type(T)</code>
+%%      `erl_parse' form. The function `type(T)'
 %%      should return the correct type tag regardless of the
-%%      representation of <code>T</code>, so that the user sees no
-%%      difference between <code>erl_syntax</code> and
-%%      <code>erl_parse</code> nodes.</li>
+%%      representation of `T', so that the user sees no
+%%      difference between `erl_syntax' and
+%%      `erl_parse' nodes.</li>
 %% </ul>
+%%
 %% @see is_tree/1
 %% @see data/1
 %% @see type/1
 
--spec tree(atom(), term()) -> syntaxTree().
+-spec tree(atom(), term()) -> #tree{}.
 
 tree(Type, Data) ->
     #tree{type = Type, data = Data}.
 
 
 %% =====================================================================
-%% @spec is_tree(Tree::syntaxTree()) -> boolean()
-%%
-%% @doc <em>For special purposes only</em>. Returns <code>true</code> if
-%% <code>Tree</code> is an abstract syntax tree and <code>false</code>
+%% @doc <em>For special purposes only</em>. Returns `true' if
+%% `Tree' is an abstract syntax tree and `false'
 %% otherwise.
 %%
-%% <p><em>Note</em>: this function yields <code>false</code> for all
-%% "old-style" <code>erl_parse</code>-compatible "parse trees".</p>
+%% <em>Note</em>: this function yields `false' for all
+%% "old-style" `erl_parse'-compatible "parse trees".
 %%
 %% @see tree/2
 
@@ -7227,12 +6691,10 @@ is_tree(_) ->
 
 
 %% =====================================================================
-%% @spec data(Tree::syntaxTree()) -> term()
-%%
 %% @doc <em>For special purposes only</em>. Returns the associated data
 %% of a syntax tree node. Evaluation fails with reason
-%% <code>badarg</code> if <code>is_tree(Node)</code> does not yield
-%% <code>true</code>.
+%% `badarg' if `is_tree(Node)' does not yield
+%% `true'.
 %%
 %% @see tree/2
 
@@ -7248,26 +6710,19 @@ data(T) -> erlang:error({badarg, T}).
 
 
 %% =====================================================================
-%% @spec wrap(Node::erl_parse()) -> syntaxTree()
-%%
-%% @type erl_parse() = erl_parse:parse_tree(). The "parse tree"
-%% representation built by the Erlang standard library parser
-%% <code>erl_parse</code>. This is a subset of the
-%% <a href="#type-syntaxTree"><code>syntaxTree</code></a> type.
-%%
-%% @doc Creates a wrapper structure around an <code>erl_parse</code>
+%% @doc Creates a wrapper structure around an `erl_parse'
 %% "parse tree".
 %%
-%% <p>This function and the related <code>unwrap/1</code> and
-%% <code>is_wrapper/1</code> provide a uniform way to attach arbitrary
-%% information to an <code>erl_parse</code> tree. Some information about
+%% This function and the related {@link unwrap/1} and
+%% {@link is_wrapper/1} provide a uniform way to attach arbitrary
+%% information to an `erl_parse' tree. Some information about
 %% the encapsuled tree may be cached in the wrapper, such as the node
 %% type. All functions on syntax trees must behave so that the user sees
-%% no difference between wrapped and non-wrapped <code>erl_parse</code>
+%% no difference between wrapped and non-wrapped `erl_parse'
 %% trees. <em>Attaching a wrapper onto another wrapper structure is an
-%% error</em>.</p>
+%% error</em>.
 
-%%-spec wrap(erl_parse:parse_tree()) -> syntaxTree().
+-spec wrap(erl_parse()) -> #wrapper{}.
 
 wrap(Node) ->
     %% We assume that Node is an old-school `erl_parse' tree.
@@ -7276,24 +6731,20 @@ wrap(Node) ->
 
 
 %% =====================================================================
-%% @spec unwrap(Node::syntaxTree()) -> syntaxTree()
-%%
-%% @doc Removes any wrapper structure, if present. If <code>Node</code>
+%% @doc Removes any wrapper structure, if present. If `Node'
 %% is a wrapper structure, this function returns the wrapped
-%% <code>erl_parse</code> tree; otherwise it returns <code>Node</code>
+%% `erl_parse' tree; otherwise it returns `Node'
 %% itself.
 
--spec unwrap(syntaxTree()) -> syntaxTree().
+-spec unwrap(syntaxTree()) -> #tree{} | erl_parse().
 
 unwrap(#wrapper{tree = Node}) -> Node;
 unwrap(Node) -> Node.	 % This could also be a new-form node.
 
 
 %% =====================================================================
-%% @spec is_wrapper(Term::term()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if the argument is a wrapper
-%% structure, otherwise <code>false</code>.
+%% @doc Returns `true' if the argument is a wrapper
+%% structure, otherwise `false'.
 
 -ifndef(NO_UNUSED).
 -spec is_wrapper(term()) -> boolean().
diff --git a/lib/syntax_tools/src/erl_syntax_lib.erl b/lib/syntax_tools/src/erl_syntax_lib.erl
index 97dfbfd7cd..36cd35f15d 100644
--- a/lib/syntax_tools/src/erl_syntax_lib.erl
+++ b/lib/syntax_tools/src/erl_syntax_lib.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 1997-2006 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @end
 %% =====================================================================
 
diff --git a/lib/syntax_tools/src/erl_tidy.erl b/lib/syntax_tools/src/erl_tidy.erl
index 09efc9c392..59cf6c0a92 100644
--- a/lib/syntax_tools/src/erl_tidy.erl
+++ b/lib/syntax_tools/src/erl_tidy.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 1999-2006 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @end
 %% =====================================================================
 
diff --git a/lib/syntax_tools/src/igor.erl b/lib/syntax_tools/src/igor.erl
index aa933eb54b..37e561cbbe 100644
--- a/lib/syntax_tools/src/igor.erl
+++ b/lib/syntax_tools/src/igor.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 1998-2006 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @end
 %% =====================================================================
 
diff --git a/lib/syntax_tools/src/prettypr.erl b/lib/syntax_tools/src/prettypr.erl
index c13fa30998..1b5ba6b05a 100644
--- a/lib/syntax_tools/src/prettypr.erl
+++ b/lib/syntax_tools/src/prettypr.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 2000-2006 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @end
 %% =====================================================================
 
diff --git a/lib/syntax_tools/test/Makefile b/lib/syntax_tools/test/Makefile
index 3e31bdbd50..d4733b9a42 100644
--- a/lib/syntax_tools/test/Makefile
+++ b/lib/syntax_tools/test/Makefile
@@ -57,9 +57,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) syntax_tools.spec syntax_tools.cover $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) syntax_tools.spec syntax_tools.cover "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
 
 release_docs_spec:
diff --git a/lib/syntax_tools/vsn.mk b/lib/syntax_tools/vsn.mk
index 2b9a08e192..8f774c5d75 100644
--- a/lib/syntax_tools/vsn.mk
+++ b/lib/syntax_tools/vsn.mk
@@ -1 +1 @@
-SYNTAX_TOOLS_VSN = 1.6.8
+SYNTAX_TOOLS_VSN = 1.6.9
diff --git a/lib/test_server/doc/src/Makefile b/lib/test_server/doc/src/Makefile
index b32f3d3c59..8c7fa99886 100644
--- a/lib/test_server/doc/src/Makefile
+++ b/lib/test_server/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2002-2011. All Rights Reserved.
+# Copyright Ericsson AB 2002-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -119,16 +119,16 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6_FILES) $(RELEASE_PATH)/man/man6
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6_FILES) "$(RELEASE_PATH)/man/man6"
 
 release_spec:
 
diff --git a/lib/test_server/doc/src/notes.xml b/lib/test_server/doc/src/notes.xml
index 3701066e56..6a9add044a 100644
--- a/lib/test_server/doc/src/notes.xml
+++ b/lib/test_server/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,119 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Test_Server 3.5.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    test_server_h will now recognize info_reports written by
+	    ct connection handlers (according to the description in
+	    cth_conn_log) and ignore them as they will be completely
+	    handled by by ct_conn_log_h.</p>
+          <p>
+	    Earlier test_server_h would print a tag (testcase name)
+	    before forwarding the report to error_logger_tty_h. This
+	    would cause lots of tags in the log with no info report
+	    following (since error_logger_tty_h did not handle them).</p>
+          <p>
+	    Own Id: OTP-10571</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    Restore Config data if lost when test case fails.</p>
+          <p>
+	    Own Id: OTP-10070 Aux Id: kunagi-175 [86] </p>
+        </item>
+        <item>
+          <p>
+	    IO server error in test_server.</p>
+          <p>
+	    Own Id: OTP-10125 Aux Id: OTP-10101, kunagi-177 [88] </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Test_Server 3.5.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The documentation has been updated with the latest
+	    changes for the test_server_ctrl:report/2 function.</p>
+          <p>
+	    Own Id: OTP-10086 Aux Id: seq12066 </p>
+        </item>
+        <item>
+          <p>
+	    The ct:get_status/0 function failed to report status if a
+	    parallel test case group was running at the time of the
+	    call. This has been fixed and the return value for the
+	    function has been updated. Please see the ct reference
+	    manual for details.</p>
+          <p>
+	    Own Id: OTP-10172</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    It is now possible to sort the HTML tables by clicking on
+	    the header elements. In order to reset a sorted table,
+	    the browser window should simply be refreshed. This
+	    feature requires that the browser supports javascript,
+	    and has javascript execution enabled. If the 'ct_run
+	    -basic_html' flag is used, no javascript code is included
+	    in the generated HTML code.</p>
+          <p>
+	    Own Id: OTP-9896 Aux Id: seq12034, OTP-9835 </p>
+        </item>
+        <item>
+          <p>
+	    Verbosity levels for log printouts has been added. This
+	    makes it possible to specify preferred verbosity for
+	    different categories of log printouts, as well as general
+	    printouts (such as standard IO), to allow control over
+	    which strings get printed and which get ignored. New
+	    versions of the Common Test logging functions, ct:log,
+	    ct:pal and ct:print, have been introduced, with a new
+	    Importance argument added. The Importance value is
+	    compared to the verbosity level at runtime. More
+	    information can be found in the chapter about Logging in
+	    the Common Test User's Guide.</p>
+          <p>
+	    Own Id: OTP-10067 Aux Id: seq12050 </p>
+        </item>
+        <item>
+          <p>
+	    The Erlang/OTP test runner ts has been extended to allow
+	    cross compilation of test suites. To cross compile the
+	    test suites first follow the normal cross compilation
+	    procedures and release the tests on the build host. Then
+	    install ts using an xcomp specification file and compile
+	    test suites using ts:compile_testcases/0. For more
+	    details see $ERL_TOP/xcomp/README.md.</p>
+          <p>
+	    Own Id: OTP-10074</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Test_Server 3.5.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/test_server/doc/src/test_server.xml b/lib/test_server/doc/src/test_server.xml
index 5bfa42c36f..841cbfbe91 100644
--- a/lib/test_server/doc/src/test_server.xml
+++ b/lib/test_server/doc/src/test_server.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2007</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -529,6 +529,18 @@ Only valid for peer nodes. Note that slave nodes always
            analogy  with  <c>os:getenv/1</c>),  which  removes  the
            environment variable. Only valid for peer nodes. Not
            available on VxWorks.</item>
+	  <tag><c>{start_cover, false}</c></tag>
+	  <item>By default the test server will start cover on all nodes
+	   when the test is run with code coverage analysis. To make
+	   sure cover is not started on a new node, set this option to
+	   <c>false</c>. This can be necessary if the connection to
+	   the node at some point will be broken but the node is
+	   expected to stay alive. The reason is that a remote cover
+	   node can not continue to run without its main node. Another
+	   solution would be to explicitly stop cover on the node
+	   before breaking the connection, but in some situations (if
+	   old code resides in one or more processes) this is not
+	   possible.</item>
         </taglist>
       </desc>
     </func>
diff --git a/lib/test_server/doc/src/test_server_ctrl.xml b/lib/test_server/doc/src/test_server_ctrl.xml
index 9028a67ecb..41bc0bcc75 100644
--- a/lib/test_server/doc/src/test_server_ctrl.xml
+++ b/lib/test_server/doc/src/test_server_ctrl.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2007</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -769,11 +769,13 @@ Optional, if not given the test server controller node
         constantly updated. The following can be reported:
         </p>
         <p><c>What = tests_start, Data = {Name,NumCases}</c><br></br>
+	   <c>What = loginfo, Data = [{topdir,TestRootDir},{rundir,CurrLogDir}]</c><br></br>
 	   <c>What = tests_done, Data = {Ok,Failed,{UserSkipped,AutoSkipped}}</c><br></br>
-	   <c>What = tc_start, Data = {Mod,Func}</c><br></br>
+	   <c>What = tc_start, Data = {{Mod,Func},TCLogFile}</c><br></br>
 	   <c>What = tc_done, Data = {Mod,Func,Result}</c><br></br>
 	   <c>What = tc_user_skip, Data = {Mod,Func,Comment}</c><br></br>
-	   <c>What = tc_auto_skip, Data = {Mod,Func,Comment}</c></p>
+	   <c>What = tc_auto_skip, Data = {Mod,Func,Comment}</c><br></br>
+	   <c>What = framework_error, Data = {{FWMod,FWFunc},Error}</c></p>
       </desc>
     </func>
     <func>
diff --git a/lib/test_server/doc/src/ts.xml b/lib/test_server/doc/src/ts.xml
index f9b48d8372..4a2c536e96 100644
--- a/lib/test_server/doc/src/ts.xml
+++ b/lib/test_server/doc/src/ts.xml
@@ -85,8 +85,7 @@
     <p><c>ts:install/1</c> or <c>ts:install/2</c> is used if the
         target platform is different from the controller host, i.e. if
         you run on "remote target" or if special options are required
-        for your system. VxWorks is currently supported
-        as remote target platform.
+        for your system.
         </p>
       <p>See the reference manual for detailed information about
         <c>ts:install/0/1/2</c>.
@@ -249,9 +248,8 @@
         <p>Installs and configures the Test Server Framework for
           running test suites. If a remote host is to be used, the
           <c>TargetSystem</c> argument must be given so that "cross
-          installation" can be done. This should be used for testing on
-          VxWorks. Installation is required for any of the
-          functions in <c>ts</c> to work.
+		  installation" can be done. Installation is required for
+		  any of the functions in <c>ts</c> to work.
           </p>
         <p>Opts may be one or more of
           </p>
@@ -500,29 +498,6 @@ This option is mandatory for remote targets
       </desc>
     </func>
     <func>
-      <name>index() -> ok | {error, Reason}</name>
-      <fsummary>Updates local index page</fsummary>
-      <type>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>This function updates the local index page. This can be
-          useful if a previous test run was not completed and the index
-          is incomplete.</p>
-      </desc>
-    </func>
-    <func>
-      <name>clean() -> ok</name>
-      <name>clean(all) -> ok</name>
-      <fsummary>Cleans up the log directories created when running tests. </fsummary>
-      <desc>
-        <p>This function cleans up log directories created when
-          running test cases. <c>clean/0</c> cleans up all but the last
-          run of each application.  <c>clean/1</c> cleans up all test
-          runs found.</p>
-      </desc>
-    </func>
-    <func>
       <name>estone() -> ok | {error, Reason}</name>
       <name>estone(Opts) -> ok</name>
       <fsummary>Runs the EStone test</fsummary>
diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
index 4bc51873c2..20e7a5942c 100644
--- a/lib/test_server/src/Makefile
+++ b/lib/test_server/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2011. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -40,24 +40,24 @@ RELSYSDIR = $(RELEASE_PATH)/lib/test_server-$(VSN)
 # ----------------------------------------------------
 
 MODULES= test_server_ctrl \
+	 test_server_gl \
+	 test_server_io \
 	 test_server_node \
 	 test_server \
 	 test_server_sup \
 	 test_server_h \
-	 erl2html2 \
-	 vxworks_client
+	 erl2html2
 
 TS_MODULES= \
 	ts \
 	ts_run \
-	ts_reports \
 	ts_lib \
 	ts_make \
 	ts_erl_config \
 	ts_autoconf_win32 \
-        ts_autoconf_vxworks \
 	ts_install \
-	ts_install_cth
+	ts_install_cth \
+	ts_benchmark
 
 TARGET_MODULES= $(MODULES:%=$(EBIN)/%)
 TS_TARGET_MODULES= $(TS_MODULES:%=$(EBIN)/%)
@@ -124,22 +124,22 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELEASE_PATH)/test_server
+	$(INSTALL_DIR) "$(RELEASE_PATH)/test_server"
 	$(INSTALL_DATA) $(ERL_FILES) $(TS_ERL_FILES) \
 		$(HRL_FILES) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) \
 		$(TS_TARGET_FILES) \
 		$(AUTOCONF_FILES) $(C_FILES) $(COVER_FILES) $(CONFIG) \
-		$(RELEASE_PATH)/test_server
-	$(INSTALL_SCRIPT) $(PROGRAMS) $(RELEASE_PATH)/test_server
+		"$(RELEASE_PATH)/test_server"
+	$(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server"
 
 release_docs_spec:
 
diff --git a/lib/test_server/src/configure.in b/lib/test_server/src/configure.in
index 097853bcfc..785bab395c 100644
--- a/lib/test_server/src/configure.in
+++ b/lib/test_server/src/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script for Erlang.
 dnl
 dnl %CopyrightBegin%
 dnl 
-dnl Copyright Ericsson AB 1997-2011. All Rights Reserved.
+dnl Copyright Ericsson AB 1997-2012. All Rights Reserved.
 dnl 
 dnl The contents of this file are subject to the Erlang Public License,
 dnl Version 1.1, (the "License"); you may not use this file except in
@@ -108,7 +108,7 @@ AC_CHECK_HEADER(poll.h, AC_DEFINE(HAVE_POLL_H))
 # for the system.
 
 AC_MSG_CHECKING([system version (for dynamic loading)])
-system=`uname -s`-`uname -r`
+system=`./config.sub $host`
 AC_MSG_RESULT($system)
 
 # Step 2: check for existence of -ldl library.  This is needed because
@@ -119,10 +119,9 @@ AC_CHECK_LIB(dl, dlopen, have_dl=yes, have_dl=no)
 # Step 3: set configuration options based on system name and version.
 
 SHLIB_LDLIBS=
-
 fullSrcDir=`cd $srcdir; pwd`
 case $system in
-    Linux*)
+    *-linux-*)
 	SHLIB_CFLAGS="-fPIC"
 	SHLIB_SUFFIX=".so"
 	if test "$have_dl" = yes; then
@@ -136,7 +135,7 @@ case $system in
 	fi
 	SHLIB_EXTRACT_ALL=""
 	;;
-    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly*)
+    *-netbsd*|*-freebsd*|*-openbsd*|*-dragonfly*)
 	# Not available on all versions:  check for include file.
 	AC_CHECK_HEADER(dlfcn.h, [
 	    SHLIB_CFLAGS="-fpic"
@@ -153,28 +152,21 @@ case $system in
 	])
 	SHLIB_EXTRACT_ALL=""
 	;;
-    SunOS-4*)
-	SHLIB_CFLAGS="-PIC"
-	SHLIB_LD="ld"
-	SHLIB_LDFLAGS="$LDFLAGS"
-	SHLIB_SUFFIX=".so"
-	SHLIB_EXTRACT_ALL=""
-	;;
-    SunOS-5*|UNIX_SV-4.2*)
+    *-solaris2*|*-sysv4*)
 	SHLIB_CFLAGS="-KPIC"
 	SHLIB_LD="/usr/ccs/bin/ld"
 	SHLIB_LDFLAGS="$LDFLAGS -G -z text"
 	SHLIB_SUFFIX=".so"
 	SHLIB_EXTRACT_ALL="-z allextract"
 	;;
-    Darwin*)
+    *darwin*)
 	SHLIB_CFLAGS="-fno-common"
 	SHLIB_LD="cc"
 	SHLIB_LDFLAGS="$LDFLAGS -bundle -flat_namespace -undefined suppress"
 	SHLIB_SUFFIX=".so"
 	SHLIB_EXTRACT_ALL=""
 	;;
-    OSF1*)
+    *osf1*)
 	SHLIB_CFLAGS="-fPIC"
 	SHLIB_LD="ld"
 	SHLIB_LDFLAGS="$LDFLAGS -shared"
@@ -206,19 +198,19 @@ esac
 
 if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
 	case $system in
-	    AIX-*)
+	    *-aix)
 		;;
-	    BSD/OS*)
+	    *-bsd*)
 		;;
-	    IRIX*)
+	    *-irix)
 		;;
-	    NetBSD-*|FreeBSD-*|OpenBSD-*)
+	    *-netbsd|*-freebsd|*-openbsd)
 		;;
-	    RISCos-*)
+	    *-riscos)
 		;;
-	    ULTRIX-4.*)
+	    *ultrix4.*)
 		;;
-	    Darwin*)
+	    *darwin*)
 		;;
 	    *)
 		SHLIB_CFLAGS="-fPIC"
diff --git a/lib/test_server/src/erl2html2.erl b/lib/test_server/src/erl2html2.erl
index 6891e87e48..9c459c05d4 100644
--- a/lib/test_server/src/erl2html2.erl
+++ b/lib/test_server/src/erl2html2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -18,19 +18,9 @@
 %%
 
 %%%------------------------------------------------------------------
-%%% Purpose:Convert Erlang files to html. (Pretty faaast... :-)
+%%% Purpose:Convert Erlang files to html.
 %%%------------------------------------------------------------------
 
-%--------------------------------------------------------------------
-% Some stats (Sparc5@110Mhz):
-% 4109 lines (erl_parse.erl):              3.00 secs
-% 1847 lines (application_controller.erl): 0.57 secs
-% 3160 lines (test_server.erl):            1.00 secs
-% 1199 lines (ts_estone.erl):              0.35 secs
-%
-% Avg: ~4.5e-4s/line, or ~0.45s/1000 lines, or ~2200 lines/sec.
-%--------------------------------------------------------------------
-
 -module(erl2html2).
 -export([convert/2, convert/3]).
 
@@ -52,134 +42,141 @@ convert(File, Dest) ->
 	      "<body bgcolor=\"white\" text=\"black\""
 	      " link=\"blue\" vlink=\"purple\" alink=\"red\">\n"],
     convert(File, Dest, Header).
-    
+
+
 convert(File, Dest, Header) ->
-    case file:read_file(File) of
-	{ok, Bin} ->
-	    Code=binary_to_list(Bin),
-	    statistics(runtime),
-	    {Html1, Lines} = root(Code, [], 1),
-	    Html = [Header,
-		    "<pre>\n", Html1, "</pre>\n", 
-		    footer(Lines),"</body>\n</html>\n"],
-	    file:write_file(Dest, Html);
-	{error, Reason}  ->
-	    {error, Reason}
+    %% statistics(runtime),
+    case parse_file(File) of
+	{ok,Functions} ->
+	    %% {_, Time1} = statistics(runtime),
+	    %% io:format("Parsed file in ~.2f Seconds.~n",[Time1/1000]),
+	    case file:open(File,[raw,{read_ahead,10000}]) of
+		{ok,SFd} ->
+		    case file:open(Dest,[write,raw]) of
+			{ok,DFd} ->
+			    file:write(DFd,[Header,"<pre>\n"]),
+			    Lines = build_html(SFd,DFd,Functions),
+			    file:write(DFd,["</pre>\n",footer(),
+					    "</body>\n</html>\n"]),
+			    %% {_, Time2} = statistics(runtime),
+			    %% io:format("Converted ~p lines in ~.2f Seconds.~n",
+			    %% 	      [Lines, Time2/1000]),
+			    file:close(SFd),
+			    file:close(DFd),
+			    ok;
+			Error ->
+			    Error
+		    end;
+		Error ->
+		    Error
+	    end;
+	Error ->
+	    Error
     end.
 
-root([], Res, Line) ->
-    {Res, Line};
-root([Char0|Code], Res, Line0) ->
-    Char = [Char0],
-    case Char of
-	"-" ->
-	    {Match, Line1, NewCode0, AttName} = 
-		read_to_char(Line0+1, Code, [], [$(, $.]),
-	    {_, Line2, NewCode, Stuff} = read_to_char(Line1, NewCode0, [], $\n),
-	    NewRes = [Res,linenum(Line0),"-<b>",AttName,
-			 "</b>",Match, Stuff, "\n"],
-	    root(NewCode, NewRes, Line2);
-	"%" ->
-	    {_, Line, NewCode, Stuff} = read_to_char(Line0+1, Code, [], $\n),
-	    NewRes = [Res,linenum(Line0),"<i>%",Stuff,"</i>\n"],
-	    root(NewCode, NewRes, Line);
-	"\n" ->
-	    root(Code, [Res,linenum(Line0), "\n"], Line0+1);
-	" " ->
-	    {_, Line, NewCode, Stuff} = read_to_char(Line0+1, Code, [], $\n),
-	    root(NewCode, [Res,linenum(Line0)," ",Stuff, "\n"],
-		 Line);
-	"\t" ->
-	    {_, Line, NewCode, Stuff} = read_to_char(Line0+1, Code, [], $\n),
-	    root(NewCode, [Res,linenum(Line0),"\t",Stuff, "\n"],
-		 Line);
-	[Chr|_] when Chr>96, Chr<123 ->
-	    %% Assumed to be function/clause start.
-	    %% FIXME: This will trivially generate non-unique anchors
-	    %% (one for each clause) --- which is illegal HTML.
-	    {_, Line1, NewCode0, FName0} = read_to_char(Line0+1, Code, [], $(),
-	    {_, Line2, NewCode, Stuff} = 
-                read_to_char(Line1,NewCode0, [], $\n),
-	    FuncName = [[Chr],FName0],
-	    NewRes=[Res,"<a name=",FuncName,">",
-		    linenum(Line0),"<b>",FuncName,"</b></a>",
-		    "(",Stuff, "\n"],
-	    root(NewCode, NewRes, Line2);
-	Chr ->
-	    {_, Line, NewCode, Stuff} = read_to_char(Line0+1, Code, [], $\n),
-	    root(NewCode, [Res,linenum(Line0),Chr,Stuff, "\n"],
-		 Line)
+%%%-----------------------------------------------------------------
+%%% Parse the input file to get the line numbers for all function
+%%% definitions. This will be used when creating link targets for each
+%%% function in build_html/5.
+%%%
+%%% All function clauses are also marked in order to allow
+%%% possibly_enhance/2 to write these in bold.
+parse_file(File) ->
+    case epp:open(File, [], []) of
+	{ok,Epp} ->
+	    Forms = parse_file(Epp,File,false),
+	    epp:close(Epp),
+	    {ok,Forms};
+	{error,E} ->
+	    {error,E}
     end.
 
-read_to_char(Line0, [], Res, _Chr) ->
-    {nomatch, Line0, [], Res};
-read_to_char(Line0, [Char|Code], Res, Chr) ->
-    case Char of
-	Chr -> {Char, Line0, Code, Res};
-	_ when is_list(Chr) ->
-	    case lists:member(Char,Chr) of
-		true -> 
-		    {Char, Line0, Code, Res};
-		false -> 
-		    {Line,NewCode,NewRes} = maybe_convert(Line0,Code,Res,Char),
-		    read_to_char(Line, NewCode, NewRes, Chr)
+
+parse_file(Epp,File,InCorrectFile) ->
+    case epp:parse_erl_form(Epp) of
+	{ok,Form} ->
+	    case Form of
+		{attribute,_,file,{File,_}} ->
+		    parse_file(Epp,File,true);
+		{attribute,_,file,{_OtherFile,_}} ->
+		    parse_file(Epp,File,false);
+		{function,L,F,A,[_|C]} when InCorrectFile ->
+		    Clauses = [{clause,CL} || {clause,CL,_,_,_} <- C],
+		    [{atom_to_list(F),A,L} | Clauses] ++
+			parse_file(Epp,File,true);
+		_ ->
+		    parse_file(Epp,File,InCorrectFile)
 	    end;
-	_ ->
-	    {Line,NewCode,NewRes} = maybe_convert(Line0,Code,Res,Char),
-	    read_to_char(Line,NewCode, NewRes, Chr)
+	{error,_E} ->
+	    parse_file(Epp,File,InCorrectFile);
+	{eof,_Location} ->
+	    []
     end.
 
-maybe_convert(Line0,Code,Res,Chr) ->
-    case Chr of
-	%% Quoted stuff should not have the highlighting like normal code
-	%% FIXME: unbalanced quotes (e.g. in comments) will cause trouble with
-	%% highlighting and line numbering in the rest of the module.
-	$" ->  
-	    {_, Line1, NewCode, Stuff0} = read_to_char(Line0, Code, [], $"),
-            {Line2,Stuff} = add_linenumbers(Line1,lists:flatten(Stuff0),[]),
-	    {Line2,NewCode,[Res,$",Stuff,$"]};
-	%% These chars have meaning in HTML, and *must* *not* be
-	%% written as themselves.
-	$& ->
-	    {Line0, Code, [Res,"&amp;"]};
-	$< ->
-	    {Line0, Code, [Res,"&lt;"]};
-	$> ->
-	    {Line0, Code, [Res,"&gt;"]};
-	%% Everything else is simply copied.
-	OtherChr ->
-	    {Line0, Code, [Res,OtherChr]}
-    end.
+%%%-----------------------------------------------------------------
+%%% Add a link target for each line and one for each function definition.
+build_html(SFd,DFd,Functions) ->
+    build_html(SFd,DFd,file:read_line(SFd),1,Functions,false).
 
-add_linenumbers(Line,[Chr|Chrs],Res) ->
-    case Chr of
-	$\n -> add_linenumbers(Line+1,Chrs,[Res,$\n,linenum(Line)]);
-	_  -> add_linenumbers(Line,Chrs,[Res,Chr])
-    end;
-add_linenumbers(Line,[],Res) ->
-    {Line,Res}.
+build_html(SFd,DFd,{ok,Str},L,[{F,A,L}|Functions],_IsFuncDef) ->
+    FALink = http_uri:encode(F++"-"++integer_to_list(A)),
+    file:write(DFd,["<a name=\"",FALink,"\"/>"]),
+    build_html(SFd,DFd,{ok,Str},L,Functions,true);
+build_html(SFd,DFd,{ok,Str},L,[{clause,L}|Functions],_IsFuncDef) ->
+    build_html(SFd,DFd,{ok,Str},L,Functions,true);
+build_html(SFd,DFd,{ok,Str},L,Functions,IsFuncDef) ->
+    LStr = line_number(L),
+    Str1 = line(Str,IsFuncDef),
+    file:write(DFd,[LStr,Str1]),
+    build_html(SFd,DFd,file:read_line(SFd),L+1,Functions,false);
+build_html(_SFd,_DFd,eof,L,_Functions,_IsFuncDef) ->
+    L.
 
-%% Make nicely indented line numbers.
-linenum(Line) ->
-    Num = integer_to_list(Line),
-    A = case Line rem 10 of
-	    0 -> "<a name=\"" ++ Num ++"\"></a>";
-	    _ -> []
-	end,
+line_number(L) ->
+    LStr = integer_to_list(L),
     Pred =
-	case length(Num) of
+	case length(LStr) of
 	    Length when Length < 5 ->
 		lists:duplicate(5-Length,$\s);
 	    _ -> 
 		[]
 	end, 
-    [A,Pred,integer_to_list(Line),":"].
+    ["<a name=\"",LStr,"\"/>",Pred,LStr,": "].
+
+line(Str,IsFuncDef) ->
+    Str1 = htmlize(Str),
+    possibly_enhance(Str1,IsFuncDef).
+
+%%%-----------------------------------------------------------------
+%%% Substitute special characters that should not appear in HTML
+htmlize([$<|Str]) ->
+    [$&,$l,$t,$;|htmlize(Str)];
+htmlize([$>|Str]) ->
+    [$&,$g,$t,$;|htmlize(Str)];
+htmlize([$&|Str]) ->
+    [$&,$a,$m,$p,$;|htmlize(Str)];
+htmlize([$"|Str]) ->
+    [$&,$q,$u,$o,$t,$;|htmlize(Str)];
+htmlize([Ch|Str]) ->
+    [Ch|htmlize(Str)];
+htmlize([]) ->
+    [].
+
+%%%-----------------------------------------------------------------
+%%% Write comments in italic and function definitions in bold.
+possibly_enhance(Str,true) ->
+    case lists:splitwith(fun($() -> false; (_) -> true end, Str) of
+	{_,[]} -> Str;
+	{F,A} -> ["<b>",F,"</b>",A]
+    end;
+possibly_enhance([$%|_]=Str,_) ->
+    ["<i>",Str--"\n","</i>","\n"];
+possibly_enhance([$-|_]=Str,_) ->
+    possibly_enhance(Str,true);
+possibly_enhance(Str,false) ->
+    Str.
 
-footer(_Lines) ->
+%%%-----------------------------------------------------------------
+%%% End of the file
+footer() ->
     "".
-%%    {_, Time} = statistics(runtime),
-%%    io:format("Converted ~p lines in ~.2f Seconds.~n",
-%%	      [Lines, Time/1000]),
-%%    S = "<i>The transformation of this file (~p lines) took ~.2f seconds</i>",
-%%    F = lists:flatten(io_lib:format(S, [Lines, Time/1000])),
-%%    ["<hr size=1>",F,"<br>\n"].
diff --git a/lib/test_server/src/test_server.app.src b/lib/test_server/src/test_server.app.src
index faf7db835e..26330f9695 100644
--- a/lib/test_server/src/test_server.app.src
+++ b/lib/test_server/src/test_server.app.src
@@ -24,6 +24,7 @@
 	     test_server_ctrl,
 	     test_server,
 	     test_server_h,
+	     test_server_io,
 	     test_server_node,
 	     test_server_sup
 	    ]},
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 6e94e4861a..14cdfd391a 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -20,21 +20,19 @@
 
 -define(DEFAULT_TIMETRAP_SECS, 60).
 
-%%% START %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([start/1,start/2]).
-
 %%% TEST_SERVER_CTRL INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -export([run_test_case_apply/1,init_target_info/0,init_purify/0]).
--export([cover_compile/1,cover_analyse/2]).
+-export([cover_compile/1,cover_analyse/3]).
 
 %%% TEST_SERVER_SUP INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([get_loc/1]).
+-export([get_loc/1,set_tc_state/1]).
 
 %%% TEST SUITE INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -export([lookup_config/2]).
 -export([fail/0,fail/1,format/1,format/2,format/3]).
 -export([capture_start/0,capture_stop/0,capture_get/0]).
 -export([messages_get/0]).
+-export([permit_io/2]).
 -export([hours/1,minutes/1,seconds/1,sleep/1,adjusted_sleep/1,timecall/3]).
 -export([timetrap_scale_factor/0,timetrap/1,get_timetrap_info/0,
 	 timetrap_cancel/1,timetrap_cancel/0]).
@@ -49,7 +47,7 @@
 -export([run_on_shielded_node/2]).
 -export([is_cover/0,is_debug/0,is_commercial/0]).
 
--export([break/1,continue/0]).
+-export([break/1,break/2,break/3,continue/0,continue/1]).
 
 %%% DEBUGGER INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -export([purify_new_leaks/0, purify_format/2, purify_new_fds_inuse/0,
@@ -59,49 +57,11 @@
 -export([]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--record(state,{controller,jobs=[]}).
-
 -include("test_server_internal.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -define(pl2a(M), test_server_sup:package_atom(M)).
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% **** START *** CODE FOR REMOTE TARGET ONLY ***
-%%
-%% test_server
-%% This process is started only if the test is to be run on a remote target
-%% The process is then started on target
-%% A socket connection is established with the test_server_ctrl process
-%% on host, and information about target is sent to host.
-start([ControllerHost]) when is_atom(ControllerHost) ->
-    start(atom_to_list(ControllerHost));
-start(ControllerHost) when is_list(ControllerHost) ->
-    start(ControllerHost,?MAIN_PORT).
-start(ControllerHost,ControllerPort) ->
-    S = self(),
-    Pid = spawn(fun() -> init(ControllerHost,ControllerPort,S) end),
-    receive {Pid,started} -> {ok,Pid};
-	    {Pid,Error} -> Error
-    end.
-
-init(Host,Port,Starter) ->
-    global:register_name(?MODULE,self()),
-    process_flag(trap_exit,true),
-    test_server_sup:cleanup_crash_dumps(),
-    case gen_tcp:connect(Host,Port, [binary,
-				     {reuseaddr,true},
-				     {packet,2}]) of
-	{ok,MainSock} ->
-	    Starter ! {self(),started},
-	    request(MainSock,{target_info,init_target_info()}),
-	    loop(#state{controller={Host,MainSock}});
-	Error ->
-	    Starter ! {self(),{error,
-			       {could_not_contact_controller,Error}}}
-    end.
-
 init_target_info() ->
     [$.|Emu] = code:objfile_extension(),
     {_, OTPRel} = init:script_id(),
@@ -117,171 +77,10 @@ init_target_info() ->
 		 username=test_server_sup:get_username(),
 		 cookie=atom_to_list(erlang:get_cookie())}.
 
-
-loop(#state{controller={_,MainSock}} = State) ->
-    receive
-	{tcp, MainSock, <<1,Request/binary>>} ->
-	    State1 = decode_main(binary_to_term(Request),State),
-	    loop(State1);
-	{tcp_closed, MainSock} ->
-	    gen_tcp:close(MainSock),
-	    halt();
-	{'EXIT',Pid,Reason} ->
-	    case lists:keysearch(Pid,1,State#state.jobs) of
-		{value,{Pid,Name}} ->
-		    case Reason of
-			normal -> ignore;
-			_other -> request(MainSock,{job_proc_killed,Name,Reason})
-		    end,
-		    NewJobs = lists:keydelete(Pid,1,State#state.jobs),
-		    loop(State#state{jobs = NewJobs});
-		false ->
-		    loop(State)
-	    end
-    end.
-
-%% Decode request on main socket
-decode_main({job,Port,Name},#state{controller={Host,_},jobs=Jobs}=State) ->
-    S = self(),
-    NewJob = spawn_link(fun() -> job(Host,Port,S) end),
-    receive {NewJob,started} -> State#state{jobs=[{NewJob,Name}|Jobs]};
-	    {NewJob,_Error} -> State
-    end.
-
 init_purify() ->
     purify_new_leaks().
 
 
-%% Temporary job process on target
-%% This process will live while all test cases in the job are executed.
-%% A socket connection is established with the job process on host.
-job(Host,Port,Starter) ->
-    process_flag(trap_exit,true),
-    init_purify(),
-    case gen_tcp:connect(Host,Port, [binary,
-				     {reuseaddr,true},
-				     {packet,4},
-				     {active,false}]) of
-	{ok,JobSock} ->
-	    Starter ! {self(),started},
-	    job(JobSock);
-	Error ->
-	    Starter ! {self(),{error,
-			       {could_not_contact_controller,Error}}}
-    end.
-
-job(JobSock) ->
-    JobDir = get_jobdir(),
-    ok = file:make_dir(JobDir),
-    ok = file:make_dir(filename:join(JobDir,?priv_dir)),
-    put(test_server_job_sock,JobSock),
-    put(test_server_job_dir,JobDir),
-    {ok,Cwd} = file:get_cwd(),
-    job_loop(JobSock),
-    ok = file:set_cwd(Cwd),
-    send_privdir(JobDir,JobSock), % also recursively removes jobdir
-    ok.
-
-
-get_jobdir() ->
-    Now = now(),
-    {{Y,M,D},{H,Mi,S}} = calendar:now_to_local_time(Now),
-    Basename = io_lib:format("~w-~2.2.0w-~2.2.0w_~2.2.0w.~2.2.0w.~2.2.0w_~w",
-			     [Y,M,D,H,Mi,S,element(3,Now)]),
-    %% if target has a file master, don't use prim_file to look up cwd
-    case lists:keymember(master,1,init:get_arguments()) of
-	true ->
-	    {ok,Cwd} = file:get_cwd(),
-	    Cwd ++ "/" ++ Basename;
-	false ->
-	    filename:absname(Basename)
-    end.
-
-send_privdir(JobDir,JobSock) ->
-    LocalPrivDir = filename:join(JobDir,?priv_dir),
-    case file:list_dir(LocalPrivDir) of
-	{ok,List} when List/=[] ->
-	    Tarfile0 = ?priv_dir ++ ".tar.gz",
-	    Tarfile = filename:join(JobDir,Tarfile0),
-	    {ok,Tar} = erl_tar:open(Tarfile,[write,compressed,cooked]),
-	    ok = erl_tar:add(Tar,LocalPrivDir,?priv_dir,[]),
-	    ok = erl_tar:close(Tar),
-	    {ok,TarBin} = file:read_file(Tarfile),
-	    file:delete(Tarfile),
-	    ok = del_dir(JobDir),
-	    request(JobSock,{{privdir,Tarfile0},TarBin});
-	_ ->
-	    ok = del_dir(JobDir),
-	    request(JobSock,{privdir,empty_priv_dir})
-    end.
-
-del_dir(Dir) ->
-    case file:read_file_info(Dir) of
-	{ok,#file_info{type=directory}} ->
-	    {ok,Cont} = file:list_dir(Dir),
-	    lists:foreach(fun(F) -> del_dir(filename:join(Dir,F)) end, Cont),
-	    ok = file:del_dir(Dir);
-	{ok,#file_info{}} ->
-	    ok = file:delete(Dir);
-	_r ->
-	    %% This might be a symlink - let's try to delete it!
-	    catch file:delete(Dir),
-	    ok
-    end.
-
-%%
-%% Receive and decode request on job socket
-%%
-job_loop(JobSock) ->
-    Request = recv(JobSock),
-    case decode_job(Request) of
-	ok -> job_loop(JobSock);
-	{stop,R} -> R
-    end.
-
-decode_job({{beam,Mod,Which},Beam}) ->
-    % FIXME, shared directory structure on host and target required,
-    % "Library beams" are not loaded from HOST... /Patrik
-    code:add_patha(filename:dirname(Which)),
-    % End of Patriks uglyness...
-    {module,Mod} = code:load_binary(Mod,Which,Beam),
-    ok;
-decode_job({{datadir,Tarfile0},Archive}) ->
-    JobDir = get(test_server_job_dir),
-    Tarfile = filename:join(JobDir,Tarfile0),
-    ok = file:write_file(Tarfile,Archive),
-    % Cooked is temporary removed/broken
-    % ok = erl_tar:extract(Tarfile,[compressed,{cwd,JobDir},cooked]),
-    ok = erl_tar:extract(Tarfile,[compressed,{cwd,JobDir}]),
-    ok = file:delete(Tarfile),
-    ok;
-decode_job({test_case,Case}) ->
-    Result = run_test_case_apply(Case),
-    JobSock = get(test_server_job_sock),
-    request(JobSock,{test_case_result,Result}),
-    case test_server_sup:tar_crash_dumps() of
-	{error,no_crash_dumps} -> request(JobSock,{crash_dumps,no_crash_dumps});
-	{ok,TarFile} ->
-	    {ok,TarBin} = file:read_file(TarFile),
-	    file:delete(TarFile),
-	    request(JobSock,{{crash_dumps,filename:basename(TarFile)},TarBin})
-    end,
-    ok;
-decode_job({sync_apply,{M,F,A}}) ->
-    R = apply(M,F,A),
-    request(get(test_server_job_sock),{sync_result,R}),
-    ok;
-decode_job(job_done) ->
-    {stop,stopped}.
-
-%%
-%% **** STOP *** CODE FOR REMOTE TARGET ONLY ***
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% cover_compile({App,Include,Exclude,Cross}) ->
 %%                                          {ok,AnalyseModules} | {error,Reason}
@@ -376,9 +175,7 @@ module_names(Beams) ->
 do_cover_compile(Modules) ->
     do_cover_compile1(lists:usort(Modules)). % remove duplicates
 
-do_cover_compile1([Dont|Rest]) when Dont=:=cover;
-				    Dont=:=test_server;
-				    Dont=:=test_server_ctrl ->
+do_cover_compile1([Dont|Rest]) when Dont=:=cover ->
     do_cover_compile1(Rest);
 do_cover_compile1([M|Rest]) ->
     case {code:is_sticky(M),code:is_loaded(M)} of
@@ -415,7 +212,7 @@ do_cover_compile1([]) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% cover_analyse(Analyse,Modules) -> [{M,{Cov,NotCov,Details}}]
+%% cover_analyse(Analyse,Modules,Stop) -> [{M,{Cov,NotCov,Details}}]
 %%
 %% Analyse = {details,Dir} | details | {overview,void()} | overview
 %% Modules = [atom()], the modules to analyse
@@ -431,8 +228,19 @@ do_cover_compile1([]) ->
 %%
 %% Also, if a Dir exists, cover data will be exported to a file called
 %% all.coverdata in that directory.
-cover_analyse(Analyse,Modules) ->
-    io:fwrite("Cover analysing...\n",[]),
+%%
+%% Finally, if Stop==true, then cover will be stopped after the
+%% analysis is completed. Stopping cover causes the original (non
+%% cover compiled) modules to be loaded back in. If a process at this
+%% point is still running old code of any of the cover compiled
+%% modules, meaning that is has not done any fully qualified function
+%% call after the cover compilation, the process will now be
+%% killed. To avoid this scenario, it is possible to set Stop=false,
+%% which means that the modules will stay cover compiled. Note that
+%% this is only recommended if the erlang node is being terminated
+%% after the test is completed.
+cover_analyse(Analyse,Modules,Stop) ->
+    print(stdout, "Cover analysing...\n", []),
     DetailsFun =
 	case Analyse of
 	    {details,Dir} ->
@@ -482,9 +290,15 @@ cover_analyse(Analyse,Modules) ->
 			  {M,Err}
 		  end
 	  end, Modules),
-    Sticky = unstick_all_sticky(node()),
-    cover:stop(),
-    stick_all_sticky(node(),Sticky),
+
+    case Stop of
+	true ->
+	    Sticky = unstick_all_sticky(node()),
+	    cover:stop(),
+	    stick_all_sticky(node(),Sticky);
+	false ->
+	    ok
+    end,
     R.
 
 pmap(Fun,List) ->
@@ -501,7 +315,20 @@ pmap(Fun,List) ->
 		      end
 	      end, Pids).
 
+
+do_cover_for_node(Node,CoverFunc) ->
+    %% In case a slave node is starting another slave node! I.e. this
+    %% function is executed on a slave node - then the cover function
+    %% must be executed on the master node. This is for instance the
+    %% case in test_server's own tests.
+    MainCoverNode = cover:get_main_node(),
+    Sticky = unstick_all_sticky(MainCoverNode,Node),
+    rpc:call(MainCoverNode,cover,CoverFunc,[Node]),
+    stick_all_sticky(Node,Sticky).
+
 unstick_all_sticky(Node) ->
+    unstick_all_sticky(node(),Node).
+unstick_all_sticky(MainCoverNode,Node) ->
     lists:filter(
       fun(M) ->
 	      case code:is_sticky(M) of
@@ -512,7 +339,7 @@ unstick_all_sticky(Node) ->
 		      false
 	      end
       end,
-      cover:modules()).
+      rpc:call(MainCoverNode,cover,modules,[])).
 
 stick_all_sticky(Node,Sticky) ->
     lists:foreach(
@@ -537,7 +364,6 @@ stick_all_sticky(Node,Sticky) ->
 %% it possible to capture all it's output from io:format/2, etc.
 %%
 %% The job process then sits down and waits for news from the case process.
-%% This might be io requests (which are redirected to the log files).
 %%
 %% Returns a tuple with the time spent (in seconds) in the test case,
 %% the return value from the test case or an {'EXIT',Reason} if the case
@@ -559,7 +385,8 @@ stick_all_sticky(Node,Sticky) ->
 %% compensate timetraps for runtime delays introduced by e.g. tools like
 %% cover.
 
-run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,TimetrapData}) ->
+run_test_case_apply({CaseNum,Mod,Func,Args,Name,
+		     RunInit,TimetrapData}) ->
     purify_format("Test case #~w ~w:~w/1", [CaseNum, Mod, Func]),
     case os:getenv("TS_RUN_VALGRIND") of
 	false ->
@@ -570,38 +397,30 @@ run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,TimetrapData}) ->
     end,
     test_server_h:testcase({Mod,Func,1}),
     ProcBef = erlang:system_info(process_count),
-    Result = run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData),
+    Result = run_test_case_apply(Mod, Func, Args, Name, RunInit,
+				 TimetrapData),
     ProcAft = erlang:system_info(process_count),
     purify_new_leaks(),
     DetFail = get(test_server_detected_fail),
     {Result,DetFail,ProcBef,ProcAft}.
 
+-type tc_status() :: 'starting' | 'running' | 'init_per_testcase' |
+		     'end_per_testcase' | {'framework',atom(),atom()} |
+		     'tc'.
+-record(st,
+	{
+	  ref :: reference(),
+	  pid :: pid(),
+	  mf :: {atom(),atom()},
+	  status :: tc_status() | 'undefined',
+	  ret_val :: term(),
+	  comment :: list(char()),
+	  timeout :: non_neg_integer() | 'infinity',
+	  config :: list() | 'undefined',
+	  end_conf_pid :: pid() | 'undefined'
+	}).
+
 run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
-    case get(test_server_job_dir) of
-	undefined ->
-	    %% i'm a local target
-	    do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData);
-	JobDir ->
-	    %% i'm a remote target
-	    case Args of
-		[Config] when is_list(Config) ->
-		    {value,{data_dir,HostDataDir}} =
-			lists:keysearch(data_dir, 1, Config),
-		    DataBase = filename:basename(HostDataDir),
-		    TargetDataDir = filename:join(JobDir, DataBase),
-		    Config1 = lists:keyreplace(data_dir, 1, Config,
-					       {data_dir,TargetDataDir}),
-		    TargetPrivDir = filename:join(JobDir, ?priv_dir),
-		    Config2 = lists:keyreplace(priv_dir, 1, Config1,
-					       {priv_dir,TargetPrivDir}),
-		    do_run_test_case_apply(Mod, Func, [Config2], Name, RunInit,
-					   TimetrapData);
-		_other ->
-		    do_run_test_case_apply(Mod, Func, Args, Name, RunInit,
-					   TimetrapData)
-	    end
-    end.
-do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
     {ok,Cwd} = file:get_cwd(),
     Args2Print = case Args of
 		     [Args1] when is_list(Args1) ->
@@ -616,9 +435,6 @@ do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
     TCCallback = get(test_server_testcase_callback),
     LogOpts = get(test_server_logopts),
     Ref = make_ref(),
-    OldGLeader = group_leader(),
-    %% Set ourself to group leader for the spawned process
-    group_leader(self(),self()),
     Pid =
 	spawn_link(
 	  fun() ->
@@ -626,9 +442,10 @@ do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
 				     RunInit, TimetrapData,
 				     LogOpts, TCCallback)
 	  end),
-    group_leader(OldGLeader, self()),
     put(test_server_detected_fail, []),
-    run_test_case_msgloop(Ref, Pid, false, false, "", undefined, starting).
+    St = #st{ref=Ref,pid=Pid,mf={Mod,Func},status=starting,ret_val=[],
+	     comment="",timeout=infinity,config=hd(Args)},
+    run_test_case_msgloop(St).
 
 %% Ugly bug (pre R5A):
 %% If this process (group leader of the test case) terminates before
@@ -639,32 +456,23 @@ do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
 %% A test case is known to have failed if it returns {'EXIT', _} tuple,
 %% or sends a message {failed, File, Line} to it's group_leader
 %%
-run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
-		      Comment, CurrConf, Status) ->
-    %% NOTE: Keep job_proxy_msgloop/0 up to date when changes
-    %%       are made in this function!
-    {Timeout,ReturnValue} =
-	case Terminate of
-	    {true, ReturnVal} ->
-		%% stop any timetrap timers for the test case
-		%% that have been started by this process
-		timetrap_cancel_all(Pid, false),
-		{20, ReturnVal};
-	    false ->
-		{infinity, should_never_appear}
-	end,
+run_test_case_msgloop(#st{ref=Ref,pid=Pid,end_conf_pid=EndConfPid0}=St0) ->
     receive
-	{test_case_initialized,Pid} ->
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,running);
-	Abort = {abort_current_testcase,_,_} when Status == starting ->
+	{set_tc_state=Tag,From,{Status,Config0}} ->
+	    Config = case Config0 of
+			 unknown -> St0#st.config;
+			 _ -> Config0
+		     end,
+	    St = St0#st{status=Status,config=Config},
+	    From ! {self(),Tag,ok},
+	    run_test_case_msgloop(St);
+	{abort_current_testcase,_,_}=Abort when St0#st.status =:= starting ->
 	    %% we're in init phase, must must postpone this operation
 	    %% until test case execution is in progress (or FW:init_tc
 	    %% gets killed)
 	    self() ! Abort,
 	    erlang:yield(),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(St0);
 	{abort_current_testcase,Reason,From} ->
 	    Line = case is_process_alive(Pid) of
 		       true -> get_loc(Pid);
@@ -674,130 +482,49 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 	    exit(Pid,{testcase_aborted,Reason,Line}),
 	    erlang:yield(),
 	    From ! {self(),abort_current_testcase,ok},
-	    NewComment =
-		receive
-		    {'DOWN', Mon, process, Pid, _} ->
-			Comment
-		    after 10000 ->
-			    %% Pid is probably trapping exits, hit it harder...
-			    exit(Pid, kill),
-			    %% here's the only place we know Reason, so we save
-			    %% it as a comment, potentially replacing user data
-			    Error = lists:flatten(io_lib:format("Aborted: ~p",
-								[Reason])),
-			    Error1 = lists:flatten([string:strip(S,left) ||
+	    St = receive
+		     {'DOWN', Mon, process, Pid, _} ->
+			 St0
+		 after 10000 ->
+			 %% Pid is probably trapping exits, hit it harder...
+			 exit(Pid, kill),
+			 %% here's the only place we know Reason, so we save
+			 %% it as a comment, potentially replacing user data
+			 Error = lists:flatten(io_lib:format("Aborted: ~p",
+							     [Reason])),
+			 Error1 = lists:flatten([string:strip(S,left) ||
 						    S <- string:tokens(Error,
 								       [$\n])]),
-			    if length(Error1) > 63 ->
-				    string:substr(Error1,1,60) ++ "...";
-			       true ->
-				    Error1
-			    end
-		    end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  NewComment,CurrConf,Status);
-        {io_request,From,ReplyAs,{put_chars,io_lib,Func,[Format,Args]}}
-	when is_list(Format) ->
-	    Msg = (catch io_lib:Func(Format,Args)),
-	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-        {io_request,From,ReplyAs,{put_chars,io_lib,Func,[Format,Args]}}
-	when is_atom(Format) ->
-	    Msg = (catch io_lib:Func(Format,Args)),
-	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-        {io_request,From,ReplyAs,{put_chars,Bytes}} ->
-	    run_test_case_msgloop_io(
-	      ReplyAs,CaptureStdout,Bytes,From,put_chars),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-        {io_request,From,ReplyAs,{put_chars,unicode,io_lib,Func,[Format,Args]}}
-	when is_list(Format) ->
-	    Msg = unicode_to_latin1(catch io_lib:Func(Format,Args)),
-	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-        {io_request,From,ReplyAs,{put_chars,latin1,io_lib,Func,[Format,Args]}}
-	when is_list(Format) ->
-	    Msg = (catch io_lib:Func(Format,Args)),
-	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-        {io_request,From,ReplyAs,{put_chars,unicode,io_lib,Func,[Format,Args]}}
-	when is_atom(Format) ->
-	    Msg = unicode_to_latin1(catch io_lib:Func(Format,Args)),
-	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-        {io_request,From,ReplyAs,{put_chars,latin1,io_lib,Func,[Format,Args]}}
-	when is_atom(Format) ->
-	    Msg = (catch io_lib:Func(Format,Args)),
-	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-        {io_request,From,ReplyAs,{put_chars,unicode,Bytes}} ->
-	    run_test_case_msgloop_io(
-	      ReplyAs,CaptureStdout,unicode_to_latin1(Bytes),From,put_chars),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-        {io_request,From,ReplyAs,{put_chars,latin1,Bytes}} ->
-	    run_test_case_msgloop_io(
-	      ReplyAs,CaptureStdout,Bytes,From,put_chars),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-        IoReq when element(1, IoReq) == io_request ->
-	    %% something else, just pass it on
-            group_leader() ! IoReq,
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-	{structured_io,ClientPid,Msg} ->
-	    output(Msg, ClientPid),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-	{capture,NewCapture} ->
-            run_test_case_msgloop(Ref,Pid,NewCapture,Terminate,
-				  Comment,CurrConf,Status);
+			 Comment = if length(Error1) > 63 ->
+					   string:substr(Error1,1,60) ++ "...";
+				      true ->
+					   Error1
+				   end,
+			 St0#st{comment=Comment}
+		 end,
+	    run_test_case_msgloop(St);
 	{sync_apply,From,MFA} ->
 	    sync_local_or_remote_apply(false,From,MFA),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(St0);
 	{sync_apply_proxy,Proxy,From,MFA} ->
 	    sync_local_or_remote_apply(Proxy,From,MFA),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-	{printout,Detail,Format,Args} ->
-	    print(Detail,Format,Args),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-	{comment,NewComment} ->
-	    NewComment1 = test_server_ctrl:to_string(NewComment),
-	    NewComment2 = test_server_sup:framework_call(format_comment,
-							 [NewComment1],
-							 NewComment1),
-	    Terminate1 =
-		case Terminate of
-		    {true,{Time,Value,Loc,Opts,_OldComment}} ->
-			{true,{Time,Value,mod_loc(Loc),Opts,NewComment2}};
-		    Other ->
-			Other
-		end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate1,
-				  NewComment2,CurrConf,Status);
+	    run_test_case_msgloop(St0);
+	{comment,NewComment0} ->
+	    NewComment1 = test_server_ctrl:to_string(NewComment0),
+	    NewComment = test_server_sup:framework_call(format_comment,
+							[NewComment1],
+							NewComment1),
+	    run_test_case_msgloop(St0#st{comment=NewComment});
 	{read_comment,From} ->
-	    From ! {self(),read_comment,Comment},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-	{set_curr_conf,From,NewCurrConf} ->
-	    From ! {self(),set_curr_conf,ok},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,NewCurrConf,Status);
-	{make_priv_dir,From} when CurrConf == undefined ->
-	    From ! {self(),make_priv_dir,{error,no_priv_dir_in_config}};
+	    From ! {self(),read_comment,St0#st.comment},
+	    run_test_case_msgloop(St0);
 	{make_priv_dir,From} ->
+	    Config = case St0#st.config of
+			 undefined -> [];
+			 Config0 -> Config0
+		     end,
 	    Result =
-		case proplists:get_value(priv_dir, element(2, CurrConf)) of
+		case proplists:get_value(priv_dir, Config) of
 		    undefined ->
 			{error,no_priv_dir_in_config};
 		    PrivDir ->
@@ -811,207 +538,63 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 			end
 		end,
 	    From ! {self(),make_priv_dir,Result},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(St0);
 	{'EXIT',Pid,{Ref,Time,Value,Loc,Opts}} ->
-	    RetVal = {Time/1000000,Value,mod_loc(Loc),Opts,Comment},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},
-				  Comment,undefined,Status);
+	    RetVal = {Time/1000000,Value,Loc,Opts},
+	    St = setup_termination(RetVal, St0#st{config=undefined}),
+	    run_test_case_msgloop(St);
 	{'EXIT',Pid,Reason} ->
-	    case Reason of
-		{timetrap_timeout,TVal,Loc} ->
-		    %% convert Loc to form that can be formatted
-		    case mod_loc(Loc) of
-			{FwMod,FwFunc,framework} ->
-			    %% timout during framework call
-			    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,
-					  {framework_error,{timetrap,TVal}},
-					  unknown,self()),
-			    run_test_case_msgloop(Ref,Pid,CaptureStdout,
-						  Terminate,Comment,
-						  undefined,Status);
-			Loc1 ->
-			    %% call end_per_testcase on a separate process,
-			    %% only so that the user has a chance to
-			    %% clean up after init_per_testcase, even after
-			    %% a timetrap timeout
-			    NewCurrConf =
-				case CurrConf of
-				    {{Mod,Func},Conf} ->
-					EndConfPid =
-					    call_end_conf(
-					      Mod,Func,Pid,
-					      {timetrap_timeout,TVal},
-					      Loc1,[{tc_status,
-						     {failed,
-						      timetrap_timeout}}|Conf],
-					      TVal),
-					{EndConfPid,{Mod,Func},Conf};
-				    _ ->
-					{Mod,Func} = get_mf(Loc1),
-					%% The framework functions mustn't
-					%% execute on this group leader process
-					%% or io will cause deadlock, so we
-					%% spawn a dedicated process for the
-					%% operation and let the group leader
-					%% go back to handle io.
-					spawn_fw_call(Mod,Func,CurrConf,Pid,
-						      {timetrap_timeout,TVal},
-						      Loc1,self()),
-					undefined
-				end,
-			    run_test_case_msgloop(Ref,Pid,CaptureStdout,
-						  Terminate,Comment,
-						  NewCurrConf,Status)
-		    end;
-		{timetrap_timeout,TVal,Loc,InitOrEnd} ->
-		    case mod_loc(Loc) of
-			{FwMod,FwFunc,framework} ->
-			    %% timout during framework call
-			    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,
-					  {framework_error,{timetrap,TVal}},
-					  unknown,self());
-			Loc1 ->
-			    {Mod,_Func} = get_mf(Loc1),
-			    spawn_fw_call(Mod,InitOrEnd,CurrConf,Pid,
-					  {timetrap_timeout,TVal},
-					  Loc1,self())
-		    end,
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-					  Comment,CurrConf,Status);
-		{testcase_aborted,ErrorMsg={user_timetrap_error,_},AbortLoc} ->
-		    %% user timetrap function caused exit
-		    %% during start of test case
-		    {Mod,Func} = get_mf(mod_loc(AbortLoc)),
-		    spawn_fw_call(Mod,Func,CurrConf,Pid,
-				  ErrorMsg,unknown,self()),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,
-					  Terminate,Comment,
-					  undefined,Status);		
-		{testcase_aborted,AbortReason,AbortLoc} ->
-		    ErrorMsg = {testcase_aborted,AbortReason},
-		    case mod_loc(AbortLoc) of
-			{FwMod,FwFunc,framework} ->
-			    %% abort during framework call
-			    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,
-					  {framework_error,ErrorMsg},
-					  unknown,self()),
-			    run_test_case_msgloop(Ref,Pid,CaptureStdout,
-						  Terminate,Comment,
-						  undefined,Status);
-			Loc1 ->
-			    %% call end_per_testcase on a separate process,
-			    %% only so that the user has a chance to clean up
-			    %% after init_per_testcase, even after abortion
-			    NewCurrConf =
-				case CurrConf of
-				    {{Mod,Func},Conf} ->
-					TVal =
-					    case lists:keysearch(default_timeout,
-								 1,
-								 Conf) of
-						{value,{default_timeout,Tmo}} ->
-						    Tmo;
-						_ ->
-						    ?DEFAULT_TIMETRAP_SECS*1000
-					    end,
-					EndConfPid =
-					    call_end_conf(
-					      Mod,Func,Pid,
-					      ErrorMsg,Loc1,
-					      [{tc_status,
-						{failed,ErrorMsg}}|Conf],TVal),
-					{EndConfPid,{Mod,Func},Conf};
-				    _ ->
-					{Mod,Func} = get_mf(Loc1),
-					spawn_fw_call(Mod,Func,CurrConf,Pid,
-						      ErrorMsg,Loc1,self()),
-					undefined
-				end,
-			    run_test_case_msgloop(Ref,Pid,CaptureStdout,
-						  Terminate,Comment,
-						  NewCurrConf,Status)
-		    end;
-		killed ->
-		    %% result of an exit(TestCase,kill) call, which is the
-		    %% only way to abort a testcase process that traps exits
-		    %% (see abort_current_testcase)
-		    {Mod,Func} = case CurrConf of
-				     {MF,_} -> MF;
-				     _      -> {undefined,undefined}
-				 end,
-		    spawn_fw_call(Mod,Func,CurrConf,Pid,
-				  testcase_aborted_or_killed,
-				  unknown,self()),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-					  Comment,CurrConf,Status);
-		{fw_error,{FwMod,FwFunc,FwError}} ->
-		    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,
-				  {framework_error,FwError},
-				  unknown,self()),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-					  Comment,CurrConf,Status);
-		_Other ->
-		    %% the testcase has terminated because of Reason (e.g. an exit
-		    %% because a linked process failed)
-		    {Mod,Func} = case CurrConf of
-				     {MF,_} -> MF;
-				     _      -> {undefined,undefined}
-				 end,
-		    spawn_fw_call(Mod,Func,CurrConf,Pid,
-				  Reason,unknown,self()),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-					  Comment,CurrConf,Status)
-	    end;
-	{EndConfPid,{call_end_conf,Data,_Result}} ->
+	    St = handle_tc_exit(Reason, St0),
+	    run_test_case_msgloop(St);
+	{EndConfPid0,{call_end_conf,Data,_Result}} ->
+	    #st{mf={Mod,Func},config=CurrConf} = St0,
 	    case CurrConf of
-		{EndConfPid,{Mod,Func},_Conf} ->
+		_ when is_list(CurrConf) ->
 		    {_Mod,_Func,TCPid,TCExitReason,Loc} = Data,
 		    spawn_fw_call(Mod,Func,CurrConf,TCPid,
 				  TCExitReason,Loc,self()),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-					  Comment,undefined,Status);
+		    St = St0#st{config=undefined,end_conf_pid=undefined},
+		    run_test_case_msgloop(St);
 		_ ->
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-					  Comment,CurrConf,Status)
+		    run_test_case_msgloop(St0)
 	    end;
 	{_FwCallPid,fw_notify_done,{T,Value,Loc,Opts,AddToComment}} ->
 	    %% the framework has been notified, we're finished
-	    RetVal =
-		case AddToComment of
-		    undefined ->
-			{T,Value,Loc,Opts,Comment};
-		    _ ->
-			Comment1 =
-			    if Comment == "" -> 
-				    AddToComment;
-			       true -> 
-				    Comment ++
-				    test_server_ctrl:xhtml("<br>",
-							   "<br />") ++
-				    AddToComment
-			    end,
-			{T,Value,Loc,Opts,Comment1}
-		end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},
-				  Comment,undefined,Status);
+	    RetVal = {T,Value,Loc,Opts},
+	    Comment0 = St0#st.comment,
+	    Comment = case AddToComment of
+			  undefined ->
+			      Comment0;
+			  _ ->
+			      if Comment0 =:= "" ->
+				      AddToComment;
+				 true -> 
+				      Comment0 ++
+					  test_server_ctrl:xhtml("<br>",
+								 "<br />") ++
+					  AddToComment
+			      end
+		      end,
+	    St = setup_termination(RetVal, St0#st{comment=Comment,
+						  config=undefined}),
+	    run_test_case_msgloop(St);
  	{'EXIT',_FwCallPid,{fw_notify_done,Func,Error}} ->
 	    %% a framework function failed
 	    CB = os:getenv("TEST_SERVER_FRAMEWORK"),
 	    Loc = case CB of
 		      FW when FW =:= false; FW =:= "undefined" ->
-			  {test_server,Func};
+			  [{test_server,Func}];
 		      _ ->
-			  {list_to_atom(CB),Func}
+			  [{list_to_atom(CB),Func}]
 		  end,
-	    RetVal = {died,{framework_error,Loc,Error},Loc,"Framework error"},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},
-				  Comment,undefined,Status);
+	    RetVal = {died,{framework_error,Loc,Error},Loc},
+	    St = setup_termination(RetVal, St0#st{comment="Framework error",
+						 config=undefined}),
+	    run_test_case_msgloop(St);
 	{failed,File,Line} ->
 	    put(test_server_detected_fail,
 		[{File, Line}| get(test_server_detected_fail)]),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(St0);
 
 	{user_timetrap,Pid,_TrapTime,StartTime,E={user_timetrap_error,_},_} ->
 	    case update_user_timetraps(Pid, StartTime) of
@@ -1020,8 +603,7 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 		ignore ->
 		    ok
 	    end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(St0);
 	{user_timetrap,Pid,TrapTime,StartTime,ElapsedTime,Scale} ->
 	    %% a user timetrap is triggered, ignore it if new
 	    %% timetrap has been started since
@@ -1036,68 +618,123 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 		ignore ->
 		    ok
 	    end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(St0);
 	{timetrap_cancel_one,Handle,_From} ->
 	    timetrap_cancel_one(Handle, false),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(St0);
 	{timetrap_cancel_all,TCPid,_From} ->
 	    timetrap_cancel_all(TCPid, false),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
-	{get_timetrap_info,TCPid,From} ->
+	    run_test_case_msgloop(St0);
+	{get_timetrap_info,From,TCPid} ->
 	    Info = get_timetrap_info(TCPid, false),
 	    From ! {self(),get_timetrap_info,Info},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(St0);
 	_Other when not is_tuple(_Other) ->
 	    %% ignore anything not generated by test server
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(St0);
 	_Other when element(1, _Other) /= 'EXIT',
 		    element(1, _Other) /= started,
 		    element(1, _Other) /= finished,
 		    element(1, _Other) /= print ->
 	    %% ignore anything not generated by test server
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status)
-    after Timeout ->
-	    ReturnValue
+	    run_test_case_msgloop(St0)
+    after St0#st.timeout ->
+	    #st{ret_val=RetVal,comment=Comment} = St0,
+	    erlang:append_element(RetVal, Comment)
     end.
 
-run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func) ->
-    case Msg of
-	{'EXIT',_} ->
-	    From ! {io_reply,ReplyAs,{error,Func}};
-	_ ->
-	    From ! {io_reply,ReplyAs,ok}
-    end,
-    if  CaptureStdout /= false ->
-	    CaptureStdout ! {captured,Msg};
-	true ->
-	    ok
-    end,
-    output({minor,Msg},From).
+setup_termination(RetVal, #st{pid=Pid}=St) ->
+    timetrap_cancel_all(Pid, false),
+    St#st{ret_val=RetVal,timeout=20}.
+
+set_tc_state(State) ->
+    set_tc_state(State,unknown).
+set_tc_state(State, Config) ->
+    tc_supervisor_req(set_tc_state, {State,Config}).
+
+handle_tc_exit(killed, St) ->
+    %% probably the result of an exit(TestCase,kill) call, which is the
+    %% only way to abort a testcase process that traps exits
+    %% (see abort_current_testcase).
+    #st{config=Config,mf={Mod,Func},pid=Pid} = St,
+    Msg = testcase_aborted_or_killed,
+    spawn_fw_call(Mod, Func, Config, Pid, Msg, unknown, self()),
+    St;
+handle_tc_exit({testcase_aborted,{user_timetrap_error,_}=Msg,_}, St) ->
+    #st{config=Config,mf={Mod,Func},pid=Pid} = St,
+    spawn_fw_call(Mod, Func, Config, Pid, Msg, unknown, self()),
+    St;
+handle_tc_exit(Reason, #st{status={framework,FwMod,FwFunc},
+			  config=Config,pid=Pid}=St) ->
+    R = case Reason of
+	    {timetrap_timeout,TVal,_} ->
+		{timetrap,TVal};
+	    {testcase_aborted=E,AbortReason,_} ->
+		{E,AbortReason};
+	    {fw_error,{FwMod,FwFunc,FwError}} ->
+		FwError;
+	    Other ->
+		Other
+	end,
+    Error = {framework_error,R},
+    spawn_fw_call(FwMod, FwFunc, Config, Pid, Error, unknown, self()),
+    St;
+handle_tc_exit(Reason, #st{status=tc,config=Config0,mf={Mod,Func},pid=Pid}=St)
+  when is_list(Config0) ->
+    {R,Loc1,F} = case Reason of
+		     {timetrap_timeout=E,TVal,Loc0} ->
+			 {{E,TVal},Loc0,E};
+		     {testcase_aborted=E,AbortReason,Loc0} ->
+			 Msg = {E,AbortReason},
+			 {Msg,Loc0,Msg};
+		     Other ->
+			 {Other,unknown,Other}
+		 end,
+    Timeout = end_conf_timeout(Reason, St),
+    Config = [{tc_status,{failed,F}}|Config0],
+    EndConfPid = call_end_conf(Mod, Func, Pid, R, Loc1, Config, Timeout),
+    St#st{end_conf_pid=EndConfPid};
+handle_tc_exit(Reason, #st{config=Config,mf={Mod,Func0},pid=Pid,
+			   status=Status}=St) ->
+    {R,Loc1} = case Reason of
+		   {timetrap_timeout=E,TVal,Loc0} ->
+		       {{E,TVal},Loc0};
+		   {testcase_aborted=E,AbortReason,Loc0} ->
+		       {{E,AbortReason},Loc0};
+		   Other ->
+		       {Other,unknown}
+	       end,
+    Func = case Status of
+	       init_per_testcase=F -> {F,Func0};
+	       end_per_testcase=F -> {F,Func0};
+	       _ -> Func0
+	   end,
+    spawn_fw_call(Mod, Func, Config, Pid, R, Loc1, self()),
+    St.
 
-output(Msg,Sender) ->
-    local_or_remote_apply({test_server_ctrl,output,[Msg,Sender]}).
+end_conf_timeout({timetrap_timeout,Timeout,_}, _) ->
+    Timeout;
+end_conf_timeout(_, #st{config=Config}) when is_list(Config) ->
+    proplists:get_value(default_timeout, Config, ?DEFAULT_TIMETRAP_SECS*1000);
+end_conf_timeout(_, _) ->
+    ?DEFAULT_TIMETRAP_SECS*1000.
 
 call_end_conf(Mod,Func,TCPid,TCExitReason,Loc,Conf,TVal) ->
-    %% Starter is also the group leader process
     Starter = self(),
     Data = {Mod,Func,TCPid,TCExitReason,Loc},
     EndConfProc =
 	fun() ->
-		group_leader(Starter, self()),
+		process_flag(trap_exit,true), % to catch timetraps
 		Supervisor = self(),
 		EndConfApply =
 		    fun() ->
+			    timetrap(TVal),
 			    case catch apply(Mod,end_per_testcase,[Func,Conf]) of
 				{'EXIT',Why} ->
 				    timer:sleep(1),
 				    group_leader() ! {printout,12,
-						      "WARNING! ~p:end_per_testcase(~p, ~p)"
+						      "WARNING! "
+						      "~p:end_per_testcase(~p, ~p)"
 						      " crashed!\n\tReason: ~p\n",
 						      [Mod,Func,Conf,Why]};
 				_ ->
@@ -1110,29 +747,26 @@ call_end_conf(Mod,Func,TCPid,TCExitReason,Loc,Conf,TVal) ->
 		    {Pid,end_conf} ->
 			Starter ! {self(),{call_end_conf,Data,ok}};
 		    {'EXIT',Pid,Reason} ->
-			Starter ! {self(),{call_end_conf,Data,{error,Reason}}}
-		after TVal ->
-			exit(Pid, kill),
 			group_leader() ! {printout,12,
 					  "WARNING! ~p:end_per_testcase(~p, ~p)"
-					  " failed!\n\tReason: timetrap timeout"
-					  " after ~w ms!\n", [Mod,Func,Conf,TVal]},
-			Starter ! {self(),{call_end_conf,Data,{error,timeout}}}
+					  " failed!\n\tReason: ~p\n",
+					  [Mod,Func,Conf,Reason]},
+			Starter ! {self(),{call_end_conf,Data,{error,Reason}}};
+		    {'EXIT',_OtherPid,Reason} ->
+			%% Probably the parent - not much to do about that
+			exit(Reason)
 		end
 	end,
     spawn_link(EndConfProc).
 
-spawn_fw_call(Mod,{init_per_testcase,Func},_,Pid,{timetrap_timeout,TVal}=Why,
+spawn_fw_call(Mod,{init_per_testcase,Func},CurrConf,Pid,{timetrap_timeout,TVal}=Why,
 	      Loc,SendTo) ->
     FwCall =
 	fun() ->
-		%% set group leader so that printouts/comments
-		%% from the framework get printed in the logs
-		group_leader(SendTo, self()),
 		Skip = {skip,{failed,{Mod,init_per_testcase,Why}}},
 		%% if init_per_testcase fails, the test case
 		%% should be skipped
-		case catch do_end_tc_call(Mod,Func, Loc, {Pid,Skip,[[]]}, Why) of
+		case catch do_end_tc_call(Mod,Func, {Pid,Skip,[CurrConf]}, Why) of
 		    {'EXIT',FwEndTCErr} ->
 			exit({fw_notify_done,end_tc,FwEndTCErr});
 		    _ ->
@@ -1146,22 +780,10 @@ spawn_fw_call(Mod,{init_per_testcase,Func},_,Pid,{timetrap_timeout,TVal}=Why,
 
 spawn_fw_call(Mod,{end_per_testcase,Func},EndConf,Pid,
 	      {timetrap_timeout,TVal}=Why,_Loc,SendTo) ->
-    %%! This is a temporary fix that keeps Test Server alive during
-    %%! execution of a parallel test case group, when sometimes
-    %%! this clause gets called with EndConf == undefined. See OTP-9594
-    %%! for more info.
-    EndConf1 = if EndConf == undefined ->
-		       [{tc_status,{failed,{Mod,end_per_testcase,Why}}}];
-		  true ->
-		       EndConf
-	       end,
     FwCall =
 	fun() ->
-		%% set group leader so that printouts/comments
-		%% from the framework get printed in the logs
-		group_leader(SendTo, self()),
 		{RetVal,Report} =
-		    case proplists:get_value(tc_status, EndConf1) of
+		    case proplists:get_value(tc_status, EndConf) of
 			undefined ->
 			    E = {failed,{Mod,end_per_testcase,Why}},
 			    {E,E};
@@ -1175,9 +797,9 @@ spawn_fw_call(Mod,{end_per_testcase,Func},EndConf,Pid,
 				  "WARNING! ~p:end_per_testcase(~p, ~p)"
 				  " failed!\n\tReason: timetrap timeout"
 				  " after ~w ms!\n", [Mod,Func,EndConf,TVal]},
-		FailLoc = proplists:get_value(tc_fail_loc, EndConf1),
-		case catch do_end_tc_call(Mod,Func, FailLoc,
-					  {Pid,Report,[EndConf1]}, Why) of
+		FailLoc = proplists:get_value(tc_fail_loc, EndConf),
+		case catch do_end_tc_call(Mod,Func,
+					  {Pid,Report,[EndConf]}, Why) of
 		    {'EXIT',FwEndTCErr} ->
 			exit({fw_notify_done,end_tc,FwEndTCErr});
 		    _ ->
@@ -1195,9 +817,6 @@ spawn_fw_call(Mod,{end_per_testcase,Func},EndConf,Pid,
 spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo) ->
     FwCall =
 	fun() ->
-		%% set group leader so that printouts/comments
-		%% from the framework get printed in the logs
-		group_leader(SendTo, self()),
 		test_server_sup:framework_call(report, [framework_error,
 							{{FwMod,FwFunc},
 							 FwError}]),
@@ -1213,12 +832,9 @@ spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo) ->
 	end,
     spawn_link(FwCall);
 
-spawn_fw_call(Mod,Func,_,Pid,Error,Loc,SendTo) ->
+spawn_fw_call(Mod,Func,CurrConf,Pid,Error,Loc,SendTo) ->
     FwCall =
 	fun() ->
-		%% set group leader so that printouts/comments
-		%% from the framework get printed in the logs
-		group_leader(SendTo, self()),
 		case catch fw_error_notify(Mod,Func,[],
 					   Error,Loc) of
 		    {'EXIT',FwErrorNotifyErr} ->
@@ -1227,8 +843,8 @@ spawn_fw_call(Mod,Func,_,Pid,Error,Loc,SendTo) ->
 		    _ ->
 			ok
 		end,
-		Conf = [{tc_status,{failed,timetrap_timeout}}],
-		case catch do_end_tc_call(Mod,Func, Loc,
+		Conf = [{tc_status,{failed,timetrap_timeout}}|CurrConf],
+		case catch do_end_tc_call(Mod,Func,
 					  {Pid,Error,[Conf]},Error) of
 		    {'EXIT',FwEndTCErr} ->
 			exit({fw_notify_done,end_tc,FwEndTCErr});
@@ -1293,83 +909,73 @@ run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
 		   TimetrapData, LogOpts, TCCallback) ->
     put(test_server_multiply_timetraps, TimetrapData),
     put(test_server_logopts, LogOpts),
+    Where = [{Mod,Func}],
+    put(test_server_loc, Where),
     FWInitResult = test_server_sup:framework_call(init_tc,[?pl2a(Mod),Func,Args0],
 						  {ok,Args0}),
-    group_leader() ! {test_case_initialized,self()},
+    set_tc_state(running),
     {{Time,Value},Loc,Opts} =
 	case FWInitResult of
 	    {ok,Args} ->
 		run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback);
 	    Error = {error,_Reason} ->
-		Where = {Mod,Func},
-		NewResult = do_end_tc_call(Mod,Func, Where, {Error,Args0},
+		NewResult = do_end_tc_call(Mod,Func, {Error,Args0},
 					   {skip,{failed,Error}}),
 		{{0,NewResult},Where,[]};
 	    {fail,Reason} ->
 		Conf = [{tc_status,{failed,Reason}} | hd(Args0)],
-		Where = {Mod,Func},
 		fw_error_notify(Mod, Func, Conf, Reason),
-		NewResult = do_end_tc_call(Mod,Func, Where, {{error,Reason},[Conf]},
+		NewResult = do_end_tc_call(Mod,Func, {{error,Reason},[Conf]},
 					   {fail,Reason}),
 		{{0,NewResult},Where,[]};
 	    Skip = {skip,_Reason} ->
-		Where = {Mod,Func},
-		NewResult = do_end_tc_call(Mod,Func, Where, {Skip,Args0}, Skip),
+		NewResult = do_end_tc_call(Mod,Func, {Skip,Args0}, Skip),
 		{{0,NewResult},Where,[]};
 	    {auto_skip,Reason} ->
-		Where = {Mod,Func},
-		NewResult = do_end_tc_call(Mod,Func, Where, {{skip,Reason},Args0},
+		NewResult = do_end_tc_call(Mod,Func, {{skip,Reason},Args0},
 					   {skip,Reason}),
 		{{0,NewResult},Where,[]}
 	end,
     exit({Ref,Time,Value,Loc,Opts}).
 
 run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
-    %% save current state in controller loop
-    sync_send(group_leader(),set_curr_conf,{{Mod,Func},hd(Args)},
-	      5000, fun() -> exit(no_answer_from_group_leader) end),
     case RunInit of
 	run_init ->
-	    put(test_server_init_or_end_conf,{init_per_testcase,Func}),
-	    put(test_server_loc, {Mod,{init_per_testcase,Func}}),
+	    set_tc_state(init_per_testcase, hd(Args)),
 	    ensure_timetrap(Args),
 	    case init_per_testcase(Mod, Func, Args) of
 		Skip = {skip,Reason} ->
 		    Line = get_loc(),
-		    Conf = [{tc_status,{skipped,Reason}}],
-		    NewRes = do_end_tc_call(Mod,Func, Line, {Skip,[Conf]}, Skip),
+		    Conf = [{tc_status,{skipped,Reason}}|hd(Args)],
+		    NewRes = do_end_tc_call(Mod,Func, {Skip,[Conf]}, Skip),
 		    {{0,NewRes},Line,[]};
 		{skip_and_save,Reason,SaveCfg} ->
 		    Line = get_loc(),
-		    Conf = [{tc_status,{skipped,Reason}},{save_config,SaveCfg}],
-		    NewRes = do_end_tc_call(Mod,Func, Line, {{skip,Reason},[Conf]},
+		    Conf = [{tc_status,{skipped,Reason}},{save_config,SaveCfg}|hd(Args)],
+		    NewRes = do_end_tc_call(Mod,Func, {{skip,Reason},[Conf]},
 					    {skip,Reason}),
 		    {{0,NewRes},Line,[]};
 		FailTC = {fail,Reason} ->       % user fails the testcase
 		    EndConf = [{tc_status,{failed,Reason}} | hd(Args)],
 		    fw_error_notify(Mod, Func, EndConf, Reason),
-		    NewRes = do_end_tc_call(Mod,Func, {Mod,Func},
+		    NewRes = do_end_tc_call(Mod,Func,
 					    {{error,Reason},[EndConf]},
 					    FailTC),
-		    {{0,NewRes},{Mod,Func},[]};
+		    {{0,NewRes},[{Mod,Func}],[]};
 		{ok,NewConf} ->
-		    put(test_server_init_or_end_conf,undefined),
 		    %% call user callback function if defined
 		    NewConf1 = user_callback(TCCallback, Mod, Func, init, NewConf),
 		    %% save current state in controller loop
-		    sync_send(group_leader(),set_curr_conf,{{Mod,Func},NewConf1},
-			      5000, fun() -> exit(no_answer_from_group_leader) end),
-		    put(test_server_loc, {Mod,Func}),
+		    set_tc_state(tc, NewConf1),
 		    %% execute the test case
 		    {{T,Return},Loc} = {ts_tc(Mod, Func, [NewConf1]),get_loc()},
 		    {EndConf,TSReturn,FWReturn} =
 			case Return of
 			    {E,TCError} when E=='EXIT' ; E==failed ->
-				ModLoc = mod_loc(Loc),
 				fw_error_notify(Mod, Func, NewConf1,
-						TCError, ModLoc),
+						TCError, Loc),
 				{[{tc_status,{failed,TCError}},
-				  {tc_fail_loc,ModLoc}|NewConf1],
+				  {tc_fail_loc,Loc}|NewConf1],
 				 Return,{error,TCError}};
 			    SaveCfg={save_config,_} ->
 				{[{tc_status,ok},SaveCfg|NewConf1],Return,ok};
@@ -1386,8 +992,6 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 		    %% call user callback function if defined
 		    EndConf1 = user_callback(TCCallback, Mod, Func, 'end', EndConf),
 		    %% update current state in controller loop
-		    sync_send(group_leader(),set_curr_conf,EndConf1, 5000,
-			      fun() -> exit(no_answer_from_group_leader) end),
 		    {FWReturn1,TSReturn1,EndConf2} =
 			case end_per_testcase(Mod, Func, EndConf1) of
 			    SaveCfg1={save_config,_} ->
@@ -1407,24 +1011,21 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 				{FWReturn,TSReturn,EndConf1}
 			end,
 		    %% clear current state in controller loop
-		    sync_send(group_leader(),set_curr_conf,undefined,
-			      5000, fun() -> exit(no_answer_from_group_leader) end),
-		    put(test_server_init_or_end_conf,undefined),
-		    case do_end_tc_call(Mod,Func, Loc,
+		    case do_end_tc_call(Mod,Func,
 					{FWReturn1,[EndConf2]}, TSReturn1) of
 			{failed,Reason} = NewReturn ->
 			    fw_error_notify(Mod,Func,EndConf2, Reason),
-			    {{T,NewReturn},{Mod,Func},[]};
+			    {{T,NewReturn},[{Mod,Func}],[]};
 			NewReturn ->
 			    {{T,NewReturn},Loc,[]}
 		    end
 	    end;
 	skip_init ->
+	    set_tc_state(running, hd(Args)),
 	    %% call user callback function if defined
 	    Args1 = user_callback(TCCallback, Mod, Func, init, Args),
 	    ensure_timetrap(Args1),
 	    %% ts_tc does a catch
-	    put(test_server_loc, {Mod,Func}),
 	    %% if this is a named conf group, the test case (init or end conf)
 	    %% should be called with the name as the first argument
 	    Args2 = if Name == undefined -> Args1;
@@ -1435,43 +1036,12 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 	    %% call user callback function if defined
 	    Return1 = user_callback(TCCallback, Mod, Func, 'end', Return),
 	    {Return2,Opts} = process_return_val([Return1], Mod, Func,
-						Args1, {Mod,Func}, Return1),
+						Args1, [{Mod,Func}], Return1),
 	    {{T,Return2},Loc,Opts}
     end.
 
-do_end_tc_call(M,F, Loc, Res, Return) ->
-    IsSuite = case lists:reverse(atom_to_list(M)) of
-		  [$E,$T,$I,$U,$S,$_|_]  -> true;
-		  _ -> false
-	      end,
+do_end_tc_call(Mod, Func, Res, Return) ->
     FwMod = os:getenv("TEST_SERVER_FRAMEWORK"),
-    {Mod,Func} =
-	if FwMod == M ; FwMod == "undefined"; FwMod == false ->
-		{M,F};
-	   (not IsSuite) and is_list(Loc) and (length(Loc)>1) ->
-		%% If failure in other module (M) than suite, try locate
-		%% suite name in Loc list and call end_tc with Suite:TestCase
-		%% instead of M:F.
-		GetSuite = fun(S,TC) ->
-				   case lists:reverse(atom_to_list(S)) of
-				       [$E,$T,$I,$U,$S,$_|_]  -> [{S,TC}];
-				      _ -> []
-				   end
-			  end,
-		case lists:flatmap(fun({S,TC,_})   -> GetSuite(S,TC);
-				      ({{S,TC},_}) -> GetSuite(S,TC);
-				      ({S,TC})     -> GetSuite(S,TC);
-				      (_)          -> []
-				   end, Loc) of
-		    [] ->
-			{M,F};
-		    [FoundSuite|_] ->
-			FoundSuite
-		end;
-	   true ->
-		{M,F}
-	end,
-
     Ref = make_ref(),
     if FwMod == "ct_framework" ; FwMod == "undefined"; FwMod == false ->
 	    case test_server_sup:framework_call(
@@ -1513,7 +1083,7 @@ process_return_val([Return], M,F,A, Loc, Final) when is_list(Return) ->
 	true ->		     % must be return value from end conf case
 	    process_return_val1(Return, M,F,A, Loc, Final, []);
 	false -> % must be Config value from init conf case
-	    case do_end_tc_call(M, F, Loc, {ok,A}, Return) of
+	    case do_end_tc_call(M, F, {ok,A}, Return) of
 		{failed, FWReason} = Failed ->
 		    fw_error_notify(M,F,A, FWReason),
 		    {Failed, []};
@@ -1529,9 +1099,9 @@ process_return_val(Return, M,F,A, Loc, Final) ->
 process_return_val1([Failed={E,TCError}|_], M,F,A=[Args], Loc, _, SaveOpts)
   when E=='EXIT';
        E==failed ->
-    fw_error_notify(M,F,A, TCError, mod_loc(Loc)),
-    case do_end_tc_call(M,F, Loc, {{error,TCError},
-				   [[{tc_status,{failed,TCError}}|Args]]},
+    fw_error_notify(M,F,A, TCError, Loc),
+    case do_end_tc_call(M,F, {{error,TCError},
+			      [[{tc_status,{failed,TCError}}|Args]]},
 			Failed) of
 	{failed,FWReason} ->
 	    {{failed,FWReason},SaveOpts};
@@ -1549,8 +1119,8 @@ process_return_val1([RetVal={Tag,_}|Opts], M,F,A, Loc, _, SaveOpts) when Tag==sk
     process_return_val1(Opts, M,F,A, Loc, RetVal, SaveOpts);
 process_return_val1([_|Opts], M,F,A, Loc, Final, SaveOpts) ->
     process_return_val1(Opts, M,F,A, Loc, Final, SaveOpts);
-process_return_val1([], M,F,A, Loc, Final, SaveOpts) ->
-    case do_end_tc_call(M,F, Loc, {Final,A}, Final) of
+process_return_val1([], M,F,A, _Loc, Final, SaveOpts) ->
+    case do_end_tc_call(M,F, {Final,A}, Final) of
 	{failed,FWReason} ->
 	    {{failed,FWReason},SaveOpts};
 	NewReturn ->
@@ -1616,7 +1186,7 @@ do_init_per_testcase(Mod, Args) ->
 	throw:Other ->
 	    set_loc(erlang:get_stacktrace()),
 	    Line = get_loc(),
-	    FormattedLoc = test_server_sup:format_loc(mod_loc(Line)),
+	    FormattedLoc = test_server_sup:format_loc(Line),
 	    group_leader() ! {printout,12,
 			      "ERROR! init_per_testcase thrown!\n"
 			      "\tLocation: ~s\n\tReason: ~p\n",
@@ -1627,7 +1197,7 @@ do_init_per_testcase(Mod, Args) ->
 	    Reason = {Reason0,Stk},
 	    set_loc(Stk),
 	    Line = get_loc(),
-	    FormattedLoc = test_server_sup:format_loc(mod_loc(Line)),
+	    FormattedLoc = test_server_sup:format_loc(Line),
 	    group_leader() ! {printout,12,
 			      "ERROR! init_per_testcase crashed!\n"
 			      "\tLocation: ~s\n\tReason: ~p\n",
@@ -1650,8 +1220,7 @@ end_per_testcase(Mod, Func, Conf) ->
     end.
 
 do_end_per_testcase(Mod,EndFunc,Func,Conf) ->
-    put(test_server_init_or_end_conf,{EndFunc,Func}),
-    put(test_server_loc, {Mod,{EndFunc,Func}}),
+    set_tc_state(end_per_testcase, Conf),
     try Mod:EndFunc(Func, Conf) of
 	{save_config,_}=SaveCfg ->
 	    SaveCfg;
@@ -1675,8 +1244,7 @@ do_end_per_testcase(Mod,EndFunc,Func,Conf) ->
 			      "Reason: ~p\n"
 			      "Line: ~s\n",
 			      [EndFunc, Other,
-			       test_server_sup:format_loc(
-				 mod_loc(get_loc()))]},
+			       test_server_sup:format_loc(get_loc())]},
 	    {failed,{Mod,end_per_testcase,Other}};
 	  Class:Reason ->
 	    Stk = erlang:get_stacktrace(),
@@ -1698,8 +1266,7 @@ do_end_per_testcase(Mod,EndFunc,Func,Conf) ->
 			      "Reason: ~p\n"
 			      "Line: ~s\n",
 			      [EndFunc, Reason,
-			       test_server_sup:format_loc(
-				 mod_loc(get_loc()))]},
+			       test_server_sup:format_loc(get_loc())]},
 	    {failed,{Mod,end_per_testcase,Why}}
     end.
 
@@ -1712,66 +1279,19 @@ get_loc(Pid) ->
     lists:foreach(fun({Key,Val}) -> put(Key, Val) end, Dict),
     Stk = [rewrite_loc_item(Loc) || Loc <- Stk0],
     case get(test_server_loc) of
-	undefined ->
-	    put(test_server_loc, Stk);
-	{Suite,Case} ->
+	[{Suite,Case}] ->
 	    %% location info unknown, check if {Suite,Case,Line}
 	    %% is available in stacktrace. and if so, use stacktrace
-	    %% instead of currect test_server_loc
+	    %% instead of current test_server_loc
 	    case [match || {S,C,_L} <- Stk, S == Suite, C == Case] of
 		[match|_] -> put(test_server_loc, Stk);
 		_         -> ok
 	    end;
 	_ ->
-	    ok
+	    put(test_server_loc, Stk)
     end,
     get_loc().
 
-%% find the latest known Suite:Testcase
-get_mf(MFs) ->
-    get_mf(MFs, {undefined,undefined}).
-
-get_mf([MF|MFs], _Found) when is_tuple(MF) ->
-    ModFunc = {Mod,_} = case MF of
-			    {M,F,_} -> {M,F};
-			    MF -> MF
-			end,
-    case is_suite(Mod) of
-	true -> ModFunc;
-	false -> get_mf(MFs, ModFunc)
-    end;
-get_mf(_, Found) ->
-    Found.
-
-is_suite(Mod) ->
-    case lists:reverse(atom_to_list(Mod)) of
-	"ETIUS" ++ _ -> true;
-	_ -> false
-    end.
-
-mod_loc(Loc) ->
-    %% handle diff line num versions
-    case Loc of
-	[{{_M,_F},_L}|_] ->
-	    [begin if L /= 0 -> {?pl2a(M),F,L};
-		      true   -> {?pl2a(M),F} end end || {{M,F},L} <- Loc];
-	[{_M,_F}|_] ->
-	    [{?pl2a(M),F} || {M,F} <- Loc];
-	{{M,F},0} ->
-	    [{?pl2a(M),F}];
-	{{M,F},L} ->
-	    [{?pl2a(M),F,L}];
-	{M,ForL} ->
-	    [{?pl2a(M),ForL}];
-	{M,F,0} ->
-	    [{M,F}];
-	[{M,F,0}|Stack] ->
-	    [{M,F}|Stack];
-	_ ->
-	    Loc
-    end.
-
-
 fw_error_notify(Mod, Func, Args, Error) ->
     test_server_sup:framework_call(error_notification,
 				   [?pl2a(Mod),Func,[Args],
@@ -1793,10 +1313,10 @@ fw_error_notify(Mod, Func, Args, Error, Loc) ->
 %% is directed to console, major and/or minor log files.
 
 print(Detail,Format,Args) ->
-    local_or_remote_apply({test_server_ctrl,print,[Detail,Format,Args]}).
+    test_server_ctrl:print(Detail, Format, Args).
 
 print(Detail,Format,Args,Printer) ->
-    local_or_remote_apply({test_server_ctrl,print,[Detail,Format,Args,Printer]}).
+    test_server_ctrl:print(Detail, Format, Args, Printer).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% print_timsteamp(Detail,Leader) -> ok
@@ -1806,7 +1326,7 @@ print(Detail,Format,Args,Printer) ->
 %% log files.
 
 print_timestamp(Detail,Leader) ->
-    local_or_remote_apply({test_server_ctrl,print_timestamp,[Detail,Leader]}).
+    test_server_ctrl:print_timestamp(Detail, Leader).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1854,7 +1374,12 @@ ts_tc(M, F, A) ->
     {Elapsed, Result}.
 
 set_loc(Stk) ->
-    Loc = [rewrite_loc_item(I) || {_,_,_,_}=I <- Stk],
+    Loc = case [rewrite_loc_item(I) || {_,_,_,_}=I <- Stk] of
+	      [{M,F,0}|Stack] ->
+		  [{M,F}|Stack];
+	      Other ->
+		  Other
+	  end,
     put(test_server_loc, Loc).
 
 rewrite_loc_item({M,F,_,Loc}) ->
@@ -1868,16 +1393,6 @@ rewrite_loc_item({M,F,_,Loc}) ->
 %% Note: Some of these functions have been moved to test_server_sup %%
 %%       in an attempt to keep this modules small (yeah, right!)    %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-unicode_to_latin1(Chars) when is_list(Chars); is_binary(Chars) ->
-    lists:flatten(
-      [ case X of
-	    High when High > 255 ->
-		io_lib:format("\\{~.8B}",[X]);
-	    Low ->
-		Low
-	end || X <- unicode:characters_to_list(Chars,unicode) ]);
-unicode_to_latin1(Garbage) ->
-    Garbage.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% format(Format) -> IoLibReturn
@@ -1959,6 +1474,13 @@ messages_get() ->
     test_server_sup:messages_get([]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% permit_io(GroupLeader, FromPid) -> ok
+%%
+%% Make sure proceeding IO from FromPid won't get rejected
+permit_io(GroupLeader, FromPid) ->
+    GroupLeader ! {permit_io,FromPid}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% sleep(Time) -> ok
 %% Time = integer() | float() | infinity
 %%
@@ -2061,31 +1583,40 @@ fail() ->
 %% Break a test case so part of the test can be done manually.
 %% Use continue/0 to continue.
 break(Comment) ->
-    case erase(test_server_timetraps) of
-	undefined -> ok;
-	List -> lists:foreach(fun({Ref,_,_}) -> 
-				      timetrap_cancel(Ref)
-			      end, List)
-    end,
+    break(?MODULE, Comment).
+
+break(CBM, Comment) ->
+    break(CBM, '', Comment).
+
+break(CBM, TestCase, Comment) ->
+    timetrap_cancel(),
+    {TCName,CntArg,PName} =
+	if TestCase == '' -> 
+		{"", "", test_server_break_process};
+	   true ->
+		Str = atom_to_list(TestCase),
+		{[32 | Str], Str,
+		 list_to_atom("test_server_break_process_" ++ Str)}
+	end,
     io:format(user,
 	      "\n\n\n--- SEMIAUTOMATIC TESTING ---"
-	      "\nThe test case executes on process ~w"
+	      "\nThe test case~s executes on process ~w"
 	      "\n\n\n~s"
 	      "\n\n\n-----------------------------\n\n"
-	      "Continue with --> test_server:continue().\n",
-	      [self(),Comment]),
-    case whereis(test_server_break_process) of
+	      "Continue with --> ~w:continue(~s).\n",
+	      [TCName,self(),Comment,CBM,CntArg]),
+    case whereis(PName) of
 	undefined ->
-	    spawn_break_process(self());
+	    spawn_break_process(self(), PName);
 	OldBreakProcess ->
 	    OldBreakProcess ! cancel,
-	    spawn_break_process(self())
+	    spawn_break_process(self(), PName)
     end,
     receive continue -> ok end.
 
-spawn_break_process(Pid) ->
+spawn_break_process(Pid, PName) ->
     spawn(fun() ->
-		  register(test_server_break_process,self()),
+		  register(PName, self()),
 		  receive
 		      continue -> continue(Pid);
 		      cancel -> ok
@@ -2094,13 +1625,19 @@ spawn_break_process(Pid) ->
 
 continue() ->
     case whereis(test_server_break_process) of
-	undefined ->
-	     ok;
-	BreakProcess ->
-	    BreakProcess ! continue
+	undefined    -> ok;
+	BreakProcess -> BreakProcess ! continue
     end.
 
-continue(Pid) ->
+continue(TestCase) when is_atom(TestCase) ->
+    PName = list_to_atom("test_server_break_process_" ++
+			 atom_to_list(TestCase)),
+    case whereis(PName) of
+	undefined    -> ok;
+	BreakProcess -> BreakProcess ! continue
+    end;	
+
+continue(Pid) when is_pid(Pid) ->
     Pid ! continue.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2108,28 +1645,19 @@ continue(Pid) ->
 %%
 %% Returns the amount to scale timetraps with.
 
+%% {X, fun() -> check() end} <- multiply scale with X if Fun() is true
 timetrap_scale_factor() ->
-    F0 = case test_server:purify_is_running() of
-	    true -> 5;
-	    false -> 1
-	end,
-    F1 = case {is_debug(), has_lock_checking()} of
-	     {true,_} -> 6 * F0;
-	     {false,true} -> 2 * F0;
-	     {false,false} -> F0
-	 end,
-    F2 = case has_superfluous_schedulers() of
-	     true -> 3*F1;
-	     false -> F1
-	 end,
-    F = case test_server_sup:get_os_family() of
-	    vxworks -> 5 * F2;
-	    _ -> F2
-	end,
-    case test_server:is_cover() of
-	true -> 10 * F;
-	false -> F
-    end.
+    timetrap_scale_factor([
+	{ 2, fun() -> has_lock_checking() end},
+	{ 3, fun() -> has_superfluous_schedulers() end},
+	{ 5, fun() -> purify_is_running() end},
+	{ 6, fun() -> is_debug() end},
+	{10, fun() -> is_cover() end}
+    ]).
+
+timetrap_scale_factor(Scales) ->
+    %% The fun in {S, Fun} a filter input to the list comprehension
+    lists:foldl(fun(S,O) -> O*S end, 1, [ S || {S,F} <- Scales, F()]).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2457,11 +1985,7 @@ get_timetrap_info(TCPid, SendToServer) ->
 		[I|_] ->
 		    I;
 		[] when SendToServer == true ->
-		    MsgLooper = group_leader(),
-		    MsgLooper ! {get_timetrap_info,TCPid,self()},
-		    receive
-			{MsgLooper,get_timetrap_info,I} -> I
-		    end;
+		    tc_supervisor_req({get_timetrap_info,TCPid});
 		[] ->
 		    undefined
 	    end
@@ -2480,17 +2004,29 @@ hours(N)   -> trunc(N * 1000 * 60 * 60).
 minutes(N) -> trunc(N * 1000 * 60).
 seconds(N) -> trunc(N * 1000).
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% sync_send(Pid,Tag,Msg,Timeout,DoAfter) -> Result
+%% tc_supervisor_req(Tag) -> Result
+%% tc_supervisor_req(Tag, Msg) -> Result
 %%
-sync_send(Pid,Tag,Msg,Timeout,DoAfter) ->
+
+tc_supervisor_req(Tag) ->
+    Pid = test_server_gl:get_tc_supervisor(group_leader()),
+    Pid ! {Tag,self()},
+    receive
+	{Pid,Tag,Result} ->
+	    Result
+    after 5000 ->
+	    error(no_answer_from_tc_supervisor)
+    end.
+
+tc_supervisor_req(Tag, Msg) ->
+    Pid = test_server_gl:get_tc_supervisor(group_leader()),
     Pid ! {Tag,self(),Msg},
     receive
 	{Pid,Tag,Result} ->
 	    Result
-    after Timeout ->
-	    DoAfter()
+    after 5000 ->
+	    error(no_answer_from_tc_supervisor)
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2652,7 +2188,10 @@ start_node(Name, Type, Options) ->
             %% by a shielded node.
             Cover = case is_cover() of
                         true ->
-                            not is_shielded(Name) andalso same_version(Node);
+                            not is_shielded(Name)
+				andalso same_version(Node)
+				andalso proplists:get_value(start_cover,Options,
+							    true);
                         false ->
                             false
                     end,
@@ -2660,9 +2199,7 @@ start_node(Name, Type, Options) ->
 	    net_adm:ping(Node),
 	    case Cover of
 		true ->
-		    Sticky = unstick_all_sticky(Node),
-		    cover:start(Node),
-		    stick_all_sticky(Node,Sticky);
+		    do_cover_for_node(Node,start);
 		_ ->
 		    ok
 	    end,
@@ -2690,7 +2227,27 @@ wait_for_node(Slave) ->
     group_leader() ! {sync_apply,
 		      self(),
 		      {test_server_ctrl,wait_for_node,[Slave]}},
-    receive {sync_result,R} -> R end.
+    Result = receive {sync_result,R} -> R end,
+    case Result of
+	ok ->
+	    Cover = case is_cover() of
+			true ->
+			    not is_shielded(Slave) andalso same_version(Slave);
+			false ->
+			    false
+		    end,
+
+	    net_adm:ping(Slave),
+	    case Cover of
+		true ->
+		    do_cover_for_node(Slave,start);
+		_ ->
+		    ok
+	    end;
+	_ ->
+	    ok
+    end,
+    Result.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2702,9 +2259,7 @@ stop_node(Slave) ->
     Nocover = is_shielded(Slave) orelse not same_version(Slave),
     case is_cover() of
 	true when not Nocover ->
-	    Sticky = unstick_all_sticky(Slave),
-	    cover:stop(Slave),
-	    stick_all_sticky(Slave,Sticky);
+	    do_cover_for_node(Slave,flush);
 	_ ->
 	    ok
     end,
@@ -2885,13 +2440,7 @@ comment(String) ->
 %% Read the current comment string stored in
 %% state during test case execution.
 read_comment() ->
-    MsgLooper = group_leader(),
-    MsgLooper ! {read_comment,self()},
-    receive
-	{MsgLooper,read_comment,Comment} -> Comment
-    after
-	5000 -> ""
-    end.
+    tc_supervisor_req(read_comment).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% make_priv_dir() -> ok
@@ -2899,13 +2448,7 @@ read_comment() ->
 %% Order test server to create the private directory
 %% for the current test case.
 make_priv_dir() ->
-    MsgLooper = group_leader(),
-    group_leader() ! {make_priv_dir,self()},
-    receive
-	{MsgLooper,make_priv_dir,Result} -> Result
-    after
-	5000 -> error
-    end.
+    tc_supervisor_req(make_priv_dir).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% os_type() -> OsType
@@ -2913,7 +2456,7 @@ make_priv_dir() ->
 %% Returns the OsType of the target node. OsType is
 %% the same as returned from os:type()
 os_type() ->
-    test_server_ctrl:get_target_os_type().
+    os:type().
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3032,47 +2575,9 @@ purify_format(Format, Args) ->
 %%
 %% Generic send functions for communication with host
 %%
-sync_local_or_remote_apply(Proxy,From,{M,F,A} = MFA) ->
-    case get(test_server_job_sock) of
-	undefined ->
-	    %% i'm a local target
-	    Result = apply(M,F,A),
-	    if is_pid(Proxy) -> Proxy ! {sync_result_proxy,From,Result};
-	       true -> From ! {sync_result,Result}
-	    end;
-	JobSock ->
-	    %% i'm a remote target
-	    request(JobSock,{sync_apply,MFA}),
-	    {sync_result,Result} = recv(JobSock),
-	    if is_pid(Proxy) -> Proxy ! {sync_result_proxy,From,Result};
-	       true -> From ! {sync_result,Result}
-	    end
-    end.
-local_or_remote_apply({M,F,A} = MFA) ->
-    case get(test_server_job_sock) of
-	undefined ->
-	    %% i'm a local target
-	    apply(M,F,A),
-	    ok;
-	JobSock ->
-	    %% i'm a remote target
-	    request(JobSock,{apply,MFA}),
-	    ok
-    end.
-
-request(Sock,Request) ->
-    gen_tcp:send(Sock,<<1,(term_to_binary(Request))/binary>>).
-
-%%
-%% Generic receive function for communication with host
-%%
-recv(Sock) ->
-    case gen_tcp:recv(Sock,0) of
-	{error,closed} ->
-	    gen_tcp:close(Sock),
-	    exit(connection_lost);
-	{ok,<<1,Request/binary>>} ->
-	    binary_to_term(Request);
-	{ok,<<0,B/binary>>} ->
-	    B
+sync_local_or_remote_apply(Proxy, From, {M,F,A}) ->
+    %% i'm a local target
+    Result = apply(M, F, A),
+    if is_pid(Proxy) -> Proxy ! {sync_result_proxy,From,Result};
+       true -> From ! {sync_result,Result}
     end.
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 5ed296d215..bc08c12089 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -34,118 +34,6 @@
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% ARCHITECTURE
-%%
-%% The Erlang Test Server can be run on the target machine (local target)
-%% or towards a remote target. The execution flow is mainly the same in
-%% both cases, but with a remote target the test cases are (obviously)
-%% executed on the target machine. Host and target communicates over
-%% socket connections because the host should not be introduced as an
-%% additional node in the distributed erlang system in which the test
-%% cases are run.
-%%
-%%
-%% Local Target:
-%% =============
-%%
-%%   -----
-%%   |   |  test_server_ctrl ({global,test_server})
-%%   ----- (test_server_ctrl.erl)
-%%     |
-%%     |
-%%   -----
-%%   |   | JobProc
-%%   ----- (test_server_ctrl.erl and test_server.erl)
-%%     |
-%%     |
-%%   -----
-%%   |   | CaseProc
-%%   ----- (test_server.erl)
-%%
-%%
-%%
-%% test_server_ctrl is the main process in the system. It is a registered
-%% process, and it will always be alive when testing is ongoing.
-%% test_server_ctrl initiates testing and monitors JobProc(s).
-%%
-%% When target is local, and Test Server is *not* being used by a framework
-%% application (where it might cause duplicate name problems in a distributed
-%% test environment), the process is globally registered as 'test_server'
-%% to be able to simulate the {global,test_server} process on a remote target.
-%%
-%% JobProc is spawned for each 'job' added to the test_server_ctrl.
-%% A job can mean one test case, one test suite or one spec.
-%% JobProc creates and writes logs and presents results from testing.
-%% JobProc is the group leader for CaseProc.
-%%
-%% CaseProc is spawned for each test case. It runs the test case and
-%% sends results and any other information to its group leader - JobProc.
-%%
-%%
-%%
-%% Remote Target:
-%% ==============
-%%
-%% 		HOST				TARGET
-%%
-%% 	                   -----  MainSock   -----
-%%        test_server_ctrl |   |- - - - - - -|   | {global,test_server}
-%%  (test_server_ctrl.erl) -----	     ----- (test_server.erl)
-%% 		             |		       |
-%% 			     |		       |
-%% 		           -----  JobSock    -----
-%% 	          JobProcH |   |- - - - - - -|   | JobProcT
-%%  (test_server_ctrl.erl) -----	     ----- (test_server.erl)
-%% 					       |	
-%% 					       |
-%% 					     -----
-%% 					     |   | CaseProc
-%% 					     ----- (test_server.erl)
-%%
-%%
-%%
-%%
-%% A separate test_server process only exists when target is remote. It
-%% is then the main process on target. It is started when test_server_ctrl
-%% is started, and a socket connection is established between
-%% test_server_ctrl and test_server. The following information can be sent
-%% over MainSock:
-%%
-%% HOST			TARGET
-%%  -> {target_info, TargetInfo}     (during initiation)
-%%  <- {job_proc_killed,Name,Reason} (if a JobProcT dies unexpectedly)
-%%  -> {job,Port,Name}               (to start a new JobProcT)
-%%
-%%
-%% When target is remote, JobProc is split into to processes: JobProcH
-%% executing on Host and JobProcT executing on Target. (The two processes
-%% execute the same code as JobProc does when target is local.) JobProcH
-%% and JobProcT communicates over a socket connection. The following
-%% information can be sent over JobSock:
-%%
-%% HOST			TARGET
-%%  -> {test_case, Case}          To start a new test case
-%%  -> {beam,Mod}                 .beam file as binary to be loaded
-%% 				  on target, e.g. a test suite
-%%  -> {datadir,Tarfile}          Content of the datadir for a test suite
-%%  <- {apply,MFA}                MFA to be applied on host, ignore return;
-%% 				  (apply is used for printing information in
-%% 				  log or console)
-%%  <- {sync_apply,MFA}           MFA to be applied on host, wait for return
-%% 				  (used for starting and stopping slave nodes)
-%%  -> {sync_apply,MFA}           MFA to be applied on target, wait for return
-%% 				  (used for cover compiling and analysing)
-%% <-> {sync_result,Result}       Return value from sync_apply
-%%  <- {test_case_result,Result}  When a test case is finished
-%%  <- {crash_dumps,Tarfile}      When a test case is finished
-%%  -> job_done			  When a job is finished
-%%  <- {privdir,Privdir}          When a job is finished
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-
 %%% SUPERVISOR INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -export([start/0, start/1, start_link/1, stop/0]).
 
@@ -162,22 +50,21 @@
 -export([jobs/0, run_test/1, wait_finish/0, idle_notify/1,
 	 abort_current_testcase/1, abort/0]).
 -export([start_get_totals/1, stop_get_totals/0]).
--export([get_levels/0, set_levels/3]).
+-export([reject_io_reqs/1, get_levels/0, set_levels/3]).
 -export([multiply_timetraps/1, scale_timetraps/1, get_timetrap_parameters/0]).
 -export([create_priv_dir/1]).
--export([cover/2, cover/3, cover/7,
-	 cross_cover_analyse/1, cross_cover_analyse/2, trc/1, stop_trace/0]).
+-export([cover/2, cover/3, cover/8,
+	 cross_cover_analyse/2, cross_cover_analyse/3, trc/1, stop_trace/0]).
 -export([testcase_callback/1]).
 -export([set_random_seed/1]).
 -export([kill_slavenodes/0]).
 
 %%% TEST_SERVER INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([output/2, print/2, print/3, print/4, print_timestamp/2]).
+-export([print/2, print/3, print/4, print_timestamp/2]).
 -export([start_node/3, stop_node/1, wait_for_node/1, is_release_available/1]).
 -export([format/1, format/2, format/3, to_string/1]).
 -export([get_target_info/0]).
 -export([get_hosts/0]).
--export([get_target_os_type/0]).
 -export([node_started/1]).
 
 %%% DEBUGGER INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -203,6 +90,7 @@
 -define(coverlog_name, "cover.html").
 -define(cross_coverlog_name, "cross_cover.html").
 -define(cover_total, "total_cover.log").
+-define(unexpected_io_log, "unexpected_io.log").
 -define(last_file, "last_name").
 -define(last_link, "last_link").
 -define(last_test, "last_test").
@@ -218,8 +106,9 @@
 
 -define(auto_skip_color, "#FFA64D").
 -define(user_skip_color, "#FF8000").
+-define(sortable_table_name, "SortableTable").
 
--record(state,{jobs=[],levels={1,19,10},
+-record(state,{jobs=[], levels={1,19,10}, reject_io_reqs=false,
 	       multiply_timetraps=1, scale_timetraps=true,
 	       create_priv_dir=auto_per_run, finish=false,
 	       target_info, trc=false, cover=false, wait_for_node=[],
@@ -429,14 +318,6 @@ run_test(CommandLine) ->
     testcase_callback(TCCB),
     add_job(Name, {command_line,SpecList}),
 
-    %% adding of jobs involves file i/o which may take long time
-    %% when running a nfs mounted file system (VxWorks).
-    case controller_call(get_target_info) of
-	#target_info{os_family=vxworks} ->
-	    receive after 30000 -> ready_to_wait end;
-	_ ->
-	    wait_now
-    end,
     wait_finish().
 
 %% Converted CoverFile to a string unless it is 'none'
@@ -469,8 +350,7 @@ wait_finish() ->
     ok.
 
 abort_current_testcase(Reason) ->
-    controller_call({abort_current_testcase,Reason}),
-    ok.
+    controller_call({abort_current_testcase,Reason}).
 
 abort() ->
     OldTrap = process_flag(trap_exit, true),
@@ -498,6 +378,9 @@ get_levels() ->
 set_levels(Show, Major, Minor) ->
     controller_call({set_levels,Show,Major,Minor}).
 
+reject_io_reqs(Bool) ->
+    controller_call({reject_io_reqs,Bool}).
+
 multiply_timetraps(N) ->
     controller_call({multiply_timetraps,N}).
 
@@ -524,9 +407,9 @@ cover(App, Analyse) when is_atom(App) ->
 cover(CoverFile, Analyse) ->
     cover(none, CoverFile, Analyse).
 cover(App, CoverFile, Analyse) ->
-    controller_call({cover,{App,CoverFile},Analyse}).
-cover(App, CoverFile, Exclude, Include, Cross, Export, Analyse) ->
-    controller_call({cover,{App,{CoverFile,Exclude,Include,Cross,Export}},Analyse}).
+    controller_call({cover,{App,CoverFile},Analyse,true}).
+cover(App, CoverFile, Exclude, Include, Cross, Export, Analyse, Stop) ->
+    controller_call({cover,{App,{CoverFile,Exclude,Include,Cross,Export}},Analyse,Stop}).
 
 testcase_callback(ModFunc) ->
     controller_call({testcase_callback,ModFunc}).
@@ -540,20 +423,6 @@ kill_slavenodes() ->
 get_hosts() ->
     get(test_server_hosts).
 
-get_target_os_type() ->
-    case whereis(?MODULE) of
-	undefined ->
-	    %% This is probably called on the target node
-	    os:type();
-	Pid when Pid =:= self() ->
-	    os:type();
-	_pid ->
-	    %% This is called on the controller, e.g. from a
-	    %% specification clause of a test case
-	    #target_info{os_type=OsType} = controller_call(get_target_info),
-	    OsType
-    end.
-
 %%--------------------------------------------------------------------
 
 add_job(Name, TopCase) ->
@@ -609,7 +478,7 @@ controller_call(Arg, Timeout) ->
 %% Mode 'lazy' ignores (and resets to []) any jobs in the state file
 %%
 
-init([Param]) ->
+init([_]) ->
     case os:getenv("TEST_SERVER_CALL_TRACE") of
 	false ->
 	    ok;
@@ -635,104 +504,14 @@ init([Param]) ->
     test_server_sup:cleanup_crash_dumps(),
     State = #state{jobs=[],finish=false},
     put(test_server_free_targets,[]),
-    case contact_main_target(Param) of
-	{ok,TI} ->
-	    ets:new(slave_tab, [named_table,set,public,{keypos,2}]),
-	    set_hosts([TI#target_info.host]),
-	    {ok,State#state{target_info=TI}};
-	{error,Reason} ->
-	    {stop,Reason}
-    end.
-	
-
-%% If the test is to be run at a remote target, this function sets up
-%% a socket communication with the target.
-contact_main_target(local) ->
-    %% When used by a general framework, global registration of
-    %% test_server should not be required.
-    case get_fw_mod(undefined) of
-	undefined ->
-	    %% Local target! The global test_server process implemented by
-	    %% test_server.erl will not be started, so we simulate it by
-	    %% globally registering this process instead.
-	    global:sync(),
-	    case global:whereis_name(test_server) of
-		undefined ->
-		    global:register_name(test_server, self());
-		Pid ->
-		    case node() of
-			N when N == node(Pid) ->
-			    io:format(user, "Warning: test_server already running!\n", []),
-			    global:re_register_name(test_server,self());
-			_ ->
-			    ok
-		    end
-	    end;
-	_ ->
-	    ok
-    end,
-    TI = test_server:init_target_info(),
+    TI0 = test_server:init_target_info(),
     TargetHost = test_server_sup:hoststr(),
-    {ok,TI#target_info{where=local,
-		       host=TargetHost,
-		       naming=naming(),
-		       master=TargetHost}};
-
-contact_main_target(ParameterFile) ->
-    case read_parameters(ParameterFile) of
-	{ok,Par} ->
-	    case test_server_node:start_remote_main_target(Par) of
-		{ok,TI} ->
-		    {ok,TI};
-		{error,Error} ->
-		    {error,{could_not_start_main_target,Error}}
-	    end;
-	{error,Error} ->
-	    {error,{could_not_read_parameterfile,Error}}
-    end.
-
-read_parameters(File) ->
-    case file:consult(File) of
-	{ok,Data} ->
-	    read_parameters(lists:flatten(Data), #par{naming=naming()});
-	Error ->
-	    Error
-    end.
-read_parameters([{type,Type}|Data], Par) -> % mandatory
-    read_parameters(Data, Par#par{type=Type});
-read_parameters([{target,Target}|Data], Par) -> % mandatory
-    read_parameters(Data, Par#par{target=cast_to_list(Target)});
-read_parameters([{slavetargets,SlaveTargets}|Data], Par) ->
-    read_parameters(Data, Par#par{slave_targets=SlaveTargets});
-read_parameters([{longnames,Bool}|Data], Par) ->
-    Naming = if Bool->"-name"; true->"-sname" end,
-    read_parameters(Data, Par#par{naming=Naming});
-read_parameters([{master,{Node,Cookie}}|Data], Par) ->
-    read_parameters(Data, Par#par{master=cast_to_list(Node),
-				 cookie=cast_to_list(Cookie)});
-read_parameters([Other|_Data], _Par) ->
-    {error,{illegal_parameter,Other}};
-read_parameters([], Par) when Par#par.type==undefined ->
-    {error, {missing_mandatory_parameter,type}};
-read_parameters([], Par) when Par#par.target==undefined ->
-    {error, {missing_mandatory_parameter,target}};
-read_parameters([], Par0) ->
-    Par =
-	case {Par0#par.type, Par0#par.master} of
-	    {ose, undefined} ->
-		%% Use this node as master and bootserver for target
-		%% and slave nodes
-		Par0#par{master = atom_to_list(node()),
-			 cookie = atom_to_list(erlang:get_cookie())};
-	    {ose, _Master} ->
-		%% Master for target and slave nodes was defined in parameterfile
-		Par0;
-	    _ ->
-		%% Use target as master for slave nodes,
-		%% (No master is used for target)
-		Par0#par{master="test_server@" ++ Par0#par.target}
-	end,
-    {ok,Par}.
+    TI = TI0#target_info{host=TargetHost,
+			 naming=naming(),
+			 master=TargetHost},
+    ets:new(slave_tab, [named_table,set,public,{keypos,2}]),
+    set_hosts([TI#target_info.host]),
+    {ok,State#state{target_info=TI}}.
 
 naming() ->
     case lists:member($., test_server_sup:hoststr()) of
@@ -799,7 +578,7 @@ handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
     ExtraTools =
 	case State#state.cover of
 	    false -> [];
-	    {App,Analyse} -> [{cover,App,Analyse}]
+	    {App,Analyse,Stop} -> [{cover,App,Analyse,Stop}]
 	end,
     ExtraTools1 =
 	case State#state.random_seed of
@@ -815,6 +594,7 @@ handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
 			    [SpecName,{State#state.multiply_timetraps,
 				       State#state.scale_timetraps}],
 			    LogDir, Name, State#state.levels,
+			    State#state.reject_io_reqs,
 			    State#state.create_priv_dir,
 			    State#state.testcase_callback, ExtraTools1),
 		    NewJobs = [{Name,Pid}|State#state.jobs],
@@ -825,6 +605,7 @@ handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
 			    [SpecList,{State#state.multiply_timetraps,
 				       State#state.scale_timetraps}],
 			    LogDir, Name, State#state.levels,
+			    State#state.reject_io_reqs,
 			    State#state.create_priv_dir,
 			    State#state.testcase_callback, ExtraTools1),
 		    NewJobs = [{Name,Pid}|State#state.jobs],
@@ -843,6 +624,7 @@ handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
 				     {State#state.multiply_timetraps,
 				      State#state.scale_timetraps}],
 				    LogDir, Name, State#state.levels,
+				    State#state.reject_io_reqs,
 				    State#state.create_priv_dir,
 				    State#state.testcase_callback, ExtraTools1),
 			    NewJobs = [{Name,Pid}|State#state.jobs],
@@ -975,6 +757,15 @@ handle_call({set_levels,Show,Major,Minor}, _From, State) ->
     {reply,ok,State#state{levels={Show,Major,Minor}}};
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% handle_call({reject_io_reqs,Bool}, _, State) -> ok
+%% Bool = bool()
+%%
+%% May be used to switch off stdout printouts to the minor log file
+
+handle_call({reject_io_reqs,Bool}, _From, State) ->
+    {reply,ok,State#state{reject_io_reqs=Bool}};
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% handle_call({multiply_timetraps,N}, _, State) -> ok
 %% N = integer() | infinity
 %%
@@ -1043,13 +834,13 @@ handle_call(stop_trace, _From, State) ->
     {reply,R,State#state{trc=false}};
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% handle_call({cover,App,Analyse}, _, State) -> ok | {error,Reason}
+%% handle_call({cover,App,Analyse,Stop}, _, State) -> ok | {error,Reason}
 %%
 %% All modules inn application App are cover compiled
 %% Analyse indicates on which level the coverage should be analysed
 
-handle_call({cover,App,Analyse}, _From, State) ->
-    {reply,ok,State#state{cover={App,Analyse}}};
+handle_call({cover,App,Analyse,Stop}, _From, State) ->
+    {reply,ok,State#state{cover={App,Analyse,Stop}}};
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% handle_call({create_priv_dir,Value}, _, State) -> ok | {error,Reason}
@@ -1201,25 +992,17 @@ handle_cast({node_started,Node}, State) ->
 %% Pid = pid()
 %% Reason = term()
 %%
-%% Handles exit messages from linked processes. Only test suites and
-%% possibly a target client are expected to be linked.
-%% When a test suite terminates, it is removed from the job queue.
-%% If a target client terminates it means that we lost contact with
-%% target. The test_server_ctrl process is terminated, and teminate/2
-%% will do the cleanup
+%% Handles exit messages from linked processes. Only test suites are
+%% expected to be linked.  When a test suite terminates, it is removed
+%% from the job queue.  If a target client terminates it means that we
+%% lost contact with target. The test_server_ctrl process is
+%% terminated, and teminate/2 will do the cleanup
 
 handle_info({'EXIT',Pid,Reason}, State) ->
     case lists:keysearch(Pid,2,State#state.jobs) of
 	false ->
-	    TI = State#state.target_info,
-	    case TI#target_info.target_client of
-		Pid ->
-		    %% The target client died - lost contact with target
-		    {stop,{lost_contact_with_target,Reason},State};
-		_other ->
-		    %% not our problem
-		    {noreply,State}
-	    end;
+	    %% not our problem
+	    {noreply,State};
 	{value,{Name,_}} ->
 	    NewJobs = lists:keydelete(Pid, 2, State#state.jobs),
 	    case Reason of
@@ -1294,14 +1077,8 @@ handle_info({tcp_closed,Sock}, State=#state{trc=Sock}) ->
     %%! Maybe print something???
     {noreply,State#state{trc=false}};
 handle_info({tcp_closed,Sock}, State) ->
-    case test_server_node:nodedown(Sock,State#state.target_info) of
-	target_died ->
-	    %% terminate/2 will do the cleanup
-	    {stop,target_died,State};
-	_ ->
-	    {noreply,State}
-    end;
-
+    test_server_node:nodedown(Sock, State#state.target_info),
+    {noreply,State};
 handle_info(_, State) ->
     %% dummy; accept all, do nothing.
     {noreply, State}.
@@ -1340,14 +1117,15 @@ kill_all_jobs([]) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% spawn_tester(Mod, Func, Args, Dir, Name, Levels, CreatePrivDir,
-%%              TestCaseCallback, ExtraTools) -> Pid
+%% spawn_tester(Mod, Func, Args, Dir, Name, Levels, RejectIoReqs,
+%%              CreatePrivDir, TestCaseCallback, ExtraTools) -> Pid
 %% Mod = atom()
 %% Func = atom()
 %% Args = [term(),...]
 %% Dir = string()
 %% Name = string()
 %% Levels = {integer(),integer(),integer()}
+%% RejectIoReqs = bool()
 %% CreatePrivDir = auto_per_run | manual_per_tc | auto_per_tc
 %% TestCaseCallback = {CBMod,CBFunc} | undefined
 %% ExtraTools = [ExtraTool,...]
@@ -1359,24 +1137,23 @@ kill_all_jobs([]) ->
 %% When the named function is done executing, a summary of the results
 %% is printed to the log files.
 
-spawn_tester(Mod, Func, Args, Dir, Name, Levels, 
+spawn_tester(Mod, Func, Args, Dir, Name, Levels, RejectIoReqs,
 	     CreatePrivDir, TCCallback, ExtraTools) ->
-    spawn_link(
-      fun() -> init_tester(Mod, Func, Args, Dir, Name, Levels,
+    spawn_link(fun() ->
+	      init_tester(Mod, Func, Args, Dir, Name, Levels, RejectIoReqs,
 			   CreatePrivDir, TCCallback, ExtraTools)
       end).
 
-init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev},
-	    CreatePrivDir, TCCallback, ExtraTools) ->
+init_tester(Mod, Func, Args, Dir, Name, {_,_,MinLev}=Levels,
+	    RejectIoReqs, CreatePrivDir, TCCallback, ExtraTools) ->
     process_flag(trap_exit, true),
+    test_server_io:start_link(),
     put(test_server_name, Name),
     put(test_server_dir, Dir),
     put(test_server_total_time, 0),
     put(test_server_ok, 0),
     put(test_server_failed, 0),
     put(test_server_skipped, {0,0}),
-    put(test_server_summary_level, SumLev),
-    put(test_server_major_level, MajLev),
     put(test_server_minor_level, MinLev),
     put(test_server_create_priv_dir, CreatePrivDir),
     put(test_server_random_seed, proplists:get_value(random_seed, ExtraTools)),
@@ -1393,23 +1170,30 @@ init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev},
 		    put(test_server_framework_name, list_to_atom(FWName))
 	    end
     end,
+
     %% before first print, read and set logging options
     LogOpts = test_server_sup:framework_call(get_logopts, [], []),
     put(test_server_logopts, LogOpts),
-    put(test_server_log_nl, not lists:member(no_nl, LogOpts)),
+
     StartedExtraTools = start_extra_tools(ExtraTools),
+
+    test_server_io:set_job_name(Name),
+    test_server_io:set_gl_props([{levels,Levels},
+				 {auto_nl,not lists:member(no_nl, LogOpts)},
+				 {reject_io_reqs,RejectIoReqs}]),
+    group_leader(test_server_io:get_gl(true), self()),
     {TimeMy,Result} = ts_tc(Mod, Func, Args),
-    put(test_server_common_io_handler, undefined),
-    stop_extra_tools(StartedExtraTools),
+    set_io_buffering(undefined),
+    test_server_io:set_job_name(undefined),
+    catch stop_extra_tools(StartedExtraTools),
     case Result of
 	{'EXIT',test_suites_done} ->
-	    print(25, "DONE, normal exit", []);
+	    ok;
 	{'EXIT',_Pid,Reason} ->
 	    print(1, "EXIT, reason ~p", [Reason]);
 	{'EXIT',Reason} ->
-	    print(1, "EXIT, reason ~p", [Reason]);
-	_Other ->
-	    print(25, "DONE", [])
+	    report_severe_error(Reason),
+	    print(1, "EXIT, reason ~p", [Reason])
     end,
     Time = TimeMy/1000000,
     SuccessStr =
@@ -1424,9 +1208,15 @@ init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev},
 	end,
     OkN = get(test_server_ok),
     FailedN = get(test_server_failed),
-    print(html,"<tr><td></td><td><b>TOTAL</b></td><td></td><td></td><td></td>"
-	  "<td>~.3fs</td><td><b>~s</b></td><td>~p Ok, ~p Failed~s of ~p</td></tr>\n",
-	  [Time,SuccessStr,OkN,FailedN,SkipStr,OkN+FailedN+SkippedN]).
+    print(html,"\n</tbody>\n<tfoot>\n"
+	  "<tr><td></td><td><b>TOTAL</b></td><td></td><td></td><td></td>"
+	  "<td>~.3fs</td><td><b>~s</b></td><td>~p Ok, ~p Failed~s of ~p</td></tr>\n"
+	  "</tfoot>\n",
+	  [Time,SuccessStr,OkN,FailedN,SkipStr,OkN+FailedN+SkippedN]),
+    test_server_io:stop().
+
+report_severe_error(Reason) ->
+    test_server_sup:framework_call(report, [severe_error,Reason]).
 
 %% timer:tc/3
 ts_tc(M, F, A) ->
@@ -1444,11 +1234,11 @@ elapsed_time(Before, After) ->
 
 start_extra_tools(ExtraTools) ->
     start_extra_tools(ExtraTools, []).
-start_extra_tools([{cover,App,Analyse} | ExtraTools], Started) ->
+start_extra_tools([{cover,App,Analyse,Stop} | ExtraTools], Started) ->
     case cover_compile(App) of
 	{ok,AnalyseMods} ->
 	    start_extra_tools(ExtraTools,
-			      [{cover,App,Analyse,AnalyseMods}|Started]);
+			      [{cover,App,Analyse,AnalyseMods,Stop}|Started]);
 	{error,_} ->
 	    start_extra_tools(ExtraTools, Started)
     end;
@@ -1467,8 +1257,8 @@ stop_extra_tools(ExtraTools) ->
     end,
     stop_extra_tools(ExtraTools, TestDir).
 
-stop_extra_tools([{cover,App,Analyse,AnalyseMods}|ExtraTools], TestDir) ->
-    cover_analyse(App, Analyse, AnalyseMods, TestDir),
+stop_extra_tools([{cover,App,Analyse,AnalyseMods,Stop}|ExtraTools], TestDir) ->
+    cover_analyse(App, Analyse, AnalyseMods, Stop, TestDir),
     stop_extra_tools(ExtraTools, TestDir);
 %%stop_extra_tools([_ | ExtraTools], TestDir) ->
 %%    stop_extra_tools(ExtraTools, TestDir);
@@ -1486,7 +1276,7 @@ stop_extra_tools([], _) ->
 %% Reads the named test suite specification file, and executes it.
 %%
 %% This function is meant to be called by a process created by
-%% spawn_tester/7, which sets up some necessary dictionary values.
+%% spawn_tester/10, which sets up some necessary dictionary values.
 
 do_spec(SpecName, TimetrapSpec) when is_list(SpecName) ->
     case file:consult(SpecName) of
@@ -1535,7 +1325,7 @@ do_spec(SpecName, TimetrapSpec) when is_list(SpecName) ->
 %% should not be used. Use a configuration test case instead.
 %%
 %% This function is meant to be called by a process created by
-%% spawn_tester/7, which sets up some necessary dictionary values.
+%% spawn_tester/10, which sets up some necessary dictionary values.
 
 do_spec_list(TermList0, TimetrapSpec) ->
     Nodes = [],
@@ -1702,7 +1492,7 @@ add_mod(Mod, Mods) ->
 %% configuration information into the log files.
 %%
 %% This function is meant to be called by a process created by
-%% spawn_tester/7, which sets up some necessary dictionary values.
+%% spawn_tester/10, which sets up some necessary dictionary values.
 do_test_cases(TopCases, SkipCases,
 	      Config, MultiplyTimetrap) when is_integer(MultiplyTimetrap);
 					     MultiplyTimetrap == infinity ->
@@ -1741,7 +1531,8 @@ do_test_cases(TopCases, SkipCases,
 	    test_server_sup:framework_call(report, [tests_start,{Test,N}]),
 	    {Header,Footer} =
 		case test_server_sup:framework_call(get_html_wrapper, 
-						    [TestDescr,true,TestDir], "") of
+						    [TestDescr,true,TestDir,
+						    {[],[2,3,4,7,8],[1,6]}], "") of
 		    Empty when (Empty == "") ; (element(2,Empty) == "")  ->
 			put(basic_html, true),
 			{["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n",
@@ -1799,18 +1590,20 @@ do_test_cases(TopCases, SkipCases,
 	    print(html,
 		  "<p><ul>\n"
 		  "<li><a href=\"~s\">Full textual log</a></li>\n"
-		  "<li><a href=\"~s\">Coverage log</a></li>\n</ul></p>\n",
-		  [?suitelog_name,?coverlog_name]),
+		  "<li><a href=\"~s\">Coverage log</a></li>\n"
+		  "<li><a href=\"~s\">Unexpected I/O log</a></li>\n</ul></p>\n",
+		  [?suitelog_name,?coverlog_name,?unexpected_io_log]),
 	    print(html,
 		  "<p>~s</p>\n" ++
-		   xhtml("<table bgcolor=\"white\" border=\"3\" cellpadding=\"5\">",
-			 "<table>") ++
-		   "<tr><th>Num</th><th>Module</th><th>Group</th>" ++
-		   "<th>Case</th><th>Log</th><th>Time</th><th>Result</th>" ++
-		   "<th>Comment</th></tr>\n",
-		  [print_if_known(N, {"<i>Executing <b>~p</b> test cases...</i>\n",[N]},
+		  xhtml("<table bgcolor=\"white\" border=\"3\" cellpadding=\"5\">",
+			["<table id=\"",?sortable_table_name,"\">\n",
+			 "<thead>\n"]) ++
+		      "<tr><th>Num</th><th>Module</th><th>Group</th>" ++
+		      "<th>Case</th><th>Log</th><th>Time</th><th>Result</th>" ++
+		      "<th>Comment</th></tr>\n</thead>\n<tbody>\n",
+		  [print_if_known(N, {"<i>Executing <b>~p</b> test cases...</i>" ++
+				      xhtml("\n<br>\n", "\n<br />\n"),[N]},
 				  {"",[]})]),
-	    print(html, xhtml("<br>", "<br />")),
 
 	    print(major, "=cases         ~p", [get(test_server_cases)]),
 	    print(major, "=user          ~s", [TI#target_info.username]),
@@ -1859,7 +1652,7 @@ start_log_file() ->
 	{error, eexist} ->
 	    ok;
 	MkDirError ->
-	    exit({cant_create_log_dir,{MkDirError,Dir}})
+	    log_file_error(MkDirError, Dir)
     end,
     TestDir = timestamp_filename_get(filename:join(Dir, "run.")),
     TestDir1 =
@@ -1874,20 +1667,26 @@ start_log_file() ->
 		    ok ->
 			TestDirX;
 		    MkDirError2 ->
-			exit({cant_create_log_dir,{MkDirError2,TestDirX}})
+			log_file_error(MkDirError2, TestDirX)
 		end;
 	    MkDirError2 ->
-		exit({cant_create_log_dir,{MkDirError2,TestDir}})
+		log_file_error(MkDirError2, TestDir)
 	end,
     ok = file:write_file(filename:join(Dir, ?last_file), TestDir1 ++ "\n"),
     ok = file:write_file(?last_file, TestDir1 ++ "\n"),
     put(test_server_log_dir_base,TestDir1),
     MajorName = filename:join(TestDir1, ?suitelog_name),
     HtmlName = MajorName ++ ?html_ext,
+    UnexpectedName = filename:join(TestDir1, ?unexpected_io_log),
     {ok,Major} = file:open(MajorName, [write]),
     {ok,Html}  = file:open(HtmlName,  [write]),
+    {ok,Unexpected}  = file:open(UnexpectedName,  [write]),
+    test_server_io:set_fd(major, Major),
+    test_server_io:set_fd(html, Html),
+    test_server_io:set_fd(unexpected_io, Unexpected),
     put(test_server_major_fd,Major),
     put(test_server_html_fd,Html),
+    put(test_server_unexpected_io, Unexpected),
 
     make_html_link(filename:absname(?last_test ++ ?html_ext),
 		   HtmlName, filename:basename(Dir)),
@@ -1898,12 +1697,15 @@ start_log_file() ->
     PrivDir = filename:join(TestDir1, ?priv_dir),
     ok = file:make_dir(PrivDir),
     put(test_server_priv_dir,PrivDir++"/"),
-    print_timestamp(13,"Suite started at "),
+    print_timestamp(major, "Suite started at "),
 
     LogInfo = [{topdir,Dir},{rundir,lists:flatten(TestDir1)}],
     test_server_sup:framework_call(report, [loginfo,LogInfo]),
     {ok,TestDir1}.
 
+log_file_error(Error, Dir) ->
+    exit({cannot_create_log_dir,{Error,lists:flatten(Dir)}}).
+
 make_html_link(LinkName, Target, Explanation) ->
     %% if possible use a relative reference to Target.
     TargetL = filename:split(Target),
@@ -1937,13 +1739,14 @@ make_html_link(LinkName, Target, Explanation) ->
 %% Some header info will also be inserted into the log file.
 
 start_minor_log_file(Mod, Func) ->
+    MFA = {Mod,Func,1},
     LogDir = get(test_server_log_dir_base),
     Name0 = lists:flatten(io_lib:format("~s.~s~s", [Mod,Func,?html_ext])),
     Name = downcase(Name0),
     AbsName = filename:join(LogDir, Name),
     case file:read_file_info(AbsName) of
 	{error,_} ->                         %% normal case, unique name
-	    start_minor_log_file1(Mod, Func, LogDir, AbsName);
+	    start_minor_log_file1(Mod, Func, LogDir, AbsName, MFA);
 	{ok,_} ->                            %% special case, duplicate names
 	    {_,S,Us} = now(),
 	    Name1_0 =
@@ -1952,19 +1755,21 @@ start_minor_log_file(Mod, Func) ->
 							     ?html_ext])),
 	    Name1 = downcase(Name1_0),
 	    AbsName1 = filename:join(LogDir, Name1),
-	    start_minor_log_file1(Mod, Func, LogDir, AbsName1)
+	    start_minor_log_file1(Mod, Func, LogDir, AbsName1, MFA)
     end.
 
-start_minor_log_file1(Mod, Func, LogDir, AbsName) ->
+start_minor_log_file1(Mod, Func, LogDir, AbsName, MFA) ->
     {ok,Fd} = file:open(AbsName, [write]),
     Lev = get(test_server_minor_level)+1000, %% far down in the minor levels
     put(test_server_minor_fd, Fd),
-    
+    test_server_gl:set_minor_fd(group_leader(), Fd, MFA),
+
     TestDescr = io_lib:format("Test ~p:~p result", [Mod,Func]),
     {Header,Footer} =
 	case test_server_sup:framework_call(get_html_wrapper, 
 					    [TestDescr,false,
-					     filename:dirname(AbsName)], "") of
+					     filename:dirname(AbsName),
+					     undefined], "") of
 	    Empty when (Empty == "") ; (element(2,Empty) == "")  ->
 		put(basic_html, true),
 		{["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n",
@@ -1991,7 +1796,7 @@ start_minor_log_file1(Mod, Func, LogDir, AbsName) ->
 	  lists:member(no_src, get(test_server_logopts))} of
 	{true,false} ->
 	    print(Lev, "<a href=\"~s#~s\">source code for ~p:~p/1</a>\n",
-		  [SrcListing,Func,Mod,Func]);
+		  [SrcListing,atom_to_list(Func)++"-1",Mod,Func]);
 	_ -> ok
     end,
 
@@ -2006,6 +1811,7 @@ start_minor_log_file1(Mod, Func, LogDir, AbsName) ->
     AbsName.
 
 stop_minor_log_file() ->
+    test_server_gl:unset_minor_fd(group_leader()),
     Fd = get(test_server_minor_fd),
     Footer = get(test_server_minor_footer),
     io:fwrite(Fd, "</pre>\n" ++ Footer, []),
@@ -2094,7 +1900,7 @@ html_possibly_convert(Src, SrcInfo, Dest) ->
 	    Header =
 		case test_server_sup:framework_call(get_html_wrapper, 
 						    ["Module "++Src,false,
-						     OutDir], "") of
+						     OutDir,undefined], "") of
 		    Empty when (Empty == "") ; (element(2,Empty) == "")  ->
 			["<!DOCTYPE HTML PUBLIC",
 			 "\"-//W3C//DTD HTML 3.2 Final//EN\">\n",
@@ -2281,9 +2087,7 @@ do_add_end_per_suite_and_skip(LastMod, LastRef, Mod, FwMod) ->
 %% Runs the specified tests, then displays/logs the summary.
 
 run_test_cases(TestSpec, Config, TimetrapData) ->
-
-    maybe_open_job_sock(),
-
+    test_server:init_purify(),
     case lists:member(no_src, get(test_server_logopts)) of
 	true ->
 	    ok;
@@ -2293,8 +2097,6 @@ run_test_cases(TestSpec, Config, TimetrapData) ->
 
     run_test_cases_loop(TestSpec, [Config], TimetrapData, [], []),
 
-    maybe_get_privdir(),
-
     {AllSkippedN,UserSkipN,AutoSkipN,SkipStr} =
 	case get(test_server_skipped) of
 	    {0,0} -> {0,0,0,""};
@@ -2313,41 +2115,6 @@ run_test_cases(TestSpec, Config, TimetrapData) ->
     print(major, "=auto_skipped  ~p", [AutoSkipN]),
     exit(test_suites_done).
 
-%% If the test is run at a remote target, this function sets up a socket
-%% communication with the target for handling this particular job.
-maybe_open_job_sock() ->
-    TI = get_target_info(),
-    case TI#target_info.where of
-	local ->
-	    %% local target
-	    test_server:init_purify();
-	MainSock ->
-	    %% remote target
-	    {ok,LSock} = gen_tcp:listen(0, [binary,
-					    {reuseaddr,true},
-					    {packet,4},
-					    {active,false}]),
-	    {ok,Port} = inet:port(LSock),
-	    request(MainSock, {job,Port,get(test_server_name)}),
-	    case gen_tcp:accept(LSock, ?ACCEPT_TIMEOUT) of
-		{ok,Sock} -> put(test_server_ctrl_job_sock, Sock);
-		{error,Reason} -> exit({no_contact,Reason})
-	    end
-    end.
-
-%% If the test is run at a remote target, this function waits for a
-%% tar packet containing the privdir created by the test case.
-maybe_get_privdir() ->
-    case get(test_server_ctrl_job_sock) of
-	undefined ->
-	    %% local target
-	    ok;
-	Sock ->
-	    %% remote target
-	    request(Sock, job_done),
-	    gen_tcp:close(Sock)
-    end.
-
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% run_test_cases_loop(TestCases, Config, TimetrapData, Mode, Status) -> ok
@@ -2426,27 +2193,38 @@ maybe_get_privdir() ->
 %% reason, the Mode argument specifies if a parallel group is currently
 %% being executed.
 %%
-%% A parallel test case process will always set the dictionary value
-%% 'test_server_common_io_handler' to the pid of the main (starting)
-%% process. With this value set, the print/3 function will send print
-%% messages to the main process instead of writing the data to file
-%% (only true for printouts to common log files).
+%% The low-level mechanism for buffering IO for the common log files
+%% is handled by the test_server_io module. Buffering is turned on by
+%% test_server_io:start_transaction/0 and off by calling
+%% test_server_io:end_transaction/0. The buffered data for the transaction
+%% can printed by calling test_server_io:print_buffered/1.
+%%
+%% This module is responsible for turning on IO buffering and to later
+%% test_server_io:print_buffered/1 to print the data. To help with this,
+%% two variables in the process dictionary are used:
+%% 'test_server_common_io_handler' and 'test_server_queued_io'. The values
+%% are set to as follwing:
+%%
+%%   Value	Meaning
+%%   -----     -------
+%%   undefined	No parallel test cases running
+%%   {tc,Pid}	Running test cases in a top-level parallel group
+%%   {Ref,Pid}	Running sequential test case inside a parallel group
+%%
+%% FIXME: The Pid is no longer used.
 %%
 %% If a conf group nested under a parallel group in the test
 %% specification should be started, the 'test_server_common_io_handler'
-%% value gets set also on the main process. This causes all printouts
-%% to common files - both from parallel test cases and from cases
-%% executed by the main process - to all end up as messages in the
-%% inbox of the main process.
+%% value gets set also on the main process.
 %%
 %% During execution of a parallel group (or of a group nested under a
 %% parallel group), *any* new test case being started gets registered
 %% in a list saved in the dictionary with 'test_server_queued_io' as key.
 %% When the top level parallel group is finished (only then can we be
 %% sure all parallel test cases have finished and "reported in"), the
-%% list of test cases is traversed in order and printout messages from
-%% each process - including the main process - are handled in turn. See
-%% handle_test_case_io_and_status/0 for details.
+%% list of test cases is traversed in order and test_server_io:print_buffered/1
+%% can be called for each test case. See handle_test_case_io_and_status/0
+%% for details.
 %%
 %% To be able to handle nested conf groups with different properties,
 %% the Mode argument specifies a list of {Ref,Properties} tuples.
@@ -2589,16 +2367,15 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 
 run_test_cases_loop([{auto_skip_case,{Case,Comment},SkipMode}|Cases],
 		    Config, TimetrapData, Mode, Status) ->
-    {Mod,Func} = skip_case(auto, undefined, get(test_server_case_num)+1, Case, Comment,
-			   (undefined /= get(test_server_common_io_handler)), SkipMode),
+    {Mod,Func} = skip_case(auto, undefined, get(test_server_case_num)+1,
+			   Case, Comment, is_io_buffered(), SkipMode),
     test_server_sup:framework_call(report, [tc_auto_skip,{?pl2a(Mod),Func,Comment}]),
     run_test_cases_loop(Cases, Config, TimetrapData, Mode,
 			update_status(skipped, Mod, Func, Status));
 
 run_test_cases_loop([{skip_case,{conf,Ref,Case,Comment}}|Cases0],
 		    Config, TimetrapData, Mode, Status) ->
-    {Mod,Func} = skip_case(user, Ref, 0, Case, Comment,
-			   (undefined /= get(test_server_common_io_handler))),
+    {Mod,Func} = skip_case(user, Ref, 0, Case, Comment, is_io_buffered()),
     {Cases,Config1} =
 	case curr_ref(Mode) of
 	    Ref ->
@@ -2614,8 +2391,8 @@ run_test_cases_loop([{skip_case,{conf,Ref,Case,Comment}}|Cases0],
 
 run_test_cases_loop([{skip_case,{Case,Comment}}|Cases],
 		    Config, TimetrapData, Mode, Status) ->
-    {Mod,Func} = skip_case(user, undefined, get(test_server_case_num)+1, Case, Comment,
-			   (undefined /= get(test_server_common_io_handler))),
+    {Mod,Func} = skip_case(user, undefined, get(test_server_case_num)+1,
+			   Case, Comment, is_io_buffered()),
     test_server_sup:framework_call(report, [tc_user_skip,{?pl2a(Mod),Func,Comment}]),
     run_test_cases_loop(Cases, Config, TimetrapData, Mode,
 			update_status(skipped, Mod, Func, Status));
@@ -2852,7 +2629,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 	end,
 
     CurrMode = curr_mode(Ref, Mode0, Mode),
-    ConfCaseResult = run_test_case(Ref, 0, Mod, Func, [ActualCfg], skip_init, target,
+    ConfCaseResult = run_test_case(Ref, 0, Mod, Func, [ActualCfg], skip_init,
 				   TimetrapData, CurrMode),
 
     case ConfCaseResult of
@@ -2886,6 +2663,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 	    exit(framework_error);
 	{_,Fail,_} when element(1,Fail) == 'EXIT';
 			element(1,Fail) == timetrap_timeout;
+			element(1,Fail) == user_timetrap_error;
 			element(1,Fail) == failed ->
 	    {Cases2,Config1,Status3} =
 		if StartConf ->
@@ -2905,14 +2683,6 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
 	    run_test_cases_loop(Cases2, Config1, TimetrapData, Mode, Status3);
-	{died,Why,_} when Func == init_per_suite ->
-	    print(minor, "~n*** Unexpected exit during init_per_suite.~n", []),
-	    Reason = {failed,{Mod,init_per_suite,Why}},
-	    Cases2 = skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),
-	    set_io_buffering(IOHandler),
-	    stop_minor_log_file(),
-	    run_test_cases_loop(Cases2, Config, TimetrapData, Mode,
-				delete_status(Ref, Status2));
 	{_,{Skip,Reason},_} when StartConf and ((Skip==skip) or (Skip==skipped)) ->
 	    ReportAbortRepeat(skipped),
 	    print(minor, "~n*** ~p skipped.~n"
@@ -2983,7 +2753,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
     end;
 
 run_test_cases_loop([{make,Ref,{Mod,Func,Args}}|Cases0], Config, TimetrapData, Mode, Status) ->
-    case run_test_case(Ref, 0, Mod, Func, Args, skip_init, host, TimetrapData) of
+    case run_test_case(Ref, 0, Mod, Func, Args, skip_init, TimetrapData) of
 	{_,Why={'EXIT',_},_} ->
  	    print(minor, "~n*** ~p failed.~n"
  		  "    Skipping all cases.", [Func]),
@@ -3014,23 +2784,21 @@ run_test_cases_loop([{Mod,Case}|Cases], Config, TimetrapData, Mode, Status) ->
 
 run_test_cases_loop([{Mod,Func,Args}|Cases], Config, TimetrapData, Mode, Status) ->
     Num = put(test_server_case_num, get(test_server_case_num)+1),
+
     %% check the current execution mode and save info about the case if
     %% detected that printouts to common log files is handled later
-    case check_prop(parallel, Mode) of
+
+    case check_prop(parallel, Mode) =:= false andalso is_io_buffered() of
+	true ->
+	    %% sequential test case nested in a parallel group;
+	    %% io is buffered, so we must queue this test case
+	    queue_test_case_io(undefined, self(), Num+1, Mod, Func);
 	false ->
-	    case get(test_server_common_io_handler) of
-		undefined ->
-		    %% io printouts are written to straight to file
-		    ok;
-		_ ->
-		    %% io messages are buffered, put test case in queue
-		    queue_test_case_io(undefined, self(), Num+1, Mod, Func)
-	    end;
-	_ ->
 	    ok
     end,
+
     case run_test_case(undefined, Num+1, Mod, Func, Args,
-		       run_init, target, TimetrapData, Mode) of
+		       run_init, TimetrapData, Mode) of
 	%% callback to framework module failed, exit immediately
 	{_,{framework_error,{FwMod,FwFunc},Reason},_} ->
 	    print(minor, "~n*** ~p failed in ~p. Reason: ~p~n", [FwMod,FwFunc,Reason]),
@@ -3077,8 +2845,8 @@ run_test_cases_loop([{Mod,Func,Args}|Cases], Config, TimetrapData, Mode, Status)
 	%% the test case is being executed in parallel with the main process (and
 	%% other test cases) and Pid is the dedicated process executing the case
 	Pid ->
-	    %% io from Pid will be buffered in the main process inbox and handled
-	    %% later, so we have to save info about the case
+	    %% io from Pid will be buffered by the test_server_io process and
+	    %% handled later, so we have to save info about the case
 	    queue_test_case_io(undefined, Pid, Num+1, Mod, Func),
 	    run_test_cases_loop(Cases, Config, TimetrapData, Mode, Status)
     end;
@@ -3185,11 +2953,17 @@ get_data_dir(Mod, Suite) ->
 	non_existing ->
 	    print(12, "The module ~p is not loaded", [Mod]),
 	    [];
+	cover_compiled ->
+	    MainCoverNode = cover:get_main_node(),
+	    {file,File} = rpc:call(MainCoverNode,cover,is_compiled,[UseMod]),
+	    do_get_data_dir(UseMod,File);
 	FullPath ->
-	    filename:dirname(FullPath) ++ "/" ++ cast_to_list(UseMod) ++
-		?data_dir_suffix
+	    do_get_data_dir(UseMod,FullPath)
     end.
 
+do_get_data_dir(Mod,File) ->
+    filename:dirname(File) ++ "/" ++ cast_to_list(Mod) ++ ?data_dir_suffix.
+
 print_conf_time(0) ->
     ok;
 print_conf_time(ConfTime) ->
@@ -3333,7 +3107,9 @@ skip_case(Type, Ref, CaseNum, Case, Comment, SendSync, Mode) ->
     if SendSync ->
 	    queue_test_case_io(Ref, self(), CaseNum, Mod, Func),
 	    self() ! {started,Ref,self(),CaseNum,Mod,Func},
+	    test_server_io:start_transaction(),
 	    skip_case1(Type, CaseNum, Mod, Func, Comment, Mode),
+	    test_server_io:end_transaction(),
 	    self() ! {finished,Ref,self(),CaseNum,Mod,Func,skipped,{0,skipped,[]}};
        not SendSync ->
 	    skip_case1(Type, CaseNum, Mod, Func, Comment, Mode)
@@ -3474,13 +3250,20 @@ modify_cases_upto1(Ref, CopyOp, [C|T], Orig, Alt) ->
 %%
 %% Save info about current process (always the main process) buffering
 %% io printout messages from parallel test case processes (*and* possibly
-%% also the main process). If the value is the default 'undefined',
-%% io is not buffered but printed directly to file (see print/3).
+%% also the main process).
 
 set_io_buffering(IOHandler) ->
     put(test_server_common_io_handler, IOHandler).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% is_io_buffered() -> true|false
+%%
+%% Test whether is being buffered.
+
+is_io_buffered() ->
+    get(test_server_common_io_handler) =/= undefined.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% queue_test_case_io(Pid, Num, Mod, Func) -> ok
 %%
 %% Save info about test case that gets its io buffered. This can
@@ -3527,7 +3310,7 @@ wait_and_resend(Ref, [{_,CurrPid,CaseNum,Mod,Func}|Ps] = Cases, Ok,Skip,Fail) ->
     receive
 	{finished,_Ref,CurrPid,CaseNum,Mod,Func,Result,_RetVal} = Msg ->
 	    %% resend message to main process so that it can be used
-	    %% to handle buffered io messages later
+	    %% to test_server_io:print_buffered/1 later
 	    self() ! Msg,
 	    MF = {Mod,Func},
 	    {Ok1,Skip1,Fail1} =
@@ -3558,16 +3341,18 @@ rm_cases_upto(Ref, [_|Ps]) ->
 %%
 %% Each parallel test case process prints to its own minor log file during
 %% execution. The common log files (major, html etc) must however be
-%% written to sequentially. The test case processes send print requests
-%% to the main (starting) process (the same process executing
-%% run_test_cases_loop/4), which handles these requests in the same
-%% order that the test case processes were started.
-%%
-%% An io session is always started with a {started,Ref,Pid,Num,Mod,Func}
-%% message and terminated with {finished,Ref,Pid,Num,Mod,Func,Result,RetVal}.
-%% The result shipped with the finished message from a parallel process
-%% is used to update status data of the current test run. An 'EXIT'
-%% message from each parallel test case process (after finishing and
+%% written to sequentially. This is handled by calling
+%% test_server_io:start_transaction/0 to tell the test_server_io process
+%% to buffer all print requests.
+%%
+%% An io session is always started with a
+%% {started,Ref,Pid,Num,Mod,Func} message (and
+%% test_server_io:start_transaction/0 will be called) and terminated
+%% with {finished,Ref,Pid,Num,Mod,Func,Result,RetVal} (and
+%% test_server_io:end_transaction/0 will be called).  The result
+%% shipped with the finished message from a parallel process is used
+%% to update status data of the current test run. An 'EXIT' message
+%% from each parallel test case process (after finishing and
 %% terminating) is also received and handled here.
 %%
 %% During execution of a parallel group, any cases (conf or normal)
@@ -3576,13 +3361,13 @@ rm_cases_upto(Ref, [_|Ps]) ->
 %% correct sequence. This function handles also the print messages
 %% generated by nested group cases that have been executed sequentially
 %% by the main process (note that these cases do not generate 'EXIT'
-%% messages, only 'start', 'print' and 'finished' messages).
+%% messages, only 'start' and 'finished' messages).
 %%
 %% See the header comment for run_test_cases_loop/4 for more
 %% info about IO handling.
 %%
 %% Note: It is important that the type of messages handled here
-%% do not get consumated by test_server:run_test_case_msgloop/5
+%% do not get consumed by test_server:run_test_case_msgloop/5
 %% during the test case execution (e.g. in the catch clause of
 %% the receive)!
 
@@ -3609,7 +3394,7 @@ handle_test_case_io_and_status() ->
 
 %% Handle cases (without Ref) that belong to the top parallel group (i.e. when Refs = [])
 handle_io_and_exit_loop([], [{undefined,CurrPid,CaseNum,Mod,Func}|Ps] = Cases, Ok,Skip,Fail) ->
-    %% retreive the start message for the current io session (= testcase)
+    %% retrieve the start message for the current io session (= testcase)
     receive
 	{started,_,CurrPid,CaseNum,Mod,Func} ->
 	    {Ok1,Skip1,Fail1} =
@@ -3649,11 +3434,18 @@ handle_io_and_exit_loop(_, [], Ok,Skip,Fail) ->
 
 handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases) ->
     receive
+	{abort_current_testcase=Tag,_Reason,From} ->
+	    %% If a parallel group is executing, there is no unique
+	    %% current test case, so we must generate an error.
+	    From ! {self(),Tag,{error,parallel_group}},
+	    handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases);
 	%% end of io session from test case executed by main process
 	{finished,_,Main,CaseNum,Mod,Func,Result,_RetVal} ->
+	    test_server_io:print_buffered(CurrPid),
 	    {Result,{Mod,Func}};
 	%% end of io session from test case executed by parallel process
 	{finished,_,CurrPid,CaseNum,Mod,Func,Result,RetVal} ->
+	    test_server_io:print_buffered(CurrPid),
 	    case Result of
 		ok ->
 		    put(test_server_ok, get(test_server_ok)+1);
@@ -3666,13 +3458,9 @@ handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases) ->
 	    end,
 	    {Result,{Mod,Func}};
 
-	%% print to common log file
-	{print,CurrPid,Detail,Msg} ->
-	    output({Detail,Msg}, internal),
-	    handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases);
-
 	%% unexpected termination of test case process
 	{'EXIT',TCPid,Reason} when Reason /= normal ->
+	    test_server_io:print_buffered(CurrPid),
 	    {value,{_,_,Num,M,F}} = lists:keysearch(TCPid, 2, Cases),
 	    print(1, "Error! Process for test case #~p (~p:~p) died! Reason: ~p",
 		  [Num, M, F, Reason]),
@@ -3704,59 +3492,52 @@ handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases) ->
 %% RetVal is the result of executing the test case. It contains info
 %% about the execution time and the return value of the test case function.
 
-run_test_case(Ref, Num, Mod, Func, Args, RunInit, Where, TimetrapData) ->
+run_test_case(Ref, Num, Mod, Func, Args, RunInit, TimetrapData) ->
     file:set_cwd(filename:dirname(get(test_server_dir))),
-    run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
-		   TimetrapData, [], [], self()).
+    run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
+		   TimetrapData, [], self()).
 
-run_test_case(Ref, Num, Mod, Func, Args, skip_init, Where, TimetrapData, Mode) ->
+run_test_case(Ref, Num, Mod, Func, Args, skip_init, TimetrapData, Mode) ->
     %% a conf case is always executed by the main process
-    run_test_case1(Ref, Num, Mod, Func, Args, skip_init, Where,
-		   TimetrapData, [], Mode, self());
+    run_test_case1(Ref, Num, Mod, Func, Args, skip_init,
+		   TimetrapData, Mode, self());
 
-run_test_case(Ref, Num, Mod, Func, Args, RunInit, Where, TimetrapData, Mode) ->
+run_test_case(Ref, Num, Mod, Func, Args, RunInit, TimetrapData, Mode) ->
     file:set_cwd(filename:dirname(get(test_server_dir))),
+    Main = self(),
     case check_prop(parallel, Mode) of
 	false ->
 	    %% this is a sequential test case
-	    run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
-			   TimetrapData, [], Mode, self());
+	    run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
+			   TimetrapData, Mode, Main);
 	_Ref ->
 	    %% this a parallel test case, spawn the new process
-	    Main = self(),
-	    {dictionary,State} = process_info(self(), dictionary),
-	    spawn_link(fun() ->
-			   run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
-					  TimetrapData, State, Mode, Main)
-		       end)
+	    Dictionary = get(),
+	    {dictionary,Dictionary} = process_info(self(), dictionary),
+	    spawn_link(
+	      fun() ->
+		      process_flag(trap_exit, true),
+		      [put(Key, Val) || {Key,Val} <- Dictionary],
+		      set_io_buffering({tc,Main}),
+		      run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
+				     TimetrapData, Mode, Main)
+	      end)
     end.
 
-run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
-	       TimetrapData, State, Mode, Main) ->
-    %% if this runs on a parallel test case process,
-    %% copy the dictionary from the main process
-    do_if_parallel(Main, fun() -> process_flag(trap_exit, true) end, ok),
-    CopyDict = fun() -> lists:foreach(fun({Key,Val}) ->
-					      put(Key, Val)
-				      end, State)
-	       end,
-    do_if_parallel(Main, CopyDict, ok),
-    do_if_parallel(Main, fun() -> 
-				 put(test_server_common_io_handler, {tc,Main})
-			 end, ok),
+run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
+	       TimetrapData, Mode, Main) ->
+    group_leader(test_server_io:get_gl(Main == self()), self()),
+
     %% if io is being buffered, send start io session message
     %% (no matter if case runs on parallel or main process)
-    case get(test_server_common_io_handler) of
-	undefined -> ok;
-	_ -> Main ! {started,Ref,self(),Num,Mod,Func}
+    case is_io_buffered() of
+	false -> ok;
+	true ->
+	    test_server_io:start_transaction(),
+	    Main ! {started,Ref,self(),Num,Mod,Func}
     end,
     TSDir = get(test_server_dir),
-    case Where of
-	target ->
-	    maybe_send_beam_and_datadir(Mod);
-	host ->
-	    ok
-    end,
+
     print(major, "=case          ~p:~p", [Mod, Func]),
     MinorName = start_minor_log_file(Mod, Func),
     print(minor, "<a name=\"top\"></a>", [], internal_raw),
@@ -3808,11 +3589,12 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
 	  [num2str(Num),fw_name(Mod),GroupName,MinorBase,Func,
 	   MinorBase,MinorBase]),
 
-    do_if_parallel(Main, ok, fun erlang:yield/0),
+    do_unless_parallel(Main, fun erlang:yield/0),
+
     %% run the test case
     {Result,DetectedFail,ProcsBefore,ProcsAfter} =
 	run_test_case_apply(Num, Mod, Func, [UpdatedArgs], get_name(Mode),
-			    RunInit, Where, TimetrapData),
+			    RunInit, TimetrapData),
     {Time,RetVal,Loc,Opts,Comment} =
 	case Result of
 	    Normal={_Time,_RetVal,_Loc,_Opts,_Comment} -> Normal;
@@ -3824,7 +3606,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
     print_timestamp(minor, "Ended at "),
     print(major, "=ended         ~s", [lists:flatten(timestamp_get(""))]),
 
-    do_if_parallel(Main, ok, fun() -> file:set_cwd(filename:dirname(TSDir)) end),
+    do_unless_parallel(Main, fun() -> file:set_cwd(filename:dirname(TSDir)) end),
 
     %% call the appropriate progress function clause to print the results to log
     Status =
@@ -3929,14 +3711,17 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
        true ->
 	    ok
     end,
-    check_new_crash_dumps(Where),
+    test_server_sup:check_new_crash_dumps(),
 
     %% if io is being buffered, send finished message
     %% (no matter if case runs on parallel or main process)
-    case get(test_server_common_io_handler) of
-	undefined -> ok;
-	_ -> Main ! {finished,Ref,self(),Num,Mod,Func,
-		     ?mod_result(Status),{Time,RetVal,Opts}}
+    case is_io_buffered() of
+	false ->
+	    ok;
+	true ->
+	    test_server_io:end_transaction(),
+	    Main ! {finished,Ref,self(),Num,Mod,Func,
+		    ?mod_result(Status),{Time,RetVal,Opts}}
     end,
     {Time,RetVal,Opts}.
 
@@ -3944,126 +3729,16 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
 %%--------------------------------------------------------------------
 %% various help functions
 
-%% Call If() if we're on parallel process, or
-%% call Else() if we're on main process
-do_if_parallel(Pid, If, Else) ->
+%% Call Action if we are running on the main process (not parallel).
+do_unless_parallel(Main, Action) when is_function(Action, 0) ->
     case self() of
-	Pid ->
-	    if is_function(Else) -> Else();
-	       true -> Else
-	    end;
-	_ ->
-	    if is_function(If) -> If();
-	       true -> If
-	    end
+	Main -> Action();
+	_ -> ok
     end.
 
 num2str(0) -> "";
 num2str(N) -> integer_to_list(N).
 
-%% If remote target, this function sends the test suite (if not already sent)
-%% and the content of datadir til target.
-maybe_send_beam_and_datadir(Mod) ->
-    case get(test_server_ctrl_job_sock) of
-	undefined ->
-	    %% local target
-	    ok;
-	JobSock ->
-	    %% remote target
-	    case get(test_server_downloaded_suites) of
-		undefined ->
-		    send_beam_and_datadir(Mod, JobSock),
-		    put(test_server_downloaded_suites, [Mod]);
-		Suites ->
-		    case lists:member(Mod, Suites) of
-			false ->
-			    send_beam_and_datadir(Mod, JobSock),
-			    put(test_server_downloaded_suites, [Mod|Suites]);
-			true ->
-			    ok
-		    end
-	    end
-    end.
-
-send_beam_and_datadir(Mod, JobSock) ->
-    case code:which(Mod) of
-	non_existing ->
-	    io:format("** WARNING: Suite ~w could not be found on host\n",
-		      [Mod]);
-	BeamFile ->
-	    send_beam(JobSock, Mod, BeamFile)
-    end,
-    DataDir = get_data_dir(Mod),
-    case file:read_file_info(DataDir) of
-	{ok,_I} ->
-	    {ok,All} = file:list_dir(DataDir),
-	    AddTarFiles =
-		case controller_call(get_target_info) of
-		    #target_info{os_family=ose} ->
-			ObjExt = code:objfile_extension(),
-			Wc = filename:join(DataDir, "*" ++ ObjExt),
-			ModsInDatadir = filelib:wildcard(Wc),
-			SendBeamFun = fun(X) -> send_beam(JobSock, X) end,
-			lists:foreach(SendBeamFun, ModsInDatadir),
-			%% No need to send C code or makefiles since
-			%% no compilation can be done on target anyway.
-			%% Compiled C code must exist on target.
-			%% Beam files are already sent as binaries.
-			%% Erlang source are sent in case the test case
-			%% is to compile it.
-			Filter = fun("Makefile") -> false;
-				    ("Makefile.src") -> false;
-				    (Y) ->
-					 case filename:extension(Y) of
-					     ".c"   -> false;
-					     ObjExt -> false;
-					     _      -> true
-					 end
-				 end,
-			lists:filter(Filter, All);
-		    _ ->
-			All
-		end,
-	    Tarfile =  "data_dir.tar.gz",
-	    {ok,Tar} = erl_tar:open(Tarfile, [write,compressed]),
-	    ShortDataDir = filename:basename(DataDir),
-	    AddTarFun =
-		fun(File) ->
-			Long = filename:join(DataDir, File),
-			Short = filename:join(ShortDataDir, File),
-			ok = erl_tar:add(Tar, Long, Short, [])
-		end,
-	    lists:foreach(AddTarFun, AddTarFiles),
-	    ok = erl_tar:close(Tar),
-	    {ok,TarBin} = file:read_file(Tarfile),
-	    file:delete(Tarfile),
-	    request(JobSock, {{datadir,Tarfile}, TarBin});
-	{error,_R} ->
-	    ok
-    end.
-
-send_beam(JobSock, BeamFile) ->
-    Mod=filename:rootname(filename:basename(BeamFile), code:objfile_extension()),
-    send_beam(JobSock, list_to_atom(Mod), BeamFile).
-send_beam(JobSock, Mod, BeamFile) ->
-    {ok,BeamBin} = file:read_file(BeamFile),
-    request(JobSock, {{beam,Mod,BeamFile}, BeamBin}).
-
-check_new_crash_dumps(Where) ->
-    case Where of
-	target ->
-	    case get(test_server_ctrl_job_sock) of
-		undefined ->
-		    ok;
-		Socket ->
-		    read_job_sock_loop(Socket)
-	    end;
-	_ ->
-	    ok
-    end,
-    test_server_sup:check_new_crash_dumps().
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% progress(Result, CaseNum, Mod, Func, Location, Reason, Time,
 %%	    Comment, TimeFormat) -> Result
@@ -4431,11 +4106,10 @@ do_format_exception(Reason={Error,Stack}) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit,
-%%                     Where, TimetrapData) ->
+%%                     TimetrapData) ->
 %%  {{Time,RetVal,Loc,Opts,Comment},DetectedFail,ProcessesBefore,ProcessesAfter} |
 %%  {{died,Reason,unknown,Comment},DetectedFail,ProcessesBefore,ProcessesAfter}
 %% Name = atom()
-%% Where = target | host
 %% Time = float()   (seconds)
 %% RetVal = term()
 %% Loc = term()
@@ -4450,21 +4124,10 @@ do_format_exception(Reason={Error,Stack}) ->
 %% sent over socket to target, and test_server runs the case and sends the
 %% result back over the socket. Else test_server runs the case directly on host.
 
-run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, host, TimetrapData) ->
+run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit,
+		    TimetrapData) ->
     test_server:run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,
-				     TimetrapData});
-run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, target, TimetrapData) ->
-    case get(test_server_ctrl_job_sock) of
-	undefined ->
-	    %% local target
-	    test_server:run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,
-					     TimetrapData});
-	JobSock ->
-	    %% remote target
-	    request(JobSock, {test_case,{CaseNum,Mod,Func,Args,Name,RunInit,
-					 TimetrapData}}),
-	    read_job_sock_loop(JobSock)
-    end.
+				     TimetrapData}).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% print(Detail, Format, Args) -> ok
@@ -4474,16 +4137,6 @@ run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, target, TimetrapDat
 %%
 %% Just like io:format, except that depending on the Detail value, the output
 %% is directed to console, major and/or minor log files.
-%%
-%% To handle printouts to common (not minor) log files from parallel test
-%% case processes, the test_server_common_io_handler value is checked. If
-%% set, the data is sent to the main controlling process. Note that test
-%% cases that belong to a conf group nested under a parallel group will also
-%% get its io data sent to main rather than immediately printed out, even
-%% if the test cases are executed by the same, main, process (ie the main
-%% process sends messages to itself then).
-%%
-%% Buffered io is handled by the handle_test_case_io_and_status/0 function.
 
 print(Detail, Format) ->
     print(Detail, Format, []).
@@ -4496,19 +4149,7 @@ print(Detail, Format, Args, Printer) ->
     print_or_buffer(Detail, Msg, Printer).
 
 print_or_buffer(Detail, Msg, Printer) ->
-    case get(test_server_minor_level) of
-	_ when Detail == minor ->
-	    output({Detail,Msg}, Printer);
-	MinLevel when is_number(Detail), Detail >= MinLevel ->
-	    output({Detail,Msg}, Printer);
-	_ ->					% Detail < Minor | major | html
-	    case get(test_server_common_io_handler) of
-		undefined ->
-		    output({Detail,Msg}, Printer);
-		{_,MainPid} ->
-		    MainPid ! {print,self(),Detail,Msg}
-	    end
-    end.
+    test_server_gl:print(group_leader(), Detail, Msg, Printer).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% print_timestamp(Detail, Leader) -> ok
@@ -4572,112 +4213,6 @@ format(Detail, Format, Args) ->
     print_or_buffer(Detail, Str, self()).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% output({Level,Message}, Sender) -> ok
-%% Level = integer() | minor | major | html
-%% Message = string() | [integer()]
-%% Sender = string() | internal
-%%
-%% Outputs the message on the channels indicated by Level. If Level is an
-%% atom, only the corresponding channel receives the output. When Level is
-%% an integer console, major and/or minor log file will receive output
-%% depending on the user set thresholds (see get_levels/0, set_levels/3)
-%%
-%% When printing on the console, the message is prefixed with the test
-%% suite's name. In case a name is not set (yet), Sender is used.
-%%
-%% When not outputting to the console, and the Sender is 'internal',
-%% the message is prefixed with "=== ", so that it will be apparent that
-%% the message comes from the test server and not the test suite itself.
-
-output({Level,Msg}, Sender) when is_integer(Level) ->
-    SumLev = get(test_server_summary_level),
-    if  Level =< SumLev ->
-	    output_to_fd(stdout, Msg, Sender);
-	true ->
-	    ok
-    end,
-    MajLev = get(test_server_major_level),
-    if  Level =< MajLev ->
-	    output_to_fd(get(test_server_major_fd), Msg, Sender);
-	true ->
-	    ok
-    end,
-    MinLev = get(test_server_minor_level),
-    if  Level >= MinLev ->
-	    output_to_fd(get(test_server_minor_fd), Msg, Sender);
-	true ->
-	    ok
-    end;
-output({minor,Bytes}, Sender) when is_list(Bytes) ->
-    output_to_fd(get(test_server_minor_fd), Bytes, Sender);
-output({major,Bytes}, Sender) when is_list(Bytes) ->
-    output_to_fd(get(test_server_major_fd), Bytes, Sender);
-output({minor,Bytes}, Sender) when is_binary(Bytes) ->
-    output_to_fd(get(test_server_minor_fd),binary_to_list(Bytes), Sender);
-output({major,Bytes}, Sender) when is_binary(Bytes) ->
-    output_to_fd(get(test_server_major_fd),binary_to_list(Bytes), Sender);
-output({html,Msg}, _Sender) ->
-    case get(test_server_html_fd) of
-	undefined ->
-	    ok;
-	Fd ->
-	    io:put_chars(Fd,Msg),
-	    case file:position(Fd, {cur, 0}) of
-		{ok, Pos} ->
-		    %% We are writing to a seekable file.  Finalise so
-		    %% we get complete valid (and viewable) HTML code.
-		    %% Then rewind to overwrite the finalising code.
-		    io:put_chars(Fd, "\n</table>\n"),
-		    case get(test_server_html_footer) of
-			undefined ->
-			    io:put_chars(Fd, "</body>\n</html>\n");
-			Footer ->
-			    io:put_chars(Fd, Footer)
-		    end,
-		    file:position(Fd, Pos);
-		{error, epipe} ->
-		    %% The file is not seekable.  We cannot erase what
-		    %% we've already written --- so the reader will
-		    %% have to wait until we're done.
-		    ok
-	    end
-    end;
-output({minor,Data}, Sender) ->
-    output_to_fd(get(test_server_minor_fd),
-		 lists:flatten(io_lib:format(
-				 "Unexpected output: ~p~n", [Data])),Sender);
-output({major,Data}, Sender) ->
-    output_to_fd(get(test_server_major_fd),
-		 lists:flatten(io_lib:format(
-				 "Unexpected output: ~p~n", [Data])),Sender).
-
-output_to_fd(stdout, Msg, Sender) ->
-    Name =
-	case get(test_server_name) of
-	    undefined -> Sender;
-	    Other -> Other
-	end,
-    io:format("Testing ~s: ~s\n", [Name, lists:flatten(Msg)]);
-output_to_fd(undefined, _Msg, _Sender) ->
-    ok;
-output_to_fd(Fd, [$=|Msg], internal) ->
-    io:put_chars(Fd, [$=]),
-    io:put_chars(Fd, Msg),
-    io:put_chars(Fd, "\n");
-
-output_to_fd(Fd, Msg, internal) ->
-    io:put_chars(Fd, [$=,$=,$=,$ ]),
-    io:put_chars(Fd, Msg),
-    io:put_chars(Fd, "\n");
-
-output_to_fd(Fd, Msg, _Sender) ->
-    io:put_chars(Fd, Msg),
-    case get(test_server_log_nl) of
-	false -> ok;
-	_     -> io:put_chars(Fd, "\n")
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% xhtml(BasicHtml, XHtml) -> BasicHtml | XHtml
 %%
 xhtml(HTML, XHTML) ->
@@ -5189,7 +4724,7 @@ get_target_info() ->
 %% Called by test_server. See test_server:start_node/3 for details
 
 start_node(Name, Type, Options) ->
-    T = 10 * ?ACCEPT_TIMEOUT, % give some extra time
+    T = 10 * ?ACCEPT_TIMEOUT * test_server:timetrap_scale_factor(),
     format(minor, "Attempt to start ~w node ~p with options ~p",
 	   [Type, Name, Options]),
     case controller_call({start_node,Name,Type,Options}, T) of
@@ -5234,7 +4769,8 @@ start_node(Name, Type, Options) ->
 %% when the new node has contacted test_server_ctrl again
 
 wait_for_node(Slave) ->
-    case catch controller_call({wait_for_node,Slave},10000) of
+    T = 10000 * test_server:timetrap_scale_factor(),
+    case catch controller_call({wait_for_node,Slave},T) of
 	{'EXIT',{timeout,_}} -> {error,timeout};
 	ok -> ok
     end.
@@ -5258,60 +4794,6 @@ stop_node(Slave) ->
     controller_call({stop_node,Slave}).
 
 
-%%--------------------------------------------------------------------
-%% Functions handling target communication over socket
-
-%% Generic send function for communication with target
-request(Sock,Request) ->
-    gen_tcp:send(Sock,<<1,(term_to_binary(Request))/binary>>).
-
-%% Receive and decode request on job specific socket
-%% Used when test is running on a remote target
-read_job_sock_loop(Sock) ->
-    case gen_tcp:recv(Sock,0) of
-	{error,Reason} ->
-	    gen_tcp:close(Sock),
-	    exit({controller,connection_lost,Reason});
-	{ok,<<1,Request/binary>>} ->
-	    case decode(binary_to_term(Request)) of
-		ok ->
-		    read_job_sock_loop(Sock);
-		{stop,Result} ->
-		    Result
-	    end
-    end.
-
-decode({apply,{M,F,A}}) ->
-    apply(M,F,A),
-    ok;
-decode({sync_apply,{M,F,A}}) ->
-    R = apply(M,F,A),
-    request(get(test_server_ctrl_job_sock),{sync_result,R}),
-    ok;
-decode({sync_result,Result}) ->
-    {stop,Result};
-decode({test_case_result,Result}) ->
-    {stop,Result};
-decode({privdir,empty_priv_dir}) ->
-    {stop,ok};
-decode({{privdir,PrivDirTar},TarBin}) ->
-    Root = get(test_server_log_dir_base),
-    unpack_tar(Root,PrivDirTar,TarBin),
-    {stop,ok};
-decode({crash_dumps,no_crash_dumps}) ->
-    {stop,ok};
-decode({{crash_dumps,CrashDumpTar},TarBin}) ->
-    Dir = test_server_sup:crash_dump_dir(),
-    unpack_tar(Dir,CrashDumpTar,TarBin),
-    {stop,ok}.
-
-unpack_tar(Dir,TarFileName0,TarBin) ->
-    TarFileName = filename:join(Dir,TarFileName0),
-    ok = file:write_file(TarFileName,TarBin),
-    ok = erl_tar:extract(TarFileName,[compressed,{cwd,Dir}]),
-    ok = file:delete(TarFileName).
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%                        DEBUGGER INTERFACE                        %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -5456,16 +4938,7 @@ cover_compile({App,CoverFile}) ->
     cover_compile1({App,Exclude,Include,Cross}).
 
 cover_compile1(What) ->
-    case get(test_server_ctrl_job_sock) of
-	undefined ->
-	    %% local target
-	    test_server:cover_compile(What);
-	JobSock ->
-	    %% remote target
-	    request(JobSock, {sync_apply,{test_server,cover_compile,[What]}}),
-	    read_job_sock_loop(JobSock)
-    end.
-
+    test_server:cover_compile(What).
 
 %% Read the coverfile for an application and return a list of modules
 %% that are members of the application but shall not be compiled
@@ -5517,7 +4990,7 @@ check_cover_file([], Exclude, Include) ->
 %%
 %% This per application analysis writes the file cover.html in the
 %% application's run.<timestamp> directory.
-cover_analyse({App,CoverInfo}, Analyse, AnalyseMods, TestDir) ->
+cover_analyse({App,CoverInfo}, Analyse, AnalyseMods, Stop, TestDir) ->
     write_default_cross_coverlog(TestDir),
 
     {ok,CoverLog} = file:open(filename:join(TestDir, ?coverlog_name), [write]),
@@ -5548,7 +5021,7 @@ cover_analyse({App,CoverInfo}, Analyse, AnalyseMods, TestDir) ->
 
     io:fwrite(CoverLog, "<p>Excluded module(s): <code>~p</code>\n", [Excluded]),
 
-    Coverage = cover_analyse(Analyse, AnalyseMods),
+    Coverage = cover_analyse(Analyse, AnalyseMods, Stop),
 
     case lists:filter(fun({_M,{_,_,_}}) -> false;
 			 (_) -> true
@@ -5565,32 +5038,27 @@ cover_analyse({App,CoverInfo}, Analyse, AnalyseMods, TestDir) ->
     file:write_file(filename:join(TestDir, ?cover_total),
 		    term_to_binary(TotPercent)).
 
-cover_analyse(Analyse, AnalyseMods) ->
+cover_analyse(Analyse, AnalyseMods, Stop) ->
     TestDir = get(test_server_log_dir_base),
-    case get(test_server_ctrl_job_sock) of
-	undefined ->
-	    %% local target
-	    test_server:cover_analyse({Analyse,TestDir}, AnalyseMods);
-	JobSock ->
-	    %% remote target
-	    request(JobSock, {sync_apply,{test_server,
-					  cover_analyse,
-					  [Analyse,AnalyseMods]}}),
-	    read_job_sock_loop(JobSock)
-    end.
+    test_server:cover_analyse({Analyse,TestDir}, AnalyseMods, Stop).
 
 
 %% Cover analysis, cross application
 %% This can be executed on any node after all tests are finished.
-%% The node's current directory must be the same as when the tests
-%% were run.
-cross_cover_analyse(Analyse) ->
-    cross_cover_analyse(Analyse, undefined).
-
-cross_cover_analyse(Analyse, CrossModules) ->
-    CoverdataFiles = get_coverdata_files(),
+%% Apps = [{App,Dir}]
+%%   App = atom(), application name
+%%   Dir = string(), the log directory for App, normally where
+%%                   run.<timestamp> is found.
+%%   Modules = [atom()], modules that have been cover compiled during tests
+%%                       of other apps than the one they belong to.
+cross_cover_analyse(Analyse, Apps) ->
+    cross_cover_analyse(Analyse, Apps, get_cross_modules()).
+cross_cover_analyse(Analyse, Apps, Modules) ->
+    Apps1 = get_latest_run_dirs(Apps),
+    Apps2 = add_cross_modules(Modules,Apps1),
+    CoverdataFiles = get_coverdata_files(Apps2),
     lists:foreach(fun(CDF) -> cover:import(CDF) end, CoverdataFiles),
-    io:fwrite("Cover analysing... ", []),
+    io:fwrite("Cover analysing...\n", []),
     DetailsFun =
 	case Analyse of
 	    details ->
@@ -5604,25 +5072,15 @@ cross_cover_analyse(Analyse, CrossModules) ->
 	    _ ->
 		fun(_,_) -> undefined end
 	end,
-    SortedModules =
-	case CrossModules of
-	    undefined ->
-		sort_modules([Mod || Mod <- get_all_cross_modules(),
-				     lists:member(Mod, cover:imported_modules())], []);
-	    _ ->
-		sort_modules(CrossModules, [])
-	end,
-    Coverage = analyse_apps(SortedModules, DetailsFun, []),
+    Coverage = analyse_apps(Apps2, DetailsFun, []),
     cover:stop(),
-    write_cross_cover_logs(Coverage).
+    write_cross_cover_logs(Coverage,Apps2).
 
-%% For each application from which there are modules listed in the
-%% cross.cover, write a cross cover log (cross_cover.html).
-write_cross_cover_logs([{App,Coverage}|T]) ->
-    case last_test_for_app(App) of
-	false ->
-	    ok;
-	Dir ->
+%% For each application from which there are cross cover analysed
+%% modules, write a cross cover log (cross_cover.html).
+write_cross_cover_logs([{App,Coverage}|T],Apps) ->
+    case lists:keyfind(App,1,Apps) of
+	{_,Dir,Mods} when Mods=/=[] ->
 	    CoverLogName = filename:join(Dir,?cross_coverlog_name),
 	    {ok,CoverLog} = file:open(CoverLogName, [write]),
 	    write_coverlog_header(CoverLog),
@@ -5630,54 +5088,51 @@ write_cross_cover_logs([{App,Coverage}|T]) ->
 		      "<h1>Coverage results for \'~w\' from all tests</h1>\n",
 		      [App]),
 	    write_cover_result_table(CoverLog, Coverage),
-	    io:fwrite("Written file ~p\n", [CoverLogName])
+	    io:fwrite("Written file ~p\n", [CoverLogName]);
+	_ ->
+	    ok
     end,
-    write_cross_cover_logs(T);
-write_cross_cover_logs([]) ->
+    write_cross_cover_logs(T,Apps);
+write_cross_cover_logs([],_) ->
     io:fwrite("done\n", []).
 
-%% Find all exported coverdata files. First find all the latest
-%% run.<timestamp> directories, and the check if there is a file named
-%% all.coverdata.
-get_coverdata_files() ->
-    PossibleFiles = [last_coverdata_file(Dir) ||
-			Dir <- filelib:wildcard([$*|?logdir_ext]),
-			filelib:is_dir(Dir)],
-    [File || File <- PossibleFiles, filelib:is_file(File)].
-
-last_coverdata_file(Dir) ->
-    LastDir = last_test(filelib:wildcard(filename:join(Dir,"run.[1-2]*")),false),
-    filename:join(LastDir,"all.coverdata").
-
-
-%% Find the latest run.<timestamp> directory for the given application.
-last_test_for_app(App) ->
-    AppLogDir = atom_to_list(App)++?logdir_ext,
-    last_test(filelib:wildcard(filename:join(AppLogDir,"run.[1-2]*")),false).
-
-last_test([Run|Rest], false) ->
-    last_test(Rest, Run);
-last_test([Run|Rest], Latest) when Run > Latest ->
-    last_test(Rest, Run);
-last_test([_|Rest], Latest) ->
-    last_test(Rest, Latest);
-last_test([], Latest) ->
+%% Get the latest run.<timestamp> directories
+get_latest_run_dirs([{App,Dir}|Apps]) ->
+    [{App,get_latest_run_dir(Dir)} | get_latest_run_dirs(Apps)];
+get_latest_run_dirs([]) ->
+    [].
+
+get_latest_run_dir(Dir) ->
+    case filelib:wildcard(filename:join(Dir,"run.[1-2]*")) of
+	[] ->
+	    Dir;
+	[H|T] ->
+	    get_latest_dir(T,H)
+    end.
+
+get_latest_dir([H|T],Latest) when H>Latest ->
+    get_latest_dir(T,H);
+get_latest_dir([_|T],Latest) ->
+    get_latest_dir(T,Latest);
+get_latest_dir([],Latest) ->
     Latest.
 
-%% Sort modules according to the application they belong to.
-%% Return [{App,LastTestDir,ModuleList}]
-sort_modules([M|Modules], Acc) ->
-    App = get_app(M),
-    Acc1 =
-	case lists:keysearch(App, 1, Acc) of
-	    {value,{App,LastTest,List}} ->
-		lists:keyreplace(App, 1, Acc, {App,LastTest,[M|List]});
+%% Associate the cross cover modules with their applications.
+add_cross_modules(Mods,Apps)->
+    do_add_cross_modules(Mods,[{App,Dir,[]} || {App,Dir} <- Apps]).
+do_add_cross_modules([Mod|Mods],Apps)->
+    App = get_app(Mod),
+    NewApps =
+	case lists:keytake(App,1,Apps) of
+	    {value,{App,Dir,AppMods},Rest} ->
+		[{App,Dir,lists:umerge([Mod],AppMods)}|Rest];
 	    false ->
-		[{App,last_test_for_app(App),[M]}|Acc]
+		Apps
 	end,
-    sort_modules(Modules, Acc1);
-sort_modules([], Acc) ->
-    Acc.
+    do_add_cross_modules(Mods,NewApps);
+do_add_cross_modules([],Apps) ->
+    %% Just to get the modules in the same order as app-only cover log
+    [{App,Dir,lists:reverse(Mods)} || {App,Dir,Mods} <- Apps].
 
 get_app(Module) ->
     Beam = code:which(Module),
@@ -5685,6 +5140,14 @@ get_app(Module) ->
     [AppStr|_] = string:tokens(AppDir,"-"),
     list_to_atom(AppStr).
 
+%% Find all exported coverdata files.
+get_coverdata_files(Apps) ->
+    lists:flatmap(
+      fun({_,LatestAppDir,_}) ->
+	      filelib:wildcard(filename:join(LatestAppDir,"all.coverdata"))
+      end,
+      Apps).
+
 
 %% For each application, analyse all modules
 %% Used for cross cover analysis.
@@ -5705,7 +5168,7 @@ analyse_modules(_Dir, [], _DetailsFun, Acc) ->
 
 
 %% Read the cross cover file (cross.cover)
-get_all_cross_modules() ->
+get_cross_modules() ->
     get_cross_modules(all).
 get_cross_modules(App) ->
     case file:consult(?cross_cover_file) of
@@ -5808,11 +5271,11 @@ write_default_cross_coverlog(TestDir) ->
     {ok,CrossCoverLog} =
 	file:open(filename:join(TestDir,?cross_coverlog_name), [write]),
     write_coverlog_header(CrossCoverLog),
-    io:fwrite(CrossCoverLog,
-	      ["No cross cover modules exist for this application,",
-	       xhtml("<br>","<br />"),
-	       "or cross cover analysis is not completed.\n"
-	       "</body></html>\n"], []),
+    io:put_chars(CrossCoverLog,
+		 ["No cross cover modules exist for this application,",
+		  xhtml("<br>","<br />"),
+		  "or cross cover analysis is not completed.\n"
+		  "</body></html>\n"]),
     file:close(CrossCoverLog).
 
 write_cover_result_table(CoverLog,Coverage) ->
diff --git a/lib/test_server/src/test_server_gl.erl b/lib/test_server/src/test_server_gl.erl
new file mode 100644
index 0000000000..d32c7c07dc
--- /dev/null
+++ b/lib/test_server/src/test_server_gl.erl
@@ -0,0 +1,293 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%% This module implements group leader processes for test cases.
+%% Each group leader process handles output to the minor log file for
+%% a test case, and calls test_server_io to handle output to the common
+%% log files. The group leader processes are created and destroyed
+%% through the test_server_io module/process.
+
+-module(test_server_gl).
+-export([start_link/0,stop/1,set_minor_fd/3,unset_minor_fd/1,
+	 get_tc_supervisor/1,print/4,set_props/2]).
+
+-export([init/1,handle_call/3,handle_cast/2,handle_info/2,terminate/2]).
+
+-record(st, {tc_supervisor :: 'none'|pid(),    %Test case supervisor
+	     tc :: mfa(),		       %Current test case MFA
+	     minor :: 'none'|pid(),	       %Minor fd
+	     minor_monitor,		       %Monitor ref for minor fd
+	     capture :: 'none'|pid(),	       %Capture output
+	     reject_io :: boolean(),	       %Reject I/O requests...
+	     permit_io,			       %... and exceptions
+	     auto_nl=true :: boolean(),	       %Automatically add NL
+	     levels			       %{Stdout,Major,Minor}
+	    }).
+
+%% start_link()
+%%  Start a new group leader process. Only to be called by
+%%  the test_server_io process.
+
+start_link() ->
+    case gen_server:start_link(?MODULE, [], []) of
+	{ok,Pid} ->
+	    {ok,Pid};
+	Other ->
+	    Other
+    end.
+
+
+%% stop(Pid)
+%%  Stop a group leader process. Only to be called by
+%%  the test_server_io process.
+
+stop(GL) ->
+    gen_server:cast(GL, stop).
+
+
+%% set_minor_fd(GL, Fd, MFA)
+%%  GL = Pid for the group leader process
+%%  Fd = file descriptor for the minor log file
+%%  MFA = {M,F,A} for the test case owning the minor log file
+%%
+%%  Register the file descriptor for the minor log file. Subsequent
+%%  IO directed to the minor log file will be written to this file.
+%%  Also register the currently executing process at the testcase
+%%  supervisor corresponding to this group leader process.
+
+set_minor_fd(GL, Fd, MFA) ->
+    req(GL, {set_minor_fd,Fd,MFA,self()}).
+
+
+%% unset_minor_fd(GL, Fd, MFA)
+%%  GL = Pid for the group leader process
+%%
+%%  Unregister the file descriptor for minor log file (typically
+%%  because the test case has ended the minor log file is about
+%%  to be closed). Subsequent IO (for example, by a process spawned
+%%  by the testcase process) will go to the unexpected_io log file.
+
+unset_minor_fd(GL) ->
+    req(GL, unset_minor_fd).
+
+
+%% get_tc_supervisor(GL)
+%%  GL = Pid for the group leader process
+%%
+%%  Return the Pid for the process that supervises the test case
+%%  that has this group leader.
+
+get_tc_supervisor(GL) ->
+    req(GL, get_tc_supervisor).
+
+
+%% print(GL, Detail, Format, Args) -> ok
+%%  GL = Pid for the group leader process
+%%  Detail = integer() | minor | major | html | stdout
+%%  Msg = iodata()
+%%  Printer = internal | pid()
+%%
+%%  Print a message to one of the log files. If Detail is an integer,
+%%  it will be compared to the levels (set by set_props/2) to
+%%  determine which log file(s) that are to receive the output. If
+%%  Detail is an atom, the value of the atom will directly determine
+%%  which log file to use.  IO to the minor log file will be handled
+%%  directly by this group leader process (printing to the file set by
+%%  set_minor_fd/3), and all other IO will be handled by calling
+%%  test_server_io:print/3.
+
+print(GL, Detail, Msg, Printer) ->
+    req(GL, {print,Detail,Msg,Printer}).
+
+
+%% set_props(GL, [PropertyTuple])
+%%  GL = Pid for the group leader process
+%%  PropertyTuple = {levels,{Show,Major,Minor}} |
+%%                  {auto_nl,boolean()} |
+%%                  {reject_io_reqs,boolean()}
+%%
+%%  Set properties for this group leader process.
+
+set_props(GL, PropList) ->
+    req(GL, {set_props,PropList}).
+
+%%% Internal functions.
+
+init([]) ->
+    {ok,#st{tc_supervisor=none,
+	    minor=none,
+	    minor_monitor=none,
+	    capture=none,
+	    reject_io=false,
+	    permit_io=gb_sets:empty(),
+	    auto_nl=true,
+	    levels={1,19,10}
+	   }}.
+
+req(GL, Req) ->
+    gen_server:call(GL, Req, infinity).
+
+handle_call(get_tc_supervisor, _From, #st{tc_supervisor=Pid}=St) ->
+    {reply,Pid,St};
+handle_call({set_minor_fd,Fd,MFA,Supervisor}, _From, St) ->
+    Ref = erlang:monitor(process, Fd),
+    {reply,ok,St#st{tc=MFA,minor=Fd,minor_monitor=Ref,
+		    tc_supervisor=Supervisor}};
+handle_call(unset_minor_fd, _From, St) ->
+    {reply,ok,St#st{minor=none,tc_supervisor=none}};
+handle_call({set_props,PropList}, _From, St) ->
+    {reply,ok,do_set_props(PropList, St)};
+handle_call({print,Detail,Msg,Printer}, {From,_}, St) ->
+    output(Detail, Msg, Printer, From, St),
+    {reply,ok,St}.
+
+handle_cast(stop, St) ->
+    {stop,normal,St}.
+
+handle_info({'DOWN',Ref,process,_,_}, #st{minor_monitor=Ref}=St) ->
+    {noreply,St#st{minor=none,minor_monitor=none}};
+handle_info({permit_io,Pid}, #st{permit_io=P}=St) ->
+    {noreply,St#st{permit_io=gb_sets:add(Pid, P)}};
+handle_info({capture,Cap0}, St) ->
+    Cap = case Cap0 of
+	      false -> none;
+	      Pid when is_pid(Cap0) -> Pid
+	  end,
+    {noreply,St#st{capture=Cap}};
+handle_info({io_request,From,ReplyAs,Req}=IoReq, St) ->
+    try	io_req(Req, From, St) of
+	passthrough ->
+	    group_leader() ! IoReq;
+	Data ->
+	    case is_io_permitted(From, St) of
+		false ->
+		    ok;
+		true ->
+		    case St of
+			#st{capture=none} ->
+			    ok;
+			#st{capture=CapturePid} ->
+			    CapturePid ! {captured,Data}
+		    end,
+		    output(minor, Data, From, From, St)
+	    end,
+	    From ! {io_reply,ReplyAs,ok}
+    catch
+	_:_ ->
+	    {io_reply,ReplyAs,{error,arguments}}
+    end,
+    {noreply,St};
+handle_info({structured_io,ClientPid,{Detail,Str}}, St) ->
+    output(Detail, Str, ClientPid, ClientPid, St),
+    {noreply,St};
+handle_info({printout,Detail,Format,Args}, St) ->
+    Str = io_lib:format(Format, Args),
+    output(Detail, Str, internal, none, St),
+    {noreply,St};
+handle_info(Msg, #st{tc_supervisor=Pid}=St) when is_pid(Pid) ->
+    %% The process overseeing the testcase process also used to be
+    %% the group leader; thus, it is widely expected that it can be
+    %% reached by sending a message to the group leader. Therefore
+    %% we'll need to forward any non-recognized messaged to the test
+    %% case supervisor.
+    Pid ! Msg,
+    {noreply,St};
+handle_info(_Msg, #st{}=St) ->
+    %% There is no known supervisor process. Ignore this message.
+    {noreply,St}.
+
+terminate(_, _) ->
+    ok.
+
+do_set_props([{levels,Levels}|Ps], St) ->
+    do_set_props(Ps, St#st{levels=Levels});
+do_set_props([{auto_nl,AutoNL}|Ps], St) ->
+    do_set_props(Ps, St#st{auto_nl=AutoNL});
+do_set_props([{reject_io_reqs,Bool}|Ps], St) ->
+    do_set_props(Ps, St#st{reject_io=Bool});
+do_set_props([], St) -> St.
+
+io_req({put_chars,Enc,Bytes}, _, _) when Enc =:= latin1; Enc =:= unicode  ->
+    to_latin1(Enc, Bytes);
+io_req({put_chars,Encoding,Mod,Func,[Format,Args]}, _, _) ->
+    Str = Mod:Func(Format, Args),
+    to_latin1(Encoding, Str);
+io_req(_, _, _) -> passthrough.
+
+to_latin1(unicode, Str) ->
+    [if C > 255 ->
+	     io_lib:format("\\{~.8B}", [C]);
+	true ->
+	     C
+     end || C <- unicode:characters_to_list(Str, unicode)];
+to_latin1(latin1, Str) -> Str.
+
+output(Level, Str, Sender, From, St) when is_integer(Level) ->
+    case selected_by_level(Level, stdout, St) of
+	true -> output(stdout, Str, Sender, From, St);
+	false -> ok
+    end,
+    case selected_by_level(Level, major, St) of
+	true -> output(major, Str, Sender, From, St);
+	false -> ok
+    end,
+    case selected_by_level(Level, minor, St) of
+	true -> output(minor, Str, Sender, From, St);
+	false -> ok
+    end;
+output(stdout, Str, _Sender, From, St) ->
+    output_to_file(stdout, Str, From, St);
+output(html, Str, _Sender, From, St) ->
+    output_to_file(html, Str, From, St);
+output(Level, Str, Sender, From, St) when is_atom(Level) ->
+    output_to_file(Level, dress_output(Str, Sender, St), From, St).
+
+output_to_file(minor, Data0, From, #st{tc={M,F,A},minor=none}) ->
+    Data = [io_lib:format("=== ~p:~p/~p\n", [M,F,A]),Data0],
+    test_server_io:print(From, unexpected_io, Data),
+    ok;
+output_to_file(minor, Data, From, #st{minor=Fd}) ->
+    try
+	io:put_chars(Fd, Data)
+    catch
+	_:_ ->
+	    test_server_io:print(From, unexpected_io, Data)
+    end;
+output_to_file(Detail, Data, From, _) ->
+    test_server_io:print(From, Detail, Data).
+
+is_io_permitted(From, #st{reject_io=true,permit_io=P}) ->
+    gb_sets:is_member(From, P);
+is_io_permitted(_, #st{reject_io=false}) -> true.
+
+selected_by_level(Level, stdout, #st{levels={Stdout,_,_}}) ->
+    Level =< Stdout;
+selected_by_level(Level, major, #st{levels={_,Major,_}}) ->
+    Level =< Major;
+selected_by_level(Level, minor, #st{levels={_,_,Minor}}) ->
+    Level >= Minor.
+
+dress_output([$=|_]=Str, internal, _) ->
+    [Str,$\n];
+dress_output(Str, internal, _) ->
+    ["=== ",Str,$\n];
+dress_output(Str, _, #st{auto_nl=AutoNL}) ->
+    case AutoNL of
+	true -> [Str,$\n];
+	false -> Str
+    end.
diff --git a/lib/test_server/src/test_server_h.erl b/lib/test_server/src/test_server_h.erl
index fdeee59326..78daba855d 100644
--- a/lib/test_server/src/test_server_h.erl
+++ b/lib/test_server/src/test_server_h.erl
@@ -131,6 +131,11 @@ report_receiver(warning_msg, _) -> kernel;
 report_receiver(warning_report, _) -> kernel;
 report_receiver(info, _) -> kernel;
 report_receiver(info_msg, _) -> kernel;
+report_receiver(info_report,Tuple)
+  when is_tuple(Tuple) andalso
+       (element(1,Tuple)==ct_connection orelse
+	element(1,Tuple)==conn_log) ->
+    none;
 report_receiver(info_report, _) -> kernel;
 report_receiver(_, _) -> none.
 
diff --git a/lib/test_server/src/test_server_internal.hrl b/lib/test_server/src/test_server_internal.hrl
index c9c52854e3..d204c35293 100644
--- a/lib/test_server/src/test_server_internal.hrl
+++ b/lib/test_server/src/test_server_internal.hrl
@@ -24,8 +24,7 @@
 %% Target information generated by test_server:init_target_info/0 and 
 %% test_server_ctrl:contact_main_target/2
 %% Once initiated, this information will never change!!
--record(target_info, {where,           % local | Socket
-		      os_family,       % atom(); win32 | unix | vxworks | ose
+-record(target_info, {os_family,       % atom(); win32 | unix
 		      os_type,         % result of os:type()
 		      host,            % string(); the name of the target machine
 		      version,         % string()
@@ -43,7 +42,6 @@
 				       % itself is master for slave nodes
 
 		      %% The following are only used for remote targets
-		      target_client,   % reference to a client talking to target
 		      slave_targets=[]}).% list() of atom(); all available 
 				         % targets for starting slavenodes
 
diff --git a/lib/test_server/src/test_server_io.erl b/lib/test_server/src/test_server_io.erl
new file mode 100644
index 0000000000..777b377201
--- /dev/null
+++ b/lib/test_server/src/test_server_io.erl
@@ -0,0 +1,319 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%% This module implements a process with the registered name 'test_server_io',
+%% which has two main responsibilities:
+%%
+%%   * Manage group leader processes (see the test_server_gl module)
+%%   for test cases. A group_leader process is obtained by calling
+%%   get_gl/1. Group leader processes will be kept alive as along as
+%%   the 'test_server_io' process is alive.
+%%
+%%   * Handle output to the common log files (stdout, major, html,
+%%   unexpected_io).
+%%
+
+-module(test_server_io).
+-export([start_link/0,stop/0,get_gl/1,set_fd/2,
+	 start_transaction/0,end_transaction/0,print_buffered/1,print/3,
+	 set_footer/1,set_job_name/1,set_gl_props/1]).
+
+-export([init/1,handle_call/3,handle_info/2,terminate/2]).
+
+-record(st, {fds,				%Singleton fds (gb_tree)
+	     shared_gl :: pid(),		%Shared group leader
+	     gls,				%Group leaders (gb_set)
+	     io_buffering=false,		%I/O buffering
+	     buffered,				%Buffered I/O requests
+	     html_footer,			%HTML footer
+	     job_name,				%Name of current job.
+	     gl_props,				%Properties for GL.
+	     stopping
+	    }).
+
+start_link() ->
+    case gen_server:start_link({local,?MODULE}, ?MODULE, [], []) of
+	{ok,Pid} ->
+	    {ok,Pid};
+	Other ->
+	    Other
+    end.
+
+stop() ->
+    OldGL = group_leader(),
+    group_leader(self(), self()),
+    req(stop),
+    group_leader(OldGL, self()),
+    ok.
+
+%% get_gl(Shared) -> Pid
+%%  Shared = boolean()
+%%  Pid = pid()
+%%
+%%  Return a group leader (a process using the test_server_gl module).
+%%  If Shared is true, the shared group leader is returned (suitable for
+%%  running sequential test cases), otherwise a new group leader process
+%%  is spawned. Group leader processes will live until the
+%%  'test_server_io' process is stopped.
+
+get_gl(Shared) when is_boolean(Shared) ->
+    req({get_gl,Shared}).
+
+%% set_fd(Tag, Fd) -> ok.
+%%  Tag = major | html | unexpected_io
+%%  Fd = a file descriptor (as returned by file:open/2)
+%%
+%%  Associate a file descriptor with the given Tag. This
+%%  Tag can later be used in when calling to print/3.
+
+set_fd(Tag, Fd) ->
+    req({set_fd,Tag,Fd}).
+
+%% start_transaction()
+%%
+%%  Subsequent calls to print/3 from the process executing start_transaction/0
+%%  will cause the messages to be buffered instead of printed directly.
+
+start_transaction() ->
+    req({start_transaction,self()}).
+
+%% end_transaction()
+%%
+%%  End the transaction started by start_transaction/0. Subsequent calls to
+%%  print/3 will cause the message to be printed directly.
+
+end_transaction() ->
+    req({end_transaction,self()}).
+
+%% print(From, Tag, Msg)
+%%  From = pid()
+%%  Tag = stdout, or any tag that has been registered using set_fd/2
+%%  Msg = string or iolist
+%%
+%%  Either print Msg to the file identified by Tag, or buffer the message
+%%  start_transaction/0 has been called from the process From.
+%%
+%%  NOTE: The tags have various special meanings. For example, 'html'
+%%  is assumed to be a HTML file.
+
+print(From, Tag, Msg) ->
+    req({print,From,Tag,Msg}).
+
+%% print_buffered(Pid)
+%%  Pid = pid()
+%%
+%%  Print all messages buffered in the *first* transaction buffered for Pid.
+%%  (If start_transaction/0 and end_transaction/0 has been called N times,
+%%  print_buffered/1 must be called N times to print all transactions.)
+
+print_buffered(Pid) ->
+    req({print_buffered,Pid}).
+
+%% set_footer(IoData)
+%%
+%%  Set a footer for the file associated with the 'html' tag.
+%%  It will be used by print/3 to print a footer for the HTML file.
+
+set_footer(Footer) ->
+    req({set_footer,Footer}).
+
+%% set_job_name(Name)
+%%  Set a name for the currently running job. The name will be used
+%%  when printing to 'stdout'.
+%%
+set_job_name(Name) ->
+    req({set_job_name,Name}).
+
+%% set_gl_props(PropList)
+%%  Set properties for group leader processes. When a group_leader process
+%%  is created, test_server_gl:set_props(PropList) will be called.
+
+set_gl_props(PropList) ->
+    req({set_gl_props,PropList}).
+
+
+%%% Internal functions.
+
+init([]) ->
+    process_flag(trap_exit, true),
+    Empty = gb_trees:empty(),
+    {ok,Shared} = test_server_gl:start_link(),
+    {ok,#st{fds=Empty,shared_gl=Shared,gls=gb_sets:empty(),
+	    io_buffering=gb_sets:empty(),
+	    buffered=Empty,
+	    html_footer="</body>\n</html>\n",
+	    job_name="<name not set>",
+	    gl_props=[]}}.
+
+req(Req) ->
+    gen_server:call(?MODULE, Req, infinity).
+
+handle_call({get_gl,false}, _From, #st{gls=Gls,gl_props=Props}=St) ->
+    {ok,Pid} = test_server_gl:start_link(),
+    test_server_gl:set_props(Pid, Props),
+    {reply,Pid,St#st{gls=gb_sets:insert(Pid, Gls)}};
+handle_call({get_gl,true}, _From, #st{shared_gl=Shared}=St) ->
+    {reply,Shared,St};
+handle_call({set_fd,Tag,Fd}, _From, #st{fds=Fds0}=St) ->
+    Fds = gb_trees:enter(Tag, Fd, Fds0),
+    {reply,ok,St#st{fds=Fds}};
+handle_call({start_transaction,Pid}, _From, #st{io_buffering=Buffer0,
+						buffered=Buf0}=St) ->
+    Buf = case gb_trees:is_defined(Pid, Buf0) of
+	      false -> gb_trees:insert(Pid, queue:new(), Buf0);
+	      true -> Buf0
+	  end,
+    Buffer = gb_sets:add(Pid, Buffer0),
+    {reply,ok,St#st{io_buffering=Buffer,buffered=Buf}};
+handle_call({print,From,Tag,Str}, _From, St0) ->
+    St = output(From, Tag, Str, St0),
+    {reply,ok,St};
+handle_call({end_transaction,Pid}, _From, #st{io_buffering=Buffer0,
+					      buffered=Buffered0}=St0) ->
+    Q0 = gb_trees:get(Pid, Buffered0),
+    Q = queue:in(eot, Q0),
+    Buffered = gb_trees:update(Pid, Q, Buffered0),
+    Buffer = gb_sets:delete_any(Pid, Buffer0),
+    St = St0#st{io_buffering=Buffer,buffered=Buffered},
+    {reply,ok,St};
+handle_call({print_buffered,Pid}, _From, #st{buffered=Buffered0}=St0) ->
+    Q0 = gb_trees:get(Pid, Buffered0),
+    Q = do_print_buffered(Q0, St0),
+    Buffered = gb_trees:update(Pid, Q, Buffered0),
+    St = St0#st{buffered=Buffered},
+    {reply,ok,St};
+handle_call({set_footer,Footer}, _From, St) ->
+    {reply,ok,St#st{html_footer=Footer}};
+handle_call({set_job_name,Name}, _From, St) ->
+    {reply,ok,St#st{job_name=Name}};
+handle_call({set_gl_props,Props}, _From, #st{shared_gl=Shared}=St) ->
+    test_server_gl:set_props(Shared, Props),
+    {reply,ok,St#st{gl_props=Props}};
+handle_call(stop, From, #st{shared_gl=SGL,gls=Gls0}=St0) ->
+    St = St0#st{gls=gb_sets:insert(SGL, Gls0),stopping=From},
+    gc(St),
+    %% Give the users of the surviving group leaders some
+    %% time to finish.
+    erlang:send_after(2000, self(), stop_group_leaders),
+    {noreply,St}.
+
+handle_info({'EXIT',Pid,normal}, #st{gls=Gls0,stopping=From}=St) ->
+    Gls = gb_sets:delete_any(Pid, Gls0),
+    case gb_sets:is_empty(Gls) andalso stopping =/= undefined of
+	true ->
+	    %% No more group leaders left.
+	    gen_server:reply(From, ok),
+	    {stop,normal,St#st{gls=Gls,stopping=undefined}};
+	false ->
+	    %% Wait for more group leaders to finish.
+	    {noreply,St#st{gls=Gls}}
+    end;
+handle_info({'EXIT',_Pid,Reason}, _St) ->
+    exit(Reason);
+handle_info(stop_group_leaders, #st{gls=Gls}=St) ->
+    %% Stop the remaining group leaders.
+    [test_server_gl:stop(GL) || GL <- gb_sets:to_list(Gls)],
+    erlang:send_after(2000, self(), kill_group_leaders),
+    {noreply,St};
+handle_info(kill_group_leaders, #st{gls=Gls,stopping=From}=St) ->
+    [exit(GL, kill) || GL <- gb_sets:to_list(Gls)],
+    gen_server:reply(From, ok),
+    {stop,normal,St};
+handle_info(Other, St) ->
+    io:format("Ignoring: ~p\n", [Other]),
+    {noreply,St}.
+
+terminate(_, _) ->
+    ok.
+
+output(From, Tag, Str, #st{io_buffering=Buffered,buffered=Buf0}=St) ->
+    case gb_sets:is_member(From, Buffered) of
+	false ->
+	    do_output(Tag, Str, St),
+	    St;
+	true ->
+	    Q0 = gb_trees:get(From, Buf0),
+	    Q = queue:in({Tag,Str}, Q0),
+	    Buf = gb_trees:update(From, Q, Buf0),
+	    St#st{buffered=Buf}
+    end.
+
+do_output(stdout, Str, #st{job_name=undefined}) ->
+    io:put_chars(Str);
+do_output(stdout, Str0, #st{job_name=Name}) ->
+    Str = io_lib:format("Testing ~s: ~s\n", [Name,Str0]),
+    io:put_chars(Str);
+do_output(Tag, Str, #st{fds=Fds}=St) ->
+    case gb_trees:lookup(Tag, Fds) of
+	none ->
+	    S = io_lib:format("\n*** ERROR: ~p, line ~p: No known '~p' log file\n",
+			      [?MODULE,?LINE,Tag]),
+	    do_output(stdout, [S,Str], St);
+	{value,Fd} ->
+	    try
+		io:put_chars(Fd, Str),
+		case Tag of
+		    html -> finalise_table(Fd, St);
+		    _ -> ok
+		end
+	    catch _:Error ->
+		    S = io_lib:format("\n*** ERROR: ~p, line ~p: Error writing to "
+				      "log file '~p': ~p\n",
+				      [?MODULE,?LINE,Tag,Error]),
+		    do_output(stdout, [S,Str], St)
+	    end
+    end.
+
+finalise_table(Fd, #st{html_footer=Footer}) ->
+    case file:position(Fd, {cur,0}) of
+	{ok,Pos} ->
+	    %% We are writing to a seekable file.  Finalise so
+	    %% we get complete valid (and viewable) HTML code.
+	    %% Then rewind to overwrite the finalising code.
+	    io:put_chars(Fd, ["\n</table>\n",Footer]),
+	    file:position(Fd, Pos);
+	{error,epipe} ->
+	    %% The file is not seekable.  We cannot erase what
+	    %% we've already written --- so the reader will
+	    %% have to wait until we're done.
+	    ok
+    end.
+
+do_print_buffered(Q0, St) ->
+    Item = queue:get(Q0),
+    Q = queue:drop(Q0),
+    case Item of
+	eot ->
+	    Q;
+	{Tag,Str} ->
+	    do_output(Tag, Str, St),
+	    do_print_buffered(Q, St)
+    end.
+
+gc(#st{gls=Gls0}) ->
+    InUse0 = [begin
+		  case process_info(P, group_leader) of
+		      {group_leader,GL} -> GL;
+		      undefined -> undefined
+		  end
+	      end || P <- processes()],
+    InUse = ordsets:from_list(InUse0),
+    Gls = gb_sets:to_list(Gls0),
+    NotUsed = ordsets:subtract(Gls, InUse),
+    [test_server_gl:stop(Pid) || Pid <- NotUsed],
+    ok.
diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl
index e8498a43f2..b307d93c7d 100644
--- a/lib/test_server/src/test_server_node.erl
+++ b/lib/test_server/src/test_server_node.erl
@@ -26,7 +26,7 @@
 
 %% Test Controller interface
 -export([is_release_available/1]).
--export([start_remote_main_target/1,stop/1]).
+-export([stop/1]).
 -export([start_tracer_node/2,trace_nodes/2,stop_tracer_node/1]).
 -export([start_node/5, stop_node/2]).
 -export([kill_nodes/1, nodedown/2]).
@@ -35,7 +35,6 @@
 
 -include("test_server_internal.hrl").
 -record(slave_info, {name,socket,client}).
--define(VXWORKS_ACCEPT_TIMEOUT,?ACCEPT_TIMEOUT).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%                                                                  %%%
@@ -58,87 +57,8 @@ is_release_available(Rel) ->
 	    false
     end.
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Start main target node on remote host
-%%% The target node must not know the controller node via erlang distribution.
-start_remote_main_target(Parameters) ->
-    #par{type=TargetType,
-	 target=TargetHost,
-	 naming=Naming,
-	 master=MasterNode,
-	 cookie=MasterCookie,
-	 slave_targets=SlaveTargets} = Parameters,
-
-    lists:foreach(fun(T) -> maybe_reboot_target({TargetType,T}) end,
-		  [list_to_atom(TargetHost)|SlaveTargets]),
-
-    % Must give the targets a chance to reboot...
-    case TargetType of
-	vxworks ->
-	    receive after 15000 -> ok end;
-	_ ->
-	    ok
-    end,
-
-    Cmd0 = get_main_target_start_command(TargetType,TargetHost,Naming,
-					 MasterNode,MasterCookie),
-    Cmd = 
-	case os:getenv("TEST_SERVER_FRAMEWORK") of
-	    FW when FW =:= false; FW =:= "undefined" -> Cmd0;
-	    FW -> Cmd0 ++ " -env TEST_SERVER_FRAMEWORK " ++ FW
-	end,
-	
-    {ok,LSock} = gen_tcp:listen(?MAIN_PORT,[binary,{reuseaddr,true},{packet,2}]),
-    case start_target(TargetType,TargetHost,Cmd) of
-	{ok,TargetClient,AcceptTimeout} ->
-	    case gen_tcp:accept(LSock,AcceptTimeout) of
-		{ok,Sock} -> 
-		    gen_tcp:close(LSock),
-		    receive 
-			{tcp,Sock,Bin} when is_binary(Bin) ->
-			    case unpack(Bin) of
-				error ->
-				    gen_tcp:close(Sock),
-				    close_target_client(TargetClient),
-				    {error,bad_message};
-				{ok,{target_info,TI}} ->
-				    put(test_server_free_targets,SlaveTargets),
-				    {ok, TI#target_info{where=Sock,
-							host=TargetHost,
-							naming=Naming,
-							master=MasterNode,
-							target_client=TargetClient,
-							slave_targets=SlaveTargets}}
-			    end;
-			{tcp_closed,Sock} ->
-			    gen_tcp:close(Sock),
-			    close_target_client(TargetClient),
-			    {error,could_not_contact_target}
-		    after AcceptTimeout ->
-			    gen_tcp:close(Sock),
-			    close_target_client(TargetClient),
-			    {error,timeout}
-		    end;
-		Error -> 
-		    %%! maybe something like kill_target(...)???
-		    gen_tcp:close(LSock),
-		    close_target_client(TargetClient),
-		    {error,{could_not_contact_target,Error}}
-	    end;
-	Error ->
-	    gen_tcp:close(LSock),
-	    {error,{could_not_start_target,Error}}
-    end.
-
 stop(TI) ->
-    kill_nodes(TI),
-    case TI#target_info.where of
-	local -> % there is no remote target to stop
-	    ok;
-	Sock ->  % stop remote target
-	    gen_tcp:close(Sock),
-	    close_target_client(TI#target_info.target_client)	    
-    end.
+    kill_nodes(TI).
 
 nodedown(Sock, TI) ->
     Match = #slave_info{name='$1',socket=Sock,client='$2',_='_'},
@@ -155,14 +75,8 @@ nodedown(Sock, TI) ->
 		false -> ok
 	    end,
 	    slave_died;
-	[] -> 
-	    case TI#target_info.where of
-		Sock ->
-		    %% test_server_ctrl will do the cleanup
-		    target_died;
-		_ -> 
-		    ignore
-	    end
+	[] ->
+	    ok
     end.
 
 
@@ -176,10 +90,7 @@ start_tracer_node(TraceFile,TI) ->
     Match = #slave_info{name='$1',_='_'},
     SlaveNodes = lists:map(fun([N]) -> [" ",N] end,
 			   ets:match(slave_tab,Match)),
-    TargetNode = case TI#target_info.where of
-		     local -> node();
-		     _ -> "test_server@" ++ TI#target_info.host
-		 end,
+    TargetNode = node(),
     Cookie = TI#target_info.cookie,
     {ok,LSock} = gen_tcp:listen(0,[binary,{reuseaddr,true},{packet,2}]),
     {ok,TracePort} = inet:port(LSock),
@@ -407,7 +318,7 @@ start_node_peer(SlaveName, OptList, From, TI) ->
     % Support for erl_crash_dump files..
     CrashFile = filename:join([TI#target_info.test_server_dir,
 			       "erl_crash_dump."++cast_to_list(SlaveName)]),
-    CrashArgs = lists:concat([" -env ERL_CRASH_DUMP ",CrashFile," "]),
+    CrashArgs = lists:concat([" -env ERL_CRASH_DUMP \"",CrashFile,"\" "]),
     FailOnError = start_node_get_option_value(fail_on_error, OptList, true),
     Pa = TI#target_info.test_server_dir,
     Prog0 = start_node_get_option_value(erl, OptList, default),
@@ -420,7 +331,7 @@ start_node_peer(SlaveName, OptList, From, TI) ->
     Cmd = lists:concat([Prog,
 			" -detached ",
 			TI#target_info.naming, " ", SlaveName,
-			" -pa ", Pa,
+			" -pa \"", Pa,"\"",
 			NodeStarted,
 			CrashArgs,
 			" ", Args]),
@@ -433,10 +344,12 @@ start_node_peer(SlaveName, OptList, From, TI) ->
     %% Bad environment can cause open port to fail. If this happens,
     %% we ignore it and let the testcase handle the situation...
     catch open_port({spawn, Cmd}, [stream|Opts]),
+
+    Tmo = 60000 * test_server:timetrap_scale_factor(),
     
     case start_node_get_option_value(wait, OptList, true) of
 	true ->
-	    Ret = wait_for_node_started(LSock,60000,undefined,Cleanup,TI,self()),
+	    Ret = wait_for_node_started(LSock,Tmo,undefined,Cleanup,TI,self()),
 	    case {Ret,FailOnError} of
 		{{{ok, Node}, Warning},_} ->
 		    gen_server:reply(From,{{ok,Node},HostStr,Cmd,[],Warning});
@@ -452,7 +365,7 @@ start_node_peer(SlaveName, OptList, From, TI) ->
 	    Self = self(),
 	    spawn_link(
 	      fun() -> 
-		      wait_for_node_started(LSock,60000,undefined,
+		      wait_for_node_started(LSock,Tmo,undefined,
 					    Cleanup,TI,Self),
 		      receive after infinity -> ok end
 	      end),
@@ -462,9 +375,6 @@ start_node_peer(SlaveName, OptList, From, TI) ->
 %%
 %% Slave nodes are started on a remote host if
 %% - the option remote is given when calling test_server:start_node/3
-%% or
-%% - the target type is vxworks, since only one erlang node
-%%   can be started on each vxworks host.
 %%
 start_node_slave(SlaveName, OptList, From, TI) ->
     SuppliedArgs = start_node_get_option_value(args, OptList, []),
@@ -472,138 +382,38 @@ start_node_slave(SlaveName, OptList, From, TI) ->
 
     CrashFile = filename:join([TI#target_info.test_server_dir,
 			       "erl_crash_dump."++cast_to_list(SlaveName)]),
-    CrashArgs = lists:concat([" -env ERL_CRASH_DUMP ",CrashFile," "]),
+    CrashArgs = lists:concat([" -env ERL_CRASH_DUMP \"",CrashFile,"\" "]),
     Pa = TI#target_info.test_server_dir,
-    Args = lists:concat([" -pa ", Pa, " ", SuppliedArgs, CrashArgs]),
+    Args = lists:concat([" -pa \"", Pa, "\" ", SuppliedArgs, CrashArgs]),
 
     Prog0 = start_node_get_option_value(erl, OptList, default),
     Prog = pick_erl_program(Prog0),
     Ret = 
 	case start_which_node(OptList) of
 	    {error,Reason} -> {{error,Reason},undefined,undefined};
-	    Host0 -> do_start_node_slave(Host0,SlaveName,Args,Prog,Cleanup,TI)
+	    Host0 -> do_start_node_slave(Host0,SlaveName,Args,Prog,Cleanup)
 	end,
     gen_server:reply(From,Ret).
 
 
-do_start_node_slave(Host0, SlaveName, Args, Prog, Cleanup, TI) ->
-    case TI#target_info.where of
-	local ->
-	    Host = 
-		case Host0 of
-		    local -> test_server_sup:hoststr();
-		    _ -> cast_to_list(Host0)
-		end,
-	    Cmd = Prog ++ " " ++ Args,
-	    %% Can use slave.erl here because I'm both controller and target
-	    %% so I will ping the new node anyway
-	    case slave:start(Host, SlaveName, Args, no_link, Prog) of
-		{ok,Nodename} -> 
-		    case Cleanup of
-			true -> ets:insert(slave_tab,#slave_info{name=Nodename});
-			false -> ok
-		    end,
-		    {{ok,Nodename}, Host, Cmd, [], []};
-		Ret -> 
-		    {Ret, Host, Cmd}
-	    end;
-    
-	_Sock ->
-	    %% Cannot use slave.erl here because I'm only controller, and will
-	    %% not ping the new node. Only target shall contact the new node!!
-	    no_contact_start_slave(Host0,SlaveName,Args,Prog,Cleanup,TI)
-    end.
-
-
-
-no_contact_start_slave(Host, Name, Args0, Prog, Cleanup,TI) ->
-    Args1 = case string:str(Args0,"-setcookie") of
-		0 -> "-setcookie " ++ TI#target_info.cookie ++ " " ++ Args0;
-		_ -> Args0
+do_start_node_slave(Host0, SlaveName, Args, Prog, Cleanup) ->
+    Host =
+	case Host0 of
+	    local -> test_server_sup:hoststr();
+	    _ -> cast_to_list(Host0)
+	end,
+    Cmd = Prog ++ " " ++ Args,
+    %% Can use slave.erl here because I'm both controller and target
+    %% so I will ping the new node anyway
+    case slave:start(Host, SlaveName, Args, no_link, Prog) of
+	{ok,Nodename} ->
+	    case Cleanup of
+		true -> ets:insert(slave_tab,#slave_info{name=Nodename});
+		false -> ok
 	    end,
-    Args = TI#target_info.naming ++ " " ++ cast_to_list(Name) ++ " " ++ Args1,
-    case Host of
-	local ->
-	    case get(test_server_free_targets) of
-		[] ->
-		    io:format("Starting slave ~p on HOST~n", [Name]),
-		    TargetType = test_server_sup:get_os_family(),
-		    Cmd0 = get_slave_node_start_command(TargetType,
-							Prog,
-							TI#target_info.master),
-		    Cmd = Cmd0 ++ " " ++ Args,
-		    do_no_contact_start_slave(TargetType,
-					      test_server_sup:hoststr(),
-					      Cmd, Cleanup,TI, false);
-		[H|T] ->
-		    TargetType = TI#target_info.os_family,
-		    Cmd0 = get_slave_node_start_command(TargetType,
-							Prog,
-							TI#target_info.master),
-		    Cmd = Cmd0 ++ " " ++ Args,
-		    case do_no_contact_start_slave(TargetType,H,Cmd,Cleanup,
-						   TI,true) of
-			{error,remove} ->
-			    io:format("Cannot start node on ~p, "
-				      "removing from slave "
-				      "target list.", [H]),
-			    put(test_server_free_targets,T),
-			    no_contact_start_slave(Host,Name,Args,Prog,
-						   Cleanup,TI);
-			{error,keep} ->
-			    %% H is added to the END OF THE LIST 
-			    %% in order to avoid the same target to
-			    %% be selected each time
-			    put(test_server_free_targets,T++[H]),
-			    no_contact_start_slave(Host,Name,Args,Prog,
-						   Cleanup,TI);
-			R ->
-			    put(test_server_free_targets,T),
-			    R
-		    end
-	    end;
-	_ -> 
-	    TargetType = TI#target_info.os_family,
-	    Cmd0 = get_slave_node_start_command(TargetType,
-						Prog,
-						TI#target_info.master),
-	    Cmd = Cmd0 ++ " " ++ Args,
-	    do_no_contact_start_slave(TargetType, Host, Cmd, Cleanup, TI, false)
-    end.
-
-do_no_contact_start_slave(TargetType,Host0,Cmd0,Cleanup,TI,Retry) ->
-    %% Must use TargetType instead of TI#target_info.os_familiy here 
-    %% because if there were no free_targets we will be starting the 
-    %% slave node on host which might have a different os_familiy
-    Host = cast_to_list(Host0),
-    {ok,LSock} = gen_tcp:listen(0,[binary,
-				    {reuseaddr,true},
-				    {packet,2}]),
-    {ok,WaitPort} = inet:port(LSock),
-    Cmd = lists:concat([Cmd0, " -s ", ?MODULE, " node_started ", 
-			test_server_sup:hoststr(), " ", WaitPort]),
-
-    case start_target(TargetType,Host,Cmd) of
-	{ok,Client,AcceptTimeout} ->
-	    case wait_for_node_started(LSock,AcceptTimeout,
-				       Client,Cleanup,TI,self()) of
-		{error,_}=WaitError -> 
-		    if Retry ->
-			    case maybe_reboot_target(Client) of
-				{error,_} -> {error,remove};
-				ok -> {error,keep}
-			    end;
-		       true ->
-			    {WaitError,Host,Cmd}
-		    end;
-		{Ok,Warning} -> 
-		    {Ok,Host,Cmd,[],Warning}
-	    end;
-	StartError ->
-	    gen_tcp:close(LSock),
-	    if Retry -> {error,remove};
-	       true -> {{error,{could_not_start_target,StartError}},Host,Cmd}
-	    end
+	    {{ok,Nodename}, Host, Cmd, [], []};
+	Ret ->
+	    {Ret, Host, Cmd}
     end.
 
 
@@ -787,71 +597,10 @@ kill_node(SI,TI) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Platform specific code
 
-start_target(vxworks,TargetHost,Cmd) ->
-    case vxworks_client:open(TargetHost) of
-	{ok,P} ->
-	    case vxworks_client:send_data(P,Cmd,"start_erl called") of
-		{ok,_} -> 
-		    {ok,{vxworks,P},?VXWORKS_ACCEPT_TIMEOUT};
-		Error -> 
-		    Error
-	    end;
-	Error ->
-	    Error
-    end;
-
-start_target(unix,TargetHost,Cmd0) ->
-    Cmd = 
-	case test_server_sup:hoststr() of
-	    TargetHost -> Cmd0;
-	    _ -> lists:concat(["rsh ",TargetHost, " ", Cmd0])
-	end,
-    open_port({spawn, Cmd}, [stream]),
-    {ok,undefined,?ACCEPT_TIMEOUT}.
-
-maybe_reboot_target({vxworks,P}) when is_pid(P) ->
-    %% Reboot the vxworks card.
-    %% Client is also closed after this, even if reboot fails
-    vxworks_client:send_data_wait_for_close(P,"q");
-maybe_reboot_target({vxworks,T}) when is_atom(T) ->
-    %% Reboot the vxworks card.
-    %% Client is also closed after this, even if reboot fails
-    vxworks_client:reboot(T);
-maybe_reboot_target(_) ->
-    {error, cannot_reboot_target}.
-
-close_target_client({vxworks,P}) ->
-    vxworks_client:close(P);
 close_target_client(undefined) ->
     ok.
 
 
-
-%%
-%% Command for starting main target
-%% 
-get_main_target_start_command(vxworks,_TargetHost,Naming,
-			      _MasterNode,_MasterCookie) ->
-    "e" ++ Naming ++ " test_server -boot start_sasl"
-	" -sasl errlog_type error"
-	" -s test_server start " ++ test_server_sup:hoststr();
-get_main_target_start_command(unix,_TargetHost,Naming,
-			      _MasterNode,_MasterCookie) ->
-    Prog = pick_erl_program(default),
-    Prog ++ " " ++  Naming ++ " test_server" ++
-	" -boot start_sasl -sasl errlog_type error"
-	" -s test_server start " ++ test_server_sup:hoststr().
-
-%% 
-%% Command for starting slave nodes
-%% 
-get_slave_node_start_command(vxworks, _Prog, _MasterNode) ->
-    "e";
-    %"e-noinput -master " ++ MasterNode;
-get_slave_node_start_command(unix, Prog, MasterNode) ->
-    cast_to_list(Prog) ++ " -detached -master " ++ MasterNode.
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% cast_to_list(X) -> string()
 %%% X = list() | atom() | void()
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index 9d111ff769..c7553cccb5 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -64,13 +64,7 @@ timetrap(Timeout0, ReportTVal, Scale, Pid) ->
 				      true -> ReportTVal end,
 		    MFLs = test_server:get_loc(Pid),
 		    Mon = erlang:monitor(process, Pid),
-		    Trap = 
-			case get(test_server_init_or_end_conf) of
-			    undefined ->
-				{timetrap_timeout,TimeToReport,MFLs};
-			    InitOrEnd ->
-				{timetrap_timeout,TimeToReport,MFLs,InitOrEnd}
-			end,
+		    Trap = {timetrap_timeout,TimeToReport,MFLs},
 		    exit(Pid, Trap),
 		    receive
 			{'DOWN', Mon, process, Pid, _} ->
@@ -473,10 +467,8 @@ getenv_any([]) -> "".
 %%
 %% Returns the OS family
 get_os_family() ->
-    case os:type() of
-	{OsFamily,_OsName} -> OsFamily;
-	OsFamily -> OsFamily
-    end.
+    {OsFamily,_OsName} = os:type(),
+    OsFamily.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -520,8 +512,18 @@ framework_call(Callback,Func,Args,DefaultReturn) ->
     end,
     case erlang:function_exported(Mod,Func,length(Args)) of
 	true ->
-	    put(test_server_loc, {Mod,Func,framework}),
 	    EH = fun(Reason) -> exit({fw_error,{Mod,Func,Reason}}) end,
+	    SetTcState = case Func of
+			     end_tc -> true;
+			     init_tc -> true;
+			     _ -> false
+			 end,
+	    case SetTcState of
+		true ->
+		    test_server:set_tc_state({framework,Mod,Func});
+		false ->
+		    ok
+	    end,
 	    try apply(Mod,Func,Args) of
 		Result ->
 		    Result
@@ -552,18 +554,6 @@ format_loc([{Mod,LineOrFunc}]) ->
     format_loc({Mod,LineOrFunc});
 format_loc({Mod,Func}) when is_atom(Func) -> 
     io_lib:format("{~s,~w}",[package_str(Mod),Func]);
-format_loc({Mod,Line}) when is_integer(Line) -> 
-    %% ?line macro is used
-    ModStr = package_str(Mod),
-    case {lists:member(no_src, get(test_server_logopts)),
-	  lists:reverse(ModStr)} of
-	{false,[$E,$T,$I,$U,$S,$_|_]}  ->
-	    io_lib:format("{~s,<a href=\"~s~s#~w\">~w</a>}",
-			  [ModStr,downcase(ModStr),?src_listing_ext,
-			   round_to_10(Line),Line]);
-	_ ->
-	    io_lib:format("{~s,~w}",[ModStr,Line])
-    end;
 format_loc(Loc) ->
     io_lib:format("~p",[Loc]).    
 
@@ -578,16 +568,11 @@ format_loc1({Mod,Func,Line}) ->
 	{false,[$E,$T,$I,$U,$S,$_|_]}  ->
 	    io_lib:format("{~s,~w,<a href=\"~s~s#~w\">~w</a>}",
 			  [ModStr,Func,downcase(ModStr),?src_listing_ext,
-			   round_to_10(Line),Line]);
+			   Line,Line]);
 	_ ->
 	    io_lib:format("{~s,~w,~w}",[ModStr,Func,Line])
     end.
 
-round_to_10(N) when (N rem 10) == 0 ->
-    N;
-round_to_10(N) ->
-    trunc(N/10)*10.
-
 downcase(S) -> downcase(S, []).
 downcase([Uc|Rest], Result) when $A =< Uc, Uc =< $Z ->
     downcase(Rest, [Uc-$A+$a|Result]);
diff --git a/lib/test_server/src/ts.erl b/lib/test_server/src/ts.erl
index cb06264adb..115e783070 100644
--- a/lib/test_server/src/ts.erl
+++ b/lib/test_server/src/ts.erl
@@ -25,11 +25,12 @@
 -module(ts).
 
 -export([run/0, run/1, run/2, run/3, run/4,
-	 clean/0, clean/1,
 	 tests/0, tests/1,
-	 install/0, install/1, install/2, index/0,
+	 install/0, install/1,
+	 bench/0, bench/1, bench/2, benchmarks/0,
 	 estone/0, estone/1,
 	 cross_cover_analyse/1,
+	 compile_testcases/0, compile_testcases/1,
 	 help/0]).
 -export([i/0, l/1, r/0, r/1, r/2, r/3]).
 
@@ -39,20 +40,14 @@
 %%% the modules:
 %%%
 %%%       +-- ts_install --+------  ts_autoconf_win32
-%%%       |                |
-%%%       |                +------  ts_autoconf_vxworks
 %%%       |
 %%% ts ---+                +------  ts_erl_config
 %%%       |                |				     ts_lib
-%%%       |                +------  ts_make
-%%%       |                |
-%%%       +-- ts_run  -----+
-%%%                        |	    			     ts_filelib
-%%%                        +------  ts_make_erl
-%%%                        |
-%%%                        +------  ts_reports (indirectly)
-%%%       
-%%%       
+%%%       +-- ts_run  -----+------  ts_make
+%%%       |                |	    			     ts_filelib
+%%%       |                +------  ts_make_erl
+%%%       |
+%%%       +-- ts_benchmark
 %%%
 %%% The modules ts_lib and ts_filelib contains utilities used by
 %%% the other modules.
@@ -62,8 +57,7 @@
 %%% ts			 Frontend to the test server framework.  Contains all
 %%%			 interface functions.
 %%% ts_install		 Installs the test suite.  On Unix, `autoconf' is
-%%%			 is used; on Windows, ts_autoconf_win32 is used,
-%%%                      on VxWorks, ts_autoconf_vxworks is used.
+%%%			 is used; on Windows, ts_autoconf_win32 is used.
 %%%			 The result is written to the file `variables'.
 %%% ts_run		 Supervises running of the tests.
 %%% ts_autconf_win32	 An `autoconf' for Windows.
@@ -76,10 +70,9 @@
 %%%			 and other platforms.
 %%% ts_make_erl		 A corrected version of the standar Erlang module
 %%%			 make (used for rebuilding test suites).
-%%% ts_reports		 Generates index pages in HTML, providing a summary
-%%%			 of the tests run.
 %%% ts_lib		 Miscellanous utility functions, each used by several
 %%%			 other modules.
+%%% ts_benchmark         Supervises otp benchmarks and collects results.
 %%%----------------------------------------------------------------------
 
 -include_lib("kernel/include/file.hrl").
@@ -88,35 +81,25 @@
 -define(
    install_help,
    [
-    "  ts:install()      - Install TS for local target with no Options.\n"
-    "  ts:install([Options])\n",
-    "                    - Install TS for local target with Options\n"
-    "  ts:install({Architecture, Target_name})\n",
-    "                    - Install TS for a remote target architecture.\n",
-    "                      and target network name (e.g. {vxworks_cpu32, sauron}).\n",
-    "  ts:install({Architecture, Target_name}, [Options])\n",
-    "                    - Install TS as above, and with Options.\n",
+    "  ts:install()           - Install TS with no Options.\n"
+    "  ts:install([Options])  - Install TS with Options\n"
     "\n",
     "Installation options supported:\n",
     "  {longnames, true} - Use fully qualified hostnames\n",
-    "  {hosts, [HostList]}\n"
-    "                    - Use theese hosts for distributed testing.\n"
     "  {verbose, Level}  - Sets verbosity level for TS output (0,1,2), 0 is\n"
     "                      quiet(default).\n"
-    "  {slavetargets, SlaveTarges}\n"
-    "                    - Available hosts for starting slave nodes for\n"
-    "                      platforms which cannot have more than one erlang\n"
-    "                      node per host.\n"
-    "  {crossroot, TargetErlRoot}\n"
-    "                    - Erlang root directory on target host\n"
-    "                      Mandatory for remote targets\n"
-    "  {master, {MasterHost, MasterCookie}}\n"
-    "                    - Master host and cookie for targets which are\n"
-    "                      started as slave nodes.\n"
-    "                      erl_boot_server must be started on master before\n"
-    "                      test is run.\n"
-    "                      Optional, default is controller host and then\n"
-    "                      erl_boot_server is started autmatically\n"
+    "  {crossroot, ErlTop}\n"
+    "                    - Erlang root directory on build host, ~n"
+    "                      normally same value as $ERL_TOP\n"
+    "  {crossenv, [{Key,Val}]}\n"
+    "                    - Environmentals used by test configure on build host\n"
+    "  {crossflags, FlagsString}\n"
+    "                    - Flags used by test configure on build host\n"
+    "  {xcomp, XCompFile}\n"
+    "                    - The xcomp file to use for cross compiling the~n"
+    "                      testcases. Using this option will override any~n"
+    "                      cross* configurations given to ts. Note that you~n"
+    "                      have to have a correct ERL_TOP as well.~n"
    ]).
 
 help() ->
@@ -137,7 +120,7 @@ help(installed) ->
 	 "  ts:run(Spec, Mod) - Run a single test suite.\n",
 	 "  ts:run(Spec, Mod, Case)\n",
 	 "                    - Run a single test case.\n",
-	 "  All above run functions can have the additional Options argument\n",
+	 "  All above run functions can have an additional Options argument\n",
 	 "  which is a list of options.\n",
 	 "\n",
 	 "Run options supported:\n",
@@ -167,13 +150,10 @@ help(installed) ->
 	 "  {ctp | ctpl, Mod, Func}\n",
 	 "  {ctp | ctpl, Mod, Func, Arity}\n",
 	 "\n",
-	 "Support functions\n",
+	 "Support functions:\n",
 	 "  ts:tests()        - Shows all available families of tests.\n",
 	 "  ts:tests(Spec)    - Shows all available test modules in Spec,\n",
 	 "                      i.e. ../Spec_test/*_SUITE.erl\n",
-	 "  ts:index()        - Updates local index page.\n",
-	 "  ts:clean()        - Cleans up all but the last tests run.\n",
-	 "  ts:clean(all)     - Cleans up all test runs found.\n",
 	 "  ts:estone()       - Run estone_SUITE in kernel application with\n"
 	 "                      no run options\n",
 	 "  ts:estone(Opts)   - Run estone_SUITE in kernel application with\n"
@@ -183,53 +163,31 @@ help(installed) ->
 	 "                      cover_details. Analyses modules specified in\n"
 	 "                      cross.cover.\n"
 	 "                      Level can be 'overview' or 'details'.\n",
+	 "  ts:compile_testcases()~n"
+	 "  ts:compile_testcases(Apps)~n"
+	 "                    - Compile all testcases for usage in a cross ~n"
+	 "                      compile environment."
 	 " \n"
+	 "Benchmark functions:\n"
+	 "  ts:benchmarks()   - Get all available families of benchmarks\n"
+	 "  ts:bench()        - Runs all benchmarks\n"
+	 "  ts:bench(Spec)    - Runs all benchmarks in the given spec file.\n"
+	 "                      The spec file is actually ../*_test/Spec_bench.spec\n\n"
+	 "                      ts:bench can take the same Options argument as ts:run.\n"
+	 "\n"
 	 "Installation (already done):\n"
 	],
     show_help([H,?install_help]).
 
 show_help(H) ->
-    io:put_chars(lists:flatten(H)).
+    io:format(lists:flatten(H)).
 
 
 %% Installs tests.
 install() ->
     ts_install:install(install_local,[]).
-install({Architecture, Target_name})  ->
-    ts_install:install({ts_lib:maybe_atom_to_list(Architecture), 
-			ts_lib:maybe_atom_to_list(Target_name)}, []);
 install(Options) when is_list(Options) ->
     ts_install:install(install_local,Options).
-install({Architecture, Target_name}, Options) when is_list(Options)->
-    ts_install:install({ts_lib:maybe_atom_to_list(Architecture), 
-			ts_lib:maybe_atom_to_list(Target_name)}, Options).
-
-%% Updates the local index page.
-
-index() ->
-    check_and_run(fun(_Vars) -> ts_reports:make_index(), ok end).
-
-%%
-%% clean(all)
-%% Deletes all logfiles.
-%%
-clean(all) ->
-    delete_files(filelib:wildcard("*" ++ ?logdir_ext)).
-
-%% clean/0
-%%
-%% Cleans up run logfiles, all but the last run.
-clean() ->
-    clean1(filelib:wildcard("*" ++ ?logdir_ext)).
-
-clean1([Dir|Dirs]) ->
-    List0 = filelib:wildcard(filename:join(Dir, "run.*")),
-    case lists:reverse(lists:sort(List0)) of
-	[] -> ok;
-	[_Last|Rest] -> delete_files(Rest)
-    end,
-    clean1(Dirs);
-clean1([]) -> ok.
 
 %% run/0
 %%  Runs all specs found by ts:tests(), if any, or returns
@@ -301,14 +259,43 @@ run(List, Opts) when is_list(List), is_list(Opts) ->
 run(Testspec, Config) when is_atom(Testspec), is_list(Config) ->
     Options=check_test_get_opts(Testspec, Config),
     File=atom_to_list(Testspec),
-    Spec = case code:lib_dir(Testspec) of
-	       {error, bad_name} when Testspec /= emulator, 
-                                      Testspec /= system,
-                                      Testspec /= epmd ->
-		   create_skip_spec(Testspec, tests(Testspec));
-	       _ ->
-		   File++".spec"
-	       end,
+    WhatToDo =
+	case Testspec of
+	    %% Known to exist but fails generic tests below
+	    emulator -> test;
+	    system -> test;
+	    erl_interface -> test;
+	    epmd -> test;
+	    _ ->
+		case code:lib_dir(Testspec) of
+		    {error,bad_name} ->
+			%% Application does not exist
+			skip;
+		    Path ->
+			case file:read_file_info(filename:join(Path,"ebin")) of
+			    {ok,#file_info{type=directory}} ->
+				%% Erlang application is built
+				test;
+			    _ ->
+				case filelib:wildcard(
+				       filename:join([Path,"priv","*.jar"])) of
+				    [] ->
+					%% The application is not built
+					skip;
+				    [_|_] ->
+					%% Java application is built
+					test
+				end
+			end
+		end
+	end,
+    Spec =
+	case WhatToDo of
+	    skip ->
+		create_skip_spec(Testspec, tests(Testspec));
+	    test ->
+		File++".spec"
+	end,
     run_test(File, [{spec,[Spec]}], Options);
 %% Runs one module in a spec (interactive)
 run(Testspec, Mod) when is_atom(Testspec), is_atom(Mod) ->
@@ -502,6 +489,25 @@ tests(Spec) ->
     {ok, Cwd} = file:get_cwd(),
     ts_lib:suites(Cwd, atom_to_list(Spec)).
 
+%% Benchmark related functions
+
+bench() ->
+    bench([]).
+
+bench(Opts) when is_list(Opts) ->
+    bench(benchmarks(),Opts);
+bench(Spec) ->
+    bench([Spec],[]).
+
+bench(Spec, Opts) when is_atom(Spec) ->
+    bench([Spec],Opts);
+bench(Specs, Opts) ->
+    check_and_run(fun(Vars) -> ts_benchmark:run(Specs, Opts, Vars) end).
+
+benchmarks() ->
+    ts_benchmark:benchmarks().
+
+
 
 %% 
 %% estone/0, estone/1
@@ -521,8 +527,60 @@ estone(Opts) when is_list(Opts) -> run(emulator,estone_SUITE,Opts).
 cross_cover_analyse([Level]) ->
     cross_cover_analyse(Level);
 cross_cover_analyse(Level) ->
-    test_server_ctrl:cross_cover_analyse(Level).
-
+    Apps = get_last_app_tests(),
+    Modules = get_cross_modules(Apps,[]),
+    test_server_ctrl:cross_cover_analyse(Level,Apps,Modules).
+
+get_last_app_tests() ->
+    AllTests = filelib:wildcard(filename:join(["*","*_test.logs"])),
+    {ok,RE} = re:compile("^[^/]*/[^\.]*\.(.*)_test\.logs$"),
+    get_last_app_tests(AllTests,RE,[]).
+
+get_last_app_tests([Dir|Dirs],RE,Acc) ->
+    NewAcc =
+	case re:run(Dir,RE,[{capture,all,list}]) of
+	    {match,[Dir,AppStr]} ->
+		App = list_to_atom(AppStr),
+		case lists:keytake(App,1,Acc) of
+		    {value,{App,LastDir},Rest} ->
+			if Dir > LastDir ->
+				[{App,Dir}|Rest];
+			   true ->
+				Acc
+			end;
+		    false ->
+			[{App,Dir} | Acc]
+		end;
+	    _ ->
+		Acc
+	end,
+    get_last_app_tests(Dirs,RE,NewAcc);
+get_last_app_tests([],_,Acc) ->
+    Acc.
+
+get_cross_modules([{App,_}|Apps],Acc) ->
+    Mods = cross_modules(App),
+    get_cross_modules(Apps,lists:umerge(Mods,Acc));
+get_cross_modules([],Acc) ->
+    Acc.
+
+cross_modules(App) ->
+    case default_coverfile(App) of
+	none ->
+	    [];
+	File ->
+	    case catch file:consult(File) of
+		{ok,CoverSpec} ->
+		    case lists:keyfind(cross_apps,1,CoverSpec) of
+			false ->
+			    [];
+			{cross_apps,App,Modules} ->
+			    lists:usort(Modules)
+		    end;
+		_ ->
+		    []
+	    end
+    end.
 
 %%% Implementation.
 
@@ -563,32 +621,6 @@ run_test(File, Args, Options) ->
 run_test(File, Args, Options, Vars) ->
     ts_run:run(File, Args, Options, Vars).
 
-
-delete_files([]) -> ok;
-delete_files([Item|Rest]) ->
-    case file:delete(Item) of
-	ok ->
-	    delete_files(Rest);
-	{error,eperm} ->
-	    file:change_mode(Item, 8#777),
-	    delete_files(filelib:wildcard(filename:join(Item, "*"))),
-	    file:del_dir(Item),
-	    ok;
-	{error,eacces} ->
-	    %% We'll see about that!
-	    file:change_mode(Item, 8#777),
-	    case file:delete(Item) of
-		ok -> ok;
-		{error,_} ->
-		    erlang:yield(),
-		    file:change_mode(Item, 8#777),
-		    file:delete(Item),
-		    ok
-	    end;
-	{error,_} -> ok
-    end,
-    delete_files(Rest).
-
 
 %% This module provides some convenient shortcuts to running
 %% the test server from within a started Erlang shell.
@@ -728,3 +760,23 @@ cover_type(cover_details) -> details.
 do_load(Mod) ->
     code:purge(Mod),
     code:load_file(Mod).
+
+
+compile_testcases() ->
+    compile_datadirs("../*/*_data").
+
+compile_testcases(App) when is_atom(App) ->
+    compile_testcases([App]);
+compile_testcases([App | T]) ->
+    compile_datadirs(io_lib:format("../~s_test/*_data", [App])),
+    compile_testcases(T);
+compile_testcases([]) ->
+    ok.
+
+compile_datadirs(DataDirs) ->
+    {ok,Variables} = file:consult("variables"),
+
+    lists:foreach(fun(Dir) ->
+			  ts_lib:make_non_erlang(Dir, Variables)
+		  end,
+		  filelib:wildcard(DataDirs)).
diff --git a/lib/test_server/src/ts.hrl b/lib/test_server/src/ts.hrl
index 885a726c54..5e829f3575 100644
--- a/lib/test_server/src/ts.hrl
+++ b/lib/test_server/src/ts.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -28,6 +28,7 @@
 -define(run_summary, "suite.summary").
 -define(cover_total,"total_cover.log").
 -define(variables, "variables").
+-define(cross_variables, "variables-cross").
 -define(LF, [10]).                              % Newline in VxWorks script
 -define(CHAR_PER_LINE, 60).                     % Characters per VxWorks script building line
 -define(CROSS_COOKIE, "cross").                 % cookie used when cross platform testing
diff --git a/lib/test_server/src/ts_autoconf_vxworks.erl b/lib/test_server/src/ts_autoconf_vxworks.erl
deleted file mode 100644
index f4535cd89a..0000000000
--- a/lib/test_server/src/ts_autoconf_vxworks.erl
+++ /dev/null
@@ -1,191 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%% Purpose : Autoconf for cross environments.
-
--module(ts_autoconf_vxworks).
--export([configure/1]).
-%%% Supported cross platforms:
--define(PLATFORMS, ["vxworks_cpu32", "vxworks_ppc860", "vxworks_ppc603", 
-		    "vxworks_sparc", "vxworks_ppc750", "vxworks_simso"]).
--include("ts.hrl").
-
-%% takes an argument {Target_arch, Target_host} (e.g. {vxworks_ppc860, thorin}).
-configure({Target_arch, Target_host}) ->
-    case variables({Target_arch, Target_host}) of
-	{ok, Vars} ->
-	    ts_lib:subst_file("conf_vars.in", "conf_vars", Vars);
-	Error ->
-	    Error
-    end.
-
-variables(Cross_spec) ->
-    run_tests(Cross_spec, tests(), []).
-
-run_tests(Cross_spec, [{Prompt, Tester}|Rest], Vars) ->
-    io:format("checking ~s... ", [Prompt]),
-    case catch Tester(Cross_spec, Vars) of
-	{'EXIT', Reason} ->
-	    io:format("FAILED~nExit status: ~p~n", [Reason]),
-	    {error, auto_conf_failed};
-	{Result, NewVars} ->
-	    io:format("~s~n", [lists:concat([Result])]),
-	    run_tests(Cross_spec, Rest, NewVars)
-    end;
-run_tests(_Cross_spec, [], Vars) ->
-    {ok, Vars}.
-
-
-%%% The tests.
-
-tests() ->
-    [{"supported target architecture", fun target_architecture/2},
-     {"cross target host to run tests on", fun target_host/2},
-     {"CPU type", fun cpu/2},
-     {"for cross-compiling gcc", fun find_gcc/2},
-     {"for cross-linker", fun find_ld/2},
-     {"for object extension", fun find_obj/2},
-     {"for shared libraries extension", fun find_dll/2},
-     {"for executables extension", fun find_exe/2},
-     {"for make", fun find_make/2}].
-
-target_architecture({Architecture, _Target_host}, Vars) ->
-    case lists:member(Architecture, ?PLATFORMS) of
-	true ->
-	    {Architecture, [{host_os, os_type(Architecture)}, {host,  Architecture}|Vars]};    
-	false ->
-	    {"unsupported_platform", Vars} 
-    end.
-
-target_host({_Architecture, Target_host}, Vars) ->
-    {Target_host, [{target_host, Target_host} | Vars]}.
-
-cpu({Arch, _Target_host}, Vars) ->
-    Cpu = processor(Arch),
-    {Cpu, [{host_cpu, Cpu}|Vars]}.
-		
-find_gcc({Arch, _Target_host}, Vars) ->
-    Gcc = "cc" ++ gnu_suffix(Arch),
-    case os:find_executable(Gcc) of
-	false ->
-	    {no, Vars};
-	Path when is_list(Path) ->
-	    Cflags = cflags(Arch),
-	    {Path, [{'CC', Gcc},
-		    {'CFLAGS', Cflags},
-		    {'EI_CFLAGS', Cflags},
-		    {'ERTS_CFLAGS', Cflags},
-		    {'DEFS', ""},
-		    {'ERTS_LIBS', ""},
-		    {'LIBS', ""},
-		    {'SHLIB_CFLAGS', Cflags},
-		    {test_c_compiler, "{gnuc, undefined}"} | Vars]}
-    end.
-
-find_ld({Arch, _Target_host}, Vars) ->
-    Linker = "ld" ++ gnu_suffix(Arch),
-    case os:find_executable(Linker) of
-	false ->
-	    {no, Vars};
-	Path when is_list(Path) ->
-	    {Path, [{'LD', Linker},
-		    {'CROSSLDFLAGS', ldflags(Arch)},
-		    {'SHLIB_EXTRACT_ALL', ""},
-		    {'SHLIB_LD', Linker},
-		    {'SHLIB_LDFLAGS', ""},
-		    {'SHLIB_LDLIBS', ""} | Vars]}
-    end.
-
-find_obj({Arch, _Target_host}, Vars) ->
-    Obj = obj_ext(Arch),
-    {Obj, [{obj, Obj}|Vars]}.
-
-find_dll({Arch, _Target_host}, Vars) ->
-    Dll = dll_ext(Arch),
-    {Dll, [{'SHLIB_SUFFIX', Dll}|Vars]}.
-
-find_exe({Arch, _Target_host}, Vars) ->
-    Exe = exe_ext(Arch),
-    {Exe, [{exe, Exe}|Vars]}.
-
-find_make(_, Vars) ->
-    {"make", [{make_command, "make"} | Vars]}.
-
-%%% some utility functions 
-gnu_suffix(Arch) ->
-    {_, _, _, _, Suffix, _Cpu, _Cflags, _} = cross_data(Arch),
-    Suffix.
-
-processor(Arch) ->
-    {_, _, _, _, _Suffix, Cpu, _Cflags, _} = cross_data(Arch),
-    Cpu.
-
-cflags(Arch) ->
-    {_, _, _, _, _Suffix, _Cpu, Cflags, _} = cross_data(Arch),
-    Cflags.
-
-ldflags(Arch) ->
-    {_, _, _, _, _Suffix, _Cpu, _Cflags, Ldflags} = cross_data(Arch),
-    Ldflags.
-
-os_type(Arch) ->
-    {Os_type, _, _, _, _, _, _, _} = cross_data(Arch),
-    Os_type.
-
-obj_ext(Arch) ->
-    {_, _, Obj, _, _, _, _, _} = cross_data(Arch),
-    Obj.
-
-dll_ext(Arch) ->
-    {_, _, _, Dll, _, _, _, _} = cross_data(Arch),
-    Dll.
-
-exe_ext(Arch) ->
-    {_, Exe, _, _, _, _, _, _} = cross_data(Arch),
-    Exe.
-
-cross_data(Arch) ->
-    case Arch of
-	"vxworks_cpu32" ->
-	    {"VxWorks", "", ".o", ".eld", "68k", "cpu32",
-	    "-DCPU=CPU32 -DVXWORKS -I$(WIND_BASE)/target/h -mnobitfield -fno-builtin -nostdinc -fvolatile -msoft-float",
-	    "-r -d"};
-	"vxworks_ppc860" ->
-	    {"VxWorks", "", ".o", ".eld", "ppc", "ppc860",
-	     "-DCPU=PPC860 -DVXWORKS -I$(WIND_BASE)/target/h -mcpu=860 -fno-builtin -fno-for-scope -msoft-float -D_GNU_TOOL -nostdinc",
-	    "-r -d"};
-	"vxworks_ppc603" ->
-	    {"VxWorks", "", ".o", ".eld", "ppc", "ppc603",
-	     "-DCPU=PPC603 -DVXWORKS -I$(WIND_BASE)/target/h -fno-builtin -fno-for-scope -D_GNU_TOOL -nostdinc",
-	    "-r -d"};
-	"vxworks_sparc" ->
-	    %%% The Sparc Architecture is included for private use (i.e. not Tornado 1.0.1 compatible).
-	    {"VxWorks", "", ".o", ".eld", "sparc", "sparc",
-	    "-DCPU=SPARC -DVXWORKS  -I/home/gandalf/bsproj/BS.2/UOS/vw/5.2/h -fno-builtin -nostdinc",
-	    "-r -d"};
-	"vxworks_ppc750" ->
-	    {"VxWorks", "", ".o", ".eld", "ppc", "ppc604",
-	     "-DCPU=PPC604 -DVXWORKS -DTOOL_FAMILY=gnu -DTOOL=gnu -I$(WIND_BASE)/target/h -fno-builtin -fno-for-scope -D_GNU_TOOL",
-	    "-r -d"};
-	"vxworks_simso" ->
-	    {"VxWorks", "", ".o", ".eld", "simso", "simso",
-	     "-DCPU=SIMSPARCSOLARIS -DVXWORKS -DTOOL_FAMILY=gnu -DTOOL=gnu -I$(WIND_BASE)/target/h -I$(WIND_GCC_INCLUDE) -fno-builtin -fno-for-scope -D_GNU_TOOL",
-	    "-r -d"}
-	
-    end.
diff --git a/lib/test_server/src/ts_autoconf_win32.erl b/lib/test_server/src/ts_autoconf_win32.erl
index 9103542fd2..4a5c5c7603 100644
--- a/lib/test_server/src/ts_autoconf_win32.erl
+++ b/lib/test_server/src/ts_autoconf_win32.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -67,6 +67,7 @@ system_type(Vars) ->
 		     {5,1,_} -> "Windows XP";
 		     {5,2,_} -> "Windows 2003";
 		     {6,0,_} -> "Windows Vista";
+		     {6,1,_} -> "Windows 7";
 		     {_,_,_} -> "Windows NCC-1701-D"
 		 end;
 	     {win32, windows} -> 
diff --git a/lib/test_server/src/ts_benchmark.erl b/lib/test_server/src/ts_benchmark.erl
new file mode 100644
index 0000000000..516d22fd2d
--- /dev/null
+++ b/lib/test_server/src/ts_benchmark.erl
@@ -0,0 +1,91 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(ts_benchmark).
+
+-include_lib("common_test/include/ct_event.hrl").
+-include_lib("kernel/include/file.hrl").
+-include("ts.hrl").
+
+-export([benchmarks/0,
+	 run/3]).
+
+%% gen_event callbacks
+-export([init/1, handle_event/2]).
+
+benchmarks() ->
+    {ok, Cwd} = file:get_cwd(),
+    Benches = filelib:wildcard(
+		filename:join([Cwd,"..","*_test","*_bench.spec"])),
+    [begin
+	 Base = filename:basename(N),
+	 list_to_atom(string:substr(Base,1,string:rstr(Base,"_")-1))
+     end || N <- Benches].
+
+run(Specs, Opts, Vars) ->
+    {ok, Cwd} = file:get_cwd(),
+    {{YY,MM,DD},{HH,Mi,SS}} = calendar:local_time(),
+    BName = lists:concat([YY,"_",MM,"_",DD,"T",HH,"_",Mi,"_",SS]),
+    BDir = filename:join([Cwd,BName]),
+    file:make_dir(BDir),
+    [ts_run:run(atom_to_list(Spec),
+		[{spec, [atom_to_list(Spec)++"_bench.spec"]}],
+		[{event_handler, {ts_benchmark, [Spec,BDir]}}|Opts],Vars) 
+     || Spec <- Specs],
+    file:delete(filename:join(Cwd,"latest_benchmark")),
+    {ok,D} = file:open(filename:join(Cwd,"latest_benchmark"),[write]),
+    io:format(D,BDir,[]),
+    file:close(D).
+    
+
+%%%===================================================================
+%%% gen_event callbacks
+%%%===================================================================
+
+-record(state, { spec, suite, tc, stats_dir}).
+
+init([Spec,Dir]) ->
+    {ok, #state{ spec = Spec, stats_dir = Dir }}.
+
+handle_event(#event{name = tc_start, data = {Suite,Tc}}, State) ->
+    {ok,State#state{ suite = Suite, tc = Tc}};
+handle_event(#event{name = benchmark_data, data = Data}, State) ->
+    Spec = proplists:get_value(application, Data, State#state.spec),
+    Suite = proplists:get_value(suite, Data, State#state.suite),
+    Tc = proplists:get_value(name, Data, State#state.tc),
+    Value = proplists:get_value(value, Data),
+    {ok, D} = file:open(filename:join(
+			  [State#state.stats_dir,
+			   lists:concat([e(Spec),"-",e(Suite),"-",
+					 e(Tc),".ebench"])]),
+			[append]),
+    io:format(D, "~p~n",[Value]),
+    file:close(D),
+    {ok, State};
+handle_event(_Event, State) ->
+    {ok, State}.
+
+
+e(Atom) when is_atom(Atom) ->
+    Atom;
+e(Str) when is_list(Str) ->
+    lists:map(fun($/) ->
+		      $\\;
+		 (C) ->
+		      C
+	      end,Str).
diff --git a/lib/test_server/src/ts_erl_config.erl b/lib/test_server/src/ts_erl_config.erl
index 5585e8ccd3..73abe86e11 100644
--- a/lib/test_server/src/ts_erl_config.erl
+++ b/lib/test_server/src/ts_erl_config.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -128,15 +128,15 @@ erts_lib(Vars,OsType) ->
 		   ErtsLibInternal}
 	  end,
     [{erts_lib_include,
-      filename:nativename(ErtsLibInclude)},
+      quote(filename:nativename(ErtsLibInclude))},
      {erts_lib_include_generated,
-      filename:nativename(ErtsLibIncludeGenerated)},
+      quote(filename:nativename(ErtsLibIncludeGenerated))},
      {erts_lib_include_internal,
-      filename:nativename(ErtsLibIncludeInternal)},
+      quote(filename:nativename(ErtsLibIncludeInternal))},
      {erts_lib_include_internal_generated,
-      filename:nativename(ErtsLibIncludeInternalGenerated)},
-     {erts_lib_path, filename:nativename(ErtsLibPath)},
-     {erts_lib_internal_path, filename:nativename(ErtsLibInternalPath)},
+      quote(filename:nativename(ErtsLibIncludeInternalGenerated))},
+     {erts_lib_path, quote(filename:nativename(ErtsLibPath))},
+     {erts_lib_internal_path, quote(filename:nativename(ErtsLibInternalPath))},
      {erts_lib_multi_threaded, erts_lib_name(multi_threaded, OsType)},
      {erts_lib_single_threaded, erts_lib_name(single_threaded, OsType)}
      | Vars].
@@ -145,13 +145,13 @@ erl_include(Vars) ->
     Include = 
 	case erl_root(Vars) of
 	    {installed, Root} ->
-		filename:join([Root, "usr", "include"]);
+		quote(filename:join([Root, "usr", "include"]));
 	    {srctree, Root, Target} ->
-		filename:join([Root, "erts", "emulator", "beam"])
-		    ++ " -I" ++ filename:join([Root, "erts", "emulator"])
+		quote(filename:join([Root, "erts", "emulator", "beam"]))
+		    ++ " -I" ++ quote(filename:join([Root, "erts", "emulator"]))
 		    ++ system_include(Root, Vars)
-		    ++ " -I" ++ filename:join([Root, "erts", "include"])
-		    ++ " -I" ++ filename:join([Root, "erts", "include", Target])
+		    ++ " -I" ++ quote(filename:join([Root, "erts", "include"]))
+		    ++ " -I" ++ quote(filename:join([Root, "erts", "include", Target]))
 	end,
     [{erl_include, filename:nativename(Include)}|Vars].
 
@@ -160,10 +160,9 @@ system_include(Root, Vars) ->
     SysDir =
 	case ts_lib:var(os, Vars) of
 	    "Windows" ++ _T -> "sys/win32";
-	    "VxWorks" -> "sys.vxworks";
 	    _ -> "sys/unix"
 	end,
-    " -I" ++ filename:nativename(filename:join([Root, "erts", "emulator", SysDir])).
+    " -I" ++ quote(filename:nativename(filename:join([Root, "erts", "emulator", SysDir]))).
 
 erl_interface(Vars,OsType) ->
     {Incl, {LibPath, MkIncl}} =
@@ -176,9 +175,6 @@ erl_interface(Vars,OsType) ->
 		     {installed, _Root} ->
 			 {filename:join(Dir, "lib"),
 			  filename:join(Dir, "src")};
-		     {srctree, _Root, _Target} when OsType =:= vxworks ->
-			 {filename:join(Dir, "lib"),
-			  filename:join([Dir, "src"])};
 		     {srctree, _Root, Target} ->
 			 {filename:join([Dir, "obj", Target]),
 			  filename:join([Dir, "src", Target])}
@@ -218,22 +214,18 @@ erl_interface(Vars,OsType) ->
 		    {unix,_} ->
 			"-lpthread";
 		    _ -> 
-			"" % VxWorks
+			""
 		end,
-    CrossCompile = case OsType of
-		       vxworks -> "true";
-		       _ ->       "false"
-		   end,
-    [{erl_interface_libpath, filename:nativename(LibPath)},
+    [{erl_interface_libpath, quote(filename:nativename(LibPath))},
      {erl_interface_sock_libs, sock_libraries(OsType)},
      {erl_interface_lib, Lib},
      {erl_interface_eilib, Lib1},
      {erl_interface_lib_drv, LibDrv},
      {erl_interface_eilib_drv, Lib1Drv},
      {erl_interface_threadlib, ThreadLib},
-     {erl_interface_include, filename:nativename(Incl)},
-     {erl_interface_mk_include, filename:nativename(MkIncl)},
-     {erl_interface_cross_compile, CrossCompile} | Vars].
+     {erl_interface_include, quote(filename:nativename(Incl))},
+     {erl_interface_mk_include, quote(filename:nativename(MkIncl))}
+     | Vars].
 
 ic(Vars, OsType) ->
     {ClassPath, LibPath, Incl} =
@@ -250,10 +242,10 @@ ic(Vars, OsType) ->
 		 end,
 		 filename:join(Dir, "include")}
 	end,
-    [{ic_classpath, filename:nativename(ClassPath)},
-     {ic_libpath, filename:nativename(LibPath)},
+    [{ic_classpath, quote(filename:nativename(ClassPath))},
+     {ic_libpath, quote(filename:nativename(LibPath))},
      {ic_lib, link_library("ic", OsType)},
-     {ic_include_path, filename:nativename(Incl)}|Vars].
+     {ic_include_path, quote(filename:nativename(Incl))}|Vars].
 
 jinterface(Vars, _OsType) ->
     ClassPath =
@@ -263,7 +255,7 @@ jinterface(Vars, _OsType) ->
 	    Dir ->
 		filename:join([Dir, "priv", "OtpErlang.jar"])
 	end,
-    [{jinterface_classpath, filename:nativename(ClassPath)}|Vars].
+    [{jinterface_classpath, quote(filename:nativename(ClassPath))}|Vars].
 
 lib_dir(Vars, Lib) ->
     LibLibDir = case Lib of
@@ -276,8 +268,6 @@ lib_dir(Vars, Lib) ->
     case {get_var(crossroot, Vars), LibLibDir} of
 	{{error, _}, _} ->			%no crossroot
 	    LibLibDir;
-	{_, {error, _}} ->			%no lib
-	    LibLibDir;
 	{CrossRoot, _} ->
 	    %% XXX: Ugly. So ugly I won't comment it
 	    %% /Patrik
@@ -299,18 +289,16 @@ lib_dir(Vars, Lib) ->
     end.
 
 erl_root(Vars) ->
-    Root = code:root_dir(),
-    case ts_lib:erlang_type() of
+    Root = case get_var(crossroot,Vars) of
+	       {error, notfound} -> code:root_dir();
+	       CrossRoot -> CrossRoot
+	   end,
+    case ts_lib:erlang_type(Root) of
 	{srctree, _Version} ->
 	    Target = get_var(target, Vars),
 	    {srctree, Root, Target};
 	{_, _Version} ->
-	    case get_var(crossroot,Vars) of
-		{error, notfound} ->
-		    {installed, Root};
-		CrossRoot ->
-		    {installed, CrossRoot}
-	    end
+	    {installed, Root}
     end.
 
 
@@ -326,16 +314,12 @@ get_var(Key, Vars) ->
 sock_libraries({win32, _}) ->
     "ws2_32.lib";
 sock_libraries({unix, _}) ->
-    "";	% Included in general libraries if needed.
-sock_libraries(vxworks) ->
-    "".
+    "".	% Included in general libraries if needed.
 
 link_library(LibName,{win32, _}) ->
     LibName ++ ".lib";
 link_library(LibName,{unix, _}) ->
     "lib" ++ LibName ++ ".a";
-link_library(LibName,vxworks) ->
-    "lib" ++ LibName ++ ".a";
 link_library(_LibName,_Other) ->
     exit({link_library, not_supported}).
 
@@ -362,10 +346,17 @@ ssl(Vars, _OsType) ->
 	{error, bad_name} ->
 	    throw({cannot_find_app, ssl});
 	Dir ->
-	    [{ssl_libdir, filename:nativename(Dir)}| Vars]
+	    [{ssl_libdir, quote(filename:nativename(Dir))}| Vars]
     end.
 
 separators(Vars, {win32,_}) ->
     [{'DS',"\\"},{'PS',";"}|Vars];
 separators(Vars, _) ->
     [{'DS',"/"},{'PS',":"}|Vars].
+
+quote([$ |R]) ->
+    "\\ "++quote(R);
+quote([C|R]) ->
+    [C|quote(R)];
+quote([]) ->
+    [].
diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl
index 9703478f20..ba8952f10f 100644
--- a/lib/test_server/src/ts_install.erl
+++ b/lib/test_server/src/ts_install.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -28,12 +28,25 @@ install(install_local, Options) ->
     install(os:type(), Options);
 
 install(TargetSystem, Options) ->
-    io:format("Running configure for cross architecture, network target name~n"
-	      "~p~n", [TargetSystem]),
-    case autoconf(TargetSystem) of
+    case file:consult(?variables) of
+	{ok, Vars} ->
+	    case proplists:get_value(cross,Vars) of
+		"yes" when Options == []->
+		    target_install(Vars);
+		_ ->
+		    build_install(TargetSystem, Options)
+	    end;
+	_ ->
+	    build_install(TargetSystem, Options)
+    end.
+
+
+build_install(TargetSystem, Options) ->
+    XComp = parse_xcomp_file(proplists:get_value(xcomp,Options)),
+    case autoconf(TargetSystem, XComp++Options) of
 	{ok, Vars0} ->
 	    OsType = os_type(TargetSystem),
-	    Vars1 = ts_erl_config:variables(merge(Vars0,Options),OsType),
+	    Vars1 = ts_erl_config:variables(Vars0++XComp++Options,OsType),
 	    {Options1, Vars2} = add_vars(Vars1, Options),
 	    Vars3 = lists:flatten([Options1|Vars2]),
 	    write_terms(?variables, Vars3);
@@ -42,35 +55,42 @@ install(TargetSystem, Options) ->
     end.
 
 os_type({unix,_}=OsType) -> OsType;
-os_type({win32,_}=OsType) -> OsType;
-os_type(_Other) -> vxworks.
+os_type({win32,_}=OsType) -> OsType.
 
-merge(Vars,[]) ->
-    Vars;
-merge(Vars,[{crossroot,X}| Tail]) ->
-    merge([{crossroot, X} | Vars], Tail);
-merge(Vars,[_X | Tail]) ->
-    merge(Vars,Tail).
+target_install(CrossVars) ->
+    io:format("Cross installation detected, skipping configure and data_dir make~n"),
+    case file:rename(?variables,?cross_variables) of
+	ok ->
+	    ok;
+	_ ->
+	    io:format("Could not find variables file from cross make~n"),
+	    throw(cross_installation_failed)
+    end,
+    CPU = proplists:get_value('CPU',CrossVars),
+    OS = proplists:get_value(os,CrossVars),
+    {Options,Vars} = add_vars([{cross,"yes"},{'CPU',CPU},{os,OS}],[]),
+    Variables = lists:flatten([Options|Vars]),
+    write_terms(?variables, Variables).
 
 %% Autoconf for various platforms.
 %% unix uses the configure script
 %% win32 uses ts_autoconf_win32
-%% VxWorks uses ts_autoconf_vxworks.
 
-autoconf(TargetSystem) ->
-    case autoconf1(TargetSystem) of
+autoconf(TargetSystem, XComp) ->
+    case autoconf1(TargetSystem, XComp) of
 	ok ->
 	    autoconf2(file:read_file("conf_vars"));
 	Error ->
 	    Error
     end.
 
-autoconf1({win32, _}) ->
+autoconf1({win32, _},[{cross,"no"}]) ->
     ts_autoconf_win32:configure();
-autoconf1({unix, _}) ->
-    unix_autoconf();
-autoconf1(Other) ->
-    ts_autoconf_vxworks:configure(Other).
+autoconf1({unix, _},XCompFile) ->
+    unix_autoconf(XCompFile);
+autoconf1(_,_) ->
+    io:format("cross compilation not supported for that this platform~n"),
+    throw(cross_installation_failed).
 
 autoconf2({ok, Bin}) ->
     get_vars(binary_to_list(Bin), name, [], []);
@@ -92,27 +112,40 @@ get_vars([], name, [], Result) ->
 get_vars(_, _, _, _) ->
     {error, fatal_bad_conf_vars}.
 
-unix_autoconf() ->
+unix_autoconf(XConf) ->
     Configure = filename:absname("configure"),
-    Args = case catch erlang:system_info(threads) of
-	       false -> "";
-	       _ -> " --enable-shlib-thread-safety"
-	   end
-	++ case catch string:str(erlang:system_info(system_version),
-				 "debug") > 0 of
-	       false -> "";
-	       _ -> " --enable-debug-mode"
-	   end,
+    Flags = proplists:get_value(crossflags,XConf,[]),
+    Env = proplists:get_value(crossenv,XConf,[]),
+    Host = get_xcomp_flag("host", Flags),
+    Build = get_xcomp_flag("build", Flags),
+    Threads = [" --enable-shlib-thread-safety" ||
+		  erlang:system_info(threads) /= false],
+    Debug = [" --enable-debug-mode" ||
+		string:str(erlang:system_info(system_version),"debug") > 0],
+    Args = Host ++ Build ++ Threads ++ Debug,
     case filelib:is_file(Configure) of
 	true ->
-	    Env = macosx_cflags(),
-	    Port = open_port({spawn, Configure ++ Args},
-			     [stream, eof, {env,Env}]),
+	    OSXEnv = macosx_cflags(),
+	    io:format("Running ~sEnv: ~p~n",
+		      [lists:flatten(Configure ++ Args),Env++OSXEnv]),
+	    Port = open_port({spawn, lists:flatten(["\"",Configure,"\"",Args])},
+			     [stream, eof, {env,Env++OSXEnv}]),
 	    ts_lib:print_data(Port);
 	false ->
 	    {error, no_configure_script}
     end.
 
+
+get_xcomp_flag(Flag, Flags) ->
+    get_xcomp_flag(Flag, Flag, Flags).
+get_xcomp_flag(Flag, Tag, Flags) ->
+    case proplists:get_value(Flag,Flags) of
+	undefined -> "";
+	"guess" -> [" --",Tag,"=",os:cmd("$ERL_TOP/erts/autoconf/config.guess")];
+	HostVal -> [" --",Tag,"=",HostVal]
+    end.
+
+
 macosx_cflags() ->
     case os:type() of
 	{unix, darwin} ->
@@ -125,10 +158,33 @@ macosx_cflags() ->
 	    []
     end.
 
+parse_xcomp_file(undefined) ->
+    [{cross,"no"}];
+parse_xcomp_file(Filepath) ->
+    {ok,Bin} = file:read_file(Filepath),
+    Lines = binary:split(Bin,<<"\n">>,[global,trim]),
+    {Envs,Flags} = parse_xcomp_file(Lines,[],[]),
+    [{cross,"yes"},{crossroot,os:getenv("ERL_TOP")},
+     {crossenv,Envs},{crossflags,Flags}].
+
+parse_xcomp_file([<<A:8,_/binary>> = Line|R],Envs,Flags)
+  when $A =< A, A =< $Z ->
+    [Var,Value] = binary:split(Line,<<"=">>),
+    parse_xcomp_file(R,[{binary_to_list(Var),
+			 binary_to_list(Value)}|Envs],Flags);
+parse_xcomp_file([<<"erl_xcomp_",Line/binary>>|R],Envs,Flags) ->
+    [Var,Value] = binary:split(Line,<<"=">>),
+    parse_xcomp_file(R,Envs,[{binary_to_list(Var),
+			      binary_to_list(Value)}|Flags]);
+parse_xcomp_file([_|R],Envs,Flags) ->
+    parse_xcomp_file(R,Envs,Flags);
+parse_xcomp_file([],Envs,Flags) ->
+    {lists:reverse(Envs),lists:reverse(Flags)}.
+
 write_terms(Name, Terms) ->
     case file:open(Name, [write]) of
 	{ok, Fd} ->
-	    Result = write_terms1(Fd, Terms),
+	    Result = write_terms1(Fd, remove_duplicates(Terms)),
 	    file:close(Fd),
 	    Result;
 	{error, Reason} ->
@@ -141,6 +197,17 @@ write_terms1(Fd, [Term|Rest]) ->
 write_terms1(_, []) ->
     ok.
 
+remove_duplicates(List) ->
+    lists:reverse(
+      lists:foldl(fun({Key,Val},Acc) ->
+			  R = make_ref(),
+			  case proplists:get_value(Key,Acc,R) of
+			      R -> [{Key,Val}|Acc];
+			      _Else ->
+				  Acc
+			  end
+		  end,[],List)).
+
 add_vars(Vars0, Opts0) ->
     {Opts,LongNames} =
 	case lists:keymember(longnames, 1, Opts0) of
@@ -209,12 +276,11 @@ platform(Vars) ->
     LC = lock_checking(),
     MT = modified_timing(),
     AsyncThreads = async_threads(),
-    HeapType = heap_type_label(),
     Debug = debug(),
     CpuBits = word_size(),
     Common = lists:concat([Hostname,"/",OsType,"/",CpuType,CpuBits,LinuxDist,
 			   Schedulers,BindType,KP,IOTHR,LC,MT,AsyncThreads,
-			   HeapType,Debug,ExtraLabel]),
+			   Debug,ExtraLabel]),
     PlatformId = lists:concat([ErlType, " ", Version, Common]),
     PlatformLabel = ErlType ++ Common,
     PlatformFilename = platform_as_filename(PlatformId),
@@ -272,12 +338,6 @@ hostname() ->
 	    "/localhost"
     end.
 
-heap_type_label() ->
-    case catch erlang:system_info(heap_type) of
-	hybrid -> "/Hybrid";
-	_ -> "" %private
-    end.
-
 async_threads() ->
     case catch erlang:system_info(threads) of
 	true -> "/A"++integer_to_list(erlang:system_info(thread_pool_size));
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/test_server/src/ts_install_cth.erl
index a41916fd0a..9b6e10e7e2 100644
--- a/lib/test_server/src/ts_install_cth.erl
+++ b/lib/test_server/src/ts_install_cth.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -95,17 +95,12 @@ pre_init_per_suite(_Suite,Config,State) ->
     try
 	{ok,Variables} = 
 	    file:consult(filename:join(State#state.ts_conf_dir,"variables")),
-
-	%% Make the stuff in all_SUITE_data if it exists
-	AllDir = filename:join(DataDir,"../all_SUITE_data"),
-	case filelib:is_dir(AllDir) of
-	    true ->
-		make_non_erlang(AllDir,Variables);
-	    false ->
-		ok
+	case proplists:get_value(cross,Variables) of
+	    "yes" ->
+		ct:log("Not making data dir as tests have been cross compiled");
+	    _ ->
+		ts_lib:make_non_erlang(DataDir, Variables)
 	end,
-	
-	make_non_erlang(DataDir, Variables),
 
 	{add_node_name(Config, State), State}
     catch Error:Reason ->
@@ -219,39 +214,6 @@ terminate(_State) ->
 %%% ============================================================================
 %%% Local functions
 %%% ============================================================================
-%% Configure and run all the Makefiles in the data dirs of the suite 
-%% in question
-make_non_erlang(DataDir, Variables) ->
-    {ok,CurrWD} = file:get_cwd(),
-    try
-	file:set_cwd(DataDir),
-	MakeCommand = proplists:get_value(make_command,Variables),
-	
-	FirstMakefile = filename:join(DataDir,"Makefile.first"),
-	case filelib:is_regular(FirstMakefile) of
-	    true ->
-		ct:log("Making ~p",[FirstMakefile]),
-		ok = ts_make:make(
-		       MakeCommand, DataDir, filename:basename(FirstMakefile));
-	    false ->
-		ok
-	end,
-	
-	MakefileSrc = filename:join(DataDir,"Makefile.src"),
-	MakefileDest = filename:join(DataDir,"Makefile"),
-	case filelib:is_regular(MakefileSrc) of
-	    true ->
-		ok = ts_lib:subst_file(MakefileSrc,MakefileDest,Variables),
-		ct:log("Making ~p",[MakefileDest]),
-		ok = ts_make:make([{makefile,"Makefile"},{data_dir,DataDir} 
-				   | Variables]);
-	    false ->
-		ok
-	end
-    after
-	file:set_cwd(CurrWD),
-	timer:sleep(100)
-    end.
 
 %% Add a nodename to config if it does not exist
 add_node_name(Config, State) ->
diff --git a/lib/test_server/src/ts_lib.erl b/lib/test_server/src/ts_lib.erl
index 2f0a4ea8c0..d9a699ca9f 100644
--- a/lib/test_server/src/ts_lib.erl
+++ b/lib/test_server/src/ts_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -24,10 +24,11 @@
 %% Avoid warning for local function error/1 clashing with autoimported BIF.
 -compile({no_auto_import,[error/1]}).
 -export([error/1, var/2, erlang_type/0,
-	 initial_capital/1, interesting_logs/1, 
-	 specs/1, suites/2, last_test/1,
-	 force_write_file/2, force_delete/1,
+	 erlang_type/1,
+	 initial_capital/1,
+	 specs/1, suites/2,
 	 subst_file/3, subst/2, print_data/1,
+	 make_non_erlang/2,
 	 maybe_atom_to_list/1, progress/4
 	]).
 
@@ -73,8 +74,10 @@ progress(Vars, Level, Format, Args) ->
 %% Returns: {Type, Version} where Type is otp|src
 
 erlang_type() ->
+    erlang_type(code:root_dir()).
+erlang_type(RootDir) ->
     {_, Version} = init:script_id(),
-    RelDir = filename:join(code:root_dir(), "releases"), % Only in installed
+    RelDir = filename:join(RootDir, "releases"), % Only in installed
     case filelib:is_file(RelDir) of
 	true -> {otp,Version};			% installed OTP
 	false -> {srctree,Version}		% source code tree
@@ -87,25 +90,18 @@ initial_capital([C|Rest]) when $a =< C, C =< $z ->
 initial_capital(String) ->
     String.
 
-%% Returns a list of the "interesting logs" in a directory,
-%% i.e. those that correspond to spec files.
-
-interesting_logs(Dir) ->
-    Logs = filelib:wildcard(filename:join(Dir, [$*|?logdir_ext])),
-    Interesting =
-	case specs(Dir) of
-	    [] ->
-		Logs;
-	    Specs0 ->
-		Specs = ordsets:from_list(Specs0),
-		[L || L <- Logs, ordsets:is_element(filename_to_atom(L), Specs)]
-	end,
-    sort_tests(Interesting).
-
 specs(Dir) ->
     Specs = filelib:wildcard(filename:join([filename:dirname(Dir),
-					    "*_test", "*.{dyn,}spec"])), 
-    sort_tests([filename_to_atom(Name) || Name <- Specs]).
+					    "*_test", "*.{dyn,}spec"])),
+    % Filter away all spec which end with _bench.spec
+    NoBench = fun(SpecName) ->
+		      case lists:reverse(SpecName) of
+			  "ceps.hcneb_"++_ -> false;
+			  _ -> true
+		      end
+	      end,
+
+    sort_tests([filename_to_atom(Name) || Name <- Specs, NoBench(Name)]).
 
 suites(Dir, Spec) ->
     Glob=filename:join([filename:dirname(Dir), Spec++"_test",
@@ -153,42 +149,6 @@ suite_order(mnesia) -> 44;
 suite_order(system) -> 999; %% IMPORTANT: system SHOULD always be last!
 suite_order(_) -> 200.
 
-last_test(Dir) ->
-    last_test(filelib:wildcard(filename:join(Dir, "run.[1-2]*")), false).
-
-last_test([Run|Rest], false) ->
-    last_test(Rest, Run);
-last_test([Run|Rest], Latest) when Run > Latest ->
-    last_test(Rest, Run);
-last_test([_|Rest], Latest) ->
-    last_test(Rest, Latest);
-last_test([], Latest) ->
-    Latest.
-
-%% Do the utmost to ensure that the file is written, by deleting or
-%% renaming an old file with the same name.
-
-force_write_file(Name, Contents) ->
-    force_delete(Name),
-    file:write_file(Name, Contents).
-
-force_delete(Name) ->
-    case file:delete(Name) of
-	{error, eacces} ->
-	    force_rename(Name, Name ++ ".old.", 0);
-	Other ->
-	    Other
-    end.
-
-force_rename(From, To, Number) ->
-    Dest = [To|integer_to_list(Number)],
-    case file:read_file_info(Dest) of
-	{ok, _} ->
-	    force_rename(From, To, Number+1);
-	{error, _} ->
-	    file:rename(From, Dest)
-    end.
-
 %% Substitute all occurrences of @var@ in the In file, using
 %% the list of variables in Vars, producing the output file Out.
 %% Returns: ok | {error, Reason}
@@ -333,3 +293,45 @@ maybe_atom_to_list(To_list) when is_list(To_list) ->
 maybe_atom_to_list(To_list) when is_atom(To_list)->
     atom_to_list(To_list).
     
+
+%% Configure and run all the Makefiles in the data dir of the suite
+%% in question
+make_non_erlang(DataDir, Variables) ->
+    %% Make the stuff in all_SUITE_data if it exists
+    AllDir = filename:join(DataDir,"../all_SUITE_data"),
+    case filelib:is_dir(AllDir) of
+	true ->
+	    make_non_erlang_do(AllDir,Variables);
+	false ->
+	    ok
+    end,
+    make_non_erlang_do(DataDir, Variables).
+
+make_non_erlang_do(DataDir, Variables) ->
+    try
+	MakeCommand = proplists:get_value(make_command,Variables),
+
+	FirstMakefile = filename:join(DataDir,"Makefile.first"),
+	case filelib:is_regular(FirstMakefile) of
+	    true ->
+		io:format("Making ~p",[FirstMakefile]),
+		ok = ts_make:make(
+		       MakeCommand, DataDir, filename:basename(FirstMakefile));
+	    false ->
+		ok
+	end,
+
+	MakefileSrc = filename:join(DataDir,"Makefile.src"),
+	MakefileDest = filename:join(DataDir,"Makefile"),
+	case filelib:is_regular(MakefileSrc) of
+	    true ->
+		ok = ts_lib:subst_file(MakefileSrc,MakefileDest,Variables),
+		io:format("Making ~p",[MakefileDest]),
+		ok = ts_make:make([{makefile,"Makefile"},{data_dir,DataDir}
+				   | Variables]);
+	    false ->
+		ok
+	end
+    after
+	timer:sleep(100)  %% maybe unnecessary now when we don't do set_cwd anymore
+    end.
diff --git a/lib/test_server/src/ts_make.erl b/lib/test_server/src/ts_make.erl
index 3df66111a3..f3266f5836 100644
--- a/lib/test_server/src/ts_make.erl
+++ b/lib/test_server/src/ts_make.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -25,12 +25,12 @@
 %% Functions to be called from make test cases.
 
 make(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
-    Makefile = ?config(makefile, Config),
-    Make = ?config(make_command, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    Makefile = proplists:get_value(makefile, Config),
+    Make = proplists:get_value(make_command, Config),
     case make(Make, DataDir, Makefile) of
 	ok -> ok;
-	{error,Reason} -> ?t:fail({make_failed,Reason})
+	{error,Reason} -> exit({make_failed,Reason})
     end.
 
 unmake(Config) when is_list(Config) ->
@@ -85,7 +85,7 @@ run_make_script({win32, _}, Make, Dir, Makefile) ->
     {"run_make.bat",
      ".\\run_make",
      ["@echo off\r\n",
-      "cd ", filename:nativename(Dir), "\r\n",
+      "cd \"", filename:nativename(Dir), "\"\r\n",
       Make, " -f ", Makefile, " \r\n",
       "if errorlevel 1 echo *error*\r\n",
       "if not errorlevel 1 echo *ok*\r\n"]};
@@ -93,7 +93,7 @@ run_make_script({unix, _}, Make, Dir, Makefile) ->
     {"run_make", 
      "/bin/sh ./run_make",
      ["#!/bin/sh\n",
-      "cd ", Dir, "\n",
+      "cd \"", Dir, "\"\n",
       Make, " -f ", Makefile, " 2>&1\n",
       "case $? in\n",
       "  0) echo '*ok*';;\n",
diff --git a/lib/test_server/src/ts_reports.erl b/lib/test_server/src/ts_reports.erl
deleted file mode 100644
index f981a77ae4..0000000000
--- a/lib/test_server/src/ts_reports.erl
+++ /dev/null
@@ -1,545 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%% Purpose : Produces reports in HTML from the outcome of test suite runs.
-
--module(ts_reports).
-
--export([make_index/0, make_master_index/2, make_progress_index/2]).
--export([count_cases/1, year/0, current_time/0]).
-
--include_lib("kernel/include/file.hrl").
--include("ts.hrl").
-
--compile({no_auto_import,[error/1]}).
-
--import(filename, [basename/1, rootname/1]).
--import(ts_lib, [error/1]).
-
-
-%% Make master index page which points out index pages for all platforms.
-
-make_master_index(Dir, Vars) ->
-    IndexName = filename:join(Dir, "index.html"),
-    {ok, Index0} = make_master_index1(directories(Dir), master_header(Vars)),
-    Index = [Index0|master_footer()],
-    io:put_chars("Updating " ++ IndexName ++ "... "),
-    ok = ts_lib:force_write_file(IndexName, Index),
-    io:put_chars("done\n").
-
-make_master_index1([Dir|Rest], Result) ->
-    NewResult = 
-	case catch read_variables(Dir) of
-	    {'EXIT',{{bad_installation,Reason},_}} ->
-		io:put_chars("Failed to read " ++ filename:join(Dir,?variables)++
-			     ": " ++ Reason ++ " - Ignoring this directory\n"),
-		Result;
-	    Vars ->
-		Platform = ts_lib:var(platform_label, Vars),
-		case make_index(Dir, Vars, false) of
-		    {ok, Summary} ->
-			make_master_index(Platform, Dir, Summary, Result);
-		    {error, _} ->
-			Result
-		end
-	end,
-    make_master_index1(Rest, NewResult);
-make_master_index1([], Result) ->
-    {ok, Result}.
-
-make_progress_index(Dir, Vars) ->
-    IndexName = filename:join(Dir, "index.html"),
-    io:put_chars("Updating " ++ IndexName ++ "... "),
-    Index0=progress_header(Vars),
-    ts_lib:force_delete(IndexName),
-    Dirs=find_progress_runs(Dir),
-    Index1=[Index0|make_progress_links(Dirs, [])],
-    IndexF=[Index1|progress_footer()],
-    ok = ts_lib:force_write_file(IndexName, IndexF),
-    io:put_chars("done\n").
-
-find_progress_runs(Dir) ->
-    case file:list_dir(Dir) of
-	{ok, Dirs0} ->
-	    Dirs1= [filename:join(Dir,X) || X <- Dirs0, 
-			 filelib:is_dir(filename:join(Dir,X))],
-	    lists:sort(Dirs1);
-	_ ->
-	    []
-    end.
-
-name_from_vars(Dir, Platform) ->
-    VarFile=filename:join([Dir, Platform, "variables"]),
-    case file:consult(VarFile) of
-	{ok, Vars} ->
-	    ts_lib:var(platform_id, Vars);
-	_Other ->
-	    Platform
-    end.
-
-make_progress_links([], Acc) ->
-    Acc;
-make_progress_links([RDir|Rest], Acc) ->
-    Dir=filename:basename(RDir),
-    Platforms=[filename:basename(X) ||
-		  X <- find_progress_runs(RDir)],
-    PlatformLinks=["<A HREF=\""++filename:join([Dir,X,"index.html"])
-		   ++"\">"++name_from_vars(RDir, X)++"</A><BR>" ||
-		      X <- Platforms],
-    LinkName=Dir++"/index.html",
-    Link =
-    [
-     "<TR valign=top>\n",
-     "<TD><A HREF=\"", LinkName, "\">", Dir, "</A></TD>", "\n",
-     "<TD>", PlatformLinks, "</TD>", "\n"
-    ],
-    make_progress_links(Rest, [Link|Acc]).
-
-read_variables(Dir) ->
-    case file:consult(filename:join(Dir, ?variables)) of
-	{ok, Vars} -> Vars;
-	{error, Reason} ->
-	    erlang:error({bad_installation,file:format_error(Reason)}, [Dir])
-    end.
-
-make_master_index(Platform, Dirname, {Succ, Fail, UserSkip,AutoSkip}, Result) ->
-    Link = filename:join(filename:basename(Dirname), "index.html"),
-    FailStr =
-	if Fail > 0 ->  
-		["<FONT color=\"red\">",
-		 integer_to_list(Fail),"</FONT>"];
-	   true ->
-		integer_to_list(Fail)
-	end,
-    AutoSkipStr =
-	if AutoSkip > 0 ->
-		["<FONT color=\"brown\">",
-		 integer_to_list(AutoSkip),"</FONT>"];
-	   true -> integer_to_list(AutoSkip)
-	end,
-    [Result,
-     "<TR valign=top>\n",
-     "<TD><A HREF=\"", Link, "\">", Platform, "</A></TD>", "\n",
-     make_row(integer_to_list(Succ), false),
-     make_row(FailStr, false),
-     make_row(integer_to_list(UserSkip), false),
-     make_row(AutoSkipStr, false),
-     "</TR>\n"].
-
-%% Make index page which points out individual test suites for a single platform.
-
-make_index() ->
-    {ok, Pwd} = file:get_cwd(),
-    Vars = read_variables(Pwd),
-    make_index(Pwd, Vars, true).
-
-make_index(Dir, Vars, IncludeLast) ->
-    IndexName = filename:absname("index.html", Dir),
-    io:put_chars("Updating " ++ IndexName ++ "... "),
-    case catch make_index1(Dir, IndexName, Vars, IncludeLast) of
-	{'EXIT', Reason} ->
-	    io:put_chars("CRASHED!\n"),
-	    io:format("~p~n", [Reason]),
-	    {error, Reason};
-	{error, Reason} ->
-	    io:put_chars("FAILED\n"),
-	    io:format("~p~n", [Reason]),
-	    {error, Reason};
-	{ok, Summary} ->
-	    io:put_chars("done\n"),
-	    {ok, Summary};
-	Err ->
-	    io:format("Unknown internal error. Please report.\n(Err: ~p, ID: 1)",
-		      [Err]),
-	    {error, Err}
-    end.
-
-make_index1(Dir, IndexName, Vars, IncludeLast) ->
-    Logs0 = ts_lib:interesting_logs(Dir),
-    Logs = 
-	case IncludeLast of
-	    true  -> add_last_name(Logs0);
-	    false -> Logs0
-	end,
-    {ok, {Index0, Summary}} = make_index(Logs, header(Vars), 0, 0, 0, 0, 0),
-    Index = [Index0|footer()],
-    case ts_lib:force_write_file(IndexName, Index) of
-	ok ->
-	    {ok, Summary};
-	{error, Reason} ->
-	    error({index_write_error, Reason})
-    end.
-
-make_index([Name|Rest], Result, TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt) ->
-    case ts_lib:last_test(Name) of
-	false ->
-	    %% Silently skip.
-	    make_index(Rest, Result, TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt);
-	Last ->
-	    case count_cases(Last) of
-		{Succ, Fail, USkip, ASkip} ->
-		    Cov = 
-			case file:read_file(filename:join(Last,?cover_total)) of
-			    {ok,Bin} -> 
-				TotCoverage = binary_to_term(Bin),
-				io_lib:format("~w %",[TotCoverage]);
-			    _error -> 
-				""
-			end,
-		    Link = filename:join(basename(Name), basename(Last)),
-		    JustTheName = rootname(basename(Name)),
-		    NotBuilt = not_built(JustTheName),
-		    NewResult = [Result, make_index1(JustTheName,
-						     Link, Succ, Fail, USkip, ASkip, 
-						     NotBuilt, Cov, false)],
-		    make_index(Rest, NewResult, TotSucc+Succ, TotFail+Fail, 
-			       UserSkip+USkip, AutoSkip+ASkip, TotNotBuilt+NotBuilt);
-		error ->
-		    make_index(Rest, Result, TotSucc, TotFail, UserSkip, AutoSkip,
-			       TotNotBuilt)
-	    end
-    end;
-make_index([], Result, TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt) ->
-    {ok, {[Result|make_index1("Total", no_link,
-			      TotSucc, TotFail, UserSkip, AutoSkip, 
-			      TotNotBuilt, "", true)],
-	  {TotSucc, TotFail, UserSkip, AutoSkip}}}.
-
-make_index1(SuiteName, Link, Success, Fail, UserSkip, AutoSkip, NotBuilt, Coverage, Bold) ->
-    Name = test_suite_name(SuiteName),
-    FailStr =
-	if Fail > 0 ->  
-		["<FONT color=\"red\">",
-		 integer_to_list(Fail),"</FONT>"];
-	   true ->
-		integer_to_list(Fail)
-	end,
-    AutoSkipStr =
-	if AutoSkip > 0 ->
-		["<FONT color=\"brown\">",
-		 integer_to_list(AutoSkip),"</FONT>"];
-	   true -> integer_to_list(AutoSkip)
-	end,
-    ["<TR valign=top>\n",
-     "<TD>",
-     case Link of
-	 no_link ->
-	     ["<B>", Name|"</B>"];
-	 _Other  ->
-	     CrashDumpName = SuiteName ++ "_erl_crash.dump",
-	     CrashDumpLink = 
-		 case filelib:is_file(CrashDumpName) of
-		     true -> 
-			 ["&nbsp;<A HREF=\"", CrashDumpName, 
-			  "\">(CrashDump)</A>"];
-		     false ->
-			 ""
-		 end,
-	     LogFile = filename:join(Link, ?suitelog_name ++ ".html"),
-	     ["<A HREF=\"", LogFile, "\">", Name, "</A>\n", CrashDumpLink, 
-	      "</TD>\n"]
-     end,
-     make_row(integer_to_list(Success), Bold),
-     make_row(FailStr, Bold),
-     make_row(integer_to_list(UserSkip), Bold),
-     make_row(AutoSkipStr, Bold),
-     make_row(integer_to_list(NotBuilt), Bold),
-     make_row(Coverage, Bold),
-     "</TR>\n"].
-
-make_row(Row, true) ->
-    ["<TD ALIGN=right><B>", Row|"</B></TD>"];
-make_row(Row, false) ->
-    ["<TD ALIGN=right>", Row|"</TD>"].
-
-not_built(BaseName) ->
-    Dir = filename:join("..", BaseName++"_test"), 
-    Erl = length(filelib:wildcard(filename:join(Dir,"*_SUITE.erl"))),
-    Beam = length(filelib:wildcard(filename:join(Dir,"*_SUITE.beam"))),
-    Erl-Beam.
-
-
-%% Add the log file directory for the very last test run (according to
-%% last_name).
-
-add_last_name(Logs) ->
-    case file:read_file("last_name") of
-	{ok, Bin} ->
-	    Name = filename:dirname(lib:nonl(binary_to_list(Bin))),
-	    case lists:member(Name, Logs) of
-		true  -> Logs;
-		false -> [Name|Logs]
-	    end;
-	_ ->
-	    Logs
-    end.
-
-term_to_text(Term) ->
-    lists:flatten(io_lib:format("~p.\n", [Term])).
-
-test_suite_name(Name) ->
-    ts_lib:initial_capital(Name) ++ " suite".
-
-directories(Dir) ->
-    {ok, Files} = file:list_dir(Dir),
-    [filename:join(Dir, X) || X <- Files,
-			      filelib:is_dir(filename:join(Dir, X))].
-
-
-%%% Headers and footers.
-
-header(Vars) ->
-    Platform = ts_lib:var(platform_id, Vars),
-    ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n"
-     "<!-- autogenerated by '"++atom_to_list(?MODULE)++"'. -->\n"
-     "<HTML>\n",
-     "<HEAD>\n",
-     "<TITLE>Test Results for ", Platform, "</TITLE>\n",
-     "</HEAD>\n",
-
-     body_tag(),
-
-     "<!-- ---- DOCUMENT TITLE  ---- -->\n",
-
-     "<CENTER>\n",
-     "<H1>Test Results for ", Platform, "</H1>\n",
-     "</CENTER>\n",
-
-     "<!-- ---- CONTENT ---- -->\n",
-     "<CENTER>\n",
-
-     "<TABLE border=3 cellpadding=5>\n",
-     "<th><B>Family</B></th>\n",
-     "<th>Successful</th>\n",
-     "<th>Failed</th>\n",
-     "<th>User Skipped</th>\n"
-     "<th>Auto Skipped</th>\n"
-     "<th>Missing Suites</th>\n"
-     "<th>Coverage</th>\n"
-     "\n"].
-
-footer() ->
-    ["</TABLE>\n"
-     "</CENTER>\n"
-     "<P><CENTER>\n"
-     "<HR>\n"
-     "<P><FONT SIZE=-1>\n"
-     "Copyright &copy; ", year(),
-     " <A HREF=\"http://erlang.ericsson.se\">Open Telecom Platform</A><BR>\n"
-     "Updated: <!date>", current_time(), "<!/date><BR>\n"
-     "</FONT>\n"
-     "</CENTER>\n"
-     "</body>\n"
-     "</HTML>\n"].
-
-progress_header(Vars) ->
-    Release = ts_lib:var(erl_release, Vars),
-    ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n"
-     "<!-- autogenerated by '"++atom_to_list(?MODULE)++"'. -->\n"
-     "<HTML>\n",
-     "<HEAD>\n",
-     "<TITLE>", Release, " Progress Test Results</TITLE>\n",
-     "</HEAD>\n",
-
-     body_tag(),
-
-     "<!-- ---- DOCUMENT TITLE ---- -->\n",
-
-     "<CENTER>\n",
-     "<H1>", Release, " Progress Test Results</H1>\n",
-     "<TABLE border=3 cellpadding=5>\n",
-     "<th><b>Test Run</b></th><th>Platforms</th>\n"].
-
-progress_footer() ->
-    ["</TABLE>\n",
-     "</CENTER>\n",
-     "<P><CENTER>\n",
-     "<HR>\n",
-     "<P><FONT SIZE=-1>\n",
-     "Copyright &copy; ", year(),
-     " <A HREF=\"http://erlang.ericsson.se\">Open Telecom Platform</A><BR>\n",
-     "Updated: <!date>", current_time(), "<!/date><BR>\n",
-     "</FONT>\n",
-     "</CENTER>\n",
-     "</body>\n",
-     "</HTML>\n"].
-
-master_header(Vars) ->
-    Release = ts_lib:var(erl_release, Vars),
-    Vsn = erlang:system_info(version),
-    ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n"
-     "<!-- autogenerated by '"++atom_to_list(?MODULE)++"'. -->\n"
-     "<HTML>\n",
-     "<HEAD>\n",
-     "<TITLE>", Release, " Test Results (", Vsn, ")</TITLE>\n",
-     "</HEAD>\n",
-
-     body_tag(),
-
-     "<!-- ---- DOCUMENT TITLE ---- -->\n",
-
-     "<CENTER>\n",
-     "<H1>", Release, " Test Results (", Vsn, ")</H1>\n",
-     "</CENTER>\n",
-
-     "<!-- ---- CONTENT ---- -->\n",
-
-     "<CENTER>\n",
-     
-     "<TABLE border=3 cellpadding=5>\n",
-     "<th><b>Platform</b></th>\n",
-     "<th>Successful</th>\n",
-     "<th>Failed</th>\n",
-     "<th>User Skipped</th>\n"
-     "<th>Auto Skipped</th>\n"
-     "\n"].
-
-master_footer() ->
-    ["</TABLE>\n",
-     "</CENTER>\n",
-     "<P><CENTER>\n",
-     "<HR>\n",
-     "<P><FONT SIZE=-1>\n",
-     "Copyright &copy; ", year(), 
-     " <A HREF=\"http://erlang.ericsson.se\">Open Telecom Platform</A><BR>\n",
-     "Updated: <!date>", current_time(), "<!/date><BR>\n",
-     "</FONT>\n",
-     "</CENTER>\n",
-     "</body>\n",
-     "</HTML>\n"].
-
-body_tag() ->
-    "<body bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#0000FF\""
-	"vlink=\"#800080\" alink=\"#FF0000\">".
-
-year() ->
-    {Y, _, _} = date(),
-    integer_to_list(Y).
-
-current_time() ->
-    {{Y, Mon, D}, {H, Min, S}} = calendar:local_time(),
-    Weekday = weekday(calendar:day_of_the_week(Y, Mon, D)),
-    lists:flatten(io_lib:format("~s ~s ~p ~2.2.0w:~2.2.0w:~2.2.0w ~w",
-				[Weekday, month(Mon), D, H, Min, S, Y])).
-
-weekday(1) -> "Mon";
-weekday(2) -> "Tue";
-weekday(3) -> "Wed";
-weekday(4) -> "Thu";
-weekday(5) -> "Fri";
-weekday(6) -> "Sat";
-weekday(7) -> "Sun".
-
-month(1) -> "Jan";
-month(2) -> "Feb";
-month(3) -> "Mar";
-month(4) -> "Apr";
-month(5) -> "May";
-month(6) -> "Jun";
-month(7) -> "Jul";
-month(8) -> "Aug";
-month(9) -> "Sep";
-month(10) -> "Oct";
-month(11) -> "Nov";
-month(12) -> "Dec".
-
-%% Count test cases in the given directory (a directory of the type
-%% run.1997-08-04_09.58.52).
-
-count_cases(Dir) ->
-    SumFile = filename:join(Dir, ?run_summary),
-    case read_summary(SumFile, [summary]) of
-	{ok, [{Succ,Fail,Skip}]} ->
-	    {Succ,Fail,Skip,0};
-	{ok, [Summary]} ->
-	    Summary;
-	{error, _} ->
-	    LogFile = filename:join(Dir, ?suitelog_name),
-	    case file:read_file(LogFile) of
-		{ok, Bin} ->
-		    Summary = count_cases1(binary_to_list(Bin), {0, 0, 0, 0}),
-		    write_summary(SumFile, Summary),
-		    Summary;
-		{error, _Reason} ->
-		    io:format("\nFailed to read ~p (skipped)\n", [LogFile]),
-		    error
-	    end
-    end.
-
-write_summary(Name, Summary) ->
-    File = [term_to_text({summary, Summary})],
-    ts_lib:force_write_file(Name, File).
-
-% XXX: This function doesn't do what the writer expect. It can't handle
-% the case if there are several different keys and I had to add a special
-% case for the empty file. The caller also expect just one tuple as
-% a result so this function is written way to general for no reason.
-% But it works sort of. /kgb
-
-read_summary(Name, Keys) ->
-    case file:consult(Name) of
-	{ok, []} ->
-	    {error, "Empty summary file"};
-	{ok, Terms} ->
-	    {ok, lists:map(fun(Key) -> {value, {_, Value}} = 
-					   lists:keysearch(Key, 1, Terms),
-				       Value end,
-			   Keys)};
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-count_cases1("=failed" ++ Rest, {Success, _Fail, UserSkip,AutoSkip}) ->
-    {NextLine, Count} = get_number(Rest),
-    count_cases1(NextLine, {Success, Count, UserSkip,AutoSkip});
-count_cases1("=successful" ++ Rest, {_Success, Fail, UserSkip,AutoSkip}) ->
-    {NextLine, Count} = get_number(Rest),
-    count_cases1(NextLine, {Count, Fail, UserSkip,AutoSkip});
-count_cases1("=skipped" ++ Rest, {Success, Fail, _UserSkip,AutoSkip}) ->
-    {NextLine, Count} = get_number(Rest),
-    count_cases1(NextLine, {Success, Fail, Count,AutoSkip});
-count_cases1("=user_skipped" ++ Rest, {Success, Fail, _UserSkip,AutoSkip}) ->
-    {NextLine, Count} = get_number(Rest),
-    count_cases1(NextLine, {Success, Fail, Count,AutoSkip});
-count_cases1("=auto_skipped" ++ Rest, {Success, Fail, UserSkip,_AutoSkip}) ->
-    {NextLine, Count} = get_number(Rest),
-    count_cases1(NextLine, {Success, Fail, UserSkip,Count});
-count_cases1([], Counters) ->
-    Counters;
-count_cases1(Other, Counters) ->
-    count_cases1(skip_to_nl(Other), Counters).
-
-get_number([$\s|Rest]) ->
-    get_number(Rest);
-get_number([Digit|Rest]) when $0 =< Digit, Digit =< $9 ->
-    get_number(Rest, Digit-$0).
-
-get_number([Digit|Rest], Acc) when $0 =< Digit, Digit =< $9 ->
-    get_number(Rest, Acc*10+Digit-$0);
-get_number([$\n|Rest], Acc) ->
-    {Rest, Acc};
-get_number([_|Rest], Acc) ->
-    get_number(Rest, Acc).
-
-skip_to_nl([$\n|Rest]) ->
-    Rest;
-skip_to_nl([_|Rest]) ->
-    skip_to_nl(Rest);
-skip_to_nl([]) ->
-    [].
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl
index 885a3c9b96..741dd483f5 100644
--- a/lib/test_server/src/ts_run.erl
+++ b/lib/test_server/src/ts_run.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -21,7 +21,7 @@
 
 -module(ts_run).
 
--export([run/4]).
+-export([run/4,ct_run_test/2]).
 
 -define(DEFAULT_MAKE_TIMETRAP_MINUTES, 60).
 -define(DEFAULT_UNMAKE_TIMETRAP_MINUTES, 15).
@@ -87,6 +87,24 @@ execute([Hook|Rest], Vars0, Spec0, St0) ->
 execute([], Vars, Spec, St) ->
     {ok, Vars, Spec, St}.
 
+%% Wrapper to run tests using ct:run_test/1 and handle any errors.
+
+ct_run_test(Dir, CommonTestArgs) ->
+    try
+	ok = file:set_cwd(Dir),
+	case ct:run_test(CommonTestArgs) of
+	    {_,_,_} ->
+		ok;
+	    {error,Error} ->
+		io:format("ERROR: ~P\n", [Error,20]);
+	    Other ->
+		io:format("~P\n", [Other,20])
+	end
+    catch
+	_:Crash ->
+	    io:format("CRASH: ~P\n", [Crash,20])
+    end.
+
 %%
 %% Deletes File from Files when File is on the form .../<SUITE>_data/<file>
 %% when all of <SUITE> has been skipped in Spec, i.e. there
@@ -157,7 +175,6 @@ get_config_files() ->
     [TSConfig | case os:type() of
 		    {unix,_} -> ["ts.unix.config"];
 		    {win32,_} -> ["ts.win32.config"];
-		    vxworks -> ["ts.vxworks.config"];
 		    _ -> []
 		end].
 
@@ -229,10 +246,9 @@ make_command(Vars, Spec, State) ->
 	   %% uncomment the line below to disable exception formatting 
 	   %%	   " -test_server_format_exception false",
 	   " -boot start_sasl -sasl errlog_type error",
-	   " -pz ",Cwd,
+	   " -pz \"",Cwd,"\"",
 	   " -ct_test_vars ",TestVars,
-	   " -eval \"file:set_cwd(\\\"",TestDir,"\\\")\" "
-	   " -eval \"ct:run_test(", 
+	   " -eval \"ts_run:ct_run_test(\\\"",TestDir,"\\\", ",
 	   backslashify(lists:flatten(State#state.test_server_args)),")\""
 	   " ",
 	   ExtraArgs],
@@ -329,14 +345,13 @@ start_xterm(Command) ->
 path_separator() ->
     case os:type() of
 	{win32, _} -> ";";
-	{unix, _}  -> ":";
-	vxworks ->    ":"
+	{unix, _}  -> ":"
     end.
 
 
-make_common_test_args(Args0, Options, _Vars) ->
+make_common_test_args(Args0, Options0, _Vars) ->
     Trace = 
-	case lists:keysearch(trace,1,Options) of
+	case lists:keysearch(trace,1,Options0) of
 	    {value,{trace,TI}} when is_tuple(TI); is_tuple(hd(TI)) ->
 		ok = file:write_file(?tracefile,io_lib:format("~p.~n",[TI])),
 		[{ct_trace,?tracefile}];
@@ -348,40 +363,35 @@ make_common_test_args(Args0, Options, _Vars) ->
 		[]
 	end,
     Cover = 
-	case lists:keysearch(cover,1,Options) of
+	case lists:keysearch(cover,1,Options0) of
 	    {value,{cover, App, none, _Analyse}} ->
 		io:format("No cover file found for ~p~n",[App]),
 		[];
 	    {value,{cover,_App,File,_Analyse}} -> 
-		[{cover,to_list(File)}];
+		[{cover,to_list(File)},{cover_stop,false}];
 	    false -> 
 		[]
 	end,
 
-    Logdir = case lists:keysearch(logdir, 1, Options) of
+    Logdir = case lists:keysearch(logdir, 1, Options0) of
 		  {value,{logdir, _}} ->
 		      [];
 		  false ->
 		      [{logdir,"../test_server"}]
 	     end,
 
-    TimeTrap = case test_server:timetrap_scale_factor() of
-		   1 ->
-		       [];
-		   Scale ->
-		       [{multiply_timetraps, Scale},
-			{scale_timetraps, true}]
-	       end,
-
-    ConfigPath = case {os:getenv("TEST_CONFIG_PATH"),
-		       lists:keysearch(config, 1, Options)} of
-		     {false,{value, {config, Path}}} ->
-			 Path;
-		     {false,false} ->
-			 "../test_server";
-		     {Path,_} ->
-			 Path
-		 end,
+    TimeTrap = [{scale_timetraps, true}],
+
+    {ConfigPath,
+     Options} = case {os:getenv("TEST_CONFIG_PATH"),
+		      lists:keysearch(config, 1, Options0)} of
+		    {_,{value, {config, Path}}} ->
+			{Path,lists:keydelete(config, 1, Options0)};
+		    {false,false} ->
+			{"../test_server",Options0};
+		    {Path,_} ->
+			{Path,Options0}
+		end,
     ConfigFiles = [{config,[filename:join(ConfigPath,File)
 			    || File <- get_config_files()]}],
     io_lib:format("~100000p",[Args0++Trace++Cover++Logdir++
diff --git a/lib/test_server/src/ts_selftest.erl b/lib/test_server/src/ts_selftest.erl
deleted file mode 100644
index 655aa4bab3..0000000000
--- a/lib/test_server/src/ts_selftest.erl
+++ /dev/null
@@ -1,120 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
--module(ts_selftest).
--export([selftest/0]).
-
-selftest() ->
-    case node() of
-	nonode@nohost ->
-	    io:format("Sorry, you have to start this node distributed.~n"),
-	    exit({error, node_not_distributed});
-	_ ->
-	    ok
-    end,
-    case catch ts:tests(test_server) of
-	{'EXIT', _} ->
-	    io:format("Test Server self test not availiable.");
-	Other ->
-	    selftest1()
-    end.
-
-selftest1() ->
-    % Batch starts
-    io:format("Selftest #1: Whole spec, batch mode:~n"),
-    io:format("------------------------------------~n"),
-    ts:run(test_server, [batch]),
-    ok=check_result(1, "test_server.logs", 2),
-
-    io:format("Selftest #2: One module, batch mode:~n"),
-    io:format("------------------------------------~n"),
-    ts:run(test_server, test_server_SUITE, [batch]),
-    ok=check_result(2, "test_server_SUITE.logs", 2),
-
-    io:format("Selftest #3: One testcase, batch mode:~n"),
-    io:format("--------------------------------------~n"),
-    ts:run(test_server, test_server_SUITE, msgs, [batch]),
-    ok=check_result(3, "test_server_SUITE.logs", 0),
-
-    % Interactive starts
-    io:format("Selftest #4: Whole spec, interactive mode:~n"),
-    io:format("------------------------------------------~n"),
-    ts:run(test_server),
-    kill_test_server(),
-    ok=check_result(4, "test_server.logs", 2),
-
-    io:format("Selftest #5: One module, interactive mode:~n"),
-    io:format("------------------------------------------~n"),
-    ts:run(test_server, test_server_SUITE),
-    kill_test_server(),
-    ok=check_result(5, "test_server_SUITE.logs", 2),
-
-    io:format("Selftest #6: One testcase, interactive mode:~n"),
-    io:format("--------------------------------------------~n"),
-    ts:run(test_server, test_server_SUITE, msgs),
-    kill_test_server(),
-    ok=check_result(6, "test_server_SUITE.logs", 0),
-    
-    ok.
-
-check_result(Test, TDir, ExpSkip) ->
-    Dir=ts_lib:last_test(TDir),
-    {Total, Failed, Skipped}=ts_reports:count_cases(Dir),
-		io:format("Selftest #~p:",[Test]),
-    case {Total, Failed, Skipped} of
-	{_, 0, ExpSkip} ->        % 2 test cases should be skipped.
-	    io:format("All ok.~n~n"),
-	    ok;
-	{_, _, _} ->
-	    io:format("Not completely successful.~n~n"),
-	    error
-    end.
-
-
-%% Wait for test server to get started.
-kill_test_server() ->
-    Node=list_to_atom("test_server@"++atom_to_list(hostname())),
-    net_adm:ping(Node),
-    case whereis(test_server_ctrl) of
-	undefined ->
-	    kill_test_server();
-	Pid ->
-	    kill_test_server(0, Pid)
-    end.
-
-%% Wait for test server to finish.
-kill_test_server(30, Pid) ->
-    exit(self(), test_server_is_dead);
-kill_test_server(Num, Pid) ->
-    case whereis(test_server_ctrl) of
-	undefined ->
-	    slave:stop(node(Pid));
-	Pid ->
-	    receive
-	    after
-		1000 ->
-		    kill_test_server(Num+1, Pid)
-	    end
-    end.
-
-
-hostname() ->
-    list_to_atom(from($@, atom_to_list(node()))).
-from(H, [H | T]) -> T;
-from(H, [_ | T]) -> from(H, T);
-from(H, []) -> [].
diff --git a/lib/test_server/src/vxworks_client.erl b/lib/test_server/src/vxworks_client.erl
deleted file mode 100644
index ca65eca02a..0000000000
--- a/lib/test_server/src/vxworks_client.erl
+++ /dev/null
@@ -1,243 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
--module(vxworks_client).
-
--export([open/1, close/1, send_data/2, send_data/3, send_data_wait_for_close/2, reboot/1]).
--export([init/2]).    
-
--include("ts.hrl").
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% This is a client talking to a test server daemon on a VxWorks card.
-%%% 
-%%% User interface:
-%%%
-%%% open/1
-%%% Start a client and establish the connection with the test server daemon
-%%% 
-%%% send_data/2
-%%% Send data/command to the test server daemon, don't wait for any return
-%%% 
-%%% send_data/3
-%%% Send data/command to the test server daemon and wait for the given
-%%% return value.
-%%%
-%%% send_data_wait_for_close/2
-%%% Send data/command to the test server daemon and wait for the daemon to
-%%% close the connection.
-%%% 
-%%% close/1
-%%% Close the client.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-%%
-%% User interface
-%%
-
-reboot(Target) ->
-    {ok, {_,_,_,_,_,[Addr|_]}} = inet:gethostbyname(Target),
-    Fun = fun({ok, Socket}) ->
-		  gen_tcp:send(Socket, "q\n"),
-		  receive
-		      {tcp_closed, Socket} ->
-			  gen_tcp:close(Socket),
-			  {ok, socket_closed}
-		  after 5000 ->
-			  exit({timeout, tryagain})
-		  end
-	  end,
-    io:format("Stopping (rebooting) ~p ",[Target]),
-    case fun_target(Addr, Fun) of
-	{ok, socket_closed} ->
-	    ok;
-	_Else ->
-	    io:format("No contact with ts daemon - exiting ...~n"),
-	    exit({stop, no_ts_daemon_contact})
-    end.
-			    
-
-%% open(Target) -> {ok,Client} | {error, Reason}
-open(Target) ->
-    {ok, {_,_,_,_,_,[Addr|_]}} = inet:gethostbyname(Target),
-    Fun = fun({ok, Socket}) ->
-		  P = spawn(?MODULE,init,[Target,Socket]),
-		  inet_tcp:controlling_process(Socket,P),
-		  {ok,P}
-	  end,
-    case fun_target(Addr,Fun) of
-	{ok, Pid} ->
-	    {ok, Pid};
-	{error,Reason} ->
-	    {error, Reason}
-    end.
-
-%% send_data(Client,Data) -> ok
-send_data(Pid,Data) ->
-    Pid ! {send_data,Data++"\n"},
-    ok.
-
-%% send_data(Client,Data,ExpectedReturn) -> {ok,ExpectedReturn} | {error,Reason}
-send_data(Pid,Data,Return) ->
-    Pid ! {send_data,Data++"\n",Return,self()},
-    receive {Pid,Result} -> Result end.
-
-%% send_data_wait_for_close(Client,Data) -> ok | {error,Reason}
-send_data_wait_for_close(Pid,Data) ->
-    send_data(Pid,Data,tcp_closed).
-
-%% close(Client) -> ok
-close(Pid) ->
-    Pid ! close,
-    ok.
-
-
-%%
-%% Internal
-%%
-
-init(Target,Socket) ->
-    process_flag(trap_exit,true),
-    loop(Target,Socket).
-
-loop(Target,Socket) ->
-    receive
-	{send_data,Data} ->
-	    %% io:format("vx client sending: ~p~n", [Data]),
-	    gen_tcp:send(Socket, Data),
-	    loop(Socket,Target);
-	{send_data,Data,tcp_closed,From} ->
-	    %% io:format("vx client sending: ~p~n", [Data]),
-	    gen_tcp:send(Socket, Data),
-	    receive
-		{tcp_closed, Socket} ->
-		    From ! {self(),ok}
-	    after 5000 ->
-		    From ! {self(),{error,timeout}}
-	    end,
-	    closed(Socket,normal);
-	{send_data,Data,Return,From} ->
-	    %% io:format("vx client sending: ~p~n", [Data]),
-	    gen_tcp:send(Socket, Data),
-	    case receive_line(Socket,[],Return,200) of
-		{tcp_closed, Socket} ->
-		    From ! {self(),{error,{socket_closed,Target}}},
-		    closed(Socket,{socket_closed,Target});
-		{tcp,Socket,_Rest} ->
-		    From ! {self(),{ok,Data}},
-		    got_data(Target,Socket,Data);
-		error ->
-		    From ! {self(),{error,{catatonic,Target}}}
-	    end;
-	close ->
-	    closed(Socket,normal);
-	{tcp_closed, Socket} ->
-	    closed(Socket,{socket_closed,Target});
-	{tcp,Socket,Data} ->
-	    got_data(Target,Socket,Data)
-    end.
-	    
-
-
-closed(Socket,Reason) ->
-    gen_tcp:close(Socket),
-    exit(Reason).
-
-got_data(Target,Socket,Data) ->
-    if is_atom(Target) ->
-	    io:format("~w: ~s",[Target,uncr(Data)]);
-       true ->
-	     io:format("~s: ~s",[Target,uncr(Data)])
-    end,
-    loop(Target,Socket).
-	
-uncr([]) ->
-    [];
-uncr([$\r | T]) ->
-    uncr(T);
-uncr([H | T]) ->
-    [H | uncr(T)].
-
-strip_line(Line) ->
-    RPos = string:rchr(Line, $\n),
-    string:substr(Line,RPos+1).
-
-maybe_done_receive(Socket,Ack,Match,C) ->
-    case string:str(Ack,Match) of
-	0 ->
-	    receive_line(Socket,strip_line(Ack),Match,C);
-	_ ->
-	    {tcp,Socket,strip_line(Ack)}
-    end.
-    
-
-receive_line(_Socket,_Ack,_Match,0) ->
-    error;
-receive_line(Socket,Ack,Match,Counter) ->
-    receive
-	{tcp_closed, Socket} ->
-	    {tcp_closed, Socket};
-	{tcp,Socket,Data} ->
-	    NewAck = Ack ++ Data,
-	    case {string:str(NewAck,"\r") > 0,
-		  string:str(NewAck,"\n") > 0} of
-		{true,_} ->
-		    maybe_done_receive(Socket,NewAck,Match,Counter-1);
-		{_,true} ->
-		    maybe_done_receive(Socket,NewAck,Match,Counter-1);
-		_ ->
-		    receive_line(Socket,NewAck,Match,Counter)
-	    end
-    after 20000 ->
-	    error
-    end.
-   
-
-%% Misc functions
-fun_target(Addr, Fun) ->
-    io:format("["),
-    fun_target(Addr, Fun, 60).		%Vx-cards need plenty of time.
-
-fun_target(_Addr, _Fun, 0) ->
-    io:format(" no contact with ts daemon]~n"),
-    {error,failed_to_connect};
-fun_target(Addr, Fun, Tries_left) ->
-    receive after 1 -> ok end,
-    case do_connect(Addr, Fun) of
-	{ok, Value} ->
-	    io:format(" ok]~n"),
-	    {ok, Value};
-	_Error -> % typical {error, econnrefused}
-	    io:format("."),
-	    receive after 10000 -> ok end,
-	    fun_target(Addr, Fun, Tries_left-1)
-    end.
-	    
-do_connect(Addr, Fun) ->
-    case gen_tcp:connect(Addr, ?TS_PORT, [{reuseaddr, true}], 60000) of
-	{ok, Socket} ->
-	    Fun({ok, Socket});
-	Error ->
-	    Error
-    end.
-
-
-    
diff --git a/lib/test_server/test/Makefile b/lib/test_server/test/Makefile
index 198440bb17..afccc28662 100644
--- a/lib/test_server/test/Makefile
+++ b/lib/test_server/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -26,8 +26,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 MODULES= \
 	test_server_SUITE \
-	test_server_line_SUITE \
-	test_server_test_lib
+	test_server_test_lib \
+	erl2html2_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -65,7 +65,6 @@ make_emakefile:
 	>> $(EMAKEFILE)
 
 tests debug opt: make_emakefile
-	cd ../src && $(MAKE) ../ebin/test_server_line.beam
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
@@ -83,10 +82,10 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(COVERFILE) $(RELSYSDIR)
-	$(INSTALL_DATA) test_server_test_lib.hrl test_server.spec test_server.cover $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(COVERFILE) "$(RELSYSDIR)"
+	$(INSTALL_DATA) test_server_test_lib.hrl test_server.spec test_server.cover "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/test_server/test/erl2html2_SUITE.erl b/lib/test_server/test/erl2html2_SUITE.erl
new file mode 100644
index 0000000000..96175413a1
--- /dev/null
+++ b/lib/test_server/test/erl2html2_SUITE.erl
@@ -0,0 +1,254 @@
+%%%-------------------------------------------------------------------
+%%% @author Siri Hansen <[email protected]>
+%%% @copyright (C) 2012, Siri Hansen
+%%% @doc
+%%%
+%%% @end
+%%% Created : 15 Nov 2012 by Siri Hansen <[email protected]>
+%%%-------------------------------------------------------------------
+-module(erl2html2_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+
+-define(HEADER,
+	["<!DOCTYPE HTML PUBLIC",
+	 "\"-//W3C//DTD HTML 3.2 Final//EN\">\n",
+	 "<!-- autogenerated by 'erl2html2' -->\n",
+	 "<html>\n",
+	 "<head><title>Module ", Src, "</title>\n",
+	 "<meta http-equiv=\"cache-control\" ",
+	 "content=\"no-cache\">\n",
+	 "</head>\n",
+	 "<body bgcolor=\"white\" text=\"black\" ",
+	 "link=\"blue\" vlink=\"purple\" alink=\"red\">\n"]).
+
+%%--------------------------------------------------------------------
+%% @spec suite() -> Info
+%% Info = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,30}},
+     {ct_hooks,[ts_install_cth,test_server_test_lib]}].
+
+%%--------------------------------------------------------------------
+%% @spec init_per_suite(Config0) ->
+%%     Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1} | {fail,Reason}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%% @end
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+all() ->
+    [m1].
+
+%%--------------------------------------------------------------------
+%% @spec TestCase() -> Info
+%% Info = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+m1() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% @spec TestCase(Config0) ->
+%%               ok | exit() | {skip,Reason} | {comment,Comment} |
+%%               {save_config,Config1} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% Comment = term()
+%% @end
+%%--------------------------------------------------------------------
+m1(Config) ->
+    {Src,Dst} = convert_module("m1",Config),
+    {true,L} = check_line_numbers(Src,Dst),
+    ok = check_link_targets(Src,Dst,L,[{baz,0}]),
+    ok.
+
+convert_module(Mod,Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    Src = filename:join(DataDir,Mod++".erl"),
+    Dst = filename:join(PrivDir,Mod++".erl.html"),
+    io:format("<a href=\"~s\">~s</a>\n",[Src,filename:basename(Src)]),
+    ok = erl2html2:convert(Src, Dst, "<html><body>"),
+    io:format("<a href=\"~s\">~s</a>\n",[Dst,filename:basename(Dst)]),
+    {Src,Dst}.
+
+%% Check that there are the same number of lines in each file, and
+%% that all line numbers are displayed in the dst file.
+check_line_numbers(Src,Dst) ->
+    {ok,SFd} = file:open(Src,[read]),
+    {ok,DFd} = file:open(Dst,[read]),
+    {ok,SN} = count_src_lines(SFd,0),
+    ok = file:close(SFd),
+    {ok,DN} = read_dst_line_numbers(DFd),
+    ok = file:close(DFd),
+    {SN == DN,SN}.
+
+count_src_lines(Fd,N) ->
+    case io:get_line(Fd,"") of
+	eof ->
+	    {ok,N};
+	{error,Reason} ->
+	    {error,Reason,N};
+	_Line ->
+	    count_src_lines(Fd,N+1)
+    end.
+
+read_dst_line_numbers(Fd) ->
+    "<html><body><pre>\n" = io:get_line(Fd,""),
+    read_dst_line_numbers(Fd,0).
+read_dst_line_numbers(Fd,Last) when is_integer(Last) ->
+    case io:get_line(Fd,"") of
+	eof ->
+	    {ok,Last};
+	{error,Reason} ->
+	    {error,Reason,Last};
+	"</pre>"++_ ->
+	    {ok,Last};
+	"</body>"++_ ->
+	    {ok,Last};
+	Line ->
+	    %% erlang:display(Line),
+	    Num = check_line_number(Last,Line,Line),
+	    read_dst_line_numbers(Fd,Num)
+    end.
+
+check_line_number(Last,Line,OrigLine) ->
+    case Line of
+	"<a name="++_ ->
+	    [$>|Rest] = lists:dropwhile(fun($>) -> false; (_) -> true end,Line),
+	    check_line_number(Last,Rest,OrigLine);
+	_ ->
+	    [N |_] = string:tokens(Line,":"),
+%	    erlang:display(N),
+	    Num =
+		try list_to_integer(string:strip(N))
+		catch _:_ -> ct:fail({no_line_number_after,Last,OrigLine})
+		end,
+	    if Num == Last+1 ->
+		    Num;
+	       true ->
+		    ct:fail({unexpected_integer,Num,Last})
+	    end
+    end.
+
+
+%% Check that there is one link target for each line and one for each
+%% function.
+%% The test module has -compile(export_all), so all functions are
+%% found by listing the exported ones.
+check_link_targets(Src,Dst,L,RmFncs) ->
+    Mod = list_to_atom(filename:basename(filename:rootname(Src))),
+    Exports = Mod:module_info(exports)--[{module_info,0},{module_info,1}|RmFncs],
+    {ok,{[],L},_} = xmerl_sax_parser:file(Dst,
+				     [{event_fun,fun sax_event/3},
+				      {event_state,{Exports,0}}]),
+    ok.
+
+sax_event(Event,_Loc,State) ->
+    sax_event(Event,State).
+
+sax_event({startElement,_Uri,"a",_QN,Attrs},{Exports,PrevLine}) ->
+    {_,_,"name",Name} = lists:keyfind("name",3,Attrs),
+    case catch list_to_integer(Name) of
+	Line when is_integer(Line) ->
+	    case PrevLine + 1 of
+		Line ->
+%		    erlang:display({found_line,Line}),
+		    {Exports,Line};
+		Other ->
+		    ct:fail({unexpected_line_number_target,Other})
+	    end;
+	{'EXIT',_} ->
+	    {match,[FStr,AStr]} =
+		 re:run(Name,"^(.*)-([0-9]+)$",[{capture,all_but_first,list}]),
+	    F = list_to_atom(http_uri:decode(FStr)),
+	    A = list_to_integer(AStr),
+%	    erlang:display({found_fnc,F,A}),
+	    A = proplists:get_value(F,Exports),
+	    {lists:delete({F,A},Exports),PrevLine}
+    end;
+sax_event(_,State) ->
+    State.
diff --git a/lib/test_server/test/erl2html2_SUITE_data/Makefile.src b/lib/test_server/test/erl2html2_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..942ac0584b
--- /dev/null
+++ b/lib/test_server/test/erl2html2_SUITE_data/Makefile.src
@@ -0,0 +1,2 @@
+all:
+	erlc -Iinclude m1.erl
\ No newline at end of file
diff --git a/lib/test_server/test/erl2html2_SUITE_data/header1.hrl b/lib/test_server/test/erl2html2_SUITE_data/header1.hrl
new file mode 100644
index 0000000000..53d1b79ac5
--- /dev/null
+++ b/lib/test_server/test/erl2html2_SUITE_data/header1.hrl
@@ -0,0 +1,4 @@
+baz() ->
+    ok.
+
+-define(MACRO_DEFINING_A_FUNCTION,quux() -> ok).
diff --git a/lib/inviso/doc/man3/.gitignore b/lib/test_server/test/erl2html2_SUITE_data/include/header2.hrl
index e69de29bb2..e69de29bb2 100644
--- a/lib/inviso/doc/man3/.gitignore
+++ b/lib/test_server/test/erl2html2_SUITE_data/include/header2.hrl
diff --git a/lib/test_server/test/erl2html2_SUITE_data/m1.erl b/lib/test_server/test/erl2html2_SUITE_data/m1.erl
new file mode 100644
index 0000000000..156f1d0a51
--- /dev/null
+++ b/lib/test_server/test/erl2html2_SUITE_data/m1.erl
@@ -0,0 +1,46 @@
+%% Comment with <html> code &amp; </html>
+%% and also some "quotes" and 'single quotes'
+
+-module(m1).
+
+-compile(export_all).
+
+-include("header1.hrl").
+-include("header2.hrl").
+
+-define(MACRO1,value).
+
+%%% Comment
+foo(x) ->
+    %% Comment
+    ok_x;
+foo(y) ->
+    %% Second clause
+    ok_y.
+
+'quoted_foo'() ->
+    ok.
+
+'quoted_foo_with_"_and_/'() ->
+    ok.
+
+'quoted_foo_with_(_and_)'() ->
+    ok.
+
+'quoted_foo_with_<_and_>'() ->
+    ok.
+
+bar() ->
+    do_something(),
+ok. % indentation error, OTP-9710
+
+%% Function inside macro definition
+?MACRO_DEFINING_A_FUNCTION.
+
+%% Two function one one line
+quuux() -> ok. quuuux() -> ok.
+
+%% do_something/0 does something
+do_something() ->
+    ?MACRO1.
+%% comments after last line
diff --git a/lib/test_server/test/test_server.cover b/lib/test_server/test/test_server.cover
index 5c59bab494..052415377d 100644
--- a/lib/test_server/test/test_server.cover
+++ b/lib/test_server/test/test_server.cover
@@ -1,22 +1 @@
 {incl_app,test_server,details}.
-
-{excl_mods, test_server, [test_server,
-			  test_server_ctrl,
-			  ts_selftest]}.
-
-%% Using incl_mods list here because the test_server might not find
-%% lib_dir for test_server - and so it will not find which modules to
-%% compile.
-{incl_mods, test_server, [erl2html2,
-			  test_server_node,
-			  test_server_sup,
-			  ts,
-			  ts_autoconf_vxworks,
-			  ts_autoconf_win32,
-			  ts_erl_config,
-			  ts_install,
-			  ts_lib,
-			  ts_make,
-			  ts_run,
-			  vxworks_client]}.
-
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
index a8532b08ab..95a3423fef 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -79,7 +79,8 @@ groups() ->
 all() ->
     [test_server_SUITE, test_server_parallel01_SUITE,
      test_server_conf02_SUITE, test_server_conf01_SUITE,
-     test_server_skip_SUITE, test_server_shuffle01_SUITE].
+     test_server_skip_SUITE, test_server_shuffle01_SUITE,
+     test_server_break_SUITE].
 
 
 %%--------------------------------------------------------------------
@@ -92,8 +93,8 @@ test_server_SUITE(Config) ->
 %    rpc:call(Node,dbg, tracer,[]),
 %    rpc:call(Node,dbg, p,[all,c]),
 %    rpc:call(Node,dbg, tpl,[test_server_ctrl,x]),
-    run_test_server_tests("test_server_SUITE", 39, 1, 31, 
-			  20, 9, 1, 11, 2, 26, Config).
+    run_test_server_tests("test_server_SUITE", 38, 1, 30,
+			  19, 9, 1, 11, 2, 25, Config).
 
 test_server_parallel01_SUITE(Config) ->
     run_test_server_tests("test_server_parallel01_SUITE", 37, 0, 19, 
@@ -115,14 +116,18 @@ test_server_conf02_SUITE(Config) ->
     run_test_server_tests("test_server_conf02_SUITE", 26, 0, 12, 
 			  12, 0, 0, 0, 0, 26, Config).
 
+test_server_break_SUITE(Config) ->
+    D = run_test_server_tests("test_server_break_SUITE", 8, 2, 6,
+			  4, 0, 0, 0, 2, 6, Config),
+    D.
 
 run_test_server_tests(SuiteName, NCases, NFail, NExpected, NSucc, 
 		      NUsrSkip, NAutoSkip, 
 		      NActualSkip, NActualFail, NActualSucc, Config) ->
 
-    ct:log("See test case log files under:~n~p~n",
-	   [filename:join([proplists:get_value(priv_dir, Config),
-			   SuiteName++".logs"])]),
+    WorkDir = proplists:get_value(work_dir, Config),
+    ct:log("<a href=\"file://~s\">Test case log files</a>\n",
+	   [filename:join(WorkDir, SuiteName++".logs")]),
 
     Node = proplists:get_value(node, Config),
     {ok,_Pid} = rpc:call(Node,test_server_ctrl, start, []),
@@ -138,17 +143,18 @@ run_test_server_tests(SuiteName, NCases, NFail, NExpected, NSucc,
     
     rpc:call(Node,test_server_ctrl, stop, []),
 
-    {ok,#suite{ n_cases = NCases,
-		n_cases_failed = NFail,
-		n_cases_expected = NExpected, 
-		n_cases_succ = NSucc,
-		n_cases_user_skip = NUsrSkip,
-		n_cases_auto_skip = NAutoSkip,
-		cases = Cases }} = Data =
-	test_server_test_lib:parse_suite(
-	  hd(filelib:wildcard(
-	       filename:join([proplists:get_value(priv_dir, Config), 
-			      SuiteName++".logs","run*","suite.log"])))),
+    {ok,Data} =	test_server_test_lib:parse_suite(
+		  lists:last(
+		    lists:sort(
+		      filelib:wildcard(
+			filename:join([WorkDir,SuiteName++".logs",
+				       "run*","suite.log"]))))),
+    check([{"Number of cases",NCases,Data#suite.n_cases},
+	   {"Number failed",NFail,Data#suite.n_cases_failed},
+	   {"Number expected",NExpected,Data#suite.n_cases_expected},
+	   {"Number successful",NSucc,Data#suite.n_cases_succ},
+	   {"Number user skipped",NUsrSkip,Data#suite.n_cases_user_skip},
+	   {"Number auto skipped",NAutoSkip,Data#suite.n_cases_auto_skip}], ok),
     {NActualSkip,NActualFail,NActualSucc} = 
 	lists:foldl(fun(#tc{ result = skip },{S,F,Su}) ->
 			     {S+1,F,Su};
@@ -156,9 +162,18 @@ run_test_server_tests(SuiteName, NCases, NFail, NExpected, NSucc,
 			     {S,F,Su+1};
 			(#tc{ result = failed },{S,F,Su}) ->
 			     {S,F+1,Su}
-			  end,{0,0,0},Cases),
+			  end,{0,0,0},Data#suite.cases),
     Data.
 
+check([{Str,Same,Same}|T], Status) ->
+    io:format("~s: ~p\n", [Str,Same]),
+    check(T, Status);
+check([{Str,Expected,Actual}|T], _) ->
+    io:format("~s: expected ~p, actual ~p\n", [Str,Expected,Actual]),
+    check(T, error);
+check([], ok) -> ok;
+check([], error) -> ?t:fail().
+
 until(Fun) ->
     case Fun() of
 	true ->
diff --git a/lib/test_server/test/test_server_SUITE_data/Makefile.src b/lib/test_server/test/test_server_SUITE_data/Makefile.src
index 332b855df6..ec8ddd78b0 100644
--- a/lib/test_server/test/test_server_SUITE_data/Makefile.src
+++ b/lib/test_server/test/test_server_SUITE_data/Makefile.src
@@ -4,4 +4,5 @@ all:
 	erlc test_server_conf01_SUITE.erl
 	erlc test_server_shuffle01_SUITE.erl
 	erlc test_server_conf02_SUITE.erl
-	erlc test_server_skip_SUITE.erl
\ No newline at end of file
+	erlc test_server_skip_SUITE.erl
+	erlc test_server_break_SUITE.erl
\ No newline at end of file
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl
index dfcdff0c3e..fc2adcd651 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -34,7 +34,7 @@
 	 do_times/1, do_times_mfa/1, do_times_fun/1,
 	 skip_cases/1, skip_case1/1, skip_case2/1, skip_case3/1, 
 	 skip_case4/1, skip_case5/1, skip_case6/1, skip_case7/1,
-	 skip_case8/1, skip_case9/1, undefined_functions/1,
+	 skip_case8/1, skip_case9/1,
 	 conf_init/1, check_new_conf/1, conf_cleanup/1,
 	 check_old_conf/1, conf_init_fail/1, start_stop_node/1,
 	 cleanup_nodes_init/1, check_survive_nodes/1, cleanup_nodes_fin/1,
@@ -47,7 +47,7 @@ all(suite) ->
     [config, comment, timetrap, timetrap_cancel, multiply_timetrap,
      init_per_s, init_per_tc, end_per_tc,
      timeconv, msgs, capture, timecall, do_times, skip_cases,
-     undefined_functions, commercial,
+     commercial,
      {conf, conf_init, [check_new_conf], conf_cleanup},
      check_old_conf,
      {conf, conf_init_fail,[conf_member_skip],conf_cleanup_skip},
@@ -386,50 +386,6 @@ skip_case9(Config) when is_list(Config) ->
     %% returning {skip, Reason} from init_per_testcase/2 for this case. 
     ?t:fail("This case should have been Skipped by init_per_testcase/2").
 
-undefined_functions(suite) -> [];
-undefined_functions(doc) -> ["Check for calls to undefined functions in"
-			     " test_server."
-			     "Skip if cover is running"];
-undefined_functions(Config) when is_list(Config) ->
-    case whereis(cover_server) of
-	Pid when is_pid(Pid) -> 
-	    {skip,"Cover is running"};
-	undefined -> 
-	    undefined_functions()
-    end.
-
-undefined_functions() ->
-    TestServerDir = filename:dirname(code:which(test_server)),
-    Res = xref:d(TestServerDir),
-    
-    {value,{unused,Unused}} = lists:keysearch(unused, 1, Res),
-    case Unused of
-	[] -> ok;
-	_ ->
-	    lists:foreach(fun (MFA) ->
-				  io:format("~s unused", [format_mfa(MFA)])
-			  end, Unused)
-    end,
-    
-    {value,{undefined,Undef0}} = lists:keysearch(undefined, 1, Res),
-    Undef = [U || U <- Undef0, not unresolved(U)],
-    case Undef of
-	[] -> ok;
-	_ ->
-	    lists:foreach(fun ({MFA1,MFA2}) ->
-				  io:format("~s calls undefined ~s",
-					    [format_mfa(MFA1),format_mfa(MFA2)])
-			  end, Undef),
-	    ?t:fail({length(Undef),undefined_functions_in_otp})
-    end,
-    ok.
-
-unresolved({_,{_,'$F_EXPR',_}}) -> true;
-unresolved(_) -> false.
-
-format_mfa({M,F,A}) ->
-    lists:flatten(io_lib:format("~s:~s/~p", [M,F,A])).
-
 conf_init(doc) -> ["Test successful conf case: Change Config parameter"];
 conf_init(Config) when is_list(Config) ->
     [{conf_init_var,1389}|Config].
@@ -477,7 +433,7 @@ start_stop_node(Config) when is_list(Config) ->
 	    ?t:comment("WARNING: Node started with {wait,false}"
 			     " is up faster than expected...");
 	false ->
-	    wait_for_node(Node4,0),
+	    test_server:wait_for_node(Node4),
 	    true = lists:member(Node4,nodes())
     end,
 
@@ -494,16 +450,6 @@ start_stop_node(Config) when is_list(Config) ->
 
     ok.
 
-
-wait_for_node(Node,Acc) ->
-    case net_adm:ping(Node) of
-	pang -> 
-	    timer:sleep(100),
-	    wait_for_node(Node,Acc+100);
-	pong ->
-	    Acc
-    end.
-
 cleanup_nodes_init(doc) -> ["Test that nodes are terminated when test case"
 			    " is finished unless {cleanup,false} is given."];
 cleanup_nodes_init(Config) when is_list(Config) ->
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
new file mode 100644
index 0000000000..70e30a3334
--- /dev/null
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
@@ -0,0 +1,148 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(test_server_break_SUITE).
+
+-export([all/1, init_per_suite/1, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+-export([break_in_init_tc/1,
+	 break_in_tc/1,
+	 break_in_end_tc/1,
+	 break_in_end_tc_after_fail/1,
+	 break_in_end_tc_after_abort/1,
+	 check_all_breaks/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+all(suite) ->
+    [break_in_init_tc,
+     break_in_tc,
+     break_in_end_tc,
+     break_in_end_tc_after_fail,
+     break_in_end_tc_after_abort,
+     check_all_breaks]. %must be the last test - checks result of previous tests
+
+init_per_suite(Config) ->
+    spawn(fun break_and_continue_sup/0),
+    Config.
+
+end_per_suite(Config) ->
+    ok.
+
+init_per_testcase(Case,Config) when Case==break_in_init_tc ->
+    Config1 = init_timetrap(500,Config),
+    break_and_check(Case),
+    Config1;
+init_per_testcase(Case,Config) when Case==check_all_breaks ->
+    init_timetrap({seconds,20},Config);
+init_per_testcase(_Case,Config) ->
+    init_timetrap(500,Config).
+
+init_timetrap(T,Config) ->
+    Dog = ?t:timetrap(T),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(Case,Config) when Case==break_in_end_tc;
+				   Case==break_in_end_tc_after_fail;
+				   Case==break_in_end_tc_after_abort ->
+    break_and_check(Case),
+    cancel_timetrap(Config);
+end_per_testcase(_Case,Config) ->
+    cancel_timetrap(Config).
+
+cancel_timetrap(Config) ->
+    Dog=?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+
+break_in_init_tc(Config) when is_list(Config) ->
+    ok.
+
+break_in_tc(Config) when is_list(Config) ->
+    break_and_check(break_in_tc),
+    ok.
+
+break_in_end_tc(Config) when is_list(Config) ->
+    ok.
+
+break_in_end_tc_after_fail(Config) when is_list(Config) ->
+    ?t:fail(test_case_should_fail).
+
+break_in_end_tc_after_abort(Config) when is_list(Config) ->
+    ?t:adjusted_sleep(2000). % will cause a timetrap timeout
+
+%%%-----------------------------------------------------------------
+%%% Internal functions
+
+%% This test case checks that all breaks in previous test cases was
+%% also continued, and that the break lasted as long as expected.
+%% The reason for this is that some of the breaks above are in
+%% end_per_testcase, and failures there will only produce a warning,
+%% not an error - so this is to catch the error for real.
+check_all_breaks(Config) ->
+    break_and_continue_sup ! {done,self()},
+    receive {Breaks,Continued} ->
+	    check_all_breaks(Breaks,Continued)
+    end.
+
+check_all_breaks([{From,Case,T,Start}|Breaks],[{From,End}|Continued]) ->
+    Diff = timer:now_diff(End,Start),
+    DiffSec = round(Diff/1000000),
+    TSec = round(T/1000000),
+    if DiffSec==TSec ->
+	    ?t:format("Break in ~p successfully continued after ~p second(s)~n",
+		      [Case,DiffSec]),
+	    check_all_breaks(Breaks,Continued);
+       true ->
+	    ?t:format("Faulty duration of break in ~p: continued after ~p second(s)~n",
+		      [Case,DiffSec]),
+	    ?t:fail({faulty_diff,Case,DiffSec,TSec})
+    end;
+check_all_breaks([],[]) ->
+    ok;
+check_all_breaks(Breaks,Continued) ->
+    %% This is probably a case of a missing continue - i.e. a break
+    %% has been started, but it was never continued.
+    ?t:fail({no_match_in_breaks_and_continued,Breaks,Continued}).
+
+break_and_check(Case) ->
+    break_and_continue_sup ! {break,Case,1000,self()},
+    ?t:break(atom_to_list(Case)),
+    break_and_continue_sup ! {continued,self()},
+    ok.
+
+break_and_continue_sup() ->
+    register(break_and_continue_sup,self()),
+    break_and_continue_loop([],[]).
+
+break_and_continue_loop(Breaks,Continued) ->
+    receive
+	{break,Case,T,From} ->
+	    Start = now(),
+	    {RealT,_} = timer:tc(?t,adjusted_sleep,[T]),
+	    ?t:continue(),
+	    break_and_continue_loop([{From,Case,RealT,Start}|Breaks],Continued);
+	{continued,From} ->
+	    break_and_continue_loop(Breaks,[{From,now()}|Continued]);
+	{done,From} ->
+	    From ! {lists:reverse(Breaks),lists:reverse(Continued)}
+    end.
diff --git a/lib/test_server/test/test_server_line_SUITE.erl b/lib/test_server/test/test_server_line_SUITE.erl
deleted file mode 100644
index 0aba54f6b5..0000000000
--- a/lib/test_server/test/test_server_line_SUITE.erl
+++ /dev/null
@@ -1,131 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%%------------------------------------------------------------------
-%%% Test Server self test. 
-%%%------------------------------------------------------------------
--module(test_server_line_SUITE).
--include_lib("test_server/include/test_server.hrl").
-
--export([all/0,suite/0]).
--export([init_per_suite/1,end_per_suite/1,
-	 init_per_testcase/2, end_per_testcase/2]).
--export([parse_transform/1, lines/1]).
-
-suite() -> 
-    [{ct_hooks,[ts_install_cth]},
-     {doc,["Test of parse transform for collection line numbers"]}].
-
-all() -> [parse_transform,lines].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_testcase(_Case, Config) ->
-    ?line test_server_line:clear(),
-    Dog = ?t:timetrap(?t:minutes(2)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    ?line test_server_line:clear(),
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
-parse_transform(suite) -> [];
-parse_transform(doc) -> [];
-parse_transform(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir,Config),
-    code:add_pathz(DataDir),
-
-    ?line ok = parse_transform_test:excluded(),
-    ?line [] = test_server_line:get_lines(),
-
-    ?line test_server_line:clear(),
-    ?line ok = parse_transform_test:func(),
-
-    ?line [{parse_transform_test,func4,58},
-	   {parse_transform_test,func,49},
-	   {parse_transform_test,func3,56},
-	   {parse_transform_test,func,39},
-	   {parse_transform_test,func2,54},
-	   {parse_transform_test,func,36},
-	   {parse_transform_test,func1,52},
-	   {parse_transform_test,func,35}] = test_server_line:get_lines(),
-    
-    code:del_path(DataDir),
-    ok.
-
-lines(suite) -> [];
-lines(doc) -> ["Test parse transform for collection line numbers"];
-lines(Config) when is_list(Config) ->
-    ?line L0 = [{mod,func,1},{mod,func,2},{mod,func,3},
-		{m,f,4},{m,f,5},{m,f,6},
-		{mo,fu,7},{mo,fu,8},{mo,fu,9}],
-    ?line LL = string:copies(L0, 1000),
-    ?line T1 = erlang:now(),
-    ?line lists:foreach(fun ({M,F,L}) -> 
-				test_server_line:'$test_server_line'(M, F, L) 
-			end, LL),
-    ?line T2 = erlang:now(),
-    ?line Long = test_server_line:get_lines(),
-    ?line test_server_line:clear(),
-    
-    ?line T3 = erlang:now(),
-    ?line lists:foreach(fun ({M,F,L}) -> 
-				test_server_line:'$test_server_lineQ'(M, F, L) 
-			end, LL),
-    ?line T4 = erlang:now(),
-    ?line LongQ = test_server_line:get_lines(),
-
-    ?line io:format("'$test_server_line': ~f~n'$test_server_lineQ': ~f~n",
-		    [timer:now_diff(T2, T1)/1000, timer:now_diff(T4, T3)/1000]),
-    ?line io:format("'$test_server_line' result long:~p~n", [Long]),
-    ?line io:format("'$test_server_lineQ' result long:~p~n", [LongQ]),
-
-    if Long =:= LongQ ->
-	    ?line ok;
-       true ->
-	    ?line ?t:fail("The two methods did not produce same result for"
-			  " long lists of lines")
-    end,
-    
-    ?line test_server_line:clear(),
-    ?line lists:foreach(fun ({M,F,L}) -> 
-				test_server_line:'$test_server_line'(M, F, L) 
-			end, L0),
-    ?line Short = test_server_line:get_lines(),
-    ?line test_server_line:clear(),
-    ?line lists:foreach(fun ({M,F,L}) -> 
-				test_server_line:'$test_server_lineQ'(M, F, L) 
-			end, L0),
-    ?line ShortQ = test_server_line:get_lines(),
-
-    ?line io:format("'$test_server_line' result short:~p~n", [Short]),
-    ?line io:format("'$test_server_lineQ' result short:~p~n", [ShortQ]),
-    
-    if Short =:= ShortQ ->
-	    ?line ok;
-       true ->
-	    ?line ?t:fail("The two methods did not produce same result for"
-			  " shot lists of lines\n")
-    end.
diff --git a/lib/test_server/test/test_server_line_SUITE_data/Makefile.src b/lib/test_server/test/test_server_line_SUITE_data/Makefile.src
deleted file mode 100644
index a077648934..0000000000
--- a/lib/test_server/test/test_server_line_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,6 +0,0 @@
-EFLAGS=+debug_info -pa ../../test_server -I../../test_server
-           
-all: parse_transform_test.@EMULATOR@
-
-parse_transform_test.@EMULATOR@: parse_transform_test.erl
-	erlc $(EFLAGS) parse_transform_test.erl
diff --git a/lib/test_server/test/test_server_test_lib.erl b/lib/test_server/test/test_server_test_lib.erl
index 5ca24f3df7..4e89abf308 100644
--- a/lib/test_server/test/test_server_test_lib.erl
+++ b/lib/test_server/test/test_server_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -54,9 +54,13 @@ start_slave(Config,_Level) ->
 		ok
 	    end,
 	    DataDir = proplists:get_value(data_dir, Config),
-	    PrivDir = proplists:get_value(priv_dir, Config),
+	    %% We would normally use priv_dir for temporary data,
+	    %% but the pathnames gets too long on Windows.
+	    %% Until the run-time system can support long pathnames,
+	    %% use the data dir.
+	    WorkDir = DataDir,
 
-	    %% PrivDir as well as directory of Test Server suites
+	    %% WorkDir as well as directory of Test Server suites
 	    %% have to be in code path on Test Server node.
 	    [_ | Parts] = lists:reverse(filename:split(DataDir)),
 	    TSDir = filename:join(lists:reverse(Parts)),
@@ -64,7 +68,7 @@ start_slave(Config,_Level) ->
 			      undefined -> [];
 			      Ds -> Ds
 			  end,
-	    PathDirs = [PrivDir,TSDir | AddPathDirs],
+	    PathDirs = [WorkDir,TSDir | AddPathDirs],
 	    [true = rpc:call(Node, code, add_patha, [D]) || D <- PathDirs],
 	    io:format("Dirs added to code path (on ~w):~n",
 		      [Node]),
@@ -73,13 +77,18 @@ start_slave(Config,_Level) ->
 	    true = rpc:call(Node, os, putenv, 
 			    ["TEST_SERVER_FRAMEWORK", "undefined"]),
 
-	    ok = rpc:call(Node, file, set_cwd, [PrivDir]),
-	    [{node,Node} | Config]     
+	    ok = rpc:call(Node, file, set_cwd, [WorkDir]),
+	    [{node,Node}, {work_dir,WorkDir} | Config]
     end.
 
 post_end_per_testcase(_TC, Config, Return, State) ->
     Node = proplists:get_value(node, Config),
-    cover:stop(Node),
+    case test_server:is_cover() of
+	true ->
+	    cover:flush(Node);
+	false ->
+	    ok
+    end,
     slave:stop(Node),
 
     {Return, State}.
diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk
index a1f4559083..b956ebb2b3 100644
--- a/lib/test_server/vsn.mk
+++ b/lib/test_server/vsn.mk
@@ -1 +1 @@
-TEST_SERVER_VSN = 3.5.1
+TEST_SERVER_VSN = 3.5.3
diff --git a/lib/toolbar/doc/src/Makefile b/lib/toolbar/doc/src/Makefile
index 76147c111e..2239421556 100644
--- a/lib/toolbar/doc/src/Makefile
+++ b/lib/toolbar/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -102,14 +102,14 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/toolbar/doc/src/notes.xml b/lib/toolbar/doc/src/notes.xml
index b901e6c8ff..f3ed41bd82 100644
--- a/lib/toolbar/doc/src/notes.xml
+++ b/lib/toolbar/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/toolbar/src/Makefile b/lib/toolbar/src/Makefile
index 14e1451609..102970a59a 100644
--- a/lib/toolbar/src/Makefile
+++ b/lib/toolbar/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -84,10 +84,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
index b8c4aed6e2..0382d3228d 100644
--- a/lib/tools/c_src/Makefile.in
+++ b/lib/tools/c_src/Makefile.in
@@ -188,11 +188,11 @@ include ../vsn.mk
 RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
 
 release_spec: all
-	$(INSTALL_DIR) $(RELSYSDIR)/c_src
-	$(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) $(RELSYSDIR)/c_src
+	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+	$(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) "$(RELSYSDIR)/c_src"
 ifneq ($(PROGS),)
-	$(INSTALL_DIR) $(RELSYSDIR)/bin
-	$(INSTALL_PROGRAM) $(PROGS) $(RELSYSDIR)/bin
+	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
+	$(INSTALL_PROGRAM) $(PROGS) "$(RELSYSDIR)/bin"
 endif
 
 release_docs_spec:
diff --git a/lib/tools/doc/src/Makefile b/lib/tools/doc/src/Makefile
index 433f123ae5..e3a2d64041 100644
--- a/lib/tools/doc/src/Makefile
+++ b/lib/tools/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2010. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -121,14 +121,14 @@ clean clean_docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/tools/doc/src/cover.xml b/lib/tools/doc/src/cover.xml
index 683acc025d..a2444ec947 100644
--- a/lib/tools/doc/src/cover.xml
+++ b/lib/tools/doc/src/cover.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2001</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -104,6 +104,13 @@
       remove nodes. The same Cover compiled code will be loaded on each
       node, and analysis will collect and sum up coverage data results
       from all nodes.</p>
+    <p>To only collect data from remote nodes without stopping
+      <c>cover</c> on those nodes, use <c>cover:flush/1</c></p>
+    <p>If the connection to a remote node goes down, the main node
+      will mark it as lost. If the node comes back it will be added
+      again. If the remote node was alive during the disconnected
+      periode, cover data from before and during this periode will be
+      included in the analysis.</p>
   </description>
   <funcs>
     <func>
@@ -477,6 +484,17 @@
           remote nodes is fetched and stored on the main node.</p>
       </desc>
     </func>
+    <func>
+      <name>flush(Nodes) -> ok | {error,not_main_node}</name>
+      <fsummary>Collect cover data from remote nodes.</fsummary>
+      <type>
+        <v>Nodes = [atom()]</v>
+      </type>
+      <desc>
+        <p>Fetch data from the Cover database on the remote nodes and
+        stored on the main node.</p>
+      </desc>
+    </func>
   </funcs>
 
   <section>
diff --git a/lib/tools/doc/src/eprof.xml b/lib/tools/doc/src/eprof.xml
index 8b614d8860..82eb8dd284 100644
--- a/lib/tools/doc/src/eprof.xml
+++ b/lib/tools/doc/src/eprof.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -67,9 +67,9 @@
         <p><c>Rootset</c> is a list of pids and registered names.</p>
         <p>The function returns <c>profiling</c> if tracing could be enabled
           for all processes in <c>Rootset</c>, or <c>error</c> otherwise.</p>
-        <p>A pattern can be selected to narrow the profiling. For instance ca a specific
-	    module be selected and only the code processes executes in that module will be
-	    profiled.</p>
+        <p>A pattern can be selected to narrow the profiling. For instance a
+          specific module can be selected, and only the code executed in that
+          module will be profiled.</p>
       </desc>
     </func>
     <func>
@@ -147,8 +147,8 @@
       </type>
       <desc>
         <p>This function ensures that the results displayed by
-			<c>analyze/0,1,2</c> are printed both to
-          the file <c>File</c> and the screen.</p>
+          <c>analyze/0,1,2</c> are printed both to the file
+          <c>File</c> and the screen.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index f4da132102..5d7bd464ce 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,6 +30,69 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 2.6.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The last tuple fun call has been removed from fprof.</p>
+          <p>
+	    Own Id: OTP-10091 Aux Id: seq12067 </p>
+        </item>
+        <item>
+          <p>
+	    Fix indentation of record fields in Emacs (Thanks to
+	    Tomas Abrahamsson)</p>
+          <p>
+	    Own Id: OTP-10120</p>
+        </item>
+        <item>
+          <p>
+	    Documentation fixes (Thanks to Ricardo Catalinas Jim�nez
+	    )</p>
+          <p>
+	    Own Id: OTP-10121</p>
+        </item>
+        <item>
+          <p>
+	    Remove Erlang-specific compilation error regexp in
+	    erlang.el</p>
+          <p>
+	    Own Id: OTP-10168</p>
+        </item>
+        <item>
+          <p>
+	    Fix highlighting of atoms ending with a dollar sign</p>
+          <p>
+	    Like this: 'atom$'. In that example, the last single
+	    quote should be recognised as ending the atom. This needs
+	    a font-lock workaround similar to the one for strings.
+	    Thanks to Magnus Henoch</p>
+          <p>
+	    Own Id: OTP-10178</p>
+        </item>
+        <item>
+	    <p> Xref now accepts filenames with character codes
+	    greater than 126. (Thanks to Emile Joubert for reporting
+	    the issue.) </p>
+          <p>
+	    Own Id: OTP-10192</p>
+        </item>
+        <item>
+          <p>
+	    Add test_indentation target to lib/tools/emacs/Makefile</p>
+          <p>
+	    Automatically indent test.erl.orig, save to test.erl, and
+	    compare to test.erl.intended. Thanks to Magnus Henoch.</p>
+          <p>
+	    Own Id: OTP-10226</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 2.6.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/doc/src/xref.xml b/lib/tools/doc/src/xref.xml
index 17de66bb22..9706ae6746 100644
--- a/lib/tools/doc/src/xref.xml
+++ b/lib/tools/doc/src/xref.xml
@@ -1453,7 +1453,7 @@ Evaluates a predefined analysis.
           Note however that the code path will be traversed once for
           each used <seealso marker="#library_module">library module</seealso> while setting up module data.
           On the other hand, if there are only a few modules that are
-          used by not analyzed, using <c>code_path</c> may be faster
+          used but not analyzed, using <c>code_path</c> may be faster
           than setting the library path to <c>code:get_path()</c>.
           </p>
         <p>If the library path is set to <c>code_path</c>, the set of
diff --git a/lib/tools/doc/src/xref_chapter.xml b/lib/tools/doc/src/xref_chapter.xml
index 39c5545af9..566776eab0 100644
--- a/lib/tools/doc/src/xref_chapter.xml
+++ b/lib/tools/doc/src/xref_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -301,7 +301,7 @@
       and <c>|||</c>) are the only operators that accept both
       representations. This means that in order to analyze indirect
       calls using restriction, the <c>closure</c> operator (which creates the
-      <c>digraph</c> representation of graphs) has to been
+      <c>digraph</c> representation of graphs) has to be
       applied explicitly.
       </p>
     <p>As an example of analyzing indirect calls, the following Erlang
diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile
index 8533488463..69946be24a 100644
--- a/lib/tools/emacs/Makefile
+++ b/lib/tools/emacs/Makefile
@@ -71,9 +71,9 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/emacs
+	$(INSTALL_DIR) "$(RELSYSDIR)/emacs"
 	$(INSTALL_DATA) $(EL_FILES) $(README_FILES) $(TEST_FILES) \
-		$(RELSYSDIR)/emacs
+		"$(RELSYSDIR)/emacs"
 
 ifeq ($(DOCTYPE),pdf)
 release_docs_spec:
@@ -82,7 +82,23 @@ ifeq ($(DOCTYPE),ps)
 release_docs_spec:
 else
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN_FILES) $(RELEASE_PATH)/man/man3
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN_FILES) "$(RELEASE_PATH)/man/man3"
 endif
 endif
+
+EMACS ?= emacs
+
+test_indentation:
+	@rm -f test.erl
+	@rm -f test_indent.el
+	@echo '(load "erlang-start")' >> test_indent.el
+	@echo '(find-file "test.erl.orig")' >> test_indent.el
+	@echo "(require 'cl)    ; required with Emacs < 23 for ignore-errors" >> test_indent.el
+	@echo '(erlang-mode)' >> test_indent.el
+	@echo '(toggle-debug-on-error)' >> test_indent.el
+	@echo '(erlang-indent-current-buffer)' >> test_indent.el
+	@echo '(write-file "test.erl")' >> test_indent.el
+	$(EMACS) --batch -Q -L . -l test_indent.el
+	diff -u test.erl.indented test.erl
+	@echo "No differences between expected and actual indentation"
diff --git a/lib/tools/emacs/erlang-pkg.el b/lib/tools/emacs/erlang-pkg.el
new file mode 100644
index 0000000000..decc696e21
--- /dev/null
+++ b/lib/tools/emacs/erlang-pkg.el
@@ -0,0 +1,3 @@
+(define-package "erlang" "2.7.0"
+                "Erlang major mode"
+                '((flymake-mode "0.4.6")))
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index bc7a190fb4..e2bcd37def 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -1,7 +1,13 @@
-;; erlang.el --- Major modes for editing and running Erlang
+;;; erlang.el --- Major modes for editing and running Erlang
+
+;; Copyright (C) 2004  Free Software Foundation, Inc.
+;; Author:   Anders Lindgren
+;; Keywords: erlang, languages, processes
+;; Date:     2011-12-11
+
 ;; %CopyrightBegin%
 ;;
-;; Copyright Ericsson AB 1996-2011. All Rights Reserved.
+;; Copyright Ericsson AB 1996-2012. All Rights Reserved.
 ;;
 ;; The contents of this file are subject to the Erlang Public License,
 ;; Version 1.1, (the "License"); you may not use this file except in
@@ -15,10 +21,7 @@
 ;; under the License.
 ;;
 ;; %CopyrightEnd%
-;; 
-;; Copyright (C) 2004  Free Software Foundation, Inc.
-;; Author:   Anders Lindgren
-;; Keywords: erlang, languages, processes
+;;
 
 ;; Lars Thors�n's modifications of 2000-06-07 included.
 ;; The original version of this package was written by Robert Virding.
@@ -483,10 +486,6 @@ function.")
   "*Non-nil means TAB in Erlang mode should always re-indent the current line,
 regardless of where in the line point is when the TAB command is used.")
 
-(defvar erlang-error-regexp-alist
-  '(("^\\([^:( \t\n]+\\)[:(][ \t]*\\([0-9]+\\)[:) \t]" . (1 2)))
-  "*Patterns for matching Erlang errors.")
-
 (defvar erlang-man-inhibit (eq system-type 'windows-nt)
   "Inhibit the creation of the Erlang Manual Pages menu.
 
@@ -1327,7 +1326,6 @@ Other commands:
   (erlang-menu-init)
   (erlang-mode-variables)
   (erlang-check-module-name-init)
-  (erlang-add-compilation-alist erlang-error-regexp-alist)
   (erlang-man-init)
   (erlang-tags-init)
   (erlang-font-lock-init)
@@ -1443,31 +1441,6 @@ Other commands:
   (set (make-local-variable 'outline-level) (lambda () 1))
   (set (make-local-variable 'add-log-current-defun-function)
        'erlang-current-defun))
-
-
-;; Compilation.
-;;
-;; The following code is compatible with the standard package `compilation',
-;; making it possible to go to errors using `erlang-next-error' (or just
-;; `next-error' in Emacs 21).
-;;
-;; The normal `compile' command works of course.  For best result, please
-;; execute `make' with the `-w' flag.
-;;
-;; Please see the variables named `compiling-..' above.
-
-(defun erlang-add-compilation-alist (alist)
-  (require 'compile)
-  (cond ((boundp 'compilation-error-regexp-alist) ; Emacs 19
-	 (while alist
-	   (or (assoc (car (car alist)) compilation-error-regexp-alist)
-	       (setq compilation-error-regexp-alist
-		     (cons (car alist) compilation-error-regexp-alist)))
-	   (setq alist (cdr alist))))
-	((boundp 'compilation-error-regexp)
-	 ;; Emacs 18,  Only one regexp is allowed.
-	 (funcall (symbol-function 'set)
-		  'compilation-error-regexp (car (car alist))))))
 
 (defun erlang-font-lock-init ()
   "Initialize Font Lock for Erlang mode."
@@ -1516,7 +1489,7 @@ Other commands:
           ;; A dollar sign right before the double quote that ends a
           ;; string is not a character escape.
           ;;
-          ;; And a "string" has with a double quote not escaped by a
+          ;; And a "string" consists of a double quote not escaped by a
           ;; dollar sign, any number of non-backslash non-newline
           ;; characters or escaped backslashes, a dollar sign
           ;; (otherwise we wouldn't care) and a double quote.  This
@@ -1525,6 +1498,8 @@ Other commands:
           ;; know whether matching started inside a string: limiting
           ;; search to a single line keeps things sane.
           . (("\\(?:^\\|[^$]\\)\"\\(?:[^\"\n]\\|\\\\\"\\)*\\(\\$\\)\"" 1 "w")
+	     ;; Likewise for atoms
+	     ("\\(?:^\\|[^$]\\)'\\(?:[^'\n]\\|\\\\'\\)*\\(\\$\\)'" 1 "w")
              ;; And the dollar sign in $\" escapes two characters, not
              ;; just one.
              ("\\(\\$\\)\\\\\\\"" 1 "'"))))))
@@ -2986,18 +2961,52 @@ This assumes that the preceding expression is either simple
     (forward-sexp (- arg))
     (let ((col (current-column)))
       (skip-chars-backward " \t")
-      ;; Needed to match the colon in "'foo':'bar'".
-      (if (not (memq (preceding-char) '(?# ?:)))
-          col
-        ;; Special hack to handle: (note line break)
-        ;; [#myrecord{
-        ;;  foo = foo}]
-        (or
-         (ignore-errors
-           (backward-char 1)
-           (forward-sexp -1)
-           (current-column))
-         col)))))
+      ;; Special hack to handle: (note line break)
+      ;; [#myrecord{
+      ;;  foo = foo}]
+      ;; where the call (forward-sexp -1) will fail when point is at the `#'.
+      (or
+       (ignore-errors
+	 ;; Needed to match the colon in "'foo':'bar'".
+	 (cond ((eq (preceding-char) ?:)
+		(backward-char 1)
+		(forward-sexp -1)
+		(current-column))
+	       ((eq  (preceding-char) ?#)
+		;; We may now be at:
+		;; - either a construction of a new record
+		;; - or update of a record, in which case we want
+		;;   the column of the expression to be updated.
+		;;
+		;; To see which of the two cases we are at, we first
+		;; move an expression backwards, check for keywords,
+		;; then immediately an expression forwards.  Moving
+		;; backwards skips past tokens like `,' or `->', but
+		;; when moving forwards again, we won't skip past such
+		;; tokens.  We use this: if, after having moved
+		;; forwards, we're back where we started, then it was
+		;; a record update.
+		;; The check for keywords is to detect cases like:
+		;;   case Something of #record_construction{...}
+		(backward-char 1)
+		(let ((record-start (point))
+		      (record-start-col (current-column)))
+		  (forward-sexp -1)
+		  (let ((preceding-expr-col (current-column))
+			;; white space definition according to erl_scan
+			(white-space "\000-\040\200-\240"))
+		    (if (erlang-at-keyword)
+			;; The (forward-sexp -1) call moved past a keyword
+			(1+ record-start-col)
+		      (forward-sexp 1)
+		      (skip-chars-forward white-space record-start)
+		      ;; Are we back where we started?  If so, it was an update.
+		      (if (= (point) record-start)
+			    preceding-expr-col
+			(goto-char record-start)
+			(1+ (current-column)))))))
+	       (t col)))
+       col))))
 
 (defun erlang-indent-parenthesis (stack-position) 
   (let ((previous (erlang-indent-find-preceding-expr)))
@@ -4860,7 +4869,6 @@ The following special commands are available:
     (set (make-local-variable 'compilation-old-error-list) nil))
   ;; Needed when compiling directly from the Erlang shell.
   (setq compilation-last-buffer (current-buffer))
-  (erlang-add-compilation-alist erlang-error-regexp-alist)
   (setq comint-prompt-regexp "^[^>=]*> *")
   (setq comint-eol-on-send t)
   (setq comint-input-ignoredups t)
diff --git a/lib/tools/emacs/test.erl.indented b/lib/tools/emacs/test.erl.indented
index 2948ccf1b5..6c9343f6cb 100644
--- a/lib/tools/emacs/test.erl.indented
+++ b/lib/tools/emacs/test.erl.indented
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -215,6 +215,11 @@ highlighting(X)			  % Function definitions should be highlighted
 
     "char $in string", atom, 
 
+    'atom$', atom,  'atom$', atom,
+    'atom\$', atom,
+
+    'char $in atom', atom,
+
     $[, ${, $\\, atom,
     ?MACRO_1,
     ?MACRO_2(foo),
@@ -657,3 +662,41 @@ indent_comprehensions() ->
 foo() ->
     [#foo{
 	foo = foo}].
+
+%% Record indentation
+some_function_with_a_very_long_name() ->
+    #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+       field1=a,
+       field2=b},
+    case dummy_function_with_a_very_very_long_name(x) of
+	#'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+	   field1=a,
+	   field2=b} ->
+	    ok;
+	Var = #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+		 field1=a,
+		 field2=b} ->
+	    Var#'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+	      field1=a,
+	      field2=b};
+	#xyz{
+	   a=1,
+	   b=2} ->
+	    ok
+    end.
+
+another_function_with_a_very_very_long_name() ->
+    #rec{
+       field1=1,
+       field2=1}.
+
+some_function_name_xyz(xyzzy, #some_record{
+				 field1=Field1,
+				 field2=Field2}) ->
+    SomeVariable = f(#'Some-long-record-name'{
+			field_a = 1,
+			'inter-xyz-parameters' =
+			    #'Some-other-very-long-record-name'{
+			       field2 = Field1,
+			       field2 = Field2}}),
+    {ok, SomeVariable}.
diff --git a/lib/tools/emacs/test.erl.orig b/lib/tools/emacs/test.erl.orig
index 1221c5655e..0f8c4a9175 100644
--- a/lib/tools/emacs/test.erl.orig
+++ b/lib/tools/emacs/test.erl.orig
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -215,6 +215,11 @@ highlighting(X)			  % Function definitions should be highlighted
  
  "char $in string", atom, 
 
+ 'atom$', atom,  'atom$', atom,
+ 'atom\$', atom,
+
+ 'char $in atom', atom,
+
  $[, ${, $\\, atom,
  ?MACRO_1,
  ?MACRO_2(foo),
@@ -657,3 +662,41 @@ ok.
 foo() ->
 [#foo{
 foo = foo}].
+
+%% Record indentation
+some_function_with_a_very_long_name() ->
+ #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+ field1=a,
+ field2=b},
+ case dummy_function_with_a_very_very_long_name(x) of
+ #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+ field1=a,
+ field2=b} ->
+ ok;
+ Var = #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+ field1=a,
+ field2=b} ->
+ Var#'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+ field1=a,
+ field2=b};
+ #xyz{
+ a=1,
+ b=2} ->
+ ok
+ end.
+
+another_function_with_a_very_very_long_name() ->
+ #rec{
+ field1=1,
+ field2=1}.
+
+some_function_name_xyz(xyzzy, #some_record{
+ field1=Field1,
+ field2=Field2}) ->
+ SomeVariable = f(#'Some-long-record-name'{
+ field_a = 1,
+ 'inter-xyz-parameters' =
+ #'Some-other-very-long-record-name'{
+ field2 = Field1,
+ field2 = Field2}}),
+ {ok, SomeVariable}.
diff --git a/lib/tools/emacs/vsn.mk b/lib/tools/emacs/vsn.mk
index f33ea8b519..a495da3453 100644
--- a/lib/tools/emacs/vsn.mk
+++ b/lib/tools/emacs/vsn.mk
@@ -1,3 +1,2 @@
 
-EMACS_VSN = 2.4.13
-
+EMACS_VSN = 2.7.0
diff --git a/lib/tools/examples/Makefile b/lib/tools/examples/Makefile
index 9fb8434633..fc14ee54d6 100644
--- a/lib/tools/examples/Makefile
+++ b/lib/tools/examples/Makefile
@@ -50,7 +50,7 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples"
 
 release_docs_spec:
diff --git a/lib/tools/priv/Makefile b/lib/tools/priv/Makefile
index 6fea580c00..b32ba5820d 100644
--- a/lib/tools/priv/Makefile
+++ b/lib/tools/priv/Makefile
@@ -58,9 +58,9 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(HTDOCS_FILES) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(TOOL_FILES) $(RELSYSDIR)/priv
+	$(INSTALL_DIR)  "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(HTDOCS_FILES) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(TOOL_FILES) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
index 360f4f8f29..abe1389771 100644
--- a/lib/tools/src/Makefile
+++ b/lib/tools/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2010. All Rights Reserved.
+# Copyright Ericsson AB 1996-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -105,10 +105,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
-		$(RELSYSDIR)/ebin
+		"$(RELSYSDIR)/ebin"
 
 release_docs_spec:
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index e21bd1b88c..10f14b0a49 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -26,12 +26,17 @@
 %% ARCHITECTURE
 %% The coverage tool consists of one process on each node involved in
 %% coverage analysis. The process is registered as 'cover_server'
-%% (?SERVER).  All cover_servers in the distributed system are linked
-%% together.  The cover_server on the 'main' node is in charge, and it
-%% traps exits so it can detect nodedown or process crashes on the
-%% remote nodes. This process is implemented by the functions
-%% init_main/1 and main_process_loop/1. The cover_server on the remote
-%% nodes are implemented by the functions init_remote/2 and
+%% (?SERVER).  The cover_server on the 'main' node is in charge, and
+%% it monitors the cover_servers on all remote nodes. When it gets a
+%% 'DOWN' message for another cover_server, it marks the node as
+%% 'lost'. If a nodeup is received for a lost node the main node
+%% ensures that the cover compiled modules are loaded again. If the
+%% remote node was alive during the disconnected periode, cover data
+%% for this periode will also be included in the analysis.
+%%
+%% The cover_server process on the main node is implemented by the
+%% functions init_main/1 and main_process_loop/1. The cover_server on
+%% the remote nodes are implemented by the functions init_remote/2 and
 %% remote_process_loop/1.
 %%
 %% TABLES
@@ -81,15 +86,17 @@
 	 export/1, export/2, import/1,
 	 modules/0, imported/0, imported_modules/0, which_nodes/0, is_compiled/1,
 	 reset/1, reset/0,
+	 flush/1,
 	 stop/0, stop/1]).
--export([remote_start/1]).
+-export([remote_start/1,get_main_node/0]).
 %-export([bump/5]).
 -export([transform/4]). % for test purposes
 
 -record(main_state, {compiled=[],           % [{Module,File}]
 		     imported=[],           % [{Module,File,ImportFile}]
 		     stopper,               % undefined | pid()
-		     nodes=[]}).            % [Node]
+		     nodes=[],              % [Node]
+		     lost_nodes=[]}).       % [Node]
 
 -record(remote_state, {compiled=[],         % [{Module,File}]
 		       main_node}).         % atom()
@@ -497,6 +504,19 @@ stop(Node) when is_atom(Node) ->
 stop(Nodes) ->
     call({stop,remove_myself(Nodes,[])}).
 
+%% flush(Nodes) -> ok | {error,not_main_node}
+%%   Nodes = [Node] | Node
+%%   Node = atom()
+%%   Error = {not_cover_compiled,Module}
+flush(Node) when is_atom(Node) ->
+    flush([Node]);
+flush(Nodes) ->
+    call({flush,remove_myself(Nodes,[])}).
+
+%% Used by test_server only. Not documented.
+get_main_node() ->
+    call(get_main_node).
+
 %% bump(Module, Function, Arity, Clause, Line)
 %%   Module = Function = atom()
 %%   Arity = Clause = Line = integer()
@@ -541,7 +561,10 @@ remote_call(Node,Request) ->
 	    Return = 
 		receive 
 		    {'DOWN', Ref, _Type, _Object, _Info} -> 
-			{error,node_dead};
+			case Request of
+			    {remote,stop} -> ok;
+			    _ -> {error,node_dead}
+			end;
 		    {?SERVER,Reply} -> 
 			Reply
 		end,
@@ -569,40 +592,14 @@ init_main(Starter) ->
     ets:new(?BINARY_TABLE, [set, named_table]),
     ets:new(?COLLECTION_TABLE, [set, public, named_table]),
     ets:new(?COLLECTION_CLAUSE_TABLE, [set, public, named_table]),
-    process_flag(trap_exit,true),
+    net_kernel:monitor_nodes(true),
     Starter ! {?SERVER,started},
     main_process_loop(#main_state{}).
 
 main_process_loop(State) ->
     receive
 	{From, {start_nodes,Nodes}} ->
-	    ThisNode = node(),
-	    StartedNodes = 
-		lists:foldl(
-		  fun(Node,Acc) ->
-			  case rpc:call(Node,cover,remote_start,[ThisNode]) of
-			      {ok,RPid} ->
-				  link(RPid),
-				  [Node|Acc];
-			      Error ->
-				  io:format("Could not start cover on ~w: ~p\n",
-					    [Node,Error]),
-				  Acc
-			  end
-		  end,
-		  [],
-		  Nodes),
-
-	    %% In case some of the compiled modules have been unloaded they 
-	    %% should not be loaded on the new node.
-	    {_LoadedModules,Compiled} = 
-		get_compiled_still_loaded(State#main_state.nodes,
-					  State#main_state.compiled),
-	    remote_load_compiled(StartedNodes,Compiled),
-	    
-	    State1 = 
-		State#main_state{nodes = State#main_state.nodes ++ StartedNodes,
-				 compiled = Compiled},
+	    {StartedNodes,State1} = do_start_nodes(Nodes, State),
 	    reply(From, {ok,StartedNodes}),
 	    main_process_loop(State1);
 
@@ -707,8 +704,13 @@ main_process_loop(State) ->
 	{From, {stop,Nodes}} ->
 	    remote_collect('_',Nodes,true),
 	    reply(From, ok),
-	    State1 = State#main_state{nodes=State#main_state.nodes--Nodes},
-	    main_process_loop(State1);
+	    Nodes1 = State#main_state.nodes--Nodes,
+	    main_process_loop(State#main_state{nodes=Nodes1});
+
+	{From, {flush,Nodes}} ->
+	    remote_collect('_',Nodes,false),
+	    reply(From, ok),
+	    main_process_loop(State);
 
 	{From, stop} ->
 	    lists:foreach(
@@ -788,14 +790,30 @@ main_process_loop(State) ->
 		end,
 	    main_process_loop(S);		    
 	
-	{'EXIT',Pid,_Reason} ->
-	    %% Exit is trapped on the main node only, so this will only happen 
-	    %% there. I assume that I'm only linked to cover_servers on remote 
-	    %% nodes, so this must be one of them crashing. 
-	    %% Remove node from list!
-	    State1 = State#main_state{nodes=State#main_state.nodes--[node(Pid)]},
+	{'DOWN', _MRef, process, {?SERVER,Node}, _Info} ->
+	    %% A remote cover_server is down, mark as lost
+	    Nodes = State#main_state.nodes--[Node],
+	    Lost = [Node|State#main_state.lost_nodes],
+	    main_process_loop(State#main_state{nodes=Nodes,lost_nodes=Lost});
+
+	{nodeup,Node} ->
+	    State1 =
+		case lists:member(Node,State#main_state.lost_nodes) of
+		    true ->
+			sync_compiled(Node,State);
+		    false ->
+			State
+	    end,
 	    main_process_loop(State1);
+
+	{nodedown,_} ->
+	    %% Will be taken care of when 'DOWN' message arrives
+	    main_process_loop(State);
 	
+	{From, get_main_node} ->
+	    reply(From, node()),
+	    main_process_loop(State);
+
 	get_status ->
 	    io:format("~p~n",[State]),
 	    main_process_loop(State)
@@ -850,7 +868,16 @@ remote_process_loop(State) ->
 	{remote,stop} ->
 	    reload_originals(State#remote_state.compiled),
             unregister(?SERVER),
-	    remote_reply(State#remote_state.main_node, ok);
+	    ok; % not replying since 'DOWN' message will be received anyway
+
+	{remote,get_compiled} ->
+	    remote_reply(State#remote_state.main_node,
+			 State#remote_state.compiled),
+	    remote_process_loop(State);
+
+	{From, get_main_node} ->
+	    remote_reply(From, State#remote_state.main_node),
+	    remote_process_loop(State);
 
 	get_status ->
 	    io:format("~p~n",[State]),
@@ -961,6 +988,36 @@ unload([]) ->
 
 %%%--Handling of remote nodes--------------------------------------------
 
+do_start_nodes(Nodes, State) ->
+    ThisNode = node(),
+    StartedNodes =
+	lists:foldl(
+	  fun(Node,Acc) ->
+		  case rpc:call(Node,cover,remote_start,[ThisNode]) of
+		      {ok,_RPid} ->
+			  erlang:monitor(process,{?SERVER,Node}),
+			  [Node|Acc];
+		      Error ->
+			  io:format("Could not start cover on ~w: ~p\n",
+				    [Node,Error]),
+			  Acc
+		  end
+	  end,
+	  [],
+	  Nodes),
+
+    %% In case some of the compiled modules have been unloaded they
+    %% should not be loaded on the new node.
+    {_LoadedModules,Compiled} =
+	get_compiled_still_loaded(State#main_state.nodes,
+				  State#main_state.compiled),
+    remote_load_compiled(StartedNodes,Compiled),
+
+    State1 =
+	State#main_state{nodes = State#main_state.nodes ++ StartedNodes,
+			 compiled = Compiled},
+    {StartedNodes, State1}.
+
 %% start the cover_server on a remote node
 remote_start(MainNode) ->
     case whereis(?SERVER) of
@@ -984,6 +1041,30 @@ remote_start(MainNode) ->
 	    {error,{already_started,Pid}}
     end.
 
+%% If a lost node comes back, ensure that main and remote node has the
+%% same cover compiled modules. Note that no action is taken if the
+%% same {Mod,File} eksists on both, i.e. code change is not handled!
+sync_compiled(Node,State) ->
+    #main_state{compiled=Compiled0,nodes=Nodes,lost_nodes=Lost}=State,
+    State1 =
+	case remote_call(Node,{remote,get_compiled}) of
+	    {error,node_dead} ->
+		{_,S} = do_start_nodes([Node],State),
+		S;
+	    {error,_} ->
+		State;
+	    RemoteCompiled ->
+		{_,Compiled} =  get_compiled_still_loaded(Nodes,Compiled0),
+		Unload = [UM || {UM,_}=U <- RemoteCompiled,
+			       false == lists:member(U,Compiled)],
+		remote_unload([Node],Unload),
+		Load = [L || L <- Compiled,
+			     false == lists:member(L,RemoteCompiled)],
+		remote_load_compiled([Node],Load),
+		State#main_state{compiled=Compiled, nodes=[Node|Nodes]}
+	end,
+    State1#main_state{lost_nodes=Lost--[Node]}.
+
 %% Load a set of cover compiled modules on remote nodes,
 %% We do it ?MAX_MODS modules at a time so that we don't
 %% run out of memory on the cover_server node. 
@@ -1094,7 +1175,6 @@ remove_myself([Node|Nodes],Acc) ->
     remove_myself(Nodes,[Node|Acc]);
 remove_myself([],Acc) ->
     Acc.
-    
 
 %%%--Handling of modules state data--------------------------------------
 
@@ -2254,7 +2334,13 @@ do_reset2([]) ->
 do_clear(Module) ->
     ets:match_delete(?COVER_CLAUSE_TABLE, {Module,'_'}),
     ets:match_delete(?COVER_TABLE, {#bump{module=Module},'_'}),
-    ets:match_delete(?COLLECTION_TABLE, {#bump{module=Module},'_'}).
+    case lists:member(?COLLECTION_TABLE, ets:all()) of
+	true ->
+	    %% We're on the main node
+	    ets:match_delete(?COLLECTION_TABLE, {#bump{module=Module},'_'});
+	false ->
+	    ok
+    end.
 
 not_loaded(Module, unloaded, State) ->
     do_clear(Module),
@@ -2307,7 +2393,7 @@ pmap(Fun, [E | Rest], Pids, Limit, Cnt, Acc) when Cnt < Limit ->
     pmap(Fun, Rest, Pids ++ [Pid], Limit, Cnt + 1, Acc);
 pmap(Fun, List, [Pid | Pids], Limit, Cnt, Acc) ->
     receive
-	{'DOWN', _Ref, process, _, _} ->
+	{'DOWN', _Ref, process, X, _} when is_pid(X) ->
 	    pmap(Fun, List, [Pid | Pids], Limit, Cnt - 1, Acc);
 	{res, Pid, Res} ->
 	    pmap(Fun, List, Pids, Limit, Cnt, [Res | Acc])
@@ -2316,6 +2402,6 @@ pmap(_Fun, [], [], _Limit, 0, Acc) ->
     lists:reverse(Acc);
 pmap(Fun, [], [], Limit, Cnt, Acc) ->
     receive
-	{'DOWN', _Ref, process, _, _} ->
+	{'DOWN', _Ref, process, X, _} when is_pid(X) ->
 	    pmap(Fun, [], [], Limit, Cnt - 1, Acc)
     end.
diff --git a/lib/tools/src/fprof.erl b/lib/tools/src/fprof.erl
index 8165a6c13a..4cbb910f11 100644
--- a/lib/tools/src/fprof.erl
+++ b/lib/tools/src/fprof.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -89,9 +89,7 @@ dbg(_, _, _) ->
 
 apply({M, F}, Args) 
   when is_atom(M), is_atom(F), is_list(Args) ->
-    Arity = length(Args),
-    Function = fun M:F/Arity,
-    apply_1(Function, Args, []);
+    apply_1(M, F, Args, []);
 apply(Fun, Args) 
   when is_function(Fun), is_list(Args) ->
     apply_1(Fun, Args, []);
@@ -99,26 +97,25 @@ apply(A, B) ->
     erlang:error(badarg, [A, B]).
 
 apply(M, F, Args) when is_atom(M), is_atom(F), is_list(Args) ->
-    apply_1({M, F}, Args, []);
+    apply_1(M, F, Args, []);
 apply({M, F}, Args, Options) 
   when is_atom(M), is_atom(F), is_list(Args), is_list(Options) ->
-    Arity = length(Args),
-    Function = fun M:F/Arity,
-    apply_1(Function, Args, Options);
+    apply_1(M, F, Args, Options);
 apply(Fun, Args, Options) 
   when is_function(Fun), is_list(Args), is_list(Options) ->
     apply_1(Fun, Args, Options);
 apply(A, B, C) ->
     erlang:error(badarg, [A, B, C]).
 
-apply(Module, Function, Args, Options) 
-  when is_atom(Module), is_atom(Function), is_list(Args), is_list(Options) ->
-    Arity = length(Args),
-    Fun = fun Module:Function/Arity,
-    apply_1(Fun, Args, Options);
+apply(M, F, Args, Options)
+  when is_atom(M), is_atom(F), is_list(Args), is_list(Options) ->
+    apply_1(M, F, Args, Options);
 apply(A, B, C, D) ->
     erlang:error(badarg, [A, B, C, D]).
 
+apply_1(M, F, Args, Options) ->
+    Arity = length(Args),
+    apply_1(fun M:F/Arity, Args, Options).
 
 apply_1(Function, Args, Options) ->        
     {[_, Procs, Continue], Options_1} =
diff --git a/lib/tools/src/tools.app.src b/lib/tools/src/tools.app.src
index cd9b622f15..553c5eb96b 100644
--- a/lib/tools/src/tools.app.src
+++ b/lib/tools/src/tools.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -24,6 +24,7 @@
 	     eprof,
 	     fprof,
 	     instrument,
+	     lcnt,
 	     make,
 	     xref,
 	     xref_base,
diff --git a/lib/tools/src/xref_utils.erl b/lib/tools/src/xref_utils.erl
index 9d4a175d88..680563e9df 100644
--- a/lib/tools/src/xref_utils.erl
+++ b/lib/tools/src/xref_utils.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -141,7 +141,7 @@ is_string([], _) ->
 is_string(Term, C) ->
     is_string1(Term, C).
 
-is_string1([H | T], C) when H > C, H < 127 -> 
+is_string1([H | T], C) when H > C ->
     is_string1(T, C);
 is_string1([], _) -> 
     true;
diff --git a/lib/tools/test/Makefile b/lib/tools/test/Makefile
index 8019b7269f..86c81217b6 100644
--- a/lib/tools/test/Makefile
+++ b/lib/tools/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -84,11 +84,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: make_emakefile
-	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(SPEC_FILES) $(COVER_FILE) $(EMAKEFILE) \
-		$(ERL_FILES) $(RELSYSDIR)
-	chmod -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+		$(ERL_FILES) "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
 
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 576d7e261c..3bf1b44af8 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -23,7 +23,7 @@
 	 init_per_group/2,end_per_group/2]).
 
 -export([start/1, compile/1, analyse/1, misc/1, stop/1, 
-	 distribution/1, export_import/1,
+	 distribution/1, reconnect/1, die_and_reconnect/1, export_import/1,
 	 otp_5031/1, eif/1, otp_5305/1, otp_5418/1, otp_6115/1, otp_7095/1,
          otp_8188/1, otp_8270/1, otp_8273/1, otp_8340/1]).
 
@@ -45,7 +45,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     case whereis(cover_server) of
 	undefined ->
-	    [start, compile, analyse, misc, stop, distribution,
+	    [start, compile, analyse, misc, stop,
+	     distribution, reconnect, die_and_reconnect,
 	     export_import, otp_5031, eif, otp_5305, otp_5418,
 	     otp_6115, otp_7095, otp_8188, otp_8270, otp_8273,
 	     otp_8340];
@@ -326,14 +327,16 @@ distribution(Config) when is_list(Config) ->
     ?line {ok,N1} = ?t:start_node(cover_SUITE_distribution1,slave,[]),
     ?line {ok,N2} = ?t:start_node(cover_SUITE_distribution2,slave,[]),
     ?line {ok,N3} = ?t:start_node(cover_SUITE_distribution3,slave,[]),
+    ?line {ok,N4} = ?t:start_node(cover_SUITE_distribution4,slave,[]),
 
     %% Check that an already compiled module is loaded on new nodes
     ?line {ok,f} = cover:compile(f),
-    ?line {ok,[_,_,_]} = cover:start(nodes()),
+    ?line {ok,[_,_,_,_]} = cover:start(nodes()),
     ?line cover_compiled = code:which(f),
     ?line cover_compiled = rpc:call(N1,code,which,[f]),
     ?line cover_compiled = rpc:call(N2,code,which,[f]),
     ?line cover_compiled = rpc:call(N3,code,which,[f]),
+    ?line cover_compiled = rpc:call(N4,code,which,[f]),
 
     %% Check that a node cannot be started twice
     ?line {ok,[]} = cover:start(N2),
@@ -351,6 +354,7 @@ distribution(Config) when is_list(Config) ->
     ?line cover_compiled = rpc:call(N1,code,which,[v]),
     ?line cover_compiled = rpc:call(N2,code,which,[v]),
     ?line cover_compiled = rpc:call(N3,code,which,[v]),
+    ?line cover_compiled = rpc:call(N4,code,which,[v]),
     
     %% this is lost when the node is killed
     ?line rpc:call(N3,f,f2,[]),
@@ -385,6 +389,18 @@ distribution(Config) when is_list(Config) ->
     %% reset on the remote node(s))
     ?line check_f_calls(1,1),
 
+    %% Another checn that data is not fetched twice, i.e. when flushed
+    %% then analyse should not add the same data again.
+    ?line rpc:call(N4,f,f2,[]),
+    ?line ok = cover:flush(N4),
+    ?line check_f_calls(1,2),
+
+    %% Check that flush collects data so calls are not lost if node is killed
+    ?line rpc:call(N4,f,f2,[]),
+    ?line ok = cover:flush(N4),
+    ?line rpc:call(N4,erlang,halt,[]),
+    ?line check_f_calls(1,3),
+
     %% Check that stop() unloads on all nodes
     ?line ok = cover:stop(),
     ?line timer:sleep(100), %% Give nodes time to unload on slow machines.
@@ -393,20 +409,117 @@ distribution(Config) when is_list(Config) ->
     ?line true = is_unloaded(LocalBeam),
     ?line true = is_unloaded(N2Beam),
 
-    %% Check that cover_server on remote node dies if main node dies
+    %% Check that cover_server on remote node does not die if main node dies
     ?line {ok,[N1]} = cover:start(N1),
-    ?line true = is_pid(rpc:call(N1,erlang,whereis,[cover_server])),
+    ?line true = is_pid(N1Server = rpc:call(N1,erlang,whereis,[cover_server])),
     ?line exit(whereis(cover_server),kill),
-    ?line timer:sleep(10),
-    ?line undefined = rpc:call(N1,erlang,whereis,[cover_server]),    
-    
+    ?line timer:sleep(100),
+    ?line N1Server = rpc:call(N1,erlang,whereis,[cover_server]),
+
     %% Cleanup
     ?line Files = lsfiles(),
     ?line remove(files(Files, ".beam")),
     ?line ?t:stop_node(N1),
     ?line ?t:stop_node(N2).
 
-    
+%% Test that a lost node is reconnected
+reconnect(Config) ->
+    DataDir = ?config(data_dir, Config),
+    ok = file:set_cwd(DataDir),
+
+    {ok,a} = compile:file(a),
+    {ok,b} = compile:file(b),
+    {ok,f} = compile:file(f),
+
+    {ok,N1} = ?t:start_node(cover_SUITE_reconnect,peer,
+			    [{args," -pa " ++ DataDir},{start_cover,false}]),
+    {ok,a} = cover:compile(a),
+    {ok,f} = cover:compile(f),
+    {ok,[N1]} = cover:start(nodes()),
+
+    %% Some calls to check later
+    rpc:call(N1,f,f1,[]),
+    cover:flush(N1),
+    rpc:call(N1,f,f1,[]),
+
+    %% This will cause a call to f:f2() when nodes()==[] on N1
+    rpc:cast(N1,f,call_f2_when_isolated,[]),
+
+    %% Disconnect and check that node is removed from main cover node
+    net_kernel:disconnect(N1),
+    [] = cover:which_nodes(),
+    timer:sleep(500), % allow some time for the f:f2() call
+
+    %% Do some add one module (b) and remove one module (a)
+    code:purge(a),
+    {module,a} = code:load_file(a),
+    {ok,b} = cover:compile(b),
+    cover_compiled = code:which(b),
+
+    [] = cover:which_nodes(),
+    check_f_calls(1,0), % only the first call - before the flush
+
+    %% Reconnect the node and check that b and f are cover compiled but not a
+    net_kernel:connect_node(N1),
+    timer:sleep(100),
+    [N1] = cover:which_nodes(), % we are reconnected
+    cover_compiled = rpc:call(N1,code,which,[b]),
+    cover_compiled = rpc:call(N1,code,which,[f]),
+    ABeam = rpc:call(N1,code,which,[a]),
+    false = (cover_compiled==ABeam),
+
+    %% Ensure that we have:
+    %% * one f1 call from before the flush,
+    %% * one f1 call from after the flush but before disconnect
+    %% * one f2 call when disconnected
+    check_f_calls(2,1),
+
+    cover:stop(),
+    ?t:stop_node(N1),
+    ok.
+
+%% Test that a lost node is reconnected - also if it has been dead
+die_and_reconnect(Config) ->
+    DataDir = ?config(data_dir, Config),
+    ok = file:set_cwd(DataDir),
+
+    {ok,f} = compile:file(f),
+
+    NodeName = cover_SUITE_die_and_reconnect,
+    {ok,N1} = ?t:start_node(NodeName,peer,
+			    [{args," -pa " ++ DataDir},{start_cover,false}]),
+    %% {ok,a} = cover:compile(a),
+    {ok,f} = cover:compile(f),
+    {ok,[N1]} = cover:start(nodes()),
+
+    %% Some calls to check later
+    rpc:call(N1,f,f1,[]),
+    cover:flush(N1),
+    rpc:call(N1,f,f1,[]),
+
+    %% Kill the node
+    rpc:call(N1,erlang,halt,[]),
+    [] = cover:which_nodes(),
+
+    check_f_calls(1,0), % only the first call - before the flush
+
+    %% Restart the node and check that cover reconnects
+    {ok,N1} = ?t:start_node(NodeName,peer,
+			    [{args," -pa " ++ DataDir},{start_cover,false}]),
+    timer:sleep(100),
+    [N1] = cover:which_nodes(), % we are reconnected
+    cover_compiled = rpc:call(N1,code,which,[f]),
+
+    %% One more call...
+    rpc:call(N1,f,f1,[]),
+
+    %% Ensure that no more calls are counted
+    check_f_calls(2,0),
+
+    cover:stop(),
+    ?t:stop_node(N1),
+    ok.
+
 export_import(suite) -> [];
 export_import(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir, Config),
@@ -574,14 +687,7 @@ otp_5418(Config) when is_list(Config) ->
 
     ok.
 
-otp_6115(suite) -> [];
 otp_6115(Config) when is_list(Config) ->
-    case erlang:system_info(heap_type) of
-	hybrid -> {skip,"Hybrid-heap emulator doesn't keep track of funs"};
-	_ -> otp_6115_1(Config)
-    end.
-
-otp_6115_1(Config) ->
     ?line {ok, CWD} = file:get_cwd(),
     ?line Dir = filename:join(?config(data_dir, Config), otp_6115),
     ?line ok = file:set_cwd(Dir),
@@ -1245,4 +1351,4 @@ is_unloaded(What) ->
     end.
 
 check_f_calls(F1,F2) ->
-    {ok,[{{f,f1,0},F1},{{f,f2,0},F2}]} = cover:analyse(f,calls,function).
+    {ok,[{{f,f1,0},F1},{{f,f2,0},F2}|_]} = cover:analyse(f,calls,function).
diff --git a/lib/tools/test/cover_SUITE_data/f.erl b/lib/tools/test/cover_SUITE_data/f.erl
index 1ef8bbdb49..ce2963014a 100644
--- a/lib/tools/test/cover_SUITE_data/f.erl
+++ b/lib/tools/test/cover_SUITE_data/f.erl
@@ -1,5 +1,5 @@
 -module(f).
--export([f1/0,f2/0]).
+-export([f1/0,f2/0,call_f2_when_isolated/0]).
 
 f1() ->
     f1_line1,
@@ -8,3 +8,12 @@ f1() ->
 f2() ->
     f2_line1,
     f2_line2.
+
+call_f2_when_isolated() ->
+    case nodes() of
+	[] ->
+	    f2();
+	_ ->
+	    timer:sleep(100),
+	    call_f2_when_isolated()
+    end.
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index 78e49044a5..fd3e111d8d 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -53,7 +53,7 @@
 	 analyze/1, basic/1, md/1, q/1, variables/1, unused_locals/1]).
 
 -export([
-	 format_error/1, otp_7423/1, otp_7831/1]).
+	 format_error/1, otp_7423/1, otp_7831/1, otp_10192/1]).
 
 -import(lists, [append/2, flatten/1, keysearch/3, member/2, sort/1, usort/1]).
 
@@ -86,7 +86,7 @@ groups() ->
        fun_mfa_r14, fun_mfa_vars, qlc]},
      {analyses, [],
       [analyze, basic, md, q, variables, unused_locals]},
-     {misc, [], [format_error, otp_7423, otp_7831]}].
+     {misc, [], [format_error, otp_7423, otp_7831, otp_10192]}].
 
 init_per_suite(Config) ->
     init(Config).
@@ -2515,6 +2515,18 @@ otp_7831(Conf) when is_list(Conf) ->
     ?line xref:stop(Pid2),
     ok.
 
+otp_10192(suite) -> [];
+otp_10192(doc) ->
+    ["OTP-10192. Allow filenames with character codes greater than 126."];
+otp_10192(Conf) when is_list(Conf) ->
+    PrivDir = ?privdir,
+    {ok, _Pid} = xref:start(s),
+    Dir = filename:join(PrivDir, "�"),
+    ok = file:make_dir(Dir),
+    {ok, []} = xref:add_directory(s, Dir),
+    xref:stop(s),
+    ok.
+
 %%%
 %%% Utilities
 %%%
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index 30a6d282fe..788ee12900 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 2.6.7
+TOOLS_VSN = 2.6.8
diff --git a/lib/tv/doc/src/Makefile b/lib/tv/doc/src/Makefile
index 21478d0931..413eb8f634 100644
--- a/lib/tv/doc/src/Makefile
+++ b/lib/tv/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -125,14 +125,14 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/tv/doc/src/notes.xml b/lib/tv/doc/src/notes.xml
index 9217c018e9..fa72dd23a9 100644
--- a/lib/tv/doc/src/notes.xml
+++ b/lib/tv/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tv/priv/Makefile b/lib/tv/priv/Makefile
index 69e3e32c8a..679a76fe88 100644
--- a/lib/tv/priv/Makefile
+++ b/lib/tv/priv/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -64,8 +64,8 @@ clean:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) $(TOOLBAR_FILES) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) $(TOOLBAR_FILES) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/tv/src/Makefile b/lib/tv/src/Makefile
index 457b9d38c4..da1713e156 100644
--- a/lib/tv/src/Makefile
+++ b/lib/tv/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -126,10 +126,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile
index 620b3ebb69..1f94d8fdc8 100644
--- a/lib/typer/src/Makefile
+++ b/lib/typer/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2006-2011. All Rights Reserved.
+# Copyright Ericsson AB 2006-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -101,10 +101,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(YRL_FILES) \
-		$(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
+		"$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
diff --git a/lib/typer/src/typer.erl b/lib/typer/src/typer.erl
index 6392f5765f..0ace1d5fb8 100644
--- a/lib/typer/src/typer.erl
+++ b/lib/typer/src/typer.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -83,6 +83,7 @@ start() ->
   {Args, Analysis} = process_cl_args(),
   %% io:format("Args: ~p\n", [Args]),
   %% io:format("Analysis: ~p\n", [Analysis]),
+  Timer = dialyzer_timing:init(false),
   TrustedFiles = filter_fd(Args#args.trusted, [], fun is_erl_file/1),
   Analysis2 = extract(Analysis, TrustedFiles),
   All_Files = get_all_files(Args),
@@ -91,6 +92,7 @@ start() ->
   Analysis4 = collect_info(Analysis3),
   %% io:format("Final: ~p\n", [Analysis4#analysis.fms]),
   TypeInfo = get_type_info(Analysis4),
+  dialyzer_timing:stop(Timer),
   show_or_annotate(TypeInfo),
   %% io:format("\nTyper analysis finished\n"),
   erlang:halt(0).
@@ -181,7 +183,6 @@ get_type_info(#analysis{callgraph = CallGraph,
 
 remove_external(CallGraph, PLT) ->
   {StrippedCG0, Ext} = dialyzer_callgraph:remove_external(CallGraph),
-  StrippedCG = dialyzer_callgraph:finalize(StrippedCG0),
   case get_external(Ext, PLT) of
     [] -> ok;
     Externals ->
@@ -192,7 +193,7 @@ remove_external(CallGraph, PLT) ->
         _ -> msg(io_lib:format(" Unknown types: ~p\n", [ExtTypes]))
       end
   end,
-  StrippedCG.
+  StrippedCG0.
 
 -spec get_external([{mfa(), mfa()}], plt()) -> [mfa()].
 
@@ -901,8 +902,9 @@ analyze_core_tree(Core, Records, SpecInfo, CbInfo, ExpTypes, Analysis, File) ->
   MergedExpTypes = sets:union(ExpTypes, OldExpTypes),
   CS6 = dialyzer_codeserver:insert_temp_exported_types(MergedExpTypes, CS5),
   Ex_Funcs = [{0,F,A} || {_,_,{F,A}} <- cerl:module_exports(Tree)],
-  TmpCG = Analysis#analysis.callgraph,
-  CG = dialyzer_callgraph:scan_core_tree(Tree, TmpCG),
+  CG = Analysis#analysis.callgraph,
+  {V, E} = dialyzer_callgraph:scan_core_tree(Tree, CG),
+  dialyzer_callgraph:add_edges(E, V, CG),
   Fun = fun analyze_one_function/2,
   All_Defs = cerl:module_defs(Tree),
   Acc = lists:foldl(Fun, #tmpAcc{file = File, module = Module}, All_Defs),
@@ -1005,7 +1007,7 @@ msg(Msg) ->
       port_command(P, Msg),
       true = port_close(P),
       ok;
-    _ ->  % win32, vxworks
+    _ ->  % win32
       io:format("~s", [Msg])
   end.
 
diff --git a/lib/typer/vsn.mk b/lib/typer/vsn.mk
index 85a7c01424..18e328afc1 100644
--- a/lib/typer/vsn.mk
+++ b/lib/typer/vsn.mk
@@ -1 +1 @@
-TYPER_VSN = 0.9.3
+TYPER_VSN = 0.9.4
diff --git a/lib/webtool/doc/src/Makefile b/lib/webtool/doc/src/Makefile
index 7b86752738..32269e9424 100644
--- a/lib/webtool/doc/src/Makefile
+++ b/lib/webtool/doc/src/Makefile
@@ -112,16 +112,16 @@ debug opt:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DATA) $(MAN1_FILES) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DATA) $(MAN1_FILES) "$(RELEASE_PATH)/man/man1"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/webtool/priv/Makefile b/lib/webtool/priv/Makefile
index 6e1c6606fe..6af997c2bb 100644
--- a/lib/webtool/priv/Makefile
+++ b/lib/webtool/priv/Makefile
@@ -67,14 +67,14 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/priv
-	$(INSTALL_DIR)  $(RELSYSDIR)/priv/root
-	$(INSTALL_DIR)  $(RELSYSDIR)/priv/root/conf
-	$(INSTALL_DIR)  $(RELSYSDIR)/priv/root/doc
-	$(INSTALL_DATA) $(HTDOCS_FILES) $(RELSYSDIR)/priv/root/doc
-	$(INSTALL_DATA) $(WEBSERVER_CONFIG_FILES) $(RELSYSDIR)/priv/root/conf
-	$(INSTALL_DIR)  $(RELSYSDIR)/priv/bin
-	$(INSTALL_SCRIPT)  $(SCRIPTS) $(RELSYSDIR)/priv/bin
+	$(INSTALL_DIR)  "$(RELSYSDIR)/priv"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/root"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/root/conf"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/root/doc"
+	$(INSTALL_DATA) $(HTDOCS_FILES) "$(RELSYSDIR)/priv/root/doc"
+	$(INSTALL_DATA) $(WEBSERVER_CONFIG_FILES) "$(RELSYSDIR)/priv/root/conf"
+	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/bin"
+	$(INSTALL_SCRIPT)  $(SCRIPTS) "$(RELSYSDIR)/priv/bin"
 
 release_docs_spec:
 
diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile
index 62845cd370..783ffad79a 100644
--- a/lib/webtool/src/Makefile
+++ b/lib/webtool/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -87,11 +87,11 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
-		$(RELSYSDIR)/ebin
+		"$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/wx/aclocal.m4 b/lib/wx/aclocal.m4
index 339a15a2bb..9578cd35c4 100644
--- a/lib/wx/aclocal.m4
+++ b/lib/wx/aclocal.m4
@@ -1,7 +1,7 @@
 dnl
 dnl %CopyrightBegin%
 dnl
-dnl Copyright Ericsson AB 1998-2011. All Rights Reserved.
+dnl Copyright Ericsson AB 1998-2012. All Rights Reserved.
 dnl
 dnl The contents of this file are subject to the Erlang Public License,
 dnl Version 1.1, (the "License"); you may not use this file except in
@@ -59,6 +59,7 @@ AC_ARG_VAR(erl_xcomp_isysroot, [Absolute cross system root include path (only us
 
 dnl Cross compilation variables
 AC_ARG_VAR(erl_xcomp_bigendian, [big endian system: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_double_middle_endian, [double-middle-endian system: yes|no (only used when cross compiling)])
 AC_ARG_VAR(erl_xcomp_linux_clock_gettime_correction, [clock_gettime() can be used for time correction: yes|no (only used when cross compiling)])
 AC_ARG_VAR(erl_xcomp_linux_nptl, [have Native POSIX Thread Library: yes|no (only used when cross compiling)])
 AC_ARG_VAR(erl_xcomp_linux_usable_sigusrx, [SIGUSR1 and SIGUSR2 can be used: yes|no (only used when cross compiling)])
@@ -606,6 +607,103 @@ ifelse([$5], , , [$5
 fi
 ])
 
+dnl ----------------------------------------------------------------------
+dnl
+dnl AC_DOUBLE_MIDDLE_ENDIAN
+dnl
+dnl Checks whether doubles are represented in "middle-endian" format.
+dnl Sets ac_cv_double_middle_endian={no,yes,unknown} accordingly,
+dnl as well as DOUBLE_MIDDLE_ENDIAN.
+dnl
+dnl
+
+AC_DEFUN([AC_C_DOUBLE_MIDDLE_ENDIAN],
+[AC_CACHE_CHECK(whether double word ordering is middle-endian, ac_cv_c_double_middle_endian,
+[# It does not; compile a test program.
+AC_RUN_IFELSE(
+[AC_LANG_SOURCE([[#include <stdlib.h>
+
+int
+main(void)
+{
+  int i = 0;
+  int zero = 0;
+  int bigendian;
+  int zero_index = 0;
+
+  union
+  {
+    long int l;
+    char c[sizeof (long int)];
+  } u;
+
+  /* we'll use the one with 32-bit words */
+  union
+  {
+    double d;
+    unsigned int c[2];
+  } vint;
+
+  union
+  {
+    double d;
+    unsigned long c[2];
+  } vlong;
+
+  union
+  {
+    double d;
+    unsigned short c[2];
+  } vshort;
+
+
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  u.l = 1;
+  bigendian = (u.c[sizeof (long int) - 1] == 1);
+
+  zero_index = bigendian ? 1 : 0;
+
+  vint.d = 1.0;
+  vlong.d = 1.0;
+  vshort.d = 1.0;
+
+  if (sizeof(unsigned int) == 4)
+    {
+      if (vint.c[zero_index] != 0)
+	zero = 1;
+    }
+  else if (sizeof(unsigned long) == 4)
+    {
+      if (vlong.c[zero_index] != 0)
+	zero = 1;
+    }
+  else if (sizeof(unsigned short) == 4)
+    {
+      if (vshort.c[zero_index] != 0)
+	zero = 1;
+    }
+
+  exit (zero);
+}
+]])],
+	      [ac_cv_c_double_middle_endian=no],
+	      [ac_cv_c_double_middle_endian=yes],
+	      [ac_cv_c_double_middle=unknown])])
+case $ac_cv_c_double_middle_endian in
+  yes)
+    m4_default([$1],
+      [AC_DEFINE([DOUBLE_MIDDLE_ENDIAN], 1,
+	[Define to 1 if your processor stores the words in a double in
+	 middle-endian format (like some ARMs).])]) ;;
+  no)
+    $2 ;;
+  *)
+    m4_default([$3],
+      [AC_MSG_WARN([unknown double endianness
+presetting ac_cv_c_double_middle_endian=no (or yes) will help])]) ;;
+esac
+])# AC_C_DOUBLE_MIDDLE_ENDIAN
+
 
 dnl ----------------------------------------------------------------------
 dnl
@@ -642,11 +740,16 @@ dnl Try to find POSIX threads
 dnl The usual pthread lib...
     AC_CHECK_LIB(pthread, pthread_create, THR_LIBS="-lpthread")
 
-dnl FreeBSD has pthreads in special c library, c_r...
+dnl Very old versions of FreeBSD have pthreads in special c library, c_r...
     if test "x$THR_LIBS" = "x"; then
 	AC_CHECK_LIB(c_r, pthread_create, THR_LIBS="-lc_r")
     fi
 
+dnl QNX has pthreads in standard C library
+    if test "x$THR_LIBS" = "x"; then
+	AC_CHECK_FUNC(pthread_create, THR_LIBS="none_needed")
+    fi
+
 dnl On ofs1 the '-pthread' switch should be used
     if test "x$THR_LIBS" = "x"; then
 	AC_MSG_CHECKING([if the '-pthread' switch can be used])
@@ -667,6 +770,9 @@ dnl On ofs1 the '-pthread' switch should be used
     if test "x$THR_LIBS" != "x"; then
 	THR_DEFS="$THR_DEFS -D_THREAD_SAFE -D_REENTRANT -DPOSIX_THREADS"
 	THR_LIB_NAME=pthread
+	if test "x$THR_LIBS" = "xnone_needed"; then
+	    THR_LIBS=
+	fi
 	case $host_os in
 	    solaris*)
 		THR_DEFS="$THR_DEFS -D_POSIX_PTHREAD_SEMANTICS" ;;
@@ -1337,6 +1443,14 @@ if test "$ac_cv_c_bigendian" = "yes"; then
     AC_DEFINE(ETHR_BIGENDIAN, 1, [Define if bigendian])
 fi
 
+case X$erl_xcomp_double_middle_endian in
+    X) ;;
+    Xyes|Xno|Xunknown) ac_cv_c_double_middle_endian=$erl_xcomp_double_middle_endian;;
+    *) AC_MSG_ERROR([Bad erl_xcomp_double_middle_endian value: $erl_xcomp_double_middle_endian]);;
+esac
+
+AC_C_DOUBLE_MIDDLE_ENDIAN
+
 AC_ARG_ENABLE(native-ethr-impls,
 	      AS_HELP_STRING([--disable-native-ethr-impls],
                              [disable native ethread implementations]),
diff --git a/lib/wx/api_gen/wx_extra/wxEvtHandler.erl b/lib/wx/api_gen/wx_extra/wxEvtHandler.erl
index 23a34225ca..c5802af679 100644
--- a/lib/wx/api_gen/wx_extra/wxEvtHandler.erl
+++ b/lib/wx/api_gen/wx_extra/wxEvtHandler.erl
@@ -61,7 +61,7 @@ connect(This, EventType) ->
 %%    {userData, term()}    An erlang term that will be sent with the event. Default: [].
 -spec connect(This::wxEvtHandler(), EventType::wxEventType(), [Option]) -> ok when
       Option :: {id, integer()} | {lastId, integer()} | {skip, boolean()} |
-		{callback, function()} | {userData, term()}.
+		callback | {callback, function()} | {userData, term()}.
 connect(This=#wx_ref{type=ThisT}, EventType, Options) ->
     EvH = parse_opts(Options, #evh{et=EventType}),
     ?CLASS(ThisT,wxEvtHandler),
diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in
index ce7f4bf53e..1497ac4d16 100644
--- a/lib/wx/c_src/Makefile.in
+++ b/lib/wx/c_src/Makefile.in
@@ -176,10 +176,10 @@ $(TARGET_DIR)/erl_gl$(SO_EXT): $(GL_OBJECTS)
 # ----------------------------------------------------
 include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv
-	$(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/
-	$(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/
-	$(INSTALL_PROGRAM) $(TARGET_DIR)/wxe_driver$(SO_EXT) $(RELSYSDIR)/priv/
-	$(INSTALL_PROGRAM) $(TARGET_DIR)/erl_gl$(SO_EXT) $(RELSYSDIR)/priv/
+	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(INSTALL_DATA) ../priv/erlang-logo32.png "$(RELSYSDIR)/priv/"
+	$(INSTALL_DATA) ../priv/erlang-logo64.png "$(RELSYSDIR)/priv/"
+	$(INSTALL_PROGRAM) $(TARGET_DIR)/wxe_driver$(SO_EXT) "$(RELSYSDIR)/priv/"
+	$(INSTALL_PROGRAM) $(TARGET_DIR)/erl_gl$(SO_EXT) "$(RELSYSDIR)/priv/"
 
 release_docs_spec:
diff --git a/lib/wx/configure.in b/lib/wx/configure.in
index b27e114a3d..7b35fed672 100755
--- a/lib/wx/configure.in
+++ b/lib/wx/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*-
 
 dnl %CopyrightBegin%
 dnl
-dnl Copyright Ericsson AB 2008-2011. All Rights Reserved.
+dnl Copyright Ericsson AB 2008-2012. All Rights Reserved.
 dnl
 dnl The contents of this file are subject to the Erlang Public License,
 dnl Version 1.1, (the "License"); you may not use this file except in
@@ -571,7 +571,7 @@ if test X"$WX_HAVE_STATIC_LIBS" = X"true" ; then
    LIBS=$WX_LIBS_STATIC   
 fi
 
-AC_LINK_IFELSE([
+AC_LINK_IFELSE([AC_LANG_SOURCE([
 		#ifdef WIN32
 		# include <windows.h>
 	        # include <gl/gl.h>
@@ -583,6 +583,7 @@ AC_LINK_IFELSE([
                 #include "wx/wx.h"
 		#include "wx/stc/stc.h"
 		#include "wx/glcanvas.h"
+		])
 
 		class MyApp : public wxApp
 		{
diff --git a/lib/wx/doc/src/Makefile b/lib/wx/doc/src/Makefile
index 834f887076..4e6727b6a6 100644
--- a/lib/wx/doc/src/Makefile
+++ b/lib/wx/doc/src/Makefile
@@ -95,13 +95,13 @@ ref_man.xml: ref_man.xml.src
 	@echo "</application>" >> ref_man.xml
 	@echo
 
-$(ErlMods:%.erl=%.xml):
+$(ErlMods:%.erl=%.xml): ../../src/$(@:%.xml=%.erl)
 	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(VSN) -preprocess true -sort_functions false ../../src/$(@:%.xml=%.erl)
 
-$(GenMods:%.erl=%.xml):
+$(GenMods:%.erl=%.xml): ../../src/gen/$(@:%.xml=%.erl)
 	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(VSN) -i ../../src -preprocess true -sort_functions false ../../src/gen/$(@:%.xml=%.erl)
 
-$(XML_CHAPTER_FILES):
+$(XML_CHAPTER_FILES): ../overview.edoc
 	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(VSN) -chapter ../overview.edoc
 
 debug opt:
@@ -120,14 +120,14 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/*  \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 1ba7e62d7d..95036bd7f0 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2009</year><year>2011</year>
+      <year>2009</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/wx/examples/demo/Makefile b/lib/wx/examples/demo/Makefile
index 872723fb98..c60e9c3d50 100644
--- a/lib/wx/examples/demo/Makefile
+++ b/lib/wx/examples/demo/Makefile
@@ -69,7 +69,7 @@ docs:
 run: opt
 	erl -smp -detached -pa $(TOPDIR)/ebin -s demo
 
-EXRELSYSDIR = $(RELSYSDIR)/examples/demo
+EXRELSYSDIR = "$(RELSYSDIR)/examples/demo"
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 docs:
diff --git a/lib/wx/examples/simple/Makefile b/lib/wx/examples/simple/Makefile
index 0178aea890..3f2bf01556 100644
--- a/lib/wx/examples/simple/Makefile
+++ b/lib/wx/examples/simple/Makefile
@@ -40,7 +40,7 @@ docs:
 run: opt
 	erl -smp -detached -pa $(TOPDIR)/ebin -s hello
 
-EXRELSYSDIR = $(RELSYSDIR)/examples/simple
+EXRELSYSDIR = "$(RELSYSDIR)/examples/simple"
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 docs:
diff --git a/lib/wx/examples/sudoku/Makefile b/lib/wx/examples/sudoku/Makefile
index 89919ff50c..ec900f37e2 100644
--- a/lib/wx/examples/sudoku/Makefile
+++ b/lib/wx/examples/sudoku/Makefile
@@ -40,7 +40,7 @@ docs:
 run: opt
 	erl -smp -detached -pa $(TOPDIR)/ebin -s sudoku
 
-EXRELSYSDIR = $(RELSYSDIR)/examples/sudoku
+EXRELSYSDIR = "$(RELSYSDIR)/examples/sudoku"
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 docs:
diff --git a/lib/wx/examples/xrc/Makefile b/lib/wx/examples/xrc/Makefile
index 341fdbb2cc..9a976628a7 100644
--- a/lib/wx/examples/xrc/Makefile
+++ b/lib/wx/examples/xrc/Makefile
@@ -49,7 +49,7 @@ docs:
 run: opt
 	erl -smp -detached -pa $(TOPDIR)/ebin -s xrc 
 
-EXRELSYSDIR = $(RELSYSDIR)/examples/xrc
+EXRELSYSDIR = "$(RELSYSDIR)/examples/xrc"
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 docs: 
diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
index 16b425e6f0..777fb7d998 100644
--- a/lib/wx/src/Makefile
+++ b/lib/wx/src/Makefile
@@ -120,15 +120,15 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES)
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt 
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/src/gen
-	$(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) $(RELSYSDIR)/src/gen
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXT_HRL) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src/gen"
+	$(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) "$(RELSYSDIR)/src/gen"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 #	$(INSTALL_DATA) ../$(ARCHIVE) $(RELEASE_PATH)/lib
 
 release_docs_spec:
diff --git a/lib/wx/src/gen/wxEvtHandler.erl b/lib/wx/src/gen/wxEvtHandler.erl
index cf4a72da5a..22c203392c 100644
--- a/lib/wx/src/gen/wxEvtHandler.erl
+++ b/lib/wx/src/gen/wxEvtHandler.erl
@@ -80,7 +80,7 @@ connect(This, EventType) ->
 %%    {userData, term()}    An erlang term that will be sent with the event. Default: [].
 -spec connect(This::wxEvtHandler(), EventType::wxEventType(), [Option]) -> ok when
       Option :: {id, integer()} | {lastId, integer()} | {skip, boolean()} |
-		{callback, function()} | {userData, term()}.
+		callback | {callback, function()} | {userData, term()}.
 connect(This=#wx_ref{type=ThisT}, EventType, Options) ->
     EvH = parse_opts(Options, #evh{et=EventType}),
     ?CLASS(ThisT,wxEvtHandler),
diff --git a/lib/wx/src/wx.erl b/lib/wx/src/wx.erl
index 7d62305048..2a4b18d101 100644
--- a/lib/wx/src/wx.erl
+++ b/lib/wx/src/wx.erl
@@ -102,12 +102,18 @@ new() ->
 
 %% @doc Starts a wx server.
 %% Option may be {debug, Level}, see debug/1.
--spec new([Option]) -> wx_object() when Option :: {debug, list() | atom()}.
+%% Or {silent_start, Bool}, which causes error messages at startup to
+%% be suppressed. The latter can be used as a silent test of whether
+%% wx is properly installed or not.
+-spec new([Option]) -> wx_object() when Option :: {debug, list() | atom()} |
+                                                  {silent_start, boolean()}.
 new(Options) when is_list(Options) ->
-    #wx_env{port=Port} = wxe_server:start(),
-    put(opengl_port, Port),
     Debug = proplists:get_value(debug, Options, 0),
-    debug(Debug),
+    SilentStart = proplists:get_value(silent_start, Options, false),
+    Level = calc_level(Debug),
+    #wx_env{port=Port} = wxe_server:start(SilentStart andalso Level =:= 0),
+    put(opengl_port, Port),
+    set_debug(Level),
     null().
 
 %% @doc Stops a wx server.
@@ -282,13 +288,16 @@ release_memory(Bin) when is_binary(Bin) ->
 -spec debug(Level | [Level]) -> ok
      when Level :: none | verbose | trace | driver | integer().
 
-debug(none) -> debug(0);
-debug(verbose) -> debug(1);
-debug(trace) -> debug(2);
-debug(driver) -> debug(16);
-debug([]) -> debug(0);
+debug(Debug) ->
+    Level = calc_level(Debug),
+    set_debug(Level).
 
-debug(List) when is_list(List) ->
+calc_level(none) -> calc_level(0);
+calc_level(verbose) -> calc_level(1);
+calc_level(trace) -> calc_level(2);
+calc_level(driver) -> calc_level(16);
+calc_level([]) -> calc_level(0);
+calc_level(List) when is_list(List) ->
     {Drv,Erl} =
 	lists:foldl(fun(verbose, {Drv,_Erl}) ->
 			    {Drv,1};
@@ -297,8 +306,11 @@ debug(List) when is_list(List) ->
 		       (driver, {_Drv,Erl}) ->
 			    {16, Erl}
 		    end, {0,0}, List),
-    debug(Drv + Erl);
-debug(Level) when is_integer(Level) ->
+    Drv + Erl;
+calc_level(Level) when is_integer(Level) ->
+    Level.
+
+set_debug(Level) when is_integer(Level) ->
     case get(?WXE_IDENTIFIER) of
 	undefined -> erlang:error({wxe,unknown_port});
 	#wx_env{debug=Old} when Old =:= Level -> ok;
diff --git a/lib/wx/src/wxe_master.erl b/lib/wx/src/wxe_master.erl
index ac6e4a56e6..b98a7c793e 100644
--- a/lib/wx/src/wxe_master.erl
+++ b/lib/wx/src/wxe_master.erl
@@ -28,7 +28,7 @@
 -behaviour(gen_server).
 
 %% API
--export([start/0, init_port/0, init_opengl/0]).
+-export([start/1, init_port/1, init_opengl/0]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -47,20 +47,20 @@
 %% API
 %%====================================================================
 %%--------------------------------------------------------------------
-%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+%% Function: start(SilentStart) -> {ok,Pid} | ignore | {error,Error}
 %% Description: Starts the server
 %%--------------------------------------------------------------------
-start() ->
-    gen_server:start({local, ?MODULE}, ?MODULE, [], []).
+start(SilentStart) ->
+    gen_server:start({local, ?MODULE}, ?MODULE, [SilentStart], []).
 
 %%--------------------------------------------------------------------
-%% Function: init_port() -> {UserPort,CallBackPort} | error(Error)
+%% Function: init_port(SilentStart) -> {UserPort,CallBackPort} | error(Error)
 %% Description: Creates the port
 %%--------------------------------------------------------------------
-init_port() ->
+init_port(SilentStart) ->
     case whereis(?MODULE) of
 	undefined ->
-	    case start() of
+	    case start(SilentStart) of
 		{ok,Pid} -> Pid;
 		{error,{already_started,Pid}} -> Pid;
 		{error, {Reason,Stack}} ->
@@ -93,14 +93,17 @@ init_opengl() ->
 %%                         {stop, Reason}
 %% Description: Initiates the server
 %%--------------------------------------------------------------------
-init([]) ->
+init([SilentStart]) ->
     DriverName = ?DRIVER,
-    PrivDir = wxe_util:priv_dir(?DRIVER),
+    PrivDir = wxe_util:priv_dir(?DRIVER, SilentStart),
     erlang:group_leader(whereis(init), self()),
     case catch erlang:system_info(smp_support) of
 	true -> ok;
 	_ -> 
-	    error_logger:format("WX ERROR: SMP emulator required (start with erl -smp)", []),
+	    wxe_util:opt_error_log(SilentStart,
+                                   "WX ERROR: SMP emulator required"
+                                   " (start with erl -smp)",
+                                   []),
 	    erlang:error(not_smp)
     end,
 
@@ -114,7 +117,9 @@ init([]) ->
     case erl_ddll:load_driver(PrivDir,DriverName) of
 	ok -> ok;
 	{error, What} -> 
-	    error_logger:format("WX Failed loading ~p@~p ~n", [DriverName,PrivDir]),
+	    wxe_util:opt_error_log(SilentStart,
+                                   "WX Failed loading ~p@~p ~n",
+                                   [DriverName,PrivDir]),
 	    Str = erl_ddll:format_error(What),
 	    erlang:error({load_driver,Str})
     end,
@@ -210,4 +215,3 @@ debug_ping(Port) ->
     _R = (catch erlang:port_call(Port, 0, [])),
 %%    io:format("Erlang ping ~p ~n", [_R]),
     debug_ping(Port).
-
diff --git a/lib/wx/src/wxe_server.erl b/lib/wx/src/wxe_server.erl
index 6e982c97f6..689fe16a70 100644
--- a/lib/wx/src/wxe_server.erl
+++ b/lib/wx/src/wxe_server.erl
@@ -29,7 +29,7 @@
 -behaviour(gen_server).
 
 %% API
--export([start/0, stop/0, register_me/1, set_debug/2, invoke_callback/1]).
+-export([start/1, stop/0, register_me/1, set_debug/2, invoke_callback/1]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -49,13 +49,13 @@
 %% API
 %%====================================================================
 %%--------------------------------------------------------------------
-%% Function: start() -> #wx_env{}
+%% Function: start(SilentStart) -> #wx_env{}
 %% Description: Starts the server
 %%--------------------------------------------------------------------
-start() ->
+start(SilentStart) ->
     case get(?WXE_IDENTIFIER) of
 	undefined ->
-	    case gen_server:start(?MODULE, [], []) of
+	    case gen_server:start(?MODULE, [SilentStart], []) of
 		{ok, Pid}  ->
 		    {ok, Port} = gen_server:call(Pid, get_port, infinity),
 		    wx:set_env(Env = #wx_env{port=Port,sv=Pid}),
@@ -69,7 +69,7 @@ start() ->
 		    Env;
 		false ->  %% Ok we got an old wx env, someone forgot
 		    erase(?WXE_IDENTIFIER),  %% to call wx:destroy()
-		    start()
+		    start(SilentStart)
 	    end
     end.
 
@@ -88,8 +88,8 @@ set_debug(Pid, Level) ->
 %% gen_server callbacks
 %%====================================================================
 
-init([]) ->
-    {Port,CBPort} = wxe_master:init_port(),
+init([SilentStart]) ->
+    {Port,CBPort} = wxe_master:init_port(SilentStart),
     put(?WXE_IDENTIFIER, #wx_env{port=Port,sv=self()}),
     {ok,#state{port=Port, cb_port=CBPort,
 	       users=gb_trees:empty(), cb=gb_trees:empty(), cb_cnt=1}}.
diff --git a/lib/wx/src/wxe_util.erl b/lib/wx/src/wxe_util.erl
index 02bca62486..3022b7f3f2 100644
--- a/lib/wx/src/wxe_util.erl
+++ b/lib/wx/src/wxe_util.erl
@@ -32,7 +32,7 @@
 	 get_const/1,colour_bin/1,datetime_bin/1,
 	 to_bool/1,from_bool/1]).
 
--export([wxgl_dl/0, priv_dir/1]).
+-export([wxgl_dl/0, priv_dir/2, opt_error_log/3]).
 
 -include("wxe.hrl").
 
@@ -205,7 +205,7 @@ check_previous() ->
 
 wxgl_dl() ->
     DynLib0 = "erl_gl",
-    PrivDir = priv_dir(DynLib0),
+    PrivDir = priv_dir(DynLib0, false),
     DynLib = case os:type() of
 		 {win32,_} ->
 		     DynLib0 ++ ".dll";
@@ -214,7 +214,7 @@ wxgl_dl() ->
 	     end,
     filename:join(PrivDir, DynLib).
 
-priv_dir(Driver0) ->
+priv_dir(Driver0, Silent) ->
     {file, Path} = code:is_loaded(?MODULE),
     Priv = case filelib:is_regular(Path) of
 	       true ->
@@ -229,13 +229,13 @@ priv_dir(Driver0) ->
 		 _ ->
 		     Driver0 ++ ".so"
 	     end,
-
     case file:read_file_info(filename:join(Priv, Driver)) of
 	{ok, _} ->
 	    Priv;
 	{error, _} ->
-	    error_logger:format("ERROR: Could not find \'~s\' in: ~s~n",
-				[Driver, Priv]),
+	    opt_error_log(Silent,
+                          "ERROR: Could not find \'~s\' in: ~s~n",
+                          [Driver, Priv]),
 	    erlang:error({load_driver, "No driver found"})
     end.
 
@@ -244,3 +244,7 @@ strip(Src, Src) ->
 strip([H|R], Src) ->
     [H| strip(R, Src)].
 
+opt_error_log(false, Format, Args) ->
+    error_logger:format(Format, Args);
+opt_error_log(true, _Format, _Args) ->
+    ok.
diff --git a/lib/wx/test/Makefile b/lib/wx/test/Makefile
index ac8a4bdd60..836885a308 100644
--- a/lib/wx/test/Makefile
+++ b/lib/wx/test/Makefile
@@ -53,8 +53,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: 
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) wx.spec wx.cover wx_test_lib.hrl $(ErlSrc) $(ErlTargets) $(RELSYSDIR)
-	$(INSTALL_SCRIPT) wxt $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) wx.spec wx.cover wx_test_lib.hrl $(ErlSrc) $(ErlTargets) "$(RELSYSDIR)"
+	$(INSTALL_SCRIPT) wxt "$(RELSYSDIR)"
 
 release_docs_spec:
diff --git a/lib/wx/test/wx_basic_SUITE.erl b/lib/wx/test/wx_basic_SUITE.erl
index 46c72bb453..20115a41fb 100644
--- a/lib/wx/test/wx_basic_SUITE.erl
+++ b/lib/wx/test/wx_basic_SUITE.erl
@@ -47,7 +47,7 @@ end_per_testcase(Func,Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [create_window, several_apps, wx_api, wx_misc,
+    [silent_start, create_window, several_apps, wx_api, wx_misc,
      data_types, wx_object].
 
 groups() -> 
@@ -62,6 +62,25 @@ end_per_group(_GroupName, Config) ->
   
 %% The test cases
 
+%% test silent start of wx
+silent_start(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
+silent_start(_Config) ->
+    ?mr(wx_ref, wx:new([])),
+    wx:destroy(),
+
+    ?mr(wx_ref, wx:new([{silent_start, true}])),
+    wx:destroy(),
+
+    ?mr(wx_ref, wx:new([{silent_start, true}, {debug, verbose}])),
+    wx:destroy(),
+
+    ?mr(wx_ref, wx:new([{silent_start, false}])),
+    wx:destroy(),
+
+    ?mr('EXIT', catch wx:new([{silent_start, foo}])),
+    
+    ok.
+
 %% create and test creating a window
 create_window(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 create_window(Config) ->
diff --git a/lib/xmerl/doc/src/Makefile b/lib/xmerl/doc/src/Makefile
index 100a2feb0a..6f95e30a28 100644
--- a/lib/xmerl/doc/src/Makefile
+++ b/lib/xmerl/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2010. All Rights Reserved.
+# Copyright Ericsson AB 2004-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -161,15 +161,15 @@ info:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(EXAMPLE_FILES) $(HTML_EXAMPLE_FILES) $(HTML_STYLESHEET_FILES) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
+		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(EXAMPLE_FILES) $(HTML_EXAMPLE_FILES) $(HTML_STYLESHEET_FILES) "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
 
 release_spec:
 
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 585d8bb688..056097ab2b 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,21 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a continuation bug when a new block of bytes is
+	    to be read during parsing of a default declaration. </p>
+          <p>
+	    Own Id: OTP-10063 Aux Id: seq12049 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile
index a5dbe45909..ce1aa11fba 100644
--- a/lib/xmerl/src/Makefile
+++ b/lib/xmerl/src/Makefile
@@ -214,14 +214,14 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) $(RELSYSDIR)/src
-	$(INSTALL_DATA) xmerl_xpath_parse.yrl $(RELSYSDIR)/src
-	$(INSTALL_DATA) xmerl_b64Bin.yrl $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) xmerl_xpath_parse.yrl "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) xmerl_b64Bin.yrl "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
 
diff --git a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
index df0970ef14..7b64d7c302 100644
--- a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
+++ b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
@@ -1,7 +1,7 @@
 %%-*-erlang-*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -155,16 +155,16 @@ parse_xml_decl(?BYTE_ORDER_MARK_2, State) ->
     cf(?BYTE_ORDER_MARK_2, State, fun parse_xml_decl/2);
 parse_xml_decl(?BYTE_ORDER_MARK_REST(Rest), State) ->
     cf(Rest, State, fun parse_xml_decl/2);
-parse_xml_decl(?STRING("<"), State) ->
-    cf(?STRING("<"), State, fun parse_xml_decl/2);
-parse_xml_decl(?STRING("<?"), State) ->
-    cf(?STRING("<?"), State, fun parse_xml_decl/2);
-parse_xml_decl(?STRING("<?x"), State) ->
-    cf(?STRING("<?x"), State, fun parse_xml_decl/2);
-parse_xml_decl(?STRING("<?xm"), State) ->
-    cf(?STRING("<?xm"), State, fun parse_xml_decl/2);
-parse_xml_decl(?STRING("<?xml"), State) ->
-    cf(?STRING("<?xml"), State, fun parse_xml_decl/2);
+parse_xml_decl(?STRING("<") = Bytes, State) ->
+    cf(Bytes, State, fun parse_xml_decl/2);
+parse_xml_decl(?STRING("<?") = Bytes, State) ->
+    cf(Bytes, State, fun parse_xml_decl/2);
+parse_xml_decl(?STRING("<?x") = Bytes, State) ->
+    cf(Bytes, State, fun parse_xml_decl/2);
+parse_xml_decl(?STRING("<?xm") = Bytes, State) ->
+    cf(Bytes, State, fun parse_xml_decl/2);
+parse_xml_decl(?STRING("<?xml") = Bytes, State) ->
+    cf(Bytes, State, fun parse_xml_decl/2);
 parse_xml_decl(?STRING_REST("<?xml", Rest1), State) ->
     parse_xml_decl_1(Rest1, State);
 parse_xml_decl(Bytes, #xmerl_sax_parser_state{encoding=Enc} = State) when is_binary(Bytes) ->
@@ -204,8 +204,8 @@ parse_xml_decl_1(Bytes, State) ->
 %%----------------------------------------------------------------------
 parse_prolog(?STRING_EMPTY, State) ->
     cf(?STRING_EMPTY, State, fun parse_prolog/2);
-parse_prolog(?STRING("<"), State) ->
-    cf(?STRING("<"), State, fun parse_prolog/2);
+parse_prolog(?STRING("<") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog/2);
 parse_prolog(?STRING_REST("<?", Rest), State) ->
     {Rest1, State1} = parse_pi(Rest, State),
     parse_prolog(Rest1, State1);
@@ -223,18 +223,18 @@ parse_prolog(Bytes, State) ->
 
 parse_prolog_1(?STRING_EMPTY, State) ->
     cf(?STRING_EMPTY, State, fun parse_prolog_1/2);
-parse_prolog_1(?STRING("D"), State) ->
-    cf(?STRING("D"), State, fun parse_prolog_1/2);
-parse_prolog_1(?STRING("DO"), State) ->
-    cf(?STRING("DO"), State, fun parse_prolog_1/2);
-parse_prolog_1(?STRING("DOC"), State) ->
-    cf(?STRING("DOC"), State, fun parse_prolog_1/2);
-parse_prolog_1(?STRING("DOCT"), State) ->
-    cf(?STRING("DOCT"), State, fun parse_prolog_1/2);
-parse_prolog_1(?STRING("DOCTY"), State) ->
-    cf(?STRING("DOCTY"), State, fun parse_prolog_1/2);
-parse_prolog_1(?STRING("DOCTYP"), State) ->
-    cf(?STRING("DOCTYP"), State, fun parse_prolog_1/2);
+parse_prolog_1(?STRING("D") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog_1/2);
+parse_prolog_1(?STRING("DO") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog_1/2);
+parse_prolog_1(?STRING("DOC") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog_1/2);
+parse_prolog_1(?STRING("DOCT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog_1/2);
+parse_prolog_1(?STRING("DOCTY") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog_1/2);
+parse_prolog_1(?STRING("DOCTYP") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog_1/2);
 parse_prolog_1(?STRING_REST("DOCTYPE", Rest), State) ->
     {Rest1, State1} = parse_doctype(Rest, State),
     State2 = event_callback(endDTD, State1),
@@ -512,10 +512,10 @@ parse_ns_name(Bytes, State, Prefix, Name) ->
 %%----------------------------------------------------------------------
 parse_pi_data(?STRING_EMPTY, State, Acc) ->
     cf(?STRING_EMPTY, State, Acc, fun parse_pi_data/3);
-parse_pi_data(?STRING("?"), State, Acc) ->
-    cf(?STRING("?"), State, Acc, fun parse_pi_data/3);
-parse_pi_data(?STRING("\r"), State, Acc) ->
-    cf(?STRING("\r"), State, Acc, fun parse_pi_data/3);
+parse_pi_data(?STRING("?") = Bytes, State, Acc) ->
+    cf(Bytes, State, Acc, fun parse_pi_data/3);
+parse_pi_data(?STRING("\r") = Bytes, State, Acc) ->
+    cf(Bytes, State, Acc, fun parse_pi_data/3);
 parse_pi_data(?STRING_REST("?>", Rest), State, Acc) ->
     {lists:reverse(Acc), Rest, State};
 parse_pi_data(?STRING_REST("\n", Rest), #xmerl_sax_parser_state{line_no=N} = State, Acc) ->
@@ -544,23 +544,23 @@ parse_pi_data(Bytes, State, Acc) ->
 %%----------------------------------------------------------------------
 parse_cdata(?STRING_EMPTY, State) -> 
     cf(?STRING_EMPTY, State, fun parse_cdata/2);
-parse_cdata(?STRING("["), State) -> 
-    cf(?STRING("["), State, fun parse_cdata/2);
-parse_cdata(?STRING("[C"), State) -> 
-    cf(?STRING("[C"), State, fun parse_cdata/2);
-parse_cdata(?STRING("[CD"), State) -> 
-    cf(?STRING("[CD"), State, fun parse_cdata/2);
-parse_cdata(?STRING("[CDA"), State) -> 
-    cf(?STRING("[CDA"), State, fun parse_cdata/2);
-parse_cdata(?STRING("[CDAT"), State) -> 
-    cf(?STRING("[CDAT"), State, fun parse_cdata/2);
-parse_cdata(?STRING("[CDATA"), State) -> 
-    cf(?STRING("[CDATA"), State, fun parse_cdata/2);
-parse_cdata(?STRING_REST("[CDATA[", Rest), State) -> 
-    State1 = event_callback(startCDATA, State),	    
+parse_cdata(?STRING("[") = Bytes, State) ->
+    cf(Bytes, State, fun parse_cdata/2);
+parse_cdata(?STRING("[C") = Bytes, State) ->
+    cf(Bytes, State, fun parse_cdata/2);
+parse_cdata(?STRING("[CD") = Bytes, State) ->
+    cf(Bytes, State, fun parse_cdata/2);
+parse_cdata(?STRING("[CDA") = Bytes, State) ->
+    cf(Bytes, State, fun parse_cdata/2);
+parse_cdata(?STRING("[CDAT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_cdata/2);
+parse_cdata(?STRING("[CDATA") = Bytes, State) ->
+    cf(Bytes, State, fun parse_cdata/2);
+parse_cdata(?STRING_REST("[CDATA[", Rest), State) ->
+    State1 = event_callback(startCDATA, State),	   
     parse_cdata(Rest, State1, []);
-parse_cdata(Bytes, State) -> 
-    unicode_incomplete_check([Bytes, State, fun parse_cdata/2], 
+parse_cdata(Bytes, State) ->
+    unicode_incomplete_check([Bytes, State, fun parse_cdata/2],
 			     "expecting comment or CDATA").
 
 
@@ -574,12 +574,12 @@ parse_cdata(Bytes, State) ->
 %%----------------------------------------------------------------------
 parse_cdata(?STRING_EMPTY, State, Acc) -> 
     cf(?STRING_EMPTY, State, Acc, fun parse_cdata/3);
-parse_cdata(?STRING("\r"), State, Acc) -> 
-    cf(?STRING("\r"), State, Acc, fun parse_cdata/3);
-parse_cdata(?STRING("]"), State, Acc) -> 
-    cf(?STRING("]"), State, Acc, fun parse_cdata/3);
-parse_cdata(?STRING("]]"), State, Acc) -> 
-    cf(?STRING("]]"), State, Acc, fun parse_cdata/3);
+parse_cdata(?STRING("\r") = Bytes, State, Acc) -> 
+    cf(Bytes, State, Acc, fun parse_cdata/3);
+parse_cdata(?STRING("]") = Bytes, State, Acc) -> 
+    cf(Bytes, State, Acc, fun parse_cdata/3);
+parse_cdata(?STRING("]]") = Bytes, State, Acc) -> 
+    cf(Bytes, State, Acc, fun parse_cdata/3);
 parse_cdata(?STRING_REST("]]>", Rest), State, Acc) -> 
     State1 = event_callback({characters, lists:reverse(Acc)}, State),   
     State2 = event_callback(endCDATA, State1),	    
@@ -610,12 +610,12 @@ parse_cdata(Bytes, State, Acc) ->
 %%----------------------------------------------------------------------
 parse_comment(?STRING_EMPTY, State, Acc) -> 
     cf(?STRING_EMPTY, State, Acc, fun parse_comment/3);
-parse_comment(?STRING("\r"), State, Acc) -> 
-    cf(?STRING("\r"), State, Acc, fun parse_comment/3);
-parse_comment(?STRING("-"), State, Acc) -> 
-    cf(?STRING("-"), State, Acc, fun parse_comment/3);
-parse_comment(?STRING("--"), State, Acc) -> 
-    cf(?STRING("--"), State, Acc, fun parse_comment/3);
+parse_comment(?STRING("\r") = Bytes, State, Acc) -> 
+    cf(Bytes, State, Acc, fun parse_comment/3);
+parse_comment(?STRING("-") = Bytes, State, Acc) -> 
+    cf(Bytes, State, Acc, fun parse_comment/3);
+parse_comment(?STRING("--") = Bytes, State, Acc) -> 
+    cf(Bytes, State, Acc, fun parse_comment/3);
 parse_comment(?STRING_REST("-->", Rest), State, Acc) -> 
     State1 = event_callback({comment, lists:reverse(Acc)}, State),   
     {Rest, State1};
@@ -713,8 +713,8 @@ parse_stag(Bytes, State) ->
 %%----------------------------------------------------------------------
 parse_attributes(?STRING_EMPTY, State, CurrentTag) ->
     cf(?STRING_EMPTY, State, CurrentTag, fun parse_attributes/3);
-parse_attributes(?STRING("/"), State, CurrentTag) -> 
-    cf(?STRING("/"), State, CurrentTag, fun parse_attributes/3);
+parse_attributes(?STRING("/") = Bytes, State, CurrentTag) -> 
+    cf(Bytes, State, CurrentTag, fun parse_attributes/3);
 parse_attributes(?STRING_REST("/>", Rest), State, {Tag, AttList, NewNsList}) ->
     CompleteNsList =  NewNsList ++ State#xmerl_sax_parser_state.ns,
     {Uri, LocalName, QName, Attributes} = fix_ns(Tag, AttList, CompleteNsList),
@@ -911,20 +911,20 @@ parse_att_value(?STRING_EMPTY, State, undefined, Acc) ->
     {Acc, [], State}; %% stop clause when parsing references
 parse_att_value(?STRING_EMPTY, State, Stop, Acc) ->
     cf(?STRING_EMPTY, State, Stop, Acc, fun parse_att_value/4);
-parse_att_value(?STRING("\r"), State, Stop, Acc) ->
-    cf(?STRING("\r"), State, Stop, Acc, fun parse_att_value/4);
+parse_att_value(?STRING("\r") = Bytes, State, Stop, Acc) ->
+    cf(Bytes, State, Stop, Acc, fun parse_att_value/4);
 parse_att_value(?STRING_REST("\n", Rest), #xmerl_sax_parser_state{line_no=N} = State, Stop, Acc) -> 
     parse_att_value(Rest, 
-		   State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
+		    State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
 parse_att_value(?STRING_REST("\r\n", Rest), #xmerl_sax_parser_state{line_no=N} = State, Stop, Acc) -> 
     parse_att_value(Rest, 
-		   State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
+		    State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
 parse_att_value(?STRING_REST("\r", Rest), #xmerl_sax_parser_state{line_no=N} = State, Stop, Acc)  -> 
     parse_att_value(Rest, 
-		   State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
+		    State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
 parse_att_value(?STRING_REST("\t", Rest), #xmerl_sax_parser_state{line_no=N} = State, Stop, Acc)  -> 
     parse_att_value(Rest, 
-		   State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
+		    State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
 parse_att_value(?STRING_REST("&", Rest), State, Stop, Acc)  -> 
     {Ref, Rest1, State1} = parse_reference(Rest, State, true),
     case Ref of 
@@ -1046,17 +1046,17 @@ parse_content(?STRING_EMPTY, State, Acc, IgnorableWS) ->
 	Other ->
 	    throw(Other)
     end;
-parse_content(?STRING("\r"), State, Acc, IgnorableWS) ->
-    cf(?STRING("\r"), State, Acc, IgnorableWS, fun parse_content/4);
-parse_content(?STRING("<"), State, Acc, IgnorableWS) ->	
-    cf(?STRING("<"), State, Acc, IgnorableWS, fun parse_content/4);
+parse_content(?STRING("\r") = Bytes, State, Acc, IgnorableWS) ->
+    cf(Bytes, State, Acc, IgnorableWS, fun parse_content/4);
+parse_content(?STRING("<") = Bytes, State, Acc, IgnorableWS) ->	
+    cf(Bytes, State, Acc, IgnorableWS, fun parse_content/4);
 parse_content(?STRING_REST("</", Rest), State, Acc, IgnorableWS) ->
     State1 = send_character_event(length(Acc), IgnorableWS, lists:reverse(Acc), State),
     parse_etag(Rest, State1);
-parse_content(?STRING("<!"), State, _Acc, IgnorableWS) ->
-    cf(?STRING("<!"), State, [], IgnorableWS, fun parse_content/4);
-parse_content(?STRING("<!-"), State, _Acc, IgnorableWS) ->
-    cf(?STRING("<!-"), State, [], IgnorableWS, fun parse_content/4);
+parse_content(?STRING("<!") = Bytes, State, _Acc, IgnorableWS) ->
+    cf(Bytes, State, [], IgnorableWS, fun parse_content/4);
+parse_content(?STRING("<!-") = Bytes, State, _Acc, IgnorableWS) ->
+    cf(Bytes, State, [], IgnorableWS, fun parse_content/4);
 parse_content(?STRING_REST("<!--", Rest), State, Acc, IgnorableWS) ->
     State1 = send_character_event(length(Acc), IgnorableWS, lists:reverse(Acc), State),
     {Rest1, State2} = parse_comment(Rest, State1, []),
@@ -1227,8 +1227,8 @@ whitespace(Bytes, #xmerl_sax_parser_state{encoding=Enc} = State, Acc) when is_bi
 %%----------------------------------------------------------------------
 parse_reference(?STRING_EMPTY, State, HaveToExist) ->
     cf(?STRING_EMPTY, State, HaveToExist, fun parse_reference/3);
-parse_reference(?STRING("#"), State, HaveToExist) -> 
-    cf(?STRING("#"), State, HaveToExist, fun parse_reference/3);
+parse_reference(?STRING("#") = Bytes, State, HaveToExist) -> 
+    cf(Bytes, State, HaveToExist, fun parse_reference/3);
 parse_reference(?STRING_REST("#x", Rest), State, _HaveToExist) ->
     {CharValue, RefString, Rest1, State1} = parse_hex(Rest, State, []),
     if 
@@ -1702,16 +1702,16 @@ parse_external_entity_1(?BYTE_ORDER_MARK_2, State) ->
     cf(?BYTE_ORDER_MARK_2, State, fun parse_external_entity_1/2);
 parse_external_entity_1(?BYTE_ORDER_MARK_REST(Rest), State) ->
     parse_external_entity_1(Rest, State);
-parse_external_entity_1(?STRING("<"), State) ->
-    cf(?STRING("<"), State, fun parse_external_entity_1/2);
-parse_external_entity_1(?STRING("<?"), State) ->
-    cf(?STRING("<?"), State, fun parse_external_entity_1/2);
-parse_external_entity_1(?STRING("<?x"), State) ->
-    cf(?STRING("<?x"), State, fun parse_external_entity_1/2);
-parse_external_entity_1(?STRING("<?xm"), State) ->
-    cf(?STRING("<?xm"), State, fun parse_external_entity_1/2);
-parse_external_entity_1(?STRING("<?xml"), State) ->
-    cf(?STRING("<?xml"), State, fun parse_external_entity_1/2);
+parse_external_entity_1(?STRING("<") = Bytes, State) ->
+    cf(Bytes, State, fun parse_external_entity_1/2);
+parse_external_entity_1(?STRING("<?") = Bytes, State) ->
+    cf(Bytes, State, fun parse_external_entity_1/2);
+parse_external_entity_1(?STRING("<?x") = Bytes, State) ->
+    cf(Bytes, State, fun parse_external_entity_1/2);
+parse_external_entity_1(?STRING("<?xm") = Bytes, State) ->
+    cf(Bytes, State, fun parse_external_entity_1/2);
+parse_external_entity_1(?STRING("<?xml") = Bytes, State) ->
+    cf(Bytes, State, fun parse_external_entity_1/2);
 parse_external_entity_1(?STRING_REST("<?xml", Rest) = Bytes, 
 			#xmerl_sax_parser_state{file_type=Type} = State) ->   
     {Rest1, State1} = 
@@ -1781,29 +1781,29 @@ is_next_char_whitespace(Bytes, State) ->
 %%----------------------------------------------------------------------
 parse_external_id(?STRING_EMPTY, State, OptionalSystemId) ->
     cf(?STRING_EMPTY, State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("S"), State,OptionalSystemId) ->
-    cf(?STRING("S"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("SY"), State, OptionalSystemId) ->
-    cf(?STRING("SY"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("SYS"), State, OptionalSystemId) ->
-    cf(?STRING("SYS"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("SYST"), State, OptionalSystemId) ->
-    cf(?STRING("SYST"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("SYSTE"), State, OptionalSystemId) ->
-    cf(?STRING("SYSTE"), State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("S") = Bytes, State,OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("SY") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("SYS") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("SYST") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("SYSTE") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
 parse_external_id(?STRING_REST("SYSTEM", Rest), State, _) ->
     {SysId, Rest1, State1} = parse_system_id(Rest, State, false),
     {"", SysId, Rest1, State1};
-parse_external_id(?STRING("P"), State, OptionalSystemId) ->
-    cf(?STRING("P"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("PU"), State, OptionalSystemId) ->
-    cf(?STRING("PU"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("PUB"), State, OptionalSystemId) ->
-    cf(?STRING("PUB"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("PUBL"), State, OptionalSystemId) ->
-    cf(?STRING("PUBL"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("PUBLI"), State, OptionalSystemId) ->
-    cf(?STRING("PUBLI"), State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("P") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("PU") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("PUB") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("PUBL") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("PUBLI") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
 parse_external_id(?STRING_REST("PUBLIC", Rest), State, OptionalSystemId) ->
     parse_public_id(Rest, State, OptionalSystemId);
 parse_external_id(Bytes, State, OptionalSystemId) ->
@@ -1923,70 +1923,70 @@ parse_doctype_decl(Bytes, State) ->
 parse_doctype_decl_1(?STRING_EMPTY, State) ->
     cf(?STRING_EMPTY, State, fun parse_doctype_decl_1/2);
 
-parse_doctype_decl_1(?STRING("E"), State) ->
-    cf(?STRING("E"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("EL"), State) ->
-    cf(?STRING("EL"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ELE"), State) ->
-    cf(?STRING("ELE"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ELEM"), State) ->
-    cf(?STRING("ELEM"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ELEME"), State) ->
-    cf(?STRING("ELEME"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ELEMEN"), State) ->
-    cf(?STRING("ELEMEN"), State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("E") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("EL") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ELE") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ELEM") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ELEME") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ELEMEN") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
 parse_doctype_decl_1(?STRING_REST("ELEMENT", Rest), State) ->
     {Rest1, State1} = parse_element_decl(Rest, State),
     parse_doctype_decl(Rest1, State1);
 
-parse_doctype_decl_1(?STRING("A"), State) ->
-    cf(?STRING("A"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("AT"), State) ->
-    cf(?STRING("AT"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ATT"), State) ->
-    cf(?STRING("ATT"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ATTL"), State) ->
-    cf(?STRING("ATTL"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ATTLI"), State) ->
-    cf(?STRING("ATTLI"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ATTLIS"), State) ->
-    cf(?STRING("ATTLIS"), State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("A") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("AT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ATT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ATTL") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ATTLI") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ATTLIS") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
 parse_doctype_decl_1(?STRING_REST("ATTLIST", Rest), State) ->
     {Rest1, State1} = parse_att_list_decl(Rest, State),
     parse_doctype_decl(Rest1, State1);
 
 %% E clause not needed here because already taken care of above.
-parse_doctype_decl_1(?STRING("EN"), State) ->
-    cf(?STRING("EN"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ENT"), State) ->
-    cf(?STRING("ENT"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ENTI"), State) ->
-    cf(?STRING("ENTI"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ENTIT"), State) ->
-    cf(?STRING("ENTIT"), State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("EN") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ENT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ENTI") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ENTIT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
 parse_doctype_decl_1(?STRING_REST("ENTITY", Rest), State) ->
     {Rest1, State1} = parse_entity_decl(Rest, State),
     parse_doctype_decl(Rest1, State1);
 
-parse_doctype_decl_1(?STRING("N"), State) ->
-    cf(?STRING("N"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("NO"), State) ->
-    cf(?STRING("NO"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("NOT"), State) ->
-    cf(?STRING("NOT"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("NOTA"), State) ->
-    cf(?STRING("NOTA"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("NOTAT"), State) ->
-    cf(?STRING("NOTAT"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("NOTATI"), State) ->
-    cf(?STRING("NOTATI"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("NOTATIO"), State) ->
-    cf(?STRING("NOTATIO"), State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("N") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("NO") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("NOT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("NOTA") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("NOTAT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("NOTATI") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("NOTATIO") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
 parse_doctype_decl_1(?STRING_REST("NOTATION", Rest), State) ->
     {Rest1, State1} = parse_notation_decl(Rest, State),
     parse_doctype_decl(Rest1, State1);
-parse_doctype_decl_1(?STRING("-"), State) ->
-    cf(?STRING("-"), State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("-") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
 parse_doctype_decl_1(?STRING_REST("--", Rest), State) ->
     {Rest1, State1} = parse_comment(Rest, State, []),
     parse_doctype_decl(Rest1, State1);
@@ -2264,52 +2264,52 @@ parse_default_decl(Bytes, State) ->
 %%----------------------------------------------------------------------
 parse_default_decl_1(?STRING_EMPTY, State) ->
     cf(?STRING_EMPTY, State, fun parse_default_decl_1/2);
-parse_default_decl_1(?STRING_REST("#", Rest), State) ->
-    case Rest of
-	?STRING("R") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("RE") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("REQ") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("REQU") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("REQUI") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("REQUIR") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("REQUIRE") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING_REST("REQUIRED", Rest1) ->
+parse_default_decl_1(?STRING_REST("#", _Rest) = Bytes, State) ->
+    case Bytes of
+	?STRING("#R") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#RE") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#REQ") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#REQU") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#REQUI") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#REQUIR") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#REQUIRE") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING_REST("#REQUIRED", Rest1) ->
 	    {"#REQUIRED", undefined, Rest1, State};
 
-	?STRING("I") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("IM") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("IMP") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("IMPL") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("IMPLI") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("IMPLIE") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING_REST("IMPLIED", Rest1)  ->
+	?STRING("#I") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#IM") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#IMP") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#IMPL") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#IMPLI") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#IMPLIE") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING_REST("#IMPLIED", Rest1)  ->
 	    {"#IMPLIED", undefined, Rest1, State};
 
-	?STRING("F") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("FI") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("FIX") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("FIXE") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING_REST("FIXED", Rest1)  ->
+	?STRING("#F") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#FI") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#FIX") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#FIXE") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING_REST("#FIXED", Rest1)  ->
 	    parse_fixed(Rest1, State);
 	_  ->
-	    ?fatal_error(State, "REQUIRED, IMPLIED or FIXED expected")
+	    ?fatal_error(State, "REQUIRED, IMPLIED or FIXED expected after #")
     end;
 parse_default_decl_1(?STRING_UNBOUND_REST(C, Rest), State) when C == $'; C == $" ->
     {DefaultValue, Rest1, State1} = parse_att_value(Rest, State, C, []),
@@ -2560,14 +2560,14 @@ parse_ndata_decl(?STRING_EMPTY, State) ->
     cf(?STRING_EMPTY, State, fun parse_ndata_decl/2);
 parse_ndata_decl(?STRING_REST(">", Rest), State) ->
     {undefined, Rest, State};
-parse_ndata_decl(?STRING("N") = Rest, State) ->
-    cf(Rest, State, fun parse_ndata_decl/2);
-parse_ndata_decl(?STRING("ND") = Rest, State) ->
-    cf(Rest, State, fun parse_ndata_decl/2);
-parse_ndata_decl(?STRING("NDA") = Rest, State) ->
-    cf(Rest, State, fun parse_ndata_decl/2);
-parse_ndata_decl(?STRING("NDAT") = Rest, State) ->
-    cf(Rest, State, fun parse_ndata_decl/2);
+parse_ndata_decl(?STRING("N") = Bytes, State) ->
+    cf(Bytes, State, fun parse_ndata_decl/2);
+parse_ndata_decl(?STRING("ND") = Bytes, State) ->
+    cf(Bytes, State, fun parse_ndata_decl/2);
+parse_ndata_decl(?STRING("NDA") = Bytes, State) ->
+    cf(Bytes, State, fun parse_ndata_decl/2);
+parse_ndata_decl(?STRING("NDAT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_ndata_decl/2);
 parse_ndata_decl(?STRING_REST("NDATA", Rest), State) ->
     parse_ndata_decl_1(Rest, State);
 parse_ndata_decl(Bytes, State) -> 
diff --git a/lib/xmerl/test/Makefile b/lib/xmerl/test/Makefile
index 5a2a585841..ac3370dbda 100644
--- a/lib/xmerl/test/Makefile
+++ b/lib/xmerl/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2011. All Rights Reserved.
+# Copyright Ericsson AB 2004-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -113,15 +113,15 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 
 release_tests_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA)  $(SUITE_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) xmerl.spec xmerl.cover $(RELSYSDIR)
-	cp $(XML_FILES) $(RELSYSDIR)
-	@tar cfh - xmerl_SUITE_data | (cd $(RELSYSDIR); tar xf -)
-	@tar cfh - xmerl_std_SUITE_data | (cd $(RELSYSDIR); tar xf -)
-	@tar cfh - xmerl_xsd_SUITE_data | (cd $(RELSYSDIR); tar xf -)
-	@tar cfh - xmerl_xsd_MS2002-01-16_SUITE_data | (cd $(RELSYSDIR); tar xf -)
-	@tar cfh - xmerl_xsd_NIST2002-01-16_SUITE_data | (cd $(RELSYSDIR); tar xf -)
-	@tar cfh - xmerl_xsd_Sun2002-01-16_SUITE_data | (cd $(RELSYSDIR); tar xf -)
-	chmod -R u+w $(RELSYSDIR)
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA)  $(SUITE_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) xmerl.spec xmerl.cover "$(RELSYSDIR)"
+	cp $(XML_FILES) "$(RELSYSDIR)"
+	@tar cfh - xmerl_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
+	@tar cfh - xmerl_std_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
+	@tar cfh - xmerl_xsd_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
+	@tar cfh - xmerl_xsd_MS2002-01-16_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
+	@tar cfh - xmerl_xsd_NIST2002-01-16_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
+	@tar cfh - xmerl_xsd_Sun2002-01-16_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
+	chmod -R u+w "$(RELSYSDIR)"
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 399e5b3602..599bc0b9d3 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.1
+XMERL_VSN = 1.3.2